Skip to content

Commit 59cac21

Browse files
committed
Revert "Merge pull request overblog#675 from IceShack/feature/inheritPrivateProperties0.12"
This reverts commit 6433464, reversing changes made to 7155466.
1 parent 4440c09 commit 59cac21

File tree

4 files changed

+3
-62
lines changed

4 files changed

+3
-62
lines changed

src/Config/Parser/AnnotationParser.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -259,15 +259,9 @@ private static function extractClassAnnotations(string $className): array
259259
$classAnnotations = $annotationReader->getClassAnnotations($reflectionEntity);
260260

261261
$properties = [];
262-
$reflectionClass = new \ReflectionClass($className);
263-
do {
264-
foreach ($reflectionClass->getProperties() as $property) {
265-
if (isset($properties[$property->getName()])) {
266-
continue;
267-
}
268-
$properties[$property->getName()] = ['property' => $property, 'annotations' => $annotationReader->getPropertyAnnotations($property)];
269-
}
270-
} while ($reflectionClass = $reflectionClass->getParentClass());
262+
foreach ($reflectionEntity->getProperties() as $property) {
263+
$properties[$property->getName()] = ['property' => $property, 'annotations' => $annotationReader->getPropertyAnnotations($property)];
264+
}
271265

272266
$methods = [];
273267
foreach ($reflectionEntity->getMethods() as $method) {

tests/Config/Parser/AnnotationParserTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,6 @@ public function testTypes(): void
154154
],
155155
'builders' => [['builder' => 'MyFieldsBuilder', 'builderConfig' => ['param1' => 'val1']]],
156156
]);
157-
158-
// Test a type extending another type
159-
$this->expect('Cat', 'object', [
160-
'description' => 'The Cat type',
161-
'fields' => [
162-
'name' => ['type' => 'String!', 'description' => 'The name of the animal'],
163-
'lives' => ['type' => 'Int!'],
164-
],
165-
]);
166157
}
167158

168159
public function testInput(): void

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)