Merge branch 'release/2.0.0-rc5'

php-tuf · Jul 17, 2024 · 9c5aef2 · 9c5aef2
2 parents 37037eb + c1bf198
commit 9c5aef2
Show file tree

Hide file tree

Showing 50 changed files with 235 additions and 3,375 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/infection.json5.dist b/infection.json5.dist
@@ -3,9 +3,6 @@
     "source": {
         "directories": [
             "src"
-        ],
-        "excludes": [
-            "Internal/SymfonyProcess"
         ]
     },
     "timeout": 30,

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -275,7 +275,4 @@
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint"><exclude-pattern>tests</exclude-pattern></rule>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"><exclude-pattern>tests</exclude-pattern></rule>
 
-    <!-- Exclude temporary Symfony Process fork. -->
-    <exclude-pattern>src/Internal/SymfonyProcess</exclude-pattern>
-
 </ruleset>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -16,9 +16,6 @@ parameters:
         - config/services.yml
         - docs/services.yml
         - src
-    excludePaths:
-        # Exclude temporary Symfony Process fork.
-        - src/Internal/SymfonyProcess
     treatPhpDocTypesAsCertain: false
     preconditionSystemHash: 8dfddc6171adcfe004a0bfaea2545f8e
     translationSystemHash: dec82389af17442fa61cc1fcc6f89c3e

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -36,11 +36,6 @@
             <directory suffix=".php">src</directory>
         </include>
 
-        <!-- Exclude temporary Symfony Process fork. -->
-        <exclude>
-            <directory>src/Internal/SymfonyProcess</directory>
-        </exclude>
-
         <report>
             <clover outputFile="var/phpunit/clover.xml"/>
             <html outputDirectory="var/phpunit/html-coverage"/>

