Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit e118ec8

Browse files
committed
drop Makefile, only run php cs fixer for php 5.6
1 parent 85090bb commit e118ec8

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

.travis.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ services:
44
- redis-server
55
- rabbitmq
66

7+
sudo: false
8+
9+
cache:
10+
directories:
11+
- $HOME/.composer/cache
12+
713
php:
814
- 5.3
915
- 5.3.3
@@ -12,12 +18,16 @@ php:
1218
- 5.6
1319

1420
before_install:
21+
- composer self-update
1522
- phpenv config-rm xdebug.ini
1623
- if [[ "$TRAVIS_PHP_VERSION" != "5.3" && "$TRAVIS_PHP_VERSION" != "5.3.3" ]]; then composer require --no-update guzzlehttp/guzzle:~4; fi
24+
- if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then composer require --no-update fabpot/php-cs-fixer:1.9.*; fi
1725

18-
install: make install
26+
install: composer update $COMPOSER_FLAGS --prefer-dist
1927

20-
script: php --version && make test
28+
script:
29+
- ./vendor/bin/phpunit -c ./tests/ --coverage-text
30+
- if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then ./vendor/bin/php-cs-fixer fix -v --dry-run --level=psr2 .; fi
2131

2232
notifications:
2333
irc: "irc.freenode.org#zftalk.dev"

Makefile

Lines changed: 0 additions & 12 deletions
This file was deleted.

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"guzzle/plugin-mock" : "3.*",
2626
"videlalvaro/php-amqplib" : "2.*",
2727
"predis/predis" : "0.8.*",
28-
"phpunit/phpunit" : "4.7.*",
29-
"fabpot/php-cs-fixer" : "1.9.*"
28+
"phpunit/phpunit" : "4.7.*"
3029
},
3130
"suggest" : {
3231
"ext-bcmath" : "Required by Check\\CpuPerformance",

0 commit comments

Comments
 (0)