[TypeDeclaration] Deprecate BinaryOpNullableToInstanceofRector, fold into ExplicitNullableObjectInstanceRector

rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Fixture/binaryop_binary_or.php.inc

@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+
+function binaryOr(?SomeInstance $someClass)
+{
+    if ($someClass || $someClass->someMethod()) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+
+function binaryOr(?SomeInstance $someClass)
+{
+    if ($someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance || $someClass->someMethod()) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+
+?>

rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Fixture/binaryop_both_negation.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2;
+
+function bothNegation(?SomeInstance $someClass, ?SomeInstance2 $someClass2)
+{
+    if (! $someClass || ! $someClass2) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2;
+
+function bothNegation(?SomeInstance $someClass, ?SomeInstance2 $someClass2)
+{
+    if (! $someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance || ! $someClass2 instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+
+?>

rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Fixture/binaryop_both_truthy.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2;
+
+function bothTruthy(?SomeInstance $someClass, ?SomeInstance2 $someClass2)
+{
+    if ($someClass && $someClass2) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2;
+
+function bothTruthy(?SomeInstance $someClass, ?SomeInstance2 $someClass2)
+{
+    if ($someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance && $someClass2 instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance2) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+
+?>

rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Fixture/binaryop_other_direction.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+
+function otherDirection(?SomeInstance $someClass)
+{
+    if (mt_rand(0,1) && $someClass) {
+        return $someClass->someMethod();
+
+    }
+
+    return 'no';
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+
+function otherDirection(?SomeInstance $someClass)
+{
+    if (mt_rand(0,1) && $someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance) {
+        return $someClass->someMethod();
+
+    }
+
+    return 'no';
+}
+
+?>

rules-tests/TypeDeclaration/Rector/BooleanAnd/BinaryOpNullableToInstanceofRector/Fixture/skip_assign.php.inc → rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Fixture/binaryop_skip_assign.php.inc

@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Tests\TypeDeclaration\Rector\BooleanAnd\BinaryOpNullableToInstanceofRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
 
-use Rector\Tests\TypeDeclaration\Rector\BooleanAnd\BinaryOpNullableToInstanceofRector\Source\SomeInstance;
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
 
 final class SkipAssign
 {

rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Fixture/binaryop_skip_phpdoc.php.inc

@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+
+/**
+ * @param SomeInstance|null $someClass
+ */
+function skipBinaryOrPhpdoc($someClass)
+{
+    if ($someClass || $someClass->someMethod()) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+

rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Fixture/binaryop_some_class.php.inc

@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+
+function someFunction(?SomeInstance $someClass)
+{
+    if ($someClass && $someClass->someMethod()) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance;
+
+function someFunction(?SomeInstance $someClass)
+{
+    if ($someClass instanceof \Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source\SomeInstance && $someClass->someMethod()) {
+        return 'yes';
+    }
+
+    return 'no';
+}
+
+?>

rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Source/SomeInstance.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source;
+
+final class SomeInstance
+{
+    public function someMethod(): bool
+    {
+        return true;
+    }
+}

rules-tests/CodeQuality/Rector/If_/ExplicitNullableObjectInstanceRector/Source/SomeInstance2.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\CodeQuality\Rector\If_\ExplicitNullableObjectInstanceRector\Source;
+
+final class SomeInstance2
+{
+    public function someMethod()
+    {
+    }
+}