Merge branch 'release/2.0.0-beta5'

php-tuf · Apr 3, 2024 · e687ed9 · e687ed9
2 parents 7df5ce8 + 0a028f4
commit e687ed9
Show file tree

Hide file tree

Showing 15 changed files with 117 additions and 73 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
             -   name: "Set up PHP"
                 uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
                 with:
-                    php-version: "8.1"
+                    php-version: "8.2"
                     coverage: none
 
             -   name: "Checkout code"
@@ -41,28 +41,28 @@ jobs:
                 run: "composer static"
 
     tests:
-        name: "Test: ${{ matrix.os }} / deps-${{ matrix.dependencies }}"
-        runs-on: "${{ matrix.os }}"
+        name: "Test: ${{ matrix.os }} / ${{ matrix.php }} / ${{ matrix.dependencies }}"
+        runs-on: "${{ matrix.os }}-latest"
         strategy:
             fail-fast: false
             matrix:
-                os: [ ubuntu-latest, macos-latest, windows-latest ]
-                php: [ "8.1" ]
+                os: [ ubuntu, macos, windows ]
+                php: [ "8.1", "8.2" ]
                 dependencies: [ lowest, highest ]
         steps:
             -   name: "Install rsync"
                 uses: GuillaumeFalourd/[email protected] # https://github.com/marketplace/actions/setup-rsync
 
             -   name: "Set up PHP w/ Coverage"
-                if: ${{ matrix.os == 'ubuntu-latest' && matrix.dependencies == 'highest' }}
+                if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'highest' }}
                 uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
                 with:
                     php-version: "${{ matrix.php }}"
                     extensions: gd
                     ini-values: assert.active=1, assert.exception=1, zend.assertions=1
 
             -   name: "Set up PHP w/o Coverage"
-                if: ${{ !( matrix.os == 'ubuntu-latest' && matrix.dependencies == 'highest' ) }}
+                if: ${{ !( matrix.os == 'ubuntu' && matrix.dependencies == 'highest' ) }}
                 uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
                 with:
                     php-version: "${{ matrix.php }}"
@@ -85,33 +85,32 @@ jobs:
 
             -   name: "Run core tests with coverage"
                 run: "composer test"
-                if: ${{ matrix.os == 'ubuntu-latest' && matrix.dependencies == 'highest' }}
+                if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'highest' }}
 
             # There's no reason to generate coverage data on multiple jobs--the result should be the same.
             -   name: "Run core tests without coverage"
                 run: "./vendor/bin/phpunit --no-coverage --exclude-group=windows_only"
-                if: ${{ runner.os != 'Windows' && !( matrix.os == 'ubuntu-latest' && matrix.dependencies == 'highest' ) }}
+                if: ${{ runner.os != 'Windows' && !( matrix.os == 'ubuntu' && matrix.dependencies == 'highest' ) }}
 
             -   name: "Run Windows tests"
                 run: "./vendor/bin/phpunit --no-coverage --exclude-group=no_windows"
                 if: ${{ runner.os == 'Windows' }}
 
     performance:
         name: "Performance: ${{ matrix.os }}"
-        runs-on: "${{ matrix.os }}"
+        runs-on: "${{ matrix.os }}-latest"
         strategy:
             fail-fast: false
             matrix:
-                os: [ ubuntu-latest, windows-latest ]
-                php: [ "8.1" ]
+                os: [ ubuntu, windows ]
         steps:
             -   name: "Install rsync"
                 uses: GuillaumeFalourd/[email protected] # https://github.com/marketplace/actions/setup-rsync
 
             -   name: "Set up PHP"
                 uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
                 with:
-                    php-version: "8.1"
+                    php-version: "8.2"
                     coverage: none
 
             -   name: "Checkout code"
@@ -130,7 +129,7 @@ jobs:
             -   name: "Set up PHP"
                 uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
                 with:
-                    php-version: "8.1"
+                    php-version: "8.2"
                     extensions: gd
                     ini-values: assert.active=1, assert.exception=1, zend.assertions=1
 

