symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+20-13Lines changed: 20 additions & 13 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+20-13Lines changed: 20 additions & 13 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+24Lines changed: 24 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+24Lines changed: 24 additions & 0 deletions
@@ -102,21 +102,28 @@ class NativeSessionStorage implements SessionStorageInterface
      */
     public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
     {
-        $options += array(
-            // disable by default because it's managed by HeaderBag (if used)
-            'cache_limiter' => '',
-            'use_cookies' => 1,
-        );
-
-        if (\PHP_VERSION_ID >= 50400) {
-            session_register_shutdown();
+        $this->setMetadataBag($metaBag);
+
+        if (\PHP_SESSION_ACTIVE === session_status() && \PHP_VERSION_ID >= 70200) {
+            if (!empty($options) || null !== $handler) {
+                throw new \LogicException('Cannot change options or handler of an active session');
+            }
         } else {
-            register_shutdown_function('session_write_close');
-        }
+            $options += array(
+                // disable by default because it's managed by HeaderBag (if used)
+                'cache_limiter' => '',
+                'use_cookies' => 1,
+            );
 
-        $this->setMetadataBag($metaBag);
-        $this->setOptions($options);
-        $this->setSaveHandler($handler);
+            if (\PHP_VERSION_ID >= 50400) {
+                session_register_shutdown();
+            } else {
+                register_shutdown_function('session_write_close');
+            }
+
+            $this->setOptions($options);
+            $this->setSaveHandler($handler);
+        }
     }
 
     /**
 
@@ -272,4 +272,28 @@ public function testRestart()
         $this->assertSame($id, $storage->getId(), 'Same session ID after restarting');
         $this->assertSame(7, $storage->getBag('attributes')->get('lucky'), 'Data still available');
     }
+
+    public function testCanCreateNativeSessionStorageWhenSessionAlreadyStarted()
+    {
+        session_start();
+        $this->getStorage();
+
+        // Assert no exception has been thrown by `getStorage()`
+        $this->assertTrue(true);
+    }
+
+    /**
+     * @expectedException \LogicException
+     */
+    public function testCannotSetSessionOptionsOnceSessionStarted()
+    {
+        if (PHP_VERSION_ID < 70200) {
+            $this->markTestSkipped('Limitation from PHP 7.2 only');
+        }
+
+        session_start();
+        $this->getStorage(array(
+            'name' => 'something-else',
+        ));
+    }
 }