danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2775 - use lowercase strings in a couple more places

Browse Source
This commit is contained in:
Brown 2020-02-13 17:44:16 -05:00
parent bba44e5354
commit 8989737e51
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Internal/Codebase/Populator.php
View File

@ -794,7 +794,7 @@ class Populator
foreach ($implemented_interface_storage->methods as $method_name => $method) {
if ($method->visibility === ClassLikeAnalyzer::VISIBILITY_PUBLIC) {
$mentioned_method_id = $implemented_interface . '::' . $method_name;
$mentioned_method_id = strtolower($implemented_interface) . '::' . $method_name;
$interface_method_implementers[$method_name][] = $mentioned_method_id;
}
}
@ -1096,6 +1096,8 @@ class Populator
}
if ($method_name !== '__construct') {
$id_lc = strtolower($declaring_method_id);
if ($parent_storage->is_trait) {
$declaring_class = explode('::', $declaring_method_id)[0];
$declaring_class_storage = $this->classlike_storage_provider->get($declaring_class);
@ -1103,10 +1105,10 @@ class Populator
if (isset($declaring_class_storage->methods[$method_name])
&& $declaring_class_storage->methods[$method_name]->abstract
) {
$storage->overridden_method_ids[$method_name][$declaring_method_id] = $declaring_method_id;
$storage->overridden_method_ids[$method_name][$id_lc] = $id_lc;
}
} else {
$storage->overridden_method_ids[$method_name][$declaring_method_id] = $declaring_method_id;
$storage->overridden_method_ids[$method_name][$id_lc] = $id_lc;
}
if (isset($parent_storage->overridden_method_ids[$method_name])

22
tests/ClassTest.php
View File

@ -491,6 +491,28 @@ class ClassTest extends TestCase
function foo(Resource $r, Numeric $n) : void {}
}'
],
'inheritInterfaceFromParent' => [
'<?php
class A {}
class AChild extends A {}
interface IParent {
public function get(): A;
}
interface IChild extends IParent {
/**
* @psalm-return AChild
*/
public function get(): A;
}
class Concrete implements IChild {
public function get(): A {
return new AChild;
}
}',
],
];
}