Merge pull request #964 from nextcloud/fix/noid/context-node-rel-retu…

…rntypes fix(Contexts): explicitely state non-int types
nextcloud · Apr 4, 2024 · 7eaa637 · 7eaa637
2 parents 87d494d + bc96f82
commit 7eaa637
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/lib/Db/Context.php b/lib/Db/Context.php
@@ -38,6 +38,7 @@ class Context extends Entity implements JsonSerializable {
 
 	public function __construct() {
 		$this->addType('id', 'integer');
+		$this->addType('owner_type', 'integer');
 	}
 
 	public function jsonSerialize(): array {

diff --git a/lib/Db/ContextMapper.php b/lib/Db/ContextMapper.php
@@ -83,13 +83,13 @@ protected function formatResultRows(array $rows, ?string $userId) {
 				return $carry;
 			}
 			$carry[$item['share_id']] = [
-				'share_id' => $item['share_id'],
+				'share_id' => (int)$item['share_id'],
 				'receiver' => $item['receiver'],
 				'receiver_type' => $item['receiver_type'],
-				'display_mode_default' => $item['display_mode_default'],
+				'display_mode_default' => (int)$item['display_mode_default'],
 			];
 			if ($userId !== null) {
-				$carry[$item['share_id']]['display_mode'] = $item['display_mode'];
+				$carry[$item['share_id']]['display_mode'] = (int)$item['display_mode'];
 			}
 			return $carry;
 		}, []);
@@ -100,10 +100,10 @@ protected function formatResultRows(array $rows, ?string $userId) {
 				return $carry;
 			}
 			$carry[$item['node_rel_id']] = [
-				'id' => $item['node_rel_id'],
-				'node_id' => $item['node_id'],
-				'node_type' => $item['node_type'],
-				'permissions' => $item['permissions'],
+				'id' => (int)$item['node_rel_id'],
+				'node_id' => (int)$item['node_id'],
+				'node_type' => (int)$item['node_type'],
+				'permissions' => (int)$item['permissions'],
 			];
 			return $carry;
 		}, []);
@@ -116,12 +116,12 @@ protected function formatResultRows(array $rows, ?string $userId) {
 			if (!isset($carry[$item['page_id']])) {
 				$carry[$item['page_id']] = ['content' => []];
 			}
-			$carry[$item['page_id']]['id'] = $item['page_id'];
+			$carry[$item['page_id']]['id'] = (int)$item['page_id'];
 			$carry[$item['page_id']]['page_type'] = $item['page_type'];
 			if ($item['node_rel_id'] !== null) {
 				$carry[$item['page_id']]['content'][$item['content_id']] = [
-					'order' => $item['order'],
-					'node_rel_id' => $item['node_rel_id']
+					'order' => (int)$item['order'],
+					'node_rel_id' => (int)$item['node_rel_id']
 				];
 			}
 

diff --git a/lib/Db/ContextNodeRelation.php b/lib/Db/ContextNodeRelation.php
@@ -25,6 +25,10 @@ class ContextNodeRelation extends Entity implements \JsonSerializable {
 
 	public function __construct() {
 		$this->addType('id', 'integer');
+		$this->addType('context_id', 'integer');
+		$this->addType('node_id', 'integer');
+		$this->addType('node_type', 'integer');
+		$this->addType('permissions', 'integer');
 	}
 
 	public function jsonSerialize(): array {

diff --git a/lib/Db/PageContent.php b/lib/Db/PageContent.php
@@ -21,6 +21,9 @@ class PageContent extends Entity implements \JsonSerializable {
 
 	public function __construct() {
 		$this->addType('id', 'integer');
+		$this->addType('page_id', 'integer');
+		$this->addType('node_rel_id', 'integer');
+		$this->addType('order', 'integer');
 	}
 
 	public function jsonSerialize(): array {