Merge pull request #24 from mirko-pagliai/develop

Develop

.travis.yml

@@ -15,10 +15,14 @@ matrix:
     - php: 7.0
       env: COVERAGE=1
 
+    - php: 7.0
+      env: CAKEPHP_VERSION="3.4.*"
+
 install:
   - printf "\n" | pecl install imagick
   - composer self-update
   - composer install --prefer-dist --no-interaction
+  - if [[ ! -z "$CAKEPHP_VERSION" ]]; then composer require --update-with-dependencies cakephp/cakephp:${CAKEPHP_VERSION}; fi
 
 script:
   - if [[ $PHPCS != '1' && $COVERAGE != '1' ]]; then vendor/bin/phpunit --exclude-group imageEquals; fi

CHANGELOG.md

@@ -1,4 +1,9 @@
 # 1.x branch
+## 1.2 branch
+# 1.2.0
+* updated for intervention/image 2.4;
+* some little fixes. This package requires at least CakePHP 3.4.
+
 ## 1.1 branch
 # 1.1.1
 * fixed bug when using similar format name, , as `jpeg` or `tif`;

README.md

@@ -41,8 +41,15 @@ For more information about supported format, please refer to the
 You can install the plugin via composer:
 
     $ composer require --prefer-dist mirko-pagliai/cakephp-thumber
+
+**NOTE**: the package may require one of the latest versions version of CakePHP.  
+Instead, the [cakephp3.2](//github.com/mirko-pagliai/cakephp-thumber/tree/cakephp3.2)
+branch is compatible with CakePHP versions from 3.2 onwards.  
+In this case, you can install the package as well:
+
+    $ composer require --prefer-dist mirko-pagliai/cakephp-thumber:dev-cakephp3.2
 
-Then you have to edit `APP/config/bootstrap.php` to load the plugin:
+After installation, you have to edit `APP/config/bootstrap.php` to load the plugin:
 
     Plugin::load('Thumber', ['bootstrap' => true, 'routes' => true]);
 

composer.json

@@ -10,8 +10,8 @@
     }],
     "require": {
         "php": ">=5.5.9",
-        "cakephp/cakephp": ">=3.2.0 <4.0",
-        "intervention/image": "^2.3"
+        "cakephp/cakephp": ">=3.4 <4.0",
+        "intervention/image": "^2.4"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^3.0",

version

@@ -1 +1 @@
-1.1.1
+1.2.0