Validate controller references with scope resolution operator stricter

webfactory · Oct 30, 2024 · 640c445 · 640c445
1 parent f29494d
commit 640c445
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Handler/EmbeddedShortcodeHandler.php b/src/Handler/EmbeddedShortcodeHandler.php
@@ -103,7 +103,7 @@ private function validateControllerName(string $controllerName): void
         }
 
         $callableFragments = explode('::', $controllerName);
-        if (!\is_array($callableFragments) || !isset($callableFragments[1]) || !method_exists($callableFragments[0], $callableFragments[1])) {
+        if (!\is_array($callableFragments) || count($callableFragments) !== 2 || !method_exists($callableFragments[0], $callableFragments[1])) {
             throw new InvalidArgumentException('The controller method: "'.$controllerName.'" does not exist.');
         }
     }

diff --git a/tests/Functional/EmbeddedShortcodeHandlerTest.php b/tests/Functional/EmbeddedShortcodeHandlerTest.php
@@ -93,6 +93,7 @@ public static function provideControllerNames(): Generator
         yield 'Missing method name' => [ShortcodeTestController::class];
         yield 'Not existing method' => [ShortcodeTestController::class.'_notExistingMethod'];
         yield 'Missing class' => ['ThisClassDoesNotExist'];
+        yield 'Valid reference followed by a second scope resolution operator' => [ShortcodeTestController::class.'::test::'];
     }
 
     private function processShortcodes(string $content, ?Request $request = null): string