mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-27 03:21:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4054 from wallabag/fix/phpunit-lock

Browse source 
Remove PHPUnit lock
This commit is contained in:
Jérémy Benoist 2019-07-09 11:53:49 +02:00 committed by GitHub
commit ff8fe22f2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -70,7 +70,7 @@ script:
- make fixtures - 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 # 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 [[ $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; - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;

20
composer.lock generated
View file

@ -7130,16 +7130,16 @@
}, },
{ {
"name": "sensio/framework-extra-bundle", "name": "sensio/framework-extra-bundle",
"version": "v5.4.0", "version": "v5.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
"reference": "646b3f2a847c1888fd518b9b9d738d3900d7e496" "reference": "585f4b3a1c54f24d1a8431c729fc8f5acca20c8a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/646b3f2a847c1888fd518b9b9d738d3900d7e496", "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/585f4b3a1c54f24d1a8431c729fc8f5acca20c8a",
"reference": "646b3f2a847c1888fd518b9b9d738d3900d7e496", "reference": "585f4b3a1c54f24d1a8431c729fc8f5acca20c8a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7199,7 +7199,7 @@
"annotations", "annotations",
"controllers" "controllers"
], ],
"time": "2019-07-03T19:53:49+00:00" "time": "2019-07-08T08:31:25+00:00"
}, },
{ {
"name": "sensiolabs/security-checker", "name": "sensiolabs/security-checker",
@ -10712,16 +10712,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.11.10", "version": "0.11.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "d5eb89ba61eee89f5380a31c9599626430c25649" "reference": "56b3eb2a371b60537fd20794e24af9e7e8ed4e30"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d5eb89ba61eee89f5380a31c9599626430c25649", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/56b3eb2a371b60537fd20794e24af9e7e8ed4e30",
"reference": "d5eb89ba61eee89f5380a31c9599626430c25649", "reference": "56b3eb2a371b60537fd20794e24af9e7e8ed4e30",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10783,7 +10783,7 @@
"MIT" "MIT"
], ],
"description": "PHPStan - PHP Static Analysis Tool", "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", "name": "phpstan/phpstan-doctrine",

4
phpstan.neon
View file

@ -10,4 +10,6 @@ parameters:
# https://github.com/phpstan/phpstan/issues/694#issuecomment-350724288 # https://github.com/phpstan/phpstan/issues/694#issuecomment-350724288
autoload_files: autoload_files:
- vendor/bin/.phpunit/phpunit-6.5/vendor/autoload.php - vendor/bin/.phpunit/phpunit-7.4/vendor/autoload.php
inferPrivatePropertyTypeFromConstructor: true