diff --git a/src/Psalm/Codebase.php b/src/Psalm/Codebase.php index 800d7b5a7..4683e8eb0 100644 --- a/src/Psalm/Codebase.php +++ b/src/Psalm/Codebase.php @@ -95,14 +95,6 @@ class Codebase */ public $use_referencing_locations = []; - /** - * A map of file names to the classes that they contain explicit references to - * used in collaboration with use_referencing_locations - * - * @var array> - */ - public $use_referencing_files = []; - /** * @var FileStorageProvider */ diff --git a/src/Psalm/Context.php b/src/Psalm/Context.php index bcb9cc761..c61c7583b 100644 --- a/src/Psalm/Context.php +++ b/src/Psalm/Context.php @@ -235,11 +235,6 @@ class Context */ public $parent_context; - /** - * @var array - */ - public $possible_param_types = []; - /** * A list of vars that have been assigned to * diff --git a/src/Psalm/Internal/Analyzer/CanAlias.php b/src/Psalm/Internal/Analyzer/CanAlias.php index 91fa6e63e..fee3528df 100644 --- a/src/Psalm/Internal/Analyzer/CanAlias.php +++ b/src/Psalm/Internal/Analyzer/CanAlias.php @@ -72,8 +72,6 @@ trait CanAlias // register the path $codebase->use_referencing_locations[$use_path_lc][] = new CodeLocation($this, $use); - - $codebase->use_referencing_files[$this->getFilePath()][$use_path_lc] = true; } if ($codebase->alter_code) { diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/IfElseAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/IfElseAnalyzer.php index da50a97cb..8381ad24e 100644 --- a/src/Psalm/Internal/Analyzer/Statements/Block/IfElseAnalyzer.php +++ b/src/Psalm/Internal/Analyzer/Statements/Block/IfElseAnalyzer.php @@ -459,12 +459,6 @@ class IfElseAnalyzer } } - if ($if_scope->possible_param_types) { - foreach ($if_scope->possible_param_types as $var => $type) { - $context->possible_param_types[$var] = $type; - } - } - if ($if_scope->reasonable_clauses && (count($if_scope->reasonable_clauses) > 1 || !$if_scope->reasonable_clauses[0]->wedge) ) { diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php index ebf77070a..fe53120f9 100644 --- a/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php +++ b/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php @@ -1285,19 +1285,6 @@ class ClassLikeNodeScanner } $constant_storage->description = $description; - - foreach ($stmt->attrGroups as $attr_group) { - foreach ($attr_group->attrs as $attr) { - $constant_storage->attributes[] = AttributeResolver::resolve( - $this->codebase, - $this->file_scanner, - $this->file_storage, - $this->aliases, - $attr, - $this->storage->name ?? null - ); - } - } } } diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php index c3a741b20..fbe284129 100644 --- a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php +++ b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php @@ -1368,7 +1368,7 @@ class FunctionLikeDocblockScanner ): array { $storage->template_types = []; - foreach ($docblock_info->templates as $i => $template_map) { + foreach ($docblock_info->templates as $template_map) { $template_name = $template_map[0]; if ($template_map[1] !== null && $template_map[2] !== null) { @@ -1416,8 +1416,6 @@ class FunctionLikeDocblockScanner 'fn-' . strtolower($cased_function_id) => $template_type, ]; } - - $storage->template_covariants[$i] = $template_map[3]; } return array_merge($template_types ?: [], $storage->template_types); diff --git a/src/Psalm/Internal/Scope/IfScope.php b/src/Psalm/Internal/Scope/IfScope.php index 462ea6baa..c46d706b5 100644 --- a/src/Psalm/Internal/Scope/IfScope.php +++ b/src/Psalm/Internal/Scope/IfScope.php @@ -74,13 +74,6 @@ class IfScope */ public $reasonable_clauses = []; - /** - * Variables that were mixed, but are no longer - * - * @var array|null - */ - public $possible_param_types; - /** * @var string[] */ diff --git a/src/Psalm/Storage/ClassConstantStorage.php b/src/Psalm/Storage/ClassConstantStorage.php index 9f28634a8..b0aa0e3a5 100644 --- a/src/Psalm/Storage/ClassConstantStorage.php +++ b/src/Psalm/Storage/ClassConstantStorage.php @@ -38,11 +38,6 @@ class ClassConstantStorage */ public $deprecated = false; - /** - * @var list - */ - public $attributes = []; - /** * @var ?string */ diff --git a/src/Psalm/Storage/FunctionLikeStorage.php b/src/Psalm/Storage/FunctionLikeStorage.php index 4fab9a7b6..efbda28a9 100644 --- a/src/Psalm/Storage/FunctionLikeStorage.php +++ b/src/Psalm/Storage/FunctionLikeStorage.php @@ -120,11 +120,6 @@ abstract class FunctionLikeStorage */ public $template_types; - /** - * @var array|null - */ - public $template_covariants; - /** * @var array */