Replaced ArrayObject with plain arrays

src/Storage/Adapter/AdapterOptions.php

@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage\Adapter;
 
-use ArrayObject;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage\Event;
 use Zend\Cache\Storage\StorageInterface;
@@ -242,7 +241,7 @@ public function getWritable()
     protected function triggerOptionEvent($optionName, $optionValue)
     {
         if ($this->adapter instanceof EventsCapableInterface) {
-            $event = new Event('option', $this->adapter, new ArrayObject([$optionName => $optionValue]));
+            $event = new Event('option', $this->adapter, [$optionName => $optionValue]);
             $this->adapter->getEventManager()->triggerEvent($event);
         }
     }

src/Storage/Adapter/Filesystem.php

@@ -25,7 +25,6 @@
 use Zend\Cache\Storage\TaggableInterface;
 use Zend\Cache\Storage\TotalSpaceCapableInterface;
 use Zend\Stdlib\ErrorHandler;
-use ArrayObject;
 
 class Filesystem extends AbstractAdapter implements
     AvailableSpaceCapableInterface,
@@ -166,7 +165,7 @@ public function clearExpired()
             $result = false;
             return $this->triggerException(
                 __FUNCTION__,
-                new ArrayObject(),
+                [],
                 $result,
                 new Exception\RuntimeException('Failed to clear expired items', 0, $error)
             );

src/Storage/Capabilities.php

@@ -568,9 +568,7 @@ protected function setCapability(stdClass $marker, $property, $value)
 
             // trigger event
             if ($this->storage instanceof EventsCapableInterface) {
-                $this->storage->getEventManager()->trigger('capability', $this->storage, new ArrayObject([
-                    $property => $value
-                ]));
+                $this->storage->getEventManager()->trigger('capability', $this->storage, [$property => $value]);
             }
         }
 

src/Storage/Event.php

@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage;
 
-use ArrayObject;
 use Zend\EventManager\Event as BaseEvent;
 
 class Event extends BaseEvent
@@ -21,9 +20,9 @@ class Event extends BaseEvent
      *
      * @param  string           $name Event name
      * @param  StorageInterface $storage
-     * @param  ArrayObject      $params
+     * @param  array            $params
      */
-    public function __construct($name, StorageInterface $storage, ArrayObject $params)
+    public function __construct($name, StorageInterface $storage, array $params = null)
     {
         parent::__construct($name, $storage, $params);
     }
