cs

TomasVotruba · TomasVotruba · commit 1de17f93dce5 · 2025-12-03T00:43:52.000+01:00
diff --git a/composer.json b/composer.json
@@ -13,6 +13,7 @@
         "phpunit/phpunit": "^11.5",
         "rector/rector-src": "dev-main",
         "symplify/easy-coding-standard": "^12.3",
+        "symplify/phpstan-rules": "^14.9",
         "symplify/rule-doc-generator": "^12.2",
         "symplify/vendor-patches": "^11.5",
         "tomasvotruba/class-leak": "^1.0",
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,7 +1,6 @@
-# to be enabled later once rector upgraded to use phpstan v2
-# includes:
-#    - vendor/symplify/phpstan-rules/config/symplify-rules.neon
-#    - vendor/symplify/phpstan-rules/config/rector-rules.neon
+includes:
+    - vendor/symplify/phpstan-rules/config/symplify-rules.neon
+    - vendor/symplify/phpstan-rules/config/rector-rules.neon
 
 parameters:
     level: 8
@@ -57,16 +56,16 @@ parameters:
         - '#Doing instanceof PHPStan\\Type\\.+ is error\-prone and deprecated#'
 
         # phpstan instanceof
-        -
-            identifier: phpstanApi.instanceofAssumption
-
-        -
-            identifier: phpstanApi.varTagAssumption
+        - identifier: phpstanApi.instanceofAssumption
+        - identifier: phpstanApi.varTagAssumption
+        - '#Asking about instanceof PHPStan\\.* is not covered by backward compatibility promise#'
 
         -
             identifier: argument.type
-
-        - '#Asking about instanceof PHPStan\\.* is not covered by backward compatibility promise#'
+            paths:
+                - rules/DowngradePhp85/Rector/StmtsAwareInterface/DowngradePipeOperatorRector.php
+                - rules/DowngradePhp85/Rector/Class_/DowngradeFinalPropertyPromotionRector.php
+                -  rules/DowngradePhp80/Rector/New_/DowngradeArbitraryExpressionsSupportRector.php
 
         # false positive intanceof in OR usage
         -
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_constant.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_constant.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;
 
