Merge branch '4.4' into 5.0

* 4.4: [Security] Allow switching to another user when already switched
symfony · Feb 26, 2020 · bbf735c · bbf735c
2 parents 1c1f58c + 21c4270
commit bbf735c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Tests/Functional/SwitchUserTest.php b/Tests/Functional/SwitchUserTest.php
@@ -29,15 +29,15 @@ public function testSwitchUser($originalUser, $targetUser, $expectedUser, $expec
         $this->assertEquals($expectedUser, $client->getProfile()->getCollector('security')->getUser());
     }
 
-    public function testSwitchedUserCannotSwitchToOther()
+    public function testSwitchedUserCanSwitchToOther()
     {
         $client = $this->createAuthenticatedClient('user_can_switch');
 
         $client->request('GET', '/profile?_switch_user=user_cannot_switch_1');
         $client->request('GET', '/profile?_switch_user=user_cannot_switch_2');
 
-        $this->assertEquals(500, $client->getResponse()->getStatusCode());
-        $this->assertEquals('user_cannot_switch_1', $client->getProfile()->getCollector('security')->getUser());
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('user_cannot_switch_2', $client->getProfile()->getCollector('security')->getUser());
     }
 
     public function testSwitchedUserExit()

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "symfony/security-core": "^4.4|^5.0",
         "symfony/security-csrf": "^4.4|^5.0",
         "symfony/security-guard": "^4.4|^5.0",
-        "symfony/security-http": "^4.4.3|^5.0.3"
+        "symfony/security-http": "^4.4.5|^5.0.5"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.0",