Merge pull request cakephp#17338 from cakephp/controllerfactory-unsup…

…ported-reflectiontype Don't throw an exception for unsupoorted types.
a-d-w-s · Oct 11, 2023 · 8c1c9a1 · 8c1c9a1
2 parents 1c26321 + 5579533
commit 8c1c9a1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/src/Controller/ControllerFactory.php b/src/Controller/ControllerFactory.php
@@ -159,17 +159,6 @@ protected function getActionArgs(Closure $action, array $passedParams): array
         $function = new ReflectionFunction($action);
         foreach ($function->getParameters() as $parameter) {
             $type = $parameter->getType();
-            if ($type && !$type instanceof ReflectionNamedType) {
-                // Only single types are supported
-                throw new InvalidParameterException([
-                    'template' => 'unsupported_type',
-                    'parameter' => $parameter->getName(),
-                    'controller' => $this->controller->getName(),
-                    'action' => $this->controller->getRequest()->getParam('action'),
-                    'prefix' => $this->controller->getRequest()->getParam('prefix'),
-                    'plugin' => $this->controller->getRequest()->getParam('plugin'),
-                ]);
-            }
 
             // Check for dependency injection for classes
             if ($type instanceof ReflectionNamedType && !$type->isBuiltin()) {

diff --git a/tests/TestCase/Controller/ControllerFactoryTest.php b/tests/TestCase/Controller/ControllerFactoryTest.php
@@ -887,15 +887,16 @@ public function testInvokePassedParamUnsupportedReflectionType(): void
             'params' => [
                 'plugin' => null,
                 'controller' => 'Dependencies',
-                'action' => 'unsupportedTypedUnion',
-                'pass' => ['test'],
+                'action' => 'typedUnion',
+                'pass' => ['1'],
             ],
         ]);
         $controller = $this->factory->create($request);
 
-        $this->expectException(InvalidParameterException::class);
-        $this->expectExceptionMessage('Type declaration for `one` in action `Dependencies::unsupportedTypedUnion()` is unsupported.');
-        $this->factory->invoke($controller);
+        $result = $this->factory->invoke($controller);
+        $data = json_decode((string)$result->getBody(), true);
+
+        $this->assertSame(['one' => '1'], $data);
     }
 
     public function testMiddleware(): void

diff --git a/tests/test_app/TestApp/Controller/DependenciesController.php b/tests/test_app/TestApp/Controller/DependenciesController.php
@@ -60,7 +60,7 @@ public function unsupportedTyped(iterable $one)
         return $this->response->withStringBody(json_encode(compact('one')));
     }
 
-    public function unsupportedTypedUnion(string|int $one)
+    public function typedUnion(string|int $one)
     {
         return $this->response->withStringBody(json_encode(compact('one')));
     }