Inspection of "Merge pull request #11112 from nextcloud/do-not-hi..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 89fdd0...fb17f1 )

by Morris

created 2018-09-26 10:23 UTC

Status

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

@@ -6,62 +6,62 @@
 block discarded – undo
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\User_LDAP\\Access' => $baseDir . '/../lib/Access.php',
-    'OCA\\User_LDAP\\AccessFactory' => $baseDir . '/../lib/AccessFactory.php',
-    'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\User_LDAP\\BackendUtility' => $baseDir . '/../lib/BackendUtility.php',
-    'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir . '/../lib/Command/CheckUser.php',
-    'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir . '/../lib/Command/CreateEmptyConfig.php',
-    'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir . '/../lib/Command/DeleteConfig.php',
-    'OCA\\User_LDAP\\Command\\Search' => $baseDir . '/../lib/Command/Search.php',
-    'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir . '/../lib/Command/SetConfig.php',
-    'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir . '/../lib/Command/ShowConfig.php',
-    'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir . '/../lib/Command/ShowRemnants.php',
-    'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir . '/../lib/Command/TestConfig.php',
-    'OCA\\User_LDAP\\Configuration' => $baseDir . '/../lib/Configuration.php',
-    'OCA\\User_LDAP\\Connection' => $baseDir . '/../lib/Connection.php',
-    'OCA\\User_LDAP\\ConnectionFactory' => $baseDir . '/../lib/ConnectionFactory.php',
-    'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir . '/../lib/Controller/ConfigAPIController.php',
-    'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir . '/../lib/Controller/RenewPasswordController.php',
-    'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir . '/../lib/Exceptions/ConstraintViolationException.php',
-    'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir . '/../lib/Exceptions/NotOnLDAP.php',
-    'OCA\\User_LDAP\\FilesystemHelper' => $baseDir . '/../lib/FilesystemHelper.php',
-    'OCA\\User_LDAP\\GroupPluginManager' => $baseDir . '/../lib/GroupPluginManager.php',
-    'OCA\\User_LDAP\\Group_LDAP' => $baseDir . '/../lib/Group_LDAP.php',
-    'OCA\\User_LDAP\\Group_Proxy' => $baseDir . '/../lib/Group_Proxy.php',
-    'OCA\\User_LDAP\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\User_LDAP\\IGroupLDAP' => $baseDir . '/../lib/IGroupLDAP.php',
-    'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir . '/../lib/ILDAPGroupPlugin.php',
-    'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir . '/../lib/ILDAPUserPlugin.php',
-    'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir . '/../lib/ILDAPWrapper.php',
-    'OCA\\User_LDAP\\IUserLDAP' => $baseDir . '/../lib/IUserLDAP.php',
-    'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir . '/../lib/Jobs/CleanUp.php',
-    'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir . '/../lib/Jobs/Sync.php',
-    'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir . '/../lib/Jobs/UpdateGroups.php',
-    'OCA\\User_LDAP\\LDAP' => $baseDir . '/../lib/LDAP.php',
-    'OCA\\User_LDAP\\LDAPProvider' => $baseDir . '/../lib/LDAPProvider.php',
-    'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir . '/../lib/LDAPProviderFactory.php',
-    'OCA\\User_LDAP\\LDAPUtility' => $baseDir . '/../lib/LDAPUtility.php',
-    'OCA\\User_LDAP\\LogWrapper' => $baseDir . '/../lib/LogWrapper.php',
-    'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir . '/../lib/Mapping/AbstractMapping.php',
-    'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir . '/../lib/Mapping/GroupMapping.php',
-    'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir . '/../lib/Mapping/UserMapping.php',
-    'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir . '/../lib/Migration/UUIDFix.php',
-    'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir . '/../lib/Migration/UUIDFixGroup.php',
-    'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir . '/../lib/Migration/UUIDFixInsert.php',
-    'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir . '/../lib/Migration/UUIDFixUser.php',
-    'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
-    'OCA\\User_LDAP\\Proxy' => $baseDir . '/../lib/Proxy.php',
-    'OCA\\User_LDAP\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\User_LDAP\\Settings\\Section' => $baseDir . '/../lib/Settings/Section.php',
-    'OCA\\User_LDAP\\UserPluginManager' => $baseDir . '/../lib/UserPluginManager.php',
-    'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir . '/../lib/User/DeletedUsersIndex.php',
-    'OCA\\User_LDAP\\User\\IUserTools' => $baseDir . '/../lib/User/IUserTools.php',
-    'OCA\\User_LDAP\\User\\Manager' => $baseDir . '/../lib/User/Manager.php',
-    'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir . '/../lib/User/OfflineUser.php',
-    'OCA\\User_LDAP\\User\\User' => $baseDir . '/../lib/User/User.php',
-    'OCA\\User_LDAP\\User_LDAP' => $baseDir . '/../lib/User_LDAP.php',
-    'OCA\\User_LDAP\\User_Proxy' => $baseDir . '/../lib/User_Proxy.php',
-    'OCA\\User_LDAP\\Wizard' => $baseDir . '/../lib/Wizard.php',
-    'OCA\\User_LDAP\\WizardResult' => $baseDir . '/../lib/WizardResult.php',
+    'OCA\\User_LDAP\\Access' => $baseDir.'/../lib/Access.php',
+    'OCA\\User_LDAP\\AccessFactory' => $baseDir.'/../lib/AccessFactory.php',
+    'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\User_LDAP\\BackendUtility' => $baseDir.'/../lib/BackendUtility.php',
+    'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir.'/../lib/Command/CheckUser.php',
+    'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir.'/../lib/Command/CreateEmptyConfig.php',
+    'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir.'/../lib/Command/DeleteConfig.php',
+    'OCA\\User_LDAP\\Command\\Search' => $baseDir.'/../lib/Command/Search.php',
+    'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir.'/../lib/Command/SetConfig.php',
+    'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir.'/../lib/Command/ShowConfig.php',
+    'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir.'/../lib/Command/ShowRemnants.php',
+    'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir.'/../lib/Command/TestConfig.php',
+    'OCA\\User_LDAP\\Configuration' => $baseDir.'/../lib/Configuration.php',
+    'OCA\\User_LDAP\\Connection' => $baseDir.'/../lib/Connection.php',
+    'OCA\\User_LDAP\\ConnectionFactory' => $baseDir.'/../lib/ConnectionFactory.php',
+    'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir.'/../lib/Controller/ConfigAPIController.php',
+    'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir.'/../lib/Controller/RenewPasswordController.php',
+    'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir.'/../lib/Exceptions/ConstraintViolationException.php',
+    'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir.'/../lib/Exceptions/NotOnLDAP.php',
+    'OCA\\User_LDAP\\FilesystemHelper' => $baseDir.'/../lib/FilesystemHelper.php',
+    'OCA\\User_LDAP\\GroupPluginManager' => $baseDir.'/../lib/GroupPluginManager.php',
+    'OCA\\User_LDAP\\Group_LDAP' => $baseDir.'/../lib/Group_LDAP.php',
+    'OCA\\User_LDAP\\Group_Proxy' => $baseDir.'/../lib/Group_Proxy.php',
+    'OCA\\User_LDAP\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\User_LDAP\\IGroupLDAP' => $baseDir.'/../lib/IGroupLDAP.php',
+    'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir.'/../lib/ILDAPGroupPlugin.php',
+    'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir.'/../lib/ILDAPUserPlugin.php',
+    'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir.'/../lib/ILDAPWrapper.php',
+    'OCA\\User_LDAP\\IUserLDAP' => $baseDir.'/../lib/IUserLDAP.php',
+    'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir.'/../lib/Jobs/CleanUp.php',
+    'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir.'/../lib/Jobs/Sync.php',
+    'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir.'/../lib/Jobs/UpdateGroups.php',
+    'OCA\\User_LDAP\\LDAP' => $baseDir.'/../lib/LDAP.php',
+    'OCA\\User_LDAP\\LDAPProvider' => $baseDir.'/../lib/LDAPProvider.php',
+    'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir.'/../lib/LDAPProviderFactory.php',
+    'OCA\\User_LDAP\\LDAPUtility' => $baseDir.'/../lib/LDAPUtility.php',
+    'OCA\\User_LDAP\\LogWrapper' => $baseDir.'/../lib/LogWrapper.php',
+    'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir.'/../lib/Mapping/AbstractMapping.php',
+    'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir.'/../lib/Mapping/GroupMapping.php',
+    'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir.'/../lib/Mapping/UserMapping.php',
+    'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir.'/../lib/Migration/UUIDFix.php',
+    'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir.'/../lib/Migration/UUIDFixGroup.php',
+    'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir.'/../lib/Migration/UUIDFixInsert.php',
+    'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir.'/../lib/Migration/UUIDFixUser.php',
+    'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
+    'OCA\\User_LDAP\\Proxy' => $baseDir.'/../lib/Proxy.php',
+    'OCA\\User_LDAP\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\User_LDAP\\Settings\\Section' => $baseDir.'/../lib/Settings/Section.php',
+    'OCA\\User_LDAP\\UserPluginManager' => $baseDir.'/../lib/UserPluginManager.php',
+    'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir.'/../lib/User/DeletedUsersIndex.php',
+    'OCA\\User_LDAP\\User\\IUserTools' => $baseDir.'/../lib/User/IUserTools.php',
+    'OCA\\User_LDAP\\User\\Manager' => $baseDir.'/../lib/User/Manager.php',
+    'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir.'/../lib/User/OfflineUser.php',
+    'OCA\\User_LDAP\\User\\User' => $baseDir.'/../lib/User/User.php',
+    'OCA\\User_LDAP\\User_LDAP' => $baseDir.'/../lib/User_LDAP.php',
+    'OCA\\User_LDAP\\User_Proxy' => $baseDir.'/../lib/User_Proxy.php',
+    'OCA\\User_LDAP\\Wizard' => $baseDir.'/../lib/Wizard.php',
+    'OCA\\User_LDAP\\WizardResult' => $baseDir.'/../lib/WizardResult.php',
 );

Please login to merge, or discard this patch.

ocs/v1.php 1 patch

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

