count(non-empty-array, COUNT_RECURSIVE) is int<1, max>

Author: staabm

src/Type/Php/CountFunctionReturnTypeExtension.php

@@ -6,8 +6,10 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\FunctionReflection;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
+use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\Type;
 use function count;
 use function in_array;
@@ -32,14 +34,26 @@ public function getTypeFromFunctionCall(
 			return null;
 		}
 
-		if (count($functionCall->getArgs()) > 1) {
-			$mode = $scope->getType($functionCall->getArgs()[1]->value);
-			if ($mode->isSuperTypeOf(new ConstantIntegerType(COUNT_RECURSIVE))->yes()) {
-				return null;
+		$arrayType = $scope->getType($functionCall->getArgs()[0]->value);
+		if (!$this->isNormalCount($functionCall, $arrayType, $scope)->yes()) {
+			if ($arrayType->isIterableAtLeastOnce()->yes()) {
+				return IntegerRangeType::fromInterval(1, null);
 			}
+			return null;
 		}
 
 		return $scope->getType($functionCall->getArgs()[0]->value)->getArraySize();
 	}
 
+	private function isNormalCount(FuncCall $countFuncCall, Type $countedType, Scope $scope,): TrinaryLogic
+	{
+		if (count($countFuncCall->getArgs()) === 1) {
+			$isNormalCount = TrinaryLogic::createYes();
+		} else {
+			$mode = $scope->getType($countFuncCall->getArgs()[1]->value);
+			$isNormalCount = (new ConstantIntegerType(COUNT_NORMAL))->isSuperTypeOf($mode)->result->or($countedType->getIterableValueType()->isArray()->negate());
+		}
+		return $isNormalCount;
+	}
+
 }

tests/PHPStan/Analyser/nsrt/count-recursive.php

@@ -0,0 +1,66 @@
+<?php
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public function countArray(array $arr): void
+	{
+		if (count($arr) > 2) {
+			assertType('non-empty-array', $arr);
+			assertType('int<3, max>', count($arr));
+			assertType('int<1, max>', count($arr, COUNT_NORMAL)); // could be int<3, max>
+			assertType('int<1, max>', count($arr, COUNT_RECURSIVE));
+		}
+	}
+
+	public function countArrayNormal(array $arr): void
+	{
+		if (count($arr, COUNT_NORMAL) > 2) {
+			assertType('non-empty-array', $arr);
+			assertType('int<1, max>', count($arr)); // could be int<3, max>
+			assertType('int<3, max>', count($arr, COUNT_NORMAL));
+			assertType('int<1, max>', count($arr, COUNT_RECURSIVE));
+		}
+	}
+
+	public function countArrayRecursive(array $arr): void
+	{
+		if (count($arr, COUNT_RECURSIVE) > 2) {
+			assertType('non-empty-array', $arr);
+			assertType('int<1, max>', count($arr));
+			assertType('int<1, max>', count($arr, COUNT_NORMAL));
+			assertType('int<3, max>', count($arr, COUNT_RECURSIVE));
+		}
+	}
+
+	/** @param list<int> $list */
+	public function countList($list): void
+	{
+		if (count($list) > 2) {
+			assertType('int<3, max>', count($list));
+			assertType('int<1, max>', count($list, COUNT_NORMAL));
+			assertType('int<1, max>', count($list, COUNT_RECURSIVE));
+		}
+	}
+
+	/** @param list<int> $list */
+	public function countListNormal($list): void
+	{
+		if (count($list, COUNT_NORMAL) > 2) {
+			assertType('int<1, max>', count($list));
+			assertType('int<3, max>', count($list, COUNT_NORMAL));
+			assertType('int<1, max>', count($list, COUNT_RECURSIVE));
+		}
+	}
+
+	/** @param list<int> $list */
+	public function countListRecursive($list): void
+	{
+		if (count($list, COUNT_RECURSIVE) > 2) {
+			assertType('int<1, max>', count($list));
+			assertType('int<1, max>', count($list, COUNT_NORMAL));
+			assertType('int<3, max>', count($list, COUNT_RECURSIVE));
+		}
+	}
+}