Merge branch 'hotfix/21' into develop

Forward port #21

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 1.1.1 - TBD
+## 1.1.1 - 2018-05-14
 
 ### Added
 
@@ -44,7 +44,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#21](https://github.com/zendframework/zend-expressive-session-ext/pull/21) fixes a situation whereby during persistence, if no identifier existed for
+  the session, it was not persisted. Such situations would occur when a new session was created, as
+  no identifier would yet exist. It now properly generates an identifier and persists the data in
+  such cirumstances.
 
 ## 1.1.0 - 2018-05-10
 

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2017, Zend Technologies USA, Inc.
+Copyright (c) 2017-2018, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

src/PhpSessionPersistence.php

@@ -1,13 +1,12 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-session-ext for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-session-ext/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Expressive\Session\Ext;
 
-use Dflydev\FigCookies\FigCookies\Cookie;
 use Dflydev\FigCookies\FigRequestCookies;
 use Dflydev\FigCookies\FigResponseCookies;
 use Dflydev\FigCookies\SetCookie;
@@ -100,7 +99,11 @@ public function initializeSessionFromRequest(ServerRequestInterface $request) :
 
     public function persistSession(SessionInterface $session, ResponseInterface $response) : ResponseInterface
     {
-        if ($session->isRegenerated()) {
+        // Regenerate if the session is marked as regenerated
+        // Regenerate if there is no cookie id set but the session has changed (new session with data)
+        if ($session->isRegenerated()
+            || (! $this->cookie && $session->hasChanged())
+        ) {
             $this->regenerateSession();
         }
 

test/PhpSessionPersistenceTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-session-ext for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-session-ext/blob/master/LICENSE.md New BSD License
  */
 
@@ -182,7 +182,7 @@ public function testPersistSessionIfSessionHasContents()
     {
         $this->startSession();
         $session = new Session(['foo' => 'bar']);
-        $this->persistence->persistSession($session, new Response);
+        $this->persistence->persistSession($session, new Response());
         $this->assertSame($session->toArray(), $_SESSION);
     }
 
@@ -416,4 +416,30 @@ public function testPersistSessionReturnsExpectedResponseWithoutAddedCacheHeader
 
         $this->restoreOriginalSessionIniSettings($ini);
     }
+
+    public function testCookiesNotSetWithoutRegenerate()
+    {
+        $persistence = new PhpSessionPersistence();
+        $request = new ServerRequest();
+        $session = $persistence->initializeSessionFromRequest($request);
+
+        $response = new Response();
+        $response = $persistence->persistSession($session, $response);
+
+        $this->assertFalse($response->hasHeader('Set-Cookie'));
+    }
+
+    public function testCookiesSetWithoutRegenerate()
+    {
+        $persistence = new PhpSessionPersistence();
+        $request = new ServerRequest();
+        $session = $persistence->initializeSessionFromRequest($request);
+
+        $session->set('foo', 'bar');
+
+        $response = new Response();
+        $response = $persistence->persistSession($session, $response);
+
+        $this->assertNotEmpty($response->getHeaderLine('Set-Cookie'));
+    }
 }