Added support for phpunit v11. Fixed phpunit deprecations

Signed-off-by: Eric Richer [email protected] <[email protected]>
LM-Commons · Aug 7, 2024 · 10c0eb5 · 10c0eb5
1 parent 8428160
commit 10c0eb5
Show file tree

Hide file tree

Showing 22 changed files with 59 additions and 118 deletions.
diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
   },
   "require-dev": {
     "malukenho/docheader": "^1.0.0",
-    "phpunit/phpunit": "^10.0",
+    "phpunit/phpunit": "^10.0 || ^11.0",
     "phpspec/prophecy": "^1.10",
     "phpspec/prophecy-phpunit": "^2.0",
     "friendsofphp/php-cs-fixer": "^3.43",

diff --git a/renovate.json b/renovate.json
@@ -3,11 +3,8 @@
   "extends": [
     "config:recommended"
   ],
-  "baseBranches": ["master", "2.x"],
-  "packageRules": [
-    {
-      "matchPackageNames": ["phpunit/phpunit"],
-      "allowedVersions": "<11.0"
-    }
-  ]
+  "major": {
+    "dependencyDashboardApproval": true
+  },
+  "baseBranches": ["master", "2.x"]
 }
diff --git a/...ner/AssertionPluginManagerFactoryTest.php → ...ion/AssertionPluginManagerFactoryTest.php b/...ner/AssertionPluginManagerFactoryTest.php → ...ion/AssertionPluginManagerFactoryTest.php
@@ -19,18 +19,17 @@
 
 declare(strict_types=1);
 
-namespace LmcRbacTest\Container;
+namespace LmcRbacTest\Assertion;
 
 use Laminas\ServiceManager\ServiceManager;
 use Lmc\Rbac\Assertion\AssertionContainer;
 use Lmc\Rbac\Assertion\AssertionContainerFactory;
 use Lmc\Rbac\Assertion\AssertionPluginManager;
 use Lmc\Rbac\Assertion\AssertionPluginManagerFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Assertion\AssertionPluginManagerFactory
