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

Added more descriptive type for callables

Browse Source 
Ref #1408
This commit is contained in:
Matthew Brown 2019-03-01 09:06:37 -05:00
parent 317f790bde
commit 4cc93644e5
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php
View File

@ -425,8 +425,8 @@ class ExpressionAnalyzer
$statements_analyzer->getCodebase(),
$atomic_type,
new TString(),
true,
false,
true,
$has_scalar_match
)
&& !$has_scalar_match

7
src/Psalm/Storage/FunctionLikeParameter.php
View File

@ -109,6 +109,13 @@ class FunctionLikeParameter
. ($this->is_optional ? '=' : '');
}
public function getId()
{
return ($this->type ? $this->type->getId() : 'mixed')
. ($this->is_variadic ? '...' : '')
. ($this->is_optional ? '=' : '');
}
public function __clone()
{
if ($this->type) {

11
src/Psalm/Type/Atomic/CallableTrait.php
View File

@ -141,7 +141,16 @@ trait CallableTrait
$return_type_string = '';
if ($this->params !== null) {
$param_string = '(' . implode(', ', $this->params) . ')';
$param_string .= '(';
foreach ($this->params as $i => $param) {
if ($i) {
$param_string .= ', ';
}
$param_string .= $param->getId();
}
$param_string .= ')';
}
if ($this->return_type !== null) {