Inspection of "Cleaned up personal settings page" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#5550)

by Andreas

created 2017-06-29 10:29 UTC

Status

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

@@ -33,24 +33,24 @@
 block discarded – undo
 
 class FTP extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('ftp')
-			->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\FTP')
-			->setText($l->t('FTP'))
-			->addParameters([
-				(new DefinitionParameter('host', $l->t('Host'))),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('secure', $l->t('Secure ftps://')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('ftp')
+            ->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\FTP')
+            ->setText($l->t('FTP'))
+            ->addParameters([
+                (new DefinitionParameter('host', $l->t('Host'))),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('secure', $l->t('Secure ftps://')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Backend/LegacyBackend.php 1 patch

Indentation +63 added lines, -63 removed lines patch added patch discarded remove patch

@@ -33,73 +33,73 @@
 block discarded – undo
  */
 class LegacyBackend extends Backend {
 
-	use LegacyDependencyCheckPolyfill {
-		LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
-	}
+    use LegacyDependencyCheckPolyfill {
+        LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
+    }
 
-	/** @var bool */
-	protected $hasDependencies = false;
+    /** @var bool */
+    protected $hasDependencies = false;
 
-	/**
-	 * @param string $class
-	 * @param array $definition
-	 * @param Builtin $authMechanism
-	 */
-	public function __construct($class, array $definition, Builtin $authMechanism) {
-		$this
-			->setIdentifier($class)
-			->setStorageClass($class)
-			->setText($definition['backend'])
-			->addAuthScheme(Builtin::SCHEME_BUILTIN)
-			->setLegacyAuthMechanism($authMechanism)
-		;
+    /**
+     * @param string $class
+     * @param array $definition
+     * @param Builtin $authMechanism
+     */
+    public function __construct($class, array $definition, Builtin $authMechanism) {
+        $this
+            ->setIdentifier($class)
+            ->setStorageClass($class)
+            ->setText($definition['backend'])
+            ->addAuthScheme(Builtin::SCHEME_BUILTIN)
+            ->setLegacyAuthMechanism($authMechanism)
+        ;
 
-		foreach ($definition['configuration'] as $name => $placeholder) {
-			$flags = DefinitionParameter::FLAG_NONE;
-			$type = DefinitionParameter::VALUE_TEXT;
-			if ($placeholder[0] === '&') {
-				$flags = DefinitionParameter::FLAG_OPTIONAL;
-				$placeholder = substr($placeholder, 1);
-			}
-			switch ($placeholder[0]) {
-			case '!':
-				$type = DefinitionParameter::VALUE_BOOLEAN;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '*':
-				$type = DefinitionParameter::VALUE_PASSWORD;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '#':
-				$type = DefinitionParameter::VALUE_HIDDEN;
-				$placeholder = substr($placeholder, 1);
-				break;
-			}
-			$this->addParameter((new DefinitionParameter($name, $placeholder))
-				->setType($type)
-				->setFlags($flags)
-			);
-		}
+        foreach ($definition['configuration'] as $name => $placeholder) {
+            $flags = DefinitionParameter::FLAG_NONE;
+            $type = DefinitionParameter::VALUE_TEXT;
+            if ($placeholder[0] === '&') {
+                $flags = DefinitionParameter::FLAG_OPTIONAL;
+                $placeholder = substr($placeholder, 1);
+            }
+            switch ($placeholder[0]) {
+            case '!':
+                $type = DefinitionParameter::VALUE_BOOLEAN;
+                $placeholder = substr($placeholder, 1);
+                break;
+            case '*':
+                $type = DefinitionParameter::VALUE_PASSWORD;
+                $placeholder = substr($placeholder, 1);
+                break;
+            case '#':
+                $type = DefinitionParameter::VALUE_HIDDEN;
+                $placeholder = substr($placeholder, 1);
+                break;
+            }
+            $this->addParameter((new DefinitionParameter($name, $placeholder))
+                ->setType($type)
+                ->setFlags($flags)
+            );
+        }
 
-		if (isset($definition['priority'])) {
-			$this->setPriority($definition['priority']);
-		}
-		if (isset($definition['custom'])) {
-			$this->addCustomJs($definition['custom']);
-		}
-		if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
-			$this->hasDependencies = true;
-		}
-	}
+        if (isset($definition['priority'])) {
+            $this->setPriority($definition['priority']);
+        }
+        if (isset($definition['custom'])) {
+            $this->addCustomJs($definition['custom']);
+        }
+        if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
+            $this->hasDependencies = true;
+        }
+    }
 
-	/**
-	 * @return MissingDependency[]
-	 */
-	public function checkDependencies() {
-		if ($this->hasDependencies) {
-			return $this->doCheckDependencies();
-		}
-		return [];
-	}
+    /**
+     * @return MissingDependency[]
+     */
+    public function checkDependencies() {
+        if ($this->hasDependencies) {
+            return $this->doCheckDependencies();
+        }
+        return [];
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Backend/Swift.php 1 patch

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -33,31 +33,31 @@
 block discarded – undo
 
 class Swift extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
-		$this
-			->setIdentifier('swift')
-			->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
-			->setText($l->t('OpenStack Object Storage'))
-			->addParameters([
-				(new DefinitionParameter('service_name', $l->t('Service name')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('region', $l->t('Region')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('bucket', $l->t('Bucket'))),
-				(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
-			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
-				if (isset($params['options']['key']) && $params['options']['key']) {
-					return $rackspaceAuth;
-				}
-				return $openstackAuth;
-			})
-		;
-	}
+    public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
+        $this
+            ->setIdentifier('swift')
+            ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
+            ->setText($l->t('OpenStack Object Storage'))
+            ->addParameters([
+                (new DefinitionParameter('service_name', $l->t('Service name')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('region', $l->t('Region')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('bucket', $l->t('Bucket'))),
+                (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
+            ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
+                if (isset($params['options']['key']) && $params['options']['key']) {
+                    return $rackspaceAuth;
+                }
+                return $openstackAuth;
+            })
+        ;
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Backend/OwnCloud.php 1 patch

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

@@ -32,22 +32,22 @@
 block discarded – undo
 
 class OwnCloud extends Backend {
 
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('owncloud')
-			->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
-			->setText($l->t('Nextcloud'))
-			->addParameters([
-				(new DefinitionParameter('host', $l->t('URL'))),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('secure', $l->t('Secure https://')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('owncloud')
+            ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
+            ->setText($l->t('Nextcloud'))
+            ->addParameters([
+                (new DefinitionParameter('host', $l->t('URL'))),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('secure', $l->t('Secure https://')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Backend/AmazonS3.php 1 patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -33,30 +33,30 @@
 block discarded – undo
 
 class AmazonS3 extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, AccessKey $legacyAuth) {
-		$this
-			->setIdentifier('amazons3')
-			->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
-			->setText($l->t('Amazon S3'))
-			->addParameters([
-				(new DefinitionParameter('bucket', $l->t('Bucket'))),
-				(new DefinitionParameter('hostname', $l->t('Hostname')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('port', $l->t('Port')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('region', $l->t('Region')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-				(new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-			])
-			->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, AccessKey $legacyAuth) {
+        $this
+            ->setIdentifier('amazons3')
+            ->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
+            ->setText($l->t('Amazon S3'))
+            ->addParameters([
+                (new DefinitionParameter('bucket', $l->t('Bucket'))),
+                (new DefinitionParameter('hostname', $l->t('Hostname')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('port', $l->t('Port')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('region', $l->t('Region')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+                (new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+            ])
+            ->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Backend/SFTP_Key.php 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -32,20 +32,20 @@
 block discarded – undo
 
 class SFTP_Key extends Backend {
 
-	public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
-		$this
-			->setIdentifier('\OC\Files\Storage\SFTP_Key')
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
-			->setText($l->t('SFTP with secret key login'))
-			->addParameters([
-				(new DefinitionParameter('host', $l->t('Host'))),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
-			->setLegacyAuthMechanism($legacyAuth)
-			->deprecateTo($sftpBackend)
-		;
-	}
+    public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
+        $this
+            ->setIdentifier('\OC\Files\Storage\SFTP_Key')
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
+            ->setText($l->t('SFTP with secret key login'))
+            ->addParameters([
+                (new DefinitionParameter('host', $l->t('Host'))),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
+            ->setLegacyAuthMechanism($legacyAuth)
+            ->deprecateTo($sftpBackend)
+        ;
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Backend/SMB.php 1 patch

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

@@ -35,36 +35,36 @@
 block discarded – undo
 
 class SMB extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('smb')
-			->addIdentifierAlias('\OC\Files\Storage\SMB') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
-			->setText($l->t('SMB / CIFS'))
-			->addParameters([
-				(new DefinitionParameter('host', $l->t('Host'))),
-				(new DefinitionParameter('share', $l->t('Share'))),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('domain', $l->t('Domain')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('smb')
+            ->addIdentifierAlias('\OC\Files\Storage\SMB') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
+            ->setText($l->t('SMB / CIFS'))
+            ->addParameters([
+                (new DefinitionParameter('host', $l->t('Host'))),
+                (new DefinitionParameter('share', $l->t('Share'))),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('domain', $l->t('Domain')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
-	/**
-	 * @param StorageConfig $storage
-	 * @param IUser $user
-	 */
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		$user = $storage->getBackendOption('user');
-		if ($domain = $storage->getBackendOption('domain')) {
-			$storage->setBackendOption('user', $domain.'\\'.$user);
-		}
-	}
+    /**
+     * @param StorageConfig $storage
+     * @param IUser $user
+     */
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        $user = $storage->getBackendOption('user');
+        if ($domain = $storage->getBackendOption('domain')) {
+            $storage->setBackendOption('user', $domain.'\\'.$user);
+        }
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Backend/SMB_OC.php 1 patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -38,36 +38,36 @@
 block discarded – undo
  */
 class SMB_OC extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
-		$this
-			->setIdentifier('\OC\Files\Storage\SMB_OC')
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
-			->setText($l->t('SMB / CIFS using OC login'))
-			->addParameters([
-				(new DefinitionParameter('host', $l->t('Host'))),
-				(new DefinitionParameter('username_as_share', $l->t('Username as share')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-				(new DefinitionParameter('share', $l->t('Share')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-			->deprecateTo($smbBackend)
-		;
-	}
+    public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
+        $this
+            ->setIdentifier('\OC\Files\Storage\SMB_OC')
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
+            ->setText($l->t('SMB / CIFS using OC login'))
+            ->addParameters([
+                (new DefinitionParameter('host', $l->t('Host'))),
+                (new DefinitionParameter('username_as_share', $l->t('Username as share')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+                (new DefinitionParameter('share', $l->t('Share')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->setPriority(BackendService::PRIORITY_DEFAULT - 10)
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+            ->deprecateTo($smbBackend)
+        ;
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        $username_as_share = ($storage->getBackendOption('username_as_share') === true);
 
-		if ($username_as_share) {
-			$share = '/' . $storage->getBackendOption('user');
-			$storage->setBackendOption('share', $share);
-		}
-	}
+        if ($username_as_share) {
+            $share = '/' . $storage->getBackendOption('user');
+            $storage->setBackendOption('share', $share);
+        }
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Backend/Backend.php 1 patch

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

@@ -57,110 +57,110 @@
 block discarded – undo
  */
 class Backend implements \JsonSerializable {
 
-	use VisibilityTrait;
-	use FrontendDefinitionTrait;
-	use PriorityTrait;
-	use DependencyTrait;
-	use StorageModifierTrait;
-	use IdentifierTrait;
-
-	/** @var string storage class */
-	private $storageClass;
-
-	/** @var array 'scheme' => true, supported authentication schemes */
-	private $authSchemes = [];
-
-	/** @var AuthMechanism|callable authentication mechanism fallback */
-	private $legacyAuthMechanism;
-
-	/**
-	 * @return string
-	 */
-	public function getStorageClass() {
-		return $this->storageClass;
-	}
-
-	/**
-	 * @param string $class
-	 * @return self
-	 */
-	public function setStorageClass($class) {
-		$this->storageClass = $class;
-		return $this;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAuthSchemes() {
-		if (empty($this->authSchemes)) {
-			return [AuthMechanism::SCHEME_NULL => true];
-		}
-		return $this->authSchemes;
-	}
-
-	/**
-	 * @param string $scheme
-	 * @return self
-	 */
-	public function addAuthScheme($scheme) {
-		$this->authSchemes[$scheme] = true;
-		return $this;
-	}
-
-	/**
-	 * @param array $parameters storage parameters, for dynamic mechanism selection
-	 * @return AuthMechanism
-	 */
-	public function getLegacyAuthMechanism(array $parameters = []) {
-		if (is_callable($this->legacyAuthMechanism)) {
-			return call_user_func($this->legacyAuthMechanism, $parameters);
-		}
-		return $this->legacyAuthMechanism;
-	}
-
-	/**
-	 * @param AuthMechanism $authMechanism
-	 * @return self
-	 */
-	public function setLegacyAuthMechanism(AuthMechanism $authMechanism) {
-		$this->legacyAuthMechanism = $authMechanism;
-		return $this;
-	}
-
-	/**
-	 * @param callable $callback dynamic auth mechanism selection
-	 * @return self
-	 */
-	public function setLegacyAuthMechanismCallback(callable $callback) {
-		$this->legacyAuthMechanism = $callback;
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 *
-	 * @return array
-	 */
-	public function jsonSerialize() {
-		$data = $this->jsonSerializeDefinition();
-		$data += $this->jsonSerializeIdentifier();
-
-		$data['backend'] = $data['name']; // legacy compat
-		$data['priority'] = $this->getPriority();
-		$data['authSchemes'] = $this->getAuthSchemes();
-
-		return $data;
-	}
-
-	/**
-	 * Check if parameters are satisfied in a StorageConfig
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	public function validateStorage(StorageConfig $storage) {
-		return $this->validateStorageDefinition($storage);
-	}
+    use VisibilityTrait;
+    use FrontendDefinitionTrait;
+    use PriorityTrait;
+    use DependencyTrait;
+    use StorageModifierTrait;
+    use IdentifierTrait;
+
+    /** @var string storage class */
+    private $storageClass;
+
+    /** @var array 'scheme' => true, supported authentication schemes */
+    private $authSchemes = [];
+
+    /** @var AuthMechanism|callable authentication mechanism fallback */
+    private $legacyAuthMechanism;
+
+    /**
+     * @return string
+     */
+    public function getStorageClass() {
+        return $this->storageClass;
+    }
+
+    /**
+     * @param string $class
+     * @return self
+     */
+    public function setStorageClass($class) {
+        $this->storageClass = $class;
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAuthSchemes() {
+        if (empty($this->authSchemes)) {
+            return [AuthMechanism::SCHEME_NULL => true];
+        }
+        return $this->authSchemes;
+    }
+
+    /**
+     * @param string $scheme
+     * @return self
+     */
+    public function addAuthScheme($scheme) {
+        $this->authSchemes[$scheme] = true;
+        return $this;
+    }
+
+    /**
+     * @param array $parameters storage parameters, for dynamic mechanism selection
+     * @return AuthMechanism
+     */
+    public function getLegacyAuthMechanism(array $parameters = []) {
+        if (is_callable($this->legacyAuthMechanism)) {
+            return call_user_func($this->legacyAuthMechanism, $parameters);
+        }
+        return $this->legacyAuthMechanism;
+    }
+
+    /**
+     * @param AuthMechanism $authMechanism
+     * @return self
+     */
+    public function setLegacyAuthMechanism(AuthMechanism $authMechanism) {
+        $this->legacyAuthMechanism = $authMechanism;
+        return $this;
+    }
+
+    /**
+     * @param callable $callback dynamic auth mechanism selection
+     * @return self
+     */
+    public function setLegacyAuthMechanismCallback(callable $callback) {
+        $this->legacyAuthMechanism = $callback;
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     *
+     * @return array
+     */
+    public function jsonSerialize() {
+        $data = $this->jsonSerializeDefinition();
+        $data += $this->jsonSerializeIdentifier();
+
+        $data['backend'] = $data['name']; // legacy compat
+        $data['priority'] = $this->getPriority();
+        $data['authSchemes'] = $this->getAuthSchemes();
+
+        return $data;
+    }
+
+    /**
+     * Check if parameters are satisfied in a StorageConfig
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    public function validateStorage(StorageConfig $storage) {
+        return $this->validateStorageDefinition($storage);
+    }
 
 }
 

Please login to merge, or discard this patch.

		@@ -33,24 +33,24 @@
		block discarded – undo
33	33
34	34	class FTP extends Backend {
35	35
36		- use LegacyDependencyCheckPolyfill;
	36	+ use LegacyDependencyCheckPolyfill;
37	37
38		- public function __construct(IL10N $l, Password $legacyAuth) {
39		- $this
40		- ->setIdentifier('ftp')
41		- ->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat
42		- ->setStorageClass('\OCA\Files_External\Lib\Storage\FTP')
43		- ->setText($l->t('FTP'))
44		- ->addParameters([
45		- (new DefinitionParameter('host', $l->t('Host'))),
46		- (new DefinitionParameter('root', $l->t('Remote subfolder')))
47		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
48		- (new DefinitionParameter('secure', $l->t('Secure ftps://')))
49		- ->setType(DefinitionParameter::VALUE_BOOLEAN),
50		- ])
51		- ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
52		- ->setLegacyAuthMechanism($legacyAuth)
53		- ;
54		- }
	38	+ public function __construct(IL10N $l, Password $legacyAuth) {
	39	+ $this
	40	+ ->setIdentifier('ftp')
	41	+ ->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat
	42	+ ->setStorageClass('\OCA\Files_External\Lib\Storage\FTP')
	43	+ ->setText($l->t('FTP'))
	44	+ ->addParameters([
	45	+ (new DefinitionParameter('host', $l->t('Host'))),
	46	+ (new DefinitionParameter('root', $l->t('Remote subfolder')))
	47	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	48	+ (new DefinitionParameter('secure', $l->t('Secure ftps://')))
	49	+ ->setType(DefinitionParameter::VALUE_BOOLEAN),
	50	+ ])
	51	+ ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
	52	+ ->setLegacyAuthMechanism($legacyAuth)
	53	+ ;
	54	+ }
55	55
56	56	}

		@@ -33,73 +33,73 @@
		block discarded – undo
33	33	*/
34	34	class LegacyBackend extends Backend {
35	35
36		- use LegacyDependencyCheckPolyfill {
37		- LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
38		- }
	36	+ use LegacyDependencyCheckPolyfill {
	37	+ LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
	38	+ }
39	39
40		- /** @var bool */
41		- protected $hasDependencies = false;
	40	+ /** @var bool */
	41	+ protected $hasDependencies = false;
42	42
43		- /**
44		- * @param string $class
45		- * @param array $definition
46		- * @param Builtin $authMechanism
47		- */
48		- public function __construct($class, array $definition, Builtin $authMechanism) {
49		- $this
50		- ->setIdentifier($class)
51		- ->setStorageClass($class)
52		- ->setText($definition['backend'])
53		- ->addAuthScheme(Builtin::SCHEME_BUILTIN)
54		- ->setLegacyAuthMechanism($authMechanism)
55		- ;
	43	+ /**
	44	+ * @param string $class
	45	+ * @param array $definition
	46	+ * @param Builtin $authMechanism
	47	+ */
	48	+ public function __construct($class, array $definition, Builtin $authMechanism) {
	49	+ $this
	50	+ ->setIdentifier($class)
	51	+ ->setStorageClass($class)
	52	+ ->setText($definition['backend'])
	53	+ ->addAuthScheme(Builtin::SCHEME_BUILTIN)
	54	+ ->setLegacyAuthMechanism($authMechanism)
	55	+ ;
56	56
57		- foreach ($definition['configuration'] as $name => $placeholder) {
58		- $flags = DefinitionParameter::FLAG_NONE;
59		- $type = DefinitionParameter::VALUE_TEXT;
60		- if ($placeholder[0] === '&') {
61		- $flags = DefinitionParameter::FLAG_OPTIONAL;
62		- $placeholder = substr($placeholder, 1);
63		- }
64		- switch ($placeholder[0]) {
65		- case '!':
66		- $type = DefinitionParameter::VALUE_BOOLEAN;
67		- $placeholder = substr($placeholder, 1);
68		- break;
69		- case '*':
70		- $type = DefinitionParameter::VALUE_PASSWORD;
71		- $placeholder = substr($placeholder, 1);
72		- break;
73		- case '#':
74		- $type = DefinitionParameter::VALUE_HIDDEN;
75		- $placeholder = substr($placeholder, 1);
76		- break;
77		- }
78		- $this->addParameter((new DefinitionParameter($name, $placeholder))
79		- ->setType($type)
80		- ->setFlags($flags)
81		- );
82		- }
	57	+ foreach ($definition['configuration'] as $name => $placeholder) {
	58	+ $flags = DefinitionParameter::FLAG_NONE;
	59	+ $type = DefinitionParameter::VALUE_TEXT;
	60	+ if ($placeholder[0] === '&') {
	61	+ $flags = DefinitionParameter::FLAG_OPTIONAL;
	62	+ $placeholder = substr($placeholder, 1);
	63	+ }
	64	+ switch ($placeholder[0]) {
	65	+ case '!':
	66	+ $type = DefinitionParameter::VALUE_BOOLEAN;
	67	+ $placeholder = substr($placeholder, 1);
	68	+ break;
	69	+ case '*':
	70	+ $type = DefinitionParameter::VALUE_PASSWORD;
	71	+ $placeholder = substr($placeholder, 1);
	72	+ break;
	73	+ case '#':
	74	+ $type = DefinitionParameter::VALUE_HIDDEN;
	75	+ $placeholder = substr($placeholder, 1);
	76	+ break;
	77	+ }
	78	+ $this->addParameter((new DefinitionParameter($name, $placeholder))
	79	+ ->setType($type)
	80	+ ->setFlags($flags)
	81	+ );
	82	+ }
83	83
84		- if (isset($definition['priority'])) {
85		- $this->setPriority($definition['priority']);
86		- }
87		- if (isset($definition['custom'])) {
88		- $this->addCustomJs($definition['custom']);
89		- }
90		- if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
91		- $this->hasDependencies = true;
92		- }
93		- }
	84	+ if (isset($definition['priority'])) {
	85	+ $this->setPriority($definition['priority']);
	86	+ }
	87	+ if (isset($definition['custom'])) {
	88	+ $this->addCustomJs($definition['custom']);
	89	+ }
	90	+ if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
	91	+ $this->hasDependencies = true;
	92	+ }
	93	+ }
94	94
95		- /**
96		- * @return MissingDependency[]
97		- */
98		- public function checkDependencies() {
99		- if ($this->hasDependencies) {
100		- return $this->doCheckDependencies();
101		- }
102		- return [];
103		- }
	95	+ /**
	96	+ * @return MissingDependency[]
	97	+ */
	98	+ public function checkDependencies() {
	99	+ if ($this->hasDependencies) {
	100	+ return $this->doCheckDependencies();
	101	+ }
	102	+ return [];
	103	+ }
104	104
105	105	}

		@@ -33,31 +33,31 @@
		block discarded – undo
33	33
34	34	class Swift extends Backend {
35	35
36		- use LegacyDependencyCheckPolyfill;
	36	+ use LegacyDependencyCheckPolyfill;
37	37
38		- public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
39		- $this
40		- ->setIdentifier('swift')
41		- ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
42		- ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
43		- ->setText($l->t('OpenStack Object Storage'))
44		- ->addParameters([
45		- (new DefinitionParameter('service_name', $l->t('Service name')))
46		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
47		- (new DefinitionParameter('region', $l->t('Region')))
48		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
49		- (new DefinitionParameter('bucket', $l->t('Bucket'))),
50		- (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
51		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
52		- ])
53		- ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
54		- ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
55		- if (isset($params['options']['key']) && $params['options']['key']) {
56		- return $rackspaceAuth;
57		- }
58		- return $openstackAuth;
59		- })
60		- ;
61		- }
	38	+ public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
	39	+ $this
	40	+ ->setIdentifier('swift')
	41	+ ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
	42	+ ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
	43	+ ->setText($l->t('OpenStack Object Storage'))
	44	+ ->addParameters([
	45	+ (new DefinitionParameter('service_name', $l->t('Service name')))
	46	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	47	+ (new DefinitionParameter('region', $l->t('Region')))
	48	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	49	+ (new DefinitionParameter('bucket', $l->t('Bucket'))),
	50	+ (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
	51	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	52	+ ])
	53	+ ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
	54	+ ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
	55	+ if (isset($params['options']['key']) && $params['options']['key']) {
	56	+ return $rackspaceAuth;
	57	+ }
	58	+ return $openstackAuth;
	59	+ })
	60	+ ;
	61	+ }
62	62
63	63	}

		@@ -32,22 +32,22 @@
		block discarded – undo
32	32
33	33	class OwnCloud extends Backend {
34	34
35		- public function __construct(IL10N $l, Password $legacyAuth) {
36		- $this
37		- ->setIdentifier('owncloud')
38		- ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
39		- ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
40		- ->setText($l->t('Nextcloud'))
41		- ->addParameters([
42		- (new DefinitionParameter('host', $l->t('URL'))),
43		- (new DefinitionParameter('root', $l->t('Remote subfolder')))
44		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
45		- (new DefinitionParameter('secure', $l->t('Secure https://')))
46		- ->setType(DefinitionParameter::VALUE_BOOLEAN),
47		- ])
48		- ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
49		- ->setLegacyAuthMechanism($legacyAuth)
50		- ;
51		- }
	35	+ public function __construct(IL10N $l, Password $legacyAuth) {
	36	+ $this
	37	+ ->setIdentifier('owncloud')
	38	+ ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
	39	+ ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
	40	+ ->setText($l->t('Nextcloud'))
	41	+ ->addParameters([
	42	+ (new DefinitionParameter('host', $l->t('URL'))),
	43	+ (new DefinitionParameter('root', $l->t('Remote subfolder')))
	44	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	45	+ (new DefinitionParameter('secure', $l->t('Secure https://')))
	46	+ ->setType(DefinitionParameter::VALUE_BOOLEAN),
	47	+ ])
	48	+ ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
	49	+ ->setLegacyAuthMechanism($legacyAuth)
	50	+ ;
	51	+ }
52	52
53	53	}

		@@ -33,30 +33,30 @@
		block discarded – undo
33	33
34	34	class AmazonS3 extends Backend {
35	35
36		- use LegacyDependencyCheckPolyfill;
	36	+ use LegacyDependencyCheckPolyfill;
37	37
38		- public function __construct(IL10N $l, AccessKey $legacyAuth) {
39		- $this
40		- ->setIdentifier('amazons3')
41		- ->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
42		- ->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
43		- ->setText($l->t('Amazon S3'))
44		- ->addParameters([
45		- (new DefinitionParameter('bucket', $l->t('Bucket'))),
46		- (new DefinitionParameter('hostname', $l->t('Hostname')))
47		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
48		- (new DefinitionParameter('port', $l->t('Port')))
49		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
50		- (new DefinitionParameter('region', $l->t('Region')))
51		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
52		- (new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
53		- ->setType(DefinitionParameter::VALUE_BOOLEAN),
54		- (new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
55		- ->setType(DefinitionParameter::VALUE_BOOLEAN),
56		- ])
57		- ->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
58		- ->setLegacyAuthMechanism($legacyAuth)
59		- ;
60		- }
	38	+ public function __construct(IL10N $l, AccessKey $legacyAuth) {
	39	+ $this
	40	+ ->setIdentifier('amazons3')
	41	+ ->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
	42	+ ->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
	43	+ ->setText($l->t('Amazon S3'))
	44	+ ->addParameters([
	45	+ (new DefinitionParameter('bucket', $l->t('Bucket'))),
	46	+ (new DefinitionParameter('hostname', $l->t('Hostname')))
	47	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	48	+ (new DefinitionParameter('port', $l->t('Port')))
	49	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	50	+ (new DefinitionParameter('region', $l->t('Region')))
	51	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	52	+ (new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
	53	+ ->setType(DefinitionParameter::VALUE_BOOLEAN),
	54	+ (new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
	55	+ ->setType(DefinitionParameter::VALUE_BOOLEAN),
	56	+ ])
	57	+ ->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
	58	+ ->setLegacyAuthMechanism($legacyAuth)
	59	+ ;
	60	+ }
61	61
62	62	}

		@@ -32,20 +32,20 @@
		block discarded – undo
32	32
33	33	class SFTP_Key extends Backend {
34	34
35		- public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
36		- $this
37		- ->setIdentifier('\OC\Files\Storage\SFTP_Key')
38		- ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
39		- ->setText($l->t('SFTP with secret key login'))
40		- ->addParameters([
41		- (new DefinitionParameter('host', $l->t('Host'))),
42		- (new DefinitionParameter('root', $l->t('Remote subfolder')))
43		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
44		- ])
45		- ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
46		- ->setLegacyAuthMechanism($legacyAuth)
47		- ->deprecateTo($sftpBackend)
48		- ;
49		- }
	35	+ public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
	36	+ $this
	37	+ ->setIdentifier('\OC\Files\Storage\SFTP_Key')
	38	+ ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
	39	+ ->setText($l->t('SFTP with secret key login'))
	40	+ ->addParameters([
	41	+ (new DefinitionParameter('host', $l->t('Host'))),
	42	+ (new DefinitionParameter('root', $l->t('Remote subfolder')))
	43	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	44	+ ])
	45	+ ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
	46	+ ->setLegacyAuthMechanism($legacyAuth)
	47	+ ->deprecateTo($sftpBackend)
	48	+ ;
	49	+ }
50	50
51	51	}

		@@ -35,36 +35,36 @@
		block discarded – undo
35	35
36	36	class SMB extends Backend {
37	37
38		- use LegacyDependencyCheckPolyfill;
	38	+ use LegacyDependencyCheckPolyfill;
39	39
40		- public function __construct(IL10N $l, Password $legacyAuth) {
41		- $this
42		- ->setIdentifier('smb')
43		- ->addIdentifierAlias('\OC\Files\Storage\SMB') // legacy compat
44		- ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
45		- ->setText($l->t('SMB / CIFS'))
46		- ->addParameters([
47		- (new DefinitionParameter('host', $l->t('Host'))),
48		- (new DefinitionParameter('share', $l->t('Share'))),
49		- (new DefinitionParameter('root', $l->t('Remote subfolder')))
50		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
51		- (new DefinitionParameter('domain', $l->t('Domain')))
52		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
53		- ])
54		- ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
55		- ->setLegacyAuthMechanism($legacyAuth)
56		- ;
57		- }
	40	+ public function __construct(IL10N $l, Password $legacyAuth) {
	41	+ $this
	42	+ ->setIdentifier('smb')
	43	+ ->addIdentifierAlias('\OC\Files\Storage\SMB') // legacy compat
	44	+ ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
	45	+ ->setText($l->t('SMB / CIFS'))
	46	+ ->addParameters([
	47	+ (new DefinitionParameter('host', $l->t('Host'))),
	48	+ (new DefinitionParameter('share', $l->t('Share'))),
	49	+ (new DefinitionParameter('root', $l->t('Remote subfolder')))
	50	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	51	+ (new DefinitionParameter('domain', $l->t('Domain')))
	52	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	53	+ ])
	54	+ ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
	55	+ ->setLegacyAuthMechanism($legacyAuth)
	56	+ ;
	57	+ }
58	58
59		- /**
60		- * @param StorageConfig $storage
61		- * @param IUser $user
62		- */
63		- public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
64		- $user = $storage->getBackendOption('user');
65		- if ($domain = $storage->getBackendOption('domain')) {
66		- $storage->setBackendOption('user', $domain.'\\'.$user);
67		- }
68		- }
	59	+ /**
	60	+ * @param StorageConfig $storage
	61	+ * @param IUser $user
	62	+ */
	63	+ public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
	64	+ $user = $storage->getBackendOption('user');
	65	+ if ($domain = $storage->getBackendOption('domain')) {
	66	+ $storage->setBackendOption('user', $domain.'\\'.$user);
	67	+ }
	68	+ }
69	69
70	70	}

		@@ -38,36 +38,36 @@
		block discarded – undo
38	38	*/
39	39	class SMB_OC extends Backend {
40	40
41		- use LegacyDependencyCheckPolyfill;
	41	+ use LegacyDependencyCheckPolyfill;
42	42
43		- public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
44		- $this
45		- ->setIdentifier('\OC\Files\Storage\SMB_OC')
46		- ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
47		- ->setText($l->t('SMB / CIFS using OC login'))
48		- ->addParameters([
49		- (new DefinitionParameter('host', $l->t('Host'))),
50		- (new DefinitionParameter('username_as_share', $l->t('Username as share')))
51		- ->setType(DefinitionParameter::VALUE_BOOLEAN),
52		- (new DefinitionParameter('share', $l->t('Share')))
53		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
54		- (new DefinitionParameter('root', $l->t('Remote subfolder')))
55		- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
56		- ])
57		- ->setPriority(BackendService::PRIORITY_DEFAULT - 10)
58		- ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
59		- ->setLegacyAuthMechanism($legacyAuth)
60		- ->deprecateTo($smbBackend)
61		- ;
62		- }
	43	+ public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
	44	+ $this
	45	+ ->setIdentifier('\OC\Files\Storage\SMB_OC')
	46	+ ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
	47	+ ->setText($l->t('SMB / CIFS using OC login'))
	48	+ ->addParameters([
	49	+ (new DefinitionParameter('host', $l->t('Host'))),
	50	+ (new DefinitionParameter('username_as_share', $l->t('Username as share')))
	51	+ ->setType(DefinitionParameter::VALUE_BOOLEAN),
	52	+ (new DefinitionParameter('share', $l->t('Share')))
	53	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	54	+ (new DefinitionParameter('root', $l->t('Remote subfolder')))
	55	+ ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
	56	+ ])
	57	+ ->setPriority(BackendService::PRIORITY_DEFAULT - 10)
	58	+ ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
	59	+ ->setLegacyAuthMechanism($legacyAuth)
	60	+ ->deprecateTo($smbBackend)
	61	+ ;
	62	+ }
63	63
64		- public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
65		- $username_as_share = ($storage->getBackendOption('username_as_share') === true);
	64	+ public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
	65	+ $username_as_share = ($storage->getBackendOption('username_as_share') === true);
66	66
67		- if ($username_as_share) {
68		- $share = '/' . $storage->getBackendOption('user');
69		- $storage->setBackendOption('share', $share);
70		- }
71		- }
	67	+ if ($username_as_share) {
	68	+ $share = '/' . $storage->getBackendOption('user');
	69	+ $storage->setBackendOption('share', $share);
	70	+ }
	71	+ }
72	72
73	73	}

		@@ -57,110 +57,110 @@
		block discarded – undo
57	57	*/
58	58	class Backend implements \JsonSerializable {
59	59
60		- use VisibilityTrait;
61		- use FrontendDefinitionTrait;
62		- use PriorityTrait;
63		- use DependencyTrait;
64		- use StorageModifierTrait;
65		- use IdentifierTrait;
66		-
67		- /** @var string storage class */
68		- private $storageClass;
69		-
70		- /** @var array 'scheme' => true, supported authentication schemes */
71		- private $authSchemes = [];
72		-
73		- /** @var AuthMechanism\|callable authentication mechanism fallback */
74		- private $legacyAuthMechanism;
75		-
76		- /**
77		- * @return string
78		- */
79		- public function getStorageClass() {
80		- return $this->storageClass;
81		- }
82		-
83		- /**
84		- * @param string $class
85		- * @return self
86		- */
87		- public function setStorageClass($class) {
88		- $this->storageClass = $class;
89		- return $this;
90		- }
91		-
92		- /**
93		- * @return array
94		- */
95		- public function getAuthSchemes() {
96		- if (empty($this->authSchemes)) {
97		- return [AuthMechanism::SCHEME_NULL => true];
98		- }
99		- return $this->authSchemes;
100		- }
101		-
102		- /**
103		- * @param string $scheme
104		- * @return self
105		- */
106		- public function addAuthScheme($scheme) {
107		- $this->authSchemes[$scheme] = true;
108		- return $this;
109		- }
110		-
111		- /**
112		- * @param array $parameters storage parameters, for dynamic mechanism selection
113		- * @return AuthMechanism
114		- */
115		- public function getLegacyAuthMechanism(array $parameters = []) {
116		- if (is_callable($this->legacyAuthMechanism)) {
117		- return call_user_func($this->legacyAuthMechanism, $parameters);
118		- }
119		- return $this->legacyAuthMechanism;
120		- }
121		-
122		- /**
123		- * @param AuthMechanism $authMechanism
124		- * @return self
125		- */
126		- public function setLegacyAuthMechanism(AuthMechanism $authMechanism) {
127		- $this->legacyAuthMechanism = $authMechanism;
128		- return $this;
129		- }
130		-
131		- /**
132		- * @param callable $callback dynamic auth mechanism selection
133		- * @return self
134		- */
135		- public function setLegacyAuthMechanismCallback(callable $callback) {
136		- $this->legacyAuthMechanism = $callback;
137		- }
138		-
139		- /**
140		- * Serialize into JSON for client-side JS
141		- *
142		- * @return array
143		- */
144		- public function jsonSerialize() {
145		- $data = $this->jsonSerializeDefinition();
146		- $data += $this->jsonSerializeIdentifier();
147		-
148		- $data['backend'] = $data['name']; // legacy compat
149		- $data['priority'] = $this->getPriority();
150		- $data['authSchemes'] = $this->getAuthSchemes();
151		-
152		- return $data;
153		- }
154		-
155		- /**
156		- * Check if parameters are satisfied in a StorageConfig
157		- *
158		- * @param StorageConfig $storage
159		- * @return bool
160		- */
161		- public function validateStorage(StorageConfig $storage) {
162		- return $this->validateStorageDefinition($storage);
163		- }
	60	+ use VisibilityTrait;
	61	+ use FrontendDefinitionTrait;
	62	+ use PriorityTrait;
	63	+ use DependencyTrait;
	64	+ use StorageModifierTrait;
	65	+ use IdentifierTrait;
	66	+
	67	+ /** @var string storage class */
	68	+ private $storageClass;
	69	+
	70	+ /** @var array 'scheme' => true, supported authentication schemes */
	71	+ private $authSchemes = [];
	72	+
	73	+ /** @var AuthMechanism\|callable authentication mechanism fallback */
	74	+ private $legacyAuthMechanism;
	75	+
	76	+ /**
	77	+ * @return string
	78	+ */
	79	+ public function getStorageClass() {
	80	+ return $this->storageClass;
	81	+ }
	82	+
	83	+ /**
	84	+ * @param string $class
	85	+ * @return self
	86	+ */
	87	+ public function setStorageClass($class) {
	88	+ $this->storageClass = $class;
	89	+ return $this;
	90	+ }
	91	+
	92	+ /**
	93	+ * @return array
	94	+ */
	95	+ public function getAuthSchemes() {
	96	+ if (empty($this->authSchemes)) {
	97	+ return [AuthMechanism::SCHEME_NULL => true];
	98	+ }
	99	+ return $this->authSchemes;
	100	+ }
	101	+
	102	+ /**
	103	+ * @param string $scheme
	104	+ * @return self
	105	+ */
	106	+ public function addAuthScheme($scheme) {
	107	+ $this->authSchemes[$scheme] = true;
	108	+ return $this;
	109	+ }
	110	+
	111	+ /**
	112	+ * @param array $parameters storage parameters, for dynamic mechanism selection
	113	+ * @return AuthMechanism
	114	+ */
	115	+ public function getLegacyAuthMechanism(array $parameters = []) {
	116	+ if (is_callable($this->legacyAuthMechanism)) {
	117	+ return call_user_func($this->legacyAuthMechanism, $parameters);
	118	+ }
	119	+ return $this->legacyAuthMechanism;
	120	+ }
	121	+
	122	+ /**
	123	+ * @param AuthMechanism $authMechanism
	124	+ * @return self
	125	+ */
	126	+ public function setLegacyAuthMechanism(AuthMechanism $authMechanism) {
	127	+ $this->legacyAuthMechanism = $authMechanism;
	128	+ return $this;
	129	+ }
	130	+
	131	+ /**
	132	+ * @param callable $callback dynamic auth mechanism selection
	133	+ * @return self
	134	+ */
	135	+ public function setLegacyAuthMechanismCallback(callable $callback) {
	136	+ $this->legacyAuthMechanism = $callback;
	137	+ }
	138	+
	139	+ /**
	140	+ * Serialize into JSON for client-side JS
	141	+ *
	142	+ * @return array
	143	+ */
	144	+ public function jsonSerialize() {
	145	+ $data = $this->jsonSerializeDefinition();
	146	+ $data += $this->jsonSerializeIdentifier();
	147	+
	148	+ $data['backend'] = $data['name']; // legacy compat
	149	+ $data['priority'] = $this->getPriority();
	150	+ $data['authSchemes'] = $this->getAuthSchemes();
	151	+
	152	+ return $data;
	153	+ }
	154	+
	155	+ /**
	156	+ * Check if parameters are satisfied in a StorageConfig
	157	+ *
	158	+ * @param StorageConfig $storage
	159	+ * @return bool
	160	+ */
	161	+ public function validateStorage(StorageConfig $storage) {
	162	+ return $this->validateStorageDefinition($storage);
	163	+ }
164	164
165	165	}
166	166

nextcloud / server

Pull Request — master (#5550)

Status

Category

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

Indentation +63 added lines, -63 removed lines patch added patch discarded remove patch

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

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

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

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

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch