Skip to content

Commit

Permalink
Merge pull request #231 from ThaDafinser/feature/deps
Browse files Browse the repository at this point in the history
test lowest/higest dep, change dep requirements
  • Loading branch information
ThaDafinser committed Mar 11, 2016
2 parents 280ae8c + 9984ee7 commit b20faf7
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 55 deletions.
11 changes: 11 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
checks:
php:
code_rating: true
duplication: true

filter:
excluded_paths: [tests/*]

tools:
external_code_coverage:
timeout: 600 # Timeout in seconds.
21 changes: 11 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@

language: php

sudo: false

php:
- 5.5
- 5.6
- 7
- hhvm

matrix:
fast_finish: true

# faster builds on new travis setup not using sudo
sudo: false
env:
matrix:
- DEPENDENCIES="--prefer-lowest --prefer-stable"
- DEPENDENCIES=""

before_script:
- composer self-update
- composer update --prefer-source -n --verbose
- composer update -o --prefer-source $DEPENDENCIES

script:
- vendor/bin/phpunit --coverage-clover ./clover.xml
- vendor/bin/php-cs-fixer fix src --level=psr2 --dry-run -vv
- mkdir -p build/logs
- ./vendor/bin/phpunit -c travis.phpunit.xml --coverage-clover build/logs/clover.xml

after_script:
- php vendor/bin/coveralls -v

- if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then php ocular.phar code-coverage:upload --format=php-clover ./clover.xml; fi
18 changes: 11 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@
},

"require-dev": {
"phpunit/PHPUnit": "~4|~5",
"satooshi/php-coveralls": "~0.6",
"fabpot/php-cs-fixer": "1.10.*",
"phpunit/phpunit": "^4.8|^5.2",
"fabpot/php-cs-fixer": "^1.11",

"doctrine/doctrine-orm-module": "~0.9",
"doctrine/orm": ">=2.5,<2.7",
"doctrine/dbal": ">=2.5,<2.7",
"doctrine/doctrine-orm-module": "^0.9",

"zendframework/zend-console": "~2.5",
"zendframework/zend-db": "~2.5",
Expand All @@ -52,9 +53,12 @@
"suggest" : {
"ext-intl": "*",

"doctrine/doctrine-orm-module": "~0.9",
"phpoffice/phpexcel": "~1.7",
"tecnick.com/tcpdf": "~6.0",
"doctrine/orm": ">=2.5,<2.7",
"doctrine/dbal": ">=2.5,<2.7",
"doctrine/doctrine-orm-module": "^0.9",

"phpoffice/phpexcel": "^1.8",
"tecnickcom/tcpdf": "^6.2",

"zendframework/zend-text": "~2.5"
},
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<phpunit
bootstrap="./tests/Bootstrap.php"
bootstrap="./vendor/autoload.php"
colors="false"
stopOnError="false"
stopOnFailure="false"
Expand Down
5 changes: 0 additions & 5 deletions tests/Bootstrap.php

This file was deleted.

32 changes: 0 additions & 32 deletions travis.phpunit.xml

This file was deleted.

0 comments on commit b20faf7

Please sign in to comment.