Skip to content

Commit 0cefd19

Browse files
committed
Update travis and composer
1 parent 55a9fe6 commit 0cefd19

2 files changed

Lines changed: 8 additions & 13 deletions

File tree

.travis.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: php
33
php:
44
- 5.6
55
- 7.0
6-
6+
- 7.1
77
sudo: false
88

99
env:
@@ -18,11 +18,11 @@ matrix:
1818
fast_finish: true
1919

2020
include:
21-
- php: 5.6
21+
- php: 7.1
2222
env: PHPCS=1 DEFAULT=0
2323

24-
- php: 5.6
25-
env: COVERALLS=1 DEFAULT=0 DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
24+
- php: 7.1
25+
env: CODECOVERAGE=1 DEFAULT=0 DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
2626

2727
before_script:
2828
- composer self-update
@@ -33,14 +33,12 @@ before_script:
3333

3434
- sh -c "if [ '$PHPCS' = '1' ]; then composer require cakephp/cakephp-codesniffer:dev-master; fi"
3535

36-
- sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
37-
- sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
38-
3936
script:
4037
- sh -c "if [ '$DEFAULT' = '1' ]; then ./vendor/bin/phpunit --stderr; fi"
4138
- sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -p -n --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
42-
- sh -c "if [ '$COVERALLS' = '1' ]; then ./vendor/bin/phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
43-
- sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
39+
- sh -c "if [ '$CODECOVERAGE' = '1' ]; then phpunit --coverage-clover=clover.xml || true; fi"
40+
- sh -c "if [ '$CODECOVERAGE' = '1' ]; then wget -O codecov.sh https://codecov.io/bash; fi"
41+
- sh -c "if [ '$CODECOVERAGE' = '1' ]; then bash codecov.sh; fi"
4442

4543
notifications:
4644
email: false

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"cakephp",
77
"api",
88
"rest",
9-
"hateaos",
9+
"hateoas",
1010
"crud"
1111
],
1212
"homepage": "https://github.com/CakeDC/cakephp-api",
@@ -34,9 +34,6 @@
3434
"require-dev": {
3535
"phpunit/phpunit": "<6.0"
3636
},
37-
"suggest": {
38-
"cakedc/users": "Users Plugin for CakePHP"
39-
},
4037
"autoload": {
4138
"psr-4": {
4239
"CakeDC\\Api\\": "src",

0 commit comments

Comments
 (0)