1
0
Fork 0

Merge remote-tracking branch 'origin/master'

pull/4541/merge
Jordi Boggiano 2015-10-27 23:55:55 +00:00
commit 05c464aaf6
2 changed files with 9 additions and 2 deletions

View File

@ -19,12 +19,12 @@ php:
- 5.6 - 5.6
- 7.0 - 7.0
- hhvm - hhvm
- hhvm-nightly - nightly
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- php: hhvm-nightly - php: nightly
before_script: before_script:
- rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini

View File

@ -18,6 +18,13 @@ Installation / Usage
$ curl -sS https://getcomposer.org/installer | php $ 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 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 a short version for applications that are not meant to be published as packages
themselves. To create libraries/packages please read the themselves. To create libraries/packages please read the