Inspection of "Merge pull request #21199 from nextcloud/bugfix/no..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 7ef10b...59c1ff )

by Joas

created 2020-06-04 08:59 UTC

Status

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -245,7 +245,7 @@  discard block
 block discarded – undo
 	 * @return string display name
 	 */
 	public function getDisplayName($uid): string {
-		$uid = (string)$uid;
+		$uid = (string) $uid;
 		$this->loadUser($uid);
 		return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname'];
 	}
@@ -273,9 +273,9 @@  discard block
 block discarded – undo
 				$query->expr()->eq('configkey', $query->expr()->literal('email')))
 			)
 			// sqlite doesn't like re-using a single named parameter here
-			->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
-			->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
-			->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
+			->where($query->expr()->iLike('uid', $query->createPositionalParameter('%'.$this->dbConn->escapeLikeParameter($search).'%')))
+			->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%'.$this->dbConn->escapeLikeParameter($search).'%')))
+			->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%'.$this->dbConn->escapeLikeParameter($search).'%')))
 			->orderBy($query->func()->lower('displayname'), 'ASC')
 			->orderBy('uid_lower', 'ASC')
 			->setMaxResults($limit)
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
 		$result = $query->execute();
 		$displayNames = [];
 		while ($row = $result->fetch()) {
-			$displayNames[(string)$row['uid']] = (string)$row['displayname'];
+			$displayNames[(string) $row['uid']] = (string) $row['displayname'];
 		}
 
 		return $displayNames;
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
 				if (!empty($newHash)) {
 					$this->updatePassword($uid, $newHash);
 				}
