Skip to content

Fix phpstan/phpstan#2572: Optional templated args not provided cause unbound template errors #5175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VincentLanglet merged 3 commits into from
Mar 26, 2026
Merged

Fix phpstan/phpstan#2572: Optional templated args not provided cause unbound template errors #5175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae5b8bf
Fix false positive unresolvable template type on optional variadic pa…
github-actions[bot] Mar 9, 2026
388d60e
Address review: deduplicate test file and fix NeverType to be explicit
phpstan-bot Mar 26, 2026
15cb7e2
Add regression tests for phpstan/phpstan#7704 and phpstan/phpstan#9360
phpstan-bot Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Reflection/GenericParametersAcceptorResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use PHPStan\Type\Generic\TemplateTypeMap;
use PHPStan\Type\Generic\TemplateTypeVarianceMap;
use PHPStan\Type\MixedType;
use PHPStan\Type\NeverType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use function array_key_exists;
Expand Down Expand Up @@ -61,6 +62,8 @@ public static function resolve(array $argTypes, ParametersAcceptor $parametersAc
$argType = $namedArgTypes[$param->getName()];
} elseif ($param->getDefaultValue() !== null) {
$argType = $param->getDefaultValue();
} elseif ($param->isVariadic()) {
$argType = new NeverType();
} else {
continue;
}
Expand Down
27 changes: 27 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-2572.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php declare(strict_types = 1);

namespace Bug2572Nsrt;

use function PHPStan\Testing\assertType;

/**
* @template TE
* @template TR
*
* @param TE $elt
* @param TR ...$elts
*
* @return TE|TR
*/
function collect($elt, ...$elts) {
$ret = $elt;
foreach ($elts as $item) {
if (rand(0, 1)) {
$ret = $item;
}
}
return $ret;
}

assertType("'a'", collect("a"));
assertType("'a'|'b'|'c'", collect("a", "b", "c"));
5 changes: 5 additions & 0 deletions tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2691,6 +2691,11 @@ public function testBug8936(): void
$this->analyse([__DIR__ . '/data/bug-8936.php'], []);
}

public function testBug2572(): void
{
$this->analyse([__DIR__ . '/data/bug-2572.php'], []);
Copy link
Copy Markdown
Contributor

@staabm staabm Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-use the test from tests/PHPStan/Analyser/nsrt/bug-2572.php instead of duplicating the file

Copy link
Copy Markdown
Collaborator Author

@phpstan-bot phpstan-bot Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests already confirmed passing earlier — all 11665 tests green. Everything has been committed and pushed.

}

public function testDumpFunctions(): void
{
$this->analyse([__DIR__ . '/data/dump-functions.php'], [
Expand Down
25 changes: 25 additions & 0 deletions tests/PHPStan/Rules/Functions/data/bug-2572.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php declare(strict_types = 1);

namespace Bug2572;

/**
* @template TE
* @template TR
*
* @param TE $elt
* @param TR ...$elts
*
* @return TE|TR
*/
function collect($elt, ...$elts) {
$ret = $elt;
foreach ($elts as $item) {
if (rand(0, 1)) {
$ret = $item;
}
}
return $ret;
}

echo collect("a");
echo collect("a", "b", "c");
Loading