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

Fix indentation

Browse Source
This commit is contained in:
Matthew Brown 2018-01-02 21:23:48 -05:00
parent 30754bcd52
commit 8a8253ac4c
5 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Checker/ScopeChecker.php
View File

@ -56,7 +56,7 @@ class ScopeChecker
public static function getFinalControlActions(array $stmts)
{
if (empty($stmts)) {
return [SELF::ACTION_NONE];
return [self::ACTION_NONE];
}
$control_actions = [];

16
src/Psalm/Checker/Statements/Block/IfChecker.php
View File

@ -721,10 +721,10 @@ class IfChecker
$old_elseif_context = clone $elseif_context;
if ($statements_checker->analyze(
$elseif->stmts,
$elseif_context,
$loop_scope
) === false
$elseif->stmts,
$elseif_context,
$loop_scope
) === false
) {
return false;
}
@ -969,10 +969,10 @@ class IfChecker
$old_else_context = clone $else_context;
if ($statements_checker->analyze(
$else->stmts,
$else_context,
$loop_scope
) === false
$else->stmts,
$else_context,
$loop_scope
) === false
) {
return false;
}

28
src/Psalm/Checker/Statements/Expression/CallChecker.php
View File

@ -2620,31 +2620,31 @@ class CallChecker
if (!in_array(strtolower($callable_fq_class_name), ['self', 'static', 'parent'], true)) {
if (ClassLikeChecker::checkFullyQualifiedClassLikeName(
$statements_checker,
$callable_fq_class_name,
$code_location,
$statements_checker->getSuppressedIssues()
) === false
$statements_checker,
$callable_fq_class_name,
$code_location,
$statements_checker->getSuppressedIssues()
) === false
) {
return false;
}
if (MethodChecker::checkMethodExists(
$project_checker,
$function_id,
$code_location,
$statements_checker->getSuppressedIssues()
) === false
$project_checker,
$function_id,
$code_location,
$statements_checker->getSuppressedIssues()
) === false
) {
return false;
}
}
} else {
if (self::checkFunctionExists(
$statements_checker,
$function_id,
$code_location
) === false
$statements_checker,
$function_id,
$code_location
) === false
) {
return false;
}

10
src/Psalm/Checker/Statements/ExpressionChecker.php
View File

@ -630,11 +630,11 @@ class ExpressionChecker
return null;
}
IssueBuffer::add(
new UndefinedVariable(
'Cannot find referenced variable ' . $var_name,
new CodeLocation($statements_checker->getSource(), $stmt)
)
);
new UndefinedVariable(
'Cannot find referenced variable ' . $var_name,
new CodeLocation($statements_checker->getSource(), $stmt)
)
);
$stmt->inferredType = Type::getMixed();

19
src/Psalm/Checker/StatementsChecker.php
View File

@ -1056,15 +1056,16 @@ class StatementsChecker extends SourceChecker implements StatementsSource
if (!$this->local_return_type->isGenerator()
&& !TypeChecker::isContainedBy(
$this->source->getFileChecker()->project_checker,
$inferred_type,
$this->local_return_type,
$stmt->inferredType->ignore_nullable_issues,
false,
$has_scalar_match,
$type_coerced,
$type_coerced_from_mixed
)) {
$this->source->getFileChecker()->project_checker,
$inferred_type,
$this->local_return_type,
$stmt->inferredType->ignore_nullable_issues,
false,
$has_scalar_match,
$type_coerced,
$type_coerced_from_mixed
)
) {
// is the declared return type more specific than the inferred one?
if ($type_coerced) {
if (IssueBuffer::accepts(