Skip to content

getAppInfo has to return array #8503

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

Closed
blizzz wants to merge 1 commit into from
Closed

getAppInfo has to return array #8503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions lib/private/App/AppManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ public function getAppsNeedingUpgrade($version) {
* @param null $lang
* @return array app info
*/
public function getAppInfo(string $appId, bool $path = false, $lang = null) {
public function getAppInfo(string $appId, bool $path = false, $lang = null): array {
if ($path) {
$file = $appId;
} else {
Expand All @@ -361,7 +361,7 @@ public function getAppInfo(string $appId, bool $path = false, $lang = null) {
try {
$appPath = $this->getAppPath($appId);
} catch (AppPathNotFoundException $e) {
return null;

@nickvergessen nickvergessen Feb 22, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the old OCP has null documented:

server/lib/public/App.php

Line 76 in 6d3c8d5

* @return array|null

@nickvergessen nickvergessen Feb 22, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it's also expected in some places:

server/lib/private/Installer.php

Lines 107 to 113 in 9dc3b04

if(!is_array($info)) {
throw new \Exception(
$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
[$info['name']]
)
);
}

@zorn-v zorn-v May 17, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check if not array and immediately use as array. Goood )

@blizzz blizzz May 18, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already fixed in https://github.com/nextcloud/server/pull/8504… but could use a backport.

return [];
}
$file = $appPath . '/appinfo/info.xml';
}
Expand Down