Upgrade to PHPUnit 10

Signed-off-by: George Steel <[email protected]>
laminas · May 29, 2023 · 8198a73 · 8198a73
1 parent e137f4f
commit 8198a73
Show file tree

Hide file tree

Showing 8 changed files with 288 additions and 457 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 /phpunit.xml
 /vendor/
 .phpcs-cache
+.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "laminas/laminas-coding-standard": "~2.5.0",
         "laminas/laminas-servicemanager": "^3.21",
         "phpbench/phpbench": "^1.2.10",
-        "phpunit/phpunit": "^9.6.8",
+        "phpunit/phpunit": "^10.1.3",
         "psalm/plugin-phpunit": "^0.18.4",
         "vimeo/psalm": "^5.12"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,15 +2,25 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         colors="true">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+         colors="true"
+         cacheDirectory=".phpunit.cache"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnSkippedTests="true"
+         failOnNotice="true"
+         failOnDeprecation="true"
+         failOnWarning="true"
+>
     <testsuites>
         <testsuite name="laminas-permissions-acl Test Suite">
             <directory>./test</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -369,14 +369,6 @@
     </UnusedForeachValue>
   </file>
   <file src="test/Assertion/AssertionAggregateTest.php">
-    <DeprecatedMethod>
-      <code>setMethods</code>
-      <code>setMethods</code>
-      <code>setMethods</code>
-      <code>setMethods</code>
-      <code>setMethods</code>
-      <code>setMethods</code>
-    </DeprecatedMethod>
     <MissingReturnType>
       <code>testClearAssertions</code>
     </MissingReturnType>
@@ -480,6 +472,9 @@
     <MissingReturnType>
       <code>testExpressionsEvaluation</code>
     </MissingReturnType>
+    <PossiblyUnusedMethod>
+      <code>getExpressions</code>
+    </PossiblyUnusedMethod>
   </file>
   <file src="test/TestAsset/ExpressionUseCase/BlogPost.php">
     <PossiblyUnusedMethod>

