From 70410e1359c9a76d695e42b7014da5c53cb012b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 14 Jan 2020 15:39:01 +0100 Subject: [PATCH 1/6] Update PHPCS to 3.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b2db2d4f..5f7c13f1 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "phpstan/phpstan-phpunit": "^0.11", "phpstan/phpstan-strict-rules": "^0.11", "phpunit/phpunit": "^8.5", - "squizlabs/php_codesniffer": "^3.4", + "squizlabs/php_codesniffer": "^3.5", "symfony/proxy-manager-bridge": "^4.3", "symfony/yaml": "^4.3" }, From debdfdc6f8df4cc91f2a83efea24da401228f0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 14 Jan 2020 15:43:52 +0100 Subject: [PATCH 2/6] Upgrade infection --- .travis.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29bb0a7a..6f3ca4b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ jobs: - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,} - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for mutation"; exit 1; fi script: - - ./vendor/bin/infection -s --min-msi=100 --min-covered-msi=100 --threads=$(nproc) + - ./vendor/bin/infection -s --min-msi=98 --min-covered-msi=98 --threads=$(nproc) - stage: Quality env: STATIC_ANALYSIS=1 diff --git a/composer.json b/composer.json index 5f7c13f1..f5f65f14 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "symfony/expression-language": "^4.3" }, "require-dev": { - "infection/infection": "^0.14", + "infection/infection": "^0.15", "lcobucci/coding-standard": "^3.1", "mikey179/vfsstream": "^1.6", "phpstan/phpstan": "^0.11", From b30a0cd20c795525d87ac463caa4fae33db43814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 14 Jan 2020 15:44:43 +0100 Subject: [PATCH 3/6] Update symfony dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index f5f65f14..53a7dd40 100644 --- a/composer.json +++ b/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": "^7.3 || ^8.0", - "symfony/config": "^4.3", - "symfony/dependency-injection": "^4.3", - "symfony/expression-language": "^4.3" + "symfony/config": "^5.0", + "symfony/dependency-injection": "^5.0", + "symfony/expression-language": "^5.0" }, "require-dev": { "infection/infection": "^0.15", @@ -31,8 +31,8 @@ "phpstan/phpstan-strict-rules": "^0.11", "phpunit/phpunit": "^8.5", "squizlabs/php_codesniffer": "^3.5", - "symfony/proxy-manager-bridge": "^4.3", - "symfony/yaml": "^4.3" + "symfony/proxy-manager-bridge": "^5.0", + "symfony/yaml": "^5.0" }, "suggest": { "symfony/proxy-manager-bridge": "Allows the creation of lazy services" From d701d3c268add8404d511f2c050043c01a8d8e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 14 Jan 2020 15:47:22 +0100 Subject: [PATCH 4/6] Update PHPStan --- composer.json | 8 ++++---- phpstan.neon.dist | 1 + test/GeneratorTest.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 53a7dd40..0b47fd32 100644 --- a/composer.json +++ b/composer.json @@ -25,10 +25,10 @@ "infection/infection": "^0.15", "lcobucci/coding-standard": "^3.1", "mikey179/vfsstream": "^1.6", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-deprecation-rules": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-strict-rules": "^0.11", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-deprecation-rules": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", "phpunit/phpunit": "^8.5", "squizlabs/php_codesniffer": "^3.5", "symfony/proxy-manager-bridge": "^5.0", diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 52d355a4..6cc785c1 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -9,3 +9,4 @@ parameters: paths: - src - test + checkMissingIterableValueType: false diff --git a/test/GeneratorTest.php b/test/GeneratorTest.php index ef1a3b03..5a332f69 100644 --- a/test/GeneratorTest.php +++ b/test/GeneratorTest.php @@ -68,7 +68,7 @@ public function generateShouldCompileAndLoadTheContainer(): void $dump = new ConfigCache(vfsStream::url('tests/container.php'), false); $this->generator->method('getLoader')->willReturnCallback( - static function (SymfonyBuilder $container, array $paths) { + static function (SymfonyBuilder $container, array $paths): YamlFileLoader { return new YamlFileLoader( $container, new FileLocator($paths) From 28e3a50a488aa028e1724c4403b5d598da721ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 14 Jan 2020 15:48:51 +0100 Subject: [PATCH 5/6] Require PHP 7.4 --- .scrutinizer.yml | 2 +- .travis.yml | 4 +--- composer.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 61d1722d..ce8e7ab7 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -8,7 +8,7 @@ build: rabbitmq: false mongodb: false php: - version: 7.3 + version: 7.4 cache: disabled: false directories: diff --git a/.travis.yml b/.travis.yml index 6f3ca4b8..c2cc7a5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ sudo: false language: php php: - - 7.3 - - 7.4snapshot + - 7.4 - nightly cache: @@ -22,7 +21,6 @@ script: jobs: allow_failures: - - php: 7.4snapshot - php: nightly include: diff --git a/composer.json b/composer.json index 0b47fd32..fddb253c 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "BSD-3-Clause" ], "require": { - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "symfony/config": "^5.0", "symfony/dependency-injection": "^5.0", "symfony/expression-language": "^5.0" From 5d340fd863b9040c417e75438596f823ce5a00a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 14 Jan 2020 15:55:21 +0100 Subject: [PATCH 6/6] Require PHP 7.4 compatible version of vfsstream --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fddb253c..d09f72cd 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require-dev": { "infection/infection": "^0.15", "lcobucci/coding-standard": "^3.1", - "mikey179/vfsstream": "^1.6", + "mikey179/vfsstream": "^1.6.7", "phpstan/phpstan": "^0.12", "phpstan/phpstan-deprecation-rules": "^0.12", "phpstan/phpstan-phpunit": "^0.12",