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

Tighten up Psalm’s inference

Browse Source
This commit is contained in:
Brown 2019-11-25 15:20:31 -05:00
parent c60cafbf98
commit 1f07ea7ee7
11 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/plugins/FunctionCasingChecker.php
View File

@ -94,6 +94,10 @@ class FunctionCasingChecker implements AfterFunctionCallAnalysisInterface, After
$function_id
);
if (!$function_storage->cased_name) {
return;
}
$function_name_parts = explode('\\', $function_storage->cased_name);
if (end($function_name_parts) !== end($expr->name->parts)) {

13
psalm.xml.dist
View File

@ -49,18 +49,13 @@
</plugins>
<issueHandlers>
<MisplacedRequiredParam errorLevel="suppress"/>
<PossiblyNullOperand errorLevel="suppress"/>
<MissingConstructor>
<DeprecatedMethod>
<errorLevel type="suppress">
<file name="src/Psalm/Internal/Scanner/FunctionDocblockComment.php"/>
<file name="src/Psalm/Storage/FunctionLikeStorage.php"/>
<file name="src/Psalm/Storage/MethodStorage.php"/>
<file name="src/Psalm/Storage/PropertyStorage.php"/>
<file name="src/Psalm/Internal/Scope/CaseScope.php"/>
<directory name="tests" />
</errorLevel>
</MissingConstructor>
<DeprecatedProperty errorLevel="suppress"/>
</DeprecatedMethod>
<DeprecatedMethod>
<errorLevel type="suppress">

3
src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
View File

@ -751,6 +751,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
}
if (!($storage instanceof MethodStorage)
|| !$storage->cased_name
|| $storage->visibility === ClassLikeAnalyzer::VISIBILITY_PRIVATE
) {
if ($this->function instanceof Closure) {
@ -804,6 +805,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
if ($storage instanceof MethodStorage
&& $class_storage
&& $storage->cased_name
&& $storage->visibility !== ClassLikeAnalyzer::VISIBILITY_PRIVATE
) {
$method_id_lc = strtolower($this->getMethodId());
@ -816,7 +818,6 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
$method_id_lc
);
/** @var ClassMethod $this->function */
$method_name_lc = strtolower($storage->cased_name);
if (!isset($class_storage->overridden_method_ids[$method_name_lc])) {

4
src/Psalm/Internal/Analyzer/MethodAnalyzer.php
View File

@ -520,7 +520,7 @@ class MethodAnalyzer extends FunctionLikeAnalyzer
$prevent_method_signature_mismatch = true
) {
$implementer_method_id = $implementer_classlike_storage->name . '::'
. strtolower($guide_method_storage->cased_name);
. strtolower($guide_method_storage->cased_name ?: '');
$implementer_declaring_method_id = $codebase->methods->getDeclaringMethodId($implementer_method_id);
@ -694,7 +694,7 @@ class MethodAnalyzer extends FunctionLikeAnalyzer
$template_types = [];
foreach ($map as $key => $type) {
if (is_string($key)) {
if (is_string($key) && $implementer_method_storage->defining_fqcln) {
$template_types[$key][$implementer_method_storage->defining_fqcln] = [
$type,
];

4
src/Psalm/Internal/Analyzer/Statements/Block/SwitchAnalyzer.php
View File

@ -259,9 +259,7 @@ class SwitchAnalyzer
}
$case_context->parent_context = $context;
$case_scope = $case_context->case_scope = new CaseScope();
$case_scope->parent_context = $case_context;
$case_scope = $case_context->case_scope = new CaseScope($case_context);
$case_equality_expr = null;

2
src/Psalm/Internal/Codebase/Methods.php
View File

@ -527,7 +527,7 @@ class Methods
list($fq_class_name, $method_name) = explode('::', $method_id);
return $this->classlike_storage_provider->get($fq_class_name)->methods[$method_name]->variadic;
return $this->classlike_storage_provider->get($fq_class_name)->methods[$method_name ?: '']->variadic;
}
/**

9
src/Psalm/Internal/Codebase/Scanner.php
View File

@ -638,8 +638,13 @@ class Scanner
if ($this->codebase->register_autoload_files) {
foreach ($file_storage->functions as $function_storage) {
if (!$this->codebase->functions->hasStubbedFunction($function_storage->cased_name)) {
$this->codebase->functions->addGlobalFunction($function_storage->cased_name, $function_storage);
if ($function_storage->cased_name
&& !$this->codebase->functions->hasStubbedFunction($function_storage->cased_name)
) {
$this->codebase->functions->addGlobalFunction(
$function_storage->cased_name,
$function_storage
);
}
}

5
src/Psalm/Internal/Scope/CaseScope.php
View File

@ -25,6 +25,11 @@ class CaseScope
*/
public $break_vars;
public function __construct(Context $parent_context)
{
$this->parent_context = $parent_context;
}
public function __destruct()
{
/** @psalm-suppress PossiblyNullPropertyAssignmentValue */

10
src/Psalm/Storage/FunctionLikeStorage.php
View File

@ -57,7 +57,7 @@ class FunctionLikeStorage
public $signature_return_type_location;
/**
* @var string
* @var ?string
*/
public $cased_name;
@ -67,12 +67,12 @@ class FunctionLikeStorage
public $suppressed_issues = [];
/**
* @var bool
* @var ?bool
*/
public $deprecated;
/**
* @var bool
* @var ?bool
*/
public $internal;
@ -84,7 +84,7 @@ class FunctionLikeStorage
/**
* @var bool
*/
public $variadic;
public $variadic = false;
/**
* @var bool
@ -92,7 +92,7 @@ class FunctionLikeStorage
public $returns_by_ref = false;
/**
* @var int
* @var ?int
*/
public $required_param_count;

10
src/Psalm/Storage/MethodStorage.php
View File

@ -6,22 +6,22 @@ class MethodStorage extends FunctionLikeStorage
/**
* @var bool
*/
public $is_static;
public $is_static = false;
/**
* @var int
*/
public $visibility;
public $visibility = 0;
/**
* @var bool
*/
public $final;
public $final = false;
/**
* @var bool
*/
public $abstract;
public $abstract = false;
/**
* @var bool
@ -44,7 +44,7 @@ class MethodStorage extends FunctionLikeStorage
public $inherited_return_type = false;
/**
* @var string
* @var ?string
*/
public $defining_fqcln;

4
src/Psalm/Storage/PropertyStorage.php
View File

@ -10,14 +10,14 @@ class PropertyStorage
use CustomMetadataTrait;
/**
* @var bool
* @var ?bool
*/
public $is_static;
/**
* @var int
*/
public $visibility;
public $visibility = 0;
/**
* @var CodeLocation|null