Merge pull request #110 from lingoda/drop-doctrine-cache

Drop doctrine/cache dependency

Author: devmaslov

DependencyInjection/GraphqliteCompilerPass.php

@@ -3,6 +3,7 @@
 
 namespace TheCodingMachine\Graphqlite\Bundle\DependencyInjection;
 
+use Doctrine\Common\Annotations\PsrCachedReader;
 use GraphQL\Server\ServerConfig;
 use GraphQL\Validator\Rules\DisableIntrospection;
 use GraphQL\Validator\Rules\QueryComplexity;
@@ -11,43 +12,29 @@
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
 use Symfony\Component\Cache\Psr16Cache;
-use TheCodingMachine\GraphQLite\Mappers\StaticClassListTypeMapper;
 use TheCodingMachine\GraphQLite\Mappers\StaticClassListTypeMapperFactory;
 use Webmozart\Assert\Assert;
 use function class_exists;
-use Doctrine\Common\Annotations\AnnotationException;
 use Doctrine\Common\Annotations\AnnotationReader as DoctrineAnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
-use Doctrine\Common\Annotations\CachedReader;
-use Doctrine\Common\Cache\ApcuCache;
-use function error_log;
 use Mouf\Composer\ClassNameMapper;
 use Psr\SimpleCache\CacheInterface;
 use ReflectionParameter;
-use Symfony\Component\Cache\Simple\ApcuCache as SymfonyApcuCache;
-use Symfony\Component\Cache\Simple\PhpFilesCache as SymfonyPhpFilesCache;
 use function filter_var;
 use function function_exists;
-use GraphQL\Type\Definition\InputObjectType;
-use GraphQL\Type\Definition\ObjectType;
-use Psr\Container\ContainerInterface;
 use ReflectionClass;
 use ReflectionMethod;
 use function ini_get;
 use function interface_exists;
-use function php_sapi_name;
-use function str_replace;
 use function strpos;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
 use TheCodingMachine\CacheUtils\ClassBoundCache;
 use TheCodingMachine\CacheUtils\ClassBoundCacheContract;
 use TheCodingMachine\CacheUtils\ClassBoundCacheContractInterface;
@@ -56,30 +43,15 @@
 use TheCodingMachine\ClassExplorer\Glob\GlobClassExplorer;
 use TheCodingMachine\GraphQLite\AggregateControllerQueryProviderFactory;
 use TheCodingMachine\GraphQLite\AnnotationReader;
-use TheCodingMachine\GraphQLite\Annotations\AbstractRequest;
 use TheCodingMachine\GraphQLite\Annotations\Autowire;
 use TheCodingMachine\GraphQLite\Annotations\Field;
 use TheCodingMachine\GraphQLite\Annotations\Mutation;
-use TheCodingMachine\GraphQLite\Annotations\Parameter;
 use TheCodingMachine\GraphQLite\Annotations\Query;
 use TheCodingMachine\Graphqlite\Bundle\Controller\GraphQL\LoginController;
 use TheCodingMachine\Graphqlite\Bundle\Controller\GraphQL\MeController;
-use TheCodingMachine\GraphQLite\FieldsBuilder;
-use TheCodingMachine\GraphQLite\FieldsBuilderFactory;
 use TheCodingMachine\GraphQLite\GraphQLRuntimeException as GraphQLException;
-use TheCodingMachine\GraphQLite\InputTypeGenerator;
-use TheCodingMachine\GraphQLite\InputTypeUtils;
-use TheCodingMachine\GraphQLite\Mappers\CompositeTypeMapper;
-use TheCodingMachine\GraphQLite\Mappers\GlobTypeMapper;
-use TheCodingMachine\GraphQLite\Mappers\RecursiveTypeMapperInterface;
-use TheCodingMachine\GraphQLite\Mappers\Root\CompositeRootTypeMapper;
 use TheCodingMachine\GraphQLite\Mappers\StaticTypeMapper;
-use TheCodingMachine\GraphQLite\NamingStrategy;
 use TheCodingMachine\GraphQLite\SchemaFactory;
-use TheCodingMachine\GraphQLite\TypeGenerator;
-use TheCodingMachine\GraphQLite\Types\MutableObjectType;
-use TheCodingMachine\GraphQLite\Types\ResolvableInputObjectType;
-use function var_dump;
 use TheCodingMachine\Graphqlite\Bundle\Types\SymfonyUserInterfaceType;
 
 /**
@@ -441,10 +413,11 @@ private function getAnnotationReader(): AnnotationReader
     {
         if ($this->annotationReader === null) {
             AnnotationRegistry::registerLoader('class_exists');
+
             $doctrineAnnotationReader = new DoctrineAnnotationReader();
 
             if (function_exists('apcu_fetch')) {
-                $doctrineAnnotationReader = new CachedReader($doctrineAnnotationReader, new ApcuCache(), true);
+                $doctrineAnnotationReader = new PsrCachedReader($doctrineAnnotationReader, new ApcuAdapter('graphqlite'), true);
             }
 
             $this->annotationReader = new AnnotationReader($doctrineAnnotationReader, AnnotationReader::LAX_MODE);

composer.json

@@ -18,13 +18,12 @@
   "require" : {
     "php" : ">=7.2",
     "ext-json": "*",
-    "thecodingmachine/graphqlite" : "^4.1.2",
+    "thecodingmachine/graphqlite" : "^4.3",
     "thecodingmachine/graphqlite-symfony-validator-bridge" : "^4.1",
     "symfony/framework-bundle": "^4.2 || ^5",
     "symfony/validator": "^4.2 || ^5",
     "symfony/translation": "^4.2 || ^5",
-    "doctrine/annotations": "^1.10.4",
-    "doctrine/cache": "^1.8",
+    "doctrine/annotations": "^1.13",
     "symfony/psr-http-message-bridge": "^2.0",
     "nyholm/psr7": "^1.1",
     "laminas/laminas-diactoros": "^2.2.2",