danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #5073 — don’t crash when templates cannot be resolved

Browse Source
This commit is contained in:
Matthew Brown 2021-05-13 16:55:22 -04:00
parent 2ebf97b4cb
commit 18931295c4
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php
View File

@ -88,7 +88,7 @@ class TemplateStandinTypeReplacer
}
if (!$atomic_types) {
throw new \UnexpectedValueException('Cannot remove all keys');
return $union_type;
}
if (count($atomic_types) > 1) {

25
tests/Template/ClassTemplateTest.php
View File

@ -3370,7 +3370,7 @@ class ClassTemplateTest extends TestCase
$wm[$ex] = 42;
}
',
]
],
];
}
@ -4010,6 +4010,29 @@ class ClassTemplateTest extends TestCase
takesA($child);',
'error_message' => 'InvalidArgument',
],
'noCrashTemplatedClosure' => [
'<?php
/**
* @template TCallback as Closure():string
*/
class A {
/** @var TCallback */
private $callback;
/** @param TCallback $callback */
public function __construct(Closure $callback) {
$this->callback = $callback;
}
/** @param TCallback $callback */
public function setCallback(Closure $callback): void {
$this->callback = $callback;
}
}
$a = new A(function() { return "a";});
$a->setCallback(function() { return "b";});',
'error_message' => 'InvalidScalarArgument',
],
];
}
}