Add possibility to use arbitrary Annotations on methods

Author: mgerzabek

src/Drivers/EloquentEntitySet.php

@@ -33,6 +33,7 @@
 use Flat3\Lodata\Helper\JSON;
 use Flat3\Lodata\Helper\PropertyValue;
 use Flat3\Lodata\Helper\PropertyValues;
+use Flat3\Lodata\Interfaces\AnnotationFactoryInterface;
 use Flat3\Lodata\Interfaces\EntitySet\ComputeInterface;
 use Flat3\Lodata\Interfaces\EntitySet\CountInterface;
 use Flat3\Lodata\Interfaces\EntitySet\CreateInterface;
@@ -866,29 +867,27 @@ public function discover(): self
         }
 
         /** @var ReflectionMethod $reflectionMethod */
-        foreach (Discovery::getReflectedMethods($this->model) as $reflectionMethod) {
-            /** @var LodataRelationship $relationshipInstance */
-            $relationshipInstance = Discovery::getFirstMethodAttributeInstance(
-                $reflectionMethod,
-                LodataRelationship::class
-            );
-
-            if (!$relationshipInstance) {
-                continue;
-            }
-
-            $relationshipMethod = $reflectionMethod->getName();
-
-            try {
-                $this->discoverRelationship(
-                    $relationshipMethod,
-                    $relationshipInstance->getName(),
-                    $relationshipInstance->getDescription(),
-                    $relationshipInstance->isNullable()
-                );
-            } catch (ConfigurationException $e) {
+        foreach (Discovery::getReflectedMethods($this->model) as $reflectionMethod)
+            foreach ($reflectionMethod->getAttributes() as $attribute) {
+
+                $instance = $attribute->newInstance();
+                if ($instance instanceof LodataRelationship) {
+                    $relationshipMethod = $reflectionMethod->getName();
+
+                    try {
+                        $this->discoverRelationship(
+                            $relationshipMethod,
+                            $instance->getName(),
+                            $instance->getDescription(),
+                            $instance->isNullable()
+                        );
+                    } catch (ConfigurationException $e) {
+                    }
+                }
+                else if ($instance instanceof AnnotationFactoryInterface) {
+                    $this->addAnnotation($instance->toAnnotation());
+                }
             }
-        }
 
         return $this;
     }

src/Interfaces/AnnotationFactoryInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Flat3\Lodata\Interfaces;
+
+use Flat3\Lodata\Annotation;
+
+interface AnnotationFactoryInterface
+{
+    /**
+     * Gibt eine Annotation-Instanz zurück, die dieses Attribut repräsentiert.
+     */
+    public function toAnnotation(): Annotation;
+}