Merge pull request #36 from BowlOfSoup/ISSUE-35

ISSUE-35

Author: BowlOfSoup

src/Service/Extractor/MethodExtractor.php

@@ -4,6 +4,8 @@
 
 namespace BowlOfSoup\NormalizerBundle\Service\Extractor;
 
+use Doctrine\Persistence\Proxy;
+
 class MethodExtractor extends AbstractExtractor
 {
     /** @var string */
@@ -13,11 +15,21 @@ class MethodExtractor extends AbstractExtractor
      * Extract all annotations for a (reflected) class method.
      *
      * @param string|object $annotation
+     *
+     * @throws \ReflectionException
      */
     public function extractMethodAnnotations(\ReflectionMethod $objectMethod, $annotation): array
     {
         $annotations = [];
 
+        if ($objectMethod->getDeclaringClass()->implementsInterface(Proxy::class)
+            && false !== $objectMethod->getDeclaringClass()->getParentClass()
+            && empty($this->annotationReader->getMethodAnnotations($objectMethod))
+            && $objectMethod->getDeclaringClass()->getParentClass()->hasMethod($objectMethod->getName())
+        ) {
+            $objectMethod = $objectMethod->getDeclaringClass()->getParentClass()->getMethod($objectMethod->getName());
+        }
+
         $methodAnnotations = $this->annotationReader->getMethodAnnotations($objectMethod);
         foreach ($methodAnnotations as $methodAnnotation) {
             if ($methodAnnotation instanceof $annotation) {

src/Service/Normalize/MethodNormalizer.php

@@ -63,6 +63,9 @@ public function normalize(
         return $normalizedMethods;
     }
 
+    /**
+     * @throws \ReflectionException
+     */
     private function getMethodAnnotations(string $objectName, \ReflectionMethod $classMethod, string $annotationClass): array
     {
         $methodName = $classMethod->getName();

tests/Service/NormalizerTest.php

@@ -11,6 +11,7 @@
 use BowlOfSoup\NormalizerBundle\Tests\assets\HobbyType;
 use BowlOfSoup\NormalizerBundle\Tests\assets\Person;
 use BowlOfSoup\NormalizerBundle\Tests\assets\ProxyObject;
+use BowlOfSoup\NormalizerBundle\Tests\assets\ProxySocial;
 use BowlOfSoup\NormalizerBundle\Tests\assets\Social;
 use BowlOfSoup\NormalizerBundle\Tests\assets\SomeClass;
 use BowlOfSoup\NormalizerBundle\Tests\assets\TelephoneNumbers;
@@ -489,6 +490,16 @@ public function testNormalizeWithTranslation(): void
         ], $result);
     }
 
+    public function testNormalizeProxyWithMethods(): void
+    {
+        $socialProxy = new ProxySocial();
+        $socialProxy->setFacebook('foo');
+
+        $this->assertSame([
+            'facebook' => 'foo'
+        ], $this->normalizer->normalize($socialProxy, 'proxy-method'));
+    }
+
     private function getDummyDataSet(): Person
     {
         $groupCollection = new ArrayCollection();

tests/assets/ProxySocial.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BowlOfSoup\NormalizerBundle\Tests\assets;
+
+use Doctrine\Common\Persistence\Proxy;
+
+class ProxySocial extends Social implements Proxy
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __load()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __isInitialized()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFacebook()
+    {
+        return parent::getFacebook();
+    }
+}

tests/assets/Social.php

@@ -71,6 +71,8 @@ public function setId($id)
 
     /**
      * @return string
+     *
+     * @Bos\Normalize(name="facebook", group={"proxy-method"})
      */
     public function getFacebook()
     {