Merge pull request #138 from mcg-web/remove-expression-language-deprecations-message

Remove expression language parser deprecation message for sf >= 3.2

Author: mcg-web

DependencyInjection/OverblogGraphQLExtension.php

@@ -19,6 +19,7 @@
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\HttpKernel\Kernel;
 
 class OverblogGraphQLExtension extends Extension implements PrependExtensionInterface
 {
@@ -31,6 +32,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $config = $this->treatConfigs($configs, $container);
 
+        $this->setExpressionLanguageDefaultParser($container);
         $this->setServicesAliases($config, $container);
         $this->setSchemaBuilderArguments($config, $container);
         $this->setSchemaArguments($config, $container);
@@ -55,6 +57,17 @@ public function prepend(ContainerBuilder $container)
         $typesExtension->containerPrependExtensionConfig($config, $container);
     }
 
+    private function setExpressionLanguageDefaultParser(ContainerBuilder $container)
+    {
+        $class = version_compare(Kernel::VERSION, '3.2.0', '>=') ?
+            'Symfony\\Component\\Cache\Adapter\\ArrayAdapter'
+            : 'Symfony\\Component\\ExpressionLanguage\\ParserCache\\ArrayParserCache'
+        ;
+        $definition = new Definition($class);
+        $definition->setPublic(false);
+        $container->setDefinition($this->getAlias().'.cache_expression_language_parser.default', $definition);
+    }
+
     private function setShowDebug(array $config, ContainerBuilder $container)
     {
         $container->getDefinition($this->getAlias().'.request_executor')->replaceArgument(4, $config['definitions']['show_debug_info']);

ExpressionLanguage/ExpressionLanguage.php

@@ -11,6 +11,7 @@
 
 namespace Overblog\GraphQLBundle\ExpressionLanguage;
 
+use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
 use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface;
@@ -19,7 +20,13 @@ class ExpressionLanguage extends BaseExpressionLanguage
 {
     use ContainerAwareTrait;
 
-    public function __construct(ParserCacheInterface $parser = null, array $providers = [])
+    /**
+     * ExpressionLanguage constructor.
+     *
+     * @param CacheItemPoolInterface|ParserCacheInterface|null $parser
+     * @param array                                            $providers
+     */
+    public function __construct($parser = null, array $providers = [])
     {
         // prepend the default provider to let users override it easily
         array_unshift($providers, new ConfigExpressionProvider());

Resources/config/services.yml

@@ -57,10 +57,6 @@ services:
         arguments:
             - "@overblog_graphql.promise_adapter"
 
-    overblog_graphql.cache_expression_language_parser.default:
-        class: Symfony\Component\ExpressionLanguage\ParserCache\ArrayParserCache
-        public: false
-
     overblog_graphql.expression_language.default:
         class: Overblog\GraphQLBundle\ExpressionLanguage\ExpressionLanguage
         public: false