Merge pull request #45455 from nextcloud/fix/psalm/navigation-entries

nextcloud · Jun 3, 2024 · 88fe734 · 88fe734
2 parents 4f34562 + 0d202e2
commit 88fe734
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/core/ResponseDefinitions.php b/core/ResponseDefinitions.php
@@ -26,11 +26,13 @@
  *
  * @psalm-type CoreNavigationEntry = array{
  *     id: string,
- *     order: int|string,
+ *     order?: int,
  *     href: string,
  *     icon: string,
  *     type: string,
  *     name: string,
+ *     app?: string,
+ *     default?: bool,
  *     active: bool,
  *     classes: string,
  *     unread: int,

diff --git a/core/openapi.json b/core/openapi.json
@@ -218,7 +218,6 @@
                 "type": "object",
                 "required": [
                     "id",
-                    "order",
                     "href",
                     "icon",
                     "type",
@@ -232,15 +231,8 @@
                         "type": "string"
                     },
                     "order": {
-                        "oneOf": [
-                            {
-                                "type": "integer",
-                                "format": "int64"
-                            },
-                            {
-                                "type": "string"
-                            }
-                        ]
+                        "type": "integer",
+                        "format": "int64"
                     },
                     "href": {
                         "type": "string"
@@ -254,6 +246,12 @@
                     "name": {
                         "type": "string"
                     },
+                    "app": {
+                        "type": "string"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    },
                     "active": {
                         "type": "boolean"
                     },

diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
@@ -95,7 +95,7 @@ public function add($entry) {
 			// This is the default app that will always be shown first
 			$entry['default'] = ($entry['app'] ?? false) === $this->defaultApp;
 			// Set order from user defined app order
-			$entry['order'] = $this->customAppOrder[$id]['order'] ?? $entry['order'] ?? 100;
+			$entry['order'] = (int)($this->customAppOrder[$id]['order'] ?? $entry['order'] ?? 100);
 		}
 
 		$this->entries[$id] = $entry;

diff --git a/lib/public/INavigationManager.php b/lib/public/INavigationManager.php
@@ -10,13 +10,11 @@
 
 namespace OCP;
 
-/**
- * @psalm-type NavigationEntry = array{id: string, order: int, href: string, name: string, app?: string, icon?: string, classes?: string, type?: string}
- */
-
 /**
  * Manages the ownCloud navigation
  * @since 6.0.0
+ *
+ * @psalm-type NavigationEntry = array{id: string, order: int, href: string, name: string, app?: string, icon?: string, classes?: string, type?: string}
  */
 interface INavigationManager {
 	/**