Merge branch 'hotfix/3429'

Close zendframework/zendframework#3429
Fixes zendframework/zendframework#2628
Fixes zendframework/zendframework#3075
Fixes zendframework/zendframework#3108
Fixes zendframework/zendframework#3182

src/SessionManager.php

@@ -42,6 +42,17 @@ class SessionManager extends AbstractManager
      */
     protected $validatorChain;
 
+    /**
+     * Destructor
+     * Ensures that writeClose is called.
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        $this->writeClose();
+    }
+
     /**
      * Does a session exist and is it currently active?
      *
@@ -149,10 +160,12 @@ public function writeClose()
         // flushed to the session handler. As such, we now mark the storage
         // object isImmutable.
         $storage  = $this->getStorage();
-        $_SESSION = (array) $storage;
-        session_write_close();
-        $storage->fromArray($_SESSION);
-        $storage->markImmutable();
+        if (!$storage->isImmutable()) {
+            $_SESSION = (array) $storage;
+            session_write_close();
+            $storage->fromArray($_SESSION);
+            $storage->markImmutable();
+        }
     }
 
     /**

test/SessionManagerTest.php

@@ -326,6 +326,18 @@ public function testCallingWriteCloseMarksStorageAsImmutable()
         $this->assertTrue($storage->isImmutable());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testCallingDestructorMarksStorageAsImmutable()
+    {
+        $this->manager->start();
+        $storage = $this->manager->getStorage();
+        $storage['foo'] = 'bar';
+        $this->manager = null;
+        $this->assertTrue($storage->isImmutable());
+    }
+
     /**
      * @runInSeparateProcess
      */