Fixing tests

src/Storage/Listener/BaseListener.php

@@ -144,6 +144,7 @@ public function imagePath(Event $event) {
 		$this->_loadImageProcessingFromConfig();
 		$data['path'] = $this->imageVersionPath($entity, $version, $type, $options);
 
+		$event->setData($data);
 		$event->setResult($data['path']);
 		$event->stopPropagation();
 	}
@@ -174,19 +175,21 @@ public function createImageVersion(Event $event) {
 	 * return void
 	 */
 	protected function _processImages(Event $event, $method) {
-		if ($this->config('imageProcessing') !== true) {
+		if ($this->getConfig('imageProcessing') !== true) {
 			return;
 		}
 
+		$options = $event->getData('options');
 		$versions = $this->_getVersionData($event);
-		$options = isset($event->data['options']) ? $event->data['options'] : [];
+		$options = !empty($options) ? $options : [];
 
 		$this->_loadImageProcessingFromConfig();
-		$event->result = $this->{$method}(
-			$event->data['record'],
+
+		$event->setResult($this->{$method}(
+			$event->getData('record'),
 			$versions,
 			$options
-		);
+		));
 	}
 
 	/**
@@ -201,10 +204,12 @@ protected function _processImages(Event $event, $method) {
 	 */
 	protected function _getVersionData($event)
 	{
-		if (isset($event->data['versions'])) {
-			$versions = $event->data['versions'];
-		} elseif (isset($event->data['operations'])) {
-			$versions = array_keys($event->data['operations']);
+		$data = $event->data['versions'];
+
+		if (isset($data['versions'])) {
+			$versions = $data['versions'];
+		} elseif (isset($data['operations'])) {
+			$versions = array_keys($data['operations']);
 		} else {
 			$versions = [];
 		}

tests/TestCase/Storage/Listener/LocalListenerTest.php

@@ -93,8 +93,9 @@ public function testImagePath() {
 
 		$expected = 'Test' . DS . '5c' . DS . '39' . DS . '33' . DS . 'e479b480f60b11e1a21f0800200c9a66' . DS . 'e479b480f60b11e1a21f0800200c9a66.c3f33c2a.jpg';
 		$this->listener->imagePath($event);
-		$this->assertEquals($event->getData('path'), $expected);
-		$this->assertEquals($event->result, $expected);
+
+		$this->assertEquals($expected, $event->getData('path'));
+		$this->assertEquals($expected, $event->result);
 	}
 
 	/**