From 5362f3be91c84c82f8fc8e2a2c02aee048386a69 Mon Sep 17 00:00:00 2001 From: Bruce Weirdan Date: Sun, 2 Jan 2022 13:22:37 +0200 Subject: [PATCH] Deprecate `Codebase::$php_major_version` and `Codebase::$php_minor_version` properties Removed in #6898 (Psalm 5) --- psalm-baseline.xml | 152 +++++++++++++++++- src/Psalm/Codebase.php | 6 + .../Internal/Analyzer/ProjectAnalyzer.php | 1 + 3 files changed, 158 insertions(+), 1 deletion(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 05606831bcc..66f2bee9590 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $comment_block->tags['variablesfrom'][0] @@ -13,10 +13,27 @@ + + $this->php_major_version + $this->php_minor_version + $matches[0] $symbol_parts[1] + + $analysis_php_version_id + + + + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_minor_version + $codebase->php_minor_version + @@ -31,6 +48,15 @@ + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_minor_version + $codebase->php_minor_version + $codebase->php_minor_version + $comments[0] $stmt->props[0] @@ -42,7 +68,44 @@ $line_parts[1] + + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_minor_version + $codebase->php_minor_version + + + + + $codebase->php_major_version + $project_analyzer->getCodebase()->php_major_version + $project_analyzer->getCodebase()->php_minor_version + + + + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_minor_version + $codebase->php_minor_version + + + + $codebase->php_major_version + $codebase->php_minor_version + $this->codebase->php_major_version + $this->codebase->php_major_version + $this->codebase->php_minor_version + $this->codebase->php_minor_version + $destination_parts[1] $destination_parts[1] @@ -82,6 +145,16 @@ $catch_context->assigned_var_ids += $old_catch_assigned_var_ids + + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_minor_version + $codebase->php_minor_version + + $assertion->rule[0] @@ -138,6 +211,12 @@ + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_major_version + $non_existent_method_ids[0] $parts[1] @@ -174,6 +253,11 @@ Type::getEmpty() + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_minor_version + @@ -184,6 +268,11 @@ Type::getEmpty() + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_minor_version + @@ -204,6 +293,11 @@ Type::getEmpty() + + $codebase->php_major_version + $codebase->php_major_version + $codebase->php_minor_version + @@ -217,6 +311,9 @@ Type::getEmpty() Type::getEmpty() + + $statements_analyzer->getCodebase()->php_major_version + @@ -247,6 +344,12 @@ $atomic_return_type->type_params[2] + + + $statements_analyzer->getCodebase()->php_major_version + $statements_analyzer->getCodebase()->php_minor_version + + Type::getEmpty() @@ -289,6 +392,10 @@ + + $codebase->php_major_version + $codebase->php_minor_version + $callables[0] $callables[0] @@ -347,6 +454,10 @@ + + $codebase->php_major_version + $codebase->php_minor_version + $doc_line_parts[1] $matches[0] @@ -355,6 +466,10 @@ + + $this->codebase->php_major_version + $this->codebase->php_minor_version + $imported_type_data[3] $l[4] @@ -362,6 +477,12 @@ $var_line_parts[0] + + + $codebase->php_major_version + $codebase->php_minor_version + + $node->getArgs()[0] @@ -383,21 +504,50 @@ + + $this->codebase->php_major_version + $this->codebase->php_major_version + $this->codebase->php_major_version + $this->codebase->php_major_version + $this->codebase->php_major_version + $this->codebase->php_major_version + $this->codebase->php_major_version + $this->codebase->php_minor_version + $this->codebase->php_minor_version + $this->codebase->php_minor_version + $this->codebase->php_minor_version + $stmt->stmts[0] + + + $this->codebase->php_major_version + + $cs[0] + + + $codebase->php_major_version + $codebase->php_minor_version + + new TEmpty() new TEmpty() + + + $codebase->php_major_version + + new TEmpty() diff --git a/src/Psalm/Codebase.php b/src/Psalm/Codebase.php index 67b8f38d063..cb72efa8b76 100644 --- a/src/Psalm/Codebase.php +++ b/src/Psalm/Codebase.php @@ -92,6 +92,7 @@ use const PHP_MAJOR_VERSION; use const PHP_MINOR_VERSION; +use const PHP_VERSION_ID; class Codebase { @@ -306,14 +307,19 @@ class Codebase /** * @var int + * @deprecated Removed in Psalm 5, use Codebase::$analysis_php_version_id */ public $php_major_version = PHP_MAJOR_VERSION; /** * @var int + * @deprecated Removed in Psalm 5, use Codebase::$analysis_php_version_id */ public $php_minor_version = PHP_MINOR_VERSION; + /** @var int */ + public $analysis_php_version_id = PHP_VERSION_ID; + /** @var 'cli'|'config'|'composer'|'tests'|'runtime' */ public $php_version_source = 'runtime'; diff --git a/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php b/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php index 6600f6e3ca9..4e99005e19e 100644 --- a/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php +++ b/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php @@ -1307,6 +1307,7 @@ public function setPhpVersion(string $version, string $source): void $this->codebase->php_major_version = $php_major_version; $this->codebase->php_minor_version = $php_minor_version; + $this->codebase->analysis_php_version_id = $php_major_version * 10000 + $php_minor_version * 100; $this->codebase->php_version_source = $source; }