Compatibility Symfony 5/6/7

Annotations/Delete.php

@@ -26,6 +26,6 @@
  *
  * @Annotation
  */
-class Delete implements DataSource{
+#[\Attribute] class Delete implements DataSource{
     use Route;
-}
+}

Annotations/Fetch.php

@@ -26,6 +26,6 @@
  *
  * @Annotation
  */
-class Fetch implements DataSource {
+#[\Attribute] class Fetch implements DataSource {
     use Route;
-}
+}

Annotations/Insert.php

@@ -29,6 +29,6 @@
  *
  * @Annotation
  */
-class Insert implements DataSource {
+#[\Attribute] class Insert implements DataSource {
     use Route;
-}
+}

Annotations/Reader.php

@@ -19,6 +19,11 @@
 namespace Circle\DoctrineRestDriver\Annotations;
 
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\ORM\Mapping\Driver\AttributeReader;
+use Doctrine\ORM\Mapping\Driver\RepeatableAttributeCollection;
+use Doctrine\ORM\Mapping\MappingAttribute;
+use ReflectionAttribute;
+use ReflectionClass;
 
 /**
  * Reads annotations
@@ -32,12 +37,15 @@ class Reader {
      * @var AnnotationReader
      */
     private $annotationReader;
+    private $attributeReader ;
+
 
     /**
      * Reader constructor.
      */
     public function __construct() {
-        $this->annotationReader = new AnnotationReader();
+//        $this->annotationReader = new AnnotationReader();
+        $this->attributeReader = new AttributeReader() ;
     }
 
     /**
@@ -48,8 +56,74 @@ public function __construct() {
      * @return null|string
      */
     public function read(\ReflectionClass $class, $namespace) {
-        $annotation = $this->annotationReader->getClassAnnotation($class, $namespace);
 
-        return $annotation instanceof $namespace ? $annotation : null;
+        $attributes = $this->getClassAttributes($class);
+
+        foreach ($attributes as $attribute)
+        {
+            if ($attribute instanceof $namespace)
+                return $attribute ;
+        }
+
+        // get inherited annotations
+        $parent = $class->getParentClass();
+        if ($parent !== false) {
+            return $this->read($parent, $namespace);
+        }
+
+
+        return null ; // @codeCoverageIgnore
+
+//        $annotation = $this->annotationReader->getClassAnnotation($class, $namespace);
+//        return $attributes instanceof $namespace ? $attributes : null;
+//        return $annotation instanceof $namespace ? $annotation : null;
+    }
+
+    public function readAll(\ReflectionClass $class, $namespace) {
+
+        $attributes = $this->getClassAttributes($class);
+
+        $return = [] ;
+
+        foreach ($attributes as $attribute)
+        {
+            if ($attribute instanceof $namespace) {
+                if (!str_starts_with($attribute::class,__NAMESPACE__))
+                    $return[$attribute::class] = $attribute;
+            }
+        }
+
+        return $return ;
+
+    }
+
+    /**
+     * @psalm-return class-string-map<T, T|RepeatableAttributeCollection<T>>
+     *
+     * @template T of MappingAttribute
+     */
+    public function getClassAttributes(ReflectionClass $class): array
+    {
+        return $this->convertToAttributeInstances($class->getAttributes());
+    }
+
+    /**
+     * @param array<ReflectionAttribute> $attributes
+     *
+     * @return class-string-map<T, T|RepeatableAttributeCollection<T>>
+     *
+     * @template T of MappingAttribute
+     */
+    private function convertToAttributeInstances(array $attributes): array
+    {
+        $instances = [];
+
+        foreach ($attributes as $attribute) {
+            $attributeName = $attribute->getName();
+            $instance = $attribute->newInstance();
+            $instances[$attributeName] = $instance;
+        }
+
+        return $instances;
     }
-}
+}

Annotations/Route.php

@@ -60,13 +60,35 @@ trait Route {
      *
      * @SuppressWarnings("PHPMD.StaticAccess")
      */
-    public function __construct(array $values) {
-        $settings = new ArrayCollection($values);
+    public function __construct($arrayOrUri,$statusCodes = null,$method = null,$options = [] ) {
+        $values = $arrayOrUri;
 
-        $this->route      = Url::assert($settings->get('value'), 'value');
-        $this->statusCodes = MaybeList::assert($settings->get('statusCodes'), 'statusCodes');
-        $this->method     = MaybeString::assert($settings->get('method'), 'method');
-        $this->options    = MaybeList::assert($settings->get('options'), 'options');
+        if (is_array($values)) {
+            $settings = new ArrayCollection($values);
+//            $this->route = Url::assert($settings->get('value'), 'value');
+            if (substr($values,0,1) === "/")
+                $this->route = substr($settings->get('value'),1);
+            else
+                $this->route = Url::assert($settings->get('value'), 'value');
+            // permet absolute "/"
+            $this->statusCodes = MaybeList::assert($settings->get('statusCodes'), 'statusCodes');
+            $this->method = MaybeString::assert($settings->get('method'), 'method');
+            $this->options = MaybeList::assert($settings->get('options'), 'options');
+            if ($this->options === null)
+                $this->options = [] ;
+
+        }
+        elseif (is_string($values)) {  // @codeCoverageIgnoreStart
+            if (substr($values,0,1) === "/")
+                $this->route = substr($values,1);
+            else
+                $this->route = Url::assert($values, 'value');
+            // permet absolute "/"
+            $this->statusCodes = $statusCodes;
+            $this->method = $method;
+            $this->options = $options;
+            // @codeCoverageIgnoreEnd
+        }
     }
 
     /**
@@ -104,4 +126,4 @@ public function getMethod() {
     public function getOptions() {
         return $this->options;
     }
-}
+}

Annotations/Routing.php

@@ -56,6 +56,8 @@ class Routing {
      */
     private $getAll;
 
+    private $customs ;
+
     /**
      * @var array
      */
@@ -77,9 +79,45 @@ public function __construct($namespace) {
         $reader = new Reader();
         $class  = new \ReflectionClass($namespace);
 
+        // search all customs
+        $this->customs = $reader->readAll($class,DataSource::class);
         foreach (self::$annotations as $alias => $annotation) $this->$alias = $reader->read($class, $annotation);
+
+        // create func
+//        foreach ($this->customs as $custom)
+//        {
+////            $customName = $custom->getMethod();
+////            if ($customName === null)
+//            $customName = $custom::class;
+//            $this->$customName = $custom ;
+//
+//        }
+    }
+
+    public function customs()
+    {
+        return $this->customs;
+    }
+    public function __get($name)
+    {
+        if (isset($this->customs[$name]))
+            return $this->customs[$name] ;
     }
 
+    public function __isset($name)
+    {
+        return isset($this->customs[$name]) ;
+    }
+
+    public function __call($name, $arguments)
+    {
+        if (isset($this->customs[$name]))
+            return $this->customs[$name] ;
+    }
+    public function getCustoms()
+    {
+        return $this->customs ;
+    }
     /**
      * returns the post route
      *
@@ -133,4 +171,4 @@ public function delete() {
     public function getAll() {
         return $this->getAll;
     }
-}
+}

Annotations/Select.php

@@ -29,6 +29,6 @@
  *
  * @Annotation
  */
-class Select implements DataSource {
+#[\Attribute] class Select implements DataSource {
     use Route;
-}
+}

Annotations/Update.php

@@ -29,6 +29,6 @@
  *
  * @Annotation
  */
-class Update implements DataSource {
+#[\Attribute] class Update implements DataSource {
     use Route;
-}
+}