From ef5216de545cbde705f91d0739ef8d2b323c89a4 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 2 Dec 2025 14:05:53 +0100 Subject: [PATCH 1/2] remove InfiniteLoop test, node must be changed on expression --- phpstan.neon | 6 --- .../InfiniteLoop/Fixture/de_morgan.php.inc | 37 -------------- ..._call_infinity_already_transformed.php.inc | 4 -- .../Fixture/some_method_call_infinity.php.inc | 13 ----- .../Issues/InfiniteLoop/InfiniteLoopTest.php | 28 ----------- .../Rector/MethodCall/InfinityLoopRector.php | 48 ------------------- .../InfiniteLoop/config/infinite_loop.php | 10 ---- 7 files changed, 146 deletions(-) delete mode 100644 tests/Issues/InfiniteLoop/Fixture/de_morgan.php.inc delete mode 100644 tests/Issues/InfiniteLoop/Fixture/skip_some_method_call_infinity_already_transformed.php.inc delete mode 100644 tests/Issues/InfiniteLoop/Fixture/some_method_call_infinity.php.inc delete mode 100644 tests/Issues/InfiniteLoop/InfiniteLoopTest.php delete mode 100644 tests/Issues/InfiniteLoop/Rector/MethodCall/InfinityLoopRector.php delete mode 100644 tests/Issues/InfiniteLoop/config/infinite_loop.php diff --git a/phpstan.neon b/phpstan.neon index 240dca14b41..fba5fbf77a9 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -387,9 +387,3 @@ parameters: - path: rules/TypeDeclaration/Rector/StmtsAwareInterface/IncreaseDeclareStrictTypesRector.php identifier: rector.noOnlyNullReturnInRefactor - - # handle next - - - identifier: rector.noIntegerRefactorReturn - paths: - - tests/Issues/InfiniteLoop/Rector/MethodCall/InfinityLoopRector.php diff --git a/tests/Issues/InfiniteLoop/Fixture/de_morgan.php.inc b/tests/Issues/InfiniteLoop/Fixture/de_morgan.php.inc deleted file mode 100644 index 4684d291975..00000000000 --- a/tests/Issues/InfiniteLoop/Fixture/de_morgan.php.inc +++ /dev/null @@ -1,37 +0,0 @@ - ------ - diff --git a/tests/Issues/InfiniteLoop/Fixture/skip_some_method_call_infinity_already_transformed.php.inc b/tests/Issues/InfiniteLoop/Fixture/skip_some_method_call_infinity_already_transformed.php.inc deleted file mode 100644 index 3cf40884185..00000000000 --- a/tests/Issues/InfiniteLoop/Fixture/skip_some_method_call_infinity_already_transformed.php.inc +++ /dev/null @@ -1,4 +0,0 @@ -modify('+1'); diff --git a/tests/Issues/InfiniteLoop/Fixture/some_method_call_infinity.php.inc b/tests/Issues/InfiniteLoop/Fixture/some_method_call_infinity.php.inc deleted file mode 100644 index 0390127e94c..00000000000 --- a/tests/Issues/InfiniteLoop/Fixture/some_method_call_infinity.php.inc +++ /dev/null @@ -1,13 +0,0 @@ -modify('+1'); - -?> ------ -modify('+1'); - -?> diff --git a/tests/Issues/InfiniteLoop/InfiniteLoopTest.php b/tests/Issues/InfiniteLoop/InfiniteLoopTest.php deleted file mode 100644 index bee63d7cdcc..00000000000 --- a/tests/Issues/InfiniteLoop/InfiniteLoopTest.php +++ /dev/null @@ -1,28 +0,0 @@ -doTestFile($filePath); - } - - public static function provideData(): Iterator - { - return self::yieldFilesFromDirectory(__DIR__ . '/Fixture'); - } - - public function provideConfigFilePath(): string - { - return __DIR__ . '/config/infinite_loop.php'; - } -} diff --git a/tests/Issues/InfiniteLoop/Rector/MethodCall/InfinityLoopRector.php b/tests/Issues/InfiniteLoop/Rector/MethodCall/InfinityLoopRector.php deleted file mode 100644 index d327f080102..00000000000 --- a/tests/Issues/InfiniteLoop/Rector/MethodCall/InfinityLoopRector.php +++ /dev/null @@ -1,48 +0,0 @@ -> - */ - public function getNodeTypes(): array - { - return [Assign::class, MethodCall::class]; - } - - /** - * @param Assign|MethodCall $node - * @return Assign|int|null|NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN - */ - public function refactor(Node $node): Assign|null|int - { - if ($node instanceof Assign) { - return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN; - } - - if (! $this->isName($node->name, 'modify')) { - return null; - } - - return new Assign($node->var, $node); - } - - public function getRuleDefinition(): RuleDefinition - { - return new RuleDefinition('Road to left... to left... to lefthell..', []); - } -} diff --git a/tests/Issues/InfiniteLoop/config/infinite_loop.php b/tests/Issues/InfiniteLoop/config/infinite_loop.php deleted file mode 100644 index 7f5bfc8ca09..00000000000 --- a/tests/Issues/InfiniteLoop/config/infinite_loop.php +++ /dev/null @@ -1,10 +0,0 @@ -withRules([InfinityLoopRector::class, SimplifyDeMorganBinaryRector::class]); From 6bf1c6f4e018e7fd3dd8e0b730d5e8431f029313 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 2 Dec 2025 13:08:44 +0000 Subject: [PATCH 2/2] [ci-review] Rector Rectify --- .../PHPStan/Scope/NodeVisitor/SymfonyClosureNodeVisitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/SymfonyClosureNodeVisitor.php b/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/SymfonyClosureNodeVisitor.php index 28c417e5c4e..bcdd423c138 100644 --- a/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/SymfonyClosureNodeVisitor.php +++ b/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/SymfonyClosureNodeVisitor.php @@ -30,7 +30,7 @@ public function enterNode(Node $node): ?Node } SimpleNodeTraverser::decorateWithAttributeValue( - (array) $node->stmts, + $node->stmts, AttributeKey::IS_INSIDE_SYMFONY_PHP_CLOSURE, true );