finalize refactoring

src/Doctrine/Access/CurrentAccessExtension.php

@@ -18,7 +18,7 @@ final class CurrentAccessExtension implements QueryCollectionExtensionInterface,
 {
     public function __construct(
         private Security $security,
-        private HandleCurrentAccessExtension $handleCurrentAccessExtension
+        private CurrentAccessExtensionIterator $currentAccessExtensionIterator
     )
     { }
 
@@ -45,6 +45,6 @@ final class CurrentAccessExtension implements QueryCollectionExtensionInterface,
             ->setParameter('current_organization', $currentUser->getOrganization())
         ;
 
-        $this->handleCurrentAccessExtension->addWhere($queryBuilder, $operationName);
+        $this->currentAccessExtensionIterator->addWhere($queryBuilder, $operationName);
     }
-}
+}

src/Service/Access/Utils.php

@@ -15,7 +15,7 @@ class Utils
 {
     public function __construct(
         private RoleHierarchyInterface $roleHierarchy,
-        private HandleOptionalsRoles $handleOptionalsRoles
+        private OptionalsRolesIterator $optionalsRolesIterator
     )
     {}
 
@@ -51,7 +51,7 @@ class Utils
      * @see UtilsTest::testGetAllRoles()
      */
     public function getAllRoles(Access $access): array {
-        $roles = $this->handleOptionalsRoles->getOptionalsRoles($access);
+        $roles = $this->optionalsRolesIterator->getOptionalsRoles($access);
         return $this->roleHierarchy->getReachableRoleNames(array_merge($access->getRoles(), $roles));
     }
-}
+}

tests/Service/Access/AccessProfileCreatorTest.php

@@ -10,7 +10,7 @@ use App\Entity\Organization\Organization;
 use App\Entity\Person\Person;
 use App\Repository\Access\AccessRepository;
 use App\Service\Access\AccessProfileCreator;
-use App\Service\Access\HandleOptionalsRoles;
+use App\Service\Access\OptionalsRolesIterator;
 use App\Service\Access\Utils;
 use App\Service\Organization\OrganizationProfileCreator;
 use PHPUnit\Framework\TestCase;
@@ -139,4 +139,4 @@ class AccessProfileCreatorTest extends TestCase
         $accessProfile = $this->accessProfileCreator->createCompleteAccessProfile($this->access);
         $this->assertFalse($accessProfile->getIsPayor());
     }
-}
+}

tests/Service/Access/UtilsTest.php

@@ -3,7 +3,7 @@
 namespace App\Test\Service\Access;
 
 use App\Entity\Access\Access;
-use App\Service\Access\HandleOptionalsRoles;
+use App\Service\Access\OptionalsRolesIterator;
 use App\Service\Access\Utils;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Role\RoleHierarchy;
@@ -19,12 +19,12 @@ class UtilsTest extends TestCase
             ->method('getReachableRoleNames')
             ->willReturn(["ROLE_A", "ROLE_B"]);
 
-        $handleOptionalsRolesMock = $this->getMockBuilder(HandleOptionalsRoles::class)->disableOriginalConstructor()->getMock();
-        $handleOptionalsRolesMock
+        $optionalsRolesIteratorMock = $this->getMockBuilder(OptionalsRolesIterator::class)->disableOriginalConstructor()->getMock();
+        $optionalsRolesIteratorMock
             ->method('getOptionalsRoles')
             ->willReturn(["ROLE_OPT"]);
 
-        $this->utils = new Utils($roleHierarchyMock, $handleOptionalsRolesMock);
+        $this->utils = new Utils($roleHierarchyMock, $optionalsRolesIteratorMock);
     }
 
     /**
@@ -86,4 +86,4 @@ class UtilsTest extends TestCase
 
         $this->assertEquals(['ROLE_A', 'ROLE_B'], $this->utils->getAllRoles($accessMock1));
     }
-}
+}