fix config and methods signatures

config/services.yaml

@@ -48,11 +48,11 @@ services:
     # To use the test fixtures
     App\Tests\Fixture\:
         resource: '%kernel.project_dir%/tests/Fixture/*'
-        
+
     #########################################
     ##  TAG Services ##
     _instanceof:
-        App\Doctrine\Access\AccessExtensionInterface:
+        App\Doctrine\Access\AdditionalExtension\AdditionalAccessExtensionInterface:
             tags: ['app.extensions.access']
         App\Service\Access\OptionalsRolesInterface:
             tags: ['app.optionalsroles']

src/Doctrine/AbstractExtension.php

@@ -28,7 +28,7 @@ abstract class AbstractExtension implements QueryCollectionExtensionInterface, Q
      */
     public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, Operation $operation = null, array $context = []): void
     {
-        $this->apply($queryBuilder, $resourceClass);
+        $this->apply($queryBuilder, $resourceClass, $operation);
     }
 
     /**
@@ -45,7 +45,7 @@ abstract class AbstractExtension implements QueryCollectionExtensionInterface, Q
      */
     public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, Operation $operation = null, array $context = []): void
     {
-        $this->apply($queryBuilder, $resourceClass);
+        $this->apply($queryBuilder, $resourceClass, $operation);
     }
 
     /**

src/Doctrine/Access/AdditionalExtensions/AdditionalAccessExtensionInterface.php → src/Doctrine/Access/AdditionalExtension/AdditionalAccessExtensionInterface.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Doctrine\Access\AdditionalExtensions;
+namespace App\Doctrine\Access\AdditionalExtension;
 
 use Doctrine\ORM\QueryBuilder;
 

src/Doctrine/Access/AdditionalExtensions/DateTimeConstraintExtensionAdditional.php → src/Doctrine/Access/AdditionalExtension/DateTimeConstraintExtensionAdditional.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Doctrine\Access\AdditionalExtensions;
+namespace App\Doctrine\Access\AdditionalExtension;
 
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\RequestStack;

src/Doctrine/Access/AdditionalExtensions/StudentsExtensionAdditional.php → src/Doctrine/Access/AdditionalExtension/StudentsExtensionAdditional.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Doctrine\Access\AdditionalExtensions;
+namespace App\Doctrine\Access\AdditionalExtension;
 
 use Doctrine\ORM\QueryBuilder;
 

src/Doctrine/Access/CurrentUserPersonalizedListExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Access;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\PersonalizedList;
 use Doctrine\ORM\QueryBuilder;
@@ -17,11 +18,11 @@ final class CurrentUserPersonalizedListExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === PersonalizedList::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         $currentUser = $this->security->getUser();
         $rootAlias = $queryBuilder->getRootAliases()[0];

src/Doctrine/Billing/CurrentResidenceAreaExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Billing;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Billing\ResidenceArea;
 use Doctrine\ORM\QueryBuilder;
@@ -17,11 +18,11 @@ final class CurrentResidenceAreaExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === ResidenceArea::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Booking/CurrentCoursesExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Booking;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Booking\Course;
 use Doctrine\ORM\QueryBuilder;
@@ -17,14 +18,14 @@ final class CurrentCoursesExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === Course::class;
     }
 
     /**
      * @todo : A la suite de la migration, il faut supprimer le where avec le discr.
      */
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Core/AllowedAddressPostalExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Core;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Core\AddressPostal;
 use Doctrine\ORM\QueryBuilder;
@@ -17,11 +18,11 @@ final class AllowedAddressPostalExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === AddressPostal::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Core/CurrentUserNotificationExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Core;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Core\Notification;
@@ -18,14 +19,14 @@ final class CurrentUserNotificationExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === Notification::class;
     }
 
     /**
      * @todo : A la suite de la migration, il faut supprimer le where avec le discr.
      */
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Core/CurrentUserNotificationUserExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Core;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Core\NotificationUser;
 use Doctrine\ORM\QueryBuilder;
@@ -18,14 +19,14 @@ final class CurrentUserNotificationUserExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === NotificationUser::class;
     }
 
     /**
      * @todo : A la suite de la migration, il faut supprimer le where avec le discr.
      */
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Education/CurrentCycleExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Education;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Education\Cycle;
@@ -18,10 +19,10 @@ final class CurrentCycleExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === Cycle::class;
     }
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Education/CurrentEducationNotationConfigExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Education;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Education\EducationNotationConfig;
@@ -18,11 +19,11 @@ final class CurrentEducationNotationConfigExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === EducationNotationConfig::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Education/CurrentEducationTimingExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Education;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Education\EducationTiming;
@@ -18,11 +19,11 @@ final class CurrentEducationTimingExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === EducationTiming::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Network/CurrentNetworkOrganizationExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Network;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Network\NetworkOrganization;
@@ -18,11 +19,11 @@ final class CurrentNetworkOrganizationExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === NetworkOrganization::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Organization/CurrentOrganizationAddressPostalExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Organization;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Organization\OrganizationAddressPostal;
@@ -18,11 +19,11 @@ final class CurrentOrganizationAddressPostalExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === OrganizationAddressPostal::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Organization/CurrentOrganizationArticleExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Organization;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Organization\OrganizationArticle;
@@ -18,11 +19,11 @@ final class CurrentOrganizationArticleExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === OrganizationArticle::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Doctrine/Organization/CurrentOrganizationExtension.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace App\Doctrine\Organization;
 
+use ApiPlatform\Metadata\Operation;
 use App\Doctrine\AbstractExtension;
 use App\Entity\Access\Access;
 use App\Entity\Organization\Organization;
@@ -18,11 +19,11 @@ final class CurrentOrganizationExtension extends AbstractExtension
     public function __construct(private Security $security)
     { }
 
-    public function supports(string $resourceClass, ?string $operation): bool {
+    public function supports(string $resourceClass, ?Operation $operation): bool {
         return $resourceClass === Organization::class;
     }
 
-    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass): void
+    protected function addWhere(QueryBuilder $queryBuilder, string $resourceClass, ?Operation $operation): void
     {
         /** @var Access $currentUser */
         $currentUser = $this->security->getUser();

src/Service/ServiceIterator/CurrentAccessExtensionIterator.php

@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Service\ServiceIterator;
 
-use App\Doctrine\Access\AdditionalExtensions\AdditionalAccessExtensionInterface;
+use App\Doctrine\Access\AdditionalExtension\AdditionalAccessExtensionInterface;
 use Doctrine\ORM\QueryBuilder;
 
 class CurrentAccessExtensionIterator {

tests/Unit/Service/ServiceIterator/CurrentAccessExtensionIteratorTest.php

@@ -2,7 +2,7 @@
 
 namespace App\Tests\Unit\Service\ServiceIterator;
 
-use App\Doctrine\Access\AdditionalExtensions\AdditionalAccessExtensionInterface;
+use App\Doctrine\Access\AdditionalExtension\AdditionalAccessExtensionInterface;
 use App\Service\ServiceIterator\CurrentAccessExtensionIterator;
 use Doctrine\ORM\QueryBuilder;
 use PHPUnit\Framework\TestCase;