Merge pull request #67 from laminas/renovate/phpunit-phpunit-10.x

Update dependency phpunit/phpunit to v10
laminas · Nov 21, 2023 · e4c15d5 · e4c15d5
2 parents b34fed2 + f5b50a7
commit e4c15d5
Show file tree

Hide file tree

Showing 18 changed files with 394 additions and 464 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 /.phpcs-cache
-/.phpunit.result.cache
+/.phpunit.cache
 /.psalm-cache/
 /clover.xml
 /coveralls-upload.json

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "composer/composer": "^2.6.4",
         "laminas/laminas-coding-standard": "~2.5.0",
         "mikey179/vfsstream": "^1.6.11",
-        "phpunit/phpunit": "^9.5.26",
+        "phpunit/phpunit": "^10.4",
         "psalm/plugin-phpunit": "^0.18.0",
         "vimeo/psalm": "^5.15.0",
         "webmozart/assert": "^1.11.0"

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,17 +3,24 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/autoload.php"
-    convertDeprecationsToExceptions="true"
-    colors="true">
+    cacheDirectory=".phpunit.cache"
+    displayDetailsOnIncompleteTests="true"
+    displayDetailsOnSkippedTests="true"
+    displayDetailsOnTestsThatTriggerDeprecations="true"
+    displayDetailsOnTestsThatTriggerErrors="true"
+    displayDetailsOnTestsThatTriggerNotices="true"
+    displayDetailsOnTestsThatTriggerWarnings="true"
+    colors="true"
+>
     <testsuites>
         <testsuite name="Laminas\\ComponentInstaller Tests">
             <directory>./test</directory>
         </testsuite>
     </testsuites>
 
-    <coverage processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -72,12 +72,6 @@
       <code>__construct</code>
     </PossiblyUnusedMethod>
   </file>
-  <file src="test/ComponentInstallerTest.php">
-    <DeprecatedMethod>
-      <code>withConsecutive</code>
-      <code>withConsecutive</code>
-    </DeprecatedMethod>
-  </file>
   <file src="test/ConfigDiscoveryTest.php">
     <InvalidPropertyAssignmentValue>
       <code>new Collection([

diff --git a/test/ComponentInstallerTest.php b/test/ComponentInstallerTest.php
@@ -22,16 +22,20 @@
 use Laminas\ComponentInstaller\ComponentInstaller;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
+use PHPUnit\Framework\Constraint\Constraint;
+use PHPUnit\Framework\Constraint\IsAnything;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use ReflectionObject;
 
 use function count;
+use function current;
 use function dirname;
 use function file_get_contents;
 use function implode;
 use function method_exists;
 use function mkdir;
+use function next;
 use function preg_match;
 use function preg_quote;
 use function sprintf;
@@ -191,20 +195,40 @@ private function createOutputAssertions(array $informations): void
         $consecutiveArguments = [];
 
         foreach ($informations as $information) {
-            $consecutiveArguments[] = [
-                self::callback(static function (string $argument) use ($information): bool {
-                    return preg_match(
-                        sprintf('/%s/', preg_quote($argument, '/')),
-                        $information
-                    ) !== false;
-                }),
-            ];
+            $consecutiveArguments[] = self::callback(static function (string $argument) use ($information): bool {
+                return preg_match(
+                    sprintf('/%s/', preg_quote($argument, '/')),
+                    $information
+                ) !== false;
+            });
         }
 
+        $consecutive = new class ($consecutiveArguments) extends Constraint {
+            /**
+             * @param list<Constraint> $assertions
+             */
+            public function __construct(private array $assertions)
+            {
+                $this->assertions[] = new IsAnything();
+            }
+
+            public function matches(mixed $other): bool
+            {
+                $assertion = current($this->assertions);
+                next($this->assertions);
+                return $assertion->matches($other);
+            }
+
+            public function toString(): string
+            {
+                return current($this->assertions)->toString();
+            }
+        };
+
         $this->io
             ->expects(self::exactly(count($consecutiveArguments)))
             ->method('write')
-            ->withConsecutive(...$consecutiveArguments);
+            ->with($consecutive);
     }
 
     /**
@@ -214,22 +238,46 @@ private function createInputAssertions(array $questionsAssertions): void
     {
         $consecutiveReturnValues = $consecutiveArguments = [];
         foreach ($questionsAssertions as $questionAssertion) {
-            $consecutiveArguments[]    = [
-                self::callback($questionAssertion->assertion()),
-            ];
+            $consecutiveArguments[]    = self::callback($questionAssertion->assertion());
             $consecutiveReturnValues[] = $questionAssertion->expectedAnswer;
 
             if ($questionAssertion instanceof RememberedAnswerQuestionAssertion) {
-                $consecutiveArguments[]    = [self::callback($questionAssertion->rememberAnswerAssertion())];
+                $consecutiveArguments[]    = self::callback($questionAssertion->rememberAnswerAssertion());
                 $consecutiveReturnValues[] = $questionAssertion->remember ? 'y' : 'n';
             }
         }
 
+        $consecutive = new class ($consecutiveArguments) extends Constraint {
+            /**
+             * @param list<Constraint> $assertions
+             */
+            public function __construct(private array $assertions)
+            {
+                $this->assertions[] = new IsAnything();
+            }
+
+            public function matches(mixed $other): bool
+            {
+                $assertion = current($this->assertions);
+                next($this->assertions);
+                return $assertion->matches($other);
+            }
+
+            public function toString(): string
+            {
+                return current($this->assertions)->toString();
+            }
+        };
+
+        $matcher = self::exactly(count($consecutiveReturnValues));
+
         $this->io
