From 5aa5296dafd83abb7a3156a43f01ceef1fa52984 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Thu, 6 Aug 2026 11:41:23 +0200
Subject: [PATCH 1/4] [Testing] Remove stray bare .php fixture leftover

---
 .../interface_implement.php                     | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 rules-tests/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector/FixtureAddToInterfaceMethods/interface_implement.php

diff --git a/rules-tests/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector/FixtureAddToInterfaceMethods/interface_implement.php b/rules-tests/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector/FixtureAddToInterfaceMethods/interface_implement.php
deleted file mode 100644
index 1d2157809f8..00000000000
--- a/rules-tests/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector/FixtureAddToInterfaceMethods/interface_implement.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Tests\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector\FixtureAddToInterfaceMethods;
-
-use Rector\Tests\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector\Source\ExampleFromInterface;
-
-final class InterfaceImplement implements ExampleFromInterface
-{
-    public function foo()
-    {
-        return true;
-    }
-}
-
-?>

From ba03075b8ca48704002b39455285626f87f4aa89 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Thu, 6 Aug 2026 11:38:28 +0200
Subject: [PATCH 2/4] [DeadCode] Add RemoveRedundantNullableTypeCheckRector

---
 .../nullable_int_from_method_call.php.inc     |  47 ++++++
 .../Fixture/nullable_string.php.inc           |  35 ++++
 .../Fixture/skip_another_variable.php.inc     |  15 ++
 .../Fixture/skip_untyped_param.php.inc        |  15 ++
 .../Fixture/skip_wider_union_type.php.inc     |  15 ++
 ...veRedundantNullableTypeCheckRectorTest.php |  28 ++++
 .../config/configured_rule.php                |  10 ++
 ...RemoveRedundantNullableTypeCheckRector.php | 156 ++++++++++++++++++
 src/Config/Level/DeadCodeLevel.php            |   2 +
 9 files changed, 323 insertions(+)
 create mode 100644 rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_string.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_another_variable.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_untyped_param.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_wider_union_type.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/RemoveRedundantNullableTypeCheckRectorTest.php
 create mode 100644 rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/config/configured_rule.php
 create mode 100644 rules/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector.php

diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc
new file mode 100644
index 00000000000..ab333364563
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc
@@ -0,0 +1,47 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+
+final class NullableIntFromMethodCall
+{
+    public function run(): void
+    {
+        $count = $this->resolveCount();
+        if ($count === null || ! is_int($count)) {
+            return;
+        }
+
+        echo $count;
+    }
+
+    private function resolveCount(): ?int
+    {
+        return 1;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+
+final class NullableIntFromMethodCall
+{
+    public function run(): void
+    {
+        $count = $this->resolveCount();
+        if ($count === null) {
+            return;
+        }
+
+        echo $count;
+    }
+
+    private function resolveCount(): ?int
+    {
+        return 1;
+    }
+}
+
+?>
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_string.php.inc b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_string.php.inc
new file mode 100644
index 00000000000..1e032184ba3
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_string.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+
+final class NullableString
+{
+    public function run(?string $securityExpression): void
+    {
+        if (null === $securityExpression || ! is_string($securityExpression)) {
+            return;
+        }
+
+        echo $securityExpression;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+
+final class NullableString
+{
+    public function run(?string $securityExpression): void
+    {
+        if (null === $securityExpression) {
+            return;
+        }
+
+        echo $securityExpression;
+    }
+}
+
+?>
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_another_variable.php.inc b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_another_variable.php.inc
new file mode 100644
index 00000000000..507b938a940
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_another_variable.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+
+final class SkipAnotherVariable
+{
+    public function run(?string $value, mixed $anotherValue): void
+    {
+        if (null === $value || ! is_string($anotherValue)) {
+            return;
+        }
+
+        echo $value;
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_untyped_param.php.inc b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_untyped_param.php.inc
new file mode 100644
index 00000000000..eb9ebac44f2
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_untyped_param.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+
+final class SkipUntypedParam
+{
+    public function run($value): void
+    {
+        if (null === $value || ! is_string($value)) {
+            return;
+        }
+
+        echo $value;
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_wider_union_type.php.inc b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_wider_union_type.php.inc
new file mode 100644
index 00000000000..4d2d9e31d37
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_wider_union_type.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+
+final class SkipWiderUnionType
+{
+    public function run(string|int|null $value): void
+    {
+        if (null === $value || ! is_string($value)) {
+            return;
+        }
+
+        echo $value;
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/RemoveRedundantNullableTypeCheckRectorTest.php b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/RemoveRedundantNullableTypeCheckRectorTest.php
new file mode 100644
index 00000000000..29144fe0045
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/RemoveRedundantNullableTypeCheckRectorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class RemoveRedundantNullableTypeCheckRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/config/configured_rule.php
new file mode 100644
index 00000000000..745b3f748f0
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/config/configured_rule.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(RemoveRedundantNullableTypeCheckRector::class);
+};
diff --git a/rules/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector.php b/rules/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector.php
new file mode 100644
index 00000000000..e60007d0458
--- /dev/null
+++ b/rules/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector.php
@@ -0,0 +1,156 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\DeadCode\Rector\BooleanOr;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\BinaryOp\BooleanOr;
+use PhpParser\Node\Expr\BinaryOp\Identical;
+use PhpParser\Node\Expr\BooleanNot;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\Variable;
+use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
+use Rector\PhpParser\Node\Value\ValueResolver;
+use Rector\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @see \Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\RemoveRedundantNullableTypeCheckRectorTest
+ */
+final class RemoveRedundantNullableTypeCheckRector extends AbstractRector
+{
+    public function __construct(
+        private readonly ValueResolver $valueResolver
+    ) {
+    }
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Remove is_<type>() check that can never fail next to null compare on a nullable value',
+            [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function run(?string $value)
+    {
+        if ($value === null || ! is_string($value)) {
+            return;
+        }
+    }
+}
+CODE_SAMPLE
+                    ,
+                    <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function run(?string $value)
+    {
+        if ($value === null) {
+            return;
+        }
+    }
+}
+CODE_SAMPLE
+                ),
+            ]
+        );
+    }
+
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [BooleanOr::class];
+    }
+
+    /**
+     * @param BooleanOr $node
+     */
+    public function refactor(Node $node): ?Expr
+    {
+        if (! $node->left instanceof Identical) {
+            return null;
+        }
+
+        $nullComparedExpr = $this->matchNullComparedExpr($node->left);
+        if (! $nullComparedExpr instanceof Variable) {
+            return null;
+        }
+
+        if (! $node->right instanceof BooleanNot) {
+            return null;
+        }
+
+        $funcCall = $node->right->expr;
+        if (! $funcCall instanceof FuncCall) {
+            return null;
+        }
+
+        if ($funcCall->isFirstClassCallable()) {
+            return null;
+        }
+
+        if (count($funcCall->getArgs()) !== 1) {
+            return null;
+        }
+
+        if (! $this->nodeComparator->areNodesEqual($funcCall->getArgs()[0]->value, $nullComparedExpr)) {
+            return null;
+        }
+
+        $funcCallName = $this->getName($funcCall);
+        if ($funcCallName === null) {
+            return null;
+        }
+
+        $comparedType = $this->getType($nullComparedExpr);
+        if (! TypeCombinator::containsNull($comparedType)) {
+            return null;
+        }
+
+        if (! $this->isAlwaysMatchingType($funcCallName, TypeCombinator::removeNull($comparedType))) {
+            return null;
+        }
+
+        return $node->left;
+    }
+
+    private function matchNullComparedExpr(Identical $identical): ?Expr
+    {
+        if ($this->valueResolver->isNull($identical->left)) {
+            return $identical->right;
+        }
+
+        if ($this->valueResolver->isNull($identical->right)) {
+            return $identical->left;
+        }
+
+        return null;
+    }
+
+    private function isAlwaysMatchingType(string $funcCallName, Type $type): bool
+    {
+        return match ($funcCallName) {
+            'is_string' => $type->isString()
+                ->yes(),
+            'is_int', 'is_integer', 'is_long' => $type->isInteger()
+                ->yes(),
+            'is_float', 'is_double' => $type->isFloat()
+                ->yes(),
+            'is_bool' => $type->isBoolean()
+                ->yes(),
+            'is_array' => $type->isArray()
+                ->yes(),
+            'is_object' => $type->isObject()
+                ->yes(),
+            default => false,
+        };
+    }
+}
diff --git a/src/Config/Level/DeadCodeLevel.php b/src/Config/Level/DeadCodeLevel.php
index 81cded04455..2b8f43e1a99 100644
--- a/src/Config/Level/DeadCodeLevel.php
+++ b/src/Config/Level/DeadCodeLevel.php
@@ -16,6 +16,7 @@
 use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
 use Rector\DeadCode\Rector\Block\ReplaceBlockToItsStmtsRector;
 use Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector;
+use Rector\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector;
 use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
 use Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveArgumentFromDefaultParentCallRector;
@@ -148,6 +149,7 @@ final class DeadCodeLevel
 
         RemoveAlwaysTrueIfConditionRector::class,
         ReduceAlwaysFalseIfOrRector::class,
+        RemoveRedundantNullableTypeCheckRector::class,
         RemoveUnusedPrivateClassConstantRector::class,
         RemoveUnusedPrivatePropertyRector::class,
         RemoveUnusedClosureVariableUseRector::class,

From 4b6120b8bbd2dc4ddf91e48bfc18b8b209faf65f Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Thu, 6 Aug 2026 11:54:43 +0200
Subject: [PATCH 3/4] [DeadCode] Handle truthy && is_<type>() in
 RemoveRedundantTypeCheckRector

---
 .../Fixture/array_param_truthy_check.php.inc  |  31 +++++
 .../nullable_int_from_method_call.php.inc     |   4 +-
 .../Fixture/nullable_string.php.inc           |   4 +-
 .../nullable_string_truthy_check.php.inc      |  31 +++++
 .../Fixture/skip_another_variable.php.inc     |   2 +-
 .../skip_truthy_check_on_union.php.inc        |  13 ++
 .../Fixture/skip_untyped_param.php.inc        |   2 +-
 .../Fixture/skip_wider_union_type.php.inc     |   2 +-
 .../RemoveRedundantTypeCheckRectorTest.php}   |   4 +-
 .../config/configured_rule.php                |  10 ++
 .../config/configured_rule.php                |  10 --
 .../RemoveRedundantTypeCheckRector.php}       | 114 +++++++++++++-----
 src/Config/Level/DeadCodeLevel.php            |   4 +-
 13 files changed, 182 insertions(+), 49 deletions(-)
 create mode 100644 rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/array_param_truthy_check.php.inc
 rename rules-tests/DeadCode/Rector/{BooleanOr/RemoveRedundantNullableTypeCheckRector => BinaryOp/RemoveRedundantTypeCheckRector}/Fixture/nullable_int_from_method_call.php.inc (75%)
 rename rules-tests/DeadCode/Rector/{BooleanOr/RemoveRedundantNullableTypeCheckRector => BinaryOp/RemoveRedundantTypeCheckRector}/Fixture/nullable_string.php.inc (71%)
 create mode 100644 rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_string_truthy_check.php.inc
 rename rules-tests/DeadCode/Rector/{BooleanOr/RemoveRedundantNullableTypeCheckRector => BinaryOp/RemoveRedundantTypeCheckRector}/Fixture/skip_another_variable.php.inc (70%)
 create mode 100644 rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_truthy_check_on_union.php.inc
 rename rules-tests/DeadCode/Rector/{BooleanOr/RemoveRedundantNullableTypeCheckRector => BinaryOp/RemoveRedundantTypeCheckRector}/Fixture/skip_untyped_param.php.inc (67%)
 rename rules-tests/DeadCode/Rector/{BooleanOr/RemoveRedundantNullableTypeCheckRector => BinaryOp/RemoveRedundantTypeCheckRector}/Fixture/skip_wider_union_type.php.inc (68%)
 rename rules-tests/DeadCode/Rector/{BooleanOr/RemoveRedundantNullableTypeCheckRector/RemoveRedundantNullableTypeCheckRectorTest.php => BinaryOp/RemoveRedundantTypeCheckRector/RemoveRedundantTypeCheckRectorTest.php} (75%)
 create mode 100644 rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/config/configured_rule.php
 delete mode 100644 rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/config/configured_rule.php
 rename rules/DeadCode/Rector/{BooleanOr/RemoveRedundantNullableTypeCheckRector.php => BinaryOp/RemoveRedundantTypeCheckRector.php} (50%)

diff --git a/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/array_param_truthy_check.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/array_param_truthy_check.php.inc
new file mode 100644
index 00000000000..241ff58e2d6
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/array_param_truthy_check.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
+
+final class ArrayParamTruthyCheck
+{
+    public function buildWhereClauseFromArray($query, array $clauses, $expr = null): void
+    {
+        if ($clauses && is_array($clauses)) {
+            return;
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
+
+final class ArrayParamTruthyCheck
+{
+    public function buildWhereClauseFromArray($query, array $clauses, $expr = null): void
+    {
+        if ($clauses) {
+            return;
+        }
+    }
+}
+
+?>
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc
similarity index 75%
rename from rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc
rename to rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc
index ab333364563..ebaa284cea5 100644
--- a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_int_from_method_call.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
 
 final class NullableIntFromMethodCall
 {
@@ -24,7 +24,7 @@ final class NullableIntFromMethodCall
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
 
 final class NullableIntFromMethodCall
 {
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_string.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_string.php.inc
similarity index 71%
rename from rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_string.php.inc
rename to rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_string.php.inc
index 1e032184ba3..8663e36715b 100644
--- a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/nullable_string.php.inc
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_string.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
 
 final class NullableString
 {
@@ -18,7 +18,7 @@ final class NullableString
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
 
 final class NullableString
 {
diff --git a/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_string_truthy_check.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_string_truthy_check.php.inc
new file mode 100644
index 00000000000..25f6d0bccb9
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/nullable_string_truthy_check.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
+
+final class NullableStringTruthyCheck
+{
+    public function run(?string $value): void
+    {
+        if ($value && is_string($value)) {
+            echo $value;
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
+
+final class NullableStringTruthyCheck
+{
+    public function run(?string $value): void
+    {
+        if ($value) {
+            echo $value;
+        }
+    }
+}
+
+?>
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_another_variable.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_another_variable.php.inc
similarity index 70%
rename from rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_another_variable.php.inc
rename to rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_another_variable.php.inc
index 507b938a940..fe67608e39a 100644
--- a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_another_variable.php.inc
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_another_variable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
 
 final class SkipAnotherVariable
 {
diff --git a/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_truthy_check_on_union.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_truthy_check_on_union.php.inc
new file mode 100644
index 00000000000..3f51793bf5a
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_truthy_check_on_union.php.inc
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
+
+final class SkipTruthyCheckOnUnion
+{
+    public function run(array|string $value): void
+    {
+        if ($value && is_array($value)) {
+            return;
+        }
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_untyped_param.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_untyped_param.php.inc
similarity index 67%
rename from rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_untyped_param.php.inc
rename to rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_untyped_param.php.inc
index eb9ebac44f2..81a66407aa6 100644
--- a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_untyped_param.php.inc
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_untyped_param.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
 
 final class SkipUntypedParam
 {
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_wider_union_type.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_wider_union_type.php.inc
similarity index 68%
rename from rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_wider_union_type.php.inc
rename to rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_wider_union_type.php.inc
index 4d2d9e31d37..465e80a3ca9 100644
--- a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/Fixture/skip_wider_union_type.php.inc
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_wider_union_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
 
 final class SkipWiderUnionType
 {
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/RemoveRedundantNullableTypeCheckRectorTest.php b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/RemoveRedundantTypeCheckRectorTest.php
similarity index 75%
rename from rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/RemoveRedundantNullableTypeCheckRectorTest.php
rename to rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/RemoveRedundantTypeCheckRectorTest.php
index 29144fe0045..2bef5c177f9 100644
--- a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/RemoveRedundantNullableTypeCheckRectorTest.php
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/RemoveRedundantTypeCheckRectorTest.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector;
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-final class RemoveRedundantNullableTypeCheckRectorTest extends AbstractRectorTestCase
+final class RemoveRedundantTypeCheckRectorTest extends AbstractRectorTestCase
 {
     #[DataProvider('provideData')]
     public function test(string $filePath): void
diff --git a/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/config/configured_rule.php
new file mode 100644
index 00000000000..79e6bd5ffcd
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/config/configured_rule.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(RemoveRedundantTypeCheckRector::class);
+};
diff --git a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/config/configured_rule.php
deleted file mode 100644
index 745b3f748f0..00000000000
--- a/rules-tests/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector/config/configured_rule.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Rector\Config\RectorConfig;
-use Rector\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector;
-
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rule(RemoveRedundantNullableTypeCheckRector::class);
-};
diff --git a/rules/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector.php b/rules/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector.php
similarity index 50%
rename from rules/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector.php
rename to rules/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector.php
index e60007d0458..8ca3125856b 100644
--- a/rules/DeadCode/Rector/BooleanOr/RemoveRedundantNullableTypeCheckRector.php
+++ b/rules/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Rector\DeadCode\Rector\BooleanOr;
+namespace Rector\DeadCode\Rector\BinaryOp;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\BooleanNot;
@@ -19,9 +20,9 @@
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Tests\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector\RemoveRedundantNullableTypeCheckRectorTest
+ * @see \Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\RemoveRedundantTypeCheckRectorTest
  */
-final class RemoveRedundantNullableTypeCheckRector extends AbstractRector
+final class RemoveRedundantTypeCheckRector extends AbstractRector
 {
     public function __construct(
         private readonly ValueResolver $valueResolver
@@ -30,36 +31,41 @@ public function __construct(
 
     public function getRuleDefinition(): RuleDefinition
     {
-        return new RuleDefinition(
-            'Remove is_<type>() check that can never fail next to null compare on a nullable value',
-            [
-                new CodeSample(
-                    <<<'CODE_SAMPLE'
+        return new RuleDefinition('Remove is_<type>() check that can never fail on already known type', [
+            new CodeSample(
+                <<<'CODE_SAMPLE'
 class SomeClass
 {
-    public function run(?string $value)
+    public function run(?string $value, array $items)
     {
         if ($value === null || ! is_string($value)) {
             return;
         }
+
+        if ($items && is_array($items)) {
+            return;
+        }
     }
 }
 CODE_SAMPLE
-                    ,
-                    <<<'CODE_SAMPLE'
+                ,
+                <<<'CODE_SAMPLE'
 class SomeClass
 {
-    public function run(?string $value)
+    public function run(?string $value, array $items)
     {
         if ($value === null) {
             return;
         }
+
+        if ($items) {
+            return;
+        }
     }
 }
 CODE_SAMPLE
-                ),
-            ]
-        );
+            ),
+        ]);
     }
 
     /**
@@ -67,41 +73,72 @@ public function run(?string $value)
      */
     public function getNodeTypes(): array
     {
-        return [BooleanOr::class];
+        return [BooleanOr::class, BooleanAnd::class];
     }
 
     /**
-     * @param BooleanOr $node
+     * @param BooleanOr|BooleanAnd $node
      */
     public function refactor(Node $node): ?Expr
     {
-        if (! $node->left instanceof Identical) {
+        if ($node instanceof BooleanOr) {
+            return $this->refactorBooleanOr($node);
+        }
+
+        return $this->refactorBooleanAnd($node);
+    }
+
+    /**
+     * Handles "null === $value || ! is_string($value)", where is_string() can never fail once null is excluded
+     */
+    private function refactorBooleanOr(BooleanOr $booleanOr): ?Expr
+    {
+        if (! $booleanOr->left instanceof Identical) {
             return null;
         }
 
-        $nullComparedExpr = $this->matchNullComparedExpr($node->left);
+        $nullComparedExpr = $this->matchNullComparedExpr($booleanOr->left);
         if (! $nullComparedExpr instanceof Variable) {
             return null;
         }
 
-        if (! $node->right instanceof BooleanNot) {
+        if (! $booleanOr->right instanceof BooleanNot) {
             return null;
         }
 
-        $funcCall = $node->right->expr;
+        $funcCall = $this->matchTypeCheckFuncCall($booleanOr->right->expr, $nullComparedExpr);
         if (! $funcCall instanceof FuncCall) {
             return null;
         }
 
-        if ($funcCall->isFirstClassCallable()) {
+        $funcCallName = $this->getName($funcCall);
+        if ($funcCallName === null) {
             return null;
         }
 
-        if (count($funcCall->getArgs()) !== 1) {
+        $comparedType = $this->getType($nullComparedExpr);
+        if (! TypeCombinator::containsNull($comparedType)) {
             return null;
         }
 
-        if (! $this->nodeComparator->areNodesEqual($funcCall->getArgs()[0]->value, $nullComparedExpr)) {
+        if (! $this->isAlwaysMatchingType($funcCallName, TypeCombinator::removeNull($comparedType))) {
+            return null;
+        }
+
+        return $booleanOr->left;
+    }
+
+    /**
+     * Handles "$items && is_array($items)", where is_array() can never fail on an array type
+     */
+    private function refactorBooleanAnd(BooleanAnd $booleanAnd): ?Expr
+    {
+        if (! $booleanAnd->left instanceof Variable) {
+            return null;
+        }
+
+        $funcCall = $this->matchTypeCheckFuncCall($booleanAnd->right, $booleanAnd->left);
+        if (! $funcCall instanceof FuncCall) {
             return null;
         }
 
@@ -110,16 +147,37 @@ public function refactor(Node $node): ?Expr
             return null;
         }
 
-        $comparedType = $this->getType($nullComparedExpr);
-        if (! TypeCombinator::containsNull($comparedType)) {
+        // the type is already narrowed by the truthy check on the left
+        $checkedType = $this->getType($funcCall->getArgs()[0]->value);
+        if (! $this->isAlwaysMatchingType($funcCallName, $checkedType)) {
             return null;
         }
 
-        if (! $this->isAlwaysMatchingType($funcCallName, TypeCombinator::removeNull($comparedType))) {
+        return $booleanAnd->left;
+    }
+
+    /**
+     * Matches "is_<type>($expectedExpr)" single arg function call
+     */
+    private function matchTypeCheckFuncCall(Expr $expr, Expr $expectedExpr): ?FuncCall
+    {
+        if (! $expr instanceof FuncCall) {
+            return null;
+        }
+
+        if ($expr->isFirstClassCallable()) {
+            return null;
+        }
+
+        if (count($expr->getArgs()) !== 1) {
+            return null;
+        }
+
+        if (! $this->nodeComparator->areNodesEqual($expr->getArgs()[0]->value, $expectedExpr)) {
             return null;
         }
 
-        return $node->left;
+        return $expr;
     }
 
     private function matchNullComparedExpr(Identical $identical): ?Expr
diff --git a/src/Config/Level/DeadCodeLevel.php b/src/Config/Level/DeadCodeLevel.php
index 2b8f43e1a99..6a9a706dc04 100644
--- a/src/Config/Level/DeadCodeLevel.php
+++ b/src/Config/Level/DeadCodeLevel.php
@@ -14,9 +14,9 @@
 use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector;
 use Rector\DeadCode\Rector\Assign\RemoveDoubleSelfAssignRector;
 use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
+use Rector\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector;
 use Rector\DeadCode\Rector\Block\ReplaceBlockToItsStmtsRector;
 use Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector;
-use Rector\DeadCode\Rector\BooleanOr\RemoveRedundantNullableTypeCheckRector;
 use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
 use Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveArgumentFromDefaultParentCallRector;
@@ -149,7 +149,7 @@ final class DeadCodeLevel
 
         RemoveAlwaysTrueIfConditionRector::class,
         ReduceAlwaysFalseIfOrRector::class,
-        RemoveRedundantNullableTypeCheckRector::class,
+        RemoveRedundantTypeCheckRector::class,
         RemoveUnusedPrivateClassConstantRector::class,
         RemoveUnusedPrivatePropertyRector::class,
         RemoveUnusedClosureVariableUseRector::class,

From cc10d1dfda45450f1e0d6bb3cbdf1157c7d0b257 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Thu, 6 Aug 2026 16:12:27 +0200
Subject: [PATCH 4/4] use native type and skip docblock-only param types

---
 .../Fixture/skip_docblock_array_param.php.inc  | 16 ++++++++++++++++
 .../skip_docblock_nullable_param.php.inc       | 18 ++++++++++++++++++
 .../RemoveRedundantTypeCheckRector.php         | 18 +++++++++++++++---
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_docblock_array_param.php.inc
 create mode 100644 rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_docblock_nullable_param.php.inc

diff --git a/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_docblock_array_param.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_docblock_array_param.php.inc
new file mode 100644
index 00000000000..809ea08b494
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_docblock_array_param.php.inc
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
+
+final class SkipDocblockArrayParam
+{
+    /**
+     * @param mixed[] $clauses
+     */
+    public function run($clauses): void
+    {
+        if ($clauses && is_array($clauses)) {
+            return;
+        }
+    }
+}
diff --git a/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_docblock_nullable_param.php.inc b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_docblock_nullable_param.php.inc
new file mode 100644
index 00000000000..a0f501d57e2
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector/Fixture/skip_docblock_nullable_param.php.inc
@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\BinaryOp\RemoveRedundantTypeCheckRector\Fixture;
+
+final class SkipDocblockNullableParam
+{
+    /**
+     * @param ?string $value
+     */
+    public function run($value): void
+    {
+        if (null === $value || ! is_string($value)) {
+            return;
+        }
+
+        echo $value;
+    }
+}
diff --git a/rules/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector.php b/rules/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector.php
index 8ca3125856b..f2e86be0866 100644
--- a/rules/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector.php
+++ b/rules/DeadCode/Rector/BinaryOp/RemoveRedundantTypeCheckRector.php
@@ -14,6 +14,7 @@
 use PhpParser\Node\Expr\Variable;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use Rector\NodeAnalyzer\ExprAnalyzer;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -25,7 +26,8 @@
 final class RemoveRedundantTypeCheckRector extends AbstractRector
 {
     public function __construct(
-        private readonly ValueResolver $valueResolver
+        private readonly ValueResolver $valueResolver,
+        private readonly ExprAnalyzer $exprAnalyzer
     ) {
     }
 
@@ -102,6 +104,11 @@ private function refactorBooleanOr(BooleanOr $booleanOr): ?Expr
             return null;
         }
 
+        // the docblock type can be wider than the real value
+        if ($this->exprAnalyzer->isNonTypedFromParam($nullComparedExpr)) {
+            return null;
+        }
+
         if (! $booleanOr->right instanceof BooleanNot) {
             return null;
         }
@@ -116,7 +123,7 @@ private function refactorBooleanOr(BooleanOr $booleanOr): ?Expr
             return null;
         }
 
-        $comparedType = $this->getType($nullComparedExpr);
+        $comparedType = $this->getNativeType($nullComparedExpr);
         if (! TypeCombinator::containsNull($comparedType)) {
             return null;
         }
@@ -137,6 +144,11 @@ private function refactorBooleanAnd(BooleanAnd $booleanAnd): ?Expr
             return null;
         }
 
+        // the docblock type can be wider than the real value
+        if ($this->exprAnalyzer->isNonTypedFromParam($booleanAnd->left)) {
+            return null;
+        }
+
         $funcCall = $this->matchTypeCheckFuncCall($booleanAnd->right, $booleanAnd->left);
         if (! $funcCall instanceof FuncCall) {
             return null;
@@ -148,7 +160,7 @@ private function refactorBooleanAnd(BooleanAnd $booleanAnd): ?Expr
         }
 
         // the type is already narrowed by the truthy check on the left
-        $checkedType = $this->getType($funcCall->getArgs()[0]->value);
+        $checkedType = $this->getNativeType($funcCall->getArgs()[0]->value);
         if (! $this->isAlwaysMatchingType($funcCallName, $checkedType)) {
             return null;
         }