summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-02-05 07:59:50 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2015-02-05 07:59:50 +0100
commit9b6d5041afee4c5e379c56f3cf2111b989c6c24b (patch)
tree5d4e8fcadf3ea4ee78fa95793bcded0f6cb673c8
parent868fb240c232522937df01ac2e2e2516c13000c7 (diff)
parenta83c8a68db8510d9d5f0a62bcb56e45625bc19d7 (diff)
downloadsymfony-security-9b6d5041afee4c5e379c56f3cf2111b989c6c24b.zip
symfony-security-9b6d5041afee4c5e379c56f3cf2111b989c6c24b.tar.gz
symfony-security-9b6d5041afee4c5e379c56f3cf2111b989c6c24b.tar.bz2
Merge branch '2.7'
* 2.7: (61 commits) fixxed order of usage [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index removed the last deprecation notice [Serializer] Silent deprecation notice removed deprecation notice [PropertyAccess] Show property path in all exception messages added deprecation notice for HttpCache::createEsi() added missing deprecation notice when using the form_enctype function [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again removed non-sense example Fixes small typo. [Validator] Remove unnecessary include in tests [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex fixed typo [Serializer] Use Serializer's LogicException when applicable [Serializer] Use autoloader for annotations in tests [Validator] fix DOS-style line endings Drop useless execution bit bumped Symfony version to 2.6.5 [Serializer] update changelog ... Conflicts: CHANGELOG-2.3.md CHANGELOG-2.5.md CHANGELOG-2.6.md src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
-rw-r--r--Core/SecurityContext.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index 222e5aa..27e85c5 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -60,7 +60,7 @@ class SecurityContext implements SecurityContextInterface
}
if ($oldSignature) {
- // renamed for clearity
+ // renamed for clarity
$authenticationManager = $tokenStorage;
$accessDecisionManager = $authorizationChecker;
$tokenStorage = new TokenStorage();