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

Completed

Push — master ( f700cd...5cc8ea )

by Lukas

created 2017-11-27 16:26 UTC

Status

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/MissingDependency.php 1 patch

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

@@ -27,39 +27,39 @@
 block discarded – undo
  */
 class MissingDependency {
 
-	/** @var string */
-	private $dependency;
+    /** @var string */
+    private $dependency;
 
-	/** @var string|null Custom message */
-	private $message = null;
+    /** @var string|null Custom message */
+    private $message = null;
 
-	/**
-	 * @param string $dependency
-	 */
-	public function __construct($dependency) {
-		$this->dependency = $dependency;
-	}
+    /**
+     * @param string $dependency
+     */
+    public function __construct($dependency) {
+        $this->dependency = $dependency;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getDependency() {
-		return $this->dependency;
-	}
+    /**
+     * @return string
+     */
+    public function getDependency() {
+        return $this->dependency;
+    }
 
-	/**
-	 * @return string|null
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
+    /**
+     * @return string|null
+     */
+    public function getMessage() {
+        return $this->message;
+    }
 
-	/**
-	 * @param string $message
-	 * @return self
-	 */
-	public function setMessage($message) {
-		$this->message = $message;
-		return $this;
-	}
+    /**
+     * @param string $message
+     * @return self
+     */
+    public function setMessage($message) {
+        $this->message = $message;
+        return $this;
+    }
 }

Please login to merge, or discard this patch.

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

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

@@ -29,14 +29,14 @@
 block discarded – undo
  */
 trait DependencyTrait {
 
-	/**
-	 * Check if object is valid for use
-	 *
-	 * @return MissingDependency[] Unsatisfied dependencies
-	 */
-	public function checkDependencies() {
-		return []; // no dependencies by default
-	}
+    /**
+     * Check if object is valid for use
+     *
+     * @return MissingDependency[] Unsatisfied dependencies
+     */
+    public function checkDependencies() {
+        return []; // no dependencies by default
+    }
 
 }
 

Please login to merge, or discard this patch.

apps/files_external/appinfo/routes.php 1 patch

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

@@ -30,40 +30,40 @@
 block discarded – undo
  * @var $this \OCP\Route\IRouter
  **/
 \OC_Mount_Config::$app->registerRoutes(
-	$this,
-	array(
-		'resources' => array(
-			'global_storages' => array('url' => '/globalstorages'),
-			'user_storages' => array('url' => '/userstorages'),
-			'user_global_storages' => array('url' => '/userglobalstorages'),
-		),
-		'routes' => array(
-			array(
-				'name' => 'Ajax#getSshKeys',
-				'url' => '/ajax/public_key.php',
-				'verb' => 'POST',
-				'requirements' => array()
-			),
-			[
-				'name' => 'Ajax#saveGlobalCredentials',
-				'url' => '/globalcredentials',
-				'verb' => 'POST',
-			],
-		)
-	)
+    $this,
+    array(
+        'resources' => array(
+            'global_storages' => array('url' => '/globalstorages'),
+            'user_storages' => array('url' => '/userstorages'),
+            'user_global_storages' => array('url' => '/userglobalstorages'),
+        ),
+        'routes' => array(
+            array(
+                'name' => 'Ajax#getSshKeys',
+                'url' => '/ajax/public_key.php',
+                'verb' => 'POST',
+                'requirements' => array()
+            ),
+            [
+                'name' => 'Ajax#saveGlobalCredentials',
+                'url' => '/globalcredentials',
+                'verb' => 'POST',
+            ],
+        )
+    )
 );
 
 $this->create('files_external_oauth1', 'ajax/oauth1.php')
-	->actionInclude('files_external/ajax/oauth1.php');
+    ->actionInclude('files_external/ajax/oauth1.php');
 $this->create('files_external_oauth2', 'ajax/oauth2.php')
-	->actionInclude('files_external/ajax/oauth2.php');
+    ->actionInclude('files_external/ajax/oauth2.php');
 
 
 $this->create('files_external_list_applicable', '/applicable')
-	->actionInclude('files_external/ajax/applicable.php');
+    ->actionInclude('files_external/ajax/applicable.php');
 
 \OCP\API::register('get',
-		'/apps/files_external/api/v1/mounts',
-		array('\OCA\Files_External\Lib\Api', 'getUserMounts'),
-		'files_external');
+        '/apps/files_external/api/v1/mounts',
+        array('\OCA\Files_External\Lib\Api', 'getUserMounts'),
+        'files_external');
 

Please login to merge, or discard this patch.

		@@ -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	}

		@@ -27,39 +27,39 @@
		block discarded – undo
