Fixes

Author: danog

src/Psalm/Internal/Analyzer/NamespaceAnalyzer.php

@@ -41,7 +41,6 @@ public function __construct(
         private readonly Namespace_ $namespace,
         /**
          * @var FileAnalyzer
-         * @psalm-suppress NonInvariantDocblockPropertyType
          */
         protected SourceAnalyzer $source,
     ) {

src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php

@@ -1465,7 +1465,7 @@ private static function hasGetClassCheck(
             && strtolower($conditional->right->name->name) === 'class';
 
         $right_variable_class_const = $conditional->right instanceof PhpParser\Node\Expr\ClassConstFetch
-            && $conditional->right->class instanceof PhpParser\Node\Expr\Variable
+            && !$conditional->right->class instanceof PhpParser\Node\Name
             && $conditional->right->name instanceof PhpParser\Node\Identifier
             && strtolower($conditional->right->name->name) === 'class';
 
@@ -1474,15 +1474,22 @@ private static function hasGetClassCheck(
             && $conditional->left->name instanceof PhpParser\Node\Identifier
             && strtolower($conditional->left->name->name) === 'class';
 
-        $left_type = $source->node_data->getType($conditional->left);
+        $left_variable_class_const = $conditional->left instanceof PhpParser\Node\Expr\ClassConstFetch
+            && !$conditional->left->class instanceof PhpParser\Node\Name
+            && $conditional->left->name instanceof PhpParser\Node\Identifier
+            && strtolower($conditional->left->name->name) === 'class';
 
         $left_class_string_t = false;
 
-        if ($left_type && $left_type->isSingle()) {
-            foreach ($left_type->getAtomicTypes() as $type_part) {
-                if ($type_part instanceof TClassString) {
-                    $left_class_string_t = true;
-                    break;
+        if (!$left_variable_class_const) {
+            $left_type = $source->node_data->getType($conditional->left);
+
+            if ($left_type && $left_type->isSingle()) {
+                foreach ($left_type->getAtomicTypes() as $type_part) {
+                    if ($type_part instanceof TClassString) {
+                        $left_class_string_t = true;
+                        break;
+                    }
                 }
             }
         }
@@ -1503,29 +1510,26 @@ private static function hasGetClassCheck(
             && $conditional->left->name instanceof PhpParser\Node\Identifier
             && strtolower($conditional->left->name->name) === 'class';
 
-        $left_variable_class_const = $conditional->left instanceof PhpParser\Node\Expr\ClassConstFetch
-            && $conditional->left->class instanceof PhpParser\Node\Expr\Variable
-            && $conditional->left->name instanceof PhpParser\Node\Identifier
-            && strtolower($conditional->left->name->name) === 'class';
-
         $right_class_string = $conditional->right instanceof PhpParser\Node\Expr\ClassConstFetch
             && $conditional->right->class instanceof PhpParser\Node\Name
             && $conditional->right->name instanceof PhpParser\Node\Identifier
             && strtolower($conditional->right->name->name) === 'class';
 
-        $right_type = $source->node_data->getType($conditional->right);
-
         $right_class_string_t = false;
 
-        if ($right_type && $right_type->isSingle()) {
-            foreach ($right_type->getAtomicTypes() as $type_part) {
-                if ($type_part instanceof TClassString) {
-                    $right_class_string_t = true;
-                    break;
+        if (!$right_variable_class_const) {
+            $right_type = $source->node_data->getType($conditional->right);
+
+            if ($right_type && $right_type->isSingle()) {
+                foreach ($right_type->getAtomicTypes() as $type_part) {
+                    if ($type_part instanceof TClassString) {
+                        $right_class_string_t = true;
+                        break;
+                    }
                 }
             }
         }
-
+        
         if (($left_get_class || $left_static_class || $left_variable_class_const)
             && ($right_class_string || $right_class_string_t)
         ) {

src/Psalm/Internal/Fork/PsalmRestarter.php

@@ -90,7 +90,7 @@ protected function requiresRestart($default): bool
                 } elseif ($ini_name === 'enable_cli') {
                     $value = in_array($value, ['1', 'true', true, 1]) ? 1 : 0;
                 } elseif (is_int($required_value)) {
-                    $required_value = (int) $required_value;
+                    $value = (int) $value;
                 }
                 if ($value !== $required_value) {
                     return true;

src/Psalm/Internal/LanguageServer/Client/Workspace.php

@@ -4,7 +4,6 @@
 
 namespace Psalm\Internal\LanguageServer\Client;
 
-use JsonMapper;
 use Psalm\Internal\LanguageServer\ClientHandler;
 use Psalm\Internal\LanguageServer\LanguageServer;
 
@@ -17,10 +16,6 @@ final class Workspace
 {
     public function __construct(
         private readonly ClientHandler $handler,
-        /**
-         * @psalm-suppress UnusedProperty
-         */
-        private readonly JsonMapper $mapper,
         private readonly LanguageServer $server,
     ) {
     }

src/Psalm/Internal/Scanner/FileScanner.php

@@ -18,7 +18,7 @@
  * @internal
  * @psalm-consistent-constructor
  */
-final class FileScanner implements FileSource
+class FileScanner implements FileSource
 {
     public function __construct(public string $file_path, public string $file_name, public bool $will_analyze)
     {