Simplify AccessoryNonEmptyStringTypeCorrector (#3636)

rectorphp · Apr 20, 2023 · fff2232 · fff2232
1 parent ff89974
commit fff2232
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/packages/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php b/packages/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php
@@ -17,12 +17,7 @@ public function correct(Type $mainType): Type | IntersectionType
             return $mainType;
         }
 
-        if (
-            ! $mainType->isSubTypeOf(new AccessoryNonEmptyStringType())
-                ->yes()
-            && ! $mainType->isSubTypeOf(new AccessoryNonFalsyStringType())
-                ->yes()
-        ) {
+        if (!$mainType->isNonEmptyString()->yes()) {
             return $mainType;
         }
 

diff --git a/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php b/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php
@@ -32,7 +32,6 @@ public function correct(Type $mainType): Type
                 return $traverseCallback($traversedType);
             }
 
-            /** @var ClassReflection $classReflection */
             $classReflection = $this->reflectionProvider->getClass($value);
             if ($classReflection->getName() !== $value) {
                 return $traverseCallback($traversedType);