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

Fix a few edgecases

Browse Source
This commit is contained in:
Matthew Brown 2017-06-29 00:28:37 -04:00
parent 8fd671bdc4
commit 368b6670d7
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Checker/CommentChecker.php
View File

@ -441,7 +441,9 @@ class CommentChecker
$special[$type] = [];
}
$special[$type][$line_map && isset($line_map[$_]) ? $line_map[$_] : $m] = $data;
$line_number = $line_map && isset($line_map[$_]) ? $line_map[$_] : (int)$m;
$special[$type][$line_number] = $data;
}
}

5
src/Psalm/Checker/Statements/Expression/FetchChecker.php
View File

@ -1075,7 +1075,10 @@ class FetchChecker
)) {
return false;
}
$stmt->inferredType = Type::getMixed();
if (!IssueBuffer::isRecording()) {
$stmt->inferredType = Type::getMixed();
}
}
} elseif ($type instanceof Type\Atomic\ObjectLike) {
$object_like_keys = array_keys($type->properties);

15
src/Psalm/Context.php
View File

@ -218,11 +218,18 @@ class Context
$redefined_vars = [];
foreach ($original_context->vars_in_scope as $var => $context_type) {
if (isset($this->vars_in_scope[$var]) &&
!$this->vars_in_scope[$var]->failed_reconciliation &&
(string)$this->vars_in_scope[$var] !== (string)$context_type
if (!isset($this->vars_in_scope[$var])) {
continue;
}
$this_var = $this->vars_in_scope[$var];
if (!$this_var->failed_reconciliation &&
!$this_var->isEmpty() &&
!$context_type->isEmpty() &&
(string)$this_var !== (string)$context_type
) {
$redefined_vars[$var] = $this->vars_in_scope[$var];
$redefined_vars[$var] = $this_var;
}
}

8
src/Psalm/IssueBuffer.php
View File

@ -279,6 +279,14 @@ class IssueBuffer
self::$recorded_issues = [];
}
/**
* @return bool
*/
public static function isRecording()
{
return self::$recording_level > 0;
}
/**
* @return void
*/