Skip to content

Commit

Permalink
Use phpunit from vendor (#110)
Browse files Browse the repository at this point in the history
* Use phpunit from vendor, ignore tests/runtime

* Don't install phpunit in travis

* Checking if tests are fine with latest yii2 master

* Adjust phpunit constraint

* rollback yii2 constraint
  • Loading branch information
machour authored and samdark committed Feb 23, 2019
1 parent bc22a13 commit a9aebd0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 28 deletions.
29 changes: 1 addition & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,7 @@ php:
- 7.0
- 7.1
- 7.2

# run build against hhvm but allow them to fail
# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
matrix:
fast_finish: true
allow_failures:
- php: hhvm
include:
# test against the latest HHVM version by using a newer image
- php: hhvm
sudo: true
dist: trusty
group: edge # Use edge image until the next travis CI image update
addons:
apt:
packages:
- mysql-server-5.6
- mysql-client-core-5.6
- mysql-client-5.6
services:
- mysql
before_install:
- composer require --prefer-dist --no-interaction 'phpunit/phpunit:<6.0'
- mysql -e "CREATE USER 'travis'@'localhost' IDENTIFIED WITH mysql_native_password;";
- mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'travis'@'localhost' WITH GRANT OPTION;";
script:
- vendor/bin/phpunit --verbose $PHPUNIT_FLAGS
- 7.3

services:
- mysql
Expand Down Expand Up @@ -61,7 +35,6 @@ before_script:
if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
fi
- composer require --prefer-dist --no-interaction 'phpunit/phpunit:4.8.27|~5.7.21|^6.2'
script:
- vendor/bin/phpunit --verbose $PHPUNIT_FLAGS
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"ext-pdo": "*",
"ext-pdo_mysql": "*"
},
"require-dev": {
"phpunit/phpunit": "4.8.27|~5.7.21|^6.2"
},
"repositories": [
{
"type": "composer",
Expand Down

0 comments on commit a9aebd0

Please sign in to comment.