Merge pull request #9915 from kkmuffme/fix-psalm-6-warning-findUnused…

…Code fix CI warnings for findUnusedCode in psalm 6
vimeo · Jun 13, 2023 · 49c6f31 · 49c6f31
2 parents 2c50745 + 51fd63c
commit 49c6f31
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -1201,7 +1201,7 @@ private static function fromXmlAndPaths(
         }
 
         if (!isset($config_xml['findUnusedBaselineEntry'])) {
-            $config->config_warnings[] = '"findUnusedBaselineEntry" will be defaulted to "true" in Psalm 6.'
+            $config->config_warnings[] = '"findUnusedBaselineEntry" will default to "true" in Psalm 6.'
                 . ' You should explicitly enable or disable this setting.';
         }
 
@@ -1210,7 +1210,7 @@ private static function fromXmlAndPaths(
             $config->find_unused_code = $attribute_text === 'true' || $attribute_text === '1';
             $config->find_unused_variables = $config->find_unused_code;
         } else {
-            $config->config_warnings[] = '"findUnusedCode" will be defaulted to "true" in Psalm 6.'
+            $config->config_warnings[] = '"findUnusedCode" will default to "true" in Psalm 6.'
                 . ' You should explicitly enable or disable this setting.';
         }
 

diff --git a/tests/EndToEnd/PsalmEndToEndTest.php b/tests/EndToEnd/PsalmEndToEndTest.php
@@ -235,7 +235,7 @@ public function testPsalmWithNoProgressDoesNotProduceOutputOnStderr(): void
         $this->runPsalmInit();
 
         $psalmXml = file_get_contents(self::$tmpDir . '/psalm.xml');
-        $psalmXml = preg_replace('/findUnusedCode="(true|false)"/', '', $psalmXml);
+        $psalmXml = preg_replace('/findUnusedCode="(true|false)"/', '', $psalmXml, 1);
         file_put_contents(self::$tmpDir . '/psalm.xml', $psalmXml);
 
         $result = $this->runPsalm(['--no-progress'], self::$tmpDir);

diff --git a/tests/fixtures/DestructiveAutoloader/psalm.xml b/tests/fixtures/DestructiveAutoloader/psalm.xml
@@ -2,6 +2,7 @@
 <psalm
     autoloader="autoloader.php"
     resolveFromConfigFile="true"
+	findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

diff --git a/tests/fixtures/DummyProject/psalm.xml b/tests/fixtures/DummyProject/psalm.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <psalm
+	findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

diff --git a/tests/fixtures/ModularConfig/psalm.xml b/tests/fixtures/ModularConfig/psalm.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <psalm
+	findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

diff --git a/tests/fixtures/SuicidalAutoloader/psalm.xml b/tests/fixtures/SuicidalAutoloader/psalm.xml
@@ -2,6 +2,7 @@
 <psalm
     autoloader="autoloader.php"
     resolveFromConfigFile="true"
+	findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"