Move FlipTypeControlToUseExclusiveTypeRector from type declaration to…

… code-quality-strict, as it might be opinionated and aim at higher level programming (#5265)
rectorphp · Jan 20, 2021 · 7d001c1 · 7d001c1
1 parent c6ab3bf
commit 7d001c1
Show file tree

Hide file tree

Showing 23 changed files with 76 additions and 76 deletions.
diff --git a/config/set/code-quality-strict.php b/config/set/code-quality-strict.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\CodeQualityStrict\Rector\If_\MoveOutMethodCallInsideIfConditionRector;
 use Rector\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector;
 use Rector\CodingStyle\Rector\MethodCall\UseMessageVariableForSprintfInSymfonyStyleRector;
@@ -14,4 +15,5 @@
     $services->set(CountArrayToEmptyArrayComparisonRector::class);
     $services->set(MoveVariableDeclarationNearReferenceRector::class);
     $services->set(UseMessageVariableForSprintfInSymfonyStyleRector::class);
+    $services->set(FlipTypeControlToUseExclusiveTypeRector::class);
 };
diff --git a/config/set/type-declaration.php b/config/set/type-declaration.php
@@ -7,7 +7,6 @@
 use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector;
 use Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector;
 use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector;
-use Rector\TypeDeclaration\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\TypeDeclaration\Rector\Property\PropertyTypeDeclarationRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
@@ -21,6 +20,4 @@
 
     $services->set(AddArrayParamDocTypeRector::class);
     $services->set(AddArrayReturnDocTypeRector::class);
-
-    $services->set(FlipTypeControlToUseExclusiveTypeRector::class);
 };
