Add annotation reader cache and fix doctrine typeGuesser

.github/workflows/ci.yml

@@ -25,7 +25,15 @@ jobs:
 
           - php-version: 7.4
             symfony-version: "4.4.*"
-            validator: false
+            uninstall_validator: true
+
+          - php-version: 7.4
+            symfony-version: "4.4.*"
+            uninstall_annotations: true
+
+          - php-version: 7.4
+            symfony-version: "4.4.*"
+            uninstall_doctrine: true
 
           - php-version: 7.4
             symfony-version: "5.0.*"
@@ -77,9 +85,17 @@ jobs:
         run: composer req "webonyx/graphql-php:${{ matrix.graphql-version }}" --dev --no-update
 
       - name: "Disabled validator if needed"
-        if: matrix.validator == false
+        if: matrix.uninstall_validator
         run: composer remove "symfony/validator" --dev --no-update;
 
+      - name: "Disabled doctrine/orm if needed"
+        if: matrix.uninstall_doctrine
+        run: composer remove "doctrine/orm" --dev --no-update;
+
+      - name: "Disabled doctrine/annotations if needed"
+        if: matrix.uninstall_annotations
+        run: composer remove "doctrine/orm" "doctrine/annotations" --dev --no-update;
+
       - name: "Install dependencies"
         run: composer update --no-interaction --no-progress ${{ matrix.composer-flags }}
 

README.md

@@ -1,10 +1,10 @@
 OverblogGraphQLBundle
 ======================
 
