Simplify

Author: VincentLanglet

src/Type/Php/DateIntervalFormatDynamicReturnTypeExtension.php

@@ -7,12 +7,11 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
+use PHPStan\Type\Accessory\AccessoryLiteralStringType;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
-use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
-use PHPStan\Type\Accessory\AccessoryNumericStringType;
-use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
+use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
+use PHPStan\Type\GeneralizePrecision;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -53,37 +52,18 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			return null;
 		}
 
-		// The worst case scenario for the non-falsy-string check is that every number are 0.
+		// The worst case scenario for the non-falsy-string check is that every number is 0.
 		$dateInterval = new DateInterval('P0D');
 
 		$possibleReturnTypes = [];
 		foreach ($constantStrings as $string) {
 			$value = $dateInterval->format($string->getValue());
-
-			$accessories = [];
-			if (is_numeric($value)) {
-				$accessories[] = new AccessoryNumericStringType();
-			}
-			if ($value !== '0' && $value !== '') {
-				$accessories[] = new AccessoryNonFalsyStringType();
-			} elseif ($value !== '') {
-				$accessories[] = new AccessoryNonEmptyStringType();
-			}
-			if (strtolower($value) === $value) {
-				$accessories[] = new AccessoryLowercaseStringType();
-			}
-			if (strtoupper($value) === $value) {
-				$accessories[] = new AccessoryUppercaseStringType();
-			}
-
-			if (count($accessories) === 0) {
-				return null;
-			}
-
-			$possibleReturnTypes[] = new IntersectionType([new StringType(), ...$accessories]);
+			$possibleReturnTypes[] = new ConstantStringType($value);
 		}
 
-		return TypeCombinator::union(...$possibleReturnTypes);
+		$result = TypeCombinator::union(...$possibleReturnTypes)->generalize(GeneralizePrecision::moreSpecific());
+
+		return TypeCombinator::remove($result, new AccessoryLiteralStringType());
 	}
 
 }