diff --git a/...ipTypeControlToUseExclusiveTypeRector.php → ...ipTypeControlToUseExclusiveTypeRector.php b/...ipTypeControlToUseExclusiveTypeRector.php → ...ipTypeControlToUseExclusiveTypeRector.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\TypeDeclaration\Rector\Identical;
+namespace Rector\CodeQuality\Rector\Identical;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
@@ -26,7 +26,7 @@
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\FlipTypeControlToUseExclusiveTypeRectorTest
+ * @see \Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\FlipTypeControlToUseExclusiveTypeRectorTest
  */
 final class FlipTypeControlToUseExclusiveTypeRector extends AbstractRector
 {
@@ -121,7 +121,7 @@ public function refactor(Node $node): ?Node
 
         /** @var Type[] $types */
         $types = $this->getTypes($type);
-        if ($this->skipNotNullOneOf($types)) {
+        if ($this->isNotNullOneOf($types)) {
             return null;
         }
 
@@ -176,7 +176,7 @@ private function getVariableAssign(Identical $identical, Expr $expr): ?Node
     /**
      * @param Type[] $types
      */
-    private function skipNotNullOneOf(array $types): bool
+    private function isNotNullOneOf(array $types): bool
     {
         if ($types === []) {
             return true;
@@ -188,6 +188,7 @@ private function skipNotNullOneOf(array $types): bool
         if ($types[0] instanceof NullType) {
             return false;
         }
+
         return ! $types[1] instanceof NullType;
     }
 }
diff --git a/...clusiveTypeRector/Fixture/fixture.php.inc → ...clusiveTypeRector/Fixture/fixture.php.inc b/...clusiveTypeRector/Fixture/fixture.php.inc → ...clusiveTypeRector/Fixture/fixture.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 
@@ -26,7 +26,7 @@ class Fixture
 -----
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...ector/Identical/FlipTypeControlToUseExclusiveTypeRector/Fixture/fqcn_in_namespace.php.inc b/...ector/Identical/FlipTypeControlToUseExclusiveTypeRector/Fixture/fqcn_in_namespace.php.inc
@@ -0,0 +1,38 @@
+<?php
+
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+
+use Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Source\stdClass;
+
+class FqcnInNamespace
+{
+    public function run()
+    {
+        /** @var stdClass|null $stdClass */
+        $stdClass = $this->getStdClass();
+        if ($stdClass === null) {
+            return;
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+
+use Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Source\stdClass;
+
+class FqcnInNamespace
+{
+    public function run()
+    {
+        $stdClass = $this->getStdClass();
+        if (!$stdClass instanceof \Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Source\stdClass) {
+            return;
+        }
+    }
+}
+
+?>
diff --git a/...usiveTypeRector/Fixture/fqcn_type.php.inc → ...usiveTypeRector/Fixture/fqcn_type.php.inc b/...usiveTypeRector/Fixture/fqcn_type.php.inc → ...usiveTypeRector/Fixture/fqcn_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 class FqcnType
 {
@@ -18,7 +18,7 @@ class FqcnType
 -----
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 class FqcnType
 {

diff --git a/...TypeRector/Fixture/interface_type.php.inc → ...TypeRector/Fixture/interface_type.php.inc b/...TypeRector/Fixture/interface_type.php.inc → ...TypeRector/Fixture/interface_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use DateTimeInterface;
 
@@ -26,7 +26,7 @@ class InterfaceType
 -----
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use DateTimeInterface;
 

diff --git a/...eTypeRector/Fixture/nullable_type.php.inc → ...eTypeRector/Fixture/nullable_type.php.inc b/...eTypeRector/Fixture/nullable_type.php.inc → ...eTypeRector/Fixture/nullable_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 
@@ -28,7 +28,7 @@ class NullableType
 -----
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...siveTypeRector/Fixture/skip_array.php.inc → ...siveTypeRector/Fixture/skip_array.php.inc b/...siveTypeRector/Fixture/skip_array.php.inc → ...siveTypeRector/Fixture/skip_array.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...Fixture/skip_assign_different_var.php.inc → ...Fixture/skip_assign_different_var.php.inc b/...Fixture/skip_assign_different_var.php.inc → ...Fixture/skip_assign_different_var.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...peRector/Fixture/skip_multi_types.php.inc → ...peRector/Fixture/skip_multi_types.php.inc b/...peRector/Fixture/skip_multi_types.php.inc → ...peRector/Fixture/skip_multi_types.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...TypeRector/Fixture/skip_no_assign.php.inc → ...TypeRector/Fixture/skip_no_assign.php.inc b/...TypeRector/Fixture/skip_no_assign.php.inc → ...TypeRector/Fixture/skip_no_assign.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...iveTypeRector/Fixture/skip_no_doc.php.inc → ...iveTypeRector/Fixture/skip_no_doc.php.inc b/...iveTypeRector/Fixture/skip_no_doc.php.inc → ...iveTypeRector/Fixture/skip_no_doc.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...ypeRector/Fixture/skip_no_var_tag.php.inc → ...ypeRector/Fixture/skip_no_var_tag.php.inc b/...ypeRector/Fixture/skip_no_var_tag.php.inc → ...ypeRector/Fixture/skip_no_var_tag.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 
@@ -16,4 +16,4 @@ class SkipNoVarTag
     }
 }
 
-?>
+?>
diff --git a/...tor/Fixture/skip_not_null_compare.php.inc → ...tor/Fixture/skip_not_null_compare.php.inc b/...tor/Fixture/skip_not_null_compare.php.inc → ...tor/Fixture/skip_not_null_compare.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...eRector/Fixture/skip_not_null_doc.php.inc → ...eRector/Fixture/skip_not_null_doc.php.inc b/...eRector/Fixture/skip_not_null_doc.php.inc → ...eRector/Fixture/skip_not_null_doc.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use DateTime;
 use stdClass;

diff --git a/...TypeRector/Fixture/skip_not_union.php.inc → ...TypeRector/Fixture/skip_not_union.php.inc b/...TypeRector/Fixture/skip_not_union.php.inc → ...TypeRector/Fixture/skip_not_union.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...TypeRector/Fixture/skip_same_type.php.inc → ...TypeRector/Fixture/skip_same_type.php.inc b/...TypeRector/Fixture/skip_same_type.php.inc → ...TypeRector/Fixture/skip_same_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 class SkipSameType
 {

diff --git a/...peRector/Fixture/skip_scalar_type.php.inc → ...peRector/Fixture/skip_scalar_type.php.inc b/...peRector/Fixture/skip_scalar_type.php.inc → ...peRector/Fixture/skip_scalar_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
 
 use stdClass;
 

diff --git a/...peControlToUseExclusiveTypeRectorTest.php → ...peControlToUseExclusiveTypeRectorTest.php b/...peControlToUseExclusiveTypeRectorTest.php → ...peControlToUseExclusiveTypeRectorTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Rector\TypeDeclaration\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 
 use Iterator;
+use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
-use Rector\TypeDeclaration\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class FlipTypeControlToUseExclusiveTypeRectorTest extends AbstractRectorTestCase

diff --git a/...uality/tests/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/Source/stdClass.php b/...uality/tests/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/Source/stdClass.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\CodeQuality\Tests\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Source;
+
+class stdClass
+{
+}
diff --git a/...ector/Identical/FlipTypeControlToUseExclusiveTypeRector/Fixture/fqcn_in_namespace.php.inc b/...ector/Identical/FlipTypeControlToUseExclusiveTypeRector/Fixture/fqcn_in_namespace.php.inc
diff --git a/...ration/tests/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/Source/stdClass.php b/...ration/tests/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/Source/stdClass.php