Merge pull request #9 from gmorel/feature/9

sf2 compliance: replace deprecated SecurityContextInterface
rezzza · Mar 30, 2015 · 4108cf9 · 4108cf9
2 parents 990828f + ec624a0
commit 4108cf9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/Resources/config/services/security.xml b/Resources/config/services/security.xml
@@ -16,7 +16,7 @@
         <service id="rezzza.security.request_signature.provider" class="%rezzza.security.request_signature.provider.class%" public="false" />
 
         <service id="rezzza.security.request_signature.listener" class="%rezzza.security.request_signature.listener.class%" public="false">
-            <argument type="service" id="security.context"/>
+            <argument type="service" id="security.token_storage"/>
             <argument type="service" id="security.authentication.manager" />
             <argument /> <!-- injected via RequestSignatureFactory -->
             <argument /> <!-- injected via RequestSignatureFactory -->

diff --git a/Security/Firewall/RequestSignatureListener.php b/Security/Firewall/RequestSignatureListener.php
@@ -4,14 +4,13 @@
 
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Http\Firewall\ListenerInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Rezzza\SecurityBundle\Security\RequestSignatureToken;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * RequestSignatureListener
@@ -21,21 +20,21 @@
  */
 class RequestSignatureListener implements ListenerInterface
 {
-    protected $securityContext;
+    protected $tokenStorage;
     protected $authenticationManager;
     protected $signatureQueryParameters;
     protected $ignored;
     protected $logger;
 
     public function __construct(
-        SecurityContextInterface $securityContext,
+        TokenStorageInterface $tokenStorage,
         AuthenticationManagerInterface $authenticationManager,
         SignatureQueryParameters $signatureQueryParameters,
         $ignored,
         LoggerInterface $logger = null
     )
     {
-        $this->securityContext = $securityContext;
+        $this->tokenStorage = $tokenStorage;
         $this->authenticationManager = $authenticationManager;
         $this->signatureQueryParameters = $signatureQueryParameters;
         $this->ignored = $ignored;
@@ -45,11 +44,11 @@ public function __construct(
     public function handle(GetResponseEvent $event)
     {
         if (true === $this->ignored) {
-            if (null !== $this->securityContext->getToken()) {
+            if (null !== $this->tokenStorage->getToken()) {
                 return;
             }
 
-            $this->securityContext->setToken(new AnonymousToken('request_signature', 'anon.', array()));
+            $this->tokenStorage->setToken(new AnonymousToken('request_signature', 'anon.', array()));
 
             return;
         }
@@ -64,7 +63,7 @@ public function handle(GetResponseEvent $event)
         $authToken->requestContent = rawurldecode($request->getContent());
 
         try {
-            return $this->securityContext->setToken(
+            return $this->tokenStorage->setToken(
                 $this->authenticationManager->authenticate($authToken)
             );
         } catch (AuthenticationException $e) {

diff --git a/composer.json b/composer.json
@@ -11,8 +11,8 @@
     }],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "2.*",
-        "symfony/security-bundle" : "~2.0",
+        "symfony/framework-bundle": "~2.6",
+        "symfony/security-bundle" : "~2.6",
         "doctrine/common": "~2.2"
     },
     "require-dev": {