Skip to content

Commit d71a629

Browse files
Merge branch '3.3' into 3.4
* 3.3: (33 commits) Preserve HttpOnly value when deserializing a header [DX] [TwigBundle] Enhance the new exception page design Fix deprecated message [DI][Security] Prevent unwanted deprecation notices when using Expression Languages bumped Symfony version to 3.3.5 updated VERSION for 3.3.4 updated CHANGELOG for 3.3.4 [VarDumper] Reduce size of serialized Data objects bumped Symfony version to 3.2.12 updated VERSION for 3.2.11 updated CHANGELOG for 3.2.11 fixed bad merge Fix indent of methods [Cache] Handle APCu failures gracefully [DoctrineBridge] Use normalizedIds for resetting entity manager services [FrameworkBundle] Do not remove files from assets dir [FrameworkBundle] 3.3: Don't get() private services from debug:router bumped Symfony version to 3.3.4 updated VERSION for 3.3.3 updated CHANGELOG for 3.3.3 ...
2 parents 6b40a9f + 2862829 commit d71a629

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ExpressionLanguage.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection;
1313

1414
use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
15-
use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface;
1615

1716
/**
1817
* Adds some function to the default ExpressionLanguage.
@@ -23,7 +22,10 @@
2322
*/
2423
class ExpressionLanguage extends BaseExpressionLanguage
2524
{
26-
public function __construct(ParserCacheInterface $cache = null, array $providers = array())
25+
/**
26+
* {@inheritdoc}
27+
*/
28+
public function __construct($cache = null, array $providers = array())
2729
{
2830
// prepend the default provider to let users override it easily
2931
array_unshift($providers, new ExpressionLanguageProvider());

0 commit comments

Comments
 (0)