Browse files

Merge branch 'master' of

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information...
michaelklishin committed Jul 26, 2012
2 parents 26b4027 + 296a2c0 commit 2bd1015825ec2926c4ba2ef136eebe00f3cf9b12
Showing with 4 additions and 5 deletions.
  1. +4 −5 docs/user/languages/
@@ -76,8 +76,7 @@ and then use ENV variable values in any later script like your dependencies inst
Here is an example using the above ENV variable to modify the dependencies when using the composer package manager to run the tests against the 2 differnt versions of Symfony as defined above.
- - curl -s | php -- --quiet
- - php composer.phar require symfony/framework-bundle:${SYMFONY_VERSION}
+ - composer require symfony/framework-bundle:${SYMFONY_VERSION}
Here we use DB variable value to pick phpunit configuration file:
@@ -111,10 +110,10 @@ Then you can use phpcs as simply as phpunit command
### Installing Composer packages
-You can also install [Composer]( packages into the Travis PHP environment. Use the following:
+You can also install [Composer]( packages into the Travis PHP environment. The composer
+command comes pre-installed, so just use the following:
- curl -s | php -- --quiet
- php composer.phar install
+ composer install
### Installing PHP extensions

0 comments on commit 2bd1015

Please sign in to comment.