From f1baadebf2620f7f77627fff9c3d76d4c63f1ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 9 Nov 2022 21:00:37 +0000 Subject: [PATCH 1/8] Run tests on lowest deps also From https://github.com/szepeviktor/phpstan-wordpress/pull/122#issuecomment-1309363724 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1f64ea7..c2f7b0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,10 @@ jobs: - "composer test:phpunit -- --verbose" # - "composer test:cs -- -s" - "composer test:phpstan -- --ansi --memory-limit=1G --no-progress" + - name: "With lowest deps" + php: "7.4" + install: + - "composer update --no-interaction --prefer-lowest" cache: directories: From 220077c309d41037e6c7e0ccad6637441f4d6fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 9 Nov 2022 21:09:48 +0000 Subject: [PATCH 2/8] Require newer WPCS --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8c17699..c837157 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "php-parallel-lint/php-parallel-lint": "^1.1", "phpstan/phpstan-strict-rules": "^1.2", "phpunit/phpunit": "^8 || ^9", - "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.6" + "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.6", + "wp-coding-standards/wpcs": "^2.3" }, "autoload-dev": { "classmap": [ From f8064cbb7e37666997dd5365f742be93c3eb9975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 9 Nov 2022 21:16:30 +0000 Subject: [PATCH 3/8] Fix --- src/WpThemeGetDynamicMethodReturnTypeExtension.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WpThemeGetDynamicMethodReturnTypeExtension.php b/src/WpThemeGetDynamicMethodReturnTypeExtension.php index b463be7..1efbca8 100644 --- a/src/WpThemeGetDynamicMethodReturnTypeExtension.php +++ b/src/WpThemeGetDynamicMethodReturnTypeExtension.php @@ -26,9 +26,9 @@ class WpThemeGetDynamicMethodReturnTypeExtension implements \PHPStan\Type\Dynami /** * File headers. * - * @var list + * @var string[] */ - private static $headers = [ + protected static $headers = [ 'Name', 'ThemeURI', 'Description', From a2fc7a06336a4fa7577d8d48d4477c07cbef5af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 9 Nov 2022 21:28:58 +0000 Subject: [PATCH 4/8] Fix --- composer.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/composer.json b/composer.json index c837157..59fa1e1 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,13 @@ "symfony/polyfill-php73": "^1.12.0" }, "require-dev": { + "automattic/phpcs-neutron-standard": "^1.7", "composer/composer": "^2.1.14", "dealerdirect/phpcodesniffer-composer-installer": "^0.7", "php-parallel-lint/php-parallel-lint": "^1.1", "phpstan/phpstan-strict-rules": "^1.2", "phpunit/phpunit": "^8 || ^9", + "slevomat/coding-standard": "^8.0", "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.6", "wp-coding-standards/wpcs": "^2.3" }, From a73323aa8cbdb5c4ecc490699b08df20992425e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 9 Nov 2022 21:32:35 +0000 Subject: [PATCH 5/8] Update composer.json --- composer.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 59fa1e1..23f5942 100644 --- a/composer.json +++ b/composer.json @@ -17,15 +17,12 @@ "symfony/polyfill-php73": "^1.12.0" }, "require-dev": { - "automattic/phpcs-neutron-standard": "^1.7", "composer/composer": "^2.1.14", "dealerdirect/phpcodesniffer-composer-installer": "^0.7", "php-parallel-lint/php-parallel-lint": "^1.1", "phpstan/phpstan-strict-rules": "^1.2", - "phpunit/phpunit": "^8 || ^9", - "slevomat/coding-standard": "^8.0", - "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.6", - "wp-coding-standards/wpcs": "^2.3" + "phpunit/phpunit": "^8.0 || ^9.0", + "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.6.1" }, "autoload-dev": { "classmap": [ From 3e0b5d88e8a8917da72535768cefd26e61049993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 9 Nov 2022 21:33:17 +0000 Subject: [PATCH 6/8] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c2f7b0b..915a2e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ jobs: php: "7.4" install: - "composer update --no-interaction --prefer-lowest" + - "composer update --no-interaction --with-all-dependencies szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset" cache: directories: From 11927fe4edf759fba0e25655c5349ec6ad26c1c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 9 Nov 2022 21:36:27 +0000 Subject: [PATCH 7/8] Update WpThemeGetDynamicMethodReturnTypeExtension.php --- src/WpThemeGetDynamicMethodReturnTypeExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WpThemeGetDynamicMethodReturnTypeExtension.php b/src/WpThemeGetDynamicMethodReturnTypeExtension.php index 1efbca8..39e739d 100644 --- a/src/WpThemeGetDynamicMethodReturnTypeExtension.php +++ b/src/WpThemeGetDynamicMethodReturnTypeExtension.php @@ -26,7 +26,7 @@ class WpThemeGetDynamicMethodReturnTypeExtension implements \PHPStan\Type\Dynami /** * File headers. * - * @var string[] + * @var list */ protected static $headers = [ 'Name', From eaf8bc23456f3137625e06759a1c3a6fa83f92b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 9 Nov 2022 21:42:10 +0000 Subject: [PATCH 8/8] Lock WP stubs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 915a2e2..ace60a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ jobs: php: "7.4" install: - "composer update --no-interaction --prefer-lowest" - - "composer update --no-interaction --with-all-dependencies szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset" + - "composer update --no-interaction --with-all-dependencies szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset 'php-stubs/wordpress-stubs:^6.1'" cache: directories: