Bump up CakePHP version to 3.2

UseMuffin · Sep 13, 2017 · 5016879 · 5016879
1 parent d792a42
commit 5016879
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,11 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
   - 7.1
-
-dist: trusty
+  - 7.2
 
 env:
   global:
@@ -21,12 +19,11 @@ matrix:
       env: PHPCS=1 DEFAULT=0
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != 7.0 ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION != 7.0 && $TRAVIS_PHP_VERSION != 7.2 ]]; then phpenv config-rm xdebug.ini; fi
 
-  - composer self-update
-  - composer install --prefer-dist --no-interaction
+  - composer install
 
-  - if [[ $PHPCS = 1 ]]; then composer require cakephp/cakephp-codesniffer:dev-master; fi
+  - if [[ $PHPCS = 1 ]]; then composer require cakephp/cakephp-codesniffer:^3.0; fi
 
 script:
   - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then vendor/bin/phpunit; fi

diff --git a/composer.json b/composer.json
@@ -33,10 +33,10 @@
         "source": "https://github.com/usemuffin/crypt"
     },
     "require": {
+        "cakephp/cakephp": "^3.2",
         "ext-openssl": "*"
     },
     "require-dev": {
-        "cakephp/cakephp": "~3.0",
         "phpunit/phpunit": "<6.0"
     },
     "autoload": {