diff --git a/.travis.yml b/.travis.yml index bb9f5fa..63ea58b 100644 --- a/.travis.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index fefad1a..fce4064 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # 1.x branch ## 1.1 branch # 1.1.2 -* updated for intervention/image 2.4. +* updated for intervention/image 2.4; +* some little fixes. This package requires at least CakePHP 3.4. # 1.1.1 * fixed bug when using similar format name, , as `jpeg` or `tif`; diff --git a/composer.json b/composer.json index ea6f5a4..64b8475 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ }], "require": { "php": ">=5.5.9", - "cakephp/cakephp": ">=3.2.0 <4.0", + "cakephp/cakephp": ">=3.4 <4.0", "intervention/image": "^2.4" }, "require-dev": {