cleanup

rectorphp · Apr 24, 2023 · 5e1b9ab · 5e1b9ab
1 parent d875bd4
commit 5e1b9ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php b/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php
@@ -30,7 +30,7 @@ public function __construct(
 
     public function getRuleDefinition(): RuleDefinition
     {
-        return new RuleDefinition('Flip objectType control from null compare to use exclusive instanceof objectType', [
+        return new RuleDefinition('Flip type control from null compare to use exclusive instanceof object', [
             new CodeSample(
                 <<<'CODE_SAMPLE'
 function process(?DateTime $dateTime)

diff --git a/rules/Strict/NodeFactory/ExactCompareFactory.php b/rules/Strict/NodeFactory/ExactCompareFactory.php
@@ -142,13 +142,6 @@ private function collectCompareExprs(UnionType $unionType, Expr $expr, bool $tre
         return $compareExprs;
     }
 
-    private function cleanUpPossibleNullableUnionType(UnionType $unionType): Type
-    {
-        return count($unionType->getTypes()) === 2
-            ? TypeCombinator::removeNull($unionType)
-            : $unionType;
-    }
-
     /**
      * @param array<Identical|BooleanOr|NotIdentical|BooleanAnd|Instanceof_|BooleanNot|null> $compareExprs
      */
@@ -200,7 +193,7 @@ private function createTruthyFromUnionType(
         Expr $expr,
         bool $treatAsNonEmpty
     ): BooleanOr|NotIdentical|Identical|BooleanNot|Instanceof_|BooleanAnd|null {
-        $unionType = $this->cleanUpPossibleNullableUnionType($unionType);
+        $unionType = TypeCombinator::removeNull($unionType);
 
         if ($unionType instanceof UnionType) {
             $compareExprs = $this->collectCompareExprs($unionType, $expr, $treatAsNonEmpty);