upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

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

Browse source
This commit is contained in:
Kate 2024-06-03 17:11:20 +02:00 committed by GitHub
commit 88fe7348ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/ResponseDefinitions.php
View file

@ -26,11 +26,13 @@ namespace OCA\Core;
*
* @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,

18
core/openapi.json
View file

@ -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"
},

2
lib/private/NavigationManager.php
View file

@ -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;

6
lib/public/INavigationManager.php
View file

@ -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 {
/**