[HttpFoundation] Fix forward-compat of NativeSessionStorage with PHP 7.2

sroze · nicolas-grekas · commit 00a1357d823b · 2017-11-05T19:48:11.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -102,6 +102,12 @@ class NativeSessionStorage implements SessionStorageInterface
      */
     public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
     {
+        $this->setMetadataBag($metaBag);
+
+        if (\PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE === session_status()) {
+            return;
+        }
+
         $options += array(
             // disable by default because it's managed by HeaderBag (if used)
             'cache_limiter' => '',
@@ -114,7 +120,6 @@ public function __construct(array $options = array(), $handler = null, MetadataB
             register_shutdown_function('session_write_close');
         }
 
-        $this->setMetadataBag($metaBag);
         $this->setOptions($options);
         $this->setSaveHandler($handler);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -270,4 +270,30 @@ public function testRestart()
         $this->assertSame($id, $storage->getId(), 'Same session ID after restarting');
         $this->assertSame(7, $storage->getBag('attributes')->get('lucky'), 'Data still available');
     }
+
+    /**
+     * @requires PHP 5.4
+     */
+    public function testCanCreateNativeSessionStorageWhenSessionAlreadyStarted()
+    {
+        session_start();
+        $this->getStorage();
+
+        // Assert no exception has been thrown by `getStorage()`
+        $this->addToAssertionCount(1);
+    }
+
+    /**
+     * @requires PHP 5.4
+     */
+    public function testSetSessionOptionsOnceSessionStartedIsIgnored()
+    {
+        session_start();
+        $this->getStorage(array(
+            'name' => 'something-else',
+        ));
+
+        // Assert no exception has been thrown by `getStorage()`
+        $this->addToAssertionCount(1);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,12 @@ class NativeSessionStorage implements SessionStorageInterface`
`102`	`102`	`*/`
`103`	`103`	`public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)`
`104`	`104`	`{`
	`105`	`+ $this->setMetadataBag($metaBag);`
	`106`	`+`
	`107`	`+ if (\PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE === session_status()) {`
	`108`	`+ return;`
	`109`	`+ }`
	`110`	`+`
`105`	`111`	`$options += array(`
`106`	`112`	`// disable by default because it's managed by HeaderBag (if used)`
`107`	`113`	`'cache_limiter' => '',`
`@@ -114,7 +120,6 @@ public function __construct(array $options = array(), $handler = null, MetadataB`
`114`	`120`	`register_shutdown_function('session_write_close');`
`115`	`121`	`}`
`116`	`122`
`117`		`- $this->setMetadataBag($metaBag);`
`118`	`123`	`$this->setOptions($options);`
`119`	`124`	`$this->setSaveHandler($handler);`
`120`	`125`	`}`