minor #24623 [Session] remove lazy_write polyfill for php < 7.0 (Tobion)

fabpot · fabpot · commit 10ab3a648c9a · 2017-10-19T10:25:13.000-07:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [Session] remove lazy_write polyfill for php < 7.0 | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no  | BC breaks? |no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Remove the session.lazy_write fallback implementation for php < 7 introduced in #24523 as we don't need it in sf 4 Commits ------- 1f84b1f [Session] remove lazy_write polyfill for php < 7.0
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
@@ -88,9 +88,6 @@ public function read($sessionId)
 
         $data = $this->doRead($sessionId);
         $this->newSessionId = '' === $data ? $sessionId : null;
-        if (\PHP_VERSION_ID < 70000) {
-            $this->prefetchData = $data;
-        }
 
         return $data;
     }
@@ -100,14 +97,6 @@ public function read($sessionId)
      */
     public function write($sessionId, $data)
     {
-        if (\PHP_VERSION_ID < 70000 && $this->prefetchData) {
-            $readData = $this->prefetchData;
-            $this->prefetchData = null;
-
-            if ($readData === $data) {
-                return $this->updateTimestamp($sessionId, $data);
-            }
-        }
         if (null === $this->igbinaryEmptyData) {
             // see https://github.com/igbinary/igbinary/issues/146
             $this->igbinaryEmptyData = \function_exists('igbinary_serialize') ? igbinary_serialize(array()) : '';
@@ -125,9 +114,6 @@ public function write($sessionId, $data)
      */
     public function destroy($sessionId)
     {
-        if (\PHP_VERSION_ID < 70000) {
-            $this->prefetchData = null;
-        }
         if (!headers_sent() && ini_get('session.use_cookies')) {
             if (!$this->sessionName) {
                 throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', get_class($this)));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -13,9 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-/**
- * @requires PHP 7.0
- */
 class AbstractSessionHandlerTest extends TestCase
 {
     private static $server;

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`
`16`		`-/**`
`17`		`- * @requires PHP 7.0`
`18`		- */
`19`	`16`	`class AbstractSessionHandlerTest extends TestCase`
`20`	`17`	`{`
`21`	`18`	`private static $server;`