diff --git a/.idea/runConfigurations/PHPCS.xml b/.idea/runConfigurations/PHPCS.xml
diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
     "require": {
         "php": ">=8.1.0",
         "ext-json": "*",
-        "symfony/filesystem": "^6.2",
-        "symfony/process": "^6.2",
+        "symfony/filesystem": "^6.2 || ^7.0",
+        "symfony/process": "^6.2 || ^7.0",
         "symfony/translation-contracts": "^3.1"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/API/Process/Service/ProcessInterface.php b/src/API/Process/Service/ProcessInterface.php
@@ -53,7 +53,7 @@ public function getOutput(): string;
      *
      * @see \PhpTuf\ComposerStager\API\Process\Service\ProcessInterface::run
      */
-    public function mustRun(?OutputCallbackInterface $callback = null): self;
+    public function mustRun(?OutputCallbackInterface $callback = null): void;
 
     /**
      * Runs the process.
@@ -89,7 +89,7 @@ public function run(?OutputCallbackInterface $callback = null): int;
      *
      * @see \PhpTuf\ComposerStager\API\Process\Service\ProcessInterface::getEnv
      */
-    public function setEnv(array $env): self;
+    public function setEnv(array $env): void;
 
     /**
      * Sets the process timeout (max. runtime) in seconds.
@@ -101,5 +101,5 @@ public function setEnv(array $env): self;
      * @throws \PhpTuf\ComposerStager\API\Exception\InvalidArgumentException
      *   If the given timeout is negative.
      */
-    public function setTimeout(int $timeout = self::DEFAULT_TIMEOUT): self;
+    public function setTimeout(int $timeout = self::DEFAULT_TIMEOUT): void;
 }
diff --git a/src/Internal/Process/Service/Process.php b/src/Internal/Process/Service/Process.php
@@ -98,7 +98,7 @@ public function getOutput(): string
         }
     }
 
-    public function mustRun(?OutputCallbackInterface $callback = null): self
+    public function mustRun(?OutputCallbackInterface $callback = null): void
     {
         try {
             $callbackAdapter = new OutputCallbackAdapter($callback);
@@ -110,8 +110,6 @@ public function mustRun(?OutputCallbackInterface $callback = null): self
                 $this->d()->exceptions(),
             ), 0, $e);
         }
-
-        return $this;
     }
 
     public function run(?OutputCallbackInterface $callback = null): int
@@ -129,15 +127,13 @@ public function run(?OutputCallbackInterface $callback = null): int
         }
     }
 
-    public function setEnv(array $env): ProcessInterface
+    public function setEnv(array $env): void
     {
         $this->assertValidEnv($env);
         $this->symfonyProcess->setEnv($env);
-
-        return $this;
     }
 
-    public function setTimeout(int $timeout = self::DEFAULT_TIMEOUT): self
+    public function setTimeout(int $timeout = self::DEFAULT_TIMEOUT): void
     {
         try {
             $this->symfonyProcess->setTimeout($timeout);
@@ -148,8 +144,6 @@ public function setTimeout(int $timeout = self::DEFAULT_TIMEOUT): self
                 $this->d()->exceptions(),
             ), 0, $e);
         }
