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

Use PHP 7 deps in composer.lock #451

Merged
merged 3 commits into from
Feb 15, 2017
Merged

Use PHP 7 deps in composer.lock #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e60b1c
Using PHP 7 versions of dependencies
weierophinney Feb 15, 2017
518771e
Added logic to Travis config to update PHPUnit deps under PHP 5.6
weierophinney Feb 15, 2017
f2c8da3
Updates for 5.6 must happen BEFORE those for test coverage
weierophinney Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ before_install:
- travis_retry composer self-update

install:
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS phpunit/phpunit phpunit/phpunit-mock-objects phpunit/php-code-coverage ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
Expand Down
91 changes: 45 additions & 46 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.