introduce TypeCombinator to 'non-falsy-string'

phpstan · Jul 25, 2022 · 7fd0884 · 7fd0884
1 parent 30728d4
commit 7fd0884
Showing 1 changed file with 27 additions and 2 deletions.
diff --git a/src/Type/TypeCombinator.php b/src/Type/TypeCombinator.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type;
 
+use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\Accessory\AccessoryType;
 use PHPStan\Type\Accessory\HasOffsetType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
@@ -402,19 +403,43 @@ private static function compareTypesInUnion(Type $a, Type $b): ?array
 		if (
 			$a instanceof ConstantStringType
 			&& $a->getValue() === ''
-			&& $b->describe(VerbosityLevel::value()) === 'non-empty-string'
+			&& ($b->describe(VerbosityLevel::value()) === 'non-empty-string'
+			|| $b->describe(VerbosityLevel::value()) === 'non-falsy-string')
 		) {
 			return [null, new StringType()];
 		}
 
 		if (
 			$b instanceof ConstantStringType
 			&& $b->getValue() === ''
-			&& $a->describe(VerbosityLevel::value()) === 'non-empty-string'
+			&& ($a->describe(VerbosityLevel::value()) === 'non-empty-string'
+				|| $a->describe(VerbosityLevel::value()) === 'non-falsy-string')
 		) {
 			return [new StringType(), null];
 		}
 
+		if (
+			$a instanceof ConstantStringType
+			&& $a->getValue() === '0'
+			&& $b->describe(VerbosityLevel::value()) === 'non-falsy-string'
+		) {
+			return [null, new IntersectionType([
+				new StringType(),
+				new AccessoryNonEmptyStringType(),
+			])];
+		}
+
+		if (
+			$b instanceof ConstantStringType
+			&& $b->getValue() === '0'
+			&& $a->describe(VerbosityLevel::value()) === 'non-falsy-string'
+		) {
+			return [new IntersectionType([
+				new StringType(),
+				new AccessoryNonEmptyStringType(),
+			]), null];
+		}
+
 		return null;
 	}