Merge branch 'hotfix/122' into develop

Forward port #122

Author: michalbundyra

CHANGELOG.md

@@ -44,7 +44,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#122](https://github.com/zendframework/zend-session/pull/122) fixes
+  type check for configuration of session storage. Allows input to be
+  an instance of ArrayAccess or an array.
 
 ## 2.8.6 - 2019-08-11
 

src/Storage/Factory.php

@@ -131,17 +131,16 @@ protected static function createSessionArrayStorage($type, array $options)
     {
         $input = null;
         if (isset($options['input'])) {
-            if (null !== $options['input']
-                && ! is_array($options['input'])
+            $input = $options['input'];
+            if (! is_array($input)
                 && ! $input instanceof ArrayAccess
             ) {
                 throw new Exception\InvalidArgumentException(sprintf(
                     '%s expects the "input" option to be null, an array, or to implement ArrayAccess; received "%s"',
                     $type,
-                    (is_object($options['input']) ? get_class($options['input']) : gettype($options['input']))
+                    is_object($input) ? get_class($input) : gettype($input)
                 ));
             }
-            $input = $options['input'];
         }
 
         return new $type($input);

test/Service/StorageFactoryTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Session\Service;
 
+use ArrayObject;
 use PHPUnit\Framework\TestCase;
 use Zend\ServiceManager\Config;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
@@ -68,6 +69,16 @@ public function sessionStorageConfig()
                     ],
                 ],
             ], SessionArrayStorage::class],
+            'session-array-storage-arrayobject' => [[
+                'session_storage' => [
+                    'type' => 'SessionArrayStorage',
+                    'options' => [
+                        'input' => new ArrayObject([
+                            'foo' => 'bar',
+                        ]),
+                    ],
+                ],
+            ], SessionArrayStorage::class],
             'session-array-storage-fqcn' => [[
                 'session_storage' => [
                     'type' => SessionArrayStorage::class,
@@ -93,6 +104,21 @@ public function testUsesConfigurationToCreateStorage($config, $class)
         $this->assertEquals($config['session_storage']['options']['input'], $test);
     }
 
+    public function testConfigurationWithoutInputIsValid()
+    {
+        $this->services->setService('config', [
+            'session_storage' => [
+                'type' => SessionArrayStorage::class,
+                'options' => [],
+            ],
+        ]);
+
+        $storage = $this->services->get(StorageInterface::class);
+
+        $this->assertInstanceOf(SessionArrayStorage::class, $storage);
+        $this->assertSame([], $storage->toArray());
+    }
+
     public function invalidSessionStorageConfig()
     {
         return [