diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-03 23:52:01 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-03 23:52:01 +0100 |
| commit | c7f654d74131094b02c247373982d6f9b4287dfa (patch) | |
| tree | 7a9ce25ac071c5c9800e31714c0619994157ddc9 | |
| parent | d2f58560d2690e98b7ead329eb33589ca6b4cb70 (diff) | |
| parent | 495d07a1730d12646dbcb51ed6ef5915982630bf (diff) | |
| download | symfony-security-c7f654d74131094b02c247373982d6f9b4287dfa.zip symfony-security-c7f654d74131094b02c247373982d6f9b4287dfa.tar.gz symfony-security-c7f654d74131094b02c247373982d6f9b4287dfa.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
fixed typo
Fixed minor typo - override
[Filesystem] enforce umask while testing
[TwigBridge] moved fixtures into their own directory
Use $this->iniSet() in tests
| -rw-r--r-- | Core/Authorization/ExpressionLanguage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Authorization/ExpressionLanguage.php b/Core/Authorization/ExpressionLanguage.php index ac6a036..c2925af 100644 --- a/Core/Authorization/ExpressionLanguage.php +++ b/Core/Authorization/ExpressionLanguage.php @@ -25,7 +25,7 @@ class ExpressionLanguage extends BaseExpressionLanguage { public function __construct(ParserCacheInterface $cache = null, array $providers = array()) { - // prepend the default provider to let users overide it easily + // prepend the default provider to let users override it easily array_unshift($providers, new ExpressionLanguageProvider()); parent::__construct($cache, $providers); |