Fix tests

vimeo · Jan 17, 2022 · 3115c17 · 3115c17
1 parent 0a72abf
commit 3115c17
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 43 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -741,7 +741,9 @@ private static function validateXmlConfig(string $base_dir, string $file_content
             $psalm_node->setAttribute('xmlns', self::CONFIG_NAMESPACE);
 
             $old_dom_document = $dom_document;
-            $dom_document = self::loadDomDocument($base_dir, $old_dom_document->saveXML());
+            $old_file_contents = $old_dom_document->saveXML();
+            assert($old_file_contents !== false && $old_file_contents !== '');
+            $dom_document = self::loadDomDocument($base_dir, $old_file_contents);
         }
 
         // Enable user error handling

diff --git a/src/Psalm/Config/Creator.php b/src/Psalm/Config/Creator.php
@@ -52,6 +52,9 @@ class Creator
 </psalm>
 ';
 
+    /**
+     * @return non-empty-string
+     */
     public static function getContents(
         string $current_dir,
         ?string $suggested_dir,

diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -1487,15 +1487,14 @@ public function pluginRegistersScannerAndAnalyzer(int $flags, ?int $expectedExce
         FileTypeSelfRegisteringPlugin::$names = $names;
         FileTypeSelfRegisteringPlugin::$flags = $flags;
 
+        /** @var non-empty-string $xml */
+        $xml = sprintf(
+            '<?xml version="1.0"?>
+            <psalm><plugins><pluginClass class="%s"/></plugins></psalm>',
+            FileTypeSelfRegisteringPlugin::class
+        );
         $projectAnalyzer = $this->getProjectAnalyzerWithConfig(
-            TestConfig::loadFromXML(
-                dirname(__DIR__, 2),
-                sprintf(
-                    '<?xml version="1.0"?>
-                    <psalm><plugins><pluginClass class="%s"/></plugins></psalm>',
-                    FileTypeSelfRegisteringPlugin::class
-                )
-            )
+            TestConfig::loadFromXML(dirname(__DIR__, 2), $xml)
         );
 
 

diff --git a/tests/Config/PluginTest.php b/tests/Config/PluginTest.php
@@ -982,24 +982,23 @@ public function testAfterAnalysisHooks(): void
 
     public function testPluginFilenameCanBeAbsolute(): void
     {
+        /** @var non-empty-string $xml */
+        $xml = sprintf(
+            '<?xml version="1.0"?>
+            <psalm
+            errorLevel="1"
+        >
+                <projectFiles>
+                    <directory name="src" />
+                </projectFiles>
+                <plugins>
+                    <plugin filename="%s/examples/plugins/StringChecker.php" />
+                </plugins>
+            </psalm>',
+            __DIR__ . '/../..'
+        );
         $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
-            TestConfig::loadFromXML(
-                dirname(__DIR__, 2) . DIRECTORY_SEPARATOR,
-                sprintf(
-                    '<?xml version="1.0"?>
-                    <psalm
-                    errorLevel="1"
-                >
-                        <projectFiles>
-                            <directory name="src" />
-                        </projectFiles>
-                        <plugins>
-                            <plugin filename="%s/examples/plugins/StringChecker.php" />
-                        </plugins>
-                    </psalm>',
-                    __DIR__ . '/../..'
-                )
-            )
+            TestConfig::loadFromXML(dirname(__DIR__, 2) . DIRECTORY_SEPARATOR, $xml)
         );
 
         $this->project_analyzer->getCodebase()->config->initializePlugins($this->project_analyzer);
@@ -1010,24 +1009,23 @@ public function testPluginInvalidAbsoluteFilenameThrowsException(): void
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('does-not-exist/plugins/StringChecker.php');
 
+        /** @var non-empty-string $xml */
+        $xml = sprintf(
+            '<?xml version="1.0"?>
+            <psalm
+            errorLevel="1"
+        >
+                <projectFiles>
+                    <directory name="src" />
+                </projectFiles>
+                <plugins>
+                    <plugin filename="%s/does-not-exist/plugins/StringChecker.php" />
+                </plugins>
+            </psalm>',
+            __DIR__ . '/..'
+        );
         $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
-            TestConfig::loadFromXML(
-                dirname(__DIR__, 2) . DIRECTORY_SEPARATOR,
-                sprintf(
-                    '<?xml version="1.0"?>
-                    <psalm
-                    errorLevel="1"
-                >
-                        <projectFiles>
-                            <directory name="src" />
-                        </projectFiles>
-                        <plugins>
-                            <plugin filename="%s/does-not-exist/plugins/StringChecker.php" />
-                        </plugins>
-                    </psalm>',
-                    __DIR__ . '/..'
-                )
-            )
+            TestConfig::loadFromXML(dirname(__DIR__, 2) . DIRECTORY_SEPARATOR, $xml)
         );
 
         $this->project_analyzer->getCodebase()->config->initializePlugins($this->project_analyzer);