-            ->expects(self::exactly(count($consecutiveArguments)))
+            ->expects($matcher)
             ->method('ask')
-            ->withConsecutive(...$consecutiveArguments)
-            ->willReturnOnConsecutiveCalls(...$consecutiveReturnValues);
+            ->with($consecutive)
+            ->willReturnCallback(function () use ($matcher, $consecutiveReturnValues) {
+                return $consecutiveReturnValues[$matcher->numberOfInvocations() - 1];
+            });
     }
 
     /**
@@ -332,7 +380,7 @@ public function getModuleDependencies()
      *     5: null|string
      * }>
      */
-    public function dependency(): array
+    public static function dependency(): array
     {
         return [
             // 'description' => [
@@ -706,7 +754,7 @@ public function getModuleDependencies()
      *     2: list<non-empty-string>
      * }>
      */
-    public function modules(): array
+    public static function modules(): array
     {
         return [
             // 'description' => [
@@ -1347,7 +1395,7 @@ public function testAppendModuleAndPrependComponent(): void
      *     1: array<string, array<array-key, string>>
      * }>
      */
-    public function moduleClass(): array
+    public static function moduleClass(): array
     {
         return [
             [__DIR__ . '/TestAsset/ModuleBadlyFormatted.php', ['BadlyFormatted\Application' => ['Dependency1']]],
@@ -1744,7 +1792,7 @@ public function testOnPostPackageInstallDoesNotPromptForIgnoredPackages(): void
      *     non-empty-string
      * }>
      */
-    public function injectorConfigProvider(): array
+    public static function injectorConfigProvider(): array
     {
         $config = <<<'CONFIG'
         <?php
@@ -1932,7 +1980,7 @@ public function testDoesNotModifyRootPackageOnPluginActivation(): void
      *     5:list<non-empty-string>
      * }>
      */
-    public function packageUpdateScenarios(): Generator
+    public static function packageUpdateScenarios(): Generator
     {
         yield 'package introduces module' => [
             [], // Initially installed application modules

diff --git a/test/ConfigDiscovery/AbstractConfigAggregatorTestCase.php b/test/ConfigDiscovery/AbstractConfigAggregatorTestCase.php
@@ -46,7 +46,7 @@ public function testLocateReturnsFalseWhenFileDoesNotHaveExpectedContents(): voi
      *     0: string
      * }>
      */
-    public function validMezzioConfigContents(): array
+    public static function validMezzioConfigContents(): array
     {
         // @codingStandardsIgnoreStart
         return [

diff --git a/test/ConfigDiscovery/ApplicationConfigTest.php b/test/ConfigDiscovery/ApplicationConfigTest.php
@@ -41,7 +41,7 @@ public function testLocateReturnsFalseWhenFileDoesNotHaveExpectedContents(): voi
     /**
      * @psalm-return array<string, array{0: string}>
      */
-    public function validApplicationConfigContents(): array
+    public static function validApplicationConfigContents(): array
     {
         return [
             'long-array'  => ['<' . "?php\nreturn array(\n    'modules' => array(\n    )\n);"],

diff --git a/test/ConfigDiscovery/DevelopmentConfigTest.php b/test/ConfigDiscovery/DevelopmentConfigTest.php
@@ -41,7 +41,7 @@ public function testLocateReturnsFalseWhenFileDoesNotHaveExpectedContents(): voi
     /**
      * @psalm-return array<string, array{0: string}>
      */
-    public function validDevelopmentConfigContents(): array
+    public static function validDevelopmentConfigContents(): array
     {
         return [
             'long-array'  => ['<' . "?php\nreturn array(\n    'modules' => array(\n    )\n);"],

diff --git a/test/ConfigDiscovery/MezzioConfigTest.php b/test/ConfigDiscovery/MezzioConfigTest.php
@@ -41,7 +41,7 @@ public function testLocateReturnsFalseWhenFileDoesNotHaveExpectedContents(): voi
     /**
      * @psalm-return array<string, array{0: string}>
      */
-    public function validMezzioConfigContents(): array
+    public static function validMezzioConfigContents(): array
     {
         // @codingStandardsIgnoreStart
         return [

diff --git a/test/ConfigDiscovery/ModulesConfigTest.php b/test/ConfigDiscovery/ModulesConfigTest.php
@@ -41,7 +41,7 @@ public function testLocateReturnsFalseWhenFileDoesNotHaveExpectedContents(): voi
     /**
      * @psalm-return array<string, array{0: string}>
      */
-    public function validModulesConfigContents(): array
+    public static function validModulesConfigContents(): array
     {
         return [
             'long-array'  => ['<' . "?php\nreturn array(\n);"],