Make AccessoryNonFalsyStringType::toInteger() return IntegerType instead of non-zero

Author: zonuexe

src/Type/Accessory/AccessoryNonFalsyStringType.php

@@ -171,10 +171,7 @@ public function toNumber(): Type
 
 	public function toInteger(): Type
 	{
-		return new UnionType([
-			IntegerRangeType::fromInterval(null, -1),
-			IntegerRangeType::fromInterval(1, null),
-		]);
+		return new IntegerType();
 	}
 
 	public function toFloat(): Type

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1463,6 +1463,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6613.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10187.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10834.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10893.php');
 	}
 
 	/**

tests/PHPStan/Analyser/data/bug-10893.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace Bug10893;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param non-falsy-string $nonfalsy
+ */
+function hasMicroseconds(\DateTimeInterface $value, string $nonfalsy): bool
+{
+	assertType('non-falsy-string', $value->format('u'));
+	assertType('int', (int)$value->format('u'));
+	assertType('bool', (int)$value->format('u') !== 0);
+	assertType('non-falsy-string', $nonfalsy);
+	assertType('int', (int)$nonfalsy);
+	assertType('bool', (int)$nonfalsy !== 0);
+
+	return (int) $value->format('u') !== 0;
+}

tests/PHPStan/Analyser/data/non-falsy-string.php

@@ -10,7 +10,7 @@ class Foo {
 	 * @param truthy-string $truthyString
 	 */
 	public function bar($nonFalseyString, $truthyString) {
-		assertType('int<min, -1>|int<1, max>', (int) $nonFalseyString);
+		assertType('int', (int) $nonFalseyString);
 		// truthy-string is an alias for non-falsy-string
 		assertType('non-falsy-string', $truthyString);
 	}