From d0cf488dd4cfcadc49922255cced6a63eb596dba Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 8 Jul 2019 14:12:53 +0200 Subject: Remove PHPUnit lock It should now be PHPUnit 7.4. Update PHPStan configuration accordingly. Also, enable `inferPrivatePropertyTypeFromConstructor` for better phpDoc support in constructors. --- .travis.yml | 2 +- composer.lock | 20 ++++++++++---------- phpstan.neon | 4 +++- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96510f84..bd21d6c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,7 +70,7 @@ script: - make fixtures - - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then SYMFONY_PHPUNIT_VERSION=6.5 ./bin/simple-phpunit -v ; fi; + - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi; # PHPStan needs PHPUnit to be installed and cache app to be generated - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then php bin/phpstan analyse src tests --no-progress --level 1 ; fi; - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi; diff --git a/composer.lock b/composer.lock index 9deb6d0c..2bce514a 100644 --- a/composer.lock +++ b/composer.lock @@ -7130,16 +7130,16 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v5.4.0", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "646b3f2a847c1888fd518b9b9d738d3900d7e496" + "reference": "585f4b3a1c54f24d1a8431c729fc8f5acca20c8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/646b3f2a847c1888fd518b9b9d738d3900d7e496", - "reference": "646b3f2a847c1888fd518b9b9d738d3900d7e496", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/585f4b3a1c54f24d1a8431c729fc8f5acca20c8a", + "reference": "585f4b3a1c54f24d1a8431c729fc8f5acca20c8a", "shasum": "" }, "require": { @@ -7199,7 +7199,7 @@ "annotations", "controllers" ], - "time": "2019-07-03T19:53:49+00:00" + "time": "2019-07-08T08:31:25+00:00" }, { "name": "sensiolabs/security-checker", @@ -10712,16 +10712,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.11.10", + "version": "0.11.12", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d5eb89ba61eee89f5380a31c9599626430c25649" + "reference": "56b3eb2a371b60537fd20794e24af9e7e8ed4e30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d5eb89ba61eee89f5380a31c9599626430c25649", - "reference": "d5eb89ba61eee89f5380a31c9599626430c25649", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/56b3eb2a371b60537fd20794e24af9e7e8ed4e30", + "reference": "56b3eb2a371b60537fd20794e24af9e7e8ed4e30", "shasum": "" }, "require": { @@ -10783,7 +10783,7 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "time": "2019-07-07T13:50:30+00:00" + "time": "2019-07-08T06:55:18+00:00" }, { "name": "phpstan/phpstan-doctrine", diff --git a/phpstan.neon b/phpstan.neon index dfbc97ac..d170e0e6 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -10,4 +10,6 @@ parameters: # https://github.com/phpstan/phpstan/issues/694#issuecomment-350724288 autoload_files: - - vendor/bin/.phpunit/phpunit-6.5/vendor/autoload.php + - vendor/bin/.phpunit/phpunit-7.4/vendor/autoload.php + + inferPrivatePropertyTypeFromConstructor: true -- cgit v1.2.3