Skip to content

Remove expression language parser deprecation message for sf >= 3.2 #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2017
Merged

Remove expression language parser deprecation message for sf >= 3.2 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions DependencyInjection/OverblogGraphQLExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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);
Expand All @@ -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']);
Expand Down
9 changes: 8 additions & 1 deletion ExpressionLanguage/ExpressionLanguage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());
Expand Down
4 changes: 0 additions & 4 deletions Resources/config/services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down