Skip to content

Commit

Permalink
Fix the composer root version being used (#265)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
theofidry authored Oct 11, 2018
2 parents 5542d51 + be65a33 commit 85c65e6
Show file tree
Hide file tree
Showing 9 changed files with 490 additions and 233 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
build:
environment:
variables:
COMPOSER_ROOT_VERSION: '0.9.99'
COMPOSER_ROOT_VERSION: '0.10.99'

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.9.99
- export COMPOSER_ROOT_VERSION=0.10.99
- |
if [ 'false' == "$TRAVIS_PULL_REQUEST" ]; then
cp box.json.dist box.json
Expand Down
12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -167,16 +167,18 @@ e2e_020: bin/php-scoper.phar fixtures/set020-infection/vendor clover.xml
$(PHPBIN) $(PHPSCOPER) add-prefix --working-dir=fixtures/set020-infection \
--output-dir=../../build/set020-infection \
--force \
--no-interaction \
--stop-on-failure
--no-interaction
composer --working-dir=build/set020-infection dump-autoload

php fixtures/set020-infection/vendor/infection/infection/bin/infection \
--coverage=dist/infection-coverage \
> build/set020-infection/expected-output
sed 's/Time.*//' build/set020-infection/expected-output > build/set020-infection/expected-output

php build/set020-infection/vendor/infection/infection/bin/infection \
--coverage=dist/infection-coverage \
> build/set020-infection/output
sed 's/Time.*//' build/set020-infection/output > build/set020-infection/output

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

Expand Down Expand Up @@ -294,17 +296,17 @@ tb: bin/php-scoper.phar vendor
#---------------------------------------------------------------------------

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

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

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

Expand Down
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
}
],

"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^7.1",
"nikic/php-parser": "^4.0",
Expand All @@ -28,7 +30,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.1",
"humbug/box": "^3.0@rc",
"humbug/box": "^3.1",
"phpunit/phpunit": "^7.0"
},
"replace": {
Expand Down
Loading

0 comments on commit 85c65e6

Please sign in to comment.