diff --git a/rector.php b/rector.php
@@ -34,9 +34,6 @@
     ]);
 
     $rectorConfig->skip([
-        // Exclude temporary Symfony Process fork.
-        0 => __DIR__ . '/src/Internal/SymfonyProcess',
-
         CatchExceptionNameMatchingTypeRector::class => [__DIR__],
         EncapsedStringsToSprintfRector::class => [__DIR__],
         LocallyCalledStaticMethodToNonStaticRector::class => [__DIR__],

diff --git a/src/Internal/Finder/Service/ExecutableFinder.php b/src/Internal/Finder/Service/ExecutableFinder.php
@@ -5,8 +5,8 @@
 use PhpTuf\ComposerStager\API\Exception\LogicException;
 use PhpTuf\ComposerStager\API\Finder\Service\ExecutableFinderInterface;
 use PhpTuf\ComposerStager\API\Translation\Factory\TranslatableFactoryInterface;
-use PhpTuf\ComposerStager\Internal\SymfonyProcess\Service\ExecutableFinder as SymfonyExecutableFinder;
 use PhpTuf\ComposerStager\Internal\Translation\Factory\TranslatableAwareTrait;
+use Symfony\Component\Process\ExecutableFinder as SymfonyExecutableFinder;
 
 /**
  * @package Finder

diff --git a/src/Internal/Process/Factory/SymfonyProcessFactory.php b/src/Internal/Process/Factory/SymfonyProcessFactory.php
@@ -5,9 +5,9 @@
 use PhpTuf\ComposerStager\API\Exception\LogicException;
 use PhpTuf\ComposerStager\API\Path\Value\PathInterface;
 use PhpTuf\ComposerStager\API\Translation\Factory\TranslatableFactoryInterface;
-use PhpTuf\ComposerStager\Internal\SymfonyProcess\Value\Exception\ExceptionInterface as SymfonyExceptionInterface;
-use PhpTuf\ComposerStager\Internal\SymfonyProcess\Value\Process as SymfonyProcess;
 use PhpTuf\ComposerStager\Internal\Translation\Factory\TranslatableAwareTrait;
+use Symfony\Component\Process\Exception\ExceptionInterface as SymfonyExceptionInterface;
+use Symfony\Component\Process\Process as SymfonyProcess;
 
 /**
  * @package Process

diff --git a/src/Internal/Process/Factory/SymfonyProcessFactoryInterface.php b/src/Internal/Process/Factory/SymfonyProcessFactoryInterface.php
@@ -3,7 +3,7 @@
 namespace PhpTuf\ComposerStager\Internal\Process\Factory;
 
 use PhpTuf\ComposerStager\API\Path\Value\PathInterface;
-use PhpTuf\ComposerStager\Internal\SymfonyProcess\Value\Process as SymfonyProcess;
+use Symfony\Component\Process\Process as SymfonyProcess;
 
 /**
  * Creates Symfony Process objects.
@@ -46,7 +46,7 @@ interface SymfonyProcessFactoryInterface
      * @throws \PhpTuf\ComposerStager\API\Exception\LogicException
      *   If the process cannot be created due to host configuration.
      *
-     * @see \PhpTuf\ComposerStager\Internal\SymfonyProcess\Value\Process::__construct
+     * @see \Symfony\Component\Process\Process::__construct
      */
     public function create(array $command, ?PathInterface $cwd = null, array $env = []): SymfonyProcess;
 }
diff --git a/src/Internal/Process/Service/OutputCallbackAdapter.php b/src/Internal/Process/Service/OutputCallbackAdapter.php
@@ -4,7 +4,7 @@
 
 use PhpTuf\ComposerStager\API\Process\Service\OutputCallbackInterface;
 use PhpTuf\ComposerStager\API\Process\Value\OutputTypeEnum;
-use PhpTuf\ComposerStager\Internal\SymfonyProcess\Value\Process as SymfonyProcess;
+use Symfony\Component\Process\Process as SymfonyProcess;
 
 /**
  * @package Process

diff --git a/src/Internal/Process/Service/OutputCallbackAdapterInterface.php b/src/Internal/Process/Service/OutputCallbackAdapterInterface.php
@@ -13,6 +13,6 @@
  */
 interface OutputCallbackAdapterInterface
 {
-    /** @see \PhpTuf\ComposerStager\Internal\SymfonyProcess\Value\Process::readPipes */
+    /** @see \Symfony\Component\Process\Process::readPipes */
     public function __invoke(string $type, string $buffer): void;
 }
diff --git a/src/Internal/Process/Service/Process.php b/src/Internal/Process/Service/Process.php
@@ -10,8 +10,8 @@
 use PhpTuf\ComposerStager\API\Process\Service\ProcessInterface;
 use PhpTuf\ComposerStager\API\Translation\Factory\TranslatableFactoryInterface;
 use PhpTuf\ComposerStager\Internal\Process\Factory\SymfonyProcessFactoryInterface;
-use PhpTuf\ComposerStager\Internal\SymfonyProcess\Value\Process as SymfonyProcess;
 use PhpTuf\ComposerStager\Internal\Translation\Factory\TranslatableAwareTrait;
+use Symfony\Component\Process\Process as SymfonyProcess;
 use Throwable;
 
 /**

diff --git a/src/Internal/SymfonyProcess/LICENSE b/src/Internal/SymfonyProcess/LICENSE
diff --git a/src/Internal/SymfonyProcess/README.md b/src/Internal/SymfonyProcess/README.md
diff --git a/src/Internal/SymfonyProcess/Service/ExecutableFinder.php b/src/Internal/SymfonyProcess/Service/ExecutableFinder.php
diff --git a/src/Internal/SymfonyProcess/Value/Exception/ExceptionInterface.php b/src/Internal/SymfonyProcess/Value/Exception/ExceptionInterface.php
diff --git a/src/Internal/SymfonyProcess/Value/Exception/InvalidArgumentException.php b/src/Internal/SymfonyProcess/Value/Exception/InvalidArgumentException.php
diff --git a/src/Internal/SymfonyProcess/Value/Exception/LogicException.php b/src/Internal/SymfonyProcess/Value/Exception/LogicException.php
diff --git a/src/Internal/SymfonyProcess/Value/Exception/ProcessFailedException.php b/src/Internal/SymfonyProcess/Value/Exception/ProcessFailedException.php
diff --git a/src/Internal/SymfonyProcess/Value/Exception/ProcessSignaledException.php b/src/Internal/SymfonyProcess/Value/Exception/ProcessSignaledException.php