From 67dcff7a1f04a6118adb377ead6bff3dbcfa9fa0 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 23 Apr 2018 11:30:22 +0200 Subject: [PATCH 1/3] Fix undefined variable - found by Phan Signed-off-by: Morris Jobke --- lib/private/Files/Storage/DAV.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 1496fda514..b3c2dc0018 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -770,7 +770,7 @@ class DAV extends Common { if ($response === false) { if ($path === '') { // if root is gone it means the storage is not available - throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage()); + throw new StorageNotAvailableException('root is gone'); } return false; } From 431ccb638673b35474a818b7de5156e3832e3343 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 23 Apr 2018 11:34:37 +0200 Subject: [PATCH 2/3] Fix undefined variable - found by phan Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157 Signed-off-by: Morris Jobke --- lib/private/Files/ObjectStore/SwiftFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index 85bba57300..d10aaf467a 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -199,7 +199,7 @@ class SwiftFactory { 'name' => $this->params['container'] ]); } else { - throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $e); + throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $ex); } } catch (ConnectException $e) { /** @var RequestInterface $request */ From 4fd697e733b5e64366f0f0b740533f11280146c3 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 23 Apr 2018 11:53:47 +0200 Subject: [PATCH 3/3] Remove a check for an unused variable Left over from a refactoring https://github.com/nextcloud/server/pull/1940 Signed-off-by: Morris Jobke --- lib/private/Installer.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/private/Installer.php b/lib/private/Installer.php index 1b40b4955d..391e98171c 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -141,9 +141,7 @@ class Installer { \OC_App::setupBackgroundJobs($info['background-jobs']); //run appinfo/install.php - if(!isset($data['noinstall']) or $data['noinstall']==false) { - self::includeAppScript($basedir . '/appinfo/install.php'); - } + self::includeAppScript($basedir . '/appinfo/install.php'); $appData = OC_App::getAppInfo($appId); OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);