Merge feccaeb into 7e73dc4

zendframework · Nov 28, 2017 · 0995dc8 · 0995dc8
2 parents 7e73dc4 + feccaeb
commit 0995dc8
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/SessionManager.php b/src/SessionManager.php
@@ -132,17 +132,13 @@ public function start($preserveStorage = false)
             // ArrayUtils::merge parameter
             if ($oldSessionData instanceof Storage\StorageInterface) {
                 $oldSessionData = $oldSessionData->toArray();
-            } elseif ($oldSessionData instanceof \Traversable) {
+            } elseif ($oldSessionData instanceof Traversable) {
                 $oldSessionData = iterator_to_array($oldSessionData);
             }
         }
 
         session_start();
 
-        if ($oldSessionData instanceof Traversable) {
-            $oldSessionData = $oldSessionData->toArray();
-        }
-
         if (! empty($oldSessionData) && is_array($oldSessionData)) {
             $_SESSION = ArrayUtils::merge($oldSessionData, $_SESSION, true);
         }