Skip to content

Commit 89316cc

Browse files
authored
Merge pull request #119 from dunglas/fix-tests
Fix tests
2 parents 7355eb9 + 8fcf66e commit 89316cc

10 files changed

+402
-377
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ before_install:
1818
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
1919
- export PATH="$PATH:$HOME/.composer/vendor/bin"
2020
- wget https://phar.phpunit.de/phpunit-6.3.phar
21-
- composer global require humbug/php-scoper:^1.0@dev
21+
- composer global require humbug/php-scoper:dev-master#674e24d2b9e90b2f629dab7f30d5070e4d49d815
2222
- if [[ $coverage = 1 ]]; then mkdir -p build/logs; fi
2323
- if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
2424
- if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.4.0/php-cs-fixer.phar; fi
@@ -38,7 +38,7 @@ script:
3838
if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.1" ]]; then
3939
composer install --no-dev --prefer-dist --classmap-authoritative --no-progress --no-suggest --ansi;
4040
~/.composer/vendor/bin/php-scoper add-prefix --output-dir=build/schema-generator;
41-
composer -d=build/schema-generator dump-autoload --classmap-authoritative --no-dev;
41+
composer --working-dir=build/schema-generator dump-autoload --classmap-authoritative --no-dev;
4242
php -d phar.readonly=0 box.phar build;
4343
php schema.phar generate-types tmp/ tests/e2e/schema.yml;
4444
diff tests/e2e/src/AppBundle/Entity/Person.php tmp/AppBundle/Entity/Person.php;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"doctrine/inflector": "^1.0",
2323
"easyrdf/easyrdf": "^0.9",
2424
"ext-json": "*",
25-
"friendsofphp/php-cs-fixer": "^2.4",
25+
"friendsofphp/php-cs-fixer": "^2.10",
2626
"league/html-to-markdown": "^4.0",
2727
"psr/log": "^1.0",
2828
"symfony/config": "^3.3 || ^4.0",

0 commit comments

Comments
 (0)