diff --git a/test/Assertion/AssertionAggregateTest.php b/test/Assertion/AssertionAggregateTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
 
     public function testAddAssertion(): AssertionAggregate
     {
-        $assertion = $this->getMockForAbstractClass(AssertionInterface::class);
+        $assertion = $this->createMock(AssertionInterface::class);
         $this->assertionAggregate->addAssertion($assertion);
 
         $this->assertEquals([$assertion], $this->assertionAggregate->peakAssertions());
@@ -46,8 +46,8 @@ public function testAddAssertion(): AssertionAggregate
 
     public function testAddAssertions(): void
     {
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
 
         $aggregate = $this->assertionAggregate->addAssertions($assertions);
 
@@ -123,18 +123,10 @@ public function testManagerAccessors(): void
 
     public function testCallingAssertWillFetchAssertionFromManager(): void
     {
-        $acl = $this->getMockBuilder(Acl::class)
-            ->getMock();
-
-        $role = $this->getMockBuilder(GenericRole::class)
-            ->setConstructorArgs(['test.role'])
-            ->getMock();
-
-        $resource = $this->getMockBuilder(GenericResource::class)
-            ->setConstructorArgs(['test.resource'])
-            ->getMock();
-
-        $assertion = $this->getMockForAbstractClass(AssertionInterface::class);
+        $acl       = $this->createMock(Acl::class);
+        $role      = $this->createMock(GenericRole::class);
+        $resource  = $this->createMock(GenericResource::class);
+        $assertion = $this->createMock(AssertionInterface::class);
         $assertion->expects($this->once())
             ->method('assert')
             ->will($this->returnValue(true));
@@ -185,20 +177,12 @@ public function testAssertThrowsAnExceptionWhenReferingToNonExistentAssertion():
 
     public function testAssertWithModeAll(): void
     {
-        $acl = $this->getMockBuilder(Acl::class)
-            ->getMock();
-
-        $role = $this->getMockBuilder(GenericRole::class)
-            ->setConstructorArgs(['test.role'])
-            ->getMock();
-
-        $resource = $this->getMockBuilder(GenericResource::class)
-            ->setConstructorArgs(['test.resource'])
-            ->getMock();
-
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
+        $acl          = $this->createMock(Acl::class);
+        $role         = $this->createMock(GenericRole::class);
+        $resource     = $this->createMock(GenericResource::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
 
         $assertions[0]->expects($this->once())
             ->method('assert')
@@ -222,20 +206,12 @@ public function testAssertWithModeAll(): void
 
     public function testAssertWithModeAtLeastOne(): void
     {
-        $acl = $this->getMockBuilder(Acl::class)
-            ->getMock();
-
-        $role = $this->getMockBuilder(GenericRole::class)
-            ->setConstructorArgs(['test.role'])
-            ->getMock();
-
-        $resource = $this->getMockBuilder(GenericResource::class)
-            ->setConstructorArgs(['test.resource'])
-            ->getMock();
-
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
+        $acl          = $this->createMock(Acl::class);
+        $role         = $this->createMock(GenericRole::class);
+        $resource     = $this->createMock(GenericResource::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
 
         $assertions[0]->expects($this->once())
             ->method('assert')
@@ -260,22 +236,13 @@ public function testAssertWithModeAtLeastOne(): void
 
     public function testDoesNotAssertWithModeAll(): void
     {
-        $acl = $this->getMockBuilder(Acl::class)
-            ->getMock();
-
-        $role = $this->getMockBuilder(GenericRole::class)
-            ->setConstructorArgs(['test.role'])
-            ->setMethods(['assert'])
-            ->getMock();
-
-        $resource = $this->getMockBuilder(GenericResource::class)
-            ->setConstructorArgs(['test.resource'])
-            ->setMethods(['assert'])
-            ->getMock();
+        $acl      = $this->createMock(Acl::class);
+        $role     = $this->createMock(GenericRole::class);
+        $resource = $this->createMock(GenericResource::class);
 
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
 
         $assertions[0]->expects($this->once())
             ->method('assert')
@@ -299,22 +266,12 @@ public function testDoesNotAssertWithModeAll(): void
 
     public function testDoesNotAssertWithModeAtLeastOne(): void
     {
-        $acl = $this->getMockBuilder(Acl::class)
-            ->getMock();
-
-        $role = $this->getMockBuilder(GenericRole::class)
-            ->setConstructorArgs(['test.role'])
-            ->setMethods(['assert'])
-            ->getMock();
-
-        $resource = $this->getMockBuilder(GenericResource::class)
-            ->setConstructorArgs(['test.resource'])
-            ->setMethods(['assert'])
-            ->getMock();
-
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
-        $assertions[] = $this->getMockForAbstractClass(AssertionInterface::class);
+        $acl          = $this->createMock(Acl::class);
+        $role         = $this->createMock(GenericRole::class);
+        $resource     = $this->createMock(GenericResource::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
+        $assertions[] = $this->createMock(AssertionInterface::class);
 
         $assertions[0]->expects($this->once())
             ->method('assert')
@@ -339,18 +296,9 @@ public function testDoesNotAssertWithModeAtLeastOne(): void
 
     public function testAssertThrowsAnExceptionWhenNoAssertionIsAggregated(): void
     {
-        $acl = $this->getMockBuilder(Acl::class)
-            ->getMock();
-
-        $role = $this->getMockBuilder(GenericRole::class)
-            ->setConstructorArgs(['test.role'])
-            ->setMethods(['assert'])
-            ->getMock();
-
-        $resource = $this->getMockBuilder(GenericResource::class)
-            ->setConstructorArgs(['test.resource'])
-            ->setMethods(['assert'])
-            ->getMock();
+        $acl      = $this->createMock(Acl::class);
+        $role     = $this->createMock(GenericRole::class);
+        $resource = $this->createMock(GenericResource::class);
 
         $this->expectException(RuntimeException::class);
 

diff --git a/test/Assertion/AssertionManagerTest.php b/test/Assertion/AssertionManagerTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
 
     public function testValidatePlugin(): void
     {
-        $assertion = $this->getMockForAbstractClass(AssertionInterface::class);
+        $assertion = $this->createMock(AssertionInterface::class);
         $this->manager->validate($assertion);
 
         $this->expectException(InvalidServiceException::class);

diff --git a/test/Assertion/ExpressionAssertionTest.php b/test/Assertion/ExpressionAssertionTest.php
@@ -12,6 +12,7 @@
 use Laminas\Permissions\Acl\Role\RoleInterface;
 use LaminasTest\Permissions\Acl\TestAsset\ExpressionUseCase\BlogPost;
 use LaminasTest\Permissions\Acl\TestAsset\ExpressionUseCase\User;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use function serialize;
@@ -73,9 +74,9 @@ public function testExceptionIsRaisedInCaseOfInvalidExpressionOperator(): void
     }
 
     /**
-     * @dataProvider getExpressions
      * @param array<string, mixed> $expression
      */
+    #[DataProvider('getExpressions')]
     public function testExpressionsEvaluation(
         array $expression,
         RoleInterface $role,
@@ -99,7 +100,7 @@ public function testExpressionsEvaluation(
      *      assert: bool
      * }>
      */
-    public function getExpressions(): array
+    public static function getExpressions(): array
     {
         $author3 = new User([
             'username' => 'author3',