nextcloud / server

settings/Controller/CheckSetupController.php

Indentation +553 added lines, -553 removed lines

@@ -62,293 +62,293 @@ 
  * @package OC\Settings\Controller
  */
 class CheckSetupController extends Controller {
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
-	/** @var \OC_Util */
-	private $util;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
-	/** @var Checker */
-	private $checker;
-	/** @var ILogger */
-	private $logger;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var IDBConnection|Connection */
-	private $db;
-	/** @var ILockingProvider */
-	private $lockingProvider;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-	/** @var MemoryInfo */
-	private $memoryInfo;
-
-	public function __construct($AppName,
-								IRequest $request,
-								IConfig $config,
-								IClientService $clientService,
-								IURLGenerator $urlGenerator,
-								\OC_Util $util,
-								IL10N $l10n,
-								Checker $checker,
-								ILogger $logger,
-								EventDispatcherInterface $dispatcher,
-								IDBConnection $db,
-								ILockingProvider $lockingProvider,
-								IDateTimeFormatter $dateTimeFormatter,
-								MemoryInfo $memoryInfo) {
-		parent::__construct($AppName, $request);
-		$this->config = $config;
-		$this->clientService = $clientService;
-		$this->util = $util;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->checker = $checker;
-		$this->logger = $logger;
-		$this->dispatcher = $dispatcher;
-		$this->db = $db;
-		$this->lockingProvider = $lockingProvider;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-		$this->memoryInfo = $memoryInfo;
-	}
-
-	/**
-	 * Checks if the server can connect to the internet using HTTPS and HTTP
-	 * @return bool
-	 */
-	private function isInternetConnectionWorking() {
-		if ($this->config->getSystemValue('has_internet_connection', true) === false) {
-			return false;
-		}
-
-		$siteArray = ['www.nextcloud.com',
-						'www.startpage.com',
-						'www.eff.org',
-						'www.edri.org',
-			];
-
-		foreach($siteArray as $site) {
-			if ($this->isSiteReachable($site)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
-	* @return bool
-	*/
-	private function isSiteReachable($sitename) {
-		$httpSiteName = 'http://' . $sitename . '/';
-		$httpsSiteName = 'https://' . $sitename . '/';
-
-		try {
-			$client = $this->clientService->newClient();
-			$client->get($httpSiteName);
-			$client->get($httpsSiteName);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'internet_connection_check']);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Checks whether a local memcache is installed or not
-	 * @return bool
-	 */
-	private function isMemcacheConfigured() {
-		return $this->config->getSystemValue('memcache.local', null) !== null;
-	}
-
-	/**
-	 * Whether /dev/urandom is available to the PHP controller
-	 *
-	 * @return bool
-	 */
-	private function isUrandomAvailable() {
-		if(@file_exists('/dev/urandom')) {
-			$file = fopen('/dev/urandom', 'rb');
-			if($file) {
-				fclose($file);
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Public for the sake of unit-testing
-	 *
-	 * @return array
-	 */
-	protected function getCurlVersion() {
-		return curl_version();
-	}
-
-	/**
-	 * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
-	 * have multiple bugs which likely lead to problems in combination with
-	 * functionality required by ownCloud such as SNI.
-	 *
-	 * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
-	 * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
-	 * @return string
-	 */
-	private function isUsedTlsLibOutdated() {
-		// Don't run check when:
-		// 1. Server has `has_internet_connection` set to false
-		// 2. AppStore AND S2S is disabled
-		if(!$this->config->getSystemValue('has_internet_connection', true)) {
-			return '';
-		}
-		if(!$this->config->getSystemValue('appstoreenabled', true)
-			&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
-			&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
-			return '';
-		}
-
-		$versionString = $this->getCurlVersion();
-		if(isset($versionString['ssl_version'])) {
-			$versionString = $versionString['ssl_version'];
-		} else {
-			return '';
-		}
-
-		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if(!$this->config->getSystemValue('appstoreenabled', true)) {
-			$features = (string)$this->l10n->t('Federated Cloud Sharing');
-		}
-
-		// Check if at least OpenSSL after 1.01d or 1.0.2b
-		if(strpos($versionString, 'OpenSSL/') === 0) {
-			$majorVersion = substr($versionString, 8, 5);
-			$patchRelease = substr($versionString, 13, 6);
-
-			if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
-				($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
-				return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
-			}
-		}
-
-		// Check if NSS and perform heuristic check
-		if(strpos($versionString, 'NSS/') === 0) {
-			try {
-				$firstClient = $this->clientService->newClient();
-				$firstClient->get('https://nextcloud.com/');
-
-				$secondClient = $this->clientService->newClient();
-				$secondClient->get('https://nextcloud.com/');
-			} catch (ClientException $e) {
-				if($e->getResponse()->getStatusCode() === 400) {
-					return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
-				}
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * Whether the version is outdated
-	 *
-	 * @return bool
-	 */
-	protected function isPhpOutdated() {
-		if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Whether the php version is still supported (at time of release)
-	 * according to: https://secure.php.net/supported-versions.php
-	 *
-	 * @return array
-	 */
-	private function isPhpSupported() {
-		return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
-	}
-
-	/**
-	 * Check if the reverse proxy configuration is working as expected
-	 *
-	 * @return bool
-	 */
-	private function forwardedForHeadersWorking() {
-		$trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
-		$remoteAddress = $this->request->getRemoteAddress();
-
-		if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
-			return false;
-		}
-
-		// either not enabled or working correctly
-		return true;
-	}
-
-	/**
-	 * Checks if the correct memcache module for PHP is installed. Only
-	 * fails if memcached is configured and the working module is not installed.
-	 *
-	 * @return bool
-	 */
-	private function isCorrectMemcachedPHPModuleInstalled() {
-		if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
-			return true;
-		}
-
-		// there are two different memcached modules for PHP
-		// we only support memcached and not memcache
-		// https://code.google.com/p/memcached/wiki/PHPClientComparison
-		return !(!extension_loaded('memcached') && extension_loaded('memcache'));
-	}
-
-	/**
-	 * Checks if set_time_limit is not disabled.
-	 *
-	 * @return bool
-	 */
-	private function isSettimelimitAvailable() {
-		if (function_exists('set_time_limit')
-			&& strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return RedirectResponse
-	 */
-	public function rescanFailedIntegrityCheck() {
-		$this->checker->runInstanceVerification();
-		return new RedirectResponse(
-			$this->urlGenerator->linkToRoute('settings.AdminSettings.index')
-		);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @return DataResponse
-	 */
-	public function getFailedIntegrityCheckFiles() {
-		if(!$this->checker->isCodeCheckEnforced()) {
-			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
-		}
-
-		$completeResults = $this->checker->getResults();
-
-		if(!empty($completeResults)) {
-			$formattedTextResponse = 'Technical information
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
+    /** @var \OC_Util */
+    private $util;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l10n;
+    /** @var Checker */
+    private $checker;
+    /** @var ILogger */
+    private $logger;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var IDBConnection|Connection */
+    private $db;
+    /** @var ILockingProvider */
+    private $lockingProvider;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
+    /** @var MemoryInfo */
+    private $memoryInfo;
+
+    public function __construct($AppName,
+                                IRequest $request,
+                                IConfig $config,
+                                IClientService $clientService,
+                                IURLGenerator $urlGenerator,
+                                \OC_Util $util,
+                                IL10N $l10n,
+                                Checker $checker,
+                                ILogger $logger,
+                                EventDispatcherInterface $dispatcher,
+                                IDBConnection $db,
+                                ILockingProvider $lockingProvider,
+                                IDateTimeFormatter $dateTimeFormatter,
+                                MemoryInfo $memoryInfo) {
+        parent::__construct($AppName, $request);
+        $this->config = $config;
+        $this->clientService = $clientService;
+        $this->util = $util;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->checker = $checker;
+        $this->logger = $logger;
+        $this->dispatcher = $dispatcher;
+        $this->db = $db;
+        $this->lockingProvider = $lockingProvider;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+        $this->memoryInfo = $memoryInfo;
+    }
+
+    /**
+     * Checks if the server can connect to the internet using HTTPS and HTTP
+     * @return bool
+     */
+    private function isInternetConnectionWorking() {
+        if ($this->config->getSystemValue('has_internet_connection', true) === false) {
+            return false;
+        }
+
+        $siteArray = ['www.nextcloud.com',
+                        'www.startpage.com',
+                        'www.eff.org',
+                        'www.edri.org',
+            ];
+
+        foreach($siteArray as $site) {
+            if ($this->isSiteReachable($site)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
+     * @return bool
+     */
+    private function isSiteReachable($sitename) {
+        $httpSiteName = 'http://' . $sitename . '/';
+        $httpsSiteName = 'https://' . $sitename . '/';
+
+        try {
+            $client = $this->clientService->newClient();
+            $client->get($httpSiteName);
+            $client->get($httpsSiteName);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'internet_connection_check']);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Checks whether a local memcache is installed or not
+     * @return bool
+     */
+    private function isMemcacheConfigured() {
+        return $this->config->getSystemValue('memcache.local', null) !== null;
+    }
+
+    /**
+     * Whether /dev/urandom is available to the PHP controller
+     *
+     * @return bool
+     */
+    private function isUrandomAvailable() {
+        if(@file_exists('/dev/urandom')) {
+            $file = fopen('/dev/urandom', 'rb');
+            if($file) {
+                fclose($file);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Public for the sake of unit-testing
+     *
+     * @return array
+     */
+    protected function getCurlVersion() {
+        return curl_version();
+    }
+
+    /**
+     * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
+     * have multiple bugs which likely lead to problems in combination with
+     * functionality required by ownCloud such as SNI.
+     *
+     * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
+     * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
+     * @return string
+     */
+    private function isUsedTlsLibOutdated() {
+        // Don't run check when:
+        // 1. Server has `has_internet_connection` set to false
+        // 2. AppStore AND S2S is disabled
+        if(!$this->config->getSystemValue('has_internet_connection', true)) {
+            return '';
+        }
+        if(!$this->config->getSystemValue('appstoreenabled', true)
+            && $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
+            && $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
+            return '';
+        }
+
+        $versionString = $this->getCurlVersion();
+        if(isset($versionString['ssl_version'])) {
+            $versionString = $versionString['ssl_version'];
+        } else {
+            return '';
+        }
+
+        $features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
+        if(!$this->config->getSystemValue('appstoreenabled', true)) {
+            $features = (string)$this->l10n->t('Federated Cloud Sharing');
+        }
+
+        // Check if at least OpenSSL after 1.01d or 1.0.2b
+        if(strpos($versionString, 'OpenSSL/') === 0) {
+            $majorVersion = substr($versionString, 8, 5);
+            $patchRelease = substr($versionString, 13, 6);
+
+            if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
+                ($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
+                return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
+            }
+        }
+
+        // Check if NSS and perform heuristic check
+        if(strpos($versionString, 'NSS/') === 0) {
+            try {
+                $firstClient = $this->clientService->newClient();
+                $firstClient->get('https://nextcloud.com/');
+
+                $secondClient = $this->clientService->newClient();
+                $secondClient->get('https://nextcloud.com/');
+            } catch (ClientException $e) {
+                if($e->getResponse()->getStatusCode() === 400) {
+                    return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
+                }
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Whether the version is outdated
+     *
+     * @return bool
+     */
+    protected function isPhpOutdated() {
+        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Whether the php version is still supported (at time of release)
+     * according to: https://secure.php.net/supported-versions.php
+     *
+     * @return array
+     */
+    private function isPhpSupported() {
+        return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
+    }
+
+    /**
+     * Check if the reverse proxy configuration is working as expected
+     *
+     * @return bool
+     */
+    private function forwardedForHeadersWorking() {
+        $trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
+        $remoteAddress = $this->request->getRemoteAddress();
+
+        if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
+            return false;
+        }
+
+        // either not enabled or working correctly
+        return true;
+    }
+
+    /**
+     * Checks if the correct memcache module for PHP is installed. Only
+     * fails if memcached is configured and the working module is not installed.
+     *
+     * @return bool
+     */
+    private function isCorrectMemcachedPHPModuleInstalled() {
+        if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
+            return true;
+        }
+
+        // there are two different memcached modules for PHP
+        // we only support memcached and not memcache
+        // https://code.google.com/p/memcached/wiki/PHPClientComparison
+        return !(!extension_loaded('memcached') && extension_loaded('memcache'));
+    }
+
+    /**
+     * Checks if set_time_limit is not disabled.
+     *
+     * @return bool
+     */
+    private function isSettimelimitAvailable() {
+        if (function_exists('set_time_limit')
+            && strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return RedirectResponse
+     */
+    public function rescanFailedIntegrityCheck() {
+        $this->checker->runInstanceVerification();
+        return new RedirectResponse(
+            $this->urlGenerator->linkToRoute('settings.AdminSettings.index')
+        );
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @return DataResponse
+     */
+    public function getFailedIntegrityCheckFiles() {
+        if(!$this->checker->isCodeCheckEnforced()) {
+            return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
+        }
+
+        $completeResults = $this->checker->getResults();
+
+        if(!empty($completeResults)) {
+            $formattedTextResponse = 'Technical information
 =====================
 The following list covers which files have failed the integrity check. Please read
 the previous linked documentation to learn more about the errors and how to fix
@@ -357,273 +357,273 @@ 
 Results
 =======
 ';
-			foreach($completeResults as $context => $contextResult) {
-				$formattedTextResponse .= "- $context\n";
-
-				foreach($contextResult as $category => $result) {
-					$formattedTextResponse .= "\t- $category\n";
-					if($category !== 'EXCEPTION') {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $key\n";
-						}
-					} else {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $results\n";
-						}
-					}
-
-				}
-			}
-
-			$formattedTextResponse .= '
+            foreach($completeResults as $context => $contextResult) {
+                $formattedTextResponse .= "- $context\n";
+
+                foreach($contextResult as $category => $result) {
+                    $formattedTextResponse .= "\t- $category\n";
+                    if($category !== 'EXCEPTION') {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $key\n";
+                        }
+                    } else {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $results\n";
+                        }
+                    }
+
+                }
+            }
+
+            $formattedTextResponse .= '
 Raw output
 ==========
 ';
-			$formattedTextResponse .= print_r($completeResults, true);
-		} else {
-			$formattedTextResponse = 'No errors have been found.';
-		}
-
-
-		$response = new DataDisplayResponse(
-			$formattedTextResponse,
-			Http::STATUS_OK,
-			[
-				'Content-Type' => 'text/plain',
-			]
-		);
-
-		return $response;
-	}
-
-	/**
-	 * Checks whether a PHP opcache is properly set up
-	 * @return bool
-	 */
-	protected function isOpcacheProperlySetup() {
-		$iniWrapper = new IniGetWrapper();
-
-		if(!$iniWrapper->getBool('opcache.enable')) {
-			return false;
-		}
-
-		if(!$iniWrapper->getBool('opcache.save_comments')) {
-			return false;
-		}
-
-		if(!$iniWrapper->getBool('opcache.enable_cli')) {
-			return false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
-			return false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
-			return false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if the required FreeType functions are present
-	 * @return bool
-	 */
-	protected function hasFreeTypeSupport() {
-		return function_exists('imagettfbbox') && function_exists('imagettftext');
-	}
-
-	protected function hasMissingIndexes(): array {
-		$indexInfo = new MissingIndexInformation();
-		// Dispatch event so apps can also hint for pending index updates if needed
-		$event = new GenericEvent($indexInfo);
-		$this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
-
-		return $indexInfo->getListOfMissingIndexes();
-	}
-
-	/**
-	 * warn if outdated version of a memcache module is used
-	 */
-	protected function getOutdatedCaches(): array {
-		$caches = [
-			'apcu'	=> ['name' => 'APCu', 'version' => '4.0.6'],
-			'redis'	=> ['name' => 'Redis', 'version' => '2.2.5'],
-		];
-		$outdatedCaches = [];
-		foreach ($caches as $php_module => $data) {
-			$isOutdated = extension_loaded($php_module) && version_compare(phpversion($php_module), $data['version'], '<');
-			if ($isOutdated) {
-				$outdatedCaches[] = $data;
-			}
-		}
-
-		return $outdatedCaches;
-	}
-
-	protected function isSqliteUsed() {
-		return strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false;
-	}
-
-	protected function isReadOnlyConfig(): bool {
-		return \OC_Helper::isReadOnlyConfigEnabled();
-	}
-
-	protected function hasValidTransactionIsolationLevel(): bool {
-		try {
-			if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
-				return true;
-			}
-
-			return $this->db->getTransactionIsolation() === Connection::TRANSACTION_READ_COMMITTED;
-		} catch (DBALException $e) {
-			// ignore
-		}
-
-		return true;
-	}
-
-	protected function hasFileinfoInstalled(): bool {
-		return \OC_Util::fileInfoLoaded();
-	}
-
-	protected function hasWorkingFileLocking(): bool {
-		return !($this->lockingProvider instanceof NoopLockingProvider);
-	}
-
-	protected function getSuggestedOverwriteCliURL(): string {
-		$suggestedOverwriteCliUrl = '';
-		if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
-			$suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
-			if (!$this->config->getSystemValue('config_is_read_only', false)) {
-				// Set the overwrite URL when it was not set yet.
-				$this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
-				$suggestedOverwriteCliUrl = '';
-			}
-		}
-		return $suggestedOverwriteCliUrl;
-	}
-
-	protected function getLastCronInfo(): array {
-		$lastCronRun = $this->config->getAppValue('core', 'lastcron', 0);
-		return [
-			'diffInSeconds' => time() - $lastCronRun,
-			'relativeTime' => $this->dateTimeFormatter->formatTimeSpan($lastCronRun),
-			'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']) . '#backgroundjobs',
-		];
-	}
-
-	protected function getCronErrors() {
-		$errors = json_decode($this->config->getAppValue('core', 'cronErrors', ''), true);
-
-		if (is_array($errors)) {
-			return $errors;
-		}
-
-		return [];
-	}
-
-	protected function isPhpMailerUsed(): bool {
-		return $this->config->getSystemValue('mail_smtpmode', 'php') === 'php';
-	}
-
-	protected function hasOpcacheLoaded(): bool {
-		return function_exists('opcache_get_status');
-	}
-
-	/**
-	 * Iterates through the configured app roots and
-	 * tests if the subdirectories are owned by the same user than the current user.
-	 *
-	 * @return array
-	 */
-	protected function getAppDirsWithDifferentOwner(): array {
-		$currentUser = posix_getpwuid(posix_getuid());
-		$appDirsWithDifferentOwner = [];
-
-		foreach (OC::$APPSROOTS as $appRoot) {
-			if ($appRoot['writable'] === true) {
-				$appDirsWithDifferentOwner = array_merge(
-					$appDirsWithDifferentOwner,
-					$this->getAppDirsWithDifferentOwnerForAppRoot($currentUser, $appRoot)
-				);
-			}
-		}
-
-		sort($appDirsWithDifferentOwner);
-		return $appDirsWithDifferentOwner;
-	}
-
-	/**
-	 * Tests if the directories for one apps directory are writable by the current user.
-	 *
-	 * @param array $currentUser The current user
-	 * @param array $appRoot The app root config
-	 * @return string[] The none writable directory paths inside the app root
-	 */
-	private function getAppDirsWithDifferentOwnerForAppRoot(array $currentUser, array $appRoot): array {
-		$appDirsWithDifferentOwner = [];
-		$appsPath = $appRoot['path'];
-		$appsDir = new DirectoryIterator($appRoot['path']);
-
-		foreach ($appsDir as $fileInfo) {
-			if ($fileInfo->isDir() && !$fileInfo->isDot()) {
-				$absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
-				$appDirUser = posix_getpwuid(fileowner($absAppPath));
-				if ($appDirUser !== $currentUser) {
-					$appDirsWithDifferentOwner[] = $absAppPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
-				}
-			}
-		}
-
-		return $appDirsWithDifferentOwner;
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function check() {
-		return new DataResponse(
-			[
-				'isGetenvServerWorking' => !empty(getenv('PATH')),
-				'isReadOnlyConfig' => $this->isReadOnlyConfig(),
-				'hasValidTransactionIsolationLevel' => $this->hasValidTransactionIsolationLevel(),
-				'outdatedCaches' => $this->getOutdatedCaches(),
-				'hasFileinfoInstalled' => $this->hasFileinfoInstalled(),
-				'hasWorkingFileLocking' => $this->hasWorkingFileLocking(),
-				'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),
-				'cronInfo' => $this->getLastCronInfo(),
-				'cronErrors' => $this->getCronErrors(),
-				'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
-				'isMemcacheConfigured' => $this->isMemcacheConfigured(),
-				'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
-				'isUrandomAvailable' => $this->isUrandomAvailable(),
-				'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
-				'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
-				'phpSupported' => $this->isPhpSupported(),
-				'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
-				'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
-				'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
-				'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
-				'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
-				'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
-				'hasOpcacheLoaded' => $this->hasOpcacheLoaded(),
-				'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
-				'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
-				'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
-				'missingIndexes' => $this->hasMissingIndexes(),
-				'isSqliteUsed' => $this->isSqliteUsed(),
-				'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
-				'isPhpMailerUsed' => $this->isPhpMailerUsed(),
-				'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'),
-				'isMemoryLimitSufficient' => $this->memoryInfo->isMemoryLimitSufficient(),
-				'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(),
-			]
-		);
-	}
+            $formattedTextResponse .= print_r($completeResults, true);
+        } else {
+            $formattedTextResponse = 'No errors have been found.';
+        }
+
+
+        $response = new DataDisplayResponse(
+            $formattedTextResponse,
+            Http::STATUS_OK,
+            [
+                'Content-Type' => 'text/plain',
+            ]
+        );
+
+        return $response;
+    }
+
+    /**
+     * Checks whether a PHP opcache is properly set up
+     * @return bool
+     */
+    protected function isOpcacheProperlySetup() {
+        $iniWrapper = new IniGetWrapper();
+
+        if(!$iniWrapper->getBool('opcache.enable')) {
+            return false;
+        }
+
+        if(!$iniWrapper->getBool('opcache.save_comments')) {
+            return false;
+        }
+
+        if(!$iniWrapper->getBool('opcache.enable_cli')) {
+            return false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
+            return false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
+            return false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if the required FreeType functions are present
+     * @return bool
+     */
+    protected function hasFreeTypeSupport() {
+        return function_exists('imagettfbbox') && function_exists('imagettftext');
+    }
+
+    protected function hasMissingIndexes(): array {
+        $indexInfo = new MissingIndexInformation();
+        // Dispatch event so apps can also hint for pending index updates if needed
+        $event = new GenericEvent($indexInfo);
+        $this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
+
+        return $indexInfo->getListOfMissingIndexes();
+    }
+
+    /**
+     * warn if outdated version of a memcache module is used
+     */
+    protected function getOutdatedCaches(): array {
+        $caches = [
+            'apcu'	=> ['name' => 'APCu', 'version' => '4.0.6'],
+            'redis'	=> ['name' => 'Redis', 'version' => '2.2.5'],
+        ];
+        $outdatedCaches = [];
+        foreach ($caches as $php_module => $data) {
+            $isOutdated = extension_loaded($php_module) && version_compare(phpversion($php_module), $data['version'], '<');
+            if ($isOutdated) {
+                $outdatedCaches[] = $data;
+            }
+        }
+
+        return $outdatedCaches;
+    }
+
+    protected function isSqliteUsed() {
+        return strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false;
+    }
+
+    protected function isReadOnlyConfig(): bool {
+        return \OC_Helper::isReadOnlyConfigEnabled();
+    }
+
+    protected function hasValidTransactionIsolationLevel(): bool {
+        try {
+            if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
+                return true;
+            }
+
+            return $this->db->getTransactionIsolation() === Connection::TRANSACTION_READ_COMMITTED;
+        } catch (DBALException $e) {
+            // ignore
+        }
+
+        return true;
+    }
+
+    protected function hasFileinfoInstalled(): bool {
+        return \OC_Util::fileInfoLoaded();
+    }
+
+    protected function hasWorkingFileLocking(): bool {
+        return !($this->lockingProvider instanceof NoopLockingProvider);
+    }
+
+    protected function getSuggestedOverwriteCliURL(): string {
+        $suggestedOverwriteCliUrl = '';
+        if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
+            $suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
+            if (!$this->config->getSystemValue('config_is_read_only', false)) {
+                // Set the overwrite URL when it was not set yet.
+                $this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
+                $suggestedOverwriteCliUrl = '';
+            }
+        }
+        return $suggestedOverwriteCliUrl;
+    }
+
+    protected function getLastCronInfo(): array {
+        $lastCronRun = $this->config->getAppValue('core', 'lastcron', 0);
+        return [
+            'diffInSeconds' => time() - $lastCronRun,
+            'relativeTime' => $this->dateTimeFormatter->formatTimeSpan($lastCronRun),
+            'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']) . '#backgroundjobs',
+        ];
+    }
+
+    protected function getCronErrors() {
+        $errors = json_decode($this->config->getAppValue('core', 'cronErrors', ''), true);
+
+        if (is_array($errors)) {
+            return $errors;
+        }
+
+        return [];
+    }
+
+    protected function isPhpMailerUsed(): bool {
+        return $this->config->getSystemValue('mail_smtpmode', 'php') === 'php';
+    }
+
+    protected function hasOpcacheLoaded(): bool {
+        return function_exists('opcache_get_status');
+    }
+
+    /**
+     * Iterates through the configured app roots and
+     * tests if the subdirectories are owned by the same user than the current user.
+     *
+     * @return array
+     */
+    protected function getAppDirsWithDifferentOwner(): array {
+        $currentUser = posix_getpwuid(posix_getuid());
+        $appDirsWithDifferentOwner = [];
+
+        foreach (OC::$APPSROOTS as $appRoot) {
+            if ($appRoot['writable'] === true) {
+                $appDirsWithDifferentOwner = array_merge(
+                    $appDirsWithDifferentOwner,
+                    $this->getAppDirsWithDifferentOwnerForAppRoot($currentUser, $appRoot)
+                );
+            }
+        }
+
+        sort($appDirsWithDifferentOwner);
+        return $appDirsWithDifferentOwner;
+    }
+
+    /**
+     * Tests if the directories for one apps directory are writable by the current user.
+     *
+     * @param array $currentUser The current user
+     * @param array $appRoot The app root config
+     * @return string[] The none writable directory paths inside the app root
+     */
+    private function getAppDirsWithDifferentOwnerForAppRoot(array $currentUser, array $appRoot): array {
+        $appDirsWithDifferentOwner = [];
+        $appsPath = $appRoot['path'];
+        $appsDir = new DirectoryIterator($appRoot['path']);
+
+        foreach ($appsDir as $fileInfo) {
+            if ($fileInfo->isDir() && !$fileInfo->isDot()) {
+                $absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
+                $appDirUser = posix_getpwuid(fileowner($absAppPath));
+                if ($appDirUser !== $currentUser) {
+                    $appDirsWithDifferentOwner[] = $absAppPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
+                }
+            }
+        }
+
+        return $appDirsWithDifferentOwner;
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function check() {
+        return new DataResponse(
+            [
+                'isGetenvServerWorking' => !empty(getenv('PATH')),
+                'isReadOnlyConfig' => $this->isReadOnlyConfig(),
+                'hasValidTransactionIsolationLevel' => $this->hasValidTransactionIsolationLevel(),
+                'outdatedCaches' => $this->getOutdatedCaches(),
+                'hasFileinfoInstalled' => $this->hasFileinfoInstalled(),
+                'hasWorkingFileLocking' => $this->hasWorkingFileLocking(),
+                'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),
+                'cronInfo' => $this->getLastCronInfo(),
+                'cronErrors' => $this->getCronErrors(),
+                'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
+                'isMemcacheConfigured' => $this->isMemcacheConfigured(),
+                'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
+                'isUrandomAvailable' => $this->isUrandomAvailable(),
+                'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
+                'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
+                'phpSupported' => $this->isPhpSupported(),
+                'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
+                'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+                'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
+                'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
+                'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
+                'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
+                'hasOpcacheLoaded' => $this->hasOpcacheLoaded(),
+                'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
+                'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
+                'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
+                'missingIndexes' => $this->hasMissingIndexes(),
+                'isSqliteUsed' => $this->isSqliteUsed(),
+                'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
+                'isPhpMailerUsed' => $this->isPhpMailerUsed(),
+                'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'),
+                'isMemoryLimitSufficient' => $this->memoryInfo->isMemoryLimitSufficient(),
+                'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(),
+            ]
+        );
+    }
 }

console.php

Indentation +49 added lines, -49 removed lines

@@ -38,64 +38,64 @@
 define('OC_CONSOLE', 1);
 
 function exceptionHandler($exception) {
-	echo "An unhandled exception has been thrown:" . PHP_EOL;
-	echo $exception;
-	exit(1);
+    echo "An unhandled exception has been thrown:" . PHP_EOL;
+    echo $exception;
+    exit(1);
 }
 try {
-	require_once __DIR__ . '/lib/base.php';
+    require_once __DIR__ . '/lib/base.php';
 
-	// set to run indefinitely if needed
-	if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-		@set_time_limit(0);
-	}
+    // set to run indefinitely if needed
+    if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+        @set_time_limit(0);
+    }
 
-	if (!OC::$CLI) {
-		echo "This script can be run from the command line only" . PHP_EOL;
-		exit(1);
-	}
+    if (!OC::$CLI) {
+        echo "This script can be run from the command line only" . PHP_EOL;
+        exit(1);
+    }
 
-	set_exception_handler('exceptionHandler');
+    set_exception_handler('exceptionHandler');
 
-	if (!function_exists('posix_getuid')) {
-		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
-		exit(1);
-	}
-	$user = posix_getpwuid(posix_getuid());
-	$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
-	if ($user['name'] !== $configUser['name']) {
-		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-		echo "Current user: " . $user['name'] . PHP_EOL;
-		echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
-		echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
-		exit(1);
-	}
+    if (!function_exists('posix_getuid')) {
+        echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+        exit(1);
+    }
+    $user = posix_getpwuid(posix_getuid());
+    $configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+    if ($user['name'] !== $configUser['name']) {
+        echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
+        echo "Current user: " . $user['name'] . PHP_EOL;
+        echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
+        echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
+        exit(1);
+    }
 
-	$oldWorkingDir = getcwd();
-	if ($oldWorkingDir === false) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
-	} else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't change to Nextcloud root directory." . PHP_EOL;
-		exit(1);
-	}
+    $oldWorkingDir = getcwd();
+    if ($oldWorkingDir === false) {
+        echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
+        echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
+    } else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
+        echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
+        echo "Can't change to Nextcloud root directory." . PHP_EOL;
+        exit(1);
+    }
 
-	if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
-		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
-	}
+    if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
+        echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
+    }
 
-	$application = new Application(
-		\OC::$server->getConfig(),
-		\OC::$server->getEventDispatcher(),
-		\OC::$server->getRequest(),
-		\OC::$server->getLogger(),
-		\OC::$server->query(\OC\MemoryInfo::class)
-	);
-	$application->loadCommands(new ArgvInput(), new ConsoleOutput());
-	$application->run();
+    $application = new Application(
+        \OC::$server->getConfig(),
+        \OC::$server->getEventDispatcher(),
+        \OC::$server->getRequest(),
+        \OC::$server->getLogger(),
+        \OC::$server->query(\OC\MemoryInfo::class)
+    );
+    $application->loadCommands(new ArgvInput(), new ConsoleOutput());
+    $application->run();
 } catch (Exception $ex) {
-	exceptionHandler($ex);
+    exceptionHandler($ex);
 } catch (Error $ex) {
-	exceptionHandler($ex);
+    exceptionHandler($ex);
 }

Spacing +15 added lines, -15 removed lines

@@ -29,7 +29,7 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OC\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -38,12 +38,12 @@ 
 define('OC_CONSOLE', 1);
 
 function exceptionHandler($exception) {
-	echo "An unhandled exception has been thrown:" . PHP_EOL;
+	echo "An unhandled exception has been thrown:".PHP_EOL;
 	echo $exception;
 	exit(1);
 }
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	// set to run indefinitely if needed
 	if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
@@ -51,38 +51,38 @@ 
 	}
 
 	if (!OC::$CLI) {
-		echo "This script can be run from the command line only" . PHP_EOL;
+		echo "This script can be run from the command line only".PHP_EOL;
 		exit(1);
 	}
 
 	set_exception_handler('exceptionHandler');
 
 	if (!function_exists('posix_getuid')) {
-		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php".PHP_EOL;
 		exit(1);
 	}
 	$user = posix_getpwuid(posix_getuid());
-	$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+	$configUser = posix_getpwuid(fileowner(OC::$configDir.'config.php'));
 	if ($user['name'] !== $configUser['name']) {
-		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-		echo "Current user: " . $user['name'] . PHP_EOL;
-		echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
-		echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
+		echo "Console has to be executed with the user that owns the file config/config.php".PHP_EOL;
+		echo "Current user: ".$user['name'].PHP_EOL;
+		echo "Owner of config.php: ".$configUser['name'].PHP_EOL;
+		echo "Try adding 'sudo -u ".$configUser['name']." ' to the beginning of the command (without the single quotes)".PHP_EOL;
 		exit(1);
 	}
 
 	$oldWorkingDir = getcwd();
 	if ($oldWorkingDir === false) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only.".PHP_EOL;
+		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact.".PHP_EOL;
 	} else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't change to Nextcloud root directory." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only.".PHP_EOL;
+		echo "Can't change to Nextcloud root directory.".PHP_EOL;
 		exit(1);
 	}
 
 	if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
-		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
+		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php".PHP_EOL;
 	}
 
 	$application = new Application(

lib/private/Console/Application.php

Indentation +173 added lines, -173 removed lines

@@ -45,187 +45,187 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class Application {
-	/** @var IConfig */
-	private $config;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var IRequest */
-	private $request;
-	/** @var ILogger  */
-	private $logger;
-	/** @var MemoryInfo */
-	private $memoryInfo;
+    /** @var IConfig */
+    private $config;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var IRequest */
+    private $request;
+    /** @var ILogger  */
+    private $logger;
+    /** @var MemoryInfo */
+    private $memoryInfo;
 
-	/**
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param IRequest $request
-	 * @param ILogger $logger
-	 * @param MemoryInfo $memoryInfo
-	 */
-	public function __construct(IConfig $config,
-								EventDispatcherInterface $dispatcher,
-								IRequest $request,
-								ILogger $logger,
-								MemoryInfo $memoryInfo) {
-		$defaults = \OC::$server->getThemingDefaults();
-		$this->config = $config;
-		$this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
-		$this->dispatcher = $dispatcher;
-		$this->request = $request;
-		$this->logger = $logger;
-		$this->memoryInfo = $memoryInfo;
-	}
+    /**
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     * @param IRequest $request
+     * @param ILogger $logger
+     * @param MemoryInfo $memoryInfo
+     */
+    public function __construct(IConfig $config,
+                                EventDispatcherInterface $dispatcher,
+                                IRequest $request,
+                                ILogger $logger,
+                                MemoryInfo $memoryInfo) {
+        $defaults = \OC::$server->getThemingDefaults();
+        $this->config = $config;
+        $this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
+        $this->dispatcher = $dispatcher;
+        $this->request = $request;
+        $this->logger = $logger;
+        $this->memoryInfo = $memoryInfo;
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param ConsoleOutputInterface $output
-	 * @throws \Exception
-	 */
-	public function loadCommands(
-		InputInterface $input,
-		ConsoleOutputInterface $output
-	) {
-		// $application is required to be defined in the register_command scripts
-		$application = $this->application;
-		$inputDefinition = $application->getDefinition();
-		$inputDefinition->addOption(
-			new InputOption(
-				'no-warnings', 
-				null, 
-				InputOption::VALUE_NONE, 
-				'Skip global warnings, show command output only', 
-				null
-			)
-		);
-		try {
-			$input->bind($inputDefinition);
-		} catch (\RuntimeException $e) {
-			//expected if there are extra options
-		}
-		if ($input->getOption('no-warnings')) {
-			$output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
-		}
+    /**
+     * @param InputInterface $input
+     * @param ConsoleOutputInterface $output
+     * @throws \Exception
+     */
+    public function loadCommands(
+        InputInterface $input,
+        ConsoleOutputInterface $output
+    ) {
+        // $application is required to be defined in the register_command scripts
+        $application = $this->application;
+        $inputDefinition = $application->getDefinition();
+        $inputDefinition->addOption(
+            new InputOption(
+                'no-warnings', 
+                null, 
+                InputOption::VALUE_NONE, 
+                'Skip global warnings, show command output only', 
+                null
+            )
+        );
+        try {
+            $input->bind($inputDefinition);
+        } catch (\RuntimeException $e) {
+            //expected if there are extra options
+        }
+        if ($input->getOption('no-warnings')) {
+            $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
+        }
 
-		if ($this->memoryInfo->isMemoryLimitSufficient() === false) {
-			$output->getErrorOutput()->writeln(
-				'<comment>The current PHP memory limit ' .
-				'is below the recommended value of 512MB.</comment>'
-			);
-		}
+        if ($this->memoryInfo->isMemoryLimitSufficient() === false) {
+            $output->getErrorOutput()->writeln(
+                '<comment>The current PHP memory limit ' .
+                'is below the recommended value of 512MB.</comment>'
+            );
+        }
 
-		try {
-			require_once __DIR__ . '/../../../core/register_command.php';
-			if ($this->config->getSystemValue('installed', false)) {
-				if (\OCP\Util::needUpgrade()) {
-					throw new NeedsUpdateException();
-				} elseif ($this->config->getSystemValue('maintenance', false)) {
-					$this->writeMaintenanceModeInfo($input, $output);
-				} else {
-					OC_App::loadApps();
-					foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
-						$appPath = \OC_App::getAppPath($app);
-						if ($appPath === false) {
-							continue;
-						}
-						// load commands using info.xml
-						$info = \OC_App::getAppInfo($app);
-						if (isset($info['commands'])) {
-							$this->loadCommandsFromInfoXml($info['commands']);
-						}
-						// load from register_command.php
-						\OC_App::registerAutoloading($app, $appPath);
-						$file = $appPath . '/appinfo/register_command.php';
-						if (file_exists($file)) {
-							try {
-								require $file;
-							} catch (\Exception $e) {
-								$this->logger->logException($e);
-							}
-						}
-					}
-				}
-			} else if ($input->getArgument('command') !== '_completion' && $input->getArgument('command') !== 'maintenance:install') {
-				$output->writeln("Nextcloud is not installed - only a limited number of commands are available");
-			}
-		} catch(NeedsUpdateException $e) {
-			if ($input->getArgument('command') !== '_completion') {
-				$output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
-				$output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
-			}
-		}
+        try {
+            require_once __DIR__ . '/../../../core/register_command.php';
+            if ($this->config->getSystemValue('installed', false)) {
+                if (\OCP\Util::needUpgrade()) {
+                    throw new NeedsUpdateException();
+                } elseif ($this->config->getSystemValue('maintenance', false)) {
+                    $this->writeMaintenanceModeInfo($input, $output);
+                } else {
+                    OC_App::loadApps();
+                    foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
+                        $appPath = \OC_App::getAppPath($app);
+                        if ($appPath === false) {
+                            continue;
+                        }
+                        // load commands using info.xml
+                        $info = \OC_App::getAppInfo($app);
+                        if (isset($info['commands'])) {
+                            $this->loadCommandsFromInfoXml($info['commands']);
+                        }
+                        // load from register_command.php
+                        \OC_App::registerAutoloading($app, $appPath);
+                        $file = $appPath . '/appinfo/register_command.php';
+                        if (file_exists($file)) {
+                            try {
+                                require $file;
+                            } catch (\Exception $e) {
+                                $this->logger->logException($e);
+                            }
+                        }
+                    }
+                }
+            } else if ($input->getArgument('command') !== '_completion' && $input->getArgument('command') !== 'maintenance:install') {
+                $output->writeln("Nextcloud is not installed - only a limited number of commands are available");
+            }
+        } catch(NeedsUpdateException $e) {
+            if ($input->getArgument('command') !== '_completion') {
+                $output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
+                $output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
+            }
+        }
 
-		if ($input->getFirstArgument() !== 'check') {
-			$errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
-			if (!empty($errors)) {
-				foreach ($errors as $error) {
-					$output->writeln((string)$error['error']);
-					$output->writeln((string)$error['hint']);
-					$output->writeln('');
-				}
-				throw new \Exception("Environment not properly prepared.");
-			}
-		}
-	}
+        if ($input->getFirstArgument() !== 'check') {
+            $errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
+            if (!empty($errors)) {
+                foreach ($errors as $error) {
+                    $output->writeln((string)$error['error']);
+                    $output->writeln((string)$error['hint']);
+                    $output->writeln('');
+                }
+                throw new \Exception("Environment not properly prepared.");
+            }
+        }
+    }
 
-	/**
-	 * Write a maintenance mode info.
-	 * The commands "_completion" and "maintenance:mode" are excluded.
-	 *
-	 * @param InputInterface $input The input implementation for reading inputs.
-	 * @param ConsoleOutputInterface $output The output implementation
-	 * for writing outputs.
-	 * @return void
-	 */
-	private function writeMaintenanceModeInfo(
-		InputInterface $input, ConsoleOutputInterface $output
-	) {
-		if ($input->getArgument('command') !== '_completion'
-			&& $input->getArgument('command') !== 'maintenance:mode') {
-			$errOutput = $output->getErrorOutput();
-			$errOutput->writeln(
-				'<comment>Nextcloud is in maintenance mode - ' .
-				'no apps have been loaded</comment>' . PHP_EOL
-			);
-		}
-	}
+    /**
+     * Write a maintenance mode info.
+     * The commands "_completion" and "maintenance:mode" are excluded.
+     *
+     * @param InputInterface $input The input implementation for reading inputs.
+     * @param ConsoleOutputInterface $output The output implementation
+     * for writing outputs.
+     * @return void
+     */
+    private function writeMaintenanceModeInfo(
+        InputInterface $input, ConsoleOutputInterface $output
+    ) {
+        if ($input->getArgument('command') !== '_completion'
+            && $input->getArgument('command') !== 'maintenance:mode') {
+            $errOutput = $output->getErrorOutput();
+            $errOutput->writeln(
+                '<comment>Nextcloud is in maintenance mode - ' .
+                'no apps have been loaded</comment>' . PHP_EOL
+            );
+        }
+    }
 
-	/**
-	 * Sets whether to automatically exit after a command execution or not.
-	 *
-	 * @param bool $boolean Whether to automatically exit after a command execution or not
-	 */
-	public function setAutoExit($boolean) {
-		$this->application->setAutoExit($boolean);
-	}
+    /**
+     * Sets whether to automatically exit after a command execution or not.
+     *
+     * @param bool $boolean Whether to automatically exit after a command execution or not
+     */
+    public function setAutoExit($boolean) {
+        $this->application->setAutoExit($boolean);
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function run(InputInterface $input = null, OutputInterface $output = null) {
-		$this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
-			ConsoleEvent::EVENT_RUN,
-			$this->request->server['argv']
-		));
-		return $this->application->run($input, $output);
-	}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws \Exception
+     */
+    public function run(InputInterface $input = null, OutputInterface $output = null) {
+        $this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
+            ConsoleEvent::EVENT_RUN,
+            $this->request->server['argv']
+        ));
+        return $this->application->run($input, $output);
+    }
 
-	private function loadCommandsFromInfoXml($commands) {
-		foreach ($commands as $command) {
-			try {
-				$c = \OC::$server->query($command);
-			} catch (QueryException $e) {
-				if (class_exists($command)) {
-					$c = new $command();
-				} else {
-					throw new \Exception("Console command '$command' is unknown and could not be loaded");
-				}
-			}
+    private function loadCommandsFromInfoXml($commands) {
+        foreach ($commands as $command) {
+            try {
+                $c = \OC::$server->query($command);
+            } catch (QueryException $e) {
+                if (class_exists($command)) {
+                    $c = new $command();
+                } else {
+                    throw new \Exception("Console command '$command' is unknown and could not be loaded");
+                }
+            }
 
-			$this->application->add($c);
-		}
-	}
+            $this->application->add($c);
+        }
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -109,13 +109,13 @@ 
 
 		if ($this->memoryInfo->isMemoryLimitSufficient() === false) {
 			$output->getErrorOutput()->writeln(
-				'<comment>The current PHP memory limit ' .
+				'<comment>The current PHP memory limit '.
 				'is below the recommended value of 512MB.</comment>'
 			);
 		}
 
 		try {
-			require_once __DIR__ . '/../../../core/register_command.php';
+			require_once __DIR__.'/../../../core/register_command.php';
 			if ($this->config->getSystemValue('installed', false)) {
 				if (\OCP\Util::needUpgrade()) {
 					throw new NeedsUpdateException();
@@ -135,7 +135,7 @@ 
 						}
 						// load from register_command.php
 						\OC_App::registerAutoloading($app, $appPath);
-						$file = $appPath . '/appinfo/register_command.php';
+						$file = $appPath.'/appinfo/register_command.php';
 						if (file_exists($file)) {
 							try {
 								require $file;
@@ -148,7 +148,7 @@ 
 			} else if ($input->getArgument('command') !== '_completion' && $input->getArgument('command') !== 'maintenance:install') {
 				$output->writeln("Nextcloud is not installed - only a limited number of commands are available");
 			}
-		} catch(NeedsUpdateException $e) {
+		} catch (NeedsUpdateException $e) {
 			if ($input->getArgument('command') !== '_completion') {
 				$output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
 				$output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
@@ -159,8 +159,8 @@ 
 			$errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
 			if (!empty($errors)) {
 				foreach ($errors as $error) {
-					$output->writeln((string)$error['error']);
-					$output->writeln((string)$error['hint']);
+					$output->writeln((string) $error['error']);
+					$output->writeln((string) $error['hint']);
 					$output->writeln('');
 				}
 				throw new \Exception("Environment not properly prepared.");
@@ -184,8 +184,8 @@ 
 			&& $input->getArgument('command') !== 'maintenance:mode') {
 			$errOutput = $output->getErrorOutput();
 			$errOutput->writeln(
-				'<comment>Nextcloud is in maintenance mode - ' .
-				'no apps have been loaded</comment>' . PHP_EOL
+				'<comment>Nextcloud is in maintenance mode - '.
+				'no apps have been loaded</comment>'.PHP_EOL
 			);
 		}
 	}

lib/private/MemoryInfo.php

Indentation +45 added lines, -45 removed lines

@@ -28,54 +28,54 @@
  */
 class MemoryInfo {
 
-	const RECOMMENDED_MEMORY_LIMIT = 512 * 1024 * 1024;
+    const RECOMMENDED_MEMORY_LIMIT = 512 * 1024 * 1024;
 
-	/**
-	 * Tests if the memory limit is greater or equal the recommended value.
-	 *
-	 * @return bool
-	 */
-	public function isMemoryLimitSufficient(): bool {
-		$memoryLimit = $this->getMemoryLimit();
-		return $memoryLimit === -1 || $memoryLimit >= self::RECOMMENDED_MEMORY_LIMIT;
-	}
+    /**
+     * Tests if the memory limit is greater or equal the recommended value.
+     *
+     * @return bool
+     */
+    public function isMemoryLimitSufficient(): bool {
+        $memoryLimit = $this->getMemoryLimit();
+        return $memoryLimit === -1 || $memoryLimit >= self::RECOMMENDED_MEMORY_LIMIT;
+    }
 
-	/**
-	 * Returns the php memory limit.
-	 *
-	 * @return int The memory limit in bytes.
-	 */
-	public function getMemoryLimit(): int {
-		$iniValue = trim(ini_get('memory_limit'));
-		if ($iniValue === '-1') {
-			return -1;
-		} else if (is_numeric($iniValue) === true) {
-			return (int)$iniValue;
-		} else {
-			return $this->memoryLimitToBytes($iniValue);
-		}
-	}
+    /**
+     * Returns the php memory limit.
+     *
+     * @return int The memory limit in bytes.
+     */
+    public function getMemoryLimit(): int {
+        $iniValue = trim(ini_get('memory_limit'));
+        if ($iniValue === '-1') {
+            return -1;
+        } else if (is_numeric($iniValue) === true) {
+            return (int)$iniValue;
+        } else {
+            return $this->memoryLimitToBytes($iniValue);
+        }
+    }
 
-	/**
-	 * Converts the ini memory limit to bytes.
-	 *
-	 * @param string $memoryLimit The "memory_limit" ini value
-	 * @return int
-	 */
-	private function memoryLimitToBytes(string $memoryLimit): int {
-		$last = strtolower(substr($memoryLimit, -1));
-		$memoryLimit = (int)substr($memoryLimit, 0, -1);
+    /**
+     * Converts the ini memory limit to bytes.
+     *
+     * @param string $memoryLimit The "memory_limit" ini value
+     * @return int
+     */
+    private function memoryLimitToBytes(string $memoryLimit): int {
+        $last = strtolower(substr($memoryLimit, -1));
+        $memoryLimit = (int)substr($memoryLimit, 0, -1);
 
-		// intended fall trough
-		switch($last) {
-			case 'g':
-				$memoryLimit *= 1024;
-			case 'm':
-				$memoryLimit *= 1024;
-			case 'k':
-				$memoryLimit *= 1024;
-		}
+        // intended fall trough
+        switch($last) {
+            case 'g':
+                $memoryLimit *= 1024;
+            case 'm':
+                $memoryLimit *= 1024;
+            case 'k':
+                $memoryLimit *= 1024;
+        }
 
-		return $memoryLimit;
-	}
+        return $memoryLimit;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 		if ($iniValue === '-1') {
 			return -1;
 		} else if (is_numeric($iniValue) === true) {
-			return (int)$iniValue;
+			return (int) $iniValue;
 		} else {
 			return $this->memoryLimitToBytes($iniValue);
 		}
@@ -64,10 +64,10 @@ 
 	 */
 	private function memoryLimitToBytes(string $memoryLimit): int {
 		$last = strtolower(substr($memoryLimit, -1));
-		$memoryLimit = (int)substr($memoryLimit, 0, -1);
+		$memoryLimit = (int) substr($memoryLimit, 0, -1);
 
 		// intended fall trough
-		switch($last) {
+		switch ($last) {
 			case 'g':
 				$memoryLimit *= 1024;
 			case 'm':