From fbab3cbe8281353719aa40187b55cef7f218c9ae Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Feb 2017 11:29:53 +0100 Subject: [PATCH 1/6] Updated deployer/deployer to ^4, added deployer/recipes and herzult/php-ssh --- .spelling | 1 + README.md | 6 +++++- composer.json | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.spelling b/.spelling index f8a1dac..530a2ba 100644 --- a/.spelling +++ b/.spelling @@ -20,6 +20,7 @@ _CodeCoverage _CodeSniffer _Depend _eyes +api ApiGen Behat codebase diff --git a/README.md b/README.md index aa8abe1..78d693f 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,8 @@ Other packages that you'll get: - **[Behat Mink][behat-mink]**: Mink extension for Behat - **[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 +- **[PHP SSH][phpssh]**: An experimental object oriented SSH api in PHP - **[Mink Goutte Driver][mink-goutte-driver]**: Goutte driver for Mink framework - **[Mink Selenium2 Driver][mink-selenium2-driver]**: Selenium2 (WebDriver) driver for Mink framework - **[Phing][phing]**: Phing is a PHP project build system or build tool based on ​Apache Ant @@ -211,7 +213,8 @@ THE SOFTWARE. [behat]: http://behat.org [codeception]: http://codeception.com [contributors]: https://github.com/dealerdirect/php-qa-tools/graphs/contributors -[deployer]: https://deployer.org/ +[deployer]: https://deployer.org +[deployer-recipes]: https://github.com/deployphp/recipes [frenck]: https://github.com/frenck [get-in-touch]: http://workingatdealerdirect.eu/open-sollicitatie/ [grumphp]: https://github.com/phpro/grumphp @@ -242,6 +245,7 @@ THE SOFTWARE. [phploc]: https://github.com/sebastianbergmann/phploc [phpmd]: https://phpmd.org [phpmetrics]: http://www.phpmetrics.org +[phpssh]: https://github.com/Herzult/php-ssh [phpunit]: https://phpunit.de [prestissimo]: https://github.com/hirak/prestissimo [project-stage-shield]: https://img.shields.io/badge/Project%20Stage-Development-yellowgreen.svg diff --git a/composer.json b/composer.json index 2a8bbd7..b4dde13 100644 --- a/composer.json +++ b/composer.json @@ -30,9 +30,11 @@ "brianium/paratest": ">=0.14.0,<1.0.0", "codeception/codeception": "^2.2.0", "dealerdirect/phpcodesniffer-composer-installer": "^0.3.0", - "deployer/deployer": "^3.0.0", + "deployer/deployer": "^4.0.0", + "deployer/recipes": "^4.0.0", "frenck/php-compatibility": "^7.0.0", "friendsofphp/php-cs-fixer": "^2.0.0", + "herzult/php-ssh": "^1.1", "hirak/prestissimo": "^0.3", "jakub-onderka/php-parallel-lint": ">=0.9.1,<1.0.0", "pdepend/pdepend": "^2.2.0", From 5fe97428e4d03a9e6e20163414ca91792010bda0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Feb 2017 11:44:01 +0100 Subject: [PATCH 2/6] TravisCI build fix, by adding php ext-ssh2 to the container --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b5aeefd..c7bb790 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,9 @@ before_install: - npm set progress false install: + - sudo apt-get update -qq + - sudo apt-get install -y -qq libssh2-1-dev libssh2-php + - pecl install -f ssh2-alpha < .noninteractive - pip install yamllint - if ! shellcheck --version ; then curl -sSL "${SHELLCHECK_URL}" | tar --exclude 'SHA256SUMS' --strip-components=1 -C "${HOME}/bin" -xjf -; From 6567872e9bc4beabfae06a875364d365ae712e3a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Feb 2017 12:02:54 +0100 Subject: [PATCH 3/6] Added .noninteractive file, needed for TravisCI --- .noninteractive | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .noninteractive diff --git a/.noninteractive b/.noninteractive new file mode 100644 index 0000000..e69de29 From 31f7631fb0db940a481eb92c08b922808269db1f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Feb 2017 12:18:07 +0100 Subject: [PATCH 4/6] Fixed TravisCI, install SSH php ext differently on PHP 5.6 --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c7bb790..5272ace 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,11 @@ before_install: install: - sudo apt-get update -qq - sudo apt-get install -y -qq libssh2-1-dev libssh2-php - - pecl install -f ssh2-alpha < .noninteractive + - if [ "${TRAVIS_PHP_VERSION}" == "5.6" ]; then + pecl install -f ssh2 < .noninteractive + else + pecl install -f ssh2-alpha < .noninteractive + fi - pip install yamllint - if ! shellcheck --version ; then curl -sSL "${SHELLCHECK_URL}" | tar --exclude 'SHA256SUMS' --strip-components=1 -C "${HOME}/bin" -xjf -; From 913e7a5a6f55a558f9b7d579e9f9302e5587cbba Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Feb 2017 12:25:41 +0100 Subject: [PATCH 5/6] Removed herzult/php-ssh again, since in Deployer5 it will be deprecated --- .travis.yml | 5 ----- README.md | 2 -- composer.json | 1 - 3 files changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5272ace..ad39acf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,6 @@ before_install: install: - sudo apt-get update -qq - sudo apt-get install -y -qq libssh2-1-dev libssh2-php - - if [ "${TRAVIS_PHP_VERSION}" == "5.6" ]; then - pecl install -f ssh2 < .noninteractive - else - pecl install -f ssh2-alpha < .noninteractive - fi - pip install yamllint - if ! shellcheck --version ; then curl -sSL "${SHELLCHECK_URL}" | tar --exclude 'SHA256SUMS' --strip-components=1 -C "${HOME}/bin" -xjf -; diff --git a/README.md b/README.md index 78d693f..c65aa79 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,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 -- **[PHP SSH][phpssh]**: An experimental object oriented SSH api in PHP - **[Mink Goutte Driver][mink-goutte-driver]**: Goutte driver for Mink framework - **[Mink Selenium2 Driver][mink-selenium2-driver]**: Selenium2 (WebDriver) driver for Mink framework - **[Phing][phing]**: Phing is a PHP project build system or build tool based on ​Apache Ant @@ -245,7 +244,6 @@ THE SOFTWARE. [phploc]: https://github.com/sebastianbergmann/phploc [phpmd]: https://phpmd.org [phpmetrics]: http://www.phpmetrics.org -[phpssh]: https://github.com/Herzult/php-ssh [phpunit]: https://phpunit.de [prestissimo]: https://github.com/hirak/prestissimo [project-stage-shield]: https://img.shields.io/badge/Project%20Stage-Development-yellowgreen.svg diff --git a/composer.json b/composer.json index b4dde13..602984d 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,6 @@ "deployer/recipes": "^4.0.0", "frenck/php-compatibility": "^7.0.0", "friendsofphp/php-cs-fixer": "^2.0.0", - "herzult/php-ssh": "^1.1", "hirak/prestissimo": "^0.3", "jakub-onderka/php-parallel-lint": ">=0.9.1,<1.0.0", "pdepend/pdepend": "^2.2.0", From 11c95e3841226f28f59be344d36b908fa739dcc7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Feb 2017 12:42:59 +0100 Subject: [PATCH 6/6] Removed unneeded apt calls in the TravisCI build --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad39acf..b5aeefd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,6 @@ before_install: - npm set progress false install: - - sudo apt-get update -qq - - sudo apt-get install -y -qq libssh2-1-dev libssh2-php - pip install yamllint - if ! shellcheck --version ; then curl -sSL "${SHELLCHECK_URL}" | tar --exclude 'SHA256SUMS' --strip-components=1 -C "${HOME}/bin" -xjf -;