From a5cded2a2d659e3151bb83c80a84be4c2eff9bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgaras=20Janu=C5=A1auskas?= Date: Sun, 23 Dec 2018 22:33:52 +0200 Subject: [PATCH 1/2] Fix Travis CI testing --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c914f62e7..008ca29a7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,20 +2,18 @@ language: php dist: trusty -sudo: false - php: - 5.6 - 7.0 - 7.1 - 7.2 + - 7.3 -matrix: - fast_finish: true - +env: global: - DEFAULT=1 +matrix: include: - php: 7.0 env: PHPCS=1 DEFAULT=0 @@ -26,7 +24,6 @@ matrix: before_script: - if [[ $PHPCS = 1 ]]; then composer require cakephp/cakephp-codesniffer:~2.1; fi - if [[ $DEFAULT = 1 ]]; then composer install; fi - - if [[ $DEFAULT = 1 ]]; then composer require phpunit/phpunit:"^5.7|^6.0"; fi - if [[ $DEFAULT = 1 ]]; then composer run-script post-install-cmd --no-interaction; fi - if [[ $PHPSTAN = 1 ]]; then composer require --dev "phpstan/phpstan"; fi From dfbd2b4519ed1c8f7c56d297ade9cfada992c0c4 Mon Sep 17 00:00:00 2001 From: Mark Sch Date: Sun, 23 Dec 2018 22:53:18 +0100 Subject: [PATCH 2/2] Remove 7.2 I removed 7.2 as min max covers it plenty. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 008ca29a7a..c70d3d2173 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ php: - 5.6 - 7.0 - 7.1 - - 7.2 - 7.3 env: @@ -15,10 +14,10 @@ env: matrix: include: - - php: 7.0 + - php: 7.2 env: PHPCS=1 DEFAULT=0 - - php: 7.1 + - php: 7.2 env: PHPSTAN=1 DEFAULT=0 before_script: @@ -30,7 +29,7 @@ before_script: script: - if [[ $DEFAULT = 1 ]]; then vendor/bin/phpunit; fi - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests ./config ./webroot; fi - - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -l 5 src; fi + - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -l 5 src/; fi notifications: email: false