Skip to content

Commit

Permalink
Tests are passing with PHPUnit 4.1, updating accordingly
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed May 18, 2014
1 parent f71ac83 commit da864ac
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -43,7 +43,7 @@ before_script:
- set +H

script:
- sh -c "if [ '$PHPCS' != '1' ]; then vendor/bin/phpunit --stderr; fi"
- sh -c "if [ '$PHPCS' != '1' ]; then phpunit; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then phpcs -p --extensions=php --standard=CakePHP ./src ./tests; fi"

notifications:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -31,7 +31,7 @@ tests for cakephp by doing the following:
1. Copy `phpunit.xml.dist` to `phpunit.xml`
2. Add the relevant database credentials to your phpunit.xml if you want to run tests against
a non-SQLite datasource.
3. Run `phpunit --stderr`
3. Run `phpunit`

## Contributing

Expand Down
3 changes: 0 additions & 3 deletions composer.json
Expand Up @@ -24,9 +24,6 @@
"ext-mbstring": "*",
"nesbot/Carbon": "1.8.*"
},
"require-dev": {
"phpunit/phpunit": "3.7.33"
},
"autoload": {
"psr-4": {
"Cake\\": "src",
Expand Down

0 comments on commit da864ac

Please sign in to comment.