From 7fceb578434f685bb39feb4dd7cd6dd3e1c7352a Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Thu, 15 Dec 2022 09:33:52 +0100
Subject: [PATCH] fix(app framework): Fix missing cast of double controller
 parameters

``settype`` allows 'double' as alias of 'float'.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 lib/private/AppFramework/Http/Dispatcher.php  |  2 +-
 .../lib/AppFramework/Http/DispatcherTest.php  | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php
index 21d61bc95aaf1..a9403d511b6fa 100644
--- a/lib/private/AppFramework/Http/Dispatcher.php
+++ b/lib/private/AppFramework/Http/Dispatcher.php
@@ -194,7 +194,7 @@ private function executeController(Controller $controller, string $methodName):
 		$arguments = [];
 
 		// valid types that will be casted
-		$types = ['int', 'integer', 'bool', 'boolean', 'float'];
+		$types = ['int', 'integer', 'bool', 'boolean', 'float', 'double'];
 
 		foreach ($this->reflector->getParameters() as $param => $default) {
 
diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php
index e1d78082a2d35..3618db16ab674 100644
--- a/tests/lib/AppFramework/Http/DispatcherTest.php
+++ b/tests/lib/AppFramework/Http/DispatcherTest.php
@@ -51,11 +51,12 @@ public function __construct($appName, $request) {
 	/**
 	 * @param int $int
 	 * @param bool $bool
+	 * @param double $foo
 	 * @param int $test
-	 * @param int $test2
+	 * @param integer $test2
 	 * @return array
 	 */
-	public function exec($int, $bool, $test = 4, $test2 = 1) {
+	public function exec($int, $bool, $foo, $test = 4, $test2 = 1) {
 		$this->registerResponder('text', function ($in) {
 			return new JSONResponse(['text' => $in]);
 		});
@@ -313,7 +314,8 @@ public function testControllerParametersInjected() {
 			[
 				'post' => [
 					'int' => '3',
-					'bool' => 'false'
+					'bool' => 'false',
+					'double' => 1.2,
 				],
 				'method' => 'POST'
 			],
@@ -344,6 +346,7 @@ public function testControllerParametersInjectedDefaultOverwritten() {
 				'post' => [
 					'int' => '3',
 					'bool' => 'false',
+					'double' => 1.2,
 					'test2' => 7
 				],
 				'method' => 'POST',
@@ -375,7 +378,8 @@ public function testResponseTransformedByUrlFormat() {
 			[
 				'post' => [
 					'int' => '3',
-					'bool' => 'false'
+					'bool' => 'false',
+					'double' => 1.2,
 				],
 				'urlParams' => [
 					'format' => 'text'
@@ -408,7 +412,8 @@ public function testResponseTransformsDataResponse() {
 			[
 				'post' => [
 					'int' => '3',
-					'bool' => 'false'
+					'bool' => 'false',
+					'double' => 1.2,
 				],
 				'urlParams' => [
 					'format' => 'json'
@@ -441,7 +446,8 @@ public function testResponseTransformedByAcceptHeader() {
 			[
 				'post' => [
 					'int' => '3',
-					'bool' => 'false'
+					'bool' => 'false',
+					'double' => 1.2,
 				],
 				'server' => [
 					'HTTP_ACCEPT' => 'application/text, test',
@@ -475,7 +481,8 @@ public function testResponsePrimarilyTransformedByParameterFormat() {
 			[
 				'post' => [
 					'int' => '3',
-					'bool' => 'false'
+					'bool' => 'false',
+					'double' => 1.2,
 				],
 				'get' => [
 					'format' => 'text'