Merge pull request #128 from moufmouf/backport_optim_reflection

Backporting public method optimization

Author: moufmouf

src/FieldsBuilder.php

@@ -233,7 +233,7 @@ private function getFieldsByAnnotations($controller, string $annotationName, boo
             }
         }
 
-        foreach ($refClass->getMethods() as $refMethod) {
+        foreach ($refClass->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
             if ($closestMatchingTypeClass !== null && $closestMatchingTypeClass === $refMethod->getDeclaringClass()->getName()) {
                 // Optimisation: no need to fetch annotations from parent classes that are ALREADY GraphQL types.
                 // We will merge the fields anyway.

src/Mappers/GlobTypeMapper.php

@@ -329,8 +329,8 @@ private function buildMap(): void
 
             $isAbstract = $refClass->isAbstract();
 
-            foreach ($refClass->getMethods() as $method) {
-                if (!$method->isPublic() || ($isAbstract && !$method->isStatic())) {
+            foreach ($refClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
+                if ($isAbstract && !$method->isStatic()) {
                     continue;
                 }
                 $factory = $this->annotationReader->getFactoryAnnotation($method);

tests/Mappers/GlobTypeMapperTest.php

@@ -79,9 +79,19 @@ public function testGlobTypeMapperDuplicateInputTypesException()
 
         $mapper = new GlobTypeMapper('TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes', $typeGenerator, $this->getInputTypeGenerator(), $this->getInputTypeUtils(), $container, new \TheCodingMachine\GraphQLite\AnnotationReader(new AnnotationReader()), new NamingStrategy(), $this->getLockFactory(), new NullCache());
 
-        $this->expectException(DuplicateMappingException::class);
-        $this->expectExceptionMessage('The class \'TheCodingMachine\GraphQLite\Fixtures\TestObject\' should be mapped to only one GraphQL Input type. Two methods are pointing via the @Factory annotation to this class: \'TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes\TestFactory::myFactory\' and \'TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes\TestFactory2::myFactory\'');
-        $mapper->canMapClassToInputType(TestObject::class);
+        $caught = false;
+        try {
+            $mapper->canMapClassToInputType(TestObject::class);
+        } catch (DuplicateMappingException $e) {
+            // Depending on the environment, one of the messages can be returned.
+            $this->assertContains($e->getMessage(),
+                [
+                    'The class \'TheCodingMachine\GraphQLite\Fixtures\TestObject\' should be mapped to only one GraphQL Input type. Two methods are pointing via the @Factory annotation to this class: \'TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes\TestFactory::myFactory\' and \'TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes\TestFactory2::myFactory\'',
+                    'The class \'TheCodingMachine\GraphQLite\Fixtures\TestObject\' should be mapped to only one GraphQL Input type. Two methods are pointing via the @Factory annotation to this class: \'TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes\TestFactory2::myFactory\' and \'TheCodingMachine\GraphQLite\Fixtures\DuplicateInputTypes\TestFactory::myFactory\''
+                ]);
+            $caught = true;
+        }
+        $this->assertTrue($caught, 'DuplicateMappingException is thrown');
     }
 
     public function testGlobTypeMapperClassNotFoundException()