Skip to content

Commit 85c65e6

Browse files
authored
Fix the composer root version being used (#265)
- Fix the composer root version being used - Bump the dependencies, notably bumping to Box 3.1 - Update the Infection related tests in order to use the newer versions of PHP-Parser
2 parents 5542d51 + be65a33 commit 85c65e6

File tree

9 files changed

+490
-233
lines changed

9 files changed

+490
-233
lines changed

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
build:
22
environment:
33
variables:
4-
COMPOSER_ROOT_VERSION: '0.9.99'
4+
COMPOSER_ROOT_VERSION: '0.10.99'
55

66
tests:
77
override:

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ matrix:
1919
before_install:
2020
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
2121
- phpenv config-rm xdebug.ini || true
22-
- export COMPOSER_ROOT_VERSION=0.9.99
22+
- export COMPOSER_ROOT_VERSION=0.10.99
2323
- |
2424
if [ 'false' == "$TRAVIS_PULL_REQUEST" ]; then
2525
cp box.json.dist box.json

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,18 @@ e2e_020: bin/php-scoper.phar fixtures/set020-infection/vendor clover.xml
167167
$(PHPBIN) $(PHPSCOPER) add-prefix --working-dir=fixtures/set020-infection \
168168
--output-dir=../../build/set020-infection \
169169
--force \
170-
--no-interaction \
171-
--stop-on-failure
170+
--no-interaction
172171
composer --working-dir=build/set020-infection dump-autoload
173172

174173
php fixtures/set020-infection/vendor/infection/infection/bin/infection \
175174
--coverage=dist/infection-coverage \
176175
> build/set020-infection/expected-output
176+
sed 's/Time.*//' build/set020-infection/expected-output > build/set020-infection/expected-output
177+
177178
php build/set020-infection/vendor/infection/infection/bin/infection \
178179
--coverage=dist/infection-coverage \
179180
> build/set020-infection/output
181+
sed 's/Time.*//' build/set020-infection/output > build/set020-infection/output
180182

181183
diff build/set020-infection/expected-output build/set020-infection/output
182184

@@ -294,17 +296,17 @@ tb: bin/php-scoper.phar vendor
294296
#---------------------------------------------------------------------------
295297

296298
vendor: composer.lock
297-
export COMPOSER_ROOT_VERSION='0.9.99'; composer install
299+
export COMPOSER_ROOT_VERSION='0.10.99'; composer install
298300
unset "COMPOSER_ROOT_VERSION"
299301
touch $@
300302

301303
vendor/bamarni: composer.lock
302-
export COMPOSER_ROOT_VERSION='0.9.99'; composer install
304+
export COMPOSER_ROOT_VERSION='0.10.99'; composer install
303305
unset "COMPOSER_ROOT_VERSION"
304306
touch $@
305307

306308
bin/phpunit: composer.lock
307-
export COMPOSER_ROOT_VERSION='0.9.99'; composer install
309+
export COMPOSER_ROOT_VERSION='0.10.99'; composer install
308310
unset "COMPOSER_ROOT_VERSION"
309311
touch $@
310312

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
}
1818
],
1919

20+
"minimum-stability": "dev",
21+
"prefer-stable": true,
2022
"require": {
2123
"php": "^7.1",
2224
"nikic/php-parser": "^4.0",
@@ -28,7 +30,7 @@
2830
},
2931
"require-dev": {
3032
"bamarni/composer-bin-plugin": "^1.1",
31-
"humbug/box": "^3.0@rc",
33+
"humbug/box": "^3.1",
3234
"phpunit/phpunit": "^7.0"
3335
},
3436
"replace": {

0 commit comments

Comments
 (0)