danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Remove union types in magic methods for now

Browse Source
This commit is contained in:
Matthew Brown 2018-06-07 19:56:28 -04:00
parent 6873e60847
commit c1586ee347
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/Checker/CommentChecker.php
View File

@ -385,7 +385,7 @@ class CommentChecker
$method_entry = substr($method_entry, 0, (int) $matches[0][1] + strlen((string) $matches[0][0]));
}
$method_entry = str_replace('|', '__UNIONOR__', $method_entry);
$method_entry = preg_replace('/[a-zA-Z\\\\0-9_]+(\|[a-zA-Z\\\\0-9_]+)+ \$/', '$', $method_entry);
$php_string = '<?php ' . $return_docblock . ' function ' . $method_entry . '{}';

1
src/Psalm/Visitor/DependencyFinderVisitor.php
View File

@ -1265,7 +1265,6 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
}
if ($param_type_string) {
$param_type_string = str_replace('__UNIONOR__', '|', $param_type_string);
if ($is_nullable) {
$param_type_string .= '|null';
}

18
tests/AnnotationTest.php
View File

@ -834,6 +834,24 @@ class AnnotationTest extends TestCase
'$e' => 'callable():string',
],
],
'namespacedMagicMethodValidAnnotations' => [
'<?php
namespace Foo;
class Parent {
public function __call() {}
}
/**
* @method setBool(string $foo, string|bool $bar) : bool
*/
class Child extends Parent {}
$child = new Child();
$c = $child->setBool("hello", true);
$c = $child->setBool("hello", "true");',
],
'slashAfter?' => [
'<?php
namespace ns;