- */
+#[CoversClass('\Lmc\Rbac\Assertion\AssertionPluginManagerFactory')]
 class AssertionPluginManagerFactoryTest extends TestCase
 {
     public function testFactory(): void

diff --git a/test/Assertion/AssertionPluginManagerTest.php b/test/Assertion/AssertionPluginManagerTest.php
@@ -27,11 +27,10 @@
 use Lmc\Rbac\Assertion\AssertionInterface;
 use Lmc\Rbac\Assertion\AssertionPluginManager;
 use LmcRbacTest\Asset\SimpleAssertion;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Assertion\AssertionPluginManager
- */
+#[CoversClass('\Lmc\Rbac\Assertion\AssertionPluginManager')]
 class AssertionPluginManagerTest extends TestCase
 {
     public function testValidationOfPluginSucceedsIfAssertionInterfaceIsImplemented()

diff --git a/test/Assertion/AssertionSetTest.php b/test/Assertion/AssertionSetTest.php
@@ -28,11 +28,11 @@
 use Lmc\Rbac\Exception\InvalidArgumentException;
 use Lmc\Rbac\Identity\IdentityInterface;
 use LmcRbacTest\Asset\SimpleAssertion;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Assertion\AssertionSet
- */
+#[CoversClass('\Lmc\Rbac\Assertion\AssertionSet')]
 class AssertionSetTest extends TestCase
 {
     public function testImplementsAssertionInterface()
@@ -222,9 +222,7 @@ public function testThrowExceptionForInvalidAssertion()
         $this->assertTrue($assertionSet->assert('permission'));
     }
 
-    /**
-     * @dataProvider dpMatrix
-     */
+    #[DataProvider('dpMatrix')]
     public function testMatrix(array $assertions, bool $expectedResult, array $assertionCalledCount)
     {
         $assertionContainer = $this->getMockBuilder(AssertionPluginManagerInterface::class)->getMock();

diff --git a/...ervice/DummyAuthorizationServiceClass.php → .../Asset/DummyAuthorizationServiceClass.php b/...ervice/DummyAuthorizationServiceClass.php → .../Asset/DummyAuthorizationServiceClass.php
@@ -16,7 +16,7 @@
  * and is licensed under the MIT license.
  */
 
-namespace LmcRbacTest\Service;
+namespace LmcRbacTest\Asset;
 
 /**
  * @author Eric Richer <[email protected]>

diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -22,11 +22,10 @@
 namespace LmcRbacTest;
 
 use Lmc\Rbac\ConfigProvider;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers  \Lmc\Rbac\ConfigProvider
- */
+#[CoversClass('Lmc\Rbac\ConfigProvider')]
 class ConfigProviderTest extends TestCase
 {
     public function testProvidesExpectedConfiguration()

diff --git a/test/ModuleTest.php b/test/ModuleTest.php
@@ -23,11 +23,10 @@
 
 use Lmc\Rbac\ConfigProvider;
 use Lmc\Rbac\Module;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers  \Lmc\Rbac\Module
- */
+#[CoversClass('\Lmc\Rbac\Module')]
 class ModuleTest extends TestCase
 {
     public function testProvidesExpectedConfiguration()

diff --git a/test/Container/ModuleOptionsFactoryTest.php → test/Options/ModuleOptionsFactoryTest.php b/test/Container/ModuleOptionsFactoryTest.php → test/Options/ModuleOptionsFactoryTest.php
@@ -19,16 +19,15 @@
 
 declare(strict_types=1);
 
-namespace LmcRbacTest\Container;
+namespace LmcRbacTest\Options;
 
 use Laminas\ServiceManager\ServiceManager;
 use Lmc\Rbac\Options\ModuleOptionsFactory;
 use Lmc\Rbac\Options\ModuleOptions;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Options\ModuleOptionsFactory
- */
+#[CoversClass('\Lmc\Rbac\Options\ModuleOptionsFactory')]
 class ModuleOptionsFactoryTest extends TestCase
 {
     public function testFactory(): void

diff --git a/test/Options/ModuleOptionsTest.php b/test/Options/ModuleOptionsTest.php
@@ -22,11 +22,10 @@
 namespace LmcRbacTest\Options;
 
 use Lmc\Rbac\Options\ModuleOptions;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Options\ModuleOptions
- */
+#[CoversClass('\Lmc\Rbac\Options\ModuleOptions')]
 class ModuleOptionsTest extends TestCase
 {
     public function testAssertModuleDefaultOptions(): void

diff --git a/test/Rbac/RbacTest.php b/test/Rbac/RbacTest.php
@@ -23,17 +23,12 @@
 
 use Lmc\Rbac\Rbac;
 use Lmc\Rbac\Role\Role;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Rbac
- * @group  Coverage
- */
+#[CoversClass('\Lmc\Rbac\Rbac')]
 class RbacTest extends TestCase
 {
-    /**
-     * @covers \Lmc\Rbac\Rbac::isGranted
-     */
     public function testCanConvertSingleRole(): void
     {
         $role = new Role('Foo');
@@ -44,18 +39,12 @@ public function testCanConvertSingleRole(): void
         $this->assertTrue($rbac->isGranted($role, 'permission'));
     }
 
-    /**
-     * @covers \Lmc\Rbac\Rbac::isGranted
-     */
     public function testCanUseEmptyArray(): void
     {
         $rbac = new Rbac();
         $this->assertFalse($rbac->isGranted([], 'permission'));
     }
 
-    /**
-     * @covers \Lmc\Rbac\Rbac::isGranted
-     */
     public function testCanCheckMultipleRolesWithMatchingPermission(): void
     {
         $role1 = new Role('Foo');
@@ -69,9 +58,6 @@ public function testCanCheckMultipleRolesWithMatchingPermission(): void
         $this->assertTrue($rbac->isGranted($roles, 'permission'));
     }
 
-    /**
-     * @covers \Lmc\Rbac\Rbac::isGranted
-     */
     public function testReturnFalseIfNoRoleHasPermission(): void
     {
         $role1 = new Role('Foo');
@@ -83,9 +69,6 @@ public function testReturnFalseIfNoRoleHasPermission(): void
         $this->assertFalse($rbac->isGranted($roles, 'permission'));
     }
 
-    /**
-     * @covers \Lmc\Rbac\Rbac::isGranted
-     */
     public function testCanCheckHierarchicalRole(): void
     {
         $childRole = new Role('Bar');
@@ -99,9 +82,6 @@ public function testCanCheckHierarchicalRole(): void
         $this->assertTrue($rbac->isGranted($parentRole, 'permission'));
     }
 
-    /**
-     * @covers \Lmc\Rbac\Rbac::isGranted
-     */
     public function testReturnFalseIfNoHierarchicalRoleHasPermission(): void
     {
         $childRole = new Role('Bar');
@@ -114,9 +94,6 @@ public function testReturnFalseIfNoHierarchicalRoleHasPermission(): void
         $this->assertFalse($rbac->isGranted($parentRole, 'permission'));
     }
 
-    /**
-     * @covers \Lmc\Rbac\Rbac::isGranted
-     */
     public function testCanCheckTraversableAsRolesList(): void
     {
         $role1 = new Role('Foo');

diff --git a/...ainer/InMemoryRoleProviderFactoryTest.php → .../Role/InMemoryRoleProviderFactoryTest.php b/...ainer/InMemoryRoleProviderFactoryTest.php → .../Role/InMemoryRoleProviderFactoryTest.php
@@ -19,17 +19,16 @@
 
 declare(strict_types=1);
 
-namespace LmcRbacTest\Container;
+namespace LmcRbacTest\Role;
 
 use Laminas\ServiceManager\ServiceManager;
 use Lmc\Rbac\Role\InMemoryRoleProviderFactory;
 use Lmc\Rbac\Options\ModuleOptions;
 use Lmc\Rbac\Role\InMemoryRoleProvider;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Role\InMemoryRoleProviderFactory
- */
+#[CoversClass('\Lmc\Rbac\Role\InMemoryRoleProviderFactory')]
 class InMemoryRoleProviderFactoryTest extends TestCase
 {
     public function testFactoryUsingObjectRepository(): void

diff --git a/test/Role/InMemoryRoleProviderTest.php b/test/Role/InMemoryRoleProviderTest.php
@@ -23,11 +23,10 @@
 
 use Lmc\Rbac\Role\InMemoryRoleProvider;
 use Lmc\Rbac\Role\RoleInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Role\InMemoryRoleProvider
- */
+#[CoversClass('\Lmc\Rbac\Role\InMemoryRoleProvider')]
 class InMemoryRoleProviderTest extends TestCase
 {
     public function testInMemoryProvider(): void

diff --git a/...jectRepositoryRoleProviderFactoryTest.php → ...jectRepositoryRoleProviderFactoryTest.php b/...jectRepositoryRoleProviderFactoryTest.php → ...jectRepositoryRoleProviderFactoryTest.php
@@ -19,7 +19,7 @@
 
 declare(strict_types=1);
 
-namespace LmcRbacTest\Container;
+namespace LmcRbacTest\Role;
 
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\Persistence\ObjectRepository;
@@ -28,11 +28,10 @@
 use Lmc\Rbac\Exception\RuntimeException;
 use Lmc\Rbac\Options\ModuleOptions;
 use Lmc\Rbac\Role\ObjectRepositoryRoleProvider;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Role\ObjectRepositoryRoleProviderFactory
- */
+#[CoversClass('\Lmc\Rbac\Role\ObjectRepositoryRoleProviderFactory')]
 class ObjectRepositoryRoleProviderFactoryTest extends TestCase
 {
     public function testFactoryUsingObjectRepository(): void
@@ -68,7 +67,7 @@ public function testFactoryUsingObjectManager(): void
         $objectManager->expects($this->once())
             ->method('getRepository')
             ->with('Role')
-            ->will($this->returnValue($this->getMockBuilder(ObjectRepository::class)->getMock()));
+            ->willReturn($this->getMockBuilder(ObjectRepository::class)->getMock());
 
         $container->setService('ObjectManager', $objectManager);
 

diff --git a/test/Role/ObjectRepositoryRoleProviderTest.php b/test/Role/ObjectRepositoryRoleProviderTest.php
@@ -30,11 +30,11 @@
 use Lmc\Rbac\Role\ObjectRepositoryRoleProvider;
 use Lmc\Rbac\Role\Role;
 use Lmc\Rbac\Role\RoleInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Lmc\Rbac\Role\ObjectRepositoryRoleProvider
- */
+#[CoversClass('\Lmc\Rbac\Role\ObjectRepositoryRoleProvider')]
 class ObjectRepositoryRoleProviderTest extends TestCase
 {
 
@@ -113,9 +113,7 @@ public function testThrowExceptionIfAskedRoleIsNotFound(): void
         $provider->getRoles(['guest', 'admin', 'member']);
     }
 
-    /**
-     * @dataProvider roleProvider
-     */
+    #[DataProvider('roleProvider')]
     public function testObjectRepositoryProviderForFlatRole(array $rolesConfig, array $rolesToCheck)
     {
         $objectManager = $this->getObjectManager();