Skip to content

Commit

Permalink
Bump dependencies (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
theofidry authored Aug 6, 2018
1 parent 1576510 commit e7eb4b8
Show file tree
Hide file tree
Showing 5 changed files with 126 additions and 168 deletions.
3 changes: 1 addition & 2 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
build:
environment:
variables:
COMPOSER_ROOT_VERSION: '0.8.99'
COMPOSER_ROOT_VERSION: '0.9.99'

build:
tests:
override:
-
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ matrix:
before_install:
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- phpenv config-rm xdebug.ini || true
- export COMPOSER_ROOT_VERSION=0.8.99
- export COMPOSER_ROOT_VERSION=0.9.99
- |
if [ 'false' == "$TRAVIS_PULL_REQUEST" ]; then
cp box.json.dist box.json
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -294,17 +294,17 @@ tb: bin/php-scoper.phar vendor
#---------------------------------------------------------------------------

vendor: composer.lock
export COMPOSER_ROOT_VERSION='0.8.99'; composer install
export COMPOSER_ROOT_VERSION='0.9.99'; composer install
unset "COMPOSER_ROOT_VERSION"
touch $@

vendor/bamarni: composer.lock
export COMPOSER_ROOT_VERSION='0.8.99'; composer install
export COMPOSER_ROOT_VERSION='0.9.99'; composer install
unset "COMPOSER_ROOT_VERSION"
touch $@

bin/phpunit: composer.lock
export COMPOSER_ROOT_VERSION='0.8.99'; composer install
export COMPOSER_ROOT_VERSION='0.9.99'; composer install
unset "COMPOSER_ROOT_VERSION"
touch $@

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.1",
"humbug/box": "^3.0@beta",
"humbug/box": "^3.0@rc",
"phpunit/phpunit": "^7.0"
},
"replace": {
Expand Down
Loading

0 comments on commit e7eb4b8

Please sign in to comment.