Fix count(list) regression

phpstan · Dec 8, 2023 · fe8d164 · fe8d164
1 parent f73a165
commit fe8d164
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -249,7 +249,7 @@ public function specifyTypesInCondition(
 					$argType = $scope->getType($expr->right->getArgs()[0]->value);
 					if ($argType->isArray()->yes()) {
 						$newType = new NonEmptyArrayType();
-						if ($argType->isList()->yes()) {
+						if ($context->truthy() && $argType->isList()->yes()) {
 							$newType = AccessoryArrayListType::intersectWith($newType);
 						}
 

diff --git a/tests/PHPStan/Analyser/data/bug-10264.php b/tests/PHPStan/Analyser/data/bug-10264.php
@@ -3,6 +3,7 @@
 namespace Bug10264;
 
 use function PHPStan\Testing\assertType;
+use stdClass;
 
 class A
 {
@@ -15,6 +16,18 @@ function doFoo() {
 		assert((count($list) <= 1) === true);
 		assertType('list<Bug10264\A>', $list);
 	}
-}
 
+	/** @param list<int> $c */
+	public function sayHello(array $c): void
+	{
+		assertType('list<int>', $c);
+		if (count($c) > 0) {
+			$c = array_map(fn () => new stdClass(), $c);
+			assertType('non-empty-list<stdClass>', $c);
+		} else {
+			assertType('array{}', $c);
+		}
 
+		assertType('list<stdClass>', $c);
+	}
+}