From aeb8595401a528cd76321edd13654d4cb07055cf Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 8 Apr 2026 00:06:47 +0700 Subject: [PATCH 1/3] Fix e2e expectation due to new line info feature --- e2e/cache-meta-extension/expected-output.diff | 2 +- e2e/config-dist-fallback/expected-output.diff | 2 +- e2e/config-file-priority/expected-output.diff | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/cache-meta-extension/expected-output.diff b/e2e/cache-meta-extension/expected-output.diff index 1c008369158..2ab9053fa21 100644 --- a/e2e/cache-meta-extension/expected-output.diff +++ b/e2e/cache-meta-extension/expected-output.diff @@ -4,7 +4,7 @@ 1) src/DeadConstructor.php:2 ---------- begin diff ---------- -@@ @@ +@@ Line 2 @@ final class DeadConstructor { diff --git a/e2e/config-dist-fallback/expected-output.diff b/e2e/config-dist-fallback/expected-output.diff index 1bc6840a60b..be7387f8764 100644 --- a/e2e/config-dist-fallback/expected-output.diff +++ b/e2e/config-dist-fallback/expected-output.diff @@ -4,7 +4,7 @@ 1) src/SomeClass.php:4 ---------- begin diff ---------- -@@ @@ +@@ Line 4 @@ final class SomeClass { diff --git a/e2e/config-file-priority/expected-output.diff b/e2e/config-file-priority/expected-output.diff index 1bc6840a60b..be7387f8764 100644 --- a/e2e/config-file-priority/expected-output.diff +++ b/e2e/config-file-priority/expected-output.diff @@ -4,7 +4,7 @@ 1) src/SomeClass.php:4 ---------- begin diff ---------- -@@ @@ +@@ Line 4 @@ final class SomeClass { From 6c783790a75a71cf84d15d7446ab255f5677b5fa Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 7 Apr 2026 17:11:06 +0000 Subject: [PATCH 2/3] [ci-review] Rector Rectify --- .../AddOverrideAttributeToOverriddenMethodsRector.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php index 9138ae4ddba..4d98e6200af 100644 --- a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php +++ b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php @@ -4,6 +4,7 @@ namespace Rector\Php83\Rector\ClassMethod; +use PhpParser\Node\Name; use PhpParser\Node; use PhpParser\Node\Attribute; use PhpParser\Node\AttributeGroup; @@ -376,7 +377,7 @@ private function resolveClassMethodFromTraitUse(ClassLike $classLike, string $me // early return for the class if it does not extend anything private function shouldSkipNode(Class_ $class): bool { - if ($class->extends !== null) { + if ($class->extends instanceof Name) { return false; } From 9e3bba8d36646c815ba1108b48404e6f381fb6bd Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 8 Apr 2026 00:14:11 +0700 Subject: [PATCH 3/3] ensure no merge conflict --- .../AddOverrideAttributeToOverriddenMethodsRector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php index 4d98e6200af..b8399f26300 100644 --- a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php +++ b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php @@ -4,12 +4,12 @@ namespace Rector\Php83\Rector\ClassMethod; -use PhpParser\Node\Name; use PhpParser\Node; use PhpParser\Node\Attribute; use PhpParser\Node\AttributeGroup; use PhpParser\Node\Expr; use PhpParser\Node\Expr\Throw_; +use PhpParser\Node\Name; use PhpParser\Node\Name\FullyQualified; use PhpParser\Node\Stmt; use PhpParser\Node\Stmt\Class_;