mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8411 from nextcloud/add-strict-types-to-oc_app 

Add strict types to OC_App
This commit is contained in:
Morris Jobke 2018-02-17 21:34:20 +01:00 committed by GitHub
parent d953db8683 9b68f80c4b
commit ac63c207a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 81 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
View File

@ -96,7 +96,7 @@ class ExceptionOnLostConnection {
*/ */
public function setUp() { public function setUp() {
require_once __DIR__ . '/../../../../lib/base.php'; require_once __DIR__ . '/../../../../lib/base.php';
\OC_App::loadApps('user_ldap'); \OC_App::loadApps(['user_ldap']);
$ch = $this->getCurl(); $ch = $this->getCurl();
$proxyInfoJson = curl_exec($ch); $proxyInfoJson = curl_exec($ch);

4
lib/private/App/AppManager.php
View File

@ -380,10 +380,10 @@ class AppManager implements IAppManager {
return $data; return $data;
} }
public function getAppVersion(string $appId, bool $useCache = true) { public function getAppVersion(string $appId, bool $useCache = true): string {
if(!$useCache || !isset($this->appVersions[$appId])) { if(!$useCache || !isset($this->appVersions[$appId])) {
$appInfo = \OC::$server->getAppManager()->getAppInfo($appId); $appInfo = \OC::$server->getAppManager()->getAppInfo($appId);
$this->appVersions[$appId] = ($appInfo !== null) ? $appInfo['version'] : '0'; $this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
} }
return $this->appVersions[$appId]; return $this->appVersions[$appId];
} }

2
lib/private/Installer.php
View File

@ -112,7 +112,7 @@ class Installer {
); );
} }
$version = \OCP\Util::getVersion(); $version = implode('.', \OCP\Util::getVersion());
if (!\OC_App::isAppCompatible($version, $info)) { if (!\OC_App::isAppCompatible($version, $info)) {
throw new \Exception( throw new \Exception(
// TODO $l // TODO $l

4
lib/private/Updater.php
View File

@ -250,7 +250,7 @@ class Updater extends BasicEmitter {
$this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps()); $this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps());
// install new shipped apps on upgrade // install new shipped apps on upgrade
OC_App::loadApps('authentication'); OC_App::loadApps(['authentication']);
$errors = Installer::installShippedApps(true); $errors = Installer::installShippedApps(true);
foreach ($errors as $appId => $exception) { foreach ($errors as $appId => $exception) {
/** @var \Exception $exception */ /** @var \Exception $exception */
@ -346,7 +346,7 @@ class Updater extends BasicEmitter {
if(!isset($stacks[$type])) { if(!isset($stacks[$type])) {
$stacks[$type] = array(); $stacks[$type] = array();
} }
if (\OC_App::isType($appId, $type)) { if (\OC_App::isType($appId, [$type])) {
$stacks[$type][] = $appId; $stacks[$type][] = $appId;
$priorityType = true; $priorityType = true;
break; break;

148
lib/private/legacy/app.php
View File

@ -1,4 +1,5 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2016, ownCloud, Inc.
* @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch> * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
@ -62,21 +63,21 @@ use OCP\App\ManagerEvent;
* upgrading and removing apps. * upgrading and removing apps.
*/ */
class OC_App { class OC_App {
static private $adminForms = array(); static private $adminForms = [];
static private $personalForms = array(); static private $personalForms = [];
static private $appTypes = array(); static private $appTypes = [];
static private $loadedApps = array(); static private $loadedApps = [];
static private $altLogin = array(); static private $altLogin = [];
static private $alreadyRegistered = []; static private $alreadyRegistered = [];
const officialApp = 200; const officialApp = 200;
/** /**
* clean the appId * clean the appId
* *
* @param string|boolean $app AppId that needs to be cleaned * @param string $app AppId that needs to be cleaned
* @return string * @return string
*/ */
public static function cleanAppId($app) { public static function cleanAppId(string $app): string {
return str_replace(array('\0', '/', '\\', '..'), '', $app); return str_replace(array('\0', '/', '\\', '..'), '', $app);
} }
@ -86,23 +87,23 @@ class OC_App {
* @param string $app * @param string $app
* @return bool * @return bool
*/ */
public static function isAppLoaded($app) { public static function isAppLoaded(string $app): bool {
return in_array($app, self::$loadedApps, true); return in_array($app, self::$loadedApps, true);
} }
/** /**
* loads all apps * loads all apps
* *
* @param string[] | string | null $types * @param string[] $types
* @return bool * @return bool
* *
* This function walks through the ownCloud directory and loads all apps * This function walks through the ownCloud directory and loads all apps
* it can find. A directory contains an app if the file /appinfo/info.xml * it can find. A directory contains an app if the file /appinfo/info.xml
* exists. * exists.
* *
* if $types is set, only apps of those types will be loaded * if $types is set to non-empty array, only apps of those types will be loaded
*/ */
public static function loadApps($types = null) { public static function loadApps(array $types = []): bool {
if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) { if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
return false; return false;
} }
@ -120,7 +121,7 @@ class OC_App {
// prevent app.php from printing output // prevent app.php from printing output
ob_start(); ob_start();
foreach ($apps as $app) { foreach ($apps as $app) {
if ((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) { if (($types === [] or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) {
self::loadApp($app); self::loadApp($app);
} }
} }
@ -135,7 +136,7 @@ class OC_App {
* @param string $app * @param string $app
* @throws Exception * @throws Exception
*/ */
public static function loadApp($app) { public static function loadApp(string $app) {
self::$loadedApps[] = $app; self::$loadedApps[] = $app;
$appPath = self::getAppPath($app); $appPath = self::getAppPath($app);
if($appPath === false) { if($appPath === false) {
@ -161,7 +162,7 @@ class OC_App {
// the enabled apps cache needs to be cleared to make sure that the // the enabled apps cache needs to be cleared to make sure that the
// next time getEnableApps() is called it will also include apps that were // next time getEnableApps() is called it will also include apps that were
// enabled for groups // enabled for groups
self::$enabledAppsCache = array(); self::$enabledAppsCache = [];
} }
\OC::$server->getEventLogger()->end('load_app_' . $app); \OC::$server->getEventLogger()->end('load_app_' . $app);
} }
@ -227,7 +228,7 @@ class OC_App {
* @param string $app * @param string $app
* @param string $path * @param string $path
*/ */
public static function registerAutoloading($app, $path) { public static function registerAutoloading(string $app, string $path) {
$key = $app . '-' . $path; $key = $app . '-' . $path;
if(isset(self::$alreadyRegistered[$key])) { if(isset(self::$alreadyRegistered[$key])) {
return; return;
@ -259,7 +260,7 @@ class OC_App {
* @param string $app app name * @param string $app app name
* @throws Error * @throws Error
*/ */
private static function requireAppFile($app) { private static function requireAppFile(string $app) {
// encapsulated here to avoid variable scope conflicts // encapsulated here to avoid variable scope conflicts
require_once $app . '/appinfo/app.php'; require_once $app . '/appinfo/app.php';
} }
@ -268,13 +269,10 @@ class OC_App {
* check if an app is of a specific type * check if an app is of a specific type
* *
* @param string $app * @param string $app
* @param string|array $types * @param array $types
* @return bool * @return bool
*/ */
public static function isType($app, $types) { public static function isType(string $app, array $types): bool {
if (is_string($types)) {
$types = array($types);
}
$appTypes = self::getAppTypes($app); $appTypes = self::getAppTypes($app);
foreach ($types as $type) { foreach ($types as $type) {
if (array_search($type, $appTypes) !== false) { if (array_search($type, $appTypes) !== false) {
@ -290,7 +288,7 @@ class OC_App {
* @param string $app * @param string $app
* @return array * @return array
*/ */
private static function getAppTypes($app) { private static function getAppTypes(string $app): array {
//load the cache //load the cache
if (count(self::$appTypes) == 0) { if (count(self::$appTypes) == 0) {
self::$appTypes = \OC::$server->getAppConfig()->getValues(false, 'types'); self::$appTypes = \OC::$server->getAppConfig()->getValues(false, 'types');
@ -298,16 +296,17 @@ class OC_App {
if (isset(self::$appTypes[$app])) { if (isset(self::$appTypes[$app])) {
return explode(',', self::$appTypes[$app]); return explode(',', self::$appTypes[$app]);
} else {
return array();
} }
return [];
} }
/** /**
* read app types from info.xml and cache them in the database * read app types from info.xml and cache them in the database
*/ */
public static function setAppTypes($app) { public static function setAppTypes(string $app) {
$appData = self::getAppInfo($app); $appManager = \OC::$server->getAppManager();
$appData = $appManager->getAppInfo($app);
if(!is_array($appData)) { if(!is_array($appData)) {
return; return;
} }
@ -319,12 +318,13 @@ class OC_App {
$appData['types'] = []; $appData['types'] = [];
} }
\OC::$server->getConfig()->setAppValue($app, 'types', $appTypes); $config = \OC::$server->getConfig();
$config->setAppValue($app, 'types', $appTypes);
if (\OC::$server->getAppManager()->hasProtectedAppType($appData['types'])) { if ($appManager->hasProtectedAppType($appData['types'])) {
$enabled = \OC::$server->getConfig()->getAppValue($app, 'enabled', 'yes'); $enabled = $config->getAppValue($app, 'enabled', 'yes');
if ($enabled !== 'yes' && $enabled !== 'no') { if ($enabled !== 'yes' && $enabled !== 'no') {
\OC::$server->getConfig()->setAppValue($app, 'enabled', 'yes'); $config->setAppValue($app, 'enabled', 'yes');
} }
} }
} }
@ -332,7 +332,7 @@ class OC_App {
/** /**
* get all enabled apps * get all enabled apps
*/ */
protected static $enabledAppsCache = array(); protected static $enabledAppsCache = [];
/** /**
* Returns apps enabled for the current user. * Returns apps enabled for the current user.
@ -342,9 +342,9 @@ class OC_App {
* currently logged in one * currently logged in one
* @return string[] * @return string[]
*/ */
public static function getEnabledApps($forceRefresh = false, $all = false) { public static function getEnabledApps(bool $forceRefresh = false, bool $all = false): array {
if (!\OC::$server->getSystemConfig()->getValue('installed', false)) { if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
return array(); return [];
} }
// in incognito mode or when logged out, $user will be false, // in incognito mode or when logged out, $user will be false,
// which is also the case during an upgrade // which is also the case during an upgrade
@ -377,7 +377,7 @@ class OC_App {
* *
* This function checks whether or not an app is enabled. * This function checks whether or not an app is enabled.
*/ */
public static function isEnabled($app) { public static function isEnabled(string $app): bool {
return \OC::$server->getAppManager()->isEnabledForUser($app); return \OC::$server->getAppManager()->isEnabledForUser($app);
} }
@ -391,8 +391,8 @@ class OC_App {
* *
* This function set an app as enabled in appconfig. * This function set an app as enabled in appconfig.
*/ */
public function enable($appId, public function enable(string $appId,
$groups = null) { array $groups = []) {
self::$enabledAppsCache = []; // flush self::$enabledAppsCache = []; // flush
// Check if app is already downloaded // Check if app is already downloaded
@ -406,7 +406,7 @@ class OC_App {
$installer->installApp($appId); $installer->installApp($appId);
$appManager = \OC::$server->getAppManager(); $appManager = \OC::$server->getAppManager();
if (!is_null($groups)) { if ($groups !== []) {
$groupManager = \OC::$server->getGroupManager(); $groupManager = \OC::$server->getGroupManager();
$groupsList = []; $groupsList = [];
foreach ($groups as $group) { foreach ($groups as $group) {
@ -427,9 +427,9 @@ class OC_App {
* @param string $app app * @param string $app app
* @throws Exception * @throws Exception
*/ */
public static function disable($app) { public static function disable(string $app) {
// flush // flush
self::$enabledAppsCache = array(); self::$enabledAppsCache = [];
// run uninstall steps // run uninstall steps
$appData = OC_App::getAppInfo($app); $appData = OC_App::getAppInfo($app);
@ -472,18 +472,18 @@ class OC_App {
* @param string $appId * @param string $appId
* @return false|string * @return false|string
*/ */
public static function findAppInDirectories($appId) { public static function findAppInDirectories(string $appId) {
$sanitizedAppId = self::cleanAppId($appId); $sanitizedAppId = self::cleanAppId($appId);
if($sanitizedAppId !== $appId) { if($sanitizedAppId !== $appId) {
return false; return false;
} }
static $app_dir = array(); static $app_dir = [];
if (isset($app_dir[$appId])) { if (isset($app_dir[$appId])) {
return $app_dir[$appId]; return $app_dir[$appId];
} }
$possibleApps = array(); $possibleApps = [];
foreach (OC::$APPSROOTS as $dir) { foreach (OC::$APPSROOTS as $dir) {
if (file_exists($dir['path'] . '/' . $appId)) { if (file_exists($dir['path'] . '/' . $appId)) {
$possibleApps[] = $dir; $possibleApps[] = $dir;
@ -497,7 +497,7 @@ class OC_App {
$app_dir[$appId] = $dir; $app_dir[$appId] = $dir;
return $dir; return $dir;
} else { } else {
$versionToLoad = array(); $versionToLoad = [];
foreach ($possibleApps as $possibleApp) { foreach ($possibleApps as $possibleApp) {
$version = self::getAppVersionByPath($possibleApp['path']); $version = self::getAppVersionByPath($possibleApp['path']);
if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) { if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
@ -520,7 +520,7 @@ class OC_App {
* @param string $appId * @param string $appId
* @return string|false * @return string|false
*/ */
public static function getAppPath($appId) { public static function getAppPath(string $appId) {
if ($appId === null || trim($appId) === '') { if ($appId === null || trim($appId) === '') {
return false; return false;
} }
@ -538,7 +538,7 @@ class OC_App {
* @param string $appId * @param string $appId
* @return string|false * @return string|false
*/ */
public static function getAppWebPath($appId) { public static function getAppWebPath(string $appId) {
if (($dir = self::findAppInDirectories($appId)) != false) { if (($dir = self::findAppInDirectories($appId)) != false) {
return OC::$WEBROOT . $dir['url'] . '/' . $appId; return OC::$WEBROOT . $dir['url'] . '/' . $appId;
} }
@ -553,7 +553,7 @@ class OC_App {
* @return string * @return string
* @deprecated 14.0.0 use \OC::$server->getAppManager()->getAppVersion() * @deprecated 14.0.0 use \OC::$server->getAppManager()->getAppVersion()
*/ */
public static function getAppVersion($appId, $useCache = true) { public static function getAppVersion(string $appId, bool $useCache = true): string {
return \OC::$server->getAppManager()->getAppVersion($appId, $useCache); return \OC::$server->getAppManager()->getAppVersion($appId, $useCache);
} }
@ -563,7 +563,7 @@ class OC_App {
* @param string $path * @param string $path
* @return string * @return string
*/ */
public static function getAppVersionByPath($path) { public static function getAppVersionByPath(string $path): string {
$infoFile = $path . '/appinfo/info.xml'; $infoFile = $path . '/appinfo/info.xml';
$appData = \OC::$server->getAppManager()->getAppInfo($infoFile, true); $appData = \OC::$server->getAppManager()->getAppInfo($infoFile, true);
return isset($appData['version']) ? $appData['version'] : ''; return isset($appData['version']) ? $appData['version'] : '';
@ -580,7 +580,7 @@ class OC_App {
* @note all data is read from info.xml, not just pre-defined fields * @note all data is read from info.xml, not just pre-defined fields
* @deprecated 14.0.0 use \OC::$server->getAppManager()->getAppInfo() * @deprecated 14.0.0 use \OC::$server->getAppManager()->getAppInfo()
*/ */
public static function getAppInfo($appId, $path = false, $lang = null) { public static function getAppInfo(string $appId, bool $path = false, string $lang = null) {
return \OC::$server->getAppManager()->getAppInfo($appId, $path, $lang); return \OC::$server->getAppManager()->getAppInfo($appId, $path, $lang);
} }
@ -595,7 +595,7 @@ class OC_App {
* given for each app the following keys exist: * given for each app the following keys exist:
* - active: boolean, signals if the user is on this navigation entry * - active: boolean, signals if the user is on this navigation entry
*/ */
public static function getNavigation() { public static function getNavigation(): array {
return OC::$server->getNavigationManager()->getAll(); return OC::$server->getNavigationManager()->getAll();
} }
@ -608,7 +608,7 @@ class OC_App {
* This function returns an array containing all settings pages added. The * This function returns an array containing all settings pages added. The
* entries are sorted by the key 'order' ascending. * entries are sorted by the key 'order' ascending.
*/ */
public static function getSettingsNavigation() { public static function getSettingsNavigation(): array {
return OC::$server->getNavigationManager()->getAll('settings'); return OC::$server->getNavigationManager()->getAll('settings');
} }
@ -617,7 +617,7 @@ class OC_App {
* *
* @return string * @return string
*/ */
public static function getCurrentApp() { public static function getCurrentApp(): string {
$request = \OC::$server->getRequest(); $request = \OC::$server->getRequest();
$script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1); $script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1);
$topFolder = substr($script, 0, strpos($script, '/') ?: 0); $topFolder = substr($script, 0, strpos($script, '/') ?: 0);
@ -629,7 +629,7 @@ class OC_App {
} }
if ($topFolder == 'apps') { if ($topFolder == 'apps') {
$length = strlen($topFolder); $length = strlen($topFolder);
return substr($script, $length + 1, strpos($script, '/', $length + 1) - $length - 1); return substr($script, $length + 1, strpos($script, '/', $length + 1) - $length - 1) ?: '';
} else { } else {
return $topFolder; return $topFolder;
} }
@ -639,8 +639,8 @@ class OC_App {
* @param string $type * @param string $type
* @return array * @return array
*/ */
public static function getForms($type) { public static function getForms(string $type): array {
$forms = array(); $forms = [];
switch ($type) { switch ($type) {
case 'admin': case 'admin':
$source = self::$adminForms; $source = self::$adminForms;
@ -649,7 +649,7 @@ class OC_App {
$source = self::$personalForms; $source = self::$personalForms;
break; break;
default: default:
return array(); return [];
} }
foreach ($source as $form) { foreach ($source as $form) {
$forms[] = include $form; $forms[] = include $form;
@ -663,7 +663,7 @@ class OC_App {
* @param string $app * @param string $app
* @param string $page * @param string $page
*/ */
public static function registerAdmin($app, $page) { public static function registerAdmin(string $app, string $page) {
self::$adminForms[] = $app . '/' . $page . '.php'; self::$adminForms[] = $app . '/' . $page . '.php';
} }
@ -672,7 +672,7 @@ class OC_App {
* @param string $app * @param string $app
* @param string $page * @param string $page
*/ */
public static function registerPersonal($app, $page) { public static function registerPersonal(string $app, string $page) {
self::$personalForms[] = $app . '/' . $page . '.php'; self::$personalForms[] = $app . '/' . $page . '.php';
} }
@ -686,7 +686,7 @@ class OC_App {
/** /**
* @return array * @return array
*/ */
public static function getAlternativeLogIns() { public static function getAlternativeLogIns(): array {
return self::$altLogin; return self::$altLogin;
} }
@ -696,9 +696,9 @@ class OC_App {
* @return array an array of app names (string IDs) * @return array an array of app names (string IDs)
* @todo: change the name of this method to getInstalledApps, which is more accurate * @todo: change the name of this method to getInstalledApps, which is more accurate
*/ */
public static function getAllApps() { public static function getAllApps(): array {
$apps = array(); $apps = [];
foreach (OC::$APPSROOTS as $apps_dir) { foreach (OC::$APPSROOTS as $apps_dir) {
if (!is_readable($apps_dir['path'])) { if (!is_readable($apps_dir['path'])) {
@ -728,13 +728,13 @@ class OC_App {
* *
* @return array * @return array
*/ */
public function listAllApps() { public function listAllApps(): array {
$installedApps = OC_App::getAllApps(); $installedApps = OC_App::getAllApps();
$appManager = \OC::$server->getAppManager(); $appManager = \OC::$server->getAppManager();
//we don't want to show configuration for these //we don't want to show configuration for these
$blacklist = $appManager->getAlwaysEnabledApps(); $blacklist = $appManager->getAlwaysEnabledApps();
$appList = array(); $appList = [];
$langCode = \OC::$server->getL10N('core')->getLanguageCode(); $langCode = \OC::$server->getL10N('core')->getLanguageCode();
$urlGenerator = \OC::$server->getURLGenerator(); $urlGenerator = \OC::$server->getURLGenerator();
@ -809,7 +809,7 @@ class OC_App {
return $appList; return $appList;
} }
public static function shouldUpgrade($app) { public static function shouldUpgrade(string $app): bool {
$versions = self::getAppVersions(); $versions = self::getAppVersions();
$currentVersion = OC_App::getAppVersion($app); $currentVersion = OC_App::getAppVersion($app);
if ($currentVersion && isset($versions[$app])) { if ($currentVersion && isset($versions[$app])) {
@ -829,7 +829,7 @@ class OC_App {
* @param string $version2 version to take the number of parts from * @param string $version2 version to take the number of parts from
* @return string shortened $version1 * @return string shortened $version1
*/ */
private static function adjustVersionParts($version1, $version2) { private static function adjustVersionParts(string $version1, string $version2): string {
$version1 = explode('.', $version1); $version1 = explode('.', $version1);
$version2 = explode('.', $version2); $version2 = explode('.', $version2);
// reduce $version1 to match the number of parts in $version2 // reduce $version1 to match the number of parts in $version2
@ -859,7 +859,7 @@ class OC_App {
* *
* @return boolean true if compatible, otherwise false * @return boolean true if compatible, otherwise false
*/ */
public static function isAppCompatible($ocVersion, $appInfo) { public static function isAppCompatible(string $ocVersion, array $appInfo): bool {
$requireMin = ''; $requireMin = '';
$requireMax = ''; $requireMax = '';
if (isset($appInfo['dependencies']['nextcloud']['@attributes']['min-version'])) { if (isset($appInfo['dependencies']['nextcloud']['@attributes']['min-version'])) {
@ -880,10 +880,6 @@ class OC_App {
$requireMax = $appInfo['requiremax']; $requireMax = $appInfo['requiremax'];
} }
if (is_array($ocVersion)) {
$ocVersion = implode('.', $ocVersion);
}
if (!empty($requireMin) if (!empty($requireMin)
&& version_compare(self::adjustVersionParts($ocVersion, $requireMin), $requireMin, '<') && version_compare(self::adjustVersionParts($ocVersion, $requireMin), $requireMin, '<')
) { ) {
@ -919,7 +915,7 @@ class OC_App {
* @param string $appId * @param string $appId
* @return bool * @return bool
*/ */
public static function updateApp($appId) { public static function updateApp(sstring $appId): bool {
$appPath = self::getAppPath($appId); $appPath = self::getAppPath($appId);
if($appPath === false) { if($appPath === false) {
return false; return false;
@ -978,7 +974,7 @@ class OC_App {
* @param string[] $steps * @param string[] $steps
* @throws \OC\NeedsUpdateException * @throws \OC\NeedsUpdateException
*/ */
public static function executeRepairSteps($appId, array $steps) { public static function executeRepairSteps(string $appId, array $steps) {
if (empty($steps)) { if (empty($steps)) {
return; return;
} }
@ -1012,7 +1008,7 @@ class OC_App {
* @param string $appId * @param string $appId
* @param string[] $steps * @param string[] $steps
*/ */
private static function setupLiveMigrations($appId, array $steps) { private static function setupLiveMigrations(string $appId, array $steps) {
$queue = \OC::$server->getJobList(); $queue = \OC::$server->getJobList();
foreach ($steps as $step) { foreach ($steps as $step) {
$queue->add('OC\Migration\BackgroundRepair', [ $queue->add('OC\Migration\BackgroundRepair', [
@ -1025,7 +1021,7 @@ class OC_App {
* @param string $appId * @param string $appId
* @return \OC\Files\View|false * @return \OC\Files\View|false
*/ */
public static function getStorage($appId) { public static function getStorage(string $appId) {
if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check
if (\OC::$server->getUserSession()->isLoggedIn()) { if (\OC::$server->getUserSession()->isLoggedIn()) {
$view = new \OC\Files\View('/' . OC_User::getUser()); $view = new \OC\Files\View('/' . OC_User::getUser());
@ -1043,7 +1039,7 @@ class OC_App {
} }
} }
protected static function findBestL10NOption($options, $lang) { protected static function findBestL10NOption(array $options, string $lang): string {
$fallback = $similarLangFallback = $englishFallback = false; $fallback = $similarLangFallback = $englishFallback = false;
$lang = strtolower($lang); $lang = strtolower($lang);
@ -1095,7 +1091,7 @@ class OC_App {
* @param string $lang * @param string $lang
* @return array improved app data * @return array improved app data
*/ */
public static function parseAppInfo(array $data, $lang = null) { public static function parseAppInfo(array $data, $lang = null): array {
if ($lang && isset($data['name']) && is_array($data['name'])) { if ($lang && isset($data['name']) && is_array($data['name'])) {
$data['name'] = self::findBestL10NOption($data['name'], $lang); $data['name'] = self::findBestL10NOption($data['name'], $lang);
@ -1120,7 +1116,7 @@ class OC_App {
* @param array $info * @param array $info
* @throws \Exception * @throws \Exception
*/ */
public static function checkAppDependencies($config, $l, $info) { public static function checkAppDependencies(\OCP\IConfig $config, \OCP\IL10N $l, array $info) {
$dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l); $dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
$missing = $dependencyAnalyzer->analyze($info); $missing = $dependencyAnalyzer->analyze($info);
if (!empty($missing)) { if (!empty($missing)) {

4
lib/public/App/IAppManager.php
View File

@ -51,10 +51,10 @@ interface IAppManager {
* *
* @param string $appId * @param string $appId
* @param bool $useCache * @param bool $useCache
* @return mixed * @return string
* @since 14.0.0 * @since 14.0.0
*/ */
public function getAppVersion(string $appId, bool $useCache = true); public function getAppVersion(string $appId, bool $useCache = true): string;
/** /**
* Check if an app is enabled for user * Check if an app is enabled for user

2
settings/ajax/enableapp.php
View File

@ -34,7 +34,7 @@ if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay
exit(); exit();
} }
$groups = isset($_POST['groups']) ? (array)$_POST['groups'] : null; $groups = isset($_POST['groups']) ? (array)$_POST['groups'] : [];
$appIds = isset($_POST['appIds']) ? (array)$_POST['appIds'] : []; $appIds = isset($_POST['appIds']) ? (array)$_POST['appIds'] : [];
try { try {

13
tests/lib/AppTest.php
View File

@ -309,19 +309,6 @@ class AppTest extends \Test\TestCase {
$this->assertEquals($expectedResult, \OC_App::isAppCompatible($ocVersion, $appInfo)); $this->assertEquals($expectedResult, \OC_App::isAppCompatible($ocVersion, $appInfo));
} }
/**
* Test that the isAppCompatible method also supports passing an array
* as $ocVersion
*/
public function testIsAppCompatibleWithArray() {
$ocVersion = array(6);
$appInfo = array(
'requiremin' => '6',
'requiremax' => '6',
);
$this->assertTrue(\OC_App::isAppCompatible($ocVersion, $appInfo));
}
/** /**
* Tests that the app order is correct * Tests that the app order is correct
*/ */