Skip to content

Commit 7e93cca

Browse files
committed
Merge branch '3.2' into 3.3
* 3.2: [DI][Security] Prevent unwanted deprecation notices when using Expression Languages bumped Symfony version to 3.2.12 updated VERSION for 3.2.11 updated CHANGELOG for 3.2.11
2 parents 94b6ec3 + 15938b4 commit 7e93cca

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

CHANGELOG-3.2.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ in 3.2 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.2.0...v3.2.1
99

10+
* 3.2.11 (2017-07-05)
11+
12+
* bug #23390 [Cache] Handle APCu failures gracefully (nicolas-grekas)
13+
* bug #23378 [FrameworkBundle] Do not remove files from assets dir (1ed)
14+
1015
* 3.2.10 (2017-07-04)
1116

1217
* bug #23366 [FrameworkBundle] Don't get() private services from debug:router (chalasr)

src/Symfony/Component/DependencyInjection/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());

src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Security\Core\Authorization;
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)