Utilize array_last() (#4504)

staabm · web-flow · commit 230e9eef037d · 2025-10-31T14:33:37.000+01:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -109,7 +109,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "8.3"
+          php-version: "8.5"
 
       - uses: "ramsey/composer-install@v3"
 
diff --git a/build/composer-dependency-analyser.php b/build/composer-dependency-analyser.php
@@ -12,6 +12,8 @@
 	'symfony/polyfill-php80',
 	'symfony/polyfill-php81',
 	'symfony/polyfill-php83',
+	'symfony/polyfill-php84',
+	'symfony/polyfill-php85',
 ];
 
 $pinnedToSupportPhp72 = [
diff --git a/compiler/build/scoper.inc.php b/compiler/build/scoper.inc.php
@@ -16,9 +16,12 @@
 	'../../stubs',
 	'../../vendor/jetbrains/phpstorm-stubs',
 	'../../vendor/phpstan/php-8-stubs/stubs',
+	// when adding new polyfills, don't forget to also append them in 'exclude-namespaces' below
 	'../../vendor/symfony/polyfill-php80',
 	'../../vendor/symfony/polyfill-php81',
 	'../../vendor/symfony/polyfill-php83',
+	'../../vendor/symfony/polyfill-php84',
+	'../../vendor/symfony/polyfill-php85',
 	'../../vendor/symfony/polyfill-mbstring',
 	'../../vendor/symfony/polyfill-intl-normalizer',
 	'../../vendor/symfony/polyfill-intl-grapheme',
@@ -246,6 +249,8 @@ function (string $filePath, string $prefix, string $content): string {
 		'Symfony\Polyfill\Php80',
 		'Symfony\Polyfill\Php81',
 		'Symfony\Polyfill\Php83',
+		'Symfony\Polyfill\Php84',
+		'Symfony\Polyfill\Php85',
 		'Symfony\Polyfill\Mbstring',
 		'Symfony\Polyfill\Intl\Normalizer',
 		'Symfony\Polyfill\Intl\Grapheme',
diff --git a/composer.json b/composer.json
@@ -47,6 +47,8 @@
 		"symfony/polyfill-php80": "^1.23",
 		"symfony/polyfill-php81": "^1.27",
 		"symfony/polyfill-php83": "^1.33",
+		"symfony/polyfill-php84": "^1.33",
+		"symfony/polyfill-php85": "^1.33",
 		"symfony/process": "^5.4.3",
 		"symfony/service-contracts": "^2.5.0",
 		"symfony/string": "^5.4.3"
diff --git a/composer.lock b/composer.lock
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -3779,7 +3779,7 @@ private function enterAnonymousFunctionWithoutReflection(
 				if (isset($callableParameters[$i])) {
 					$parameterType = self::intersectButNotNever($parameterType, $callableParameters[$i]->getType());
 				} elseif (count($callableParameters) > 0) {
-					$lastParameter = $callableParameters[count($callableParameters) - 1];
+					$lastParameter = array_last($callableParameters);
 					if ($lastParameter->isVariadic()) {
 						$parameterType = self::intersectButNotNever($parameterType, $lastParameter->getType());
 					} else {
@@ -3972,7 +3972,7 @@ private function enterArrowFunctionWithoutReflection(Expr\ArrowFunction $arrowFu
 				if (isset($callableParameters[$i])) {
 					$parameterType = self::intersectButNotNever($parameterType, $callableParameters[$i]->getType());
 				} elseif (count($callableParameters) > 0) {
-					$lastParameter = $callableParameters[count($callableParameters) - 1];
+					$lastParameter = array_last($callableParameters);
 					if ($lastParameter->isVariadic()) {
 						$parameterType = self::intersectButNotNever($parameterType, $lastParameter->getType());
 					} else {
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1481,7 +1481,7 @@ private function processStmtNode(
 
 			$bodyScope = $initScope;
 			$isIterableAtLeastOnce = TrinaryLogic::createYes();
-			$lastCondExpr = $stmt->cond[count($stmt->cond) - 1] ?? null;
+			$lastCondExpr = array_last($stmt->cond) ?? null;
 			foreach ($stmt->cond as $condExpr) {
 				$condResult = $this->processExprNode($stmt, $condExpr, $bodyScope, static function (): void {
 				}, ExpressionContext::createDeep());
@@ -5239,7 +5239,7 @@ private function processArgs(
 					}
 					$parameter = $parameters[$i];
 				} elseif (count($parameters) > 0 && $parametersAcceptor->isVariadic()) {
-					$lastParameter = $parameters[count($parameters) - 1];
+					$lastParameter = array_last($parameters);
 					$assignByReference = $lastParameter->passedByReference()->createsNewVariable();
 					$parameterType = $lastParameter->getType();
 
@@ -5432,7 +5432,7 @@ private function processArgs(
 			if (isset($parameters[$i])) {
 				$currentParameter = $parameters[$i];
 			} elseif (count($parameters) > 0 && $parametersAcceptor->isVariadic()) {
-				$currentParameter = $parameters[count($parameters) - 1];
+				$currentParameter = array_last($parameters);
 			}
 
 			if ($currentParameter !== null) {
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -1517,7 +1517,7 @@ private function specifyTypesFromAsserts(TypeSpecifierContext $context, Expr\Cal
 			} elseif (isset($parameters[$i])) {
 				$paramName = $parameters[$i]->getName();
 			} elseif (count($parameters) > 0 && $parametersAcceptor->isVariadic()) {
-				$lastParameter = $parameters[count($parameters) - 1];
+				$lastParameter = array_last($parameters);
 				$paramName = $lastParameter->getName();
 			} else {
 				continue;
diff --git a/src/Fixable/PhpPrinter.php b/src/Fixable/PhpPrinter.php
@@ -24,7 +24,7 @@ protected function pCommaSeparated(array $nodes): string
 		if (count($nodes) === 0) {
 			return $result;
 		}
-		$last = $nodes[count($nodes) - 1];
+		$last = array_last($nodes);
 
 		$trailingComma = $last->getAttribute(self::FUNC_ARGS_TRAILING_COMMA_ATTRIBUTE);
 		if ($trailingComma === false) {
diff --git a/src/Parser/LastConditionVisitor.php b/src/Parser/LastConditionVisitor.php
@@ -87,7 +87,7 @@ public function enterNode(Node $node): ?Node
 			}
 
 			$if = $statements[$statementCount - 2];
-			$cond = count($if->elseifs) > 0 ? $if->elseifs[count($if->elseifs) - 1]->cond : $if->cond;
+			$cond = count($if->elseifs) > 0 ? array_last($if->elseifs)->cond : $if->cond;
 			$cond->setAttribute(self::ATTRIBUTE_NAME, true);
 		}
 
diff --git a/src/Parser/TryCatchTypeVisitor.php b/src/Parser/TryCatchTypeVisitor.php
@@ -31,7 +31,7 @@ public function enterNode(Node $node): ?Node
 	{
 		if ($node instanceof Node\Stmt || $node instanceof Node\Expr\Match_) {
 			if (count($this->typeStack) > 0) {
-				$node->setAttribute(self::ATTRIBUTE_NAME, $this->typeStack[count($this->typeStack) - 1]);
+				$node->setAttribute(self::ATTRIBUTE_NAME, array_last($this->typeStack));
 			}
 		}
 
diff --git a/src/Parser/VariadicMethodsVisitor.php b/src/Parser/VariadicMethodsVisitor.php
@@ -11,7 +11,6 @@
 use PHPStan\Reflection\ParametersAcceptor;
 use function array_key_exists;
 use function array_pop;
-use function count;
 use function in_array;
 use function sprintf;
 
@@ -74,15 +73,15 @@ public function enterNode(Node $node): ?Node
 			$this->inMethodStack[] = $node->name->name;
 		}
 
-		$lastMethod = $this->inMethodStack[count($this->inMethodStack) - 1] ?? null;
+		$lastMethod = array_last($this->inMethodStack) ?? null;
 
 		if (
 			$lastMethod !== null
 			&& $node instanceof Node\Expr\FuncCall
 			&& $node->name instanceof Name
 			&& in_array((string) $node->name, ParametersAcceptor::VARIADIC_FUNCTIONS, true)
 		) {
-			$lastClass = $this->classStack[count($this->classStack) - 1] ?? null;
+			$lastClass = array_last($this->classStack) ?? null;
 			if ($lastClass !== null) {
 				if (
 					!array_key_exists($lastClass, $this->variadicMethods)
@@ -101,8 +100,8 @@ public function enterNode(Node $node): ?Node
 	public function leaveNode(Node $node): ?Node
 	{
 		if ($node instanceof ClassMethod) {
-			$lastClass = $this->classStack[count($this->classStack) - 1] ?? null;
-			$lastMethod = $this->inMethodStack[count($this->inMethodStack) - 1] ?? null;
+			$lastClass = array_last($this->classStack) ?? null;
+			$lastMethod = array_last($this->inMethodStack) ?? null;
 			if ($lastClass !== null && $lastMethod !== null) {
 				$this->variadicMethods[$lastClass][$lastMethod] ??= false;
 			}
diff --git a/src/Reflection/AttributeReflectionFactory.php b/src/Reflection/AttributeReflectionFactory.php
@@ -107,7 +107,7 @@ private function fromNameAndArgumentExpressions(string $name, array $arguments,
 					continue;
 				}
 				if (count($parameters) > 0) {
-					$lastParameter = $parameters[count($parameters) - 1];
+					$lastParameter = array_last($parameters);
 					if ($lastParameter->isVariadic()) {
 						$parameterName = $lastParameter->getName();
 						if (array_key_exists($parameterName, $namedArgTypes)) {
diff --git a/src/Reflection/GenericParametersAcceptorResolver.php b/src/Reflection/GenericParametersAcceptorResolver.php
@@ -39,7 +39,7 @@ public static function resolve(array $argTypes, ParametersAcceptor $parametersAc
 					continue;
 				}
 				if (count($parameters) > 0) {
-					$lastParameter = $parameters[count($parameters) - 1];
+					$lastParameter = array_last($parameters);
 					if ($lastParameter->isVariadic()) {
 						$parameterName = $lastParameter->getName();
 						if (array_key_exists($parameterName, $namedArgTypes)) {
diff --git a/src/Reflection/ParametersAcceptorSelector.php b/src/Reflection/ParametersAcceptorSelector.php
@@ -490,7 +490,7 @@ public static function selectFromArgs(
 				if (isset($parameters[$i])) {
 					$parameter = $parameters[$i];
 				} elseif (count($parameters) > 0 && $singleParametersAcceptor->isVariadic()) {
-					$parameter = $parameters[count($parameters) - 1];
+					$parameter = array_last($parameters);
 				}
 			}
 
diff --git a/src/Rules/FunctionCallParametersCheck.php b/src/Rules/FunctionCallParametersCheck.php
@@ -586,8 +586,8 @@ private function processArguments(
 						break;
 					}
 
-					$parameter = $parameters[count($parameters) - 1];
-					$originalParameter = $originalParameters[count($originalParameters) - 1];
+					$parameter = array_last($parameters);
+					$originalParameter = array_last($originalParameters);
 					if (!$parameter->isVariadic()) {
 						$newArguments[$i] = [$argumentValue, $argumentValueType, $unpack, $argumentName, $argumentLine, null, null];
 						break; // func_get_args
diff --git a/src/Rules/Whitespace/FileWhitespaceRule.php b/src/Rules/Whitespace/FileWhitespaceRule.php
diff --git a/src/Type/FileTypeMapper.php b/src/Type/FileTypeMapper.php
diff --git a/tests/PHPStan/Composer/AutoloadFilesTest.php b/tests/PHPStan/Composer/AutoloadFilesTest.php

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected function pCommaSeparated(array $nodes): string`
`24`	`24`	`if (count($nodes) === 0) {`
`25`	`25`	`return $result;`
`26`	`26`	`}`
`27`		`- $last = $nodes[count($nodes) - 1];`
	`27`	`+ $last = array_last($nodes);`
`28`	`28`
`29`	`29`	`$trailingComma = $last->getAttribute(self::FUNC_ARGS_TRAILING_COMMA_ATTRIBUTE);`
`30`	`30`	`if ($trailingComma === false) {`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function enterNode(Node $node): ?Node`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`$if = $statements[$statementCount - 2];`
`90`		`- $cond = count($if->elseifs) > 0 ? $if->elseifs[count($if->elseifs) - 1]->cond : $if->cond;`
	`90`	`+ $cond = count($if->elseifs) > 0 ? array_last($if->elseifs)->cond : $if->cond;`
`91`	`91`	`$cond->setAttribute(self::ATTRIBUTE_NAME, true);`
`92`	`92`	`}`
`93`	`93`