Allow enabling mixed issues reporting for error levels > 2.

Refs #9619.
vimeo · Apr 8, 2023 · a584314 · a584314
1 parent 82b3a7c
commit a584314
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 1 deletion.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -1735,7 +1735,8 @@ public function shortenFileName(string $to): string
 
     public function reportIssueInFile(string $issue_type, string $file_path): bool
     {
-        if (($this->show_mixed_issues === false || $this->level > 2)
+        if ((($this->level < 3 && $this->show_mixed_issues === false)
+            || ($this->level > 2 && $this->show_mixed_issues !== true))
             && in_array($issue_type, self::MIXED_ISSUES, true)
         ) {
             return false;

diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -353,6 +353,77 @@ public function testIssueHandler(): void
         $this->assertFalse($config->reportIssueInFile('MissingReturnType', realpath('src/Psalm/Type.php')));
     }
 
+    public function testReportMixedIssues(): void
+    {
+        $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
+            Config::loadFromXML(
+                dirname(__DIR__, 2),
+                '<?xml version="1.0"?>
+                <psalm>
+                    <projectFiles>
+                        <directory name="src" />
+                        <directory name="tests" />
+                    </projectFiles>
+                </psalm>',
+            ),
+        );
+        $config = $this->project_analyzer->getConfig();
+
+        $this->assertNull($config->show_mixed_issues);
+        $this->assertTrue($config->reportIssueInFile('MixedArgument', realpath(__FILE__)));
+
+        $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
+            Config::loadFromXML(
+                dirname(__DIR__, 2),
+                '<?xml version="1.0"?>
+                <psalm reportMixedIssues="false">
+                    <projectFiles>
+                        <directory name="src" />
+                        <directory name="tests" />
+                    </projectFiles>
+                </psalm>',
+            ),
+        );
+        $config = $this->project_analyzer->getConfig();
+
+        $this->assertFalse($config->show_mixed_issues);
+        $this->assertFalse($config->reportIssueInFile('MixedArgument', realpath(__FILE__)));
+
+        $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
+            Config::loadFromXML(
+                dirname(__DIR__, 2),
+                '<?xml version="1.0"?>
+                <psalm errorLevel="5">
+                    <projectFiles>
+                        <directory name="src" />
+                        <directory name="tests" />
+                    </projectFiles>
+                </psalm>',
+            ),
+        );
+        $config = $this->project_analyzer->getConfig();
+
+        $this->assertNull($config->show_mixed_issues);
+        $this->assertFalse($config->reportIssueInFile('MixedArgument', realpath(__FILE__)));
+
+        $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
+            Config::loadFromXML(
+                dirname(__DIR__, 2),
+                '<?xml version="1.0"?>
+                <psalm errorLevel="5" reportMixedIssues="true">
+                    <projectFiles>
+                        <directory name="src" />
+                        <directory name="tests" />
+                    </projectFiles>
+                </psalm>',
+            ),
+        );
+        $config = $this->project_analyzer->getConfig();
+
+        $this->assertTrue($config->show_mixed_issues);
+        $this->assertTrue($config->reportIssueInFile('MixedArgument', realpath(__FILE__)));
+    }
+
     public function testGlobalUndefinedFunctionSuppression(): void
     {
         $this->project_analyzer = $this->getProjectAnalyzerWithConfig(