upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Rework array handling to avoid phan error

Browse source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-02-09 15:12:49 +01:00 committed by Roeland Jago Douma
parent 2b6c00fc0f
commit 9cf49873fa
No known key found for this signature in database
GPG key ID: F941078878347C0C
1 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/public/AppFramework/Http/Template/PublicTemplateResponse.php
View file

@ -23,6 +23,7 @@
namespace OCP\AppFramework\Http\Template;
use InvalidArgumentException;
use OCP\AppFramework\Http\TemplateResponse;
/**
@ -85,36 +86,30 @@ class PublicTemplateResponse extends TemplateResponse {
/**
* @param array $actions
* @since 14.0.0
* @throws InvalidArgumentException
*/
public function setHeaderActions(array $actions) {
foreach ($actions as $action) {
if ($actions instanceof IMenuAction) {
throw new \InvalidArgumentException('Actions must be of type IMenuAction');
throw new InvalidArgumentException('Actions must be of type IMenuAction');
}
$this->headerActions[] = $action;
}
}
/**
* @param IMenuAction $action
* @since 14.0.0
*/
public function addAction(IMenuAction $action) {
$this->headerActions[] = $action;
usort($this->headerActions, function(IMenuAction $a, IMenuAction $b) {
return $a->getPriority() > $b->getPriority();
});
}
/**
* @return IMenuAction
* @since 14.0.0
* @throws \Exception
*/
public function getPrimaryAction(): IMenuAction {
$lowest = null;
foreach ($this->headerActions as $action) {
if($lowest === null || $action->getPriority() < $lowest->getPriority()) {
$lowest = $action;
}
if ($this->getActionCount() > 0) {
return $this->headerActions[0];
}
return $lowest;
throw new \Exception('No header actions have been set');
}
/**
@ -130,24 +125,14 @@ class PublicTemplateResponse extends TemplateResponse {
* @since 14.0.0
*/
public function getOtherActions(): array {
$list = [];
$primary = $this->getPrimaryAction();
foreach ($this->headerActions as $action) {
if($primary !== $action) {
$list[] = $action;
}
}
usort($list, function(IMenuAction $a, IMenuAction $b) {
return $a->getPriority() > $b->getPriority();
});
return $list;
return array_slice($this->headerActions, 1);
}
/**
* @return string
* @since 14.0.0
*/
public function render() {
public function render(): string {
$params = array_merge($this->getParams(), [
'template' => $this,
]);