From cd110d549de64a4b6d65b6009f08ce93f6f3acac Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Mon, 27 Nov 2023 13:41:27 +0100
Subject: [PATCH] Cleanup

---
 psalm-baseline.xml     | 27 ++++++++++++++++++++++++++-
 src/Psalm/Codebase.php |  8 +++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index abd3dbf4b..4cdca652b 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="dev-master@292ed063233e29d59d0bde61bb6daedee94d55bb">
+<files psalm-version="dev-master@24735a0157f1e71d45e4ec3e406d89ee413a114f">
   <file src="examples/TemplateChecker.php">
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$comment_block->tags['variablesfrom'][0]]]></code>
@@ -16,6 +16,9 @@
     <PossiblyNullArgument>
       <code>$deprecated_element_xml</code>
     </PossiblyNullArgument>
+    <PossiblyNullReference>
+      <code>addAttribute</code>
+    </PossiblyNullReference>
     <PropertyTypeCoercion>
       <code>$this</code>
     </PropertyTypeCoercion>
@@ -625,6 +628,28 @@
       <code>hasLowercaseString</code>
     </PossiblyUnusedMethod>
   </file>
+  <file src="tests/Config/PluginListTest.php">
+    <InvalidPropertyAssignmentValue>
+      <code>Mockery::mock(ConfigFile::class)</code>
+    </InvalidPropertyAssignmentValue>
+    <MixedMethodCall>
+      <code>addPlugin</code>
+      <code>expects</code>
+      <code>expects</code>
+      <code>removePlugin</code>
+    </MixedMethodCall>
+    <NoValue>
+      <code><![CDATA[$this->config_file]]></code>
+      <code><![CDATA[$this->config_file]]></code>
+      <code><![CDATA[$this->config_file]]></code>
+      <code><![CDATA[$this->config_file]]></code>
+      <code><![CDATA[$this->config_file]]></code>
+      <code><![CDATA[$this->config_file]]></code>
+      <code><![CDATA[$this->config_file]]></code>
+      <code><![CDATA[$this->config_file]]></code>
+      <code><![CDATA[$this->config_file]]></code>
+    </NoValue>
+  </file>
   <file src="tests/TestConfig.php">
     <InvalidExtendClass>
       <code>Config</code>
diff --git a/src/Psalm/Codebase.php b/src/Psalm/Codebase.php
index dde2fda89..e3f48f025 100644
--- a/src/Psalm/Codebase.php
+++ b/src/Psalm/Codebase.php
@@ -1606,10 +1606,12 @@ final class Codebase
                         if (!in_array($method_storage->visibility, $allow_visibilities)) {
                             continue;
                         }
-                        if (array_key_exists($method_storage->cased_name, $had)) {
-                            continue;
+                        if ($method_storage->cased_name !== null) {
+                            if (array_key_exists($method_storage->cased_name, $had)) {
+                                continue;
+                            }
+                            $had[$method_storage->cased_name] = true;
                         }
-                        $had[$method_storage->cased_name] = true;
                         if ($method_storage->is_static || $gap === '->') {
                             $completion_item = new CompletionItem(
                                 $method_storage->cased_name,