-				return (string)$row['uid'];
+				return (string) $row['uid'];
 			}
 
 		}
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
 	private function loadUser($uid) {
 		$this->fixDI();
 
-		$uid = (string)$uid;
+		$uid = (string) $uid;
 		if (!isset($this->cache[$uid])) {
 			//guests $uid could be NULL or ''
 			if ($uid === '') {
@@ -363,8 +363,8 @@  discard block
 block discarded – undo
 
 			// "uid" is primary key, so there can only be a single result
 			if ($row !== false) {
-				$this->cache[$uid]['uid'] = (string)$row['uid'];
-				$this->cache[$uid]['displayname'] = (string)$row['displayname'];
+				$this->cache[$uid]['uid'] = (string) $row['uid'];
+				$this->cache[$uid]['displayname'] = (string) $row['displayname'];
 			} else {
 				return false;
 			}
@@ -385,8 +385,8 @@  discard block
 block discarded – undo
 		$limit = $this->fixLimit($limit);
 
 		$users = $this->getDisplayNames($search, $limit, $offset);
-		$userIds = array_map(function ($uid) {
-			return (string)$uid;
+		$userIds = array_map(function($uid) {
+			return (string) $uid;
 		}, array_keys($users));
 		sort($userIds, SORT_STRING | SORT_FLAG_CASE);
 		return $userIds;
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
 	 */
 	public function getHome(string $uid) {
 		if ($this->userExists($uid)) {
-			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
+			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/'.$uid;
 		}
 
 		return false;
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
 
 	public function getRealUID(string $uid): string {
 		if (!$this->userExists($uid)) {
-			throw new \RuntimeException($uid . ' does not exist');
+			throw new \RuntimeException($uid.' does not exist');
 		}
 
 		return $this->cache[$uid]['uid'];

Please login to merge, or discard this patch.

lib/private/Collaboration/Collaborators/RemoteGroupPlugin.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -59,7 +59,7 @@
 block discarded – undo
 		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
 			list($remoteGroup, $serverUrl) = $this->splitGroupRemote($search);
 			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
+				'label' => $remoteGroup." ($serverUrl)",
 				'guid' => $remoteGroup,
 				'name' => $remoteGroup,
 				'value' => [

Please login to merge, or discard this patch.

lib/private/ServerContainer.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -98,7 +98,7 @@
 block discarded – undo
 
 		if (isset($this->namespaces[$namespace])) {
 			if (!isset($this->hasNoAppContainer[$namespace])) {
-				$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
+				$applicationClassName = 'OCA\\'.$sensitiveNamespace.'\\AppInfo\\Application';
 				if (class_exists($applicationClassName)) {
 					$app = new $applicationClassName();
 					if (isset($this->appContainers[$namespace])) {

Please login to merge, or discard this patch.

apps/files_sharing/lib/Command/ExiprationNotification.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -65,7 +65,7 @@
 block discarded – undo
 		//Current time
 		$minTime = $this->time->getDateTime();
 		$minTime->add(new \DateInterval('P1D'));
-		$minTime->setTime(0,0,0);
+		$minTime->setTime(0, 0, 0);
 
 		$maxTime = clone $minTime;
 		$maxTime->setTime(23, 59, 59);

Please login to merge, or discard this patch.

apps/files_versions/composer/composer/autoload_static.php 1 patch

Spacing +34 added lines, -34 removed lines patch added patch discarded remove patch

@@ -6,53 +6,53 @@
 block discarded – undo
 
 class ComposerStaticInitFiles_Versions
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Files_Versions\\' => 19,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files_Versions\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Files_Versions\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files_Versions\\BackgroundJob\\ExpireVersions' => __DIR__ . '/..' . '/../lib/BackgroundJob/ExpireVersions.php',
-        'OCA\\Files_Versions\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files_Versions\\Command\\CleanUp' => __DIR__ . '/..' . '/../lib/Command/CleanUp.php',
-        'OCA\\Files_Versions\\Command\\Expire' => __DIR__ . '/..' . '/../lib/Command/Expire.php',
-        'OCA\\Files_Versions\\Command\\ExpireVersions' => __DIR__ . '/..' . '/../lib/Command/ExpireVersions.php',
-        'OCA\\Files_Versions\\Controller\\PreviewController' => __DIR__ . '/..' . '/../lib/Controller/PreviewController.php',
-        'OCA\\Files_Versions\\Events\\CreateVersionEvent' => __DIR__ . '/..' . '/../lib/Events/CreateVersionEvent.php',
-        'OCA\\Files_Versions\\Expiration' => __DIR__ . '/..' . '/../lib/Expiration.php',
-        'OCA\\Files_Versions\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
-        'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalListener.php',
-        'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarListener.php',
-        'OCA\\Files_Versions\\Sabre\\Plugin' => __DIR__ . '/..' . '/../lib/Sabre/Plugin.php',
-        'OCA\\Files_Versions\\Sabre\\RestoreFolder' => __DIR__ . '/..' . '/../lib/Sabre/RestoreFolder.php',
-        'OCA\\Files_Versions\\Sabre\\RootCollection' => __DIR__ . '/..' . '/../lib/Sabre/RootCollection.php',
-        'OCA\\Files_Versions\\Sabre\\VersionCollection' => __DIR__ . '/..' . '/../lib/Sabre/VersionCollection.php',
-        'OCA\\Files_Versions\\Sabre\\VersionFile' => __DIR__ . '/..' . '/../lib/Sabre/VersionFile.php',
-        'OCA\\Files_Versions\\Sabre\\VersionHome' => __DIR__ . '/..' . '/../lib/Sabre/VersionHome.php',
-        'OCA\\Files_Versions\\Sabre\\VersionRoot' => __DIR__ . '/..' . '/../lib/Sabre/VersionRoot.php',
-        'OCA\\Files_Versions\\Storage' => __DIR__ . '/..' . '/../lib/Storage.php',
-        'OCA\\Files_Versions\\Versions\\BackendNotFoundException' => __DIR__ . '/..' . '/../lib/Versions/BackendNotFoundException.php',
-        'OCA\\Files_Versions\\Versions\\IVersion' => __DIR__ . '/..' . '/../lib/Versions/IVersion.php',
-        'OCA\\Files_Versions\\Versions\\IVersionBackend' => __DIR__ . '/..' . '/../lib/Versions/IVersionBackend.php',
-        'OCA\\Files_Versions\\Versions\\IVersionManager' => __DIR__ . '/..' . '/../lib/Versions/IVersionManager.php',
-        'OCA\\Files_Versions\\Versions\\LegacyVersionsBackend' => __DIR__ . '/..' . '/../lib/Versions/LegacyVersionsBackend.php',
-        'OCA\\Files_Versions\\Versions\\Version' => __DIR__ . '/..' . '/../lib/Versions/Version.php',
-        'OCA\\Files_Versions\\Versions\\VersionManager' => __DIR__ . '/..' . '/../lib/Versions/VersionManager.php',
+    public static $classMap = array(
+        'OCA\\Files_Versions\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files_Versions\\BackgroundJob\\ExpireVersions' => __DIR__.'/..'.'/../lib/BackgroundJob/ExpireVersions.php',
+        'OCA\\Files_Versions\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files_Versions\\Command\\CleanUp' => __DIR__.'/..'.'/../lib/Command/CleanUp.php',
+        'OCA\\Files_Versions\\Command\\Expire' => __DIR__.'/..'.'/../lib/Command/Expire.php',
+        'OCA\\Files_Versions\\Command\\ExpireVersions' => __DIR__.'/..'.'/../lib/Command/ExpireVersions.php',
+        'OCA\\Files_Versions\\Controller\\PreviewController' => __DIR__.'/..'.'/../lib/Controller/PreviewController.php',
+        'OCA\\Files_Versions\\Events\\CreateVersionEvent' => __DIR__.'/..'.'/../lib/Events/CreateVersionEvent.php',
+        'OCA\\Files_Versions\\Expiration' => __DIR__.'/..'.'/../lib/Expiration.php',
+        'OCA\\Files_Versions\\Hooks' => __DIR__.'/..'.'/../lib/Hooks.php',
+        'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => __DIR__.'/..'.'/../lib/Listener/LoadAdditionalListener.php',
+        'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => __DIR__.'/..'.'/../lib/Listener/LoadSidebarListener.php',
+        'OCA\\Files_Versions\\Sabre\\Plugin' => __DIR__.'/..'.'/../lib/Sabre/Plugin.php',
+        'OCA\\Files_Versions\\Sabre\\RestoreFolder' => __DIR__.'/..'.'/../lib/Sabre/RestoreFolder.php',
+        'OCA\\Files_Versions\\Sabre\\RootCollection' => __DIR__.'/..'.'/../lib/Sabre/RootCollection.php',
+        'OCA\\Files_Versions\\Sabre\\VersionCollection' => __DIR__.'/..'.'/../lib/Sabre/VersionCollection.php',
+        'OCA\\Files_Versions\\Sabre\\VersionFile' => __DIR__.'/..'.'/../lib/Sabre/VersionFile.php',
+        'OCA\\Files_Versions\\Sabre\\VersionHome' => __DIR__.'/..'.'/../lib/Sabre/VersionHome.php',
+        'OCA\\Files_Versions\\Sabre\\VersionRoot' => __DIR__.'/..'.'/../lib/Sabre/VersionRoot.php',
+        'OCA\\Files_Versions\\Storage' => __DIR__.'/..'.'/../lib/Storage.php',
+        'OCA\\Files_Versions\\Versions\\BackendNotFoundException' => __DIR__.'/..'.'/../lib/Versions/BackendNotFoundException.php',
+        'OCA\\Files_Versions\\Versions\\IVersion' => __DIR__.'/..'.'/../lib/Versions/IVersion.php',
+        'OCA\\Files_Versions\\Versions\\IVersionBackend' => __DIR__.'/..'.'/../lib/Versions/IVersionBackend.php',
+        'OCA\\Files_Versions\\Versions\\IVersionManager' => __DIR__.'/..'.'/../lib/Versions/IVersionManager.php',
+        'OCA\\Files_Versions\\Versions\\LegacyVersionsBackend' => __DIR__.'/..'.'/../lib/Versions/LegacyVersionsBackend.php',
+        'OCA\\Files_Versions\\Versions\\Version' => __DIR__.'/..'.'/../lib/Versions/Version.php',
+        'OCA\\Files_Versions\\Versions\\VersionManager' => __DIR__.'/..'.'/../lib/Versions/VersionManager.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles_Versions::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles_Versions::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles_Versions::$classMap;

Please login to merge, or discard this patch.

apps/files_versions/composer/composer/autoload_classmap.php 1 patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -6,31 +6,31 @@
 block discarded – undo
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files_Versions\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Files_Versions\\BackgroundJob\\ExpireVersions' => $baseDir . '/../lib/BackgroundJob/ExpireVersions.php',
-    'OCA\\Files_Versions\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Files_Versions\\Command\\CleanUp' => $baseDir . '/../lib/Command/CleanUp.php',
-    'OCA\\Files_Versions\\Command\\Expire' => $baseDir . '/../lib/Command/Expire.php',
-    'OCA\\Files_Versions\\Command\\ExpireVersions' => $baseDir . '/../lib/Command/ExpireVersions.php',
-    'OCA\\Files_Versions\\Controller\\PreviewController' => $baseDir . '/../lib/Controller/PreviewController.php',
-    'OCA\\Files_Versions\\Events\\CreateVersionEvent' => $baseDir . '/../lib/Events/CreateVersionEvent.php',
-    'OCA\\Files_Versions\\Expiration' => $baseDir . '/../lib/Expiration.php',
-    'OCA\\Files_Versions\\Hooks' => $baseDir . '/../lib/Hooks.php',
-    'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => $baseDir . '/../lib/Listener/LoadAdditionalListener.php',
-    'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => $baseDir . '/../lib/Listener/LoadSidebarListener.php',
-    'OCA\\Files_Versions\\Sabre\\Plugin' => $baseDir . '/../lib/Sabre/Plugin.php',
-    'OCA\\Files_Versions\\Sabre\\RestoreFolder' => $baseDir . '/../lib/Sabre/RestoreFolder.php',
-    'OCA\\Files_Versions\\Sabre\\RootCollection' => $baseDir . '/../lib/Sabre/RootCollection.php',
-    'OCA\\Files_Versions\\Sabre\\VersionCollection' => $baseDir . '/../lib/Sabre/VersionCollection.php',
-    'OCA\\Files_Versions\\Sabre\\VersionFile' => $baseDir . '/../lib/Sabre/VersionFile.php',
-    'OCA\\Files_Versions\\Sabre\\VersionHome' => $baseDir . '/../lib/Sabre/VersionHome.php',
-    'OCA\\Files_Versions\\Sabre\\VersionRoot' => $baseDir . '/../lib/Sabre/VersionRoot.php',
-    'OCA\\Files_Versions\\Storage' => $baseDir . '/../lib/Storage.php',
-    'OCA\\Files_Versions\\Versions\\BackendNotFoundException' => $baseDir . '/../lib/Versions/BackendNotFoundException.php',
-    'OCA\\Files_Versions\\Versions\\IVersion' => $baseDir . '/../lib/Versions/IVersion.php',
-    'OCA\\Files_Versions\\Versions\\IVersionBackend' => $baseDir . '/../lib/Versions/IVersionBackend.php',
-    'OCA\\Files_Versions\\Versions\\IVersionManager' => $baseDir . '/../lib/Versions/IVersionManager.php',
-    'OCA\\Files_Versions\\Versions\\LegacyVersionsBackend' => $baseDir . '/../lib/Versions/LegacyVersionsBackend.php',
-    'OCA\\Files_Versions\\Versions\\Version' => $baseDir . '/../lib/Versions/Version.php',
-    'OCA\\Files_Versions\\Versions\\VersionManager' => $baseDir . '/../lib/Versions/VersionManager.php',
+    'OCA\\Files_Versions\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Files_Versions\\BackgroundJob\\ExpireVersions' => $baseDir.'/../lib/BackgroundJob/ExpireVersions.php',
+    'OCA\\Files_Versions\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Files_Versions\\Command\\CleanUp' => $baseDir.'/../lib/Command/CleanUp.php',
+    'OCA\\Files_Versions\\Command\\Expire' => $baseDir.'/../lib/Command/Expire.php',
+    'OCA\\Files_Versions\\Command\\ExpireVersions' => $baseDir.'/../lib/Command/ExpireVersions.php',
+    'OCA\\Files_Versions\\Controller\\PreviewController' => $baseDir.'/../lib/Controller/PreviewController.php',
+    'OCA\\Files_Versions\\Events\\CreateVersionEvent' => $baseDir.'/../lib/Events/CreateVersionEvent.php',
+    'OCA\\Files_Versions\\Expiration' => $baseDir.'/../lib/Expiration.php',
+    'OCA\\Files_Versions\\Hooks' => $baseDir.'/../lib/Hooks.php',
+    'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => $baseDir.'/../lib/Listener/LoadAdditionalListener.php',
+    'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => $baseDir.'/../lib/Listener/LoadSidebarListener.php',
+    'OCA\\Files_Versions\\Sabre\\Plugin' => $baseDir.'/../lib/Sabre/Plugin.php',
+    'OCA\\Files_Versions\\Sabre\\RestoreFolder' => $baseDir.'/../lib/Sabre/RestoreFolder.php',
+    'OCA\\Files_Versions\\Sabre\\RootCollection' => $baseDir.'/../lib/Sabre/RootCollection.php',
+    'OCA\\Files_Versions\\Sabre\\VersionCollection' => $baseDir.'/../lib/Sabre/VersionCollection.php',
+    'OCA\\Files_Versions\\Sabre\\VersionFile' => $baseDir.'/../lib/Sabre/VersionFile.php',
+    'OCA\\Files_Versions\\Sabre\\VersionHome' => $baseDir.'/../lib/Sabre/VersionHome.php',
+    'OCA\\Files_Versions\\Sabre\\VersionRoot' => $baseDir.'/../lib/Sabre/VersionRoot.php',
+    'OCA\\Files_Versions\\Storage' => $baseDir.'/../lib/Storage.php',
+    'OCA\\Files_Versions\\Versions\\BackendNotFoundException' => $baseDir.'/../lib/Versions/BackendNotFoundException.php',
+    'OCA\\Files_Versions\\Versions\\IVersion' => $baseDir.'/../lib/Versions/IVersion.php',
+    'OCA\\Files_Versions\\Versions\\IVersionBackend' => $baseDir.'/../lib/Versions/IVersionBackend.php',
+    'OCA\\Files_Versions\\Versions\\IVersionManager' => $baseDir.'/../lib/Versions/IVersionManager.php',
+    'OCA\\Files_Versions\\Versions\\LegacyVersionsBackend' => $baseDir.'/../lib/Versions/LegacyVersionsBackend.php',
+    'OCA\\Files_Versions\\Versions\\Version' => $baseDir.'/../lib/Versions/Version.php',
+    'OCA\\Files_Versions\\Versions\\VersionManager' => $baseDir.'/../lib/Versions/VersionManager.php',
 );

Please login to merge, or discard this patch.

apps/workflowengine/lib/AppInfo/Application.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 	public function registerHooksAndListeners() {
 		$this->dispatcher->addListener(
 			'OCP\WorkflowEngine::loadAdditionalSettingScripts',
-			function () {
+			function() {
 				if (!function_exists('style')) {
 					// This is hacky, but we need to load the template class
 					class_exists(Template::class, true);
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
 
 		foreach ($configuredEvents as $operationClass => $events) {
 			foreach ($events as $entityClass => $eventNames) {
-				array_map(function (string $eventName) use ($operationClass, $entityClass) {
+				array_map(function(string $eventName) use ($operationClass, $entityClass) {
 					$this->dispatcher->addListener(
 						$eventName,
-						function ($event) use ($eventName, $operationClass, $entityClass) {
+						function($event) use ($eventName, $operationClass, $entityClass) {
 							$ruleMatcher = $this->manager->getRuleMatcher();
 							try {
 								/** @var IEntity $entity */

Please login to merge, or discard this patch.

apps/files_sharing/lib/Notification/Notifier.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -232,7 +232,7 @@
 block discarded – undo
 
 		$placeholders = $replacements = [];
 		foreach ($subjectParameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			$replacements[] = $parameter['name'];
 		}
 

Please login to merge, or discard this patch.

lib/private/Updater/VersionCheck.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 		}
 
 		// Look up the cache - it is invalidated all 30 minutes
-		if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
+		if (((int) $this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
 			return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
 		}
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 		$versionString = implode('x', $version);
 
 		//fetch xml data from updater
-		$url = $updaterUrl . '?version=' . $versionString;
+		$url = $updaterUrl.'?version='.$versionString;
 
 		$tmp = [];
 		try {
@@ -98,13 +98,13 @@  discard block
 block discarded – undo
 			$data = @simplexml_load_string($xml);
 			libxml_disable_entity_loader($loadEntities);
 			if ($data !== false) {
-				$tmp['version'] = (string)$data->version;
-				$tmp['versionstring'] = (string)$data->versionstring;
-				$tmp['url'] = (string)$data->url;
-				$tmp['web'] = (string)$data->web;
-				$tmp['changes'] = isset($data->changes) ? (string)$data->changes : '';
-				$tmp['autoupdater'] = (string)$data->autoupdater;
-				$tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0';
+				$tmp['version'] = (string) $data->version;
+				$tmp['versionstring'] = (string) $data->versionstring;
+				$tmp['url'] = (string) $data->url;
+				$tmp['web'] = (string) $data->web;
+				$tmp['changes'] = isset($data->changes) ? (string) $data->changes : '';
+				$tmp['autoupdater'] = (string) $data->autoupdater;
+				$tmp['eol'] = isset($data->eol) ? (string) $data->eol : '0';
 			} else {
 				libxml_clear_errors();
 			}

Please login to merge, or discard this patch.

		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245	* @return string display name
246	246	*/
247	247	public function getDisplayName($uid): string {
248		- $uid = (string)$uid;
	248	+ $uid = (string) $uid;
249	249	$this->loadUser($uid);
250	250	return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname'];
251	251	}
		@@ -273,9 +273,9 @@ discard block
		block discarded – undo
273	273	$query->expr()->eq('configkey', $query->expr()->literal('email')))
274	274	)
275	275	// sqlite doesn't like re-using a single named parameter here
276		- ->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
277		- ->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
278		- ->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
	276	+ ->where($query->expr()->iLike('uid', $query->createPositionalParameter('%'.$this->dbConn->escapeLikeParameter($search).'%')))
	277	+ ->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%'.$this->dbConn->escapeLikeParameter($search).'%')))
	278	+ ->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%'.$this->dbConn->escapeLikeParameter($search).'%')))
279	279	->orderBy($query->func()->lower('displayname'), 'ASC')
280	280	->orderBy('uid_lower', 'ASC')
281	281	->setMaxResults($limit)
		@@ -284,7 +284,7 @@ discard block
		block discarded – undo
284	284	$result = $query->execute();
285	285	$displayNames = [];
286	286	while ($row = $result->fetch()) {
287		- $displayNames[(string)$row['uid']] = (string)$row['displayname'];
	287	+ $displayNames[(string) $row['uid']] = (string) $row['displayname'];
288	288	}
289	289
290	290	return $displayNames;
		@@ -322,7 +322,7 @@ discard block
		block discarded – undo
322	322	if (!empty($newHash)) {
323	323	$this->updatePassword($uid, $newHash);
324	324	}
325		- return (string)$row['uid'];
	325	+ return (string) $row['uid'];
326	326	}
327	327
328	328	}
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	private function loadUser($uid) {
340	340	$this->fixDI();
341	341
342		- $uid = (string)$uid;
	342	+ $uid = (string) $uid;
343	343	if (!isset($this->cache[$uid])) {
344	344	//guests $uid could be NULL or ''
345	345	if ($uid === '') {
		@@ -363,8 +363,8 @@ discard block
		block discarded – undo
363	363
364	364	// "uid" is primary key, so there can only be a single result
365	365	if ($row !== false) {
366		- $this->cache[$uid]['uid'] = (string)$row['uid'];
367		- $this->cache[$uid]['displayname'] = (string)$row['displayname'];
	366	+ $this->cache[$uid]['uid'] = (string) $row['uid'];
	367	+ $this->cache[$uid]['displayname'] = (string) $row['displayname'];
368	368	} else {
369	369	return false;
370	370	}
		@@ -385,8 +385,8 @@ discard block
		block discarded – undo
385	385	$limit = $this->fixLimit($limit);
386	386
387	387	$users = $this->getDisplayNames($search, $limit, $offset);
388		- $userIds = array_map(function ($uid) {
389		- return (string)$uid;
	388	+ $userIds = array_map(function($uid) {
	389	+ return (string) $uid;
390	390	}, array_keys($users));
391	391	sort($userIds, SORT_STRING \| SORT_FLAG_CASE);
392	392	return $userIds;
		@@ -411,7 +411,7 @@ discard block
		block discarded – undo
411	411	*/
412	412	public function getHome(string $uid) {
413	413	if ($this->userExists($uid)) {
414		- return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
	414	+ return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/'.$uid;
415	415	}
416	416
417	417	return false;
		@@ -483,7 +483,7 @@ discard block
		block discarded – undo
483	483
484	484	public function getRealUID(string $uid): string {
485	485	if (!$this->userExists($uid)) {
486		- throw new \RuntimeException($uid . ' does not exist');
	486	+ throw new \RuntimeException($uid.' does not exist');
487	487	}
488	488
489	489	return $this->cache[$uid]['uid'];

		@@ -65,7 +65,7 @@
		block discarded – undo
65	65	//Current time
66	66	$minTime = $this->time->getDateTime();
67	67	$minTime->add(new \DateInterval('P1D'));
68		- $minTime->setTime(0,0,0);
	68	+ $minTime->setTime(0, 0, 0);
69	69
70	70	$maxTime = clone $minTime;
71	71	$maxTime->setTime(23, 59, 59);

		@@ -232,7 +232,7 @@
		block discarded – undo
232	232
233	233	$placeholders = $replacements = [];
234	234	foreach ($subjectParameters as $placeholder => $parameter) {
235		- $placeholders[] = '{' . $placeholder . '}';
	235	+ $placeholders[] = '{'.$placeholder.'}';
236	236	$replacements[] = $parameter['name'];
237	237	}
238	238

		@@ -59,7 +59,7 @@
		block discarded – undo
59	59	if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
60	60	list($remoteGroup, $serverUrl) = $this->splitGroupRemote($search);
61	61	$result['exact'][] = [
62		- 'label' => $remoteGroup . " ($serverUrl)",
	62	+ 'label' => $remoteGroup." ($serverUrl)",
63	63	'guid' => $remoteGroup,
64	64	'name' => $remoteGroup,
65	65	'value' => [

		@@ -98,7 +98,7 @@
		block discarded – undo
98	98
99	99	if (isset($this->namespaces[$namespace])) {
100	100	if (!isset($this->hasNoAppContainer[$namespace])) {
101		- $applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
	101	+ $applicationClassName = 'OCA\\'.$sensitiveNamespace.'\\AppInfo\\Application';
102	102	if (class_exists($applicationClassName)) {
103	103	$app = new $applicationClassName();
104	104	if (isset($this->appContainers[$namespace])) {

		@@ -6,53 +6,53 @@
		block discarded – undo
6	6
7	7	class ComposerStaticInitFiles_Versions
8	8	{
9		- public static $prefixLengthsPsr4 = array (
	9	+ public static $prefixLengthsPsr4 = array(
10	10	'O' =>
11		- array (
	11	+ array(
12	12	'OCA\\Files_Versions\\' => 19,
13	13	),
14	14	);
15	15
16		- public static $prefixDirsPsr4 = array (
	16	+ public static $prefixDirsPsr4 = array(
17	17	'OCA\\Files_Versions\\' =>
18		- array (
19		- 0 => __DIR__ . '/..' . '/../lib',
	18	+ array(
	19	+ 0 => __DIR__.'/..'.'/../lib',
20	20	),
21	21	);
22	22
23		- public static $classMap = array (
24		- 'OCA\\Files_Versions\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
25		- 'OCA\\Files_Versions\\BackgroundJob\\ExpireVersions' => __DIR__ . '/..' . '/../lib/BackgroundJob/ExpireVersions.php',
26		- 'OCA\\Files_Versions\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
27		- 'OCA\\Files_Versions\\Command\\CleanUp' => __DIR__ . '/..' . '/../lib/Command/CleanUp.php',
28		- 'OCA\\Files_Versions\\Command\\Expire' => __DIR__ . '/..' . '/../lib/Command/Expire.php',
29		- 'OCA\\Files_Versions\\Command\\ExpireVersions' => __DIR__ . '/..' . '/../lib/Command/ExpireVersions.php',
30		- 'OCA\\Files_Versions\\Controller\\PreviewController' => __DIR__ . '/..' . '/../lib/Controller/PreviewController.php',
31		- 'OCA\\Files_Versions\\Events\\CreateVersionEvent' => __DIR__ . '/..' . '/../lib/Events/CreateVersionEvent.php',
32		- 'OCA\\Files_Versions\\Expiration' => __DIR__ . '/..' . '/../lib/Expiration.php',
33		- 'OCA\\Files_Versions\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
34		- 'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalListener.php',
35		- 'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarListener.php',
36		- 'OCA\\Files_Versions\\Sabre\\Plugin' => __DIR__ . '/..' . '/../lib/Sabre/Plugin.php',
37		- 'OCA\\Files_Versions\\Sabre\\RestoreFolder' => __DIR__ . '/..' . '/../lib/Sabre/RestoreFolder.php',
38		- 'OCA\\Files_Versions\\Sabre\\RootCollection' => __DIR__ . '/..' . '/../lib/Sabre/RootCollection.php',
39		- 'OCA\\Files_Versions\\Sabre\\VersionCollection' => __DIR__ . '/..' . '/../lib/Sabre/VersionCollection.php',
40		- 'OCA\\Files_Versions\\Sabre\\VersionFile' => __DIR__ . '/..' . '/../lib/Sabre/VersionFile.php',
41		- 'OCA\\Files_Versions\\Sabre\\VersionHome' => __DIR__ . '/..' . '/../lib/Sabre/VersionHome.php',
42		- 'OCA\\Files_Versions\\Sabre\\VersionRoot' => __DIR__ . '/..' . '/../lib/Sabre/VersionRoot.php',
43		- 'OCA\\Files_Versions\\Storage' => __DIR__ . '/..' . '/../lib/Storage.php',
44		- 'OCA\\Files_Versions\\Versions\\BackendNotFoundException' => __DIR__ . '/..' . '/../lib/Versions/BackendNotFoundException.php',
45		- 'OCA\\Files_Versions\\Versions\\IVersion' => __DIR__ . '/..' . '/../lib/Versions/IVersion.php',
46		- 'OCA\\Files_Versions\\Versions\\IVersionBackend' => __DIR__ . '/..' . '/../lib/Versions/IVersionBackend.php',
47		- 'OCA\\Files_Versions\\Versions\\IVersionManager' => __DIR__ . '/..' . '/../lib/Versions/IVersionManager.php',
48		- 'OCA\\Files_Versions\\Versions\\LegacyVersionsBackend' => __DIR__ . '/..' . '/../lib/Versions/LegacyVersionsBackend.php',
49		- 'OCA\\Files_Versions\\Versions\\Version' => __DIR__ . '/..' . '/../lib/Versions/Version.php',
50		- 'OCA\\Files_Versions\\Versions\\VersionManager' => __DIR__ . '/..' . '/../lib/Versions/VersionManager.php',
	23	+ public static $classMap = array(
	24	+ 'OCA\\Files_Versions\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
	25	+ 'OCA\\Files_Versions\\BackgroundJob\\ExpireVersions' => __DIR__.'/..'.'/../lib/BackgroundJob/ExpireVersions.php',
	26	+ 'OCA\\Files_Versions\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
	27	+ 'OCA\\Files_Versions\\Command\\CleanUp' => __DIR__.'/..'.'/../lib/Command/CleanUp.php',
	28	+ 'OCA\\Files_Versions\\Command\\Expire' => __DIR__.'/..'.'/../lib/Command/Expire.php',
	29	+ 'OCA\\Files_Versions\\Command\\ExpireVersions' => __DIR__.'/..'.'/../lib/Command/ExpireVersions.php',
	30	+ 'OCA\\Files_Versions\\Controller\\PreviewController' => __DIR__.'/..'.'/../lib/Controller/PreviewController.php',
	31	+ 'OCA\\Files_Versions\\Events\\CreateVersionEvent' => __DIR__.'/..'.'/../lib/Events/CreateVersionEvent.php',
	32	+ 'OCA\\Files_Versions\\Expiration' => __DIR__.'/..'.'/../lib/Expiration.php',
	33	+ 'OCA\\Files_Versions\\Hooks' => __DIR__.'/..'.'/../lib/Hooks.php',
	34	+ 'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => __DIR__.'/..'.'/../lib/Listener/LoadAdditionalListener.php',
	35	+ 'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => __DIR__.'/..'.'/../lib/Listener/LoadSidebarListener.php',
	36	+ 'OCA\\Files_Versions\\Sabre\\Plugin' => __DIR__.'/..'.'/../lib/Sabre/Plugin.php',
	37	+ 'OCA\\Files_Versions\\Sabre\\RestoreFolder' => __DIR__.'/..'.'/../lib/Sabre/RestoreFolder.php',
	38	+ 'OCA\\Files_Versions\\Sabre\\RootCollection' => __DIR__.'/..'.'/../lib/Sabre/RootCollection.php',
	39	+ 'OCA\\Files_Versions\\Sabre\\VersionCollection' => __DIR__.'/..'.'/../lib/Sabre/VersionCollection.php',
	40	+ 'OCA\\Files_Versions\\Sabre\\VersionFile' => __DIR__.'/..'.'/../lib/Sabre/VersionFile.php',
	41	+ 'OCA\\Files_Versions\\Sabre\\VersionHome' => __DIR__.'/..'.'/../lib/Sabre/VersionHome.php',
	42	+ 'OCA\\Files_Versions\\Sabre\\VersionRoot' => __DIR__.'/..'.'/../lib/Sabre/VersionRoot.php',
	43	+ 'OCA\\Files_Versions\\Storage' => __DIR__.'/..'.'/../lib/Storage.php',
	44	+ 'OCA\\Files_Versions\\Versions\\BackendNotFoundException' => __DIR__.'/..'.'/../lib/Versions/BackendNotFoundException.php',
	45	+ 'OCA\\Files_Versions\\Versions\\IVersion' => __DIR__.'/..'.'/../lib/Versions/IVersion.php',
	46	+ 'OCA\\Files_Versions\\Versions\\IVersionBackend' => __DIR__.'/..'.'/../lib/Versions/IVersionBackend.php',
	47	+ 'OCA\\Files_Versions\\Versions\\IVersionManager' => __DIR__.'/..'.'/../lib/Versions/IVersionManager.php',
	48	+ 'OCA\\Files_Versions\\Versions\\LegacyVersionsBackend' => __DIR__.'/..'.'/../lib/Versions/LegacyVersionsBackend.php',
	49	+ 'OCA\\Files_Versions\\Versions\\Version' => __DIR__.'/..'.'/../lib/Versions/Version.php',
	50	+ 'OCA\\Files_Versions\\Versions\\VersionManager' => __DIR__.'/..'.'/../lib/Versions/VersionManager.php',
51	51	);
52	52
53	53	public static function getInitializer(ClassLoader $loader)
54	54	{
55		- return \Closure::bind(function () use ($loader) {
	55	+ return \Closure::bind(function() use ($loader) {
56	56	$loader->prefixLengthsPsr4 = ComposerStaticInitFiles_Versions::$prefixLengthsPsr4;
57	57	$loader->prefixDirsPsr4 = ComposerStaticInitFiles_Versions::$prefixDirsPsr4;
58	58	$loader->classMap = ComposerStaticInitFiles_Versions::$classMap;

		@@ -6,31 +6,31 @@
		block discarded – undo
6	6	$baseDir = $vendorDir;
7	7
8	8	return array(
9		- 'OCA\\Files_Versions\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
10		- 'OCA\\Files_Versions\\BackgroundJob\\ExpireVersions' => $baseDir . '/../lib/BackgroundJob/ExpireVersions.php',
11		- 'OCA\\Files_Versions\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
12		- 'OCA\\Files_Versions\\Command\\CleanUp' => $baseDir . '/../lib/Command/CleanUp.php',
13		- 'OCA\\Files_Versions\\Command\\Expire' => $baseDir . '/../lib/Command/Expire.php',
14		- 'OCA\\Files_Versions\\Command\\ExpireVersions' => $baseDir . '/../lib/Command/ExpireVersions.php',
15		- 'OCA\\Files_Versions\\Controller\\PreviewController' => $baseDir . '/../lib/Controller/PreviewController.php',
16		- 'OCA\\Files_Versions\\Events\\CreateVersionEvent' => $baseDir . '/../lib/Events/CreateVersionEvent.php',
17		- 'OCA\\Files_Versions\\Expiration' => $baseDir . '/../lib/Expiration.php',
18		- 'OCA\\Files_Versions\\Hooks' => $baseDir . '/../lib/Hooks.php',
19		- 'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => $baseDir . '/../lib/Listener/LoadAdditionalListener.php',
20		- 'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => $baseDir . '/../lib/Listener/LoadSidebarListener.php',
21		- 'OCA\\Files_Versions\\Sabre\\Plugin' => $baseDir . '/../lib/Sabre/Plugin.php',
22		- 'OCA\\Files_Versions\\Sabre\\RestoreFolder' => $baseDir . '/../lib/Sabre/RestoreFolder.php',
23		- 'OCA\\Files_Versions\\Sabre\\RootCollection' => $baseDir . '/../lib/Sabre/RootCollection.php',
24		- 'OCA\\Files_Versions\\Sabre\\VersionCollection' => $baseDir . '/../lib/Sabre/VersionCollection.php',
25		- 'OCA\\Files_Versions\\Sabre\\VersionFile' => $baseDir . '/../lib/Sabre/VersionFile.php',
26		- 'OCA\\Files_Versions\\Sabre\\VersionHome' => $baseDir . '/../lib/Sabre/VersionHome.php',
27		- 'OCA\\Files_Versions\\Sabre\\VersionRoot' => $baseDir . '/../lib/Sabre/VersionRoot.php',
28		- 'OCA\\Files_Versions\\Storage' => $baseDir . '/../lib/Storage.php',
29		- 'OCA\\Files_Versions\\Versions\\BackendNotFoundException' => $baseDir . '/../lib/Versions/BackendNotFoundException.php',
30		- 'OCA\\Files_Versions\\Versions\\IVersion' => $baseDir . '/../lib/Versions/IVersion.php',
31		- 'OCA\\Files_Versions\\Versions\\IVersionBackend' => $baseDir . '/../lib/Versions/IVersionBackend.php',
32		- 'OCA\\Files_Versions\\Versions\\IVersionManager' => $baseDir . '/../lib/Versions/IVersionManager.php',
33		- 'OCA\\Files_Versions\\Versions\\LegacyVersionsBackend' => $baseDir . '/../lib/Versions/LegacyVersionsBackend.php',
34		- 'OCA\\Files_Versions\\Versions\\Version' => $baseDir . '/../lib/Versions/Version.php',
35		- 'OCA\\Files_Versions\\Versions\\VersionManager' => $baseDir . '/../lib/Versions/VersionManager.php',
	9	+ 'OCA\\Files_Versions\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
	10	+ 'OCA\\Files_Versions\\BackgroundJob\\ExpireVersions' => $baseDir.'/../lib/BackgroundJob/ExpireVersions.php',
	11	+ 'OCA\\Files_Versions\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
	12	+ 'OCA\\Files_Versions\\Command\\CleanUp' => $baseDir.'/../lib/Command/CleanUp.php',
	13	+ 'OCA\\Files_Versions\\Command\\Expire' => $baseDir.'/../lib/Command/Expire.php',
	14	+ 'OCA\\Files_Versions\\Command\\ExpireVersions' => $baseDir.'/../lib/Command/ExpireVersions.php',
	15	+ 'OCA\\Files_Versions\\Controller\\PreviewController' => $baseDir.'/../lib/Controller/PreviewController.php',
	16	+ 'OCA\\Files_Versions\\Events\\CreateVersionEvent' => $baseDir.'/../lib/Events/CreateVersionEvent.php',
	17	+ 'OCA\\Files_Versions\\Expiration' => $baseDir.'/../lib/Expiration.php',
	18	+ 'OCA\\Files_Versions\\Hooks' => $baseDir.'/../lib/Hooks.php',
	19	+ 'OCA\\Files_Versions\\Listener\\LoadAdditionalListener' => $baseDir.'/../lib/Listener/LoadAdditionalListener.php',
	20	+ 'OCA\\Files_Versions\\Listener\\LoadSidebarListener' => $baseDir.'/../lib/Listener/LoadSidebarListener.php',
	21	+ 'OCA\\Files_Versions\\Sabre\\Plugin' => $baseDir.'/../lib/Sabre/Plugin.php',
	22	+ 'OCA\\Files_Versions\\Sabre\\RestoreFolder' => $baseDir.'/../lib/Sabre/RestoreFolder.php',
	23	+ 'OCA\\Files_Versions\\Sabre\\RootCollection' => $baseDir.'/../lib/Sabre/RootCollection.php',
	24	+ 'OCA\\Files_Versions\\Sabre\\VersionCollection' => $baseDir.'/../lib/Sabre/VersionCollection.php',
	25	+ 'OCA\\Files_Versions\\Sabre\\VersionFile' => $baseDir.'/../lib/Sabre/VersionFile.php',
	26	+ 'OCA\\Files_Versions\\Sabre\\VersionHome' => $baseDir.'/../lib/Sabre/VersionHome.php',
	27	+ 'OCA\\Files_Versions\\Sabre\\VersionRoot' => $baseDir.'/../lib/Sabre/VersionRoot.php',
	28	+ 'OCA\\Files_Versions\\Storage' => $baseDir.'/../lib/Storage.php',
	29	+ 'OCA\\Files_Versions\\Versions\\BackendNotFoundException' => $baseDir.'/../lib/Versions/BackendNotFoundException.php',
	30	+ 'OCA\\Files_Versions\\Versions\\IVersion' => $baseDir.'/../lib/Versions/IVersion.php',
	31	+ 'OCA\\Files_Versions\\Versions\\IVersionBackend' => $baseDir.'/../lib/Versions/IVersionBackend.php',
	32	+ 'OCA\\Files_Versions\\Versions\\IVersionManager' => $baseDir.'/../lib/Versions/IVersionManager.php',
	33	+ 'OCA\\Files_Versions\\Versions\\LegacyVersionsBackend' => $baseDir.'/../lib/Versions/LegacyVersionsBackend.php',
	34	+ 'OCA\\Files_Versions\\Versions\\Version' => $baseDir.'/../lib/Versions/Version.php',
	35	+ 'OCA\\Files_Versions\\Versions\\VersionManager' => $baseDir.'/../lib/Versions/VersionManager.php',
36	36	);

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	public function registerHooksAndListeners() {
57	57	$this->dispatcher->addListener(
58	58	'OCP\WorkflowEngine::loadAdditionalSettingScripts',
59		- function () {
	59	+ function() {
60	60	if (!function_exists('style')) {
61	61	// This is hacky, but we need to load the template class
62	62	class_exists(Template::class, true);
		@@ -87,10 +87,10 @@ discard block
		block discarded – undo
87	87
88	88	foreach ($configuredEvents as $operationClass => $events) {
89	89	foreach ($events as $entityClass => $eventNames) {
90		- array_map(function (string $eventName) use ($operationClass, $entityClass) {
	90	+ array_map(function(string $eventName) use ($operationClass, $entityClass) {
91	91	$this->dispatcher->addListener(
92	92	$eventName,
93		- function ($event) use ($eventName, $operationClass, $entityClass) {
	93	+ function($event) use ($eventName, $operationClass, $entityClass) {
94	94	$ruleMatcher = $this->manager->getRuleMatcher();
95	95	try {
96	96	/** @var IEntity $entity */

		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	}
61	61
62	62	// Look up the cache - it is invalidated all 30 minutes
63		- if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
	63	+ if (((int) $this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
64	64	return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
65	65	}
66	66
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	$versionString = implode('x', $version);
85	85
86	86	//fetch xml data from updater
87		- $url = $updaterUrl . '?version=' . $versionString;
	87	+ $url = $updaterUrl.'?version='.$versionString;
88	88
89	89	$tmp = [];
90	90	try {
		@@ -98,13 +98,13 @@ discard block
		block discarded – undo
98	98	$data = @simplexml_load_string($xml);
99	99	libxml_disable_entity_loader($loadEntities);
100	100	if ($data !== false) {
101		- $tmp['version'] = (string)$data->version;
102		- $tmp['versionstring'] = (string)$data->versionstring;
103		- $tmp['url'] = (string)$data->url;
104		- $tmp['web'] = (string)$data->web;
105		- $tmp['changes'] = isset($data->changes) ? (string)$data->changes : '';
106		- $tmp['autoupdater'] = (string)$data->autoupdater;
107		- $tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0';
	101	+ $tmp['version'] = (string) $data->version;
	102	+ $tmp['versionstring'] = (string) $data->versionstring;
	103	+ $tmp['url'] = (string) $data->url;
	104	+ $tmp['web'] = (string) $data->web;
	105	+ $tmp['changes'] = isset($data->changes) ? (string) $data->changes : '';
	106	+ $tmp['autoupdater'] = (string) $data->autoupdater;
	107	+ $tmp['eol'] = isset($data->eol) ? (string) $data->eol : '0';
108	108	} else {
109	109	libxml_clear_errors();
110	110	}

nextcloud / server

Push — master ( 7ef10b...59c1ff )

Status

Category

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +34 added lines, -34 removed lines patch added patch discarded remove patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch