Merge 81cd866 into c88eaa4

.editorconfig

@@ -0,0 +1,19 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.bat]
+end_of_line = crlf
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitignore

@@ -1 +1,2 @@
-/vendor
+/vendor
+/.idea

.travis.yml

@@ -2,30 +2,27 @@ language: php
 sudo: false
 
 php:
-  - 5.5
   - 5.6
   - 7.0
 
 matrix:
-  allow_failures:
-    - php: 7.0
-
   fast_finish: true
-
   include:
     - php: 5.6
       env:
         - COVERALLS=1
 
 before_script:
+  - printf "\n" | pecl install imagick
   - composer self-update
+  - composer global require hirak/prestissimo
   - composer install --prefer-dist --no-interaction
   - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
   - sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
 
 script:
-  - phpunit
-  - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
+  - vendor/bin/phpunit
+  - sh -c "if [ '$COVERALLS' = '1' ]; then vendor/bin/phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
   - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
 
 notifications:

README.md

@@ -11,8 +11,8 @@ The **Imagine** plugin is a CakePHP wrapper around the [Imagine image manipulati
 Requirements
 ------------
 
- * CakePHP 3.0+
- * PHP 5.4+
+ * CakePHP 3.4 since v2.2
+   * Use v2.1 for older CakePHP versions 
  * [Imagine](https://github.com/avalanche123/Imagine)
 
 Documentation
@@ -30,7 +30,7 @@ Contributing
 
 To contribute to this plugin please follow a few basic rules.
 
-* Pull requests must be send to the ```develop``` branch.
+* Pull requests must be sent to the ```develop``` branch.
 * Contributions must follow the [PSR2-**R** coding standard recommendation](https://github.com/php-fig-rectified/fig-rectified-standards).
 * [Unit tests](http://book.cakephp.org/3.0/en/development/testing.html) are required.
 

composer.json

@@ -12,12 +12,12 @@
 		}
 	],
 	"require": {
-		"cakephp/cakephp": "3.*",
+		"cakephp/cakephp": "^3.4",
 		"imagine/imagine": "0.6.*",
 		"cakephp/plugin-installer": "*"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "4.*"
+		"phpunit/phpunit": "5.7.*"
 	},
 	"autoload": {
  		"psr-4": {