[FEATURE] Added attribute support

composer.json

@@ -23,7 +23,7 @@
     }
   ],
   "require": {
-    "php": "^7.2.5|^8.0",
+    "php": "^7.2.5|^8",
     "illuminate/auth": "^6.0|^7.0|^8.0|^9.0",
     "illuminate/config": "^6.0|^7.0|^8.0|^9.0",
     "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",

src/Mappings/BelongsToOrganisation.php

@@ -2,13 +2,15 @@
 
 namespace LaravelDoctrine\ACL\Mappings;
 
+use Attribute;
 use Doctrine\Common\Annotations\Annotation;
 use Illuminate\Contracts\Config\Repository;
 
 /**
  * @Annotation
  * @Target("PROPERTY")
  */
+#[Attribute(Attribute::TARGET_PROPERTY)]
 final class BelongsToOrganisation extends RelationAnnotation
 {
     /**

src/Mappings/BelongsToOrganisations.php

@@ -2,13 +2,15 @@
 
 namespace LaravelDoctrine\ACL\Mappings;
 
+use Attribute;
 use Doctrine\Common\Annotations\Annotation;
 use Illuminate\Contracts\Config\Repository;
 
 /**
  * @Annotation
  * @Target("PROPERTY")
  */
+#[Attribute(Attribute::TARGET_PROPERTY)]
 final class BelongsToOrganisations extends RelationAnnotation
 {
     /**

src/Mappings/HasPermissions.php

@@ -2,13 +2,15 @@
 
 namespace LaravelDoctrine\ACL\Mappings;
 
+use Attribute;
 use Doctrine\Common\Annotations\Annotation;
 use Illuminate\Contracts\Config\Repository;
 
 /**
  * @Annotation
  * @Target("PROPERTY")
  */
+#[Attribute(Attribute::TARGET_PROPERTY)]
 final class HasPermissions extends RelationAnnotation
 {
     /**

src/Mappings/HasRoles.php

@@ -2,13 +2,15 @@
 
 namespace LaravelDoctrine\ACL\Mappings;
 
+use Attribute;
 use Doctrine\Common\Annotations\Annotation;
 use Illuminate\Contracts\Config\Repository;
 
 /**
  * @Annotation
  * @Target("PROPERTY")
  */
+#[Attribute(Attribute::TARGET_PROPERTY)]
 final class HasRoles extends RelationAnnotation
 {
     /**

src/Mappings/Readers/AttributeAnnotationReader.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace LaravelDoctrine\ACL\Mappings\Readers;
+
+use Doctrine\Common\Annotations\Reader;
+use ReflectionClass;
+use ReflectionMethod;
+
+final class AttributeAnnotationReader implements Reader
+{
+    /**
+     * @var Reader
+     */
+    private $annotationReader;
+
+    /**
+     * @var AttributeReader
+     */
+    private $attributeReader;
+
+    public function __construct(AttributeReader $attributeReader, Reader $annotationReader)
+    {
+        $this->attributeReader = $attributeReader;
+        $this->annotationReader = $annotationReader;
+    }
+
+    /**
+     * @return Annotation[]
+     */
+    public function getClassAnnotations(ReflectionClass $class): array
+    {
+        $annotations = $this->attributeReader->getClassAnnotations($class);
+
+        if ([] !== $annotations) {
+            return $annotations;
+        }
+
+        return $this->annotationReader->getClassAnnotations($class);
+    }
+
+    /**
+     * @param class-string<T> $annotationName the name of the annotation
+     *
+     * @return T|null the Annotation or NULL, if the requested annotation does not exist
+     *
+     * @template T
+     */
+    public function getClassAnnotation(ReflectionClass $class, $annotationName)
+    {
+        $annotation = $this->attributeReader->getClassAnnotation($class, $annotationName);
+
+        if (null !== $annotation) {
+            return $annotation;
+        }
+
+        return $this->annotationReader->getClassAnnotation($class, $annotationName);
+    }
+
+    /**
+     * @return Annotation[]
+     */
+    public function getPropertyAnnotations(\ReflectionProperty $property): array
+    {
+        $propertyAnnotations = $this->attributeReader->getPropertyAnnotations($property);
+
+        if ([] !== $propertyAnnotations) {
+            return $propertyAnnotations;
+        }
+
+        return $this->annotationReader->getPropertyAnnotations($property);
+    }
+
+    /**
+     * @param class-string<T> $annotationName the name of the annotation
+     *
+     * @return T|null the Annotation or NULL, if the requested annotation does not exist
+     *
+     * @template T
+     */
+    public function getPropertyAnnotation(\ReflectionProperty $property, $annotationName)
+    {
+        $annotation = $this->attributeReader->getPropertyAnnotation($property, $annotationName);
+
+        if (null !== $annotation) {
+            return $annotation;
+        }
+
+        return $this->annotationReader->getPropertyAnnotation($property, $annotationName);
+    }
+
+    public function getMethodAnnotations(ReflectionMethod $method): array
+    {
+        throw new \BadMethodCallException('Not implemented');
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMethodAnnotation(ReflectionMethod $method, $annotationName)
+    {
+        throw new \BadMethodCallException('Not implemented');
+    }
+}

src/Mappings/Readers/AttributeReader.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace LaravelDoctrine\ACL\Mappings\Readers;
+
+use Attribute;
+use Gedmo\Mapping\Annotation\Annotation;
+use ReflectionClass;
+
+final class AttributeReader
+{
+    /** @var array<string,bool> */
+    private $isRepeatableAttribute = [];
+
+    /**
+     * @return array<Annotation|Annotation[]>
+     */
+    public function getClassAnnotations(ReflectionClass $class): array
+    {
+        return $this->convertToAttributeInstances($class->getAttributes());
+    }
+
+    /**
+     * @phpstan-param class-string $annotationName
+     *
+     * @return Annotation|Annotation[]|null
+     */
+    public function getClassAnnotation(ReflectionClass $class, string $annotationName)
+    {
+        return $this->getClassAnnotations($class)[$annotationName] ?? null;
+    }
+
+    /**
+     * @return array<Annotation|Annotation[]>
+     */
+    public function getPropertyAnnotations(\ReflectionProperty $property): array
+    {
+        return $this->convertToAttributeInstances($property->getAttributes());
+    }
+
+    /**
+     * @phpstan-param class-string $annotationName
+     *
+     * @return Annotation|Annotation[]|null
+     */
+    public function getPropertyAnnotation(\ReflectionProperty $property, string $annotationName)
+    {
+        return $this->getPropertyAnnotations($property)[$annotationName] ?? null;
+    }
+
+    /**
+     * @param array<\ReflectionAttribute> $attributes
+     *
+     * @return array<string, Annotation|Annotation[]>
+     */
+    private function convertToAttributeInstances(array $attributes): array
+    {
+        $instances = [];
+
+        foreach ($attributes as $attribute) {
+            $attributeName = $attribute->getName();
+            assert(is_string($attributeName));
+            // Make sure we only get Gedmo Annotations
+            if (!is_subclass_of($attributeName, Annotation::class)) {
+                continue;
+            }
+
+            $instance = $attribute->newInstance();
+            assert($instance instanceof Annotation);
+
+            if ($this->isRepeatable($attributeName)) {
+                if (!isset($instances[$attributeName])) {
+                    $instances[$attributeName] = [];
+                }
+
+                $instances[$attributeName][] = $instance;
+            } else {
+                $instances[$attributeName] = $instance;
+            }
+        }
+
+        return $instances;
+    }
+
+    private function isRepeatable(string $attributeClassName): bool
+    {
+        if (isset($this->isRepeatableAttribute[$attributeClassName])) {
+            return $this->isRepeatableAttribute[$attributeClassName];
+        }
+
+        $reflectionClass = new ReflectionClass($attributeClassName);
+        $attribute = $reflectionClass->getAttributes()[0]->newInstance();
+
+        return $this->isRepeatableAttribute[$attributeClassName] = ($attribute->flags & Attribute::IS_REPEATABLE) > 0;
+    }
+}

src/Mappings/RelationAnnotation.php

@@ -2,9 +2,7 @@
 
 namespace LaravelDoctrine\ACL\Mappings;
 
-use Doctrine\Common\Annotations\Annotation;
-
-abstract class RelationAnnotation extends Annotation implements ConfigAnnotation
+abstract class RelationAnnotation implements ConfigAnnotation
 {
     /**
      * @var string

src/Mappings/Subscribers/MappedEventSubscriber.php

@@ -2,13 +2,16 @@
 
 namespace LaravelDoctrine\ACL\Mappings\Subscribers;
 
+use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ACL\Mappings\ConfigAnnotation;
+use LaravelDoctrine\ACL\Mappings\Readers\AttributeAnnotationReader;
+use LaravelDoctrine\ACL\Mappings\Readers\AttributeReader;
 use ReflectionClass;
 use ReflectionProperty;
 
@@ -52,7 +55,10 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
         $metadata = $eventArgs->getClassMetadata();
 
         if (! $this->reader) {
-            return;
+            $this->reader = new AttributeAnnotationReader(
+                new AttributeReader(),
+                new AnnotationReader()
+            );
         }
 
         if ($this->isInstantiable($metadata) && $this->shouldBeMapped($metadata)) {