summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Core/Authentication/Provider/AuthenticationProviderInterface.php16
-rw-r--r--Core/Authorization/Voter/ExpressionVoter.php6
-rw-r--r--Core/SecurityContext.php2
3 files changed, 15 insertions, 9 deletions
diff --git a/Core/Authentication/Provider/AuthenticationProviderInterface.php b/Core/Authentication/Provider/AuthenticationProviderInterface.php
index 8007234..adad258 100644
--- a/Core/Authentication/Provider/AuthenticationProviderInterface.php
+++ b/Core/Authentication/Provider/AuthenticationProviderInterface.php
@@ -24,12 +24,12 @@ use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterfac
*/
interface AuthenticationProviderInterface extends AuthenticationManagerInterface
{
- /**
- * Checks whether this provider supports the given token.
- *
- * @param TokenInterface $token A TokenInterface instance
- *
- * @return bool true if the implementation supports the Token, false otherwise
- */
- public function supports(TokenInterface $token);
+ /**
+ * Checks whether this provider supports the given token.
+ *
+ * @param TokenInterface $token A TokenInterface instance
+ *
+ * @return bool true if the implementation supports the Token, false otherwise
+ */
+ public function supports(TokenInterface $token);
}
diff --git a/Core/Authorization/Voter/ExpressionVoter.php b/Core/Authorization/Voter/ExpressionVoter.php
index 3263803..98b8f50 100644
--- a/Core/Authorization/Voter/ExpressionVoter.php
+++ b/Core/Authorization/Voter/ExpressionVoter.php
@@ -15,6 +15,7 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface;
use Symfony\Component\Security\Core\Authorization\ExpressionLanguage;
use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Component\HttpFoundation\Request;
@@ -43,6 +44,11 @@ class ExpressionVoter implements VoterInterface
$this->roleHierarchy = $roleHierarchy;
}
+ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
+ {
+ $this->expressionLanguage->registerProvider($provider);
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index 1f46cd6..545d4cb 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -41,7 +41,7 @@ class SecurityContext implements SecurityContextInterface
private $authorizationChecker;
/**
- * For backwords compatibility, the signature of sf <2.6 still works
+ * For backwards compatibility, the signature of sf <2.6 still works
*
* @param TokenStorageInterface|AuthenticationManagerInterface $tokenStorage
* @param AuthorizationCheckerInterface|AccessDecisionManagerInterface $authorizationChecker