From 31925e600925b5caf8edf52588d7e11f536a3113 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 13 Dec 2017 15:49:35 +0100 Subject: [PATCH 1/4] :arrow_up: :fire: Updates dependencies, removes Ocular" --- README.md | 1 - composer.json | 38 ++++++++++++++++++-------------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index e060a73..e214221 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,6 @@ You'll get the following tools by depending on this package: ### Test Related - **[Codeception][codeception]**: Modern full-stack testing framework for PHP -- **[Ocular][ocular]**: CLI for uploading external code coverage data to Scrutinizer - **[ParaTest][paratest]**: Parallel testing for PHPUnit - **[PHPUnit][phpunit]**: Testing framework for PHP diff --git a/composer.json b/composer.json index 820c0b2..cbddbb1 100644 --- a/composer.json +++ b/composer.json @@ -25,29 +25,27 @@ "require": { "php": ">=5.6,<8.0-dev", "brianium/paratest": ">=0.14.0,<1.0.0", - "codeception/codeception": "^2.2.0", - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.0", - "deployer/deployer": "^4.0.0", - "deployer/recipes": "^4.0.0", - "friendsofphp/php-cs-fixer": "^2.0.0", + "codeception/codeception": "^2.3", + "dealerdirect/phpcodesniffer-composer-installer": "^0.4", + "deployer/deployer": "^4.3", + "deployer/recipes": "^4.0", + "friendsofphp/php-cs-fixer": "^2.8", "hirak/prestissimo": "^0.3", "jakub-onderka/php-parallel-lint": ">=0.9.1,<1.0.0", - "pdepend/pdepend": "^2.2.0", - "phing/phing": "^2.0.0", - "phploc/phploc": "^3.0.1", - "phpmd/phpmd": "^2.2.0", - "phpmetrics/phpmetrics": "^2.0.0", + "pdepend/pdepend": "^2.5", + "phploc/phploc": "^4.0", + "phpmd/phpmd": "^2.6.0", + "phpmetrics/phpmetrics": "^2.3.2", "phpro/grumphp": ">=0.11.0,<1.0.0,!=0.11.4", - "phpunit/phpunit": "^5.5.0", - "robmorgan/phinx": "^0.8.0", - "scheb/tombstone-analyzer": "^0.3.0", - "scrutinizer/ocular": "^1.3", - "sebastian/phpcpd": "^3.0.0", - "seld/jsonlint": "^1.4.0", - "sensiolabs/security-checker": "^4.0", - "sllh/composer-versions-check": "^2.0.0", - "squizlabs/php_codesniffer": "^3.0.2", - "wimg/php-compatibility": "^8.0.0" + "phpunit/phpunit": "^5.7", + "robmorgan/phinx": "^0.9", + "scheb/tombstone-analyzer": "^0.3", + "sebastian/phpcpd": "^3.0", + "seld/jsonlint": "^1.6", + "sensiolabs/security-checker": "^4.1", + "sllh/composer-versions-check": "^2.0", + "squizlabs/php_codesniffer": "^3.2", + "wimg/php-compatibility": "^8.0" }, "suggest": { "apigen/apigen": "Smart and Readable Documentation for your PHP project.", From b65253c43883197e4c8e2dbce2b14582769c4617 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 13 Dec 2017 15:59:34 +0100 Subject: [PATCH 2/4] SUDO make me a sandwich --- .travis.yml | 2 +- README.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0089eb3..1ba2c88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: - npm set progress false install: - - pip install yamllint + - sudo pip install yamllint - if ! shellcheck --version ; then curl -sSL "${SHELLCHECK_URL}" | tar --exclude 'SHA256SUMS' --strip-components=1 -C "${HOME}/bin" -xjf -; fi diff --git a/README.md b/README.md index e214221..af52b8b 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,6 @@ THE SOFTWARE. [license-shield]: https://img.shields.io/github/license/dealerdirect/php-qa-tools.svg [maintenance-shield]: https://img.shields.io/maintenance/yes/2017.svg [mockery]: https://github.com/padraic/mockery -[ocular]: https://github.com/scrutinizer-ci/ocular [packagist-shield]: https://img.shields.io/packagist/dt/dealerdirect/qa-tools.svg [packagist-version-shield]: https://img.shields.io/packagist/v/dealerdirect/qa-tools.svg [packagist-version]: https://packagist.org/packages/dealerdirect/qa-tools From 054f0a28936d179d1e63825ea967da95e7a52baf Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 13 Dec 2017 16:05:28 +0100 Subject: [PATCH 3/4] :ambulance: Updated tests --- .travis.yml | 1 - README.md | 2 -- 2 files changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ba2c88..8865d37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,6 @@ script: - ./vendor/bin/parallel-lint -h - ./vendor/bin/paratest --version - ./vendor/bin/pdepend --version - - ./vendor/bin/phing -v - ./vendor/bin/phinx --version - ./vendor/bin/php-cs-fixer --version - ./vendor/bin/phpcbf --version diff --git a/README.md b/README.md index af52b8b..2a06d0e 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,6 @@ Other packages that you'll get: - **[Composer Versions Check][versions-check]**: Checks if packages are up to date to last major versions after update - **[Deployer][deployer]**: Deployment tool for PHP - **[Deployer Recipes][deployer-recipes]**: Third party recipes to integrate with Deployer -- **[Phing][phing]**: Phing is a PHP project build system or build tool based on ​Apache Ant - **[Phinx][phinx]**: Phinx makes it ridiculously easy to manage the database migrations for your PHP app - **[PHP_CodeSniffer Composer Installer][phpcs-composer-installer]**: For installing PHP_CodeSniffer coding standards - **[PHPCompatibility][phpcompatibility]**: PHP Compatibility checks for PHP_CodeSniffer @@ -224,7 +223,6 @@ THE SOFTWARE. [packagist]: https://packagist.org/packages/dealerdirect/qa-tools [paratest]: https://github.com/brianium/paratest [pdepend]: https://github.com/pdepend/pdepend -[phing]:https://www.phing.info/ [phinx]: https://phinx.org [php-codebrowser]: https://github.com/mayflower/PHP_CodeBrowser [php-parallel-lint]: https://github.com/JakubOnderka/PHP-Parallel-Lint From 99bbea7f8046dacc68cfe6e0d19a0d92410bb603 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 13 Dec 2017 16:06:20 +0100 Subject: [PATCH 4/4] :rocket: Adds PHP 7.2 to Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8865d37..b0ca87e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ dist: trusty sudo: required php: + - 7.2 - 7.1 - 7.0 - 5.6