All count functions and methods return 0 or positive-int

phpstan · Oct 22, 2020 · a78a2e7 · a78a2e7
1 parent 6784a1c
commit a78a2e7
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 69 deletions.
diff --git a/resources/functionMap.php b/resources/functionMap.php
diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -769,7 +769,7 @@ private function inferAndCachePropertyTypes(
 
 		$classNameParts = explode('\\', $declaringClass->getName());
 		$namespace = null;
-		if (count($classNameParts) > 0) {
+		if (count($classNameParts) > 1) {
 			$namespace = implode('\\', array_slice($classNameParts, 0, -1));
 		}
 

diff --git a/src/Rules/Whitespace/FileWhitespaceRule.php b/src/Rules/Whitespace/FileWhitespaceRule.php
@@ -74,9 +74,7 @@ public function getLastNodes(): array
 		$nodeTraverser->traverse($nodes);
 
 		$lastNodes = $visitor->getLastNodes();
-		if (count($nodes) > 0) {
-			$lastNodes[] = $nodes[count($nodes) - 1];
-		}
+		$lastNodes[] = $nodes[count($nodes) - 1];
 		foreach ($lastNodes as $lastNode) {
 			if (!$lastNode instanceof Node\Stmt\InlineHTML || Strings::match($lastNode->value, '#^(\s+)$#') === null) {
 				continue;

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -276,7 +276,7 @@ public function toArray(): Type
 
 	public function count(): Type
 	{
-		return new IntegerType();
+		return IntegerRangeType::fromInterval(0, null);
 	}
 
 	public static function castToArrayKeyType(Type $offsetType): Type

diff --git a/src/Type/Php/CountFunctionReturnTypeExtension.php b/src/Type/Php/CountFunctionReturnTypeExtension.php
@@ -7,6 +7,7 @@
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Constant\ConstantIntegerType;
+use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
@@ -36,12 +37,17 @@ public function getTypeFromFunctionCall(
 			}
 		}
 
-		$arrays = TypeUtils::getArrays($scope->getType($functionCall->args[0]->value));
-		if (count($arrays) === 0) {
+		$argType = $scope->getType($functionCall->args[0]->value);
+		$constantArrays = TypeUtils::getConstantArrays($scope->getType($functionCall->args[0]->value));
+		if (count($constantArrays) === 0) {
+			if ($argType->isIterableAtLeastOnce()->yes()) {
+				return IntegerRangeType::fromInterval(1, null);
+			}
+
 			return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
 		}
 		$countTypes = [];
-		foreach ($arrays as $array) {
+		foreach ($constantArrays as $array) {
 			$countTypes[] = $array->count();
 		}
 

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -2530,7 +2530,7 @@ public function dataBinaryOperations(): array
 				'count($arrayOfIntegers)',
 			],
 			[
-				'int',
+				'int<0, max>',
 				'count($arrayOfIntegers, \COUNT_RECURSIVE)',
 			],
 			[
@@ -2802,11 +2802,11 @@ public function dataBinaryOperations(): array
 				'count($array)',
 			],
 			[
-				'int',
+				'int<0, max>',
 				'count()',
 			],
 			[
-				'int',
+				'int<0, max>',
 				'count($appendingToArrayInBranches)',
 			],
 			[
@@ -10204,6 +10204,11 @@ public function dataExtraIntTypes(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/extra-int-types.php');
 	}
 
+	public function dataCount(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/count-type.php');
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -10287,6 +10292,7 @@ public function dataExtraIntTypes(): array
 	 * @dataProvider dataBug3961
 	 * @dataProvider dataBug1924
 	 * @dataProvider dataExtraIntTypes
+	 * @dataProvider dataCount
 	 * @param string $assertType
 	 * @param string $file
 	 * @param mixed ...$args

diff --git a/tests/PHPStan/Analyser/data/bug-2648.php b/tests/PHPStan/Analyser/data/bug-2648.php
@@ -16,7 +16,7 @@ public function doFoo(array $list): void
 			assertType('int<2, max>', count($list));
 			unset($list['fooo']);
 			assertType('array<bool>', $list);
-			assertType('int', count($list));
+			assertType('int<0, max>', count($list));
 		}
 	}
 
@@ -28,24 +28,24 @@ public function doBar(array $list): void
 		if (count($list) > 1) {
 			assertType('int<2, max>', count($list));
 			foreach ($list as $key => $item) {
-				assertType('int<2, max>|int<min, 0>', count($list));
+				assertType('0|int<2, max>', count($list));
 				if ($item === false) {
 					unset($list[$key]);
-					assertType('int', count($list));
+					assertType('int<0, max>', count($list));
 				}
 
-				assertType('int', count($list));
+				assertType('int<0, max>', count($list));
 
 				if (count($list) === 1) {
-					assertType('int', count($list));
+					assertType('int<1, max>', count($list));
 					break;
 				}
 			}
 
-			assertType('int', count($list));
+			assertType('int<0, max>', count($list));
 		}
 
-		assertType('int', count($list));
+		assertType('int<0, max>', count($list));
 	}
 
 }
diff --git a/tests/PHPStan/Analyser/data/bug-2750.php b/tests/PHPStan/Analyser/data/bug-2750.php
@@ -8,20 +8,20 @@ function (array $input) {
 	\assert(count($input) > 0);
 	assertType('int<1, max>', count($input));
 	array_shift($input);
-	assertType('int', count($input));
+	assertType('int<0, max>', count($input));
 
 	\assert(count($input) > 0);
 	assertType('int<1, max>', count($input));
 	array_pop($input);
-	assertType('int', count($input));
+	assertType('int<0, max>', count($input));
 
 	\assert(count($input) > 0);
 	assertType('int<1, max>', count($input));
 	array_unshift($input, 'test');
-	assertType('int', count($input));
+	assertType('int<1, max>', count($input));
 
 	\assert(count($input) > 0);
 	assertType('int<1, max>', count($input));
 	array_push($input, 'nope');
-	assertType('int', count($input));
+	assertType('int<1, max>', count($input));
 };
diff --git a/tests/PHPStan/Analyser/data/count-type.php b/tests/PHPStan/Analyser/data/count-type.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace CountType;
+
+use function PHPStan\Analyser\assertType;
+
+class Foo
+{
+
+	/**
+	 * @param non-empty-array $nonEmpty
+	 */
+	public function doFoo(
+		array $nonEmpty
+	)
+	{
+		assertType('int<1, max>', count($nonEmpty));
+	}
+
+}