Updated Rector to commit 8e96b1b9dbd4a5fdf8da8d863aa9e153298d7427

rectorphp/rector-src@8e96b1b [DeadCode] Skip from call with return docblock on ReduceAlwaysFalseIfOrRector (#6361)
rectorphp · Oct 7, 2024 · 68910d2 · 68910d2
1 parent 7822553
commit 68910d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/rules/DeadCode/NodeAnalyzer/SafeLeftTypeBooleanAndOrAnalyzer.php b/rules/DeadCode/NodeAnalyzer/SafeLeftTypeBooleanAndOrAnalyzer.php
@@ -7,12 +7,15 @@
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;
+use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Expr\Variable;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Type\MixedType;
 use Rector\NodeAnalyzer\ExprAnalyzer;
+use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Reflection\ReflectionResolver;
 final class SafeLeftTypeBooleanAndOrAnalyzer
@@ -32,11 +35,17 @@ final class SafeLeftTypeBooleanAndOrAnalyzer
      * @var \Rector\Reflection\ReflectionResolver
      */
     private $reflectionResolver;
-    public function __construct(BetterNodeFinder $betterNodeFinder, ExprAnalyzer $exprAnalyzer, ReflectionResolver $reflectionResolver)
+    /**
+     * @readonly
+     * @var \Rector\NodeTypeResolver\NodeTypeResolver
+     */
+    private $nodeTypeResolver;
+    public function __construct(BetterNodeFinder $betterNodeFinder, ExprAnalyzer $exprAnalyzer, ReflectionResolver $reflectionResolver, NodeTypeResolver $nodeTypeResolver)
     {
         $this->betterNodeFinder = $betterNodeFinder;
         $this->exprAnalyzer = $exprAnalyzer;
         $this->reflectionResolver = $reflectionResolver;
+        $this->nodeTypeResolver = $nodeTypeResolver;
     }
     /**
      * @param \PhpParser\Node\Expr\BinaryOp\BooleanAnd|\PhpParser\Node\Expr\BinaryOp\BooleanOr $booleanAnd
@@ -61,6 +70,12 @@ public function isSafe($booleanAnd) : bool
         if ($classReflection instanceof ClassReflection && $classReflection->isTrait()) {
             return !$booleanAnd->left instanceof Instanceof_;
         }
-        return \true;
+        return !(bool) $this->betterNodeFinder->findFirst($booleanAnd->left, function (Node $node) : bool {
+            if (!$node instanceof CallLike) {
+                return \false;
+            }
+            $nativeType = $this->nodeTypeResolver->getNativeType($node);
+            return $nativeType instanceof MixedType && !$nativeType->isExplicitMixed();
+        });
     }
 }
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '748330a01994017fded43807745d77366fe3bff9';
+    public const PACKAGE_VERSION = '8e96b1b9dbd4a5fdf8da8d863aa9e153298d7427';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-10-06 19:25:08';
+    public const RELEASE_DATE = '2024-10-08 01:56:21';
     /**
      * @var int
      */