Merge branch 'hotfix/105'

Close #105
zendframework · Jan 31, 2018 · aaebc1e · aaebc1e
2 parents b5acadc + d24c685
commit aaebc1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,10 @@ All notable changes to this project will be documented in this file, in reverse
   either set production INI values in your production `php.ini`, and/or always
   pass your fully configured session manager to container instances you create.
 
+- [#105](https://github.com/zendframework/zend-session/pull/105) fixes an edge
+  case whereby if the special `__ZF` session value is a non-array value,
+  initializing the session would result in errors.
+
 ## 2.8.3 - 2017-12-01
 
 ### Added

diff --git a/src/Storage/AbstractSessionArrayStorage.php b/src/Storage/AbstractSessionArrayStorage.php
@@ -355,7 +355,7 @@ public function setMetadata($key, $value, $overwriteArray = false)
             );
         }
 
-        if (! isset($_SESSION['__ZF'])) {
+        if (! isset($_SESSION['__ZF']) || ! is_array($_SESSION['__ZF'])) {
             $_SESSION['__ZF'] = [];
         }
         if (isset($_SESSION['__ZF'][$key]) && is_array($value)) {