Inspection of "Merge pull request #18674 from nextcloud/enh/no_gl..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 32f79c...03cdff )

by Roeland

created 2020-01-06 07:06 UTC

Status

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 use Icewind\Streams\CallbackWrapper;
 use Icewind\Streams\RetryWrapper;
 
-class FTP extends StreamWrapper{
+class FTP extends StreamWrapper {
 	private $password;
 	private $user;
 	private $host;
@@ -46,17 +46,17 @@  discard block
 block discarded – undo
 
 	public function __construct($params) {
 		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
-			$this->host=$params['host'];
-			$this->user=$params['user'];
-			$this->password=$params['password'];
+			$this->host = $params['host'];
+			$this->user = $params['user'];
+			$this->password = $params['password'];
 			if (isset($params['secure'])) {
 				$this->secure = $params['secure'];
 			} else {
 				$this->secure = false;
 			}
-			$this->root=isset($params['root'])?$params['root']:'/';
-			if ( ! $this->root || $this->root[0]!=='/') {
-				$this->root='/'.$this->root;
+			$this->root = isset($params['root']) ? $params['root'] : '/';
+			if (!$this->root || $this->root[0] !== '/') {
+				$this->root = '/'.$this->root;
 			}
 			if (substr($this->root, -1) !== '/') {
 				$this->root .= '/';
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
 		
 	}
 
-	public function getId(){
-		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
+	public function getId() {
+		return 'ftp::'.$this->user.'@'.$this->host.'/'.$this->root;
 	}
 
 	/**
@@ -77,11 +77,11 @@  discard block
 block discarded – undo
 	 * @return string
 	 */
 	public function constructUrl($path) {
-		$url='ftp';
+		$url = 'ftp';
 		if ($this->secure) {
-			$url.='s';
+			$url .= 's';
 		}
-		$url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
+		$url .= '://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
 		return $url;
 	}
 
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
 			return $result;
 		}
 	}
-	public function fopen($path,$mode) {
-		switch($mode) {
+	public function fopen($path, $mode) {
+		switch ($mode) {
 			case 'r':
 			case 'rb':
 			case 'w':
@@ -121,17 +121,17 @@  discard block
 block discarded – undo
 			case 'c':
 			case 'c+':
 				//emulate these
-				if (strrpos($path, '.')!==false) {
-					$ext=substr($path, strrpos($path, '.'));
+				if (strrpos($path, '.') !== false) {
+					$ext = substr($path, strrpos($path, '.'));
 				} else {
-					$ext='';
+					$ext = '';
 				}
 				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
 				if ($this->file_exists($path)) {
 					$this->getFile($path, $tmpFile);
 				}
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 		}

Please login to merge, or discard this patch.

apps/files_external/lib/Config/SimpleSubstitutionTrait.php 1 patch

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

@@ -62,12 +62,12 @@  discard block
 block discarded – undo
 	 */
 	protected function checkPlaceholder(): void {
 		$this->sanitizedPlaceholder = trim(strtolower($this->placeholder));
-		if(!(bool)\preg_match('/^[a-z0-9]*$/', $this->sanitizedPlaceholder)) {
+		if (!(bool) \preg_match('/^[a-z0-9]*$/', $this->sanitizedPlaceholder)) {
 			throw new \RuntimeException(sprintf(
 				'Invalid placeholder %s, only [a-z0-9] are allowed', $this->sanitizedPlaceholder
 			));
 		}
-		if($this->sanitizedPlaceholder === '') {
+		if ($this->sanitizedPlaceholder === '') {
 			throw new \RuntimeException('Invalid empty placeholder');
 		}
 	}
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
 	 * @return mixed
 	 */
 	protected function substituteIfString($value, string $replacement) {
-		if(is_string($value)) {
-			return str_ireplace('$' . $this->sanitizedPlaceholder, $replacement, $value);
+		if (is_string($value)) {
+			return str_ireplace('$'.$this->sanitizedPlaceholder, $replacement, $value);
 		}
 		return $value;
 	}

Please login to merge, or discard this patch.

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

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

@@ -33,7 +33,7 @@  discard block
 block discarded – undo
 use OCP\IL10N;
 
 class Application extends App {
-	public function __construct () {
+	public function __construct() {
 		parent::__construct('user_ldap');
 		$container = $this->getContainer();
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 			);
 		});
 
-		$container->registerService(ILDAPWrapper::class, function () {
+		$container->registerService(ILDAPWrapper::class, function() {
 			return new LDAP();
 		});
 	}
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 			'OCA\\Files_External::loadAdditionalBackends',
 			function() use ($container) {
 				$storagesBackendService = $container->query(BackendService::class);
-				$storagesBackendService->registerConfigHandler('home', function () use ($container) {
+				$storagesBackendService->registerConfigHandler('home', function() use ($container) {
 					return $container->query(ExtStorageConfigHandler::class);
 				});
 			}

Please login to merge, or discard this patch.

apps/user_ldap/lib/Configuration.php 1 patch

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

@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 	 */
 	public function __construct($configPrefix, $autoRead = true) {
 		$this->configPrefix = $configPrefix;
-		if($autoRead) {
+		if ($autoRead) {
 			$this->readConfiguration();
 		}
 	}
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
 	 * @return mixed|null
 	 */
 	public function __get($name) {
-		if(isset($this->config[$name])) {
+		if (isset($this->config[$name])) {
 			return $this->config[$name];
 		}
 		return null;
@@ -156,22 +156,22 @@  discard block
 block discarded – undo
 	 * @return false|null
 	 */
 	public function setConfiguration($config, &$applied = null) {
-		if(!is_array($config)) {
+		if (!is_array($config)) {
 			return false;
 		}
 
 		$cta = $this->getConfigTranslationArray();
-		foreach($config as $inputKey => $val) {
-			if(strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) {
+		foreach ($config as $inputKey => $val) {
+			if (strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) {
 				$key = $cta[$inputKey];
-			} elseif(array_key_exists($inputKey, $this->config)) {
+			} elseif (array_key_exists($inputKey, $this->config)) {
 				$key = $inputKey;
 			} else {
 				continue;
 			}
 
 			$setMethod = 'setValue';
-			switch($key) {
+			switch ($key) {
 				case 'ldapAgentPassword':
 					$setMethod = 'setRawValue';
 					break;
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
 					break;
 			}
 			$this->$setMethod($key, $val);
-			if(is_array($applied)) {
+			if (is_array($applied)) {
 				$applied[] = $inputKey;
 				// storing key as index avoids duplication, and as value for simplicity
 			}
@@ -205,15 +205,15 @@  discard block
 block discarded – undo
 	}
 
 	public function readConfiguration() {
-		if(!$this->configRead && !is_null($this->configPrefix)) {
+		if (!$this->configRead && !is_null($this->configPrefix)) {
 			$cta = array_flip($this->getConfigTranslationArray());
-			foreach($this->config as $key => $val) {
-				if(!isset($cta[$key])) {
+			foreach ($this->config as $key => $val) {
+				if (!isset($cta[$key])) {
 					//some are determined
 					continue;
 				}
 				$dbKey = $cta[$key];
-				switch($key) {
+				switch ($key) {
 					case 'ldapBase':
 					case 'ldapBaseUsers':
 					case 'ldapBaseGroups':
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
 	 */
 	public function saveConfiguration() {
 		$cta = array_flip($this->getConfigTranslationArray());
-		foreach($this->unsavedChanges as $key) {
+		foreach ($this->unsavedChanges as $key) {
 			$value = $this->config[$key];
 			switch ($key) {
 				case 'ldapAgentPassword':
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
 				case 'ldapGroupFilterObjectclass':
 				case 'ldapGroupFilterGroups':
 				case 'ldapLoginFilterAttributes':
-					if(is_array($value)) {
+					if (is_array($value)) {
 						$value = implode("\n", $value);
 					}
 					break;
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
 				case 'ldapUuidGroupAttribute':
 					continue 2;
 			}
-			if(is_null($value)) {
+			if (is_null($value)) {
 				$value = '';
 			}
 			$this->saveValue($cta[$key], $value);
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
 	 */
 	protected function getMultiLine($varName) {
 		$value = $this->getValue($varName);
-		if(empty($value)) {
+		if (empty($value)) {
 			$value = '';
 		} else {
 			$value = preg_split('/\r\n|\r|\n/', $value);
@@ -313,21 +313,21 @@  discard block
 block discarded – undo
 	 * @param array|string $value to set
 	 */
 	protected function setMultiLine($varName, $value) {
-		if(empty($value)) {
+		if (empty($value)) {
 			$value = '';
 		} else if (!is_array($value)) {
 			$value = preg_split('/\r\n|\r|\n|;/', $value);
-			if($value === false) {
+			if ($value === false) {
 				$value = '';
 			}
 		}
 
-		if(!is_array($value)) {
+		if (!is_array($value)) {
 			$finalValue = trim($value);
 		} else {
 			$finalValue = [];
-			foreach($value as $key => $val) {
-				if(is_string($val)) {
+			foreach ($value as $key => $val) {
+				if (is_string($val)) {
 					$val = trim($val);
 					if ($val !== '') {
 						//accidental line breaks are not wanted and can cause
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
 	 */
 	protected function getValue($varName) {
 		static $defaults;
-		if(is_null($defaults)) {
+		if (is_null($defaults)) {
 			$defaults = $this->getDefaults();
 		}
 		return \OC::$server->getConfig()->getAppValue('user_ldap',
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
 	 * @param mixed $value to set
 	 */
 	protected function setValue($varName, $value) {
-		if(is_string($value)) {
+		if (is_string($value)) {
 			$value = trim($value);
 		}
 		$this->config[$varName] = $value;
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
 			'ldap_dynamic_group_member_url'     => 'ldapDynamicGroupMemberURL',
 			'ldap_default_ppolicy_dn'           => 'ldapDefaultPPolicyDN',
 			'ldap_ext_storage_home_attribute'   => 'ldapExtStorageHomeAttribute',
-			'ldapIgnoreNamingRules'             => 'ldapIgnoreNamingRules',	// sysconfig
+			'ldapIgnoreNamingRules'             => 'ldapIgnoreNamingRules', // sysconfig
 		);
 		return $array;
 	}
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
 	 * @throws \RuntimeException
 	 */
 	public function resolveRule($rule) {
-		if($rule === 'avatar') {
+		if ($rule === 'avatar') {
 			return $this->getAvatarAttributes();
 		}
 		throw new \RuntimeException('Invalid rule');
@@ -561,17 +561,17 @@  discard block
 block discarded – undo
 		$value = $this->ldapUserAvatarRule ?: self::AVATAR_PREFIX_DEFAULT;
 		$defaultAttributes = ['jpegphoto', 'thumbnailphoto'];
 
-		if($value === self::AVATAR_PREFIX_NONE) {
+		if ($value === self::AVATAR_PREFIX_NONE) {
 			return [];
 		}
-		if(strpos($value, self::AVATAR_PREFIX_DATA_ATTRIBUTE) === 0) {
+		if (strpos($value, self::AVATAR_PREFIX_DATA_ATTRIBUTE) === 0) {
 			$attribute = trim(substr($value, strlen(self::AVATAR_PREFIX_DATA_ATTRIBUTE)));
-			if($attribute === '') {
+			if ($attribute === '') {
 				return $defaultAttributes;
 			}
 			return [strtolower($attribute)];
 		}
-		if($value !== self::AVATAR_PREFIX_DEFAULT) {
+		if ($value !== self::AVATAR_PREFIX_DEFAULT) {
 			\OC::$server->getLogger()->warning('Invalid config value to ldapUserAvatarRule; falling back to default.');
 		}
 		return $defaultAttributes;

Please login to merge, or discard this patch.

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

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

@@ -6,85 +6,85 @@
 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\\AttributeNotSet' => __DIR__ . '/..' . '/../lib/Exceptions/AttributeNotSet.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\\Handler\\ExtStorageConfigHandler' => __DIR__ . '/..' . '/../lib/Handler/ExtStorageConfigHandler.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\\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\\AttributeNotSet' => __DIR__.'/..'.'/../lib/Exceptions/AttributeNotSet.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\\Handler\\ExtStorageConfigHandler' => __DIR__.'/..'.'/../lib/Handler/ExtStorageConfigHandler.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\\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.

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

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

@@ -6,63 +6,63 @@
 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\\AttributeNotSet' => $baseDir . '/../lib/Exceptions/AttributeNotSet.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\\Handler\\ExtStorageConfigHandler' => $baseDir . '/../lib/Handler/ExtStorageConfigHandler.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\\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\\AttributeNotSet' => $baseDir.'/../lib/Exceptions/AttributeNotSet.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\\Handler\\ExtStorageConfigHandler' => $baseDir.'/../lib/Handler/ExtStorageConfigHandler.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\\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.

lib/private/Files/ObjectStore/S3ObjectTrait.php 1 patch

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

@@ -77,7 +77,7 @@
 block discarded – undo
 	 */
 	function writeObject($urn, $stream) {
 		$count = 0;
-		$countStream = CallbackWrapper::wrap($stream, function ($read) use (&$count) {
+		$countStream = CallbackWrapper::wrap($stream, function($read) use (&$count) {
 			$count += $read;
 		});
 

Please login to merge, or discard this patch.

lib/private/Federation/CloudFederationProviderManager.php 1 patch

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

@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 								IClientService $httpClientService,
 								ICloudIdManager $cloudIdManager,
 								ILogger $logger) {
-		$this->cloudFederationProvider= [];
+		$this->cloudFederationProvider = [];
 		$this->appManager = $appManager;
 		$this->httpClientService = $httpClientService;
 		$this->cloudIdManager = $cloudIdManager;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
 
 		$client = $this->httpClientService->newClient();
 		try {
-			$response = $client->post($ocmEndPoint . '/shares', [
+			$response = $client->post($ocmEndPoint.'/shares', [
 				'body' => json_encode($share->getShare()),
 				'headers' => ['content-type' => 'application/json'],
 				'timeout' => 10,
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
 
 		$client = $this->httpClientService->newClient();
 		try {
-			$response = $client->post($ocmEndPoint . '/notifications', [
+			$response = $client->post($ocmEndPoint.'/notifications', [
 				'body' => json_encode($notification->getMessage()),
 				'headers' => ['content-type' => 'application/json'],
 				'timeout' => 10,
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
 			}
 		} catch (\Exception $e) {
 			// log the error and return false
-			$this->logger->error('error while sending notification for federated share: ' . $e->getMessage());
+			$this->logger->error('error while sending notification for federated share: '.$e->getMessage());
 		}
 
 		return false;
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
 
 		$client = $this->httpClientService->newClient();
 		try {
-			$response = $client->get($url . '/ocm-provider/', ['timeout' => 10, 'connect_timeout' => 10]);
+			$response = $client->get($url.'/ocm-provider/', ['timeout' => 10, 'connect_timeout' => 10]);
 		} catch (\Exception $e) {
 			$this->ocmEndPoints[$url] = '';
 			return '';

Please login to merge, or discard this patch.

core/Command/App/Disable.php 1 patch

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

@@ -72,13 +72,13 @@
 block discarded – undo
 
 	private function disableApp(string $appId, OutputInterface $output): void {
 		if ($this->appManager->isInstalled($appId) === false) {
-			$output->writeln('No such app enabled: ' . $appId);
+			$output->writeln('No such app enabled: '.$appId);
 			return;
 		}
 
 		try {
 			$this->appManager->disableApp($appId);
-			$output->writeln($appId . ' disabled');
+			$output->writeln($appId.' disabled');
 		} catch (\Exception $e) {
 			$output->writeln($e->getMessage());
 			$this->exitCode = 2;

Please login to merge, or discard this patch.

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	use Icewind\Streams\CallbackWrapper;
38	38	use Icewind\Streams\RetryWrapper;
39	39
40		-class FTP extends StreamWrapper{
	40	+class FTP extends StreamWrapper {
41	41	private $password;
42	42	private $user;
43	43	private $host;
		@@ -46,17 +46,17 @@ discard block
		block discarded – undo
46	46
47	47	public function __construct($params) {
48	48	if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
49		- $this->host=$params['host'];
50		- $this->user=$params['user'];
51		- $this->password=$params['password'];
	49	+ $this->host = $params['host'];
	50	+ $this->user = $params['user'];
	51	+ $this->password = $params['password'];
52	52	if (isset($params['secure'])) {
53	53	$this->secure = $params['secure'];
54	54	} else {
55	55	$this->secure = false;
56	56	}
57		- $this->root=isset($params['root'])?$params['root']:'/';
58		- if ( ! $this->root \|\| $this->root[0]!=='/') {
59		- $this->root='/'.$this->root;
	57	+ $this->root = isset($params['root']) ? $params['root'] : '/';
	58	+ if (!$this->root \|\| $this->root[0] !== '/') {
	59	+ $this->root = '/'.$this->root;
60	60	}
61	61	if (substr($this->root, -1) !== '/') {
62	62	$this->root .= '/';
		@@ -67,8 +67,8 @@ discard block
		block discarded – undo
67	67
68	68	}
69	69
70		- public function getId(){
71		- return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
	70	+ public function getId() {
	71	+ return 'ftp::'.$this->user.'@'.$this->host.'/'.$this->root;
72	72	}
73	73
74	74	/**
		@@ -77,11 +77,11 @@ discard block
		block discarded – undo
77	77	* @return string
78	78	*/
79	79	public function constructUrl($path) {
80		- $url='ftp';
	80	+ $url = 'ftp';
81	81	if ($this->secure) {
82		- $url.='s';
	82	+ $url .= 's';
83	83	}
84		- $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
	84	+ $url .= '://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
85	85	return $url;
86	86	}
87	87
		@@ -100,8 +100,8 @@ discard block
		block discarded – undo
100	100	return $result;
101	101	}
102	102	}
103		- public function fopen($path,$mode) {
104		- switch($mode) {
	103	+ public function fopen($path, $mode) {
	104	+ switch ($mode) {
105	105	case 'r':
106	106	case 'rb':
107	107	case 'w':
		@@ -121,17 +121,17 @@ discard block
		block discarded – undo
121	121	case 'c':
122	122	case 'c+':
123	123	//emulate these
124		- if (strrpos($path, '.')!==false) {
125		- $ext=substr($path, strrpos($path, '.'));
	124	+ if (strrpos($path, '.') !== false) {
	125	+ $ext = substr($path, strrpos($path, '.'));
126	126	} else {
127		- $ext='';
	127	+ $ext = '';
128	128	}
129	129	$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
130	130	if ($this->file_exists($path)) {
131	131	$this->getFile($path, $tmpFile);
132	132	}
133	133	$handle = fopen($tmpFile, $mode);
134		- return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
	134	+ return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
135	135	$this->writeBack($tmpFile, $path);
136	136	});
137	137	}

		@@ -62,12 +62,12 @@ discard block
		block discarded – undo
62	62	*/
63	63	protected function checkPlaceholder(): void {
64	64	$this->sanitizedPlaceholder = trim(strtolower($this->placeholder));
65		- if(!(bool)\preg_match('/^[a-z0-9]*$/', $this->sanitizedPlaceholder)) {
	65	+ if (!(bool) \preg_match('/^[a-z0-9]*$/', $this->sanitizedPlaceholder)) {
66	66	throw new \RuntimeException(sprintf(
67	67	'Invalid placeholder %s, only [a-z0-9] are allowed', $this->sanitizedPlaceholder
68	68	));
69	69	}
70		- if($this->sanitizedPlaceholder === '') {
	70	+ if ($this->sanitizedPlaceholder === '') {
71	71	throw new \RuntimeException('Invalid empty placeholder');
72	72	}
73	73	}
		@@ -78,8 +78,8 @@ discard block
		block discarded – undo
78	78	* @return mixed
79	79	*/
80	80	protected function substituteIfString($value, string $replacement) {
81		- if(is_string($value)) {
82		- return str_ireplace('$' . $this->sanitizedPlaceholder, $replacement, $value);
	81	+ if (is_string($value)) {
	82	+ return str_ireplace('$'.$this->sanitizedPlaceholder, $replacement, $value);
83	83	}
84	84	return $value;
85	85	}

		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	use OCP\IL10N;
34	34
35	35	class Application extends App {
36		- public function __construct () {
	36	+ public function __construct() {
37	37	parent::__construct('user_ldap');
38	38	$container = $this->getContainer();
39	39
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	);
56	56	});
57	57
58		- $container->registerService(ILDAPWrapper::class, function () {
	58	+ $container->registerService(ILDAPWrapper::class, function() {
59	59	return new LDAP();
60	60	});
61	61	}
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	'OCA\\Files_External::loadAdditionalBackends',
68	68	function() use ($container) {
69	69	$storagesBackendService = $container->query(BackendService::class);
70		- $storagesBackendService->registerConfigHandler('home', function () use ($container) {
	70	+ $storagesBackendService->registerConfigHandler('home', function() use ($container) {
71	71	return $container->query(ExtStorageConfigHandler::class);
72	72	});
73	73	}

		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	*/
116	116	public function __construct($configPrefix, $autoRead = true) {
117	117	$this->configPrefix = $configPrefix;
118		- if($autoRead) {
	118	+ if ($autoRead) {
119	119	$this->readConfiguration();
120	120	}
121	121	}
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	* @return mixed\|null
126	126	*/
127	127	public function __get($name) {
128		- if(isset($this->config[$name])) {
	128	+ if (isset($this->config[$name])) {
129	129	return $this->config[$name];
130	130	}
131	131	return null;
		@@ -156,22 +156,22 @@ discard block
		block discarded – undo
156	156	* @return false\|null
157	157	*/
158	158	public function setConfiguration($config, &$applied = null) {
159		- if(!is_array($config)) {
	159	+ if (!is_array($config)) {
160	160	return false;
161	161	}
162	162
163	163	$cta = $this->getConfigTranslationArray();
164		- foreach($config as $inputKey => $val) {
165		- if(strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) {
	164	+ foreach ($config as $inputKey => $val) {
	165	+ if (strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) {
166	166	$key = $cta[$inputKey];
167		- } elseif(array_key_exists($inputKey, $this->config)) {
	167	+ } elseif (array_key_exists($inputKey, $this->config)) {
168	168	$key = $inputKey;
169	169	} else {
170	170	continue;
171	171	}
172	172
173	173	$setMethod = 'setValue';
174		- switch($key) {
	174	+ switch ($key) {
175	175	case 'ldapAgentPassword':
176	176	$setMethod = 'setRawValue';
177	177	break;
		@@ -195,7 +195,7 @@ discard block
		block discarded – undo
195	195	break;
196	196	}
197	197	$this->$setMethod($key, $val);
198		- if(is_array($applied)) {
	198	+ if (is_array($applied)) {
199	199	$applied[] = $inputKey;
200	200	// storing key as index avoids duplication, and as value for simplicity
201	201	}
		@@ -205,15 +205,15 @@ discard block
		block discarded – undo
205	205	}
206	206
207	207	public function readConfiguration() {
208		- if(!$this->configRead && !is_null($this->configPrefix)) {
	208	+ if (!$this->configRead && !is_null($this->configPrefix)) {
209	209	$cta = array_flip($this->getConfigTranslationArray());
210		- foreach($this->config as $key => $val) {
211		- if(!isset($cta[$key])) {
	210	+ foreach ($this->config as $key => $val) {
	211	+ if (!isset($cta[$key])) {
212	212	//some are determined
213	213	continue;
214	214	}
215	215	$dbKey = $cta[$key];
216		- switch($key) {
	216	+ switch ($key) {
217	217	case 'ldapBase':
218	218	case 'ldapBaseUsers':
219	219	case 'ldapBaseGroups':
		@@ -256,7 +256,7 @@ discard block
		block discarded – undo
256	256	*/
257	257	public function saveConfiguration() {
258	258	$cta = array_flip($this->getConfigTranslationArray());
259		- foreach($this->unsavedChanges as $key) {
	259	+ foreach ($this->unsavedChanges as $key) {
260	260	$value = $this->config[$key];
261	261	switch ($key) {
262	262	case 'ldapAgentPassword':
		@@ -272,7 +272,7 @@ discard block
		block discarded – undo
272	272	case 'ldapGroupFilterObjectclass':
273	273	case 'ldapGroupFilterGroups':
274	274	case 'ldapLoginFilterAttributes':
275		- if(is_array($value)) {
	275	+ if (is_array($value)) {
276	276	$value = implode("\n", $value);
277	277	}
278	278	break;
		@@ -282,7 +282,7 @@ discard block
		block discarded – undo
282	282	case 'ldapUuidGroupAttribute':
283	283	continue 2;
284	284	}
285		- if(is_null($value)) {
	285	+ if (is_null($value)) {
286	286	$value = '';
287	287	}
288	288	$this->saveValue($cta[$key], $value);
		@@ -297,7 +297,7 @@ discard block
		block discarded – undo
297	297	*/
298	298	protected function getMultiLine($varName) {
299	299	$value = $this->getValue($varName);
300		- if(empty($value)) {
	300	+ if (empty($value)) {
301	301	$value = '';
302	302	} else {
303	303	$value = preg_split('/\r\n\|\r\|\n/', $value);
		@@ -313,21 +313,21 @@ discard block
		block discarded – undo
313	313	* @param array\|string $value to set
314	314	*/
315	315	protected function setMultiLine($varName, $value) {
316		- if(empty($value)) {
	316	+ if (empty($value)) {
317	317	$value = '';
318	318	} else if (!is_array($value)) {
319	319	$value = preg_split('/\r\n\|\r\|\n\|;/', $value);
320		- if($value === false) {
	320	+ if ($value === false) {
321	321	$value = '';
322	322	}
323	323	}
324	324
325		- if(!is_array($value)) {
	325	+ if (!is_array($value)) {
326	326	$finalValue = trim($value);
327	327	} else {
328	328	$finalValue = [];
329		- foreach($value as $key => $val) {
330		- if(is_string($val)) {
	329	+ foreach ($value as $key => $val) {
	330	+ if (is_string($val)) {
331	331	$val = trim($val);
332	332	if ($val !== '') {
333	333	//accidental line breaks are not wanted and can cause
		@@ -374,7 +374,7 @@ discard block
		block discarded – undo
374	374	*/
375	375	protected function getValue($varName) {
376	376	static $defaults;
377		- if(is_null($defaults)) {
	377	+ if (is_null($defaults)) {
378	378	$defaults = $this->getDefaults();
379	379	}
380	380	return \OC::$server->getConfig()->getAppValue('user_ldap',
		@@ -389,7 +389,7 @@ discard block
		block discarded – undo
389	389	* @param mixed $value to set
390	390	*/
391	391	protected function setValue($varName, $value) {
392		- if(is_string($value)) {
	392	+ if (is_string($value)) {
393	393	$value = trim($value);
394	394	}
395	395	$this->config[$varName] = $value;
		@@ -540,7 +540,7 @@ discard block
		block discarded – undo
540	540	'ldap_dynamic_group_member_url' => 'ldapDynamicGroupMemberURL',
541	541	'ldap_default_ppolicy_dn' => 'ldapDefaultPPolicyDN',
542	542	'ldap_ext_storage_home_attribute' => 'ldapExtStorageHomeAttribute',
543		- 'ldapIgnoreNamingRules' => 'ldapIgnoreNamingRules', // sysconfig
	543	+ 'ldapIgnoreNamingRules' => 'ldapIgnoreNamingRules', // sysconfig
544	544	);
545	545	return $array;
546	546	}
		@@ -551,7 +551,7 @@ discard block
		block discarded – undo
551	551	* @throws \RuntimeException
552	552	*/
553	553	public function resolveRule($rule) {
554		- if($rule === 'avatar') {
	554	+ if ($rule === 'avatar') {
555	555	return $this->getAvatarAttributes();
556	556	}
557	557	throw new \RuntimeException('Invalid rule');
		@@ -561,17 +561,17 @@ discard block
		block discarded – undo
561	561	$value = $this->ldapUserAvatarRule ?: self::AVATAR_PREFIX_DEFAULT;
562	562	$defaultAttributes = ['jpegphoto', 'thumbnailphoto'];
563	563
564		- if($value === self::AVATAR_PREFIX_NONE) {
	564	+ if ($value === self::AVATAR_PREFIX_NONE) {
565	565	return [];
566	566	}
567		- if(strpos($value, self::AVATAR_PREFIX_DATA_ATTRIBUTE) === 0) {
	567	+ if (strpos($value, self::AVATAR_PREFIX_DATA_ATTRIBUTE) === 0) {
568	568	$attribute = trim(substr($value, strlen(self::AVATAR_PREFIX_DATA_ATTRIBUTE)));
569		- if($attribute === '') {
	569	+ if ($attribute === '') {
570	570	return $defaultAttributes;
571	571	}
572	572	return [strtolower($attribute)];
573	573	}
574		- if($value !== self::AVATAR_PREFIX_DEFAULT) {
	574	+ if ($value !== self::AVATAR_PREFIX_DEFAULT) {
575	575	\OC::$server->getLogger()->warning('Invalid config value to ldapUserAvatarRule; falling back to default.');
576	576	}
577	577	return $defaultAttributes;

		@@ -6,85 +6,85 @@
		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\\AttributeNotSet' => __DIR__ . '/..' . '/../lib/Exceptions/AttributeNotSet.php',
42		- 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => __DIR__ . '/..' . '/../lib/Exceptions/ConstraintViolationException.php',
43		- 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => __DIR__ . '/..' . '/../lib/Exceptions/NotOnLDAP.php',
44		- 'OCA\\User_LDAP\\FilesystemHelper' => __DIR__ . '/..' . '/../lib/FilesystemHelper.php',
45		- 'OCA\\User_LDAP\\GroupPluginManager' => __DIR__ . '/..' . '/../lib/GroupPluginManager.php',
46		- 'OCA\\User_LDAP\\Group_LDAP' => __DIR__ . '/..' . '/../lib/Group_LDAP.php',
47		- 'OCA\\User_LDAP\\Group_Proxy' => __DIR__ . '/..' . '/../lib/Group_Proxy.php',
48		- 'OCA\\User_LDAP\\Handler\\ExtStorageConfigHandler' => __DIR__ . '/..' . '/../lib/Handler/ExtStorageConfigHandler.php',
49		- 'OCA\\User_LDAP\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
50		- 'OCA\\User_LDAP\\IGroupLDAP' => __DIR__ . '/..' . '/../lib/IGroupLDAP.php',
51		- 'OCA\\User_LDAP\\ILDAPGroupPlugin' => __DIR__ . '/..' . '/../lib/ILDAPGroupPlugin.php',
52		- 'OCA\\User_LDAP\\ILDAPUserPlugin' => __DIR__ . '/..' . '/../lib/ILDAPUserPlugin.php',
53		- 'OCA\\User_LDAP\\ILDAPWrapper' => __DIR__ . '/..' . '/../lib/ILDAPWrapper.php',
54		- 'OCA\\User_LDAP\\IUserLDAP' => __DIR__ . '/..' . '/../lib/IUserLDAP.php',
55		- 'OCA\\User_LDAP\\Jobs\\CleanUp' => __DIR__ . '/..' . '/../lib/Jobs/CleanUp.php',
56		- 'OCA\\User_LDAP\\Jobs\\Sync' => __DIR__ . '/..' . '/../lib/Jobs/Sync.php',
57		- 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => __DIR__ . '/..' . '/../lib/Jobs/UpdateGroups.php',
58		- 'OCA\\User_LDAP\\LDAP' => __DIR__ . '/..' . '/../lib/LDAP.php',
59		- 'OCA\\User_LDAP\\LDAPProvider' => __DIR__ . '/..' . '/../lib/LDAPProvider.php',
60		- 'OCA\\User_LDAP\\LDAPProviderFactory' => __DIR__ . '/..' . '/../lib/LDAPProviderFactory.php',
61		- 'OCA\\User_LDAP\\LDAPUtility' => __DIR__ . '/..' . '/../lib/LDAPUtility.php',
62		- 'OCA\\User_LDAP\\LogWrapper' => __DIR__ . '/..' . '/../lib/LogWrapper.php',
63		- 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => __DIR__ . '/..' . '/../lib/Mapping/AbstractMapping.php',
64		- 'OCA\\User_LDAP\\Mapping\\GroupMapping' => __DIR__ . '/..' . '/../lib/Mapping/GroupMapping.php',
65		- 'OCA\\User_LDAP\\Mapping\\UserMapping' => __DIR__ . '/..' . '/../lib/Mapping/UserMapping.php',
66		- 'OCA\\User_LDAP\\Migration\\UUIDFix' => __DIR__ . '/..' . '/../lib/Migration/UUIDFix.php',
67		- 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixGroup.php',
68		- 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixInsert.php',
69		- 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixUser.php',
70		- 'OCA\\User_LDAP\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
71		- 'OCA\\User_LDAP\\Proxy' => __DIR__ . '/..' . '/../lib/Proxy.php',
72		- 'OCA\\User_LDAP\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
73		- 'OCA\\User_LDAP\\Settings\\Section' => __DIR__ . '/..' . '/../lib/Settings/Section.php',
74		- 'OCA\\User_LDAP\\UserPluginManager' => __DIR__ . '/..' . '/../lib/UserPluginManager.php',
75		- 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => __DIR__ . '/..' . '/../lib/User/DeletedUsersIndex.php',
76		- 'OCA\\User_LDAP\\User\\Manager' => __DIR__ . '/..' . '/../lib/User/Manager.php',
77		- 'OCA\\User_LDAP\\User\\OfflineUser' => __DIR__ . '/..' . '/../lib/User/OfflineUser.php',
78		- 'OCA\\User_LDAP\\User\\User' => __DIR__ . '/..' . '/../lib/User/User.php',
79		- 'OCA\\User_LDAP\\User_LDAP' => __DIR__ . '/..' . '/../lib/User_LDAP.php',
80		- 'OCA\\User_LDAP\\User_Proxy' => __DIR__ . '/..' . '/../lib/User_Proxy.php',
81		- 'OCA\\User_LDAP\\Wizard' => __DIR__ . '/..' . '/../lib/Wizard.php',
82		- '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\\AttributeNotSet' => __DIR__.'/..'.'/../lib/Exceptions/AttributeNotSet.php',
	42	+ 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => __DIR__.'/..'.'/../lib/Exceptions/ConstraintViolationException.php',
	43	+ 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => __DIR__.'/..'.'/../lib/Exceptions/NotOnLDAP.php',
	44	+ 'OCA\\User_LDAP\\FilesystemHelper' => __DIR__.'/..'.'/../lib/FilesystemHelper.php',
	45	+ 'OCA\\User_LDAP\\GroupPluginManager' => __DIR__.'/..'.'/../lib/GroupPluginManager.php',
	46	+ 'OCA\\User_LDAP\\Group_LDAP' => __DIR__.'/..'.'/../lib/Group_LDAP.php',
	47	+ 'OCA\\User_LDAP\\Group_Proxy' => __DIR__.'/..'.'/../lib/Group_Proxy.php',
	48	+ 'OCA\\User_LDAP\\Handler\\ExtStorageConfigHandler' => __DIR__.'/..'.'/../lib/Handler/ExtStorageConfigHandler.php',
	49	+ 'OCA\\User_LDAP\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
	50	+ 'OCA\\User_LDAP\\IGroupLDAP' => __DIR__.'/..'.'/../lib/IGroupLDAP.php',
	51	+ 'OCA\\User_LDAP\\ILDAPGroupPlugin' => __DIR__.'/..'.'/../lib/ILDAPGroupPlugin.php',
	52	+ 'OCA\\User_LDAP\\ILDAPUserPlugin' => __DIR__.'/..'.'/../lib/ILDAPUserPlugin.php',
	53	+ 'OCA\\User_LDAP\\ILDAPWrapper' => __DIR__.'/..'.'/../lib/ILDAPWrapper.php',
	54	+ 'OCA\\User_LDAP\\IUserLDAP' => __DIR__.'/..'.'/../lib/IUserLDAP.php',
	55	+ 'OCA\\User_LDAP\\Jobs\\CleanUp' => __DIR__.'/..'.'/../lib/Jobs/CleanUp.php',
	56	+ 'OCA\\User_LDAP\\Jobs\\Sync' => __DIR__.'/..'.'/../lib/Jobs/Sync.php',
	57	+ 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => __DIR__.'/..'.'/../lib/Jobs/UpdateGroups.php',
	58	+ 'OCA\\User_LDAP\\LDAP' => __DIR__.'/..'.'/../lib/LDAP.php',
	59	+ 'OCA\\User_LDAP\\LDAPProvider' => __DIR__.'/..'.'/../lib/LDAPProvider.php',
	60	+ 'OCA\\User_LDAP\\LDAPProviderFactory' => __DIR__.'/..'.'/../lib/LDAPProviderFactory.php',
	61	+ 'OCA\\User_LDAP\\LDAPUtility' => __DIR__.'/..'.'/../lib/LDAPUtility.php',
	62	+ 'OCA\\User_LDAP\\LogWrapper' => __DIR__.'/..'.'/../lib/LogWrapper.php',
	63	+ 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => __DIR__.'/..'.'/../lib/Mapping/AbstractMapping.php',
	64	+ 'OCA\\User_LDAP\\Mapping\\GroupMapping' => __DIR__.'/..'.'/../lib/Mapping/GroupMapping.php',
	65	+ 'OCA\\User_LDAP\\Mapping\\UserMapping' => __DIR__.'/..'.'/../lib/Mapping/UserMapping.php',
	66	+ 'OCA\\User_LDAP\\Migration\\UUIDFix' => __DIR__.'/..'.'/../lib/Migration/UUIDFix.php',
	67	+ 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => __DIR__.'/..'.'/../lib/Migration/UUIDFixGroup.php',
	68	+ 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => __DIR__.'/..'.'/../lib/Migration/UUIDFixInsert.php',
	69	+ 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => __DIR__.'/..'.'/../lib/Migration/UUIDFixUser.php',
	70	+ 'OCA\\User_LDAP\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
	71	+ 'OCA\\User_LDAP\\Proxy' => __DIR__.'/..'.'/../lib/Proxy.php',
	72	+ 'OCA\\User_LDAP\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
	73	+ 'OCA\\User_LDAP\\Settings\\Section' => __DIR__.'/..'.'/../lib/Settings/Section.php',
	74	+ 'OCA\\User_LDAP\\UserPluginManager' => __DIR__.'/..'.'/../lib/UserPluginManager.php',
	75	+ 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => __DIR__.'/..'.'/../lib/User/DeletedUsersIndex.php',
	76	+ 'OCA\\User_LDAP\\User\\Manager' => __DIR__.'/..'.'/../lib/User/Manager.php',
	77	+ 'OCA\\User_LDAP\\User\\OfflineUser' => __DIR__.'/..'.'/../lib/User/OfflineUser.php',
	78	+ 'OCA\\User_LDAP\\User\\User' => __DIR__.'/..'.'/../lib/User/User.php',
	79	+ 'OCA\\User_LDAP\\User_LDAP' => __DIR__.'/..'.'/../lib/User_LDAP.php',
	80	+ 'OCA\\User_LDAP\\User_Proxy' => __DIR__.'/..'.'/../lib/User_Proxy.php',
	81	+ 'OCA\\User_LDAP\\Wizard' => __DIR__.'/..'.'/../lib/Wizard.php',
	82	+ 'OCA\\User_LDAP\\WizardResult' => __DIR__.'/..'.'/../lib/WizardResult.php',
83	83	);
84	84
85	85	public static function getInitializer(ClassLoader $loader)
86	86	{
87		- return \Closure::bind(function () use ($loader) {
	87	+ return \Closure::bind(function() use ($loader) {
88	88	$loader->prefixLengthsPsr4 = ComposerStaticInitUser_LDAP::$prefixLengthsPsr4;
89	89	$loader->prefixDirsPsr4 = ComposerStaticInitUser_LDAP::$prefixDirsPsr4;
90	90	$loader->classMap = ComposerStaticInitUser_LDAP::$classMap;

		@@ -6,63 +6,63 @@
		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\\AttributeNotSet' => $baseDir . '/../lib/Exceptions/AttributeNotSet.php',
27		- 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir . '/../lib/Exceptions/ConstraintViolationException.php',
28		- 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir . '/../lib/Exceptions/NotOnLDAP.php',
29		- 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir . '/../lib/FilesystemHelper.php',
30		- 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir . '/../lib/GroupPluginManager.php',
31		- 'OCA\\User_LDAP\\Group_LDAP' => $baseDir . '/../lib/Group_LDAP.php',
32		- 'OCA\\User_LDAP\\Group_Proxy' => $baseDir . '/../lib/Group_Proxy.php',
33		- 'OCA\\User_LDAP\\Handler\\ExtStorageConfigHandler' => $baseDir . '/../lib/Handler/ExtStorageConfigHandler.php',
34		- 'OCA\\User_LDAP\\Helper' => $baseDir . '/../lib/Helper.php',
35		- 'OCA\\User_LDAP\\IGroupLDAP' => $baseDir . '/../lib/IGroupLDAP.php',
36		- 'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir . '/../lib/ILDAPGroupPlugin.php',
37		- 'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir . '/../lib/ILDAPUserPlugin.php',
38		- 'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir . '/../lib/ILDAPWrapper.php',
39		- 'OCA\\User_LDAP\\IUserLDAP' => $baseDir . '/../lib/IUserLDAP.php',
40		- 'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir . '/../lib/Jobs/CleanUp.php',
41		- 'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir . '/../lib/Jobs/Sync.php',
42		- 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir . '/../lib/Jobs/UpdateGroups.php',
43		- 'OCA\\User_LDAP\\LDAP' => $baseDir . '/../lib/LDAP.php',
44		- 'OCA\\User_LDAP\\LDAPProvider' => $baseDir . '/../lib/LDAPProvider.php',
45		- 'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir . '/../lib/LDAPProviderFactory.php',
46		- 'OCA\\User_LDAP\\LDAPUtility' => $baseDir . '/../lib/LDAPUtility.php',
47		- 'OCA\\User_LDAP\\LogWrapper' => $baseDir . '/../lib/LogWrapper.php',
48		- 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir . '/../lib/Mapping/AbstractMapping.php',
49		- 'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir . '/../lib/Mapping/GroupMapping.php',
50		- 'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir . '/../lib/Mapping/UserMapping.php',
51		- 'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir . '/../lib/Migration/UUIDFix.php',
52		- 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir . '/../lib/Migration/UUIDFixGroup.php',
53		- 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir . '/../lib/Migration/UUIDFixInsert.php',
54		- 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir . '/../lib/Migration/UUIDFixUser.php',
55		- 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
56		- 'OCA\\User_LDAP\\Proxy' => $baseDir . '/../lib/Proxy.php',
57		- 'OCA\\User_LDAP\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
58		- 'OCA\\User_LDAP\\Settings\\Section' => $baseDir . '/../lib/Settings/Section.php',
59		- 'OCA\\User_LDAP\\UserPluginManager' => $baseDir . '/../lib/UserPluginManager.php',
60		- 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir . '/../lib/User/DeletedUsersIndex.php',
61		- 'OCA\\User_LDAP\\User\\Manager' => $baseDir . '/../lib/User/Manager.php',
62		- 'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir . '/../lib/User/OfflineUser.php',
63		- 'OCA\\User_LDAP\\User\\User' => $baseDir . '/../lib/User/User.php',
64		- 'OCA\\User_LDAP\\User_LDAP' => $baseDir . '/../lib/User_LDAP.php',
65		- 'OCA\\User_LDAP\\User_Proxy' => $baseDir . '/../lib/User_Proxy.php',
66		- 'OCA\\User_LDAP\\Wizard' => $baseDir . '/../lib/Wizard.php',
67		- '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\\AttributeNotSet' => $baseDir.'/../lib/Exceptions/AttributeNotSet.php',
	27	+ 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir.'/../lib/Exceptions/ConstraintViolationException.php',
	28	+ 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir.'/../lib/Exceptions/NotOnLDAP.php',
	29	+ 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir.'/../lib/FilesystemHelper.php',
	30	+ 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir.'/../lib/GroupPluginManager.php',
	31	+ 'OCA\\User_LDAP\\Group_LDAP' => $baseDir.'/../lib/Group_LDAP.php',
	32	+ 'OCA\\User_LDAP\\Group_Proxy' => $baseDir.'/../lib/Group_Proxy.php',
	33	+ 'OCA\\User_LDAP\\Handler\\ExtStorageConfigHandler' => $baseDir.'/../lib/Handler/ExtStorageConfigHandler.php',
	34	+ 'OCA\\User_LDAP\\Helper' => $baseDir.'/../lib/Helper.php',
	35	+ 'OCA\\User_LDAP\\IGroupLDAP' => $baseDir.'/../lib/IGroupLDAP.php',
	36	+ 'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir.'/../lib/ILDAPGroupPlugin.php',
	37	+ 'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir.'/../lib/ILDAPUserPlugin.php',
	38	+ 'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir.'/../lib/ILDAPWrapper.php',
	39	+ 'OCA\\User_LDAP\\IUserLDAP' => $baseDir.'/../lib/IUserLDAP.php',
	40	+ 'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir.'/../lib/Jobs/CleanUp.php',
	41	+ 'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir.'/../lib/Jobs/Sync.php',
	42	+ 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir.'/../lib/Jobs/UpdateGroups.php',
	43	+ 'OCA\\User_LDAP\\LDAP' => $baseDir.'/../lib/LDAP.php',
	44	+ 'OCA\\User_LDAP\\LDAPProvider' => $baseDir.'/../lib/LDAPProvider.php',
	45	+ 'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir.'/../lib/LDAPProviderFactory.php',
	46	+ 'OCA\\User_LDAP\\LDAPUtility' => $baseDir.'/../lib/LDAPUtility.php',
	47	+ 'OCA\\User_LDAP\\LogWrapper' => $baseDir.'/../lib/LogWrapper.php',
	48	+ 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir.'/../lib/Mapping/AbstractMapping.php',
	49	+ 'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir.'/../lib/Mapping/GroupMapping.php',
	50	+ 'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir.'/../lib/Mapping/UserMapping.php',
	51	+ 'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir.'/../lib/Migration/UUIDFix.php',
	52	+ 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir.'/../lib/Migration/UUIDFixGroup.php',
	53	+ 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir.'/../lib/Migration/UUIDFixInsert.php',
	54	+ 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir.'/../lib/Migration/UUIDFixUser.php',
	55	+ 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
	56	+ 'OCA\\User_LDAP\\Proxy' => $baseDir.'/../lib/Proxy.php',
	57	+ 'OCA\\User_LDAP\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
	58	+ 'OCA\\User_LDAP\\Settings\\Section' => $baseDir.'/../lib/Settings/Section.php',
	59	+ 'OCA\\User_LDAP\\UserPluginManager' => $baseDir.'/../lib/UserPluginManager.php',
	60	+ 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir.'/../lib/User/DeletedUsersIndex.php',
	61	+ 'OCA\\User_LDAP\\User\\Manager' => $baseDir.'/../lib/User/Manager.php',
	62	+ 'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir.'/../lib/User/OfflineUser.php',
	63	+ 'OCA\\User_LDAP\\User\\User' => $baseDir.'/../lib/User/User.php',
	64	+ 'OCA\\User_LDAP\\User_LDAP' => $baseDir.'/../lib/User_LDAP.php',
	65	+ 'OCA\\User_LDAP\\User_Proxy' => $baseDir.'/../lib/User_Proxy.php',
	66	+ 'OCA\\User_LDAP\\Wizard' => $baseDir.'/../lib/Wizard.php',
	67	+ 'OCA\\User_LDAP\\WizardResult' => $baseDir.'/../lib/WizardResult.php',
68	68	);

		@@ -77,7 +77,7 @@
		block discarded – undo
77	77	*/
78	78	function writeObject($urn, $stream) {
79	79	$count = 0;
80		- $countStream = CallbackWrapper::wrap($stream, function ($read) use (&$count) {
	80	+ $countStream = CallbackWrapper::wrap($stream, function($read) use (&$count) {
81	81	$count += $read;
82	82	});
83	83

		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	IClientService $httpClientService,
75	75	ICloudIdManager $cloudIdManager,
76	76	ILogger $logger) {
77		- $this->cloudFederationProvider= [];
	77	+ $this->cloudFederationProvider = [];
78	78	$this->appManager = $appManager;
79	79	$this->httpClientService = $httpClientService;
80	80	$this->cloudIdManager = $cloudIdManager;
		@@ -140,7 +140,7 @@ discard block
		block discarded – undo
140	140
141	141	$client = $this->httpClientService->newClient();
142	142	try {
143		- $response = $client->post($ocmEndPoint . '/shares', [
	143	+ $response = $client->post($ocmEndPoint.'/shares', [
144	144	'body' => json_encode($share->getShare()),
145	145	'headers' => ['content-type' => 'application/json'],
146	146	'timeout' => 10,
		@@ -180,7 +180,7 @@ discard block
		block discarded – undo
180	180
181	181	$client = $this->httpClientService->newClient();
182	182	try {
183		- $response = $client->post($ocmEndPoint . '/notifications', [
	183	+ $response = $client->post($ocmEndPoint.'/notifications', [
184	184	'body' => json_encode($notification->getMessage()),
185	185	'headers' => ['content-type' => 'application/json'],
186	186	'timeout' => 10,
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	}
193	193	} catch (\Exception $e) {
194	194	// log the error and return false
195		- $this->logger->error('error while sending notification for federated share: ' . $e->getMessage());
	195	+ $this->logger->error('error while sending notification for federated share: '.$e->getMessage());
196	196	}
197	197
198	198	return false;
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220
221	221	$client = $this->httpClientService->newClient();
222	222	try {
223		- $response = $client->get($url . '/ocm-provider/', ['timeout' => 10, 'connect_timeout' => 10]);
	223	+ $response = $client->get($url.'/ocm-provider/', ['timeout' => 10, 'connect_timeout' => 10]);
224	224	} catch (\Exception $e) {
225	225	$this->ocmEndPoints[$url] = '';
226	226	return '';

		@@ -72,13 +72,13 @@
		block discarded – undo
72	72
73	73	private function disableApp(string $appId, OutputInterface $output): void {
74	74	if ($this->appManager->isInstalled($appId) === false) {
75		- $output->writeln('No such app enabled: ' . $appId);
	75	+ $output->writeln('No such app enabled: '.$appId);
76	76	return;
77	77	}
78	78
79	79	try {
80	80	$this->appManager->disableApp($appId);
81		- $output->writeln($appId . ' disabled');
	81	+ $output->writeln($appId.' disabled');
82	82	} catch (\Exception $e) {
83	83	$output->writeln($e->getMessage());
84	84	$this->exitCode = 2;

nextcloud / server

Push — master ( 32f79c...03cdff )

Status

Category

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

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

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

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

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

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

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

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

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