Merge branch '0.12' into 0.13

Author: mcg-web

src/Config/Parser/AnnotationParser.php

@@ -259,9 +259,15 @@ private static function extractClassAnnotations(string $className): array
             $classAnnotations = $annotationReader->getClassAnnotations($reflectionEntity);
 
             $properties = [];
-            foreach ($reflectionEntity->getProperties() as $property) {
-                $properties[$property->getName()] = ['property' => $property, 'annotations' => $annotationReader->getPropertyAnnotations($property)];
-            }
+            $reflectionClass = new \ReflectionClass($className);
+            do {
+                foreach ($reflectionClass->getProperties() as $property) {
+                    if (isset($properties[$property->getName()])) {
+                        continue;
+                    }
+                    $properties[$property->getName()] = ['property' => $property, 'annotations' => $annotationReader->getPropertyAnnotations($property)];
+                }
+            } while ($reflectionClass = $reflectionClass->getParentClass());
 
             $methods = [];
             foreach ($reflectionEntity->getMethods() as $method) {

tests/Config/Parser/AnnotationParserTest.php

@@ -154,6 +154,15 @@ public function testTypes(): void
             ],
             'builders' => [['builder' => 'MyFieldsBuilder', 'builderConfig' => ['param1' => 'val1']]],
         ]);
+
+        // Test a type extending another type
+        $this->expect('Cat', 'object', [
+            'description' => 'The Cat type',
+            'fields' => [
+                'name' => ['type' => 'String!', 'description' => 'The name of the animal'],
+                'lives' => ['type' => 'Int!'],
+            ],
+        ]);
     }
 
     public function testInput(): void

tests/Config/Parser/fixtures/annotations/Type/Animal.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\Tests\Config\Parser\fixtures\annotations\Type;
+
+use Overblog\GraphQLBundle\Annotation as GQL;
+
+/**
+ * @GQL\Type()
+ * @GQL\Description("The character interface")
+ */
+abstract class Animal
+{
+    /**
+     * @GQL\Field(type="String!")
+     * @GQL\Description("The name of the animal")
+     */
+    private $name;
+
+    /**
+     * @GQL\Field(type="String!")
+     */
+    private $lives;
+}

tests/Config/Parser/fixtures/annotations/Type/Cat.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\Tests\Config\Parser\fixtures\annotations\Type;
+
+use Overblog\GraphQLBundle\Annotation as GQL;
+
+/**
+ * @GQL\Type()
+ * @GQL\Description("The Cat type")
+ */
+class Cat extends Animal
+{
+    /**
+     * @GQL\Field(type="Int!")
+     */
+    protected $lives;
+}