Fix checking empty constant arrays in array function return type exte…

…nsions
phpstan · Sep 5, 2022 · f129659 · f129659
1 parent 4228b5a
commit f129659
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 10 deletions.
diff --git a/src/Type/Php/ArrayKeyFirstDynamicReturnTypeExtension.php b/src/Type/Php/ArrayKeyFirstDynamicReturnTypeExtension.php
@@ -37,8 +37,11 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		if (count($constantArrays) > 0) {
 			$keyTypes = [];
 			foreach ($constantArrays as $constantArray) {
-				if ($constantArray->isEmpty()) {
+				$iterableAtLeastOnce = $constantArray->isIterableAtLeastOnce();
+				if (!$iterableAtLeastOnce->yes()) {
 					$keyTypes[] = new NullType();
+				}
+				if ($iterableAtLeastOnce->no()) {
 					continue;
 				}
 

diff --git a/src/Type/Php/ArrayKeyLastDynamicReturnTypeExtension.php b/src/Type/Php/ArrayKeyLastDynamicReturnTypeExtension.php
@@ -37,8 +37,11 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		if (count($constantArrays) > 0) {
 			$keyTypes = [];
 			foreach ($constantArrays as $constantArray) {
-				if ($constantArray->isEmpty()) {
+				$iterableAtLeastOnce = $constantArray->isIterableAtLeastOnce();
+				if (!$iterableAtLeastOnce->yes()) {
 					$keyTypes[] = new NullType();
+				}
+				if ($iterableAtLeastOnce->no()) {
 					continue;
 				}
 

diff --git a/src/Type/Php/ArrayPointerFunctionsDynamicReturnTypeExtension.php b/src/Type/Php/ArrayPointerFunctionsDynamicReturnTypeExtension.php
@@ -48,8 +48,11 @@ public function getTypeFromFunctionCall(
 		if (count($constantArrays) > 0) {
 			$keyTypes = [];
 			foreach ($constantArrays as $constantArray) {
-				if ($constantArray->isEmpty()) {
+				$iterableAtLeastOnce = $argType->isIterableAtLeastOnce();
+				if (!$iterableAtLeastOnce->yes()) {
 					$keyTypes[] = new ConstantBooleanType(false);
+				}
+				if ($iterableAtLeastOnce->no()) {
 					continue;
 				}
 

diff --git a/src/Type/Php/ArrayReduceFunctionReturnTypeExtension.php b/src/Type/Php/ArrayReduceFunctionReturnTypeExtension.php
@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
@@ -47,18 +48,18 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		$arraysType = $scope->getType($functionCall->getArgs()[0]->value);
 		$constantArrays = TypeUtils::getOldConstantArrays($arraysType);
 		if (count($constantArrays) > 0) {
-			$onlyEmpty = true;
-			$onlyNonEmpty = true;
+			$onlyEmpty = TrinaryLogic::createYes();
+			$onlyNonEmpty = TrinaryLogic::createYes();
 			foreach ($constantArrays as $constantArray) {
-				$isEmpty = $constantArray->isEmpty();
-				$onlyEmpty = $onlyEmpty && $isEmpty;
-				$onlyNonEmpty = $onlyNonEmpty && !$isEmpty;
+				$iterableAtLeastOnce = $constantArray->isIterableAtLeastOnce();
+				$onlyEmpty = $onlyEmpty->and($iterableAtLeastOnce->negate());
+				$onlyNonEmpty = $onlyNonEmpty->and($iterableAtLeastOnce);
 			}
 
-			if ($onlyEmpty) {
+			if ($onlyEmpty->yes()) {
 				return $initialType;
 			}
-			if ($onlyNonEmpty) {
+			if ($onlyNonEmpty->yes()) {
 				return $callbackReturnType;
 			}
 		}

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1018,6 +1018,7 @@ public function dataFileAsserts(): iterable
 		}
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7921.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7928.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/bug-7928.php b/tests/PHPStan/Analyser/data/bug-7928.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace Bug7928;
+
+use function PHPStan\Testing\assertType;
+
+function findEntry(): ?string
+{
+	$array = [
+		randomEntry(),
+		randomEntry(),
+	];
+	$array = array_filter($array);
+	$first = reset($array);
+	assertType('non-falsy-string|false', $first);
+	if ($first === false) {
+		return null;
+	}
+	return $first;
+};
+
+function randomEntry(): ?string
+{
+	$rand = mt_rand(0, 1);
+	if ($rand === 1) {
+		return 'foo';
+	}
+	return null;
+}