From a2e5e4b21ea95163d75bce867471e5ab6c8fdeb1 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 1 Feb 2025 18:16:58 +0700
Subject: [PATCH] [TypeDeclaration] Skip override trait method on
 StrictStringParamConcatRector

---
 .../Fixture/skip_override_trait.php.inc           | 15 +++++++++++++++
 .../Source/SomeTrait.php                          | 10 ++++++++++
 .../ParentClassMethodTypeOverrideGuard.php        |  8 ++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 rules-tests/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector/Fixture/skip_override_trait.php.inc
 create mode 100644 rules-tests/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector/Source/SomeTrait.php

diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector/Fixture/skip_override_trait.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector/Fixture/skip_override_trait.php.inc
new file mode 100644
index 00000000000..681bd56f3b0
--- /dev/null
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector/Fixture/skip_override_trait.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictStringParamConcatRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictStringParamConcatRector\Source\SomeTrait;
+
+final class SkipOverrideTrait
+{
+    use SomeTrait;
+
+    public function run($var): void
+    {
+        $var .= 'test';
+    }
+}
\ No newline at end of file
diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector/Source/SomeTrait.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector/Source/SomeTrait.php
new file mode 100644
index 00000000000..639893260f6
--- /dev/null
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector/Source/SomeTrait.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictStringParamConcatRector\Source;
+
+trait SomeTrait
+{
+    abstract public function run($var): void;
+}
diff --git a/src/VendorLocker/ParentClassMethodTypeOverrideGuard.php b/src/VendorLocker/ParentClassMethodTypeOverrideGuard.php
index 05f9d27cba4..a3db7e838f0 100644
--- a/src/VendorLocker/ParentClassMethodTypeOverrideGuard.php
+++ b/src/VendorLocker/ParentClassMethodTypeOverrideGuard.php
@@ -108,6 +108,14 @@ private function resolveParentClassMethod(ClassMethod|MethodReflection $classMet
             return $interfaceReflection->getNativeMethod($methodName);
         }
 
+        foreach ($classReflection->getTraits() as $traitReflection) {
+            if (! $traitReflection->hasNativeMethod($methodName)) {
+                continue;
+            }
+
+            return $traitReflection->getNativeMethod($methodName);
+        }
+
         return null;
     }