27	27	*/
28	28	class MissingDependency {
29	29
30		- /** @var string */
31		- private $dependency;
	30	+ /** @var string */
	31	+ private $dependency;
32	32
33		- /** @var string\|null Custom message */
34		- private $message = null;
	33	+ /** @var string\|null Custom message */
	34	+ private $message = null;
35	35
36		- /**
37		- * @param string $dependency
38		- */
39		- public function __construct($dependency) {
40		- $this->dependency = $dependency;
41		- }
	36	+ /**
	37	+ * @param string $dependency
	38	+ */
	39	+ public function __construct($dependency) {
	40	+ $this->dependency = $dependency;
	41	+ }
42	42
43		- /**
44		- * @return string
45		- */
46		- public function getDependency() {
47		- return $this->dependency;
48		- }
	43	+ /**
	44	+ * @return string
	45	+ */
	46	+ public function getDependency() {
	47	+ return $this->dependency;
	48	+ }
49	49
50		- /**
51		- * @return string\|null
52		- */
53		- public function getMessage() {
54		- return $this->message;
55		- }
	50	+ /**
	51	+ * @return string\|null
	52	+ */
	53	+ public function getMessage() {
	54	+ return $this->message;
	55	+ }
56	56
57		- /**
58		- * @param string $message
59		- * @return self
60		- */
61		- public function setMessage($message) {
62		- $this->message = $message;
63		- return $this;
64		- }
	57	+ /**
	58	+ * @param string $message
	59	+ * @return self
	60	+ */
	61	+ public function setMessage($message) {
	62	+ $this->message = $message;
	63	+ return $this;
	64	+ }
65	65	}

		@@ -29,14 +29,14 @@
		block discarded – undo
29	29	*/
30	30	trait DependencyTrait {
31	31
32		- /**
33		- * Check if object is valid for use
34		- *
35		- * @return MissingDependency[] Unsatisfied dependencies
36		- */
37		- public function checkDependencies() {
38		- return []; // no dependencies by default
39		- }
	32	+ /**
	33	+ * Check if object is valid for use
	34	+ *
	35	+ * @return MissingDependency[] Unsatisfied dependencies
	36	+ */
	37	+ public function checkDependencies() {
	38	+ return []; // no dependencies by default
	39	+ }
40	40
41	41	}
42	42

		@@ -30,40 +30,40 @@
		block discarded – undo
30	30	* @var $this \OCP\Route\IRouter
31	31	**/
32	32	\OC_Mount_Config::$app->registerRoutes(
33		- $this,
34		- array(
35		- 'resources' => array(
36		- 'global_storages' => array('url' => '/globalstorages'),
37		- 'user_storages' => array('url' => '/userstorages'),
38		- 'user_global_storages' => array('url' => '/userglobalstorages'),
39		- ),
40		- 'routes' => array(
41		- array(
42		- 'name' => 'Ajax#getSshKeys',
43		- 'url' => '/ajax/public_key.php',
44		- 'verb' => 'POST',
45		- 'requirements' => array()
46		- ),
47		- [
48		- 'name' => 'Ajax#saveGlobalCredentials',
49		- 'url' => '/globalcredentials',
50		- 'verb' => 'POST',
51		- ],
52		- )
53		- )
	33	+ $this,
	34	+ array(
	35	+ 'resources' => array(
	36	+ 'global_storages' => array('url' => '/globalstorages'),
	37	+ 'user_storages' => array('url' => '/userstorages'),
	38	+ 'user_global_storages' => array('url' => '/userglobalstorages'),
	39	+ ),
	40	+ 'routes' => array(
	41	+ array(
	42	+ 'name' => 'Ajax#getSshKeys',
	43	+ 'url' => '/ajax/public_key.php',
	44	+ 'verb' => 'POST',
	45	+ 'requirements' => array()
	46	+ ),
	47	+ [
	48	+ 'name' => 'Ajax#saveGlobalCredentials',
	49	+ 'url' => '/globalcredentials',
	50	+ 'verb' => 'POST',
	51	+ ],
	52	+ )
	53	+ )
54	54	);
55	55
56	56	$this->create('files_external_oauth1', 'ajax/oauth1.php')
57		- ->actionInclude('files_external/ajax/oauth1.php');
	57	+ ->actionInclude('files_external/ajax/oauth1.php');
58	58	$this->create('files_external_oauth2', 'ajax/oauth2.php')
59		- ->actionInclude('files_external/ajax/oauth2.php');
	59	+ ->actionInclude('files_external/ajax/oauth2.php');
60	60
61	61
62	62	$this->create('files_external_list_applicable', '/applicable')
63		- ->actionInclude('files_external/ajax/applicable.php');
	63	+ ->actionInclude('files_external/ajax/applicable.php');
64	64
65	65	\OCP\API::register('get',
66		- '/apps/files_external/api/v1/mounts',
67		- array('\OCA\Files_External\Lib\Api', 'getUserMounts'),
68		- 'files_external');
	66	+ '/apps/files_external/api/v1/mounts',
	67	+ array('\OCA\Files_External\Lib\Api', 'getUserMounts'),
	68	+ 'files_external');
69	69

nextcloud / server

Push — master ( f700cd...5cc8ea )

Status

Category

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

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

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