danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-02 09:37:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10625 from weirdan/allow-typedef-imports-from-any-kind-of-classlike

Browse Source
This commit is contained in:
Bruce Weirdan 2024-02-01 13:05:07 -04:00 committed by GitHub
commit 38d7d435c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Analyzer/FileAnalyzer.php
View File

@ -237,7 +237,7 @@ class FileAnalyzer extends SourceAnalyzer
$this->suppressed_issues,
new ClassLikeNameOptions(
true,
false,
true,
true,
true,
true,

4
src/Psalm/Internal/Type/TypeExpander.php
View File

@ -283,7 +283,9 @@ final class TypeExpander
$declaring_fq_classlike_name = $self_class;
}
if (!($evaluate_class_constants && $codebase->classOrInterfaceOrEnumExists($declaring_fq_classlike_name))) {
if (!($evaluate_class_constants
&& $codebase->classlikes->doesClassLikeExist(strtolower($declaring_fq_classlike_name))
)) {
return [$return_type];
}

15
tests/TypeAnnotationTest.php
View File

@ -884,6 +884,21 @@ class TypeAnnotationTest extends TestCase
'ignored_issues' => [],
'php_version' => '8.1',
],
'importFromTrait' => [
'code' => <<<'PHP'
<?php
/** @psalm-type _Foo = array{foo: string} */
trait T {}
/** @psalm-import-type _Foo from T */
class C {
/** @param _Foo $foo */
public function f(array $foo): void {
echo $foo['foo'];
}
}
PHP,
],
'inlineComments' => [
'code' => <<<'PHP'
<?php