Merge pull request #10071 from weirdan/fix-10070

Allow method-like strings in `referencedFunction`
vimeo · Aug 1, 2023 · b9d355e · b9d355e
2 parents b2942ce + ec842c0
commit b9d355e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/Psalm/Config/FileFilter.php b/src/Psalm/Config/FileFilter.php
@@ -337,6 +337,7 @@ public static function loadFromArray(
                 $function_id = $referenced_function['name'] ?? '';
                 if (!is_string($function_id)
                     || (!preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $function_id)
+                        && !preg_match('/^[^:]+::[^:]+$/', $function_id) // methods are also allowed
                         && !static::isRegularExpression($function_id))) {
                     throw new ConfigException(
                         'Invalid referencedFunction ' . ((string) $function_id),

diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -4,6 +4,7 @@
 
 use Composer\Autoload\ClassLoader;
 use ErrorException;
+use Psalm\CodeLocation\Raw;
 use Psalm\Config;
 use Psalm\Config\IssueHandler;
 use Psalm\Context;
@@ -16,6 +17,7 @@
 use Psalm\Internal\Provider\Providers;
 use Psalm\Internal\RuntimeCaches;
 use Psalm\Internal\Scanner\FileScanner;
+use Psalm\Issue\TooManyArguments;
 use Psalm\Tests\Config\Plugin\FileTypeSelfRegisteringPlugin;
 use Psalm\Tests\Internal\Provider\FakeParserCacheProvider;
 use Psalm\Tests\TestCase;
@@ -1824,4 +1826,34 @@ public function testConfigWithDisableExtensionsDoesNotLoadExtensionStubsAndHides
             $config->internal_stubs,
         );
     }
+
+    public function testReferencedFunctionAllowsMethods(): void
+    {
+        $config_xml = Config::loadFromXML(
+            (string) getcwd(),
+            <<<XML
+            <?xml version="1.0"?>
+            <psalm>
+                <issueHandlers>
+                    <TooManyArguments>
+                        <errorLevel type="suppress">
+                            <referencedFunction name="Foo\Bar::baz" />
+                        </errorLevel>
+                    </TooManyArguments>
+                </issueHandlers>
+            </psalm>
+            XML,
+        );
+
+        $this->assertSame(
+            Config::REPORT_SUPPRESS,
+            $config_xml->getReportingLevelForIssue(
+                new TooManyArguments(
+                    'too many',
+                    new Raw('aaa', 'aaa.php', 'aaa.php', 1, 2),
+                    'Foo\Bar::baZ',
+                ),
+            ),
+        );
+    }
 }