fix annotations

BigZ · Jul 15, 2018 · 4910ab5 · 4910ab5
1 parent ef71be9
commit 4910ab5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/src/Halapi/AnnotationReader/AnnotationReaderInterface.php b/src/Halapi/AnnotationReader/AnnotationReaderInterface.php
@@ -13,10 +13,11 @@ interface AnnotationReaderInterface
      * Return the configured route name for an embeddable relation.
      *
      * @param \ReflectionProperty $property
+     * @param string              $targetClass
      *
      * @return string
      */
-    public function getAssociationRouteName(\ReflectionProperty $property);
+    public function getAssociationRouteName(\ReflectionProperty $property, $targetClass);
 
     /**
      * Return the configured route name for a resource, or get_*entityShortName* by default.

diff --git a/src/Halapi/AnnotationReader/DoctrineAnnotationReader.php b/src/Halapi/AnnotationReader/DoctrineAnnotationReader.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Halapi\Relation;
+namespace Halapi\AnnotationReader;
 
 use Halapi\Annotation\Embeddable;
 use Doctrine\Common\Annotations\Reader;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 
 /**
  * Reads annotations.
@@ -27,13 +28,16 @@ public function __construct(Reader $annotationReader)
     }
 
     /**
+     * Get the route name of a relationship.
+     *
      * @param \ReflectionProperty $property
+     * @param string              $targetClass
      *
-     * @return mixed
+     * @return string
      *
      * @throws \ReflectionException
      */
-    public function getAssociationRouteName(\ReflectionProperty $property)
+    public function getAssociationRouteName(\ReflectionProperty $property, $targetClass)
     {
         /**
          * @var Embeddable
@@ -44,9 +48,7 @@ public function getAssociationRouteName(\ReflectionProperty $property)
             return $annotation->getRouteName();
         }
 
-        return $this->getResourceRouteName(new \ReflectionClass(
-            $this->classMetadata->getAssociationTargetClass($property->getName())
-        ));
+        return $this->getResourceRouteName(new \ReflectionClass($targetClass));
     }
 
     /**

diff --git a/src/Halapi/Relation/LinksRelation.php b/src/Halapi/Relation/LinksRelation.php
@@ -90,17 +90,17 @@ public function getRelation($resource)
     }
 
     /**
-     * @param \ReflectionProperty $property
-     * @param $relationContent
-     * @return mixed
-     * @throws \ReflectionException
+     * @inheritdoc
      */
     private function getRelationLink(\ReflectionProperty $property, $relationContent)
     {
         $relationReflection = new \ReflectionClass($relationContent);
         if ($this->classMetadata->hasAssociation($property->getName())) {
             return $this->urlGenerator->generate(
-                $this->annotationReader->getAssociationRouteName($property),
+                $this->annotationReader->getAssociationRouteName(
+                    $property,
+                    $this->classMetadata->getAssociationTargetClass($property->getName())
+                ),
                 [
                     strtolower($relationReflection->getShortName()) => $this->objectManager->getIdentifier($relationContent),
                 ]
@@ -134,8 +134,8 @@ private function getSelfLink($resource)
     /**
      * @param \ReflectionProperty $property
      * @param $relationContent
-     * @return array|mixed
-     * @throws \ReflectionException
+     *
+     * @return array
      */
     private function getRelationLinks(\ReflectionProperty $property, $relationContent)
     {