Skip to content

Commit

Permalink
Align composer.json and .travis.yml with master
Browse files Browse the repository at this point in the history
This brings back PHPUnit 4 support from #33 and thus support
for the same PHP version range as the Slim 2 framework (>= 5.3).
  • Loading branch information
danmichaelo committed Aug 7, 2016
1 parent a279014 commit e2a0fad
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 deletions.
12 changes: 10 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0

before_script:
- composer install --prefer-source --no-interaction
- composer self-update -q
- composer install --no-interaction

script:
- vendor/bin/phpunit --verbose --coverage-text
- vendor/bin/phpunit --verbose --coverage-text --coverage-clover build/logs/clover.xml
- vendor/bin/phpcs --standard=PSR2 --extensions=php src tests

after_script:
- CODECLIMATE_REPO_TOKEN="c64749943f452f321fb2f11676453b71404edd1a36df06ab06c2337d6cbe9980" vendor/bin/test-reporter --stdout > codeclimate.json
- "curl -X POST -d @codeclimate.json -H 'Content-Type: application/json' -H 'User-Agent: Code Climate (PHP Test Reporter v0.1.1)' https://codeclimate.com/test_reports"
20 changes: 11 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,25 @@
{
"name": "Craig Davis",
"email": "[email protected]"
}, {
"name": "Guillermo A. Fisher",
"homepage": "http://guillermoandraefisher.com"
},
{
"name": "Guillermo A. Fisher",
"homepage": "http://guillermoandraefisher.com"
}
],
"support": {
"issues": "https://github.com/there4/slim-test-helpers/issues",
"source": "https://github.com/there4/slim-test-helpers"
},
"minimum-stability": "dev",
"require": {
"slim/slim": "2.6.*",
"phpunit/phpunit": "5.*",
"phpunit/dbunit": "2.*",
"phpunit/phpunit": "^4.8|5.*",
"phpunit/dbunit": "1.*|2.*",
"illuminate/database": ">=4.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "1.*"
"squizlabs/php_codesniffer": "2.*",
"codeclimate/php-test-reporter": "^0.3"
},
"autoload": {
"psr-0": {
Expand All @@ -39,7 +40,8 @@
}
},
"scripts": {
"test" : "vendor/bin/phpunit --verbose --coverage-text",
"sniff" : "vendor/bin/phpcs --standard=PSR2 --extensions=php src tests"
"test": "vendor/bin/phpunit --verbose --coverage-text",
"sniff": "vendor/bin/phpcs --standard=PSR2 --extensions=php src tests",
"fix": "vendor/bin/phpcbf --standard=PSR2 --extensions=php controllers models routes src tests"
}
}

0 comments on commit e2a0fad

Please sign in to comment.