Merge branch 'hotfix/45'

Close #45

Author: weierophinney

CHANGELOG.md

@@ -21,6 +21,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#51](https://github.com/zendframework/zend-session/pull/51) provides a fix to
   the `DbTableGateway` save handler to prevent infinite recursion when
   attempting to destroy an expired record during initial read operations.
+- [#45](https://github.com/zendframework/zend-session/pull/45) updates the
+  `SessionManager::regenerateId()` method to only regenerate the identifier if a
+  session already exists.
 
 ## 2.7.2 - 2016-06-24
 

src/SessionManager.php

@@ -320,7 +320,10 @@ public function getId()
      */
     public function regenerateId($deleteOldSession = true)
     {
-        session_regenerate_id((bool) $deleteOldSession);
+        if ($this->sessionExists()) {
+            session_regenerate_id((bool) $deleteOldSession);
+        }
+
         return $this;
     }
 

test/SessionManagerTest.php

@@ -433,6 +433,17 @@ public function testRegenerateIdShouldWorkAfterSessionStarted()
         $this->assertNotSame($origId, $this->manager->getId());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testRegenerateIdDoesNothingWhenSessioIsNotStarted()
+    {
+        $origId = $this->manager->getId();
+        $this->manager->regenerateId();
+        $this->assertEquals($origId, $this->manager->getId());
+        $this->assertEquals('', $this->manager->getId());
+    }
+
     /**
      * @runInSeparateProcess
      */