From b41539cca95ab3c01edbc982457152530b405acf Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 14 Aug 2017 16:05:02 +0200 Subject: [PATCH 1/2] :arrow_up: Upgrade PHP_CodeSniffer to 3.x, replaced frenck/php-compatibility with wimg/php-compatibility. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ec06804..cfa08af 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.4.0", "deployer/deployer": "^4.0.0", "deployer/recipes": "^4.0.0", - "frenck/php-compatibility": "^7.0.0", + "wimg/php-compatibility": "^8.0.0", "friendsofphp/php-cs-fixer": "^2.0.0", "hirak/prestissimo": "^0.3", "jakub-onderka/php-parallel-lint": ">=0.9.1,<1.0.0", @@ -50,7 +50,7 @@ "seld/jsonlint": "^1.4.0", "sensiolabs/security-checker": "^4.0", "sllh/composer-versions-check": "^2.0.0", - "squizlabs/php_codesniffer": "^2.5" + "squizlabs/php_codesniffer": "^3.0.2" }, "suggest": { "apigen/apigen": "Smart and Readable Documentation for your PHP project.", From 366b30fe1a3c7a43b449a712519868a07f8de7bf Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 15 Aug 2017 10:47:48 +0200 Subject: [PATCH 2/2] Made TravisCI wait a little longer on the composer install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7fab01e..cbf2a09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: - gpg --verify ./bin/install.sh.sig - shellcheck ./bin/install.sh - composer validate - - travis_wait composer install --no-progress --no-suggest + - travis_wait 45 composer install --no-progress --no-suggest - yarn install --no-progress - yarn run test - ./vendor/bin/behat --version