@@ -29,8 +29,8 @@  discard block
 block discarded – undo
  *
  */
 
-require_once __DIR__ . '/../lib/versioncheck.php';
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/versioncheck.php';
+require_once __DIR__.'/../lib/base.php';
 
 if (\OCP\Util::needUpgrade()
 	|| \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
  * Try the appframework routes
  */
 try {
-	if(!\OC::$server->getUserSession()->isLoggedIn()) {
+	if (!\OC::$server->getUserSession()->isLoggedIn()) {
 		OC::handleLogin(\OC::$server->getRequest());
 	}
 	OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
 	OC_API::setContentType();
 
 	$format = \OC::$server->getRequest()->getParam('format', 'xml');
-	$txt='Invalid query, please check the syntax. API specifications are here:'
+	$txt = 'Invalid query, please check the syntax. API specifications are here:'
 		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
 	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 } catch (MethodNotAllowedException $e) {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 	OC_API::setContentType();
 
 	$format = \OC::$server->getRequest()->getParam('format', 'xml');
-	$txt='Invalid query, please check the syntax. API specifications are here:'
+	$txt = 'Invalid query, please check the syntax. API specifications are here:'
 		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
 	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 }

Please login to merge, or discard this patch.

apps/files/lib/Service/TagService.php 1 patch

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

@@ -122,7 +122,7 @@
 block discarded – undo
 		}
 
 		$eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
-		$this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
+		$this->dispatcher->dispatch(self::class.'::'.$eventName, new GenericEvent(null, [
 			'userId' => $user->getUID(),
 			'fileId' => $fileId,
 			'path' => $path,

Please login to merge, or discard this patch.

apps/theming/lib/Capabilities.php 1 patch

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

@@ -79,8 +79,7 @@
 block discarded – undo
 				'color-element' => $this->util->elementColor($color),
 				'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
 				'background' => $backgroundLogo === 'backgroundColor' ?
-					$this->theming->getColorPrimary() :
-					$this->url->getAbsoluteURL($this->theming->getBackground()),
+					$this->theming->getColorPrimary() : $this->url->getAbsoluteURL($this->theming->getBackground()),
 				'background-plain' => $backgroundLogo === 'backgroundColor',
 				'background-default' => !$this->util->isBackgroundThemed(),
 			],

Please login to merge, or discard this patch.

apps/user_ldap/lib/Jobs/Sync.php 1 patch

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

@@ -112,7 +112,7 @@  discard block
 block discarded – undo
 			$pagingSize = $this->config->getAppValue('user_ldap', $configKey, $minPagingSize);
 			$minPagingSize = $minPagingSize === null ? $pagingSize : min($minPagingSize, $pagingSize);
 		}
-		return (int)$minPagingSize;
+		return (int) $minPagingSize;
 	}
 
 	/**
@@ -123,20 +123,20 @@  discard block
 block discarded – undo
 
 		$isBackgroundJobModeAjax = $this->config
 				->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'ajax';
-		if($isBackgroundJobModeAjax) {
+		if ($isBackgroundJobModeAjax) {
 			return;
 		}
 
 		$cycleData = $this->getCycle();
-		if($cycleData === null) {
+		if ($cycleData === null) {
 			$cycleData = $this->determineNextCycle();
-			if($cycleData === null) {
+			if ($cycleData === null) {
 				$this->updateInterval();
 				return;
 			}
 		}
 
-		if(!$this->qualifiesToRun($cycleData)) {
+		if (!$this->qualifiesToRun($cycleData)) {
 			$this->updateInterval();
 			return;
 		}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
 
 		$filter = $access->combineFilterWithAnd(array(
 			$access->connection->ldapUserFilter,
-			$access->connection->ldapUserDisplayName . '=*',
+			$access->connection->ldapUserDisplayName.'=*',
 			$access->getFilterPartForUserSearch('')
 		));
 		$results = $access->fetchListOfUsers(
@@ -176,10 +176,10 @@  discard block
 block discarded – undo
 			true
 		);
 
-		if((int)$connection->ldapPagingSize === 0) {
+		if ((int) $connection->ldapPagingSize === 0) {
 			return false;
 		}
-		return count($results) >= (int)$connection->ldapPagingSize;
+		return count($results) >= (int) $connection->ldapPagingSize;
 	}
 
 	/**
@@ -190,16 +190,16 @@  discard block
 block discarded – undo
 	 */
 	public function getCycle() {
 		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
-		if(count($prefixes) === 0) {
+		if (count($prefixes) === 0) {
 			return null;
 		}
 
 		$cycleData = [
 			'prefix' => $this->config->getAppValue('user_ldap', 'background_sync_prefix', null),
-			'offset' => (int)$this->config->getAppValue('user_ldap', 'background_sync_offset', 0),
+			'offset' => (int) $this->config->getAppValue('user_ldap', 'background_sync_offset', 0),
 		];
 
-		if(
+		if (
 			$cycleData['prefix'] !== null
 			&& in_array($cycleData['prefix'], $prefixes)
 		) {
@@ -228,14 +228,14 @@  discard block
 block discarded – undo
 	 */
 	public function determineNextCycle(array $cycleData = null) {
 		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
-		if(count($prefixes) === 0) {
+		if (count($prefixes) === 0) {
 			return null;
 		}
 
 		// get the next prefix in line and remember it
 		$oldPrefix = $cycleData === null ? null : $cycleData['prefix'];
 		$prefix = $this->getNextPrefix($oldPrefix);
-		if($prefix === null) {
+		if ($prefix === null) {
 			return null;
 		}
 		$cycleData['prefix'] = $prefix;
@@ -253,8 +253,8 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function qualifiesToRun($cycleData) {
-		$lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'] . '_lastChange', 0);
-		if((time() - $lastChange) > 60 * 30) {
+		$lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'].'_lastChange', 0);
+		if ((time() - $lastChange) > 60 * 30) {
 			return true;
 		}
 		return false;
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
 	 */
 	protected function increaseOffset($cycleData) {
 		$ldapConfig = new Configuration($cycleData['prefix']);
-		$cycleData['offset'] += (int)$ldapConfig->ldapPagingSize;
+		$cycleData['offset'] += (int) $ldapConfig->ldapPagingSize;
 		$this->setCycle($cycleData);
 	}
 
@@ -280,17 +280,17 @@  discard block
 block discarded – undo
 	protected function getNextPrefix($lastPrefix) {
 		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
 		$noOfPrefixes = count($prefixes);
-		if($noOfPrefixes === 0) {
+		if ($noOfPrefixes === 0) {
 			return null;
 		}
 		$i = $lastPrefix === null ? false : array_search($lastPrefix, $prefixes, true);
-		if($i === false) {
+		if ($i === false) {
 			$i = -1;
 		} else {
 			$i++;
 		}
 
-		if(!isset($prefixes[$i])) {
+		if (!isset($prefixes[$i])) {
 			$i = 0;
 		}
 		return $prefixes[$i];
@@ -302,49 +302,49 @@  discard block
 block discarded – undo
 	 * @param array $argument
 	 */
 	public function setArgument($argument) {
-		if(isset($argument['config'])) {
+		if (isset($argument['config'])) {
 			$this->config = $argument['config'];
 		} else {
 			$this->config = \OC::$server->getConfig();
 		}
 
-		if(isset($argument['helper'])) {
+		if (isset($argument['helper'])) {
 			$this->ldapHelper = $argument['helper'];
 		} else {
 			$this->ldapHelper = new Helper($this->config);
 		}
 
-		if(isset($argument['ldapWrapper'])) {
+		if (isset($argument['ldapWrapper'])) {
 			$this->ldap = $argument['ldapWrapper'];
 		} else {
 			$this->ldap = new LDAP();
 		}
 
-		if(isset($argument['avatarManager'])) {
+		if (isset($argument['avatarManager'])) {
 			$this->avatarManager = $argument['avatarManager'];
 		} else {
 			$this->avatarManager = \OC::$server->getAvatarManager();
 		}
 
-		if(isset($argument['dbc'])) {
+		if (isset($argument['dbc'])) {
 			$this->dbc = $argument['dbc'];
 		} else {
 			$this->dbc = \OC::$server->getDatabaseConnection();
 		}
 
-		if(isset($argument['ncUserManager'])) {
+		if (isset($argument['ncUserManager'])) {
 			$this->ncUserManager = $argument['ncUserManager'];
 		} else {
 			$this->ncUserManager = \OC::$server->getUserManager();
 		}
 
-		if(isset($argument['notificationManager'])) {
+		if (isset($argument['notificationManager'])) {
 			$this->notificationManager = $argument['notificationManager'];
 		} else {
 			$this->notificationManager = \OC::$server->getNotificationManager();
 		}
 
-		if(isset($argument['userManager'])) {
+		if (isset($argument['userManager'])) {
 			$this->userManager = $argument['userManager'];
 		} else {
 			$this->userManager = new Manager(
@@ -359,19 +359,19 @@  discard block
 block discarded – undo
 			);
 		}
 
-		if(isset($argument['mapper'])) {
+		if (isset($argument['mapper'])) {
 			$this->mapper = $argument['mapper'];
 		} else {
 			$this->mapper = new UserMapping($this->dbc);
 		}
 		
-		if(isset($argument['connectionFactory'])) {
+		if (isset($argument['connectionFactory'])) {
 			$this->connectionFactory = $argument['connectionFactory'];
 		} else {
 			$this->connectionFactory = new ConnectionFactory($this->ldap);
 		}
 
-		if(isset($argument['accessFactory'])) {
+		if (isset($argument['accessFactory'])) {
 			$this->accessFactory = $argument['accessFactory'];
 		} else {
 			$this->accessFactory = new AccessFactory(

Please login to merge, or discard this patch.

lib/versioncheck.php 1 patch

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

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
 if (version_compare(PHP_VERSION, '7.0') === -1) {
 	http_response_code(500);
 	echo 'This version of Nextcloud requires at least PHP 7.0<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
+	echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.';
 	exit(-1);
 }
 
@@ -13,6 +13,6 @@  discard block
 block discarded – undo
 if (version_compare(PHP_VERSION, '7.3.0') !== -1) {
 	http_response_code(500);
 	echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '.';
+	echo 'You are currently running '.PHP_VERSION.'.';
 	exit(-1);
 }

Please login to merge, or discard this patch.

core/Controller/CssController.php 1 patch

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

@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 			$folder = $this->appData->getFolder($appName);
 			$gzip = false;
 			$file = $this->getFile($folder, $fileName, $gzip);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return new NotFoundResponse();
 		}
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 		if (strpos($encoding, 'gzip') !== false) {
 			try {
 				$gzip = true;
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+				return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 			} catch (NotFoundException $e) {
 				// continue
 			}

Please login to merge, or discard this patch.

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

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

@@ -6,84 +6,84 @@
 block discarded – undo
 
 class ComposerStaticInitUser_LDAP
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\User_LDAP\\' => 14,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\User_LDAP\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\User_LDAP\\Access' => __DIR__ . '/..' . '/../lib/Access.php',
-        'OCA\\User_LDAP\\AccessFactory' => __DIR__ . '/..' . '/../lib/AccessFactory.php',
-        'OCA\\User_LDAP\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\User_LDAP\\BackendUtility' => __DIR__ . '/..' . '/../lib/BackendUtility.php',
-        'OCA\\User_LDAP\\Command\\CheckUser' => __DIR__ . '/..' . '/../lib/Command/CheckUser.php',
-        'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => __DIR__ . '/..' . '/../lib/Command/CreateEmptyConfig.php',
-        'OCA\\User_LDAP\\Command\\DeleteConfig' => __DIR__ . '/..' . '/../lib/Command/DeleteConfig.php',
-        'OCA\\User_LDAP\\Command\\Search' => __DIR__ . '/..' . '/../lib/Command/Search.php',
-        'OCA\\User_LDAP\\Command\\SetConfig' => __DIR__ . '/..' . '/../lib/Command/SetConfig.php',
-        'OCA\\User_LDAP\\Command\\ShowConfig' => __DIR__ . '/..' . '/../lib/Command/ShowConfig.php',
-        'OCA\\User_LDAP\\Command\\ShowRemnants' => __DIR__ . '/..' . '/../lib/Command/ShowRemnants.php',
-        'OCA\\User_LDAP\\Command\\TestConfig' => __DIR__ . '/..' . '/../lib/Command/TestConfig.php',
-        'OCA\\User_LDAP\\Configuration' => __DIR__ . '/..' . '/../lib/Configuration.php',
-        'OCA\\User_LDAP\\Connection' => __DIR__ . '/..' . '/../lib/Connection.php',
-        'OCA\\User_LDAP\\ConnectionFactory' => __DIR__ . '/..' . '/../lib/ConnectionFactory.php',
-        'OCA\\User_LDAP\\Controller\\ConfigAPIController' => __DIR__ . '/..' . '/../lib/Controller/ConfigAPIController.php',
-        'OCA\\User_LDAP\\Controller\\RenewPasswordController' => __DIR__ . '/..' . '/../lib/Controller/RenewPasswordController.php',
-        'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => __DIR__ . '/..' . '/../lib/Exceptions/ConstraintViolationException.php',
-        'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => __DIR__ . '/..' . '/../lib/Exceptions/NotOnLDAP.php',
-        'OCA\\User_LDAP\\FilesystemHelper' => __DIR__ . '/..' . '/../lib/FilesystemHelper.php',
-        'OCA\\User_LDAP\\GroupPluginManager' => __DIR__ . '/..' . '/../lib/GroupPluginManager.php',
-        'OCA\\User_LDAP\\Group_LDAP' => __DIR__ . '/..' . '/../lib/Group_LDAP.php',
-        'OCA\\User_LDAP\\Group_Proxy' => __DIR__ . '/..' . '/../lib/Group_Proxy.php',
-        'OCA\\User_LDAP\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\User_LDAP\\IGroupLDAP' => __DIR__ . '/..' . '/../lib/IGroupLDAP.php',
-        'OCA\\User_LDAP\\ILDAPGroupPlugin' => __DIR__ . '/..' . '/../lib/ILDAPGroupPlugin.php',
-        'OCA\\User_LDAP\\ILDAPUserPlugin' => __DIR__ . '/..' . '/../lib/ILDAPUserPlugin.php',
-        'OCA\\User_LDAP\\ILDAPWrapper' => __DIR__ . '/..' . '/../lib/ILDAPWrapper.php',
-        'OCA\\User_LDAP\\IUserLDAP' => __DIR__ . '/..' . '/../lib/IUserLDAP.php',
-        'OCA\\User_LDAP\\Jobs\\CleanUp' => __DIR__ . '/..' . '/../lib/Jobs/CleanUp.php',
-        'OCA\\User_LDAP\\Jobs\\Sync' => __DIR__ . '/..' . '/../lib/Jobs/Sync.php',
-        'OCA\\User_LDAP\\Jobs\\UpdateGroups' => __DIR__ . '/..' . '/../lib/Jobs/UpdateGroups.php',
-        'OCA\\User_LDAP\\LDAP' => __DIR__ . '/..' . '/../lib/LDAP.php',
-        'OCA\\User_LDAP\\LDAPProvider' => __DIR__ . '/..' . '/../lib/LDAPProvider.php',
-        'OCA\\User_LDAP\\LDAPProviderFactory' => __DIR__ . '/..' . '/../lib/LDAPProviderFactory.php',
-        'OCA\\User_LDAP\\LDAPUtility' => __DIR__ . '/..' . '/../lib/LDAPUtility.php',
-        'OCA\\User_LDAP\\LogWrapper' => __DIR__ . '/..' . '/../lib/LogWrapper.php',
-        'OCA\\User_LDAP\\Mapping\\AbstractMapping' => __DIR__ . '/..' . '/../lib/Mapping/AbstractMapping.php',
-        'OCA\\User_LDAP\\Mapping\\GroupMapping' => __DIR__ . '/..' . '/../lib/Mapping/GroupMapping.php',
-        'OCA\\User_LDAP\\Mapping\\UserMapping' => __DIR__ . '/..' . '/../lib/Mapping/UserMapping.php',
-        'OCA\\User_LDAP\\Migration\\UUIDFix' => __DIR__ . '/..' . '/../lib/Migration/UUIDFix.php',
-        'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixGroup.php',
-        'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixInsert.php',
-        'OCA\\User_LDAP\\Migration\\UUIDFixUser' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixUser.php',
-        'OCA\\User_LDAP\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
-        'OCA\\User_LDAP\\Proxy' => __DIR__ . '/..' . '/../lib/Proxy.php',
-        'OCA\\User_LDAP\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\User_LDAP\\Settings\\Section' => __DIR__ . '/..' . '/../lib/Settings/Section.php',
-        'OCA\\User_LDAP\\UserPluginManager' => __DIR__ . '/..' . '/../lib/UserPluginManager.php',
-        'OCA\\User_LDAP\\User\\DeletedUsersIndex' => __DIR__ . '/..' . '/../lib/User/DeletedUsersIndex.php',
-        'OCA\\User_LDAP\\User\\IUserTools' => __DIR__ . '/..' . '/../lib/User/IUserTools.php',
-        'OCA\\User_LDAP\\User\\Manager' => __DIR__ . '/..' . '/../lib/User/Manager.php',
-        'OCA\\User_LDAP\\User\\OfflineUser' => __DIR__ . '/..' . '/../lib/User/OfflineUser.php',
-        'OCA\\User_LDAP\\User\\User' => __DIR__ . '/..' . '/../lib/User/User.php',
-        'OCA\\User_LDAP\\User_LDAP' => __DIR__ . '/..' . '/../lib/User_LDAP.php',
-        'OCA\\User_LDAP\\User_Proxy' => __DIR__ . '/..' . '/../lib/User_Proxy.php',
-        'OCA\\User_LDAP\\Wizard' => __DIR__ . '/..' . '/../lib/Wizard.php',
-        'OCA\\User_LDAP\\WizardResult' => __DIR__ . '/..' . '/../lib/WizardResult.php',
+    public static $classMap = array(
+        'OCA\\User_LDAP\\Access' => __DIR__.'/..'.'/../lib/Access.php',
+        'OCA\\User_LDAP\\AccessFactory' => __DIR__.'/..'.'/../lib/AccessFactory.php',
+        'OCA\\User_LDAP\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\User_LDAP\\BackendUtility' => __DIR__.'/..'.'/../lib/BackendUtility.php',
+        'OCA\\User_LDAP\\Command\\CheckUser' => __DIR__.'/..'.'/../lib/Command/CheckUser.php',
+        'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => __DIR__.'/..'.'/../lib/Command/CreateEmptyConfig.php',
+        'OCA\\User_LDAP\\Command\\DeleteConfig' => __DIR__.'/..'.'/../lib/Command/DeleteConfig.php',
+        'OCA\\User_LDAP\\Command\\Search' => __DIR__.'/..'.'/../lib/Command/Search.php',
+        'OCA\\User_LDAP\\Command\\SetConfig' => __DIR__.'/..'.'/../lib/Command/SetConfig.php',
+        'OCA\\User_LDAP\\Command\\ShowConfig' => __DIR__.'/..'.'/../lib/Command/ShowConfig.php',
+        'OCA\\User_LDAP\\Command\\ShowRemnants' => __DIR__.'/..'.'/../lib/Command/ShowRemnants.php',
+        'OCA\\User_LDAP\\Command\\TestConfig' => __DIR__.'/..'.'/../lib/Command/TestConfig.php',
+        'OCA\\User_LDAP\\Configuration' => __DIR__.'/..'.'/../lib/Configuration.php',
+        'OCA\\User_LDAP\\Connection' => __DIR__.'/..'.'/../lib/Connection.php',
+        'OCA\\User_LDAP\\ConnectionFactory' => __DIR__.'/..'.'/../lib/ConnectionFactory.php',
+        'OCA\\User_LDAP\\Controller\\ConfigAPIController' => __DIR__.'/..'.'/../lib/Controller/ConfigAPIController.php',
+        'OCA\\User_LDAP\\Controller\\RenewPasswordController' => __DIR__.'/..'.'/../lib/Controller/RenewPasswordController.php',
+        'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => __DIR__.'/..'.'/../lib/Exceptions/ConstraintViolationException.php',
+        'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => __DIR__.'/..'.'/../lib/Exceptions/NotOnLDAP.php',
+        'OCA\\User_LDAP\\FilesystemHelper' => __DIR__.'/..'.'/../lib/FilesystemHelper.php',
+        'OCA\\User_LDAP\\GroupPluginManager' => __DIR__.'/..'.'/../lib/GroupPluginManager.php',
+        'OCA\\User_LDAP\\Group_LDAP' => __DIR__.'/..'.'/../lib/Group_LDAP.php',
+        'OCA\\User_LDAP\\Group_Proxy' => __DIR__.'/..'.'/../lib/Group_Proxy.php',
+        'OCA\\User_LDAP\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\User_LDAP\\IGroupLDAP' => __DIR__.'/..'.'/../lib/IGroupLDAP.php',
+        'OCA\\User_LDAP\\ILDAPGroupPlugin' => __DIR__.'/..'.'/../lib/ILDAPGroupPlugin.php',
+        'OCA\\User_LDAP\\ILDAPUserPlugin' => __DIR__.'/..'.'/../lib/ILDAPUserPlugin.php',
+        'OCA\\User_LDAP\\ILDAPWrapper' => __DIR__.'/..'.'/../lib/ILDAPWrapper.php',
+        'OCA\\User_LDAP\\IUserLDAP' => __DIR__.'/..'.'/../lib/IUserLDAP.php',
+        'OCA\\User_LDAP\\Jobs\\CleanUp' => __DIR__.'/..'.'/../lib/Jobs/CleanUp.php',
+        'OCA\\User_LDAP\\Jobs\\Sync' => __DIR__.'/..'.'/../lib/Jobs/Sync.php',
+        'OCA\\User_LDAP\\Jobs\\UpdateGroups' => __DIR__.'/..'.'/../lib/Jobs/UpdateGroups.php',
+        'OCA\\User_LDAP\\LDAP' => __DIR__.'/..'.'/../lib/LDAP.php',
+        'OCA\\User_LDAP\\LDAPProvider' => __DIR__.'/..'.'/../lib/LDAPProvider.php',
+        'OCA\\User_LDAP\\LDAPProviderFactory' => __DIR__.'/..'.'/../lib/LDAPProviderFactory.php',
+        'OCA\\User_LDAP\\LDAPUtility' => __DIR__.'/..'.'/../lib/LDAPUtility.php',
+        'OCA\\User_LDAP\\LogWrapper' => __DIR__.'/..'.'/../lib/LogWrapper.php',
+        'OCA\\User_LDAP\\Mapping\\AbstractMapping' => __DIR__.'/..'.'/../lib/Mapping/AbstractMapping.php',
+        'OCA\\User_LDAP\\Mapping\\GroupMapping' => __DIR__.'/..'.'/../lib/Mapping/GroupMapping.php',
+        'OCA\\User_LDAP\\Mapping\\UserMapping' => __DIR__.'/..'.'/../lib/Mapping/UserMapping.php',
+        'OCA\\User_LDAP\\Migration\\UUIDFix' => __DIR__.'/..'.'/../lib/Migration/UUIDFix.php',
+        'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => __DIR__.'/..'.'/../lib/Migration/UUIDFixGroup.php',
+        'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => __DIR__.'/..'.'/../lib/Migration/UUIDFixInsert.php',
+        'OCA\\User_LDAP\\Migration\\UUIDFixUser' => __DIR__.'/..'.'/../lib/Migration/UUIDFixUser.php',
+        'OCA\\User_LDAP\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
+        'OCA\\User_LDAP\\Proxy' => __DIR__.'/..'.'/../lib/Proxy.php',
+        'OCA\\User_LDAP\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\User_LDAP\\Settings\\Section' => __DIR__.'/..'.'/../lib/Settings/Section.php',
+        'OCA\\User_LDAP\\UserPluginManager' => __DIR__.'/..'.'/../lib/UserPluginManager.php',
+        'OCA\\User_LDAP\\User\\DeletedUsersIndex' => __DIR__.'/..'.'/../lib/User/DeletedUsersIndex.php',
+        'OCA\\User_LDAP\\User\\IUserTools' => __DIR__.'/..'.'/../lib/User/IUserTools.php',
+        'OCA\\User_LDAP\\User\\Manager' => __DIR__.'/..'.'/../lib/User/Manager.php',
+        'OCA\\User_LDAP\\User\\OfflineUser' => __DIR__.'/..'.'/../lib/User/OfflineUser.php',
+        'OCA\\User_LDAP\\User\\User' => __DIR__.'/..'.'/../lib/User/User.php',
+        'OCA\\User_LDAP\\User_LDAP' => __DIR__.'/..'.'/../lib/User_LDAP.php',
+        'OCA\\User_LDAP\\User_Proxy' => __DIR__.'/..'.'/../lib/User_Proxy.php',
+        'OCA\\User_LDAP\\Wizard' => __DIR__.'/..'.'/../lib/Wizard.php',
+        'OCA\\User_LDAP\\WizardResult' => __DIR__.'/..'.'/../lib/WizardResult.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitUser_LDAP::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitUser_LDAP::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitUser_LDAP::$classMap;

Please login to merge, or discard this patch.

lib/private/App/CodeChecker/DatabaseSchemaChecker.php 1 patch

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

@@ -35,13 +35,13 @@  discard block
 block discarded – undo
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
+		if (!file_exists($appPath.'/appinfo/database.xml')) {
 			return ['errors' => [], 'warnings' => []];
 		}
 
 		libxml_use_internal_errors(true);
 		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
+		$xml = simplexml_load_file($appPath.'/appinfo/database.xml');
 		libxml_disable_entity_loader($loadEntities);
 
 
@@ -49,37 +49,37 @@  discard block
 block discarded – undo
 
 		foreach ($xml->table as $table) {
 			// Table names
-			if (strpos((string)$table->name, '*dbprefix*') !== 0) {
-				$errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
+			if (strpos((string) $table->name, '*dbprefix*') !== 0) {
+				$errors[] = 'Database schema error: name of table '.(string) $table->name.' does not start with *dbprefix*';
 			}
-			$tableName = substr((string)$table->name, strlen('*dbprefix*'));
+			$tableName = substr((string) $table->name, strlen('*dbprefix*'));
 			if (strpos($tableName, '*dbprefix*') !== false) {
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
+				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table '.(string) $table->name;
 			}
 
 			if (strlen($tableName) > 27) {
-				$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+				$errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
 			}
 
 			$hasAutoIncrement = false;
 
 			// Column names
 			foreach ($table->declaration->field as $column) {
-				if (strpos((string)$column->name, '*dbprefix*') !== false) {
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
+				if (strpos((string) $column->name, '*dbprefix*') !== false) {
+					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column '.(string) $column->name.' on table '.(string) $table->name;
 				}
 
-				if (strlen((string)$column->name) > 30) {
-					$errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
+				if (strlen((string) $column->name) > 30) {
+					$errors[] = 'Database schema error: Name of column '.(string) $column->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 30 characters allowed';
 				}
 
 				if ($column->autoincrement) {
 					if ($hasAutoIncrement) {
-						$errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
+						$errors[] = 'Database schema error: Table '.(string) $table->name.' has multiple autoincrement columns';
 					}
 
 					if (strlen($tableName) > 21) {
-						$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+						$errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
 					}
 
 					$hasAutoIncrement = true;
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
 
 			// Index names
 			foreach ($table->declaration->index as $index) {
-				$hasPrefix = strpos((string)$index->name, '*dbprefix*');
+				$hasPrefix = strpos((string) $index->name, '*dbprefix*');
 				if ($hasPrefix !== false && $hasPrefix !== 0) {
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
+					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index '.(string) $index->name.' on table '.(string) $table->name;
 				}
 
-				$indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
+				$indexName = $hasPrefix === 0 ? substr((string) $index->name, strlen('*dbprefix*')) : (string) $index->name;
 				if (strlen($indexName) > 27) {
-					$errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
+					$errors[] = 'Database schema error: Name of index '.(string) $index->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters + *dbprefix* allowed';
 				}
 			}
 		}

Please login to merge, or discard this patch.

		@@ -6,62 +6,62 @@
		block discarded – undo
6	6	$baseDir = $vendorDir;
7	7
8	8	return array(
9		- 'OCA\\User_LDAP\\Access' => $baseDir . '/../lib/Access.php',
10		- 'OCA\\User_LDAP\\AccessFactory' => $baseDir . '/../lib/AccessFactory.php',
11		- 'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
12		- 'OCA\\User_LDAP\\BackendUtility' => $baseDir . '/../lib/BackendUtility.php',
13		- 'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir . '/../lib/Command/CheckUser.php',
14		- 'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir . '/../lib/Command/CreateEmptyConfig.php',
15		- 'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir . '/../lib/Command/DeleteConfig.php',
16		- 'OCA\\User_LDAP\\Command\\Search' => $baseDir . '/../lib/Command/Search.php',
17		- 'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir . '/../lib/Command/SetConfig.php',
18		- 'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir . '/../lib/Command/ShowConfig.php',
19		- 'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir . '/../lib/Command/ShowRemnants.php',
20		- 'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir . '/../lib/Command/TestConfig.php',
21		- 'OCA\\User_LDAP\\Configuration' => $baseDir . '/../lib/Configuration.php',
22		- 'OCA\\User_LDAP\\Connection' => $baseDir . '/../lib/Connection.php',
23		- 'OCA\\User_LDAP\\ConnectionFactory' => $baseDir . '/../lib/ConnectionFactory.php',
24		- 'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir . '/../lib/Controller/ConfigAPIController.php',
25		- 'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir . '/../lib/Controller/RenewPasswordController.php',
26		- 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir . '/../lib/Exceptions/ConstraintViolationException.php',
27		- 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir . '/../lib/Exceptions/NotOnLDAP.php',
28		- 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir . '/../lib/FilesystemHelper.php',
29		- 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir . '/../lib/GroupPluginManager.php',
30		- 'OCA\\User_LDAP\\Group_LDAP' => $baseDir . '/../lib/Group_LDAP.php',
31		- 'OCA\\User_LDAP\\Group_Proxy' => $baseDir . '/../lib/Group_Proxy.php',
32		- 'OCA\\User_LDAP\\Helper' => $baseDir . '/../lib/Helper.php',
33		- 'OCA\\User_LDAP\\IGroupLDAP' => $baseDir . '/../lib/IGroupLDAP.php',
34		- 'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir . '/../lib/ILDAPGroupPlugin.php',
35		- 'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir . '/../lib/ILDAPUserPlugin.php',
36		- 'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir . '/../lib/ILDAPWrapper.php',
37		- 'OCA\\User_LDAP\\IUserLDAP' => $baseDir . '/../lib/IUserLDAP.php',
38		- 'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir . '/../lib/Jobs/CleanUp.php',
39		- 'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir . '/../lib/Jobs/Sync.php',
40		- 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir . '/../lib/Jobs/UpdateGroups.php',
41		- 'OCA\\User_LDAP\\LDAP' => $baseDir . '/../lib/LDAP.php',
42		- 'OCA\\User_LDAP\\LDAPProvider' => $baseDir . '/../lib/LDAPProvider.php',
43		- 'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir . '/../lib/LDAPProviderFactory.php',
44		- 'OCA\\User_LDAP\\LDAPUtility' => $baseDir . '/../lib/LDAPUtility.php',
45		- 'OCA\\User_LDAP\\LogWrapper' => $baseDir . '/../lib/LogWrapper.php',
46		- 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir . '/../lib/Mapping/AbstractMapping.php',
47		- 'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir . '/../lib/Mapping/GroupMapping.php',
48		- 'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir . '/../lib/Mapping/UserMapping.php',
49		- 'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir . '/../lib/Migration/UUIDFix.php',
50		- 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir . '/../lib/Migration/UUIDFixGroup.php',
51		- 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir . '/../lib/Migration/UUIDFixInsert.php',
52		- 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir . '/../lib/Migration/UUIDFixUser.php',
53		- 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
54		- 'OCA\\User_LDAP\\Proxy' => $baseDir . '/../lib/Proxy.php',
55		- 'OCA\\User_LDAP\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
56		- 'OCA\\User_LDAP\\Settings\\Section' => $baseDir . '/../lib/Settings/Section.php',
57		- 'OCA\\User_LDAP\\UserPluginManager' => $baseDir . '/../lib/UserPluginManager.php',
58		- 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir . '/../lib/User/DeletedUsersIndex.php',
59		- 'OCA\\User_LDAP\\User\\IUserTools' => $baseDir . '/../lib/User/IUserTools.php',
60		- 'OCA\\User_LDAP\\User\\Manager' => $baseDir . '/../lib/User/Manager.php',
61		- 'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir . '/../lib/User/OfflineUser.php',
62		- 'OCA\\User_LDAP\\User\\User' => $baseDir . '/../lib/User/User.php',
63		- 'OCA\\User_LDAP\\User_LDAP' => $baseDir . '/../lib/User_LDAP.php',
64		- 'OCA\\User_LDAP\\User_Proxy' => $baseDir . '/../lib/User_Proxy.php',
65		- 'OCA\\User_LDAP\\Wizard' => $baseDir . '/../lib/Wizard.php',
66		- 'OCA\\User_LDAP\\WizardResult' => $baseDir . '/../lib/WizardResult.php',
	9	+ 'OCA\\User_LDAP\\Access' => $baseDir.'/../lib/Access.php',
	10	+ 'OCA\\User_LDAP\\AccessFactory' => $baseDir.'/../lib/AccessFactory.php',
	11	+ 'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
	12	+ 'OCA\\User_LDAP\\BackendUtility' => $baseDir.'/../lib/BackendUtility.php',
	13	+ 'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir.'/../lib/Command/CheckUser.php',
	14	+ 'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir.'/../lib/Command/CreateEmptyConfig.php',
	15	+ 'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir.'/../lib/Command/DeleteConfig.php',
	16	+ 'OCA\\User_LDAP\\Command\\Search' => $baseDir.'/../lib/Command/Search.php',
	17	+ 'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir.'/../lib/Command/SetConfig.php',
	18	+ 'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir.'/../lib/Command/ShowConfig.php',
	19	+ 'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir.'/../lib/Command/ShowRemnants.php',
	20	+ 'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir.'/../lib/Command/TestConfig.php',
	21	+ 'OCA\\User_LDAP\\Configuration' => $baseDir.'/../lib/Configuration.php',
	22	+ 'OCA\\User_LDAP\\Connection' => $baseDir.'/../lib/Connection.php',
	23	+ 'OCA\\User_LDAP\\ConnectionFactory' => $baseDir.'/../lib/ConnectionFactory.php',
	24	+ 'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir.'/../lib/Controller/ConfigAPIController.php',
	25	+ 'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir.'/../lib/Controller/RenewPasswordController.php',
	26	+ 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir.'/../lib/Exceptions/ConstraintViolationException.php',
	27	+ 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir.'/../lib/Exceptions/NotOnLDAP.php',
	28	+ 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir.'/../lib/FilesystemHelper.php',
	29	+ 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir.'/../lib/GroupPluginManager.php',
	30	+ 'OCA\\User_LDAP\\Group_LDAP' => $baseDir.'/../lib/Group_LDAP.php',
	31	+ 'OCA\\User_LDAP\\Group_Proxy' => $baseDir.'/../lib/Group_Proxy.php',
	32	+ 'OCA\\User_LDAP\\Helper' => $baseDir.'/../lib/Helper.php',
	33	+ 'OCA\\User_LDAP\\IGroupLDAP' => $baseDir.'/../lib/IGroupLDAP.php',
	34	+ 'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir.'/../lib/ILDAPGroupPlugin.php',
	35	+ 'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir.'/../lib/ILDAPUserPlugin.php',
	36	+ 'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir.'/../lib/ILDAPWrapper.php',
	37	+ 'OCA\\User_LDAP\\IUserLDAP' => $baseDir.'/../lib/IUserLDAP.php',
	38	+ 'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir.'/../lib/Jobs/CleanUp.php',
	39	+ 'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir.'/../lib/Jobs/Sync.php',
	40	+ 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir.'/../lib/Jobs/UpdateGroups.php',
	41	+ 'OCA\\User_LDAP\\LDAP' => $baseDir.'/../lib/LDAP.php',
	42	+ 'OCA\\User_LDAP\\LDAPProvider' => $baseDir.'/../lib/LDAPProvider.php',
	43	+ 'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir.'/../lib/LDAPProviderFactory.php',
	44	+ 'OCA\\User_LDAP\\LDAPUtility' => $baseDir.'/../lib/LDAPUtility.php',
	45	+ 'OCA\\User_LDAP\\LogWrapper' => $baseDir.'/../lib/LogWrapper.php',
	46	+ 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir.'/../lib/Mapping/AbstractMapping.php',
	47	+ 'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir.'/../lib/Mapping/GroupMapping.php',
	48	+ 'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir.'/../lib/Mapping/UserMapping.php',
	49	+ 'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir.'/../lib/Migration/UUIDFix.php',
	50	+ 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir.'/../lib/Migration/UUIDFixGroup.php',
	51	+ 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir.'/../lib/Migration/UUIDFixInsert.php',
	52	+ 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir.'/../lib/Migration/UUIDFixUser.php',
	53	+ 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
	54	+ 'OCA\\User_LDAP\\Proxy' => $baseDir.'/../lib/Proxy.php',
	55	+ 'OCA\\User_LDAP\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
	56	+ 'OCA\\User_LDAP\\Settings\\Section' => $baseDir.'/../lib/Settings/Section.php',
	57	+ 'OCA\\User_LDAP\\UserPluginManager' => $baseDir.'/../lib/UserPluginManager.php',
	58	+ 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir.'/../lib/User/DeletedUsersIndex.php',
	59	+ 'OCA\\User_LDAP\\User\\IUserTools' => $baseDir.'/../lib/User/IUserTools.php',
	60	+ 'OCA\\User_LDAP\\User\\Manager' => $baseDir.'/../lib/User/Manager.php',
	61	+ 'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir.'/../lib/User/OfflineUser.php',
	62	+ 'OCA\\User_LDAP\\User\\User' => $baseDir.'/../lib/User/User.php',
	63	+ 'OCA\\User_LDAP\\User_LDAP' => $baseDir.'/../lib/User_LDAP.php',
	64	+ 'OCA\\User_LDAP\\User_Proxy' => $baseDir.'/../lib/User_Proxy.php',
	65	+ 'OCA\\User_LDAP\\Wizard' => $baseDir.'/../lib/Wizard.php',
	66	+ 'OCA\\User_LDAP\\WizardResult' => $baseDir.'/../lib/WizardResult.php',
67	67	);

		@@ -29,8 +29,8 @@ discard block
		block discarded – undo
29	29	*
30	30	*/
31	31
32		-require_once __DIR__ . '/../lib/versioncheck.php';
33		-require_once __DIR__ . '/../lib/base.php';
	32	+require_once __DIR__.'/../lib/versioncheck.php';
	33	+require_once __DIR__.'/../lib/base.php';
34	34
35	35	if (\OCP\Util::needUpgrade()
36	36	\|\| \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	* Try the appframework routes
73	73	*/
74	74	try {
75		- if(!\OC::$server->getUserSession()->isLoggedIn()) {
	75	+ if (!\OC::$server->getUserSession()->isLoggedIn()) {
76	76	OC::handleLogin(\OC::$server->getRequest());
77	77	}
78	78	OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	OC_API::setContentType();
81	81
82	82	$format = \OC::$server->getRequest()->getParam('format', 'xml');
83		- $txt='Invalid query, please check the syntax. API specifications are here:'
	83	+ $txt = 'Invalid query, please check the syntax. API specifications are here:'
84	84	.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
85	85	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
86	86	} catch (MethodNotAllowedException $e) {
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	OC_API::setContentType();
96	96
97	97	$format = \OC::$server->getRequest()->getParam('format', 'xml');
98		- $txt='Invalid query, please check the syntax. API specifications are here:'
	98	+ $txt = 'Invalid query, please check the syntax. API specifications are here:'
99	99	.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
100	100	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
101	101	}

		@@ -122,7 +122,7 @@
		block discarded – undo
122	122	}
123	123
124	124	$eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
125		- $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
	125	+ $this->dispatcher->dispatch(self::class.'::'.$eventName, new GenericEvent(null, [
126	126	'userId' => $user->getUID(),
127	127	'fileId' => $fileId,
128	128	'path' => $path,

		@@ -79,8 +79,7 @@
		block discarded – undo
79	79	'color-element' => $this->util->elementColor($color),
80	80	'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
81	81	'background' => $backgroundLogo === 'backgroundColor' ?
82		- $this->theming->getColorPrimary() :
83		- $this->url->getAbsoluteURL($this->theming->getBackground()),
	82	+ $this->theming->getColorPrimary() : $this->url->getAbsoluteURL($this->theming->getBackground()),
84	83	'background-plain' => $backgroundLogo === 'backgroundColor',
85	84	'background-default' => !$this->util->isBackgroundThemed(),
86	85	],

		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	$pagingSize = $this->config->getAppValue('user_ldap', $configKey, $minPagingSize);
113	113	$minPagingSize = $minPagingSize === null ? $pagingSize : min($minPagingSize, $pagingSize);
114	114	}
115		- return (int)$minPagingSize;
	115	+ return (int) $minPagingSize;
116	116	}
117	117
118	118	/**
		@@ -123,20 +123,20 @@ discard block
		block discarded – undo
123	123
124	124	$isBackgroundJobModeAjax = $this->config
125	125	->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'ajax';
126		- if($isBackgroundJobModeAjax) {
	126	+ if ($isBackgroundJobModeAjax) {
127	127	return;
128	128	}
129	129
130	130	$cycleData = $this->getCycle();
131		- if($cycleData === null) {
	131	+ if ($cycleData === null) {
132	132	$cycleData = $this->determineNextCycle();
133		- if($cycleData === null) {
	133	+ if ($cycleData === null) {
134	134	$this->updateInterval();
135	135	return;
136	136	}
137	137	}
138	138
139		- if(!$this->qualifiesToRun($cycleData)) {
	139	+ if (!$this->qualifiesToRun($cycleData)) {
140	140	$this->updateInterval();
141	141	return;
142	142	}
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165
166	166	$filter = $access->combineFilterWithAnd(array(
167	167	$access->connection->ldapUserFilter,
168		- $access->connection->ldapUserDisplayName . '=*',
	168	+ $access->connection->ldapUserDisplayName.'=*',
169	169	$access->getFilterPartForUserSearch('')
170	170	));
171	171	$results = $access->fetchListOfUsers(
		@@ -176,10 +176,10 @@ discard block
		block discarded – undo
176	176	true
177	177	);
178	178
179		- if((int)$connection->ldapPagingSize === 0) {
	179	+ if ((int) $connection->ldapPagingSize === 0) {
180	180	return false;
181	181	}
182		- return count($results) >= (int)$connection->ldapPagingSize;
	182	+ return count($results) >= (int) $connection->ldapPagingSize;
183	183	}
184	184
185	185	/**
		@@ -190,16 +190,16 @@ discard block
		block discarded – undo
190	190	*/
191	191	public function getCycle() {
192	192	$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
193		- if(count($prefixes) === 0) {
	193	+ if (count($prefixes) === 0) {
194	194	return null;
195	195	}
196	196
197	197	$cycleData = [
198	198	'prefix' => $this->config->getAppValue('user_ldap', 'background_sync_prefix', null),
199		- 'offset' => (int)$this->config->getAppValue('user_ldap', 'background_sync_offset', 0),
	199	+ 'offset' => (int) $this->config->getAppValue('user_ldap', 'background_sync_offset', 0),
200	200	];
201	201
202		- if(
	202	+ if (
203	203	$cycleData['prefix'] !== null
204	204	&& in_array($cycleData['prefix'], $prefixes)
205	205	) {
		@@ -228,14 +228,14 @@ discard block
		block discarded – undo
228	228	*/
229	229	public function determineNextCycle(array $cycleData = null) {
230	230	$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
231		- if(count($prefixes) === 0) {
	231	+ if (count($prefixes) === 0) {
232	232	return null;
233	233	}
234	234
235	235	// get the next prefix in line and remember it
236	236	$oldPrefix = $cycleData === null ? null : $cycleData['prefix'];
237	237	$prefix = $this->getNextPrefix($oldPrefix);
238		- if($prefix === null) {
	238	+ if ($prefix === null) {
239	239	return null;
240	240	}
241	241	$cycleData['prefix'] = $prefix;
		@@ -253,8 +253,8 @@ discard block
		block discarded – undo
253	253	* @return bool
254	254	*/
255	255	public function qualifiesToRun($cycleData) {
256		- $lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'] . '_lastChange', 0);
257		- if((time() - $lastChange) > 60 * 30) {
	256	+ $lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'].'_lastChange', 0);
	257	+ if ((time() - $lastChange) > 60 * 30) {
258	258	return true;
259	259	}
260	260	return false;
		@@ -267,7 +267,7 @@ discard block
		block discarded – undo
267	267	*/
268	268	protected function increaseOffset($cycleData) {
269	269	$ldapConfig = new Configuration($cycleData['prefix']);
270		- $cycleData['offset'] += (int)$ldapConfig->ldapPagingSize;
	270	+ $cycleData['offset'] += (int) $ldapConfig->ldapPagingSize;
271	271	$this->setCycle($cycleData);
272	272	}
273	273
		@@ -280,17 +280,17 @@ discard block
		block discarded – undo
280	280	protected function getNextPrefix($lastPrefix) {
281	281	$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
282	282	$noOfPrefixes = count($prefixes);
283		- if($noOfPrefixes === 0) {
	283	+ if ($noOfPrefixes === 0) {
284	284	return null;
285	285	}
286	286	$i = $lastPrefix === null ? false : array_search($lastPrefix, $prefixes, true);
287		- if($i === false) {
	287	+ if ($i === false) {
288	288	$i = -1;
289	289	} else {
290	290	$i++;
291	291	}
292	292
293		- if(!isset($prefixes[$i])) {
	293	+ if (!isset($prefixes[$i])) {
294	294	$i = 0;
295	295	}
296	296	return $prefixes[$i];
		@@ -302,49 +302,49 @@ discard block
		block discarded – undo
302	302	* @param array $argument
303	303	*/
304	304	public function setArgument($argument) {
305		- if(isset($argument['config'])) {
	305	+ if (isset($argument['config'])) {
306	306	$this->config = $argument['config'];
307	307	} else {
308	308	$this->config = \OC::$server->getConfig();
309	309	}
310	310
311		- if(isset($argument['helper'])) {
	311	+ if (isset($argument['helper'])) {
312	312	$this->ldapHelper = $argument['helper'];
313	313	} else {
314	314	$this->ldapHelper = new Helper($this->config);
315	315	}
316	316
317		- if(isset($argument['ldapWrapper'])) {
	317	+ if (isset($argument['ldapWrapper'])) {
318	318	$this->ldap = $argument['ldapWrapper'];
319	319	} else {
320	320	$this->ldap = new LDAP();
321	321	}
322	322
323		- if(isset($argument['avatarManager'])) {
	323	+ if (isset($argument['avatarManager'])) {
324	324	$this->avatarManager = $argument['avatarManager'];
325	325	} else {
326	326	$this->avatarManager = \OC::$server->getAvatarManager();
327	327	}
328	328
329		- if(isset($argument['dbc'])) {
	329	+ if (isset($argument['dbc'])) {
330	330	$this->dbc = $argument['dbc'];
331	331	} else {
332	332	$this->dbc = \OC::$server->getDatabaseConnection();
333	333	}
334	334
335		- if(isset($argument['ncUserManager'])) {
	335	+ if (isset($argument['ncUserManager'])) {
336	336	$this->ncUserManager = $argument['ncUserManager'];
337	337	} else {
338	338	$this->ncUserManager = \OC::$server->getUserManager();
339	339	}
340	340
341		- if(isset($argument['notificationManager'])) {
	341	+ if (isset($argument['notificationManager'])) {
342	342	$this->notificationManager = $argument['notificationManager'];
343	343	} else {
344	344	$this->notificationManager = \OC::$server->getNotificationManager();
345	345	}
346	346
347		- if(isset($argument['userManager'])) {
	347	+ if (isset($argument['userManager'])) {
348	348	$this->userManager = $argument['userManager'];
349	349	} else {
350	350	$this->userManager = new Manager(
		@@ -359,19 +359,19 @@ discard block
		block discarded – undo
359	359	);
360	360	}
361	361
362		- if(isset($argument['mapper'])) {
	362	+ if (isset($argument['mapper'])) {
363	363	$this->mapper = $argument['mapper'];
364	364	} else {
365	365	$this->mapper = new UserMapping($this->dbc);
366	366	}
367	367
368		- if(isset($argument['connectionFactory'])) {
	368	+ if (isset($argument['connectionFactory'])) {
369	369	$this->connectionFactory = $argument['connectionFactory'];
370	370	} else {
371	371	$this->connectionFactory = new ConnectionFactory($this->ldap);
372	372	}
373	373
374		- if(isset($argument['accessFactory'])) {
	374	+ if (isset($argument['accessFactory'])) {
375	375	$this->accessFactory = $argument['accessFactory'];
376	376	} else {
377	377	$this->accessFactory = new AccessFactory(

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5	if (version_compare(PHP_VERSION, '7.0') === -1) {
6	6	http_response_code(500);
7	7	echo 'This version of Nextcloud requires at least PHP 7.0<br/>';
8		- echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
	8	+ echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.';
9	9	exit(-1);
10	10	}
11	11
		@@ -13,6 +13,6 @@ discard block
		block discarded – undo
13	13	if (version_compare(PHP_VERSION, '7.3.0') !== -1) {
14	14	http_response_code(500);
15	15	echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>';
16		- echo 'You are currently running ' . PHP_VERSION . '.';
	16	+ echo 'You are currently running '.PHP_VERSION.'.';
17	17	exit(-1);
18	18	}

		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	$folder = $this->appData->getFolder($appName);
73	73	$gzip = false;
74	74	$file = $this->getFile($folder, $fileName, $gzip);
75		- } catch(NotFoundException $e) {
	75	+ } catch (NotFoundException $e) {
76	76	return new NotFoundResponse();
77	77	}
78	78
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	if (strpos($encoding, 'gzip') !== false) {
102	102	try {
103	103	$gzip = true;
104		- return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
	104	+ return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
105	105	} catch (NotFoundException $e) {
106	106	// continue
107	107	}

		@@ -6,84 +6,84 @@
		block discarded – undo
6	6
7	7	class ComposerStaticInitUser_LDAP
8	8	{
9		- public static $prefixLengthsPsr4 = array (
	9	+ public static $prefixLengthsPsr4 = array(
10	10	'O' =>
11		- array (
	11	+ array(
12	12	'OCA\\User_LDAP\\' => 14,
13	13	),
14	14	);
15	15
16		- public static $prefixDirsPsr4 = array (
	16	+ public static $prefixDirsPsr4 = array(
17	17	'OCA\\User_LDAP\\' =>
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\\User_LDAP\\Access' => __DIR__ . '/..' . '/../lib/Access.php',
25		- 'OCA\\User_LDAP\\AccessFactory' => __DIR__ . '/..' . '/../lib/AccessFactory.php',
26		- 'OCA\\User_LDAP\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
27		- 'OCA\\User_LDAP\\BackendUtility' => __DIR__ . '/..' . '/../lib/BackendUtility.php',
28		- 'OCA\\User_LDAP\\Command\\CheckUser' => __DIR__ . '/..' . '/../lib/Command/CheckUser.php',
29		- 'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => __DIR__ . '/..' . '/../lib/Command/CreateEmptyConfig.php',
30		- 'OCA\\User_LDAP\\Command\\DeleteConfig' => __DIR__ . '/..' . '/../lib/Command/DeleteConfig.php',
31		- 'OCA\\User_LDAP\\Command\\Search' => __DIR__ . '/..' . '/../lib/Command/Search.php',
32		- 'OCA\\User_LDAP\\Command\\SetConfig' => __DIR__ . '/..' . '/../lib/Command/SetConfig.php',
33		- 'OCA\\User_LDAP\\Command\\ShowConfig' => __DIR__ . '/..' . '/../lib/Command/ShowConfig.php',
34		- 'OCA\\User_LDAP\\Command\\ShowRemnants' => __DIR__ . '/..' . '/../lib/Command/ShowRemnants.php',
35		- 'OCA\\User_LDAP\\Command\\TestConfig' => __DIR__ . '/..' . '/../lib/Command/TestConfig.php',
36		- 'OCA\\User_LDAP\\Configuration' => __DIR__ . '/..' . '/../lib/Configuration.php',
37		- 'OCA\\User_LDAP\\Connection' => __DIR__ . '/..' . '/../lib/Connection.php',
38		- 'OCA\\User_LDAP\\ConnectionFactory' => __DIR__ . '/..' . '/../lib/ConnectionFactory.php',
39		- 'OCA\\User_LDAP\\Controller\\ConfigAPIController' => __DIR__ . '/..' . '/../lib/Controller/ConfigAPIController.php',
40		- 'OCA\\User_LDAP\\Controller\\RenewPasswordController' => __DIR__ . '/..' . '/../lib/Controller/RenewPasswordController.php',
41		- 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => __DIR__ . '/..' . '/../lib/Exceptions/ConstraintViolationException.php',
42		- 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => __DIR__ . '/..' . '/../lib/Exceptions/NotOnLDAP.php',
43		- 'OCA\\User_LDAP\\FilesystemHelper' => __DIR__ . '/..' . '/../lib/FilesystemHelper.php',
44		- 'OCA\\User_LDAP\\GroupPluginManager' => __DIR__ . '/..' . '/../lib/GroupPluginManager.php',
45		- 'OCA\\User_LDAP\\Group_LDAP' => __DIR__ . '/..' . '/../lib/Group_LDAP.php',
46		- 'OCA\\User_LDAP\\Group_Proxy' => __DIR__ . '/..' . '/../lib/Group_Proxy.php',
47		- 'OCA\\User_LDAP\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
48		- 'OCA\\User_LDAP\\IGroupLDAP' => __DIR__ . '/..' . '/../lib/IGroupLDAP.php',
49		- 'OCA\\User_LDAP\\ILDAPGroupPlugin' => __DIR__ . '/..' . '/../lib/ILDAPGroupPlugin.php',
50		- 'OCA\\User_LDAP\\ILDAPUserPlugin' => __DIR__ . '/..' . '/../lib/ILDAPUserPlugin.php',
51		- 'OCA\\User_LDAP\\ILDAPWrapper' => __DIR__ . '/..' . '/../lib/ILDAPWrapper.php',
52		- 'OCA\\User_LDAP\\IUserLDAP' => __DIR__ . '/..' . '/../lib/IUserLDAP.php',
53		- 'OCA\\User_LDAP\\Jobs\\CleanUp' => __DIR__ . '/..' . '/../lib/Jobs/CleanUp.php',
54		- 'OCA\\User_LDAP\\Jobs\\Sync' => __DIR__ . '/..' . '/../lib/Jobs/Sync.php',
55		- 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => __DIR__ . '/..' . '/../lib/Jobs/UpdateGroups.php',
56		- 'OCA\\User_LDAP\\LDAP' => __DIR__ . '/..' . '/../lib/LDAP.php',
57		- 'OCA\\User_LDAP\\LDAPProvider' => __DIR__ . '/..' . '/../lib/LDAPProvider.php',
58		- 'OCA\\User_LDAP\\LDAPProviderFactory' => __DIR__ . '/..' . '/../lib/LDAPProviderFactory.php',
59		- 'OCA\\User_LDAP\\LDAPUtility' => __DIR__ . '/..' . '/../lib/LDAPUtility.php',
60		- 'OCA\\User_LDAP\\LogWrapper' => __DIR__ . '/..' . '/../lib/LogWrapper.php',
61		- 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => __DIR__ . '/..' . '/../lib/Mapping/AbstractMapping.php',
62		- 'OCA\\User_LDAP\\Mapping\\GroupMapping' => __DIR__ . '/..' . '/../lib/Mapping/GroupMapping.php',
63		- 'OCA\\User_LDAP\\Mapping\\UserMapping' => __DIR__ . '/..' . '/../lib/Mapping/UserMapping.php',
64		- 'OCA\\User_LDAP\\Migration\\UUIDFix' => __DIR__ . '/..' . '/../lib/Migration/UUIDFix.php',
65		- 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixGroup.php',
66		- 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixInsert.php',
67		- 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixUser.php',
68		- 'OCA\\User_LDAP\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
69		- 'OCA\\User_LDAP\\Proxy' => __DIR__ . '/..' . '/../lib/Proxy.php',
70		- 'OCA\\User_LDAP\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
71		- 'OCA\\User_LDAP\\Settings\\Section' => __DIR__ . '/..' . '/../lib/Settings/Section.php',
72		- 'OCA\\User_LDAP\\UserPluginManager' => __DIR__ . '/..' . '/../lib/UserPluginManager.php',
73		- 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => __DIR__ . '/..' . '/../lib/User/DeletedUsersIndex.php',
74		- 'OCA\\User_LDAP\\User\\IUserTools' => __DIR__ . '/..' . '/../lib/User/IUserTools.php',
75		- 'OCA\\User_LDAP\\User\\Manager' => __DIR__ . '/..' . '/../lib/User/Manager.php',
76		- 'OCA\\User_LDAP\\User\\OfflineUser' => __DIR__ . '/..' . '/../lib/User/OfflineUser.php',
77		- 'OCA\\User_LDAP\\User\\User' => __DIR__ . '/..' . '/../lib/User/User.php',
78		- 'OCA\\User_LDAP\\User_LDAP' => __DIR__ . '/..' . '/../lib/User_LDAP.php',
79		- 'OCA\\User_LDAP\\User_Proxy' => __DIR__ . '/..' . '/../lib/User_Proxy.php',
80		- 'OCA\\User_LDAP\\Wizard' => __DIR__ . '/..' . '/../lib/Wizard.php',
81		- 'OCA\\User_LDAP\\WizardResult' => __DIR__ . '/..' . '/../lib/WizardResult.php',
	23	+ public static $classMap = array(
	24	+ 'OCA\\User_LDAP\\Access' => __DIR__.'/..'.'/../lib/Access.php',
	25	+ 'OCA\\User_LDAP\\AccessFactory' => __DIR__.'/..'.'/../lib/AccessFactory.php',
	26	+ 'OCA\\User_LDAP\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
	27	+ 'OCA\\User_LDAP\\BackendUtility' => __DIR__.'/..'.'/../lib/BackendUtility.php',
	28	+ 'OCA\\User_LDAP\\Command\\CheckUser' => __DIR__.'/..'.'/../lib/Command/CheckUser.php',
	29	+ 'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => __DIR__.'/..'.'/../lib/Command/CreateEmptyConfig.php',
	30	+ 'OCA\\User_LDAP\\Command\\DeleteConfig' => __DIR__.'/..'.'/../lib/Command/DeleteConfig.php',
	31	+ 'OCA\\User_LDAP\\Command\\Search' => __DIR__.'/..'.'/../lib/Command/Search.php',
	32	+ 'OCA\\User_LDAP\\Command\\SetConfig' => __DIR__.'/..'.'/../lib/Command/SetConfig.php',
	33	+ 'OCA\\User_LDAP\\Command\\ShowConfig' => __DIR__.'/..'.'/../lib/Command/ShowConfig.php',
	34	+ 'OCA\\User_LDAP\\Command\\ShowRemnants' => __DIR__.'/..'.'/../lib/Command/ShowRemnants.php',
	35	+ 'OCA\\User_LDAP\\Command\\TestConfig' => __DIR__.'/..'.'/../lib/Command/TestConfig.php',
	36	+ 'OCA\\User_LDAP\\Configuration' => __DIR__.'/..'.'/../lib/Configuration.php',
	37	+ 'OCA\\User_LDAP\\Connection' => __DIR__.'/..'.'/../lib/Connection.php',
	38	+ 'OCA\\User_LDAP\\ConnectionFactory' => __DIR__.'/..'.'/../lib/ConnectionFactory.php',
	39	+ 'OCA\\User_LDAP\\Controller\\ConfigAPIController' => __DIR__.'/..'.'/../lib/Controller/ConfigAPIController.php',
	40	+ 'OCA\\User_LDAP\\Controller\\RenewPasswordController' => __DIR__.'/..'.'/../lib/Controller/RenewPasswordController.php',
	41	+ 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => __DIR__.'/..'.'/../lib/Exceptions/ConstraintViolationException.php',
	42	+ 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => __DIR__.'/..'.'/../lib/Exceptions/NotOnLDAP.php',
	43	+ 'OCA\\User_LDAP\\FilesystemHelper' => __DIR__.'/..'.'/../lib/FilesystemHelper.php',
	44	+ 'OCA\\User_LDAP\\GroupPluginManager' => __DIR__.'/..'.'/../lib/GroupPluginManager.php',
	45	+ 'OCA\\User_LDAP\\Group_LDAP' => __DIR__.'/..'.'/../lib/Group_LDAP.php',
	46	+ 'OCA\\User_LDAP\\Group_Proxy' => __DIR__.'/..'.'/../lib/Group_Proxy.php',
	47	+ 'OCA\\User_LDAP\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
	48	+ 'OCA\\User_LDAP\\IGroupLDAP' => __DIR__.'/..'.'/../lib/IGroupLDAP.php',
	49	+ 'OCA\\User_LDAP\\ILDAPGroupPlugin' => __DIR__.'/..'.'/../lib/ILDAPGroupPlugin.php',
	50	+ 'OCA\\User_LDAP\\ILDAPUserPlugin' => __DIR__.'/..'.'/../lib/ILDAPUserPlugin.php',
	51	+ 'OCA\\User_LDAP\\ILDAPWrapper' => __DIR__.'/..'.'/../lib/ILDAPWrapper.php',
	52	+ 'OCA\\User_LDAP\\IUserLDAP' => __DIR__.'/..'.'/../lib/IUserLDAP.php',
	53	+ 'OCA\\User_LDAP\\Jobs\\CleanUp' => __DIR__.'/..'.'/../lib/Jobs/CleanUp.php',
	54	+ 'OCA\\User_LDAP\\Jobs\\Sync' => __DIR__.'/..'.'/../lib/Jobs/Sync.php',
	55	+ 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => __DIR__.'/..'.'/../lib/Jobs/UpdateGroups.php',
	56	+ 'OCA\\User_LDAP\\LDAP' => __DIR__.'/..'.'/../lib/LDAP.php',
	57	+ 'OCA\\User_LDAP\\LDAPProvider' => __DIR__.'/..'.'/../lib/LDAPProvider.php',
	58	+ 'OCA\\User_LDAP\\LDAPProviderFactory' => __DIR__.'/..'.'/../lib/LDAPProviderFactory.php',
	59	+ 'OCA\\User_LDAP\\LDAPUtility' => __DIR__.'/..'.'/../lib/LDAPUtility.php',
	60	+ 'OCA\\User_LDAP\\LogWrapper' => __DIR__.'/..'.'/../lib/LogWrapper.php',
	61	+ 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => __DIR__.'/..'.'/../lib/Mapping/AbstractMapping.php',
	62	+ 'OCA\\User_LDAP\\Mapping\\GroupMapping' => __DIR__.'/..'.'/../lib/Mapping/GroupMapping.php',
	63	+ 'OCA\\User_LDAP\\Mapping\\UserMapping' => __DIR__.'/..'.'/../lib/Mapping/UserMapping.php',
	64	+ 'OCA\\User_LDAP\\Migration\\UUIDFix' => __DIR__.'/..'.'/../lib/Migration/UUIDFix.php',
	65	+ 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => __DIR__.'/..'.'/../lib/Migration/UUIDFixGroup.php',
	66	+ 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => __DIR__.'/..'.'/../lib/Migration/UUIDFixInsert.php',
	67	+ 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => __DIR__.'/..'.'/../lib/Migration/UUIDFixUser.php',
	68	+ 'OCA\\User_LDAP\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
	69	+ 'OCA\\User_LDAP\\Proxy' => __DIR__.'/..'.'/../lib/Proxy.php',
	70	+ 'OCA\\User_LDAP\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
	71	+ 'OCA\\User_LDAP\\Settings\\Section' => __DIR__.'/..'.'/../lib/Settings/Section.php',
	72	+ 'OCA\\User_LDAP\\UserPluginManager' => __DIR__.'/..'.'/../lib/UserPluginManager.php',
	73	+ 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => __DIR__.'/..'.'/../lib/User/DeletedUsersIndex.php',
	74	+ 'OCA\\User_LDAP\\User\\IUserTools' => __DIR__.'/..'.'/../lib/User/IUserTools.php',
	75	+ 'OCA\\User_LDAP\\User\\Manager' => __DIR__.'/..'.'/../lib/User/Manager.php',
	76	+ 'OCA\\User_LDAP\\User\\OfflineUser' => __DIR__.'/..'.'/../lib/User/OfflineUser.php',
	77	+ 'OCA\\User_LDAP\\User\\User' => __DIR__.'/..'.'/../lib/User/User.php',
	78	+ 'OCA\\User_LDAP\\User_LDAP' => __DIR__.'/..'.'/../lib/User_LDAP.php',
	79	+ 'OCA\\User_LDAP\\User_Proxy' => __DIR__.'/..'.'/../lib/User_Proxy.php',
	80	+ 'OCA\\User_LDAP\\Wizard' => __DIR__.'/..'.'/../lib/Wizard.php',
	81	+ 'OCA\\User_LDAP\\WizardResult' => __DIR__.'/..'.'/../lib/WizardResult.php',
82	82	);
83	83
84	84	public static function getInitializer(ClassLoader $loader)
85	85	{
86		- return \Closure::bind(function () use ($loader) {
	86	+ return \Closure::bind(function() use ($loader) {
87	87	$loader->prefixLengthsPsr4 = ComposerStaticInitUser_LDAP::$prefixLengthsPsr4;
88	88	$loader->prefixDirsPsr4 = ComposerStaticInitUser_LDAP::$prefixDirsPsr4;
89	89	$loader->classMap = ComposerStaticInitUser_LDAP::$classMap;

		@@ -35,13 +35,13 @@ discard block
		block discarded – undo
35	35	throw new \RuntimeException("No app with given id <$appId> known.");
36	36	}
37	37
38		- if (!file_exists($appPath . '/appinfo/database.xml')) {
	38	+ if (!file_exists($appPath.'/appinfo/database.xml')) {
39	39	return ['errors' => [], 'warnings' => []];
40	40	}
41	41
42	42	libxml_use_internal_errors(true);
43	43	$loadEntities = libxml_disable_entity_loader(false);
44		- $xml = simplexml_load_file($appPath . '/appinfo/database.xml');
	44	+ $xml = simplexml_load_file($appPath.'/appinfo/database.xml');
45	45	libxml_disable_entity_loader($loadEntities);
46	46
47	47
		@@ -49,37 +49,37 @@ discard block
		block discarded – undo
49	49
50	50	foreach ($xml->table as $table) {
51	51	// Table names
52		- if (strpos((string)$table->name, 'dbprefix') !== 0) {
53		- $errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with dbprefix';
	52	+ if (strpos((string) $table->name, 'dbprefix') !== 0) {
	53	+ $errors[] = 'Database schema error: name of table '.(string) $table->name.' does not start with dbprefix';
54	54	}
55		- $tableName = substr((string)$table->name, strlen('dbprefix'));
	55	+ $tableName = substr((string) $table->name, strlen('dbprefix'));
56	56	if (strpos($tableName, 'dbprefix') !== false) {
57		- $warnings[] = 'Database schema warning: dbprefix should only appear once in name of table ' . (string)$table->name;
	57	+ $warnings[] = 'Database schema warning: dbprefix should only appear once in name of table '.(string) $table->name;
58	58	}
59	59
60	60	if (strlen($tableName) > 27) {
61		- $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + dbprefix allowed';
	61	+ $errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + dbprefix allowed';
62	62	}
63	63
64	64	$hasAutoIncrement = false;
65	65
66	66	// Column names
67	67	foreach ($table->declaration->field as $column) {
68		- if (strpos((string)$column->name, 'dbprefix') !== false) {
69		- $warnings[] = 'Database schema warning: dbprefix should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
	68	+ if (strpos((string) $column->name, 'dbprefix') !== false) {
	69	+ $warnings[] = 'Database schema warning: dbprefix should not appear in name of column '.(string) $column->name.' on table '.(string) $table->name;
70	70	}
71	71
72		- if (strlen((string)$column->name) > 30) {
73		- $errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
	72	+ if (strlen((string) $column->name) > 30) {
	73	+ $errors[] = 'Database schema error: Name of column '.(string) $column->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 30 characters allowed';
74	74	}
75	75
76	76	if ($column->autoincrement) {
77	77	if ($hasAutoIncrement) {
78		- $errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
	78	+ $errors[] = 'Database schema error: Table '.(string) $table->name.' has multiple autoincrement columns';
79	79	}
80	80
81	81	if (strlen($tableName) > 21) {
82		- $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + dbprefix allowed';
	82	+ $errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + dbprefix allowed';
83	83	}
84	84
85	85	$hasAutoIncrement = true;
		@@ -88,14 +88,14 @@ discard block
		block discarded – undo
88	88
89	89	// Index names
90	90	foreach ($table->declaration->index as $index) {
91		- $hasPrefix = strpos((string)$index->name, 'dbprefix');
	91	+ $hasPrefix = strpos((string) $index->name, 'dbprefix');
92	92	if ($hasPrefix !== false && $hasPrefix !== 0) {
93		- $warnings[] = 'Database schema warning: dbprefix should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
	93	+ $warnings[] = 'Database schema warning: dbprefix should only appear at the beginning in name of index '.(string) $index->name.' on table '.(string) $table->name;
94	94	}
95	95
96		- $indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('dbprefix')) : (string)$index->name;
	96	+ $indexName = $hasPrefix === 0 ? substr((string) $index->name, strlen('dbprefix')) : (string) $index->name;
97	97	if (strlen($indexName) > 27) {
98		- $errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + dbprefix allowed';
	98	+ $errors[] = 'Database schema error: Name of index '.(string) $index->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters + dbprefix allowed';
99	99	}
100	100	}
101	101	}

nextcloud / server

Push — master ( 89fdd0...fb17f1 )

Status

Category

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

Spacing +5 added lines, -5 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, -2 removed lines patch added patch discarded remove patch

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

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

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

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

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