Revert "Merge pull request #675 from IceShack/feature/inheritPrivateP…

…roperties0.12" This reverts commit 6433464, reversing changes made to 7155466.
overblog · Jul 8, 2020 · 59cac21 · 59cac21
1 parent 4440c09
commit 59cac21
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 62 deletions.
diff --git a/src/Config/Parser/AnnotationParser.php b/src/Config/Parser/AnnotationParser.php
@@ -259,15 +259,9 @@ private static function extractClassAnnotations(string $className): array
             $classAnnotations = $annotationReader->getClassAnnotations($reflectionEntity);
 
             $properties = [];
-            $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());
+            foreach ($reflectionEntity->getProperties() as $property) {
+                $properties[$property->getName()] = ['property' => $property, 'annotations' => $annotationReader->getPropertyAnnotations($property)];
+            }
 
             $methods = [];
             foreach ($reflectionEntity->getMethods() as $method) {

diff --git a/tests/Config/Parser/AnnotationParserTest.php b/tests/Config/Parser/AnnotationParserTest.php
@@ -154,15 +154,6 @@ 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

diff --git a/tests/Config/Parser/fixtures/annotations/Type/Animal.php b/tests/Config/Parser/fixtures/annotations/Type/Animal.php
diff --git a/tests/Config/Parser/fixtures/annotations/Type/Cat.php b/tests/Config/Parser/fixtures/annotations/Type/Cat.php