Using Native Symfony namespace feature

Before, PSR-16 cache was wrapped in a NamespaceCache (PSR-16 compatible) and then wrapped in a Symfony PSR16Adapter to generate a Symfony cache. Now, the PSR16Adapter namespace feature is used and NamespaceCache is no more needed when Symfony cache is used. Note: in the future, GraphQLite will accept PSR-16, PSR-6 or Symfony cache is input.
thecodingmachine · Apr 15, 2020 · 47857ae · 47857ae
1 parent 208b365
commit 47857ae
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/src/SchemaFactory.php b/src/SchemaFactory.php
@@ -90,6 +90,8 @@ class SchemaFactory
     private $authorizationService;
     /** @var CacheInterface */
     private $cache;
+    /** @var CacheInterface */
+    private $cacheWithoutNamespace;
     /** @var NamingStrategyInterface|null */
     private $namingStrategy;
     /** @var ContainerInterface */
@@ -104,10 +106,13 @@ class SchemaFactory
     private $fieldMiddlewares = [];
     /** @var ExpressionLanguage|null */
     private $expressionLanguage;
+    /** @var string */
+    private $cacheNamespace;
 
     public function __construct(CacheInterface $cache, ContainerInterface $container)
     {
-        $this->cache     = new NamespacedCache($cache);
+        $this->cacheNamespace = substr(md5(Versions::getVersion('thecodingmachine/graphqlite')), 0, 8);
+        $this->cache = $cache;
         $this->container = $container;
     }
 
@@ -210,8 +215,7 @@ private function getDoctrineAnnotationReader(): Reader
 
             $cache = function_exists('apcu_fetch') ? new ApcuCache() : new PhpFileCache(sys_get_temp_dir() . '/graphqlite.' . crc32(__DIR__));
 
-            $namespace = substr(md5(Versions::getVersion('thecodingmachine/graphqlite')), 0, 8);
-            $cache->setNamespace($namespace);
+            $cache->setNamespace($this->cacheNamespace);
 
             $doctrineAnnotationReader = new CachedReader($doctrineAnnotationReader, $cache, true);
 
@@ -315,18 +319,18 @@ public function createSchema(): Schema
         $authenticationService = $this->authenticationService ?: new FailAuthenticationService();
         $authorizationService  = $this->authorizationService ?: new FailAuthorizationService();
         $typeResolver          = new TypeResolver();
-        $cachedDocBlockFactory = new CachedDocBlockFactory($this->cache);
+        $namespacedCache       = new NamespacedCache($this->cache);
+        $cachedDocBlockFactory = new CachedDocBlockFactory($namespacedCache);
         $namingStrategy        = $this->namingStrategy ?: new NamingStrategy();
         $typeRegistry          = new TypeRegistry();
-        $symfonyCache          = new Psr16Adapter($this->cache);
+        $symfonyCache          = new Psr16Adapter($this->cache, $this->cacheNamespace);
 
-        $namespaceFactory = new NamespaceFactory($this->cache, $this->classNameMapper, $this->globTTL);
+        $namespaceFactory = new NamespaceFactory($namespacedCache, $this->classNameMapper, $this->globTTL);
         $nsList = array_map(static function (string $namespace) use ($namespaceFactory) {
             return $namespaceFactory->createNamespace($namespace);
         }, $this->typeNamespaces);
 
-        $psr6Cache = new Psr16Adapter($this->cache);
-        $expressionLanguage = $this->expressionLanguage ?: new ExpressionLanguage($psr6Cache);
+        $expressionLanguage = $this->expressionLanguage ?: new ExpressionLanguage($symfonyCache);
         $expressionLanguage->registerProvider(new SecurityExpressionLanguageProvider());
 
         $fieldMiddlewarePipe = new FieldMiddlewarePipe();
@@ -338,7 +342,7 @@ public function createSchema(): Schema
         $fieldMiddlewarePipe->pipe(new AuthorizationFieldMiddleware($authenticationService, $authorizationService));
 
         $compositeTypeMapper = new CompositeTypeMapper();
-        $recursiveTypeMapper = new RecursiveTypeMapper($compositeTypeMapper, $namingStrategy, $this->cache, $typeRegistry);
+        $recursiveTypeMapper = new RecursiveTypeMapper($compositeTypeMapper, $namingStrategy, $namespacedCache, $typeRegistry);
 
         $topRootTypeMapper = new NullableTypeMapperAdapter();
 
@@ -354,7 +358,7 @@ public function createSchema(): Schema
                 $typeRegistry,
                 $recursiveTypeMapper,
                 $this->container,
-                $this->cache,
+                $namespacedCache,
                 $this->globTTL
             );
 
@@ -409,7 +413,7 @@ public function createSchema(): Schema
                 $annotationReader,
                 $namingStrategy,
                 $recursiveTypeMapper,
-                $this->cache,
+                $namespacedCache,
                 $this->globTTL
             ));
         }
@@ -429,7 +433,7 @@ public function createSchema(): Schema
                 $inputTypeGenerator,
                 $recursiveTypeMapper,
                 $this->container,
-                $this->cache,
+                $namespacedCache,
                 $this->globTTL
             );
         }
@@ -447,7 +451,7 @@ public function createSchema(): Schema
                 $fieldsBuilder,
                 $this->container,
                 $annotationReader,
-                $this->cache,
+                $namespacedCache,
                 $this->classNameMapper,
                 $this->globTTL
             );