Merge remote-tracking branch 'origin/2.1.x' into 2.2.x

Author: ondrejmirtes

.github/workflows/e2e-tests.yml

@@ -303,8 +303,13 @@ jobs:
               cd e2e/report-ignores-without-comments
               OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan --error-format=raw")
               echo "$OUTPUT"
-              ../bashunit -a contains 'test.php:4:Ignore with identifier variable.undefined has no comment' "$OUTPUT"
+              ../bashunit -a contains 'test.php:4:Ignore with identifier variable.undefined has no comment.' "$OUTPUT"
+              ../bashunit -a contains 'test.php:4:Variable $undefined might not be defined.' "$OUTPUT"
               ../bashunit -a not_contains 'test.php:7' "$OUTPUT"
+              ../bashunit -a contains 'test.php:10:Ignoring all errors on a line is not allowed.' "$OUTPUT"
+              ../bashunit -a contains 'test.php:10:Variable $yetAnotherUndefined might not be defined.' "$OUTPUT"
+              ../bashunit -a contains 'test.php:12:Ignoring all errors on a line is not allowed.' "$OUTPUT"
+              ../bashunit -a contains 'test.php:12:Variable $yetYetAnotherUndefined might not be defined.' "$OUTPUT"
 
     steps:
       - name: Harden the runner (Audit all outbound calls)

e2e/report-ignores-without-comments/test.php

@@ -5,3 +5,8 @@
 
 // @phpstan-ignore variable.undefined (this one has a comment so no error)
 echo $anotherUndefined;
+
+// @phpstan-ignore-next-line
+echo $yetAnotherUndefined;
+
+echo $yetYetAnotherUndefined; // @phpstan-ignore-line

src/Analyser/FileAnalyser.php

@@ -135,6 +135,17 @@ public function analyseFile(
 					foreach ($linesToIgnore as $ignoredFile => $lines) {
 						foreach ($lines as $line => $identifiers) {
 							if ($identifiers === null) {
+								$fileErrors[] = (new Error(
+									'Ignoring all errors on a line is not allowed.',
+									$ignoredFile,
+									$line,
+									false,
+									$ignoredFile,
+									null,
+									'Use @phpstan-ignore with an identifier and a comment (in parentheses).',
+								))->withIdentifier('ignore.allLineErrors');
+								unset($linesToIgnore[$ignoredFile][$line]);
+								unset($unmatchedLineIgnores[$ignoredFile][$line]);
 								continue;
 							}
 
@@ -152,6 +163,8 @@ public function analyseFile(
 									null,
 									'Explain why this ignore is necessary in parentheses after the identifier.',
 								))->withIdentifier('ignore.noComment');
+								unset($linesToIgnore[$ignoredFile][$line]);
+								unset($unmatchedLineIgnores[$ignoredFile][$line]);
 							}
 						}
 					}

src/Analyser/TypeSpecifier.php

@@ -1403,6 +1403,45 @@ private function specifyTypesForCountFuncCall(
 			$resultTypes[] = TypeCombinator::intersect($arrayType, new NonEmptyArrayType());
 		}
 
+		if ($context->truthy() && $isConstantArray->yes() && $isList->yes()) {
+			$hasOptionalKeys = false;
+			foreach ($type->getConstantArrays() as $arrayType) {
+				if ($arrayType->getOptionalKeys() !== []) {
+					$hasOptionalKeys = true;
+					break;
+				}
+			}
+
+			if (!$hasOptionalKeys) {
+				$argExpr = $countFuncCall->getArgs()[0]->value;
+				$argExprString = $this->exprPrinter->printExpr($argExpr);
+
+				$sizeMin = null;
+				$sizeMax = null;
+				if ($sizeType instanceof ConstantIntegerType) {
+					$sizeMin = $sizeType->getValue();
+					$sizeMax = $sizeType->getValue();
+				} elseif ($sizeType instanceof IntegerRangeType) {
+					$sizeMin = $sizeType->getMin();
+					$sizeMax = $sizeType->getMax();
+				}
+
+				$sureTypes = [];
+				$sureNotTypes = [];
+
+				if ($sizeMin !== null && $sizeMin >= 1) {
+					$sureTypes[$argExprString] = [$argExpr, new HasOffsetValueType(new ConstantIntegerType($sizeMin - 1), new MixedType())];
+				}
+				if ($sizeMax !== null) {
+					$sureNotTypes[$argExprString] = [$argExpr, new HasOffsetValueType(new ConstantIntegerType($sizeMax), new MixedType())];
+				}
+
+				if ($sureTypes !== [] || $sureNotTypes !== []) {
+					return (new SpecifiedTypes($sureTypes, $sureNotTypes))->setRootExpr($rootExpr);
+				}
+			}
+		}
+
 		return $this->create($countFuncCall->getArgs()[0]->value, TypeCombinator::union(...$resultTypes), $context, $scope)->setRootExpr($rootExpr);
 	}
 

tests/PHPStan/Analyser/nsrt/bug-14301.php

@@ -0,0 +1,50 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14301;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	/**
+	 * @param array{bool}|array{mixed, string|null, mixed} $row
+	 */
+	protected function testNotEquals(array $row): string
+	{
+		if (count($row) !== 1) {
+			assertType('array{mixed, string|null, mixed}', $row);
+
+			[$field, $operator, $value] = $row;
+			assertType('string|null', $operator);
+			return $operator ?? '=';
+		} else {
+			assertType('array{bool}', $row);
+		}
+
+		return '';
+	}
+
+	/**
+	 * @param array{bool}|array{mixed, string|null, mixed} $row
+	 */
+	protected function testEquals(array $row): void
+	{
+		if (count($row) === 3) {
+			assertType('array{mixed, string|null, mixed}', $row);
+		} else {
+			assertType('array{bool}', $row);
+		}
+	}
+
+	/**
+	 * @param array{bool}|array{mixed, string|null, mixed} $row
+	 */
+	protected function testEquals1(array $row): void
+	{
+		if (count($row) === 1) {
+			assertType('array{bool}', $row);
+		} else {
+			assertType('array{mixed, string|null, mixed}', $row);
+		}
+	}
+}