Skip to content

fix(INavigationManager): Fix psalm alias not set in the right place #45455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 3 commits into from
Jun 3, 2024
Merged

fix(INavigationManager): Fix psalm alias not set in the right place #45455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8965b70
fix(INavigationManager): Fix psalm alias not set in the right place
provokateurin May 22, 2024
0a7fcde
fix(NavigationManager): Make entry order always an integer
provokateurin May 30, 2024
0d202e2
fix(core): Fix NavigationEntry typing
provokateurin May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion core/ResponseDefinitions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
18 changes: 8 additions & 10 deletions core/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@
"type": "object",
"required": [
"id",
"order",
"href",
"icon",
"type",
Expand All @@ -232,15 +231,8 @@
"type": "string"
},
"order": {
"oneOf": [
{
"type": "integer",
"format": "int64"
},
{
"type": "string"
}
]
"type": "integer",
"format": "int64"
},
"href": {
"type": "string"
Expand All @@ -254,6 +246,12 @@
"name": {
"type": "string"
},
"app": {
"type": "string"
},
"default": {
"type": "boolean"
},
"active": {
"type": "boolean"
},
Expand Down
2 changes: 1 addition & 1 deletion lib/private/NavigationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions lib/public/INavigationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down