fixes

mykiwi · mykiwi · commit 8c38f6e50233 · 2017-02-23T17:47:48.000+01:00
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -150,7 +150,7 @@ protected function refreshUser(TokenInterface $token)
             return $token;
         }
 
-        $exceptions = [];
+        $exceptions = array();
         foreach ($this->userProviders as $provider) {
             try {
                 $refreshedUser = $provider->refreshUser($user);
@@ -165,7 +165,7 @@ protected function refreshUser(TokenInterface $token)
                 // let's try the next user provider
             } catch (UsernameNotFoundException $notFound) {
                 // let's try the next user provider
-                $exceptions[] = [$notFound, $provider];
+                $exceptions[] = array($notFound, $provider);
             }
         }
 
@@ -179,6 +179,8 @@ protected function refreshUser(TokenInterface $token)
                     $this->logger->warning('Username could not be found in the selected user provider.', array('username' => $notFound->getUsername(), 'provider' => get_class($provider)));
                 }
             }
+
+            return;
         }
 
         throw new \RuntimeException(sprintf('There is no user provider for user "%s".', get_class($user)));
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -24,7 +24,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
 use Symfony\Component\Security\Http\Firewall\ContextListener;
-use Symfony\Component\Security\Tests\Fixtures\Core\SimpleSecurityContext;
+use Symfony\Component\Security\Http\Tests\Fixtures\SimpleSecurityContext;
 
 class ContextListenerTest extends TestCase
 {
@@ -254,7 +254,9 @@ public function testCanRefreshUserWithIdenticalSupportedProviders()
         $session = new Session(new MockArraySessionStorage());
 
         /** @var \Symfony\Component\HttpFoundation\Request $request */
-        $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
+            ->disableOriginalConstructor()
+            ->getMock();
         $request->expects($this->any())->method('hasPreviousSession')->will($this->returnValue(true));
         $request->expects($this->any())->method('getSession')->will($this->returnValue($session));
 
diff --git a/src/Symfony/Component/Security/Http/Tests/Fixtures/SimpleSecurityContext.php b/src/Symfony/Component/Security/Http/Tests/Fixtures/SimpleSecurityContext.php
@@ -9,12 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Fixtures\Core;
+namespace Symfony\Component\Security\Http\Tests\Fixtures;
 
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\SecurityContextInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
-class SimpleSecurityContext implements SecurityContextInterface
+class SimpleSecurityContext implements AuthorizationCheckerInterface, TokenStorageInterface
 {
     protected $token;
 

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ protected function refreshUser(TokenInterface $token)`
`150`	`150`	`return $token;`
`151`	`151`	`}`
`152`	`152`
`153`		`- $exceptions = [];`
	`153`	`+ $exceptions = array();`
`154`	`154`	`foreach ($this->userProviders as $provider) {`
`155`	`155`	`try {`
`156`	`156`	`$refreshedUser = $provider->refreshUser($user);`
`@@ -165,7 +165,7 @@ protected function refreshUser(TokenInterface $token)`
`165`	`165`	`// let's try the next user provider`
`166`	`166`	`} catch (UsernameNotFoundException $notFound) {`
`167`	`167`	`// let's try the next user provider`
`168`		`- $exceptions[] = [$notFound, $provider];`
	`168`	`+ $exceptions[] = array($notFound, $provider);`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`@@ -179,6 +179,8 @@ protected function refreshUser(TokenInterface $token)`
`179`	`179`	`$this->logger->warning('Username could not be found in the selected user provider.', array('username' => $notFound->getUsername(), 'provider' => get_class($provider)));`
`180`	`180`	`}`
`181`	`181`	`}`
	`182`	`+`
	`183`	`+ return;`
`182`	`184`	`}`
`183`	`185`
`184`	`186`	`throw new \RuntimeException(sprintf('There is no user provider for user "%s".', get_class($user)));`