From c372f09d77c1f2629fb7ffba71f9e116fe256798 Mon Sep 17 00:00:00 2001 From: kkmuffme <11071985+kkmuffme@users.noreply.github.com> Date: Thu, 8 Sep 2022 19:21:04 +0200 Subject: [PATCH] fix psalm internal errors reported by new checks --- src/Psalm/Config.php | 4 ++-- src/Psalm/Internal/Codebase/ClassLikes.php | 8 -------- src/Psalm/Internal/PluginManager/ConfigFile.php | 10 +++++----- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php index d9d81bfd5fb..e35b83b4fe0 100644 --- a/src/Psalm/Config.php +++ b/src/Psalm/Config.php @@ -6,7 +6,7 @@ use Composer\Semver\Constraint\Constraint; use Composer\Semver\VersionParser; use DOMDocument; -use DomElement; +use DOMElement; use InvalidArgumentException; use LogicException; use OutOfBoundsException; @@ -752,7 +752,7 @@ private static function validateXmlConfig(string $base_dir, string $file_content $psalm_nodes = $dom_document->getElementsByTagName('psalm'); - /** @var DomElement|null */ + /** @var DOMElement|null */ $psalm_node = $psalm_nodes->item(0); if (!$psalm_node) { diff --git a/src/Psalm/Internal/Codebase/ClassLikes.php b/src/Psalm/Internal/Codebase/ClassLikes.php index 372d1da901f..d19b202fef6 100644 --- a/src/Psalm/Internal/Codebase/ClassLikes.php +++ b/src/Psalm/Internal/Codebase/ClassLikes.php @@ -784,14 +784,6 @@ public function traitHasCorrectCase(string $fq_trait_name): bool return isset($this->existing_traits[$fq_trait_name]); } - /** - * @param lowercase-string $fq_class_name - */ - public function isUserDefined(string $fq_class_name): bool - { - return $this->classlike_storage_provider->get($fq_class_name)->user_defined; - } - public function getTraitNode(string $fq_trait_name): PhpParser\Node\Stmt\Trait_ { $fq_trait_name_lc = strtolower($fq_trait_name); diff --git a/src/Psalm/Internal/PluginManager/ConfigFile.php b/src/Psalm/Internal/PluginManager/ConfigFile.php index a945dd24931..ccabdc12b39 100644 --- a/src/Psalm/Internal/PluginManager/ConfigFile.php +++ b/src/Psalm/Internal/PluginManager/ConfigFile.php @@ -3,7 +3,7 @@ namespace Psalm\Internal\PluginManager; use DOMDocument; -use DomElement; +use DOMElement; use Psalm\Config; use RuntimeException; @@ -51,7 +51,7 @@ public function getConfig(): Config public function removePlugin(string $plugin_class): void { $config_xml = $this->readXml(); - /** @var DomElement */ + /** @var DOMElement */ $psalm_root = $config_xml->getElementsByTagName('psalm')[0]; $plugins_elements = $psalm_root->getElementsByTagName('plugins'); if (!$plugins_elements->length) { @@ -59,7 +59,7 @@ public function removePlugin(string $plugin_class): void return; } - /** @var DomElement */ + /** @var DOMElement */ $plugins_element = $plugins_elements->item(0); $plugin_elements = $plugins_element->getElementsByTagName('pluginClass'); @@ -82,7 +82,7 @@ public function removePlugin(string $plugin_class): void public function addPlugin(string $plugin_class): void { $config_xml = $this->readXml(); - /** @var DomElement */ + /** @var DOMElement */ $psalm_root = $config_xml->getElementsByTagName('psalm')->item(0); $plugins_elements = $psalm_root->getElementsByTagName('plugins'); if (!$plugins_elements->length) { @@ -91,7 +91,7 @@ public function addPlugin(string $plugin_class): void $psalm_root->appendChild($plugins_element); } } else { - /** @var DomElement */ + /** @var DOMElement */ $plugins_element = $plugins_elements->item(0); }