From 1637e80893fb0555a08dbee9516e92455d700e97 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Sat, 24 Oct 2015 16:34:35 +0100 Subject: [PATCH 1/4] Update readme.md to include php fall back Update the README.md to include the php only command to install composer incase curl is not available --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index ccbfdcd34..41b39ef10 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,13 @@ Installation / Usage ``` sh $ curl -sS https://getcomposer.org/installer | php ``` + + > **Note:** If the above fails for some reason, you can download the installer + > with `php` instead: + + ```sh + php -r "readfile('https://getcomposer.org/installer');" | php + ``` 2. Create a composer.json defining your dependencies. Note that this example is a short version for applications that are not meant to be published as packages From 27b4afcde6ca8d350790b56d812024c4b6235232 Mon Sep 17 00:00:00 2001 From: paladox Date: Mon, 26 Oct 2015 17:55:05 +0000 Subject: [PATCH 2/4] Update .travis.yml hhvm-nightly is no longer supported in travis ci so remove it. --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 383ad0334..b108f4a78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,12 +19,9 @@ php: - 5.6 - 7.0 - hhvm - - hhvm-nightly matrix: fast_finish: true - allow_failures: - - php: hhvm-nightly before_script: - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini @@ -34,7 +31,6 @@ before_script: - git config --global user.email travis@example.com script: - - ls -d tests/Composer/Test/* | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/complete.phpunit.xml --colors=always {} || (echo -e "\e[41mFAILED\e[0m {}" && $(exit 1));' - + - ls -d tests/Composer/Test/* | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/complete.phpunit.xml --col1 git: depth: 5 From 54e8339e5937941df4f15bb316ad0b94ff276b6f Mon Sep 17 00:00:00 2001 From: paladox Date: Tue, 27 Oct 2015 09:11:01 +0000 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b108f4a78..a0c6362c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ before_script: - git config --global user.email travis@example.com script: - - ls -d tests/Composer/Test/* | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/complete.phpunit.xml --col1 + - ls -d tests/Composer/Test/* | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/complete.phpunit.xml --colors=always {} || (echo -e "\e[41mFAILED\e[0m {}" && $(exit 1));' + git: depth: 5 From b85d5d2bb010a0e5b9d90a023389bdaaf22f69da Mon Sep 17 00:00:00 2001 From: paladox Date: Tue, 27 Oct 2015 10:12:43 +0000 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index a0c6362c5..55324a9af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,12 @@ php: - 5.6 - 7.0 - hhvm + - nightly matrix: fast_finish: true + allow_failures: + - php: nightly before_script: - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini