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

Don’t localise PropertyNotSetInConstructor issues

Browse Source
This commit is contained in:
Matthew Brown 2019-01-14 01:27:51 -05:00
parent 8d61cb4816
commit c43734f3ab
3 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Psalm/Internal/Analyzer/ClassAnalyzer.php
View File

@ -635,10 +635,10 @@ class ClassAnalyzer extends ClassLikeAnalyzer
$uninitialized_properties = [];
foreach ($storage->appearing_property_ids as $property_name => $appearing_property_id) {
$property_class_name = $codebase->properties->getDeclaringClassForProperty(
$property_class_name = (string) $codebase->properties->getDeclaringClassForProperty(
$appearing_property_id
);
$property_class_storage = $classlike_storage_provider->get((string)$property_class_name);
$property_class_storage = $classlike_storage_provider->get($property_class_name);
$property = $property_class_storage->properties[$property_name];
@ -648,12 +648,10 @@ class ClassAnalyzer extends ClassLikeAnalyzer
continue;
}
if ($property_class_name) {
$codebase->file_reference_provider->addReferenceToClassMethod(
strtolower($fq_class_name) . '::__construct',
strtolower($property_class_name) . '::$' . $property_name
);
}
$codebase->file_reference_provider->addReferenceToClassMethod(
strtolower($fq_class_name) . '::__construct',
strtolower($property_class_name) . '::$' . $property_name
);
if ($property->has_default || !$property->type || $property_is_initialized) {
continue;
@ -664,7 +662,7 @@ class ClassAnalyzer extends ClassLikeAnalyzer
}
$uninitialized_variables[] = '$this->' . $property_name;
$uninitialized_properties[$property_name] = $property;
$uninitialized_properties[$property_class_name . '::$' . $property_name] = $property;
}
if (!$uninitialized_properties) {
@ -758,15 +756,14 @@ class ClassAnalyzer extends ClassLikeAnalyzer
$constructor_analyzer->analyze($method_context, $global_context, true);
foreach ($uninitialized_properties as $property_name => $property_storage) {
foreach ($uninitialized_properties as $property_id => $property_storage) {
list(,$property_name) = explode('::$', $property_id);
if (!isset($method_context->vars_in_scope['$this->' . $property_name])) {
throw new \UnexpectedValueException('$this->' . $property_name . ' should be in scope');
}
$end_type = $method_context->vars_in_scope['$this->' . $property_name];
$property_id = $constructor_appearing_fqcln . '::$' . $property_name;
$constructor_class_property_storage = $property_storage;
if ($fq_class_name !== $constructor_appearing_fqcln) {
@ -785,21 +782,12 @@ class ClassAnalyzer extends ClassLikeAnalyzer
if ($property_storage->location
&& (!$end_type->initialized || $property_storage !== $constructor_class_property_storage)
) {
if (!$config->reportIssueInFile(
'PropertyNotSetInConstructor',
$property_storage->location->file_path
) && $class->extends
) {
$error_location = new CodeLocation($this, $class->extends);
} else {
$error_location = $property_storage->location;
}
if (IssueBuffer::accepts(
new PropertyNotSetInConstructor(
'Property ' . $property_id . ' is not defined in constructor of ' .
$this->fq_class_name . ' or in any private methods called in the constructor',
$error_location
$property_storage->location,
$property_id
),
array_merge($this->source->getSuppressedIssues(), $storage->suppressed_issues)
)) {

2
src/Psalm/Issue/PropertyNotSetInConstructor.php
View File

@ -1,6 +1,6 @@
<?php
namespace Psalm\Issue;
class PropertyNotSetInConstructor extends CodeIssue
class PropertyNotSetInConstructor extends PropertyIssue
{
}

1
tests/Internal/Provider/FakeFileReferenceCacheProvider.php
View File

@ -26,6 +26,7 @@ class FakeFileReferenceCacheProvider extends \Psalm\Internal\Provider\FileRefere
public function __construct()
{
$this->config_changed = false;
}
/**