-
-        return $this;
     }
 
     /**

diff --git a/tests/Compatability/CompatabilityFunctionalTest.php b/tests/Compatability/CompatabilityFunctionalTest.php
@@ -22,7 +22,8 @@ final class CompatabilityFunctionalTest extends TestCase
         '10.1.0',
         '10.1.2',
         // Next minor dev.
-        '11.x-dev',
+        // @todo Drupal 11.x now require PHP 8.3. Update the test setup for support.
+        //'11.x-dev',
     ];
 
     public static function setUpBeforeClass(): void

diff --git a/tests/Finder/Service/ExecutableFinderUnitTest.php b/tests/Finder/Service/ExecutableFinderUnitTest.php
@@ -41,8 +41,7 @@ public function testFind(): void
         $command = 'command_name';
         $this->symfonyExecutableFinder
             ->addSuffix('.phar')
-            ->shouldBeCalled()
-            ->willReturn(null);
+            ->shouldBeCalled();
         $this->symfonyExecutableFinder
             ->find($command)
             ->shouldBeCalledOnce()
@@ -60,8 +59,7 @@ public function testFindNotFound(): void
         $command = 'command_name';
         $this->symfonyExecutableFinder
             ->addSuffix('.phar')
-            ->shouldBeCalledOnce()
-            ->willReturn(null);
+            ->shouldBeCalledOnce();
         $this->symfonyExecutableFinder
             ->find($command)
             ->shouldBeCalledOnce()

diff --git a/tests/Precondition/Service/ComposerIsAvailableUnitTest.php b/tests/Precondition/Service/ComposerIsAvailableUnitTest.php
@@ -41,8 +41,7 @@ protected function setUp(): void
         $this->processFactory = $this->prophesize(ProcessFactoryInterface::class);
         $this->process = $this->prophesize(ProcessInterface::class);
         $this->process
-            ->mustRun()
-            ->willReturn($this->process);
+            ->mustRun();
         $this->process
             ->getOutput()
             ->willReturn(json_encode([

diff --git a/tests/Precondition/Service/RsyncIsAvailableUnitTest.php b/tests/Precondition/Service/RsyncIsAvailableUnitTest.php
@@ -41,8 +41,7 @@ protected function setUp(): void
         $this->processFactory = $this->prophesize(ProcessFactoryInterface::class);
         $this->process = $this->prophesize(ProcessInterface::class);
         $this->process
-            ->mustRun()
-            ->willReturn($this->process);
+            ->mustRun();
         $this->process
             ->getOutput()
             ->willReturn('');

diff --git a/tests/Process/Service/AbstractProcessRunnerUnitTest.php b/tests/Process/Service/AbstractProcessRunnerUnitTest.php
@@ -37,11 +37,9 @@ protected function setUp(): void
         $this->processFactory = $this->prophesize(ProcessFactoryInterface::class);
         $this->process = $this->prophesize(ProcessInterface::class);
         $this->process
-            ->mustRun(Argument::any())
-            ->willReturn($this->process);
+            ->mustRun(Argument::any());
         $this->process
-            ->setTimeout(Argument::any())
-            ->willReturn($this->process);
+            ->setTimeout(Argument::any());
     }
 
     private function createSut($executableName = null): AbstractProcessRunner
@@ -100,12 +98,10 @@ public function testBasicFunctionality(
             ->shouldBeCalledOnce();
         $this->process
             ->setTimeout($timeout)
-            ->shouldBeCalledOnce()
-            ->willReturn($this->process);
+            ->shouldBeCalledOnce();
         $this->process
             ->mustRun($callback)
-            ->shouldBeCalledOnce()
-            ->willReturn($this->process);
+            ->shouldBeCalledOnce();
         $this->processFactory
             ->create(...$expectedFactoryArguments)
             ->shouldBeCalledOnce()

diff --git a/tests/Process/Service/ProcessUnitTest.php b/tests/Process/Service/ProcessUnitTest.php
@@ -124,21 +124,18 @@ public function testBasicFunctionality(
             ->shouldBeCalledOnce();
         $sut = $this->createSut($givenConstructorArguments);
 
-        $actualSetEnvReturn = $sut->setEnv($envVars);
+        $sut->setEnv($envVars);
         $actualEnv = $sut->getEnv();
         $actualOutput = $sut->getOutput();
         $actualErrorOutput = $sut->getErrorOutput();
-        $actualMustRunReturn = $sut->mustRun(...$givenRunArguments);
+        $sut->mustRun(...$givenRunArguments);
         $actualRunReturn = $sut->run(...$givenRunArguments);
-        $actualSetTimeoutReturn = $sut->setTimeout(...$givenSetTimeoutArguments);
+        $sut->setTimeout(...$givenSetTimeoutArguments);
 
         self::assertSame($actualEnv, $envVars, 'Returned correct output.');
         self::assertSame($output, $actualOutput, 'Returned correct output.');
         self::assertSame($errorOutput, $actualErrorOutput, 'Returned correct error output.');
-        self::assertSame($sut, $actualMustRunReturn, 'Returned "self" from ::mustRun().');
         self::assertSame($expectedRunReturn, $actualRunReturn, 'Returned correct status code from ::run().');
-        self::assertSame($sut, $actualSetEnvReturn, 'Returned "self" from ::setEnv().');
-        self::assertSame($sut, $actualSetTimeoutReturn, 'Returned "self" from ::setTimeout().');
     }
 
     public function providerBasicFunctionality(): array