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

Migrate class constant handling into codebase classes

Browse Source
This commit is contained in:
Matt Brown 2018-02-08 18:18:34 -05:00
parent 6f7903716d
commit 283e0a6af2
3 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Psalm/Checker/ClassLikeChecker.php
View File

@ -17,7 +17,6 @@ use Psalm\Provider\FileReferenceProvider;
use Psalm\StatementsSource; use Psalm\StatementsSource;
use Psalm\Storage\ClassLikeStorage; use Psalm\Storage\ClassLikeStorage;
use Psalm\Type; use Psalm\Type;
use ReflectionProperty;
abstract class ClassLikeChecker extends SourceChecker implements StatementsSource abstract class ClassLikeChecker extends SourceChecker implements StatementsSource
{ {
@ -430,40 +429,6 @@ abstract class ClassLikeChecker extends SourceChecker implements StatementsSourc
} }
} }
/**
* @param string $class_name
* @param mixed $visibility
*
* @return array<string,Type\Union>
*/
public static function getConstantsForClass(ProjectChecker $project_checker, $class_name, $visibility)
{
$class_name = strtolower($class_name);
$storage = $project_checker->classlike_storage_provider->get($class_name);
if ($visibility === ReflectionProperty::IS_PUBLIC) {
return $storage->public_class_constants;
}
if ($visibility === ReflectionProperty::IS_PROTECTED) {
return array_merge(
$storage->public_class_constants,
$storage->protected_class_constants
);
}
if ($visibility === ReflectionProperty::IS_PRIVATE) {
return array_merge(
$storage->public_class_constants,
$storage->protected_class_constants,
$storage->private_class_constants
);
}
throw new \InvalidArgumentException('Must specify $visibility');
}
/** /**
* @param string $property_id * @param string $property_id
* @param string|null $calling_context * @param string|null $calling_context

6
src/Psalm/Checker/Statements/Expression/Fetch/ConstFetchChecker.php
View File

@ -161,8 +161,7 @@ class ConstFetchChecker
$class_visibility = \ReflectionProperty::IS_PUBLIC; $class_visibility = \ReflectionProperty::IS_PUBLIC;
} }
$class_constants = ClassLikeChecker::getConstantsForClass( $class_constants = $codebase->classlikes->getConstantsForClass(
$project_checker,
$fq_class_name, $fq_class_name,
$class_visibility $class_visibility
); );
@ -171,8 +170,7 @@ class ConstFetchChecker
$all_class_constants = []; $all_class_constants = [];
if ($fq_class_name !== $context->self) { if ($fq_class_name !== $context->self) {
$all_class_constants = ClassLikeChecker::getConstantsForClass( $all_class_constants = $codebase->classlikes->getConstantsForClass(
$project_checker,
$fq_class_name, $fq_class_name,
\ReflectionProperty::IS_PRIVATE \ReflectionProperty::IS_PRIVATE
); );

34
src/Psalm/Codebase/ClassLikes.php
View File

@ -617,6 +617,40 @@ class ClassLikes
} }
} }
/**
* @param string $class_name
* @param mixed $visibility
*
* @return array<string,Type\Union>
*/
public function getConstantsForClass($class_name, $visibility)
{
$class_name = strtolower($class_name);
$storage = $this->classlike_storage_provider->get($class_name);
if ($visibility === ReflectionProperty::IS_PUBLIC) {
return $storage->public_class_constants;
}
if ($visibility === ReflectionProperty::IS_PROTECTED) {
return array_merge(
$storage->public_class_constants,
$storage->protected_class_constants
);
}
if ($visibility === ReflectionProperty::IS_PRIVATE) {
return array_merge(
$storage->public_class_constants,
$storage->protected_class_constants,
$storage->private_class_constants
);
}
throw new \InvalidArgumentException('Must specify $visibility');
}
/** /**
* @param string $class_name * @param string $class_name
* @param string $const_name * @param string $const_name