Skip to content

Commit e2a0fad

Browse files
committed
Align composer.json and .travis.yml with master
This brings back PHPUnit 4 support from #33 and thus support for the same PHP version range as the Slim 2 framework (>= 5.3).
1 parent a279014 commit e2a0fad

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
language: php
22

33
php:
4+
- 5.3
5+
- 5.4
6+
- 5.5
47
- 5.6
58
- 7.0
69

710
before_script:
8-
- composer install --prefer-source --no-interaction
11+
- composer self-update -q
12+
- composer install --no-interaction
913

1014
script:
11-
- vendor/bin/phpunit --verbose --coverage-text
15+
- vendor/bin/phpunit --verbose --coverage-text --coverage-clover build/logs/clover.xml
1216
- vendor/bin/phpcs --standard=PSR2 --extensions=php src tests
17+
18+
after_script:
19+
- CODECLIMATE_REPO_TOKEN="c64749943f452f321fb2f11676453b71404edd1a36df06ab06c2337d6cbe9980" vendor/bin/test-reporter --stdout > codeclimate.json
20+
- "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"

composer.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,25 @@
99
{
1010
"name": "Craig Davis",
1111
"email": "craig@there4development.com"
12-
}, {
13-
"name": "Guillermo A. Fisher",
14-
"homepage": "http://guillermoandraefisher.com"
12+
},
13+
{
14+
"name": "Guillermo A. Fisher",
15+
"homepage": "http://guillermoandraefisher.com"
1516
}
1617
],
1718
"support": {
1819
"issues": "https://github.com/there4/slim-test-helpers/issues",
1920
"source": "https://github.com/there4/slim-test-helpers"
2021
},
21-
"minimum-stability": "dev",
2222
"require": {
2323
"slim/slim": "2.6.*",
24-
"phpunit/phpunit": "5.*",
25-
"phpunit/dbunit": "2.*",
24+
"phpunit/phpunit": "^4.8|5.*",
25+
"phpunit/dbunit": "1.*|2.*",
2626
"illuminate/database": ">=4.0"
2727
},
2828
"require-dev": {
29-
"squizlabs/php_codesniffer": "1.*"
29+
"squizlabs/php_codesniffer": "2.*",
30+
"codeclimate/php-test-reporter": "^0.3"
3031
},
3132
"autoload": {
3233
"psr-0": {
@@ -39,7 +40,8 @@
3940
}
4041
},
4142
"scripts": {
42-
"test" : "vendor/bin/phpunit --verbose --coverage-text",
43-
"sniff" : "vendor/bin/phpcs --standard=PSR2 --extensions=php src tests"
43+
"test": "vendor/bin/phpunit --verbose --coverage-text",
44+
"sniff": "vendor/bin/phpcs --standard=PSR2 --extensions=php src tests",
45+
"fix": "vendor/bin/phpcbf --standard=PSR2 --extensions=php controllers models routes src tests"
4446
}
4547
}

0 commit comments

Comments
 (0)