refactor: improve mappings classes readability

Author: R3VoLuT1OneR

src/Mappings/BelongsToOrganisation.php

@@ -5,7 +5,7 @@
 namespace LaravelDoctrine\ACL\Mappings;
 
 use Attribute;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
 final class BelongsToOrganisation extends RelationAttribute
@@ -25,7 +25,7 @@ public function __construct(
         $this->indexBy       = $indexBy;
     }
 
-    public function getTargetEntity(Repository $config): string|null
+    public function getTargetEntity(Config $config): string|null
     {
         return $this->targetEntity ?: $config->get('acl.organisations.entity', 'Organisation');
     }

src/Mappings/BelongsToOrganisations.php

@@ -5,7 +5,7 @@
 namespace LaravelDoctrine\ACL\Mappings;
 
 use Attribute;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
 final class BelongsToOrganisations extends RelationAttribute
@@ -27,7 +27,7 @@ public function __construct(
         $this->indexBy       = $indexBy;
     }
 
-    public function getTargetEntity(Repository $config): string|null
+    public function getTargetEntity(Config $config): string|null
     {
         return $this->targetEntity ?: $config->get('acl.organisations.entity', 'Organisation');
     }

src/Mappings/Builders/JsonArrayBuilder.php

@@ -8,13 +8,13 @@
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
 use Doctrine\ORM\Mapping\Builder\FieldBuilder;
 use Doctrine\Persistence\Mapping\ClassMetadata;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 use LaravelDoctrine\ACL\Mappings\MappingAttribute;
 use ReflectionProperty;
 
 class JsonArrayBuilder implements Builder
 {
-    public function __construct(protected Repository $config)
+    public function __construct(protected Config $config)
     {
     }
 

src/Mappings/Builders/ManyToManyBuilder.php

@@ -8,13 +8,13 @@
 use Doctrine\ORM\Mapping\Builder\ManyToManyAssociationBuilder;
 use Doctrine\ORM\Mapping\ClassMetadata as OrmClassMetadata;
 use Doctrine\Persistence\Mapping\ClassMetadata;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 use LaravelDoctrine\ACL\Mappings\MappingAttribute;
 use ReflectionProperty;
 
 class ManyToManyBuilder implements Builder
 {
-    public function __construct(protected Repository $config)
+    public function __construct(protected Config $config)
     {
     }
 

src/Mappings/Builders/ManyToOneBuilder.php

@@ -8,13 +8,13 @@
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
 use Doctrine\ORM\Mapping\ClassMetadata as OrmClassMetadata;
 use Doctrine\Persistence\Mapping\ClassMetadata;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 use LaravelDoctrine\ACL\Mappings\MappingAttribute;
 use ReflectionProperty;
 
 class ManyToOneBuilder implements Builder
 {
-    public function __construct(protected Repository $config)
+    public function __construct(protected Config $config)
     {
     }
 

src/Mappings/HasPermissions.php

@@ -5,7 +5,7 @@
 namespace LaravelDoctrine\ACL\Mappings;
 
 use Attribute;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
 final class HasPermissions extends RelationAttribute
@@ -27,7 +27,7 @@ public function __construct(
         $this->indexBy       = $indexBy;
     }
 
-    public function getTargetEntity(Repository $config): string|null
+    public function getTargetEntity(Config $config): string|null
     {
         // Config driver has no target entity
         if ($config->get('acl.permissions.driver', 'config') === 'config') {

src/Mappings/HasRoles.php

@@ -5,7 +5,7 @@
 namespace LaravelDoctrine\ACL\Mappings;
 
 use Attribute;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
 final class HasRoles extends RelationAttribute
@@ -27,7 +27,7 @@ public function __construct(
         $this->indexBy       = $indexBy;
     }
 
-    public function getTargetEntity(Repository $config): string|null
+    public function getTargetEntity(Config $config): string|null
     {
         return $this->targetEntity ?: $config->get('acl.roles.entity', 'Role');
     }

src/Mappings/MappingAttribute.php

@@ -5,9 +5,9 @@
 namespace LaravelDoctrine\ACL\Mappings;
 
 use Doctrine\ORM\Mapping\MappingAttribute as DoctrineMappingAttribute;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 
 interface MappingAttribute extends DoctrineMappingAttribute
 {
-    public function getTargetEntity(Repository $config): string|null;
+    public function getTargetEntity(Config $config): string|null;
 }

src/Mappings/RegisterMappedEventSubscribers.php

@@ -7,17 +7,19 @@
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Configuration;
+use Illuminate\Contracts\Config\Repository as Config;
 use LaravelDoctrine\ACL\Mappings\Subscribers\BelongsToOrganisationsSubscriber;
 use LaravelDoctrine\ACL\Mappings\Subscribers\BelongsToOrganisationSubscriber;
 use LaravelDoctrine\ACL\Mappings\Subscribers\HasPermissionsSubscriber;
 use LaravelDoctrine\ACL\Mappings\Subscribers\HasRolesSubscriber;
+use LaravelDoctrine\ACL\Mappings\Subscribers\MappedEventSubscriber;
 use LaravelDoctrine\ORM\DoctrineExtender;
 
 use function app;
 
 class RegisterMappedEventSubscribers implements DoctrineExtender
 {
-    /** @var class-string[] $subscribers */
+    /** @var array<class-string<MappedEventSubscriber>> $subscribers */
     protected array $subscribers = [
         BelongsToOrganisationsSubscriber::class,
         BelongsToOrganisationSubscriber::class,
@@ -27,10 +29,9 @@ class RegisterMappedEventSubscribers implements DoctrineExtender
 
     public function extend(Configuration $configuration, Connection $connection, EventManager $eventManager): void
     {
+        $config = app(Config::class);
         foreach ($this->subscribers as $subscriber) {
-            $eventManager->addEventSubscriber(
-                new $subscriber(app('config')),
-            );
+            $eventManager->addEventSubscriber(new $subscriber($config));
         }
     }
 }

src/Mappings/RelationAttribute.php

@@ -8,13 +8,9 @@ abstract class RelationAttribute implements MappingAttribute
 {
     public string|null $targetEntity;
     public string|null $mappedBy;
-
     /** @var string[] */
     public array|null $cascade;
-
-    public string $fetch = 'LAZY';
-
+    public string $fetch       = 'LAZY';
     public bool $orphanRemoval = false;
-
     public string|null $indexBy;
 }

src/Mappings/Subscribers/MappedEventSubscriber.php

@@ -8,7 +8,7 @@
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 use Doctrine\ORM\Events;
 use Doctrine\Persistence\Mapping\ClassMetadata;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Config\Repository as Config;
 use LaravelDoctrine\ACL\Mappings\Builders\Builder;
 use LaravelDoctrine\ACL\Mappings\MappingAttribute;
 use ReflectionClass;
@@ -22,7 +22,7 @@ abstract protected function shouldBeMapped(ClassMetadata $metadata): bool;
 
     abstract protected function getBuilder(MappingAttribute $attribute): Builder;
 
-    public function __construct(protected Repository $config)
+    public function __construct(protected Config $config)
     {
     }