Merge pull request #187 from stripthis/2.0

Fix deprecated warnings for CakePHP 3.7

Author: burzum

.scrutinizer.yml

@@ -21,10 +21,7 @@ build:
     project_setup:
         before:
             - mysql -e "CREATE DATABASE test"
-            - sudo composer self-update
-            - composer --version
-            - composer global require hirak/prestissimo --no-plugins
-            - composer install --prefer-dist --no-interaction
+
     tests:
         override:
             -

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
   - nightly
 
 env:

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "burzum/cakephp-file-storage",
 	"type": "cakephp-plugin",
-	"description": "This plugin is giving you the possibility to store files in virtually and kind of storage backend. This plugin is wrapping the Gaufrette library (https://github.com/KnpLabs/Gaufrette) library in a CakePHP fashion and provides a simple way to use the storage adapters through the StorageManager class.",
+	"description": "This plugin is giving you the possibility to store files in virtually any kind of storage backend. This plugin is wrapping the Gaufrette library (https://github.com/KnpLabs/Gaufrette) library in a CakePHP fashion and provides a simple way to use the storage adapters through the StorageManager class.",
 	"keywords": ["file", "filesystem", "media", "abstraction", "upload", "cakephp", "storage"],
 	"homepage": "http://github.com/burzum/cakephp-file-storage-plugin",
 	"license": "MIT",
@@ -23,7 +23,7 @@
 		"cakephp/cakephp": "^3.6.0",
 		"cakephp/plugin-installer": "^1.0.0",
 		"cakephp/migrations": "^2.0.0",
-		"knplabs/gaufrette": "^0.7.0"
+		"knplabs/gaufrette": "^0.7.0|^0.8.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^5.7.14|^6.0",

composer.lock

@@ -1,22 +1,31 @@
 <?php
 use Burzum\FileStorage\Storage\Listener\ImageProcessingListener;
 use Burzum\FileStorage\Storage\Listener\LocalListener;
+use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Event\EventManager;
 use Cake\Log\Log;
 
 $listener = new LocalListener();
 EventManager::instance()->on($listener);
 
-if (Plugin::loaded('Burzum/Imagine')) {
+if (\version_compare(Configure::version(), '3.7.0', 'ge')) {
+	$imaginePluginIsLoaded = Plugin::isLoaded('Burzum/Imagine');
+} else {
+	$imaginePluginIsLoaded = Plugin::loaded('Burzum/Imagine');
+}
+
+if ($imaginePluginIsLoaded) {
 	$listener = new ImageProcessingListener();
 	EventManager::instance()->on($listener);
 }
 
-Log::setConfig('FileStorage', [
-	'className' => 'File',
-	'path' => LOGS,
-	'levels' => [],
-	'scopes' => ['fileStorage'],
-	'file' => 'fileStorage.log',
-]);
+if (Log::getConfig('FileStorage') === null) {
+    Log::setConfig('FileStorage', [
+        'className' => 'File',
+        'path' => LOGS,
+        'levels' => [],
+        'scopes' => ['fileStorage'],
+        'file' => 'fileStorage.log',
+    ]);
+}

config/bootstrap.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Burzum\FileStorage;
+
+use Cake\Core\BasePlugin;
+
+/**
+ * FileStorage Plugin for CakePHP
+ */
+class Plugin extends BasePlugin {
+}

src/Plugin.php

@@ -121,14 +121,14 @@ public function afterSave(Event $event, EntityInterface $entity) {
 	 * @return void
 	 */
 	public function imagePath(Event $event) {
-		$event->setData($event->getData()+ [
+		$event->setData($event->getData() + [
 			'image' => null,
 			'version' => null,
 			'options' => [],
 			'pathType' => 'fullPath'
 		]);
 
-		$data = $event->getData()+ [
+		$data = $event->getData() + [
 				'image' => null,
 				'version' => null,
 				'options' => [],
@@ -188,7 +188,7 @@ protected function _processImages(Event $event, $method) {
 		}
 
 		$versions = $this->_getVersionData($event);
-		$options = (array)$event->getData('options') ;
+		$options = (array)$event->getData('options');
 
 		$this->loadImageProcessingFromConfig();
 		$event->result = $this->{$method}(
@@ -209,10 +209,11 @@ protected function _processImages(Event $event, $method) {
 	 * @return array
 	 */
 	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->getData();
+		if (isset($data['versions'])) {
+			$versions = $data['versions'];
+		} elseif (isset($data['operations'])) {
+			$versions = array_keys($data['operations']);
 		} else {
 			$versions = [];
 		}