-![CI](https://github.com/overblog/GraphQLBundle/workflows/CI/badge.svg?branch=0.14)
-[![Build status](https://ci.appveyor.com/api/projects/status/7ksxlcgwt40q74hv/branch/0.14?svg=true)](https://ci.appveyor.com/project/overblog/graphqlbundle/branch/0.14)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/badges/quality-score.png?b=0.14)](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/?branch=0.14)
-[![Coverage Status](https://coveralls.io/repos/github/overblog/GraphQLBundle/badge.svg?branch=0.14)](https://coveralls.io/github/overblog/GraphQLBundle?branch=0.14)
+![CI](https://github.com/overblog/GraphQLBundle/workflows/CI/badge.svg?branch=master)
+[![Build status](https://ci.appveyor.com/api/projects/status/7ksxlcgwt40q74hv/branch/master?svg=true)](https://ci.appveyor.com/project/overblog/graphqlbundle/branch/master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/overblog/GraphQLBundle/badge.svg?branch=master)](https://coveralls.io/github/overblog/GraphQLBundle?branch=master)
 [![Latest Stable Version](https://poser.pugx.org/overblog/graphql-bundle/version)](https://packagist.org/packages/overblog/graphql-bundle)
 [![Latest Unstable Version](https://poser.pugx.org/overblog/graphql-bundle/v/unstable)](https://packagist.org/packages/overblog/graphql-bundle)
 [![Total Downloads](https://poser.pugx.org/overblog/graphql-bundle/downloads)](https://packagist.org/packages/overblog/graphql-bundle)
@@ -97,7 +97,7 @@ Talks and slides to help you start
 
 * GraphQL in Symfony *by Bernd Alter* - [Twitter](https://twitter.com/bazoo0815)
   - [Talk about GraphQL and its implementation with Symfony (26.04.2017)](https://www.slideshare.net/berndalter7/graphql-in-symfony) `English`
-* GraphQL is right in front of us, let's to it! *by Renato Mendes Figueiredo* - [Twitter](https://twitter.com/renatomefi), [GitHub](https://github.com/renatomefi)
+* GraphQL is right in front of us, let's do it! *by Renato Mendes Figueiredo* - [Twitter](https://twitter.com/renatomefi), [GitHub](https://github.com/renatomefi)
   - [Slides at http://talks.mefi.in/graphql-scotphp17](http://talks.mefi.in/graphql-scotphp17/) `English`
   - [Video at SymfonyCamp UA 2017](https://www.youtube.com/watch?v=jyoYlnCPNgk) `English`
   - [Video at DPC 2017](https://www.youtube.com/watch?v=E7MjoCOGSSY) `English`

composer.json

@@ -3,7 +3,7 @@
     "type": "symfony-bundle",
     "license": "MIT",
     "description": "This bundle provides tools to build a GraphQL server in your Symfony App.",
-    "keywords": ["GraphQL", "Relay"],
+    "keywords": ["GraphQL","Relay"],
     "authors": [
         {
             "name": "Overblog",
@@ -48,6 +48,7 @@
     },
     "require-dev": {
         "doctrine/orm": "^2.5",
+        "doctrine/annotations": "^1.12.1",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.58",
         "phpstan/phpstan-phpunit": "^0.12.11",
@@ -56,6 +57,7 @@
         "react/promise": "^2.5",
         "symfony/asset": "^4.4 || ^5.0",
         "symfony/browser-kit": "^4.4 || ^5.0",
+        "symfony/cache": "^4.4 || ^5.0",
         "symfony/console": "^4.4 || ^5.0",
         "symfony/css-selector": "^4.4 || ^5.0",
         "symfony/phpunit-bridge": "^4.4 || ^5.0",
@@ -68,15 +70,15 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.14-dev"
+            "dev-master": "1.0-dev"
         }
     },
     "scripts": {
         "test": "bin/phpunit --color=always -v --debug",
         "static-analysis": [
             "phpstan analyse --ansi --memory-limit=1G"
         ],
-        "bench":  [
+        "bench": [
             "test -f phpbench.phar || wget https://github.com/phpbench/phpbench/releases/download/1.0.0-alpha7/phpbench.phar -O phpbench.phar",
             "@php phpbench.phar run -l dots --ansi -vvv --report='generator: \"table\", cols: [\"benchmark\", \"subject\", \"params\", \"best\", \"mean\", \"mode\", \"worst\", \"diff\"], break: [\"benchmark\"], sort: {mean: \"asc\"}'"
         ],

docs/annotations/index.md

@@ -2,7 +2,9 @@
 
 In order to use annotations or attributes, you need to configure the mapping:
 
-To use annotations, use the `annotation` mapping type.
+To use annotations, You must install `symfony/cache` and `doctrine/annotation` and use the `annotation` mapping type.
+
+
 ```yaml
 # config/packages/graphql.yaml
 overblog_graphql:
@@ -13,7 +15,6 @@ overblog_graphql:
           dir: "%kernel.project_dir%/src/GraphQL"
           suffix: ~
 ```
-
 To use attributes, use the `attribute` mapping type.
 
 ```yaml
@@ -215,6 +216,7 @@ In this example, the type `String!` will be auto-guessed from the type hint of t
 ### @Field type auto-guessing from Doctrine ORM Annotations
 
 Based on other Doctrine annotations on your fields, the corresponding GraphQL type can sometimes be guessed automatically.  
+In order to activate this guesser, you must install `doctrine/orm` package.  
 
 The type can be auto-guessed from the following annotations:
 

docs/error-handling/index.md

@@ -159,7 +159,7 @@ Custom error handling / formatting
 -----------------------------------
 
 This can also be done by using events.
-* First totally disabled default errors handler:
+* First totally disable default errors handler:
     ```yaml
     overblog_graphql:
         errors_handler: false

docs/index.md

@@ -102,6 +102,15 @@ overblog_graphql_multiple_endpoint:
     prefix: /graphql
 ```
 
+
+Optionnal features depencies
+------------
+
+- To use the Validator features, you must also install `symfony/validator` and `doctrine/annotations`
+- To use the annotations, you must also install `doctrine/annotations`
+- To use the annotations doctrine type guesser, you must also install `doctrine/orm`
+
+
 Composer autoloader configuration (optional)
 ------------
 

src/Config/Parser/AnnotationParser.php

@@ -6,18 +6,22 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Doctrine\Common\Annotations\PsrCachedReader;
+use Doctrine\Common\Annotations\Reader;
 use Overblog\GraphQLBundle\Config\Parser\MetadataParser\MetadataParser;
 use ReflectionClass;
 use ReflectionMethod;
 use ReflectionProperty;
 use Reflector;
-use RuntimeException;
+use Symfony\Component\Cache\Adapter\ApcuAdapter;
+use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 class AnnotationParser extends MetadataParser
 {
     public const METADATA_FORMAT = '@%s';
 
-    protected static ?AnnotationReader $annotationReader = null;
+    protected static Reader $annotationReader;
 
     protected static function getMetadatas(Reflector $reflector): array
     {
@@ -32,18 +36,29 @@ protected static function getMetadatas(Reflector $reflector): array
         return [];
     }
 
-    protected static function getAnnotationReader(): AnnotationReader
+    public static function getAnnotationReader(): Reader
     {
-        if (null === self::$annotationReader) {
-            if (!class_exists(AnnotationReader::class) ||
-                !class_exists(AnnotationRegistry::class)) {
-                // @codeCoverageIgnoreStart
-                throw new RuntimeException('In order to use graphql annotation, you need to require doctrine annotations');
-                // @codeCoverageIgnoreEnd
+        if (!isset(self::$annotationReader)) {
+            if (!class_exists(AnnotationReader::class)) {
+                throw new ServiceNotFoundException("In order to use annotations, you need to install 'doctrine/annotations' first. See: 'https://www.doctrine-project.org/projects/annotations.html'");
             }
+            if (!class_exists(ApcuAdapter::class)) {
+                throw new ServiceNotFoundException("In order to use annotations, you need to install 'symfony/cache' first. See: 'https://symfony.com/doc/current/components/cache.html'");
+            }
+
+            if (class_exists(AnnotationRegistry::class)) {
+                AnnotationRegistry::registerLoader('class_exists');
+            }
+            $cacheKey = md5(__DIR__);
+            // @codeCoverageIgnoreStart
+            if (extension_loaded('apcu') && apcu_enabled()) {
+                $annotationCache = new ApcuAdapter($cacheKey);
+            } else {
+                $annotationCache = new PhpFilesAdapter($cacheKey);
+            }
+            // @codeCoverageIgnoreEnd
 
-            AnnotationRegistry::registerLoader('class_exists');
-            self::$annotationReader = new AnnotationReader();
+            self::$annotationReader = new PsrCachedReader(new AnnotationReader(), $annotationCache, true);
         }
 
         return self::$annotationReader;

src/Config/Parser/MetadataParser/TypeGuesser/DoctrineTypeGuesser.php

@@ -4,25 +4,22 @@
 
 namespace Overblog\GraphQLBundle\Config\Parser\MetadataParser\TypeGuesser;
 
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\ORM\Mapping\Annotation as MappingAnnotation;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\JoinColumn;
 use Doctrine\ORM\Mapping\ManyToMany;
 use Doctrine\ORM\Mapping\ManyToOne;
 use Doctrine\ORM\Mapping\OneToMany;
 use Doctrine\ORM\Mapping\OneToOne;
+use Overblog\GraphQLBundle\Config\Parser\AnnotationParser;
 use Overblog\GraphQLBundle\Config\Parser\MetadataParser\ClassesTypesMap;
 use ReflectionClass;
 use ReflectionMethod;
 use ReflectionProperty;
 use Reflector;
-use RuntimeException;
 
 class DoctrineTypeGuesser extends TypeGuesser
 {
-    protected ?AnnotationReader $annotationReader = null;
     protected array $doctrineMapping = [];
 
     public function __construct(ClassesTypesMap $map, array $doctrineMapping = [])
@@ -46,14 +43,19 @@ public function supports(Reflector $reflector): bool
      */
     public function guessType(ReflectionClass $reflectionClass, Reflector $reflector, array $filterGraphQLTypes = []): ?string
     {
+        if (!class_exists(Column::class)) {
+            throw new TypeGuessingException(sprintf('You must install doctrine/orm package to use this type guesser.'));
+        }
+
         if (!$reflector instanceof ReflectionProperty) {
             throw new TypeGuessingException('Doctrine type guesser only apply to properties.');
         }
+
         /** @var Column|null $columnAnnotation */
         $columnAnnotation = $this->getAnnotation($reflector, Column::class);
 
         if (null !== $columnAnnotation) {
-            $type = $this->resolveTypeFromDoctrineType($columnAnnotation->type);
+            $type = $this->resolveTypeFromDoctrineType($columnAnnotation->type ?: 'string');
             $nullable = $columnAnnotation->nullable;
             if ($type) {
                 return $nullable ? $type : sprintf('%s!', $type);
@@ -100,7 +102,7 @@ public function guessType(ReflectionClass $reflectionClass, Reflector $reflector
 
     private function getAnnotation(Reflector $reflector, string $annotationClass): ?MappingAnnotation
     {
-        $reader = $this->getAnnotationReader();
+        $reader = AnnotationParser::getAnnotationReader();
         $annotations = [];
         switch (true) {
             case $reflector instanceof ReflectionClass: $annotations = $reader->getClassAnnotations($reflector); break;
@@ -117,21 +119,6 @@ private function getAnnotation(Reflector $reflector, string $annotationClass): ?
         return null;
     }
 
-    private function getAnnotationReader(): AnnotationReader
-    {
-        if (null === $this->annotationReader) {
-            if (!class_exists(AnnotationReader::class) ||
-                !class_exists(AnnotationRegistry::class)) {
-                throw new RuntimeException('In order to use graphql annotation/attributes, you need to require doctrine annotations');
-            }
-
-            AnnotationRegistry::registerLoader('class_exists');
-            $this->annotationReader = new AnnotationReader();
-        }
-
-        return $this->annotationReader;
-    }
-
     /**
      * Resolve a FQN from classname and namespace.
      *

tests/Config/Parser/AnnotationParserTest.php

@@ -6,9 +6,22 @@
 
 use Overblog\GraphQLBundle\Config\Parser\AnnotationParser;
 use SplFileInfo;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 class AnnotationParserTest extends MetadataParserTest
 {
+    public function setUp(): void
+    {
+        if ('testNoDoctrineAnnotations' !== $this->getName()) {
+            if (!self::isDoctrineAnnotationInstalled()) {
+                $this->markTestSkipped('doctrine/annotations are not installed. Skipping annotation parser tests.');
+            }
+            parent::setUp();
+        }
+    }
+
     public function parser(string $method, ...$args)
     {
         return AnnotationParser::$method(...$args);
@@ -19,6 +32,21 @@ public function formatMetadata(string $metadata): string
         return sprintf('@%s', $metadata);
     }
 
+    public function testNoDoctrineAnnotations(): void
+    {
+        if (self::isDoctrineAnnotationInstalled()) {
+            $this->markTestSkipped('doctrine/annotations are installed');
+        }
+
+        try {
+            $containerBuilder = $this->getMockBuilder(ContainerBuilder::class)->disableOriginalConstructor()->getMock();
+            AnnotationParser::parse(new SplFileInfo(__DIR__.'/fixtures/annotations/Type/Animal.php'), $containerBuilder);
+        } catch (InvalidArgumentException $e) {
+            $this->assertInstanceOf(ServiceNotFoundException::class, $e->getPrevious());
+            $this->assertMatchesRegularExpression('/doctrine\/annotations/', $e->getPrevious()->getMessage());
+        }
+    }
+
     public function testLegacyNestedAnnotations(): void
     {
         $this->config = self::cleanConfig($this->parser('parse', new SplFileInfo(__DIR__.'/fixtures/annotations/Deprecated/DeprecatedNestedAnnotations.php'), $this->containerBuilder, ['doctrine' => ['types_mapping' => []]]));