diff options
| author | provokateurin <kate@provokateurin.de> | 2024-05-30 16:59:04 +0200 |
|---|---|---|
| committer | provokateurin <kate@provokateurin.de> | 2024-05-30 17:00:32 +0200 |
| commit | 0a7fcde9069ff05cffe22e2ad6831d866103d12c (patch) | |
| tree | f0654feabf3b425381480e1b47d47c534601e0e6 | |
| parent | 8965b702285af9d77e2b51d4d46a6056ba7608b3 (diff) | |
| download | nextcloud-server-0a7fcde9069ff05cffe22e2ad6831d866103d12c.tar.gz nextcloud-server-0a7fcde9069ff05cffe22e2ad6831d866103d12c.zip | |
fix(NavigationManager): Make entry order always an integer
Signed-off-by: provokateurin <kate@provokateurin.de>
| -rw-r--r-- | core/ResponseDefinitions.php | 2 | ||||
| -rw-r--r-- | core/openapi.json | 11 | ||||
| -rw-r--r-- | lib/private/NavigationManager.php | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/core/ResponseDefinitions.php b/core/ResponseDefinitions.php index f186f52c335..af16545c267 100644 --- a/core/ResponseDefinitions.php +++ b/core/ResponseDefinitions.php @@ -26,7 +26,7 @@ namespace OCA\Core; * * @psalm-type CoreNavigationEntry = array{ * id: string, - * order: int|string, + * order: int, * href: string, * icon: string, * type: string, diff --git a/core/openapi.json b/core/openapi.json index a20691046fa..0cfb9cb5a46 100644 --- a/core/openapi.json +++ b/core/openapi.json @@ -232,15 +232,8 @@ "type": "string" }, "order": { - "oneOf": [ - { - "type": "integer", - "format": "int64" - }, - { - "type": "string" - } - ] + "type": "integer", + "format": "int64" }, "href": { "type": "string" diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php index 05a3a9c85fe..5d71c83e77a 100644 --- a/lib/private/NavigationManager.php +++ b/lib/private/NavigationManager.php @@ -95,7 +95,7 @@ class NavigationManager implements INavigationManager { // 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; |