[Php81] Allow explicit mixed processed on trait on NullToStrictString…

…FuncCallArgRector (#3212) * [Php81] Allow explicit mixed processed on trait on NullToStrictStringFuncCallArgRector * Fixed 🎉 * [ci-review] Rector Rectify * Final touch: clean up Co-authored-by: GitHub Action <action@github.com>
rectorphp · Dec 17, 2022 · e35497e · e35497e
1 parent dfad0c3
commit e35497e
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 4 deletions.
diff --git a/...ctor/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/explicit_mixed_in_trait.php.inc b/...ctor/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/explicit_mixed_in_trait.php.inc
@@ -0,0 +1,29 @@
+<?php
+
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+
+trait ExplicitMixedInTrait
+{
+    public function setTitle(mixed $title)
+    {
+        $this->title = $title;
+        return trim($this->title);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+
+trait ExplicitMixedInTrait
+{
+    public function setTitle(mixed $title)
+    {
+        $this->title = $title;
+        return trim((string) $this->title);
+    }
+}
+
+?>
diff --git a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
@@ -476,7 +476,7 @@ private function processNullToStrictStringOnNodePosition(
             return null;
         }
 
-        if ($this->shouldSkipTrait($argValue, $isTrait)) {
+        if ($this->shouldSkipTrait($argValue, $type, $isTrait)) {
             return null;
         }
 
@@ -490,13 +490,21 @@ private function processNullToStrictStringOnNodePosition(
         return $funcCall;
     }
 
-    private function shouldSkipTrait(Expr $expr, bool $isTrait): bool
+    private function shouldSkipTrait(Expr $expr, MixedType $mixedType, bool $isTrait): bool
     {
+        if (! $isTrait) {
+            return false;
+        }
+
+        if ($mixedType->isExplicitMixed()) {
+            return false;
+        }
+
         if (! $expr instanceof MethodCall) {
-            return $isTrait && $this->propertyFetchAnalyzer->isLocalPropertyFetch($expr);
+            return $this->propertyFetchAnalyzer->isLocalPropertyFetch($expr);
         }
 
-        return $isTrait;
+        return true;
     }
 
     private function isCastedReassign(Expr $expr): bool