Allow usage of invokable controllers

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

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/Handler/EmbeddedShortcodeHandler.php b/src/Handler/EmbeddedShortcodeHandler.php
@@ -41,10 +41,7 @@ public function __construct(
         RequestStack $requestStack,
         ?LoggerInterface $logger = null
     ) {
-        $callableFragments = explode('::', $controllerName);
-        if (!\is_array($callableFragments) || !isset($callableFragments[1]) || !method_exists($callableFragments[0], $callableFragments[1])) {
-            throw new InvalidArgumentException('The controller method: "'.$controllerName.'" does not exist.');
-        }
+        $this->validateControllerName($controllerName);
 
         $this->fragmentHandler = $fragmentHandler;
         $this->controllerName = $controllerName;
@@ -92,4 +89,22 @@ public function getControllerName(): string
     {
         return $this->controllerName;
     }
+
+    private function validateControllerName(string $controllerName): void
+    {
+        if (class_exists($controllerName)) {
+            // Check with method_exists instead of is_callable, because is_callable would need an object instance to
+            // positively test an invokable classes
+            if (method_exists($controllerName, '__invoke')) {
+                return;
+            }
+
+            throw new InvalidArgumentException('The configured controller "'.$controllerName.'" does not refer a method. Although a class "'.$controllerName.'" exists, but has no __invoke method.');
+        }
+
+        $callableFragments = explode('::', $controllerName);
+        if (!\is_array($callableFragments) || !isset($callableFragments[1]) || !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
@@ -92,6 +92,7 @@ public static function provideControllerNames(): Generator
         yield 'Not existing controller' => ['Foo\Bar::baz'];
         yield 'Missing method name' => [ShortcodeTestController::class];
         yield 'Not existing method' => [ShortcodeTestController::class.'_notExistingMethod'];
+        yield 'Missing class' => ['ThisClassDoesNotExist'];
     }
 
     private function processShortcodes(string $content, ?Request $request = null): string