-class Fixture
+final class FixtureConstant
 {
     public function run()
     {
@@ -16,7 +16,7 @@ class Fixture
 
 namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;
 
-class Fixture
+final class FixtureConstant
 {
     public function run()
     {
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_named_arguments.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_named_arguments.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;
 
-class Fixture
+final class FixtureNamedArguments
 {
     public function run()
     {
@@ -16,7 +16,7 @@ class Fixture
 
 namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;
 
-class Fixture
+final class FixtureNamedArguments
 {
     public function run()
     {
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_named_arguments_false_order.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_named_arguments_false_order.php.inc
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_xxh128.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_xxh128.php.inc
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_xxh32.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_xxh32.php.inc
@@ -2,11 +2,15 @@
 
 namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;
 
-class Fixture
+final class FixtureXxh32
 {
     public function run()
     {
-        return hash('xxh32', 'some-data-to-hash');
+        $value = hash('xxh32', 'some-data-to-hash');
+
+        $value = hash('xxh64', 'some-data-to-hash');
+
+        $value = hash('xxh128', 'some-data-to-hash');
     }
 }
 
@@ -16,11 +20,15 @@ class Fixture
 
 namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;
 
-class Fixture
+final class FixtureXxh32
 {
     public function run()
     {
-        return hash('md5', 'some-data-to-hash');
+        $value = hash('md5', 'some-data-to-hash');
+
+        $value = hash('md5', 'some-data-to-hash');
+
+        $value = hash('md5', 'some-data-to-hash');
     }
 }
 
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_xxh64.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/fixture_xxh64.php.inc
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/skip_check_version_compare_ternary.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/skip_check_version_compare_ternary.php.inc
@@ -6,8 +6,12 @@ final class SkipCheckVersionCompareTernary
 {
     public function run_v()
     {
-        return version_compare(PHP_VERSION, '8.1','>=')
+        $value = version_compare(PHP_VERSION, '8.1','>=')
             ? hash( 'xxh128', $value )
             : hash( 'md4', $value );
+
+        $value = version_compare(PHP_VERSION, '8.1','<')
+            ? hash( 'md4', $value )
+            : hash( 'xxh128', $value );
     }
 }
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/skip_check_version_compare_ternary2.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/skip_check_version_compare_ternary2.php.inc
diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/skip_different_func_call.php.inc b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHash/Fixture/skip_different_func_call.php.inc
diff --git a/rules/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHashRector.php b/rules/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHashRector.php
@@ -31,6 +31,9 @@
  */
 final class DowngradeHashAlgorithmXxHashRector extends AbstractRector
 {
+    /**
+     * @var array<string, string>
+     */
     private const HASH_ALGORITHMS_TO_DOWNGRADE = [
         'xxh32' => MHASH_XXH32,
         'xxh64' => MHASH_XXH64,
diff --git a/rules/DowngradePhp82/Rector/FuncCall/DowngradeIteratorCountToArrayRector.php b/rules/DowngradePhp82/Rector/FuncCall/DowngradeIteratorCountToArrayRector.php
@@ -68,16 +68,17 @@ function test(array|Traversable $data) {
 
     /**
      * @param Ternary|FuncCall $node
-     * @return null|FuncCall|NodeVisitor::DONT_TRAVERSE_CHILDREN
      */
-    public function refactor(Node $node): null|FuncCall|int
+    public function refactor(Node $node): null|FuncCall
     {
         if ($node instanceof Ternary) {
             $hasIsArrayCheck = (bool) $this->betterNodeFinder->findFirst(
                 $node,
                 fn (Node $subNode): bool => $subNode instanceof FuncCall && $this->isName($subNode, 'is_array')
             );
 
+            // get tgype...
+
             if ($hasIsArrayCheck) {
                 return NodeVisitor::DONT_TRAVERSE_CHILDREN;
             }
diff --git a/rules/DowngradePhp83/Rector/FuncCall/DowngradeJsonValidateRector.php b/rules/DowngradePhp83/Rector/FuncCall/DowngradeJsonValidateRector.php
@@ -84,8 +84,7 @@ public function getRuleDefinition(): RuleDefinition
      */
     public function getNodeTypes(): array
     {
-        $stmtsAware = NodeGroup::STMTS_AWARE;
-        return [...$stmtsAware, Switch_::class, Return_::class, Expression::class, Echo_::class];
+        return [...NodeGroup::STMTS_AWARE, Switch_::class, Return_::class, Expression::class, Echo_::class];
     }
 
     /**
diff --git a/rules/DowngradePhp85/Rector/StmtsAwareInterface/DowngradePipeOperatorRector.php b/rules/DowngradePhp85/Rector/StmtsAwareInterface/DowngradePipeOperatorRector.php
@@ -22,6 +22,7 @@
 
 /**
  * @see https://wiki.php.net/rfc/pipe-operator-v3
+ *
  * @see \Rector\Tests\DowngradePhp85\Rector\StmtsAwareInterface\DowngradePipeOperatorRector\DowngradePipeOperatorRectorTest
  */
 final class DowngradePipeOperatorRector extends AbstractRector

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;`
`4`	`4`
`5`		`-class Fixture`
	`5`	`+final class FixtureConstant`
`6`	`6`	`{`
`7`	`7`	`public function run()`
`8`	`8`	`{`
`@@ -16,7 +16,7 @@ class Fixture`
`16`	`16`
`17`	`17`	`namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;`
`18`	`18`
`19`		`-class Fixture`
	`19`	`+final class FixtureConstant`
`20`	`20`	`{`
`21`	`21`	`public function run()`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,15 @@`
`2`	`2`
`3`	`3`	`namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;`
`4`	`4`
`5`		`-class Fixture`
	`5`	`+final class FixtureXxh32`
`6`	`6`	`{`
`7`	`7`	`public function run()`
`8`	`8`	`{`
`9`		`- return hash('xxh32', 'some-data-to-hash');`
	`9`	`+ $value = hash('xxh32', 'some-data-to-hash');`
	`10`	`+`
	`11`	`+ $value = hash('xxh64', 'some-data-to-hash');`
	`12`	`+`
	`13`	`+ $value = hash('xxh128', 'some-data-to-hash');`
`10`	`14`	`}`
`11`	`15`	`}`
`12`	`16`
`@@ -16,11 +20,15 @@ class Fixture`
`16`	`20`
`17`	`21`	`namespace Rector\Tests\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHash\Fixture;`
`18`	`22`
`19`		`-class Fixture`
	`23`	`+final class FixtureXxh32`
`20`	`24`	`{`
`21`	`25`	`public function run()`
`22`	`26`	`{`
`23`		`- return hash('md5', 'some-data-to-hash');`
	`27`	`+ $value = hash('md5', 'some-data-to-hash');`
	`28`	`+`
	`29`	`+ $value = hash('md5', 'some-data-to-hash');`
	`30`	`+`
	`31`	`+ $value = hash('md5', 'some-data-to-hash');`
`24`	`32`	`}`
`25`	`33`	`}`
`26`	`34`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,12 @@ final class SkipCheckVersionCompareTernary`
`6`	`6`	`{`
`7`	`7`	`public function run_v()`
`8`	`8`	`{`
`9`		`- return version_compare(PHP_VERSION, '8.1','>=')`
	`9`	`+ $value = version_compare(PHP_VERSION, '8.1','>=')`
`10`	`10`	`? hash( 'xxh128', $value )`
`11`	`11`	`: hash( 'md4', $value );`
	`12`	`+`
	`13`	`+ $value = version_compare(PHP_VERSION, '8.1','<')`
	`14`	`+ ? hash( 'md4', $value )`
	`15`	`+ : hash( 'xxh128', $value );`
`12`	`16`	`}`
`13`	`17`	`}`