nextcloud / server

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

Indentation +29 added lines, -29 removed lines

@@ -35,36 +35,36 @@
 
 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);
+        }
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	 * @param StorageConfig $storage
 	 * @param IUser $user
 	 */
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
 		$user = $storage->getBackendOption('user');
 		if ($domain = $storage->getBackendOption('domain')) {
 			$storage->setBackendOption('user', $domain.'\\'.$user);

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

Indentation +28 added lines, -28 removed lines

@@ -38,36 +38,36 @@
  */
 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);
+        }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -61,11 +61,11 @@
 		;
 	}
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+	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');
+			$share = '/'.$storage->getBackendOption('user');
 			$storage->setBackendOption('share', $share);
 		}
 	}

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

Indentation +104 added lines, -104 removed lines

@@ -57,110 +57,110 @@
  */
 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);
+    }
 
 }
 

apps/files_external/lib/Lib/Backend/Dropbox.php

Indentation +15 added lines, -15 removed lines

@@ -33,21 +33,21 @@
 
 class Dropbox extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, OAuth1 $legacyAuth) {
-		$this
-			->setIdentifier('dropbox')
-			->addIdentifierAlias('\OC\Files\Storage\Dropbox') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\Dropbox')
-			->setText($l->t('Dropbox'))
-			->addParameters([
-				// all parameters handled in OAuth1 mechanism
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_OAUTH1)
-			->addCustomJs('dropbox')
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, OAuth1 $legacyAuth) {
+        $this
+            ->setIdentifier('dropbox')
+            ->addIdentifierAlias('\OC\Files\Storage\Dropbox') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\Dropbox')
+            ->setText($l->t('Dropbox'))
+            ->addParameters([
+                // all parameters handled in OAuth1 mechanism
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_OAUTH1)
+            ->addCustomJs('dropbox')
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

apps/files_external/lib/Lib/FrontendDefinitionTrait.php

Indentation +124 added lines, -124 removed lines

@@ -31,129 +31,129 @@
  */
 trait FrontendDefinitionTrait {
 
-	/** @var string human-readable mechanism name */
-	private $text;
-
-	/** @var DefinitionParameter[] parameters for mechanism */
-	private $parameters = [];
-
-	/** @var string[] custom JS */
-	private $customJs = [];
-
-	/**
-	 * @return string
-	 */
-	public function getText() {
-		return $this->text;
-	}
-
-	/**
-	 * @param string $text
-	 * @return self
-	 */
-	public function setText($text) {
-		$this->text = $text;
-		return $this;
-	}
-
-	/**
-	 * @param FrontendDefinitionTrait $a
-	 * @param FrontendDefinitionTrait $b
-	 * @return int
-	 */
-	public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
-		return strcmp($a->getText(), $b->getText());
-	}
-
-	/**
-	 * @return DefinitionParameter[]
-	 */
-	public function getParameters() {
-		return $this->parameters;
-	}
-
-	/**
-	 * @param DefinitionParameter[] $parameters
-	 * @return self
-	 */
-	public function addParameters(array $parameters) {
-		foreach ($parameters as $parameter) {
-			$this->addParameter($parameter);
-		}
-		return $this;
-	}
-
-	/**
-	 * @param DefinitionParameter $parameter
-	 * @return self
-	 */
-	public function addParameter(DefinitionParameter $parameter) {
-		$this->parameters[$parameter->getName()] = $parameter;
-		return $this;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getCustomJs() {
-		return $this->customJs;
-	}
-
-	/**
-	 * @param string $custom
-	 * @return self
-	 */
-	public function addCustomJs($custom) {
-		$this->customJs[] = $custom;
-		return $this;
-	}
-
-	/**
-	 * @param string $custom
-	 * @return self
-	 * @deprecated 9.1.0, use addCustomJs() instead
-	 */
-	public function setCustomJs($custom) {
-		$this->customJs = [$custom];
-		return $this;
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 *
-	 * @return array
-	 */
-	public function jsonSerializeDefinition() {
-		$configuration = [];
-		foreach ($this->getParameters() as $parameter) {
-			$configuration[$parameter->getName()] = $parameter;
-		}
-
-		$data = [
-			'name' => $this->getText(),
-			'configuration' => $configuration,
-			'custom' => $this->getCustomJs(),
-		];
-		return $data;
-	}
-
-	/**
-	 * Check if parameters are satisfied in a StorageConfig
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	public function validateStorageDefinition(StorageConfig $storage) {
-		foreach ($this->getParameters() as $name => $parameter) {
-			$value = $storage->getBackendOption($name);
-			if (!is_null($value) || !$parameter->isOptional()) {
-				if (!$parameter->validateValue($value)) {
-					return false;
-				}
-				$storage->setBackendOption($name, $value);
-			}
-		}
-		return true;
-	}
+    /** @var string human-readable mechanism name */
+    private $text;
+
+    /** @var DefinitionParameter[] parameters for mechanism */
+    private $parameters = [];
+
+    /** @var string[] custom JS */
+    private $customJs = [];
+
+    /**
+     * @return string
+     */
+    public function getText() {
+        return $this->text;
+    }
+
+    /**
+     * @param string $text
+     * @return self
+     */
+    public function setText($text) {
+        $this->text = $text;
+        return $this;
+    }
+
+    /**
+     * @param FrontendDefinitionTrait $a
+     * @param FrontendDefinitionTrait $b
+     * @return int
+     */
+    public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
+        return strcmp($a->getText(), $b->getText());
+    }
+
+    /**
+     * @return DefinitionParameter[]
+     */
+    public function getParameters() {
+        return $this->parameters;
+    }
+
+    /**
+     * @param DefinitionParameter[] $parameters
+     * @return self
+     */
+    public function addParameters(array $parameters) {
+        foreach ($parameters as $parameter) {
+            $this->addParameter($parameter);
+        }
+        return $this;
+    }
+
+    /**
+     * @param DefinitionParameter $parameter
+     * @return self
+     */
+    public function addParameter(DefinitionParameter $parameter) {
+        $this->parameters[$parameter->getName()] = $parameter;
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getCustomJs() {
+        return $this->customJs;
+    }
+
+    /**
+     * @param string $custom
+     * @return self
+     */
+    public function addCustomJs($custom) {
+        $this->customJs[] = $custom;
+        return $this;
+    }
+
+    /**
+     * @param string $custom
+     * @return self
+     * @deprecated 9.1.0, use addCustomJs() instead
+     */
+    public function setCustomJs($custom) {
+        $this->customJs = [$custom];
+        return $this;
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     *
+     * @return array
+     */
+    public function jsonSerializeDefinition() {
+        $configuration = [];
+        foreach ($this->getParameters() as $parameter) {
+            $configuration[$parameter->getName()] = $parameter;
+        }
+
+        $data = [
+            'name' => $this->getText(),
+            'configuration' => $configuration,
+            'custom' => $this->getCustomJs(),
+        ];
+        return $data;
+    }
+
+    /**
+     * Check if parameters are satisfied in a StorageConfig
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    public function validateStorageDefinition(StorageConfig $storage) {
+        foreach ($this->getParameters() as $name => $parameter) {
+            $value = $storage->getBackendOption($name);
+            if (!is_null($value) || !$parameter->isOptional()) {
+                if (!$parameter->validateValue($value)) {
+                    return false;
+                }
+                $storage->setBackendOption($name, $value);
+            }
+        }
+        return true;
+    }
 
 }

apps/files_external/lib/Lib/MissingDependency.php

Indentation +30 added lines, -30 removed lines

@@ -27,39 +27,39 @@
  */
 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;
+    }
 }

apps/files_external/lib/Lib/DependencyTrait.php

Indentation +8 added lines, -8 removed lines

@@ -29,14 +29,14 @@
  */
 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
+    }
 
 }
 

apps/files_external/lib/Lib/Api.php

Indentation +50 added lines, -50 removed lines

@@ -28,61 +28,61 @@
 
 class Api {
 
-	/**
-	 * Formats the given mount config to a mount entry.
-	 *
-	 * @param string $mountPoint mount point name, relative to the data dir
-	 * @param array $mountConfig mount config to format
-	 *
-	 * @return array entry
-	 */
-	private static function formatMount($mountPoint, $mountConfig) {
-		// strip "/$user/files" from mount point
-		$mountPoint = explode('/', trim($mountPoint, '/'), 3);
-		$mountPoint = $mountPoint[2];
+    /**
+     * Formats the given mount config to a mount entry.
+     *
+     * @param string $mountPoint mount point name, relative to the data dir
+     * @param array $mountConfig mount config to format
+     *
+     * @return array entry
+     */
+    private static function formatMount($mountPoint, $mountConfig) {
+        // strip "/$user/files" from mount point
+        $mountPoint = explode('/', trim($mountPoint, '/'), 3);
+        $mountPoint = $mountPoint[2];
 
-		// split path from mount point
-		$path = dirname($mountPoint);
-		if ($path === '.') {
-			$path = '';
-		}
+        // split path from mount point
+        $path = dirname($mountPoint);
+        if ($path === '.') {
+            $path = '';
+        }
 
-		$isSystemMount = !$mountConfig['personal'];
+        $isSystemMount = !$mountConfig['personal'];
 
-		$permissions = \OCP\Constants::PERMISSION_READ;
-		// personal mounts can be deleted
-		if (!$isSystemMount) {
-			$permissions |= \OCP\Constants::PERMISSION_DELETE;
-		}
+        $permissions = \OCP\Constants::PERMISSION_READ;
+        // personal mounts can be deleted
+        if (!$isSystemMount) {
+            $permissions |= \OCP\Constants::PERMISSION_DELETE;
+        }
 
-		$entry = array(
-			'name' => basename($mountPoint),
-			'path' => $path,
-			'type' => 'dir',
-			'backend' => $mountConfig['backend'],
-			'scope' => ( $isSystemMount ? 'system' : 'personal' ),
-			'permissions' => $permissions,
-			'id' => $mountConfig['id'],
-			'class' => $mountConfig['class']
-		);
-		return $entry;
-	}
+        $entry = array(
+            'name' => basename($mountPoint),
+            'path' => $path,
+            'type' => 'dir',
+            'backend' => $mountConfig['backend'],
+            'scope' => ( $isSystemMount ? 'system' : 'personal' ),
+            'permissions' => $permissions,
+            'id' => $mountConfig['id'],
+            'class' => $mountConfig['class']
+        );
+        return $entry;
+    }
 
-	/**
-	 * Returns the mount points visible for this user.
-	 *
-	 * @param array $params
-	 * @return \OC_OCS_Result share information
-	 */
-	public static function getUserMounts($params) {
-		$entries = array();
-		$user = \OC::$server->getUserSession()->getUser()->getUID();
+    /**
+     * Returns the mount points visible for this user.
+     *
+     * @param array $params
+     * @return \OC_OCS_Result share information
+     */
+    public static function getUserMounts($params) {
+        $entries = array();
+        $user = \OC::$server->getUserSession()->getUser()->getUID();
 
-		$mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
-		foreach($mounts as $mountPoint => $mount) {
-			$entries[] = self::formatMount($mountPoint, $mount);
-		}
+        $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
+        foreach($mounts as $mountPoint => $mount) {
+            $entries[] = self::formatMount($mountPoint, $mount);
+        }
 
-		return new \OC_OCS_Result($entries);
-	}
+        return new \OC_OCS_Result($entries);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 			'path' => $path,
 			'type' => 'dir',
 			'backend' => $mountConfig['backend'],
-			'scope' => ( $isSystemMount ? 'system' : 'personal' ),
+			'scope' => ($isSystemMount ? 'system' : 'personal'),
 			'permissions' => $permissions,
 			'id' => $mountConfig['id'],
 			'class' => $mountConfig['class']
@@ -79,7 +79,7 @@ 
 		$user = \OC::$server->getUserSession()->getUser()->getUID();
 
 		$mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
-		foreach($mounts as $mountPoint => $mount) {
+		foreach ($mounts as $mountPoint => $mount) {
 			$entries[] = self::formatMount($mountPoint, $mount);
 		}
 

apps/files_external/lib/Lib/IdentifierTrait.php

Indentation +62 added lines, -62 removed lines

@@ -28,76 +28,76 @@
  */
 trait IdentifierTrait {
 
-	/** @var string */
-	protected $identifier;
+    /** @var string */
+    protected $identifier;
 
-	/** @var string[] */
-	protected $identifierAliases = [];
+    /** @var string[] */
+    protected $identifierAliases = [];
 
-	/** @var IdentifierTrait */
-	protected $deprecateTo = null;
+    /** @var IdentifierTrait */
+    protected $deprecateTo = null;
 
-	/**
-	 * @return string
-	 */
-	public function getIdentifier() {
-		return $this->identifier;
-	}
+    /**
+     * @return string
+     */
+    public function getIdentifier() {
+        return $this->identifier;
+    }
 
-	/**
-	 * @param string $identifier
-	 * @return self
-	 */
-	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
-		$this->identifierAliases[] = $identifier;
-		return $this;
-	}
+    /**
+     * @param string $identifier
+     * @return self
+     */
+    public function setIdentifier($identifier) {
+        $this->identifier = $identifier;
+        $this->identifierAliases[] = $identifier;
+        return $this;
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getIdentifierAliases() {
-		return $this->identifierAliases;
-	}
+    /**
+     * @return string[]
+     */
+    public function getIdentifierAliases() {
+        return $this->identifierAliases;
+    }
 
-	/**
-	 * @param string $alias
-	 * @return self
-	 */
-	public function addIdentifierAlias($alias) {
-		$this->identifierAliases[] = $alias;
-		return $this;
-	}
+    /**
+     * @param string $alias
+     * @return self
+     */
+    public function addIdentifierAlias($alias) {
+        $this->identifierAliases[] = $alias;
+        return $this;
+    }
 
-	/**
-	 * @return object|null
-	 */
-	public function getDeprecateTo() {
-		return $this->deprecateTo;
-	}
+    /**
+     * @return object|null
+     */
+    public function getDeprecateTo() {
+        return $this->deprecateTo;
+    }
 
-	/**
-	 * @param object $destinationObject
-	 * @return self
-	 */
-	public function deprecateTo($destinationObject) {
-		$this->deprecateTo = $destinationObject;
-		return $this;
-	}
+    /**
+     * @param object $destinationObject
+     * @return self
+     */
+    public function deprecateTo($destinationObject) {
+        $this->deprecateTo = $destinationObject;
+        return $this;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function jsonSerializeIdentifier() {
-		$data = [
-			'identifier' => $this->identifier,
-			'identifierAliases' => $this->identifierAliases,
-		];
-		if ($this->deprecateTo) {
-			$data['deprecateTo'] = $this->deprecateTo->getIdentifier();
-		}
-		return $data;
-	}
+    /**
+     * @return array
+     */
+    public function jsonSerializeIdentifier() {
+        $data = [
+            'identifier' => $this->identifier,
+            'identifierAliases' => $this->identifierAliases,
+        ];
+        if ($this->deprecateTo) {
+            $data['deprecateTo'] = $this->deprecateTo->getIdentifier();
+        }
+        return $data;
+    }
 
 }