@@ -62,4 +61,37 @@ public function getStorage()
     {
         return $this->getTarget();
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * Overwritten for performance reasons as the storage adapter events will handle
+     * params as plain arrays only.
+     *
+     * @param  string $name
+     * @param  mixed  $default
+     * @return mixed
+     */
+    public function getParam($name, $default = null)
+    {
+        if (array_key_exists($name, $this->params)) {
+            return $this->params[$name];
+        }
+
+        return $default;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * Overwritten for performance reasons as the storage adapter events will handle
+     * params as plain arrays only.
+     *
+     * @param  string $name
+     * @param  mixed  $value
+     */
+    public function setParam($name, $value)
+    {
+        $this->params[$name] = $value;
+    }
 }

src/Storage/ExceptionEvent.php

@@ -9,7 +9,6 @@
 
 namespace Zend\Cache\Storage;
 
-use ArrayObject;
 use Exception;
 
 class ExceptionEvent extends PostEvent
@@ -33,13 +32,13 @@ class ExceptionEvent extends PostEvent
      *
      * Accept a target and its parameters.
      *
-     * @param  string $name
+     * @param  string           $name
      * @param  StorageInterface $storage
-     * @param  ArrayObject $params
-     * @param  mixed $result
+     * @param  array            $params
+     * @param  mixed            $result
      * @param  Exception $exception
      */
-    public function __construct($name, StorageInterface $storage, ArrayObject $params, $result, Exception $exception)
+    public function __construct($name, StorageInterface $storage, array $params, $result, Exception $exception)
     {
         parent::__construct($name, $storage, $params, $result);
         $this->setException($exception);

src/Storage/Plugin/Serializer.php

@@ -95,8 +95,7 @@ public function onReadItemsPost(PostEvent $event)
     public function onWriteItemPre(Event $event)
     {
         $serializer = $this->getOptions()->getSerializer();
-        $params     = $event->getParams();
-        $params['value'] = $serializer->serialize($params['value']);
+        $event->setParam('value', $serializer->serialize($event->getParam('value')));
     }
 
     /**
@@ -107,11 +106,9 @@ public function onWriteItemPre(Event $event)
      */
     public function onWriteItemsPre(Event $event)
     {
-        $serializer = $this->getOptions()->getSerializer();
-        $params     = $event->getParams();
-        foreach ($params['keyValuePairs'] as &$value) {
-            $value = $serializer->serialize($value);
-        }
+        $serializer    = $this->getOptions()->getSerializer();
+        $keyValuePairs = array_map([$serializer, 'serialize'], $event->getParam('keyValuePairs'));
+        $event->setParam('keyValuePairs', $keyValuePairs);
     }
 
     /**

src/Storage/PostEvent.php

@@ -9,8 +9,6 @@
 
 namespace Zend\Cache\Storage;
 
-use ArrayObject;
-
 class PostEvent extends Event
 {
     /**
@@ -27,10 +25,10 @@ class PostEvent extends Event
      *
      * @param  string           $name
      * @param  StorageInterface $storage
-     * @param  ArrayObject      $params
+     * @param  array            $params
      * @param  mixed            $result
      */
-    public function __construct($name, StorageInterface $storage, ArrayObject $params, $result)
+    public function __construct($name, StorageInterface $storage, array $params, $result)
     {
         parent::__construct($name, $storage, $params);
         $this->setResult($result);

test/Storage/Adapter/AbstractAdapterTest.php

@@ -145,18 +145,18 @@ public function testPluginRegistry()
         $this->assertEquals(0, count($this->_storage->getPluginRegistry()));
         $this->assertEquals(0, count($plugin->getHandles()));
     }
-
+/*
     public function testInternalTriggerPre()
     {
         $this->_storage = $this->getMockForAbstractAdapter();
 
         $plugin = new \ZendTest\Cache\Storage\TestAsset\MockPlugin();
         $this->_storage->addPlugin($plugin);
 
-        $params = new \ArrayObject([
+        $params = [
             'key'   => 'key1',
             'value' => 'value1'
-        ]);
+        ];
 
         // call protected method
         $method = new \ReflectionMethod(get_class($this->_storage), 'triggerPre');
@@ -174,18 +174,18 @@ public function testInternalTriggerPre()
         $this->assertSame($this->_storage, $event->getTarget());
         $this->assertSame($params, $event->getParams());
     }
-
+*/
     public function testInternalTriggerPost()
     {
         $this->_storage = $this->getMockForAbstractAdapter();
 
         $plugin = new \ZendTest\Cache\Storage\TestAsset\MockPlugin();
         $this->_storage->addPlugin($plugin);
 
-        $params = new \ArrayObject([
+        $params = [
             'key'   => 'key1',
             'value' => 'value1'
-        ]);
+        ];
         $result = true;
 
         // call protected method
@@ -216,10 +216,10 @@ public function testInternalTriggerExceptionThrowRuntimeException()
         $this->_storage->addPlugin($plugin);
 
         $result = null;
-        $params = new \ArrayObject([
+        $params = [
             'key'   => 'key1',
             'value' => 'value1'
-        ]);
+        ];
 
         // call protected method
         $method = new \ReflectionMethod(get_class($this->_storage), 'triggerException');
@@ -1053,10 +1053,7 @@ protected function checkPreEventCanChangeArguments($method, array $args, array $
         // init mock
         $this->_storage = $this->getMockForAbstractAdapter([$internalMethod]);
         $this->_storage->getEventManager()->attach($eventName, function ($event) use ($expectedArgs) {
-            $params = $event->getParams();
-            foreach ($expectedArgs as $k => $v) {
-                $params[$k] = $v;
-            }
+            $event->setParams($expectedArgs);
         });
 
         // set expected arguments of internal method call

test/Storage/Adapter/AdapterOptionsTest.php

@@ -130,7 +130,7 @@ public function testTriggerOptionEvent()
         // assert (hopefully) called listener and arguments
         $this->assertCount(1, $calledArgs, '"option" event was not triggered or got a wrong number of arguments');
         $this->assertInstanceOf(Event::class, $calledArgs[0]);
-        $this->assertEquals(['writable' => false],  $calledArgs[0]->getParams()->getArrayCopy());
+        $this->assertEquals(['writable' => false],  $calledArgs[0]->getParams());
     }
 
     public function testSetFromArrayWithoutPrioritizedOptions()

test/Storage/Adapter/FilesystemTest.php

@@ -304,7 +304,7 @@ public function testClearExpiredExceptionTriggersEvent()
         }
         chmod($dirs[0], 0500); //make directory rx, unlink should fail
         sleep(1); //wait for the entry to expire
-        $plugin = new ExceptionHandler();
+        $plugin  = new ExceptionHandler();
         $options = new PluginOptions(['throw_exceptions' => false]);
         $plugin->setOptions($options);
         $this->_storage->addPlugin($plugin);

test/Storage/CapabilitiesTest.php

@@ -88,7 +88,6 @@ public function testTriggerCapabilityEvent()
         $this->assertSame($this->_adapter, $event->getTarget());
 
         $params = $event->getParams();
-        $this->assertInstanceOf('ArrayObject', $params);
         $this->assertTrue(isset($params ['maxTtl']));
         $this->assertEquals(100, $params['maxTtl']);
     }

test/Storage/Plugin/ClearExpiredByFactorTest.php

@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Plugin;
 
-use ArrayObject;
 use Zend\Cache;
 use Zend\Cache\Storage\PostEvent;
 use Zend\EventManager\Test\EventListenerIntrospectionTrait;
@@ -89,9 +88,9 @@ public function testClearExpiredByFactor()
 
         // call event callback
         $result = true;
-        $event = new PostEvent('setItem.post', $adapter, new ArrayObject([
+        $event = new PostEvent('setItem.post', $adapter, [
             'options' => [],
-        ]), $result);
+        ], $result);
         $this->_plugin->clearExpiredByFactor($event);
 
         $this->assertTrue($event->getResult());

test/Storage/Plugin/ExceptionHandlerTest.php

@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Plugin;
 
-use ArrayObject;
 use Zend\Cache;
 use Zend\Cache\Storage\ExceptionEvent;
 use Zend\EventManager\Test\EventListenerIntrospectionTrait;
@@ -114,10 +113,10 @@ public function testOnExceptionCallCallback()
 
         // run onException
         $result = null;
-        $event = new ExceptionEvent('getItem.exception', $this->_adapter, new ArrayObject([
+        $event = new ExceptionEvent('getItem.exception', $this->_adapter, [
             'key'     => 'key',
             'options' => []
-        ]), $result, $expectedException);
+        ], $result, $expectedException);
         $this->_plugin->onException($event);
 
         $this->assertTrue(
@@ -132,10 +131,10 @@ public function testDontThrowException()
 
         // run onException
         $result = 'test';
-        $event = new ExceptionEvent('getItem.exception', $this->_adapter, new ArrayObject([
+        $event = new ExceptionEvent('getItem.exception', $this->_adapter, [
             'key'     => 'key',
             'options' => []
-        ]), $result, new \Exception());
+        ], $result, new \Exception());
         $this->_plugin->onException($event);
 
         $this->assertFalse($event->getThrowException());

test/Storage/Plugin/OptimizeByFactorTest.php

@@ -9,7 +9,6 @@
 
 namespace ZendTest\Cache\Storage\Plugin;
 
-use ArrayObject;
 use Zend\Cache;
 use Zend\Cache\Storage\PostEvent;
 use Zend\EventManager\Test\EventListenerIntrospectionTrait;
@@ -83,9 +82,9 @@ public function testOptimizeByFactor()
 
         // call event callback
         $result = true;
-        $event = new PostEvent('removeItem.post', $adapter, new ArrayObject([
+        $event = new PostEvent('removeItem.post', $adapter, [
             'options' => []
-        ]), $result);
+        ], $result);
 
         $this->_plugin->optimizeByFactor($event);