simplified code

fabpot · fabpot · commit 9b3c298c1785 · 2018-05-24T20:27:06.000+02:00
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
@@ -140,10 +140,6 @@ private function migrateSession(Request $request)
         if (!$request->hasSession() || !$request->hasPreviousSession()) {
             return;
         }
-
-        // Destroying the old session is broken in php 5.4.0 - 5.4.10
-        // See https://bugs.php.net/63379
-        $destroy = \PHP_VERSION_ID < 50400 || \PHP_VERSION_ID >= 50411;
-        $request->getSession()->migrate($destroy);
+        $request->getSession()->migrate(true);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
@@ -123,10 +123,6 @@ private function migrateSession(Request $request)
         if (!$request->hasSession() || !$request->hasPreviousSession()) {
             return;
         }
-
-        // Destroying the old session is broken in php 5.4.0 - 5.4.10
-        // See https://bugs.php.net/63379
-        $destroy = \PHP_VERSION_ID < 50400 || \PHP_VERSION_ID >= 50411;
-        $request->getSession()->migrate($destroy);
+        $request->getSession()->migrate(true);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php
@@ -98,10 +98,6 @@ private function migrateSession(Request $request)
         if (!$request->hasSession() || !$request->hasPreviousSession()) {
             return;
         }
-
-        // Destroying the old session is broken in php 5.4.0 - 5.4.10
-        // See https://bugs.php.net/63379
-        $destroy = \PHP_VERSION_ID < 50400 || \PHP_VERSION_ID >= 50411;
-        $request->getSession()->migrate($destroy);
+        $request->getSession()->migrate(true);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
@@ -141,11 +141,7 @@ private function migrateSession(Request $request)
         if (!$request->hasSession() || !$request->hasPreviousSession()) {
             return;
         }
-
-        // Destroying the old session is broken in php 5.4.0 - 5.4.10
-        // See https://bugs.php.net/63379
-        $destroy = \PHP_VERSION_ID < 50400 || \PHP_VERSION_ID >= 50411;
-        $request->getSession()->migrate($destroy);
+        $request->getSession()->migrate(true);
     }
 }
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
@@ -129,10 +129,6 @@ private function migrateSession(Request $request)
         if (!$request->hasSession() || !$request->hasPreviousSession()) {
             return;
         }
-
-        // Destroying the old session is broken in php 5.4.0 - 5.4.10
-        // See https://bugs.php.net/63379
-        $destroy = \PHP_VERSION_ID < 50400 || \PHP_VERSION_ID >= 50411;
-        $request->getSession()->migrate($destroy);
+        $request->getSession()->migrate(true);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php
@@ -49,11 +49,7 @@ public function onAuthentication(Request $request, TokenInterface $token)
             case self::MIGRATE:
                 // Note: this logic is duplicated in several authentication listeners
                 // until Symfony 5.0 due to a security fix with BC compat
-
-                // Destroying the old session is broken in php 5.4.0 - 5.4.10
-                // See https://bugs.php.net/63379
-                $destroy = \PHP_VERSION_ID < 50400 || \PHP_VERSION_ID >= 50411;
-                $request->getSession()->migrate($destroy);
+                $request->getSession()->migrate(true);
 
                 return;
 

Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,6 @@ private function migrateSession(Request $request)`
`140`	`140`	`if (!$request->hasSession() \|\| !$request->hasPreviousSession()) {`
`141`	`141`	`return;`
`142`	`142`	`}`
`143`		`-`
`144`		`- // Destroying the old session is broken in php 5.4.0 - 5.4.10`
`145`		`- // See https://bugs.php.net/63379`
`146`		`- $destroy = \PHP_VERSION_ID < 50400 \|\| \PHP_VERSION_ID >= 50411;`
`147`		`- $request->getSession()->migrate($destroy);`
	`143`	`+ $request->getSession()->migrate(true);`
`148`	`144`	`}`
`149`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,10 +123,6 @@ private function migrateSession(Request $request)`
`123`	`123`	`if (!$request->hasSession() \|\| !$request->hasPreviousSession()) {`
`124`	`124`	`return;`
`125`	`125`	`}`
`126`		`-`
`127`		`- // Destroying the old session is broken in php 5.4.0 - 5.4.10`
`128`		`- // See https://bugs.php.net/63379`
`129`		`- $destroy = \PHP_VERSION_ID < 50400 \|\| \PHP_VERSION_ID >= 50411;`
`130`		`- $request->getSession()->migrate($destroy);`
	`126`	`+ $request->getSession()->migrate(true);`
`131`	`127`	`}`
`132`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,6 @@ private function migrateSession(Request $request)`
`98`	`98`	`if (!$request->hasSession() \|\| !$request->hasPreviousSession()) {`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`		`-`
`102`		`- // Destroying the old session is broken in php 5.4.0 - 5.4.10`
`103`		`- // See https://bugs.php.net/63379`
`104`		`- $destroy = \PHP_VERSION_ID < 50400 \|\| \PHP_VERSION_ID >= 50411;`
`105`		`- $request->getSession()->migrate($destroy);`
	`101`	`+ $request->getSession()->migrate(true);`
`106`	`102`	`}`
`107`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,11 +141,7 @@ private function migrateSession(Request $request)`
`141`	`141`	`if (!$request->hasSession() \|\| !$request->hasPreviousSession()) {`
`142`	`142`	`return;`
`143`	`143`	`}`
`144`		`-`
`145`		`- // Destroying the old session is broken in php 5.4.0 - 5.4.10`
`146`		`- // See https://bugs.php.net/63379`
`147`		`- $destroy = \PHP_VERSION_ID < 50400 \|\| \PHP_VERSION_ID >= 50411;`
`148`		`- $request->getSession()->migrate($destroy);`
	`144`	`+ $request->getSession()->migrate(true);`
`149`	`145`	`}`
`150`	`146`	`}`
`151`	`147`
Original file line number	Diff line number	Diff line change
`@@ -129,10 +129,6 @@ private function migrateSession(Request $request)`
`129`	`129`	`if (!$request->hasSession() \|\| !$request->hasPreviousSession()) {`
`130`	`130`	`return;`
`131`	`131`	`}`
`132`		`-`
`133`		`- // Destroying the old session is broken in php 5.4.0 - 5.4.10`
`134`		`- // See https://bugs.php.net/63379`
`135`		`- $destroy = \PHP_VERSION_ID < 50400 \|\| \PHP_VERSION_ID >= 50411;`
`136`		`- $request->getSession()->migrate($destroy);`
	`132`	`+ $request->getSession()->migrate(true);`
`137`	`133`	`}`
`138`	`134`	`}`