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

Merge pull request #6589 from orklah/strict-callable

Browse Source 
Better understanding of Templates in lhs of callable TKeyedArray
This commit is contained in:
orklah 2021-10-05 12:48:53 +02:00 committed by GitHub
commit 96ed2526e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Psalm/Internal/Type/Comparator/CallableTypeComparator.php
View File

@ -9,6 +9,7 @@ use Psalm\Type;
use Psalm\Type\Atomic;
use Psalm\Type\Atomic\TArray;
use Psalm\Type\Atomic\TCallable;
use Psalm\Type\Atomic\TClassString;
use Psalm\Type\Atomic\TClosure;
use Psalm\Type\Atomic\TKeyedArray;
use Psalm\Type\Atomic\TList;
@ -430,6 +431,24 @@ class CallableTypeComparator
strtolower($lhs_atomic_type->value) . '::',
$calling_method_id ?: $file_name
);
} elseif ($lhs_atomic_type instanceof Atomic\TTemplateParam) {
$lhs_template_type = $lhs_atomic_type->as;
if ($lhs_template_type->isSingle()) {
$lhs_template_atomic_type = $lhs_template_type->getSingleAtomic();
$member_id = null;
if ($lhs_template_atomic_type instanceof TNamedObject) {
$member_id = $lhs_template_atomic_type->value;
} elseif ($lhs_template_atomic_type instanceof TClassString) {
$member_id = $lhs_template_atomic_type->as;
}
if ($member_id) {
$codebase->analyzer->addMixedMemberName(
strtolower($member_id) . '::',
$calling_method_id ?: $file_name
);
}
}
}
}
}
@ -450,6 +469,16 @@ class CallableTypeComparator
foreach ($lhs->getAtomicTypes() as $lhs_atomic_type) {
if ($lhs_atomic_type instanceof TNamedObject) {
$class_name = $lhs_atomic_type->value;
} elseif ($lhs_atomic_type instanceof Atomic\TTemplateParam) {
$lhs_template_type = $lhs_atomic_type->as;
if ($lhs_template_type->isSingle()) {
$lhs_template_atomic_type = $lhs_template_type->getSingleAtomic();
if ($lhs_template_atomic_type instanceof TNamedObject) {
$class_name = $lhs_template_atomic_type->value;
} elseif ($lhs_template_atomic_type instanceof TClassString) {
$class_name = $lhs_template_atomic_type->as;
}
}
} elseif ($lhs_atomic_type instanceof Type\Atomic\TClassString
&& $lhs_atomic_type->as
) {

5
src/Psalm/Type/Union.php
View File

@ -1680,4 +1680,9 @@ class Union implements TypeNode
{
return count($this->literal_float_types) > 0;
}
public function getSingleAtomic(): Atomic
{
return reset($this->types);
}
}