nextcloud / server

lib/private/Template/JSResourceLocator.php

Spacing +4 added lines, -4 removed lines

@@ -71,26 +71,26 @@
 		}
 
 		$app = substr($script, 0, strpos($script, '/'));
-		$script = substr($script, strpos($script, '/')+1);
+		$script = substr($script, strpos($script, '/') + 1);
 		$app_path = \OC_App::getAppPath($app);
 		$app_url = \OC_App::getAppWebPath($app);
 
 		// missing translations files fill be ignored
 		if (strpos($script, 'l10n/') === 0) {
-			$this->appendIfExist($app_path, $script . '.js', $app_url);
+			$this->appendIfExist($app_path, $script.'.js', $app_url);
 			return;
 		}
 
 		if ($app_path === false && $app_url === false) {
 			$this->logger->error('Could not find resource {resource} to load', [
-				'resource' => $app . '/' . $script . '.js',
+				'resource' => $app.'/'.$script.'.js',
 				'app' => 'jsresourceloader',
 			]);
 			return;
 		}
 
 		if (!$this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
-			$this->append($app_path, $script . '.js', $app_url);
+			$this->append($app_path, $script.'.js', $app_url);
 		}
 	}
 

Indentation +99 added lines, -99 removed lines

@@ -29,103 +29,103 @@
 
 class JSResourceLocator extends ResourceLocator {
 
-	/** @var JSCombiner */
-	protected $jsCombiner;
-
-	public function __construct(\OCP\ILogger $logger, $theme, array $core_map, array $party_map, JSCombiner $JSCombiner) {
-		parent::__construct($logger, $theme, $core_map, $party_map);
-
-		$this->jsCombiner = $JSCombiner;
-	}
-
-	/**
-	 * @param string $script
-	 */
-	public function doFind($script) {
-		$theme_dir = 'themes/'.$this->theme.'/';
-		if (strpos($script, '3rdparty') === 0
-			&& $this->appendIfExist($this->thirdpartyroot, $script.'.js')) {
-			return;
-		}
-
-		if (strpos($script, '/l10n/') !== false) {
-			// For language files we try to load them all, so themes can overwrite
-			// single l10n strings without having to translate all of them.
-			$found = 0;
-			$found += $this->appendIfExist($this->serverroot, 'core/'.$script.'.js');
-			$found += $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js');
-			$found += $this->appendIfExist($this->serverroot, $script.'.js');
-			$found += $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js');
-			$found += $this->appendIfExist($this->serverroot, 'apps/'.$script.'.js');
-			$found += $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js');
-
-			if ($found) {
-				return;
-			}
-		} elseif ($this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js')
-			|| $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js')
-			|| $this->appendIfExist($this->serverroot, $script.'.js')
-			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json')
-			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js')
-			|| $this->appendIfExist($this->serverroot, 'core/'.$script.'.js')
-			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json')
-		) {
-			return;
-		}
-
-		$app = substr($script, 0, strpos($script, '/'));
-		$script = substr($script, strpos($script, '/')+1);
-		$app_path = \OC_App::getAppPath($app);
-		$app_url = \OC_App::getAppWebPath($app);
-
-		if ($app_path !== false) {
-			// Account for the possibility of having symlinks in app path. Only
-			// do this if $app_path is set, because an empty argument to realpath
-			// gets turned into cwd.
-			$app_path = realpath($app_path);
-		}
-
-		// missing translations files fill be ignored
-		if (strpos($script, 'l10n/') === 0) {
-			$this->appendIfExist($app_path, $script . '.js', $app_url);
-			return;
-		}
-
-		if ($app_path === false && $app_url === false) {
-			$this->logger->error('Could not find resource {resource} to load', [
-				'resource' => $app . '/' . $script . '.js',
-				'app' => 'jsresourceloader',
-			]);
-			return;
-		}
-
-		if (!$this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
-			$this->append($app_path, $script . '.js', $app_url);
-		}
-	}
-
-	/**
-	 * @param string $script
-	 */
-	public function doFindTheme($script) {
-	}
-
-	protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
-		if (is_file($root.'/'.$file)) {
-			if ($this->jsCombiner->process($root, $file, $app)) {
-				$this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
-			} else {
-				// Add all the files from the json
-				$files = $this->jsCombiner->getContent($root, $file);
-				$app_url = \OC_App::getAppWebPath($app);
-
-				foreach ($files as $jsFile) {
-					$this->append($root, $jsFile, $app_url);
-				}
-			}
-			return true;
-		}
-
-		return false;
-	}
+    /** @var JSCombiner */
+    protected $jsCombiner;
+
+    public function __construct(\OCP\ILogger $logger, $theme, array $core_map, array $party_map, JSCombiner $JSCombiner) {
+        parent::__construct($logger, $theme, $core_map, $party_map);
+
+        $this->jsCombiner = $JSCombiner;
+    }
+
+    /**
+     * @param string $script
+     */
+    public function doFind($script) {
+        $theme_dir = 'themes/'.$this->theme.'/';
+        if (strpos($script, '3rdparty') === 0
+            && $this->appendIfExist($this->thirdpartyroot, $script.'.js')) {
+            return;
+        }
+
+        if (strpos($script, '/l10n/') !== false) {
+            // For language files we try to load them all, so themes can overwrite
+            // single l10n strings without having to translate all of them.
+            $found = 0;
+            $found += $this->appendIfExist($this->serverroot, 'core/'.$script.'.js');
+            $found += $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js');
+            $found += $this->appendIfExist($this->serverroot, $script.'.js');
+            $found += $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js');
+            $found += $this->appendIfExist($this->serverroot, 'apps/'.$script.'.js');
+            $found += $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js');
+
+            if ($found) {
+                return;
+            }
+        } elseif ($this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js')
+            || $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js')
+            || $this->appendIfExist($this->serverroot, $script.'.js')
+            || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json')
+            || $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js')
+            || $this->appendIfExist($this->serverroot, 'core/'.$script.'.js')
+            || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json')
+        ) {
+            return;
+        }
+
+        $app = substr($script, 0, strpos($script, '/'));
+        $script = substr($script, strpos($script, '/')+1);
+        $app_path = \OC_App::getAppPath($app);
+        $app_url = \OC_App::getAppWebPath($app);
+
+        if ($app_path !== false) {
+            // Account for the possibility of having symlinks in app path. Only
+            // do this if $app_path is set, because an empty argument to realpath
+            // gets turned into cwd.
+            $app_path = realpath($app_path);
+        }
+
+        // missing translations files fill be ignored
+        if (strpos($script, 'l10n/') === 0) {
+            $this->appendIfExist($app_path, $script . '.js', $app_url);
+            return;
+        }
+
+        if ($app_path === false && $app_url === false) {
+            $this->logger->error('Could not find resource {resource} to load', [
+                'resource' => $app . '/' . $script . '.js',
+                'app' => 'jsresourceloader',
+            ]);
+            return;
+        }
+
+        if (!$this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
+            $this->append($app_path, $script . '.js', $app_url);
+        }
+    }
+
+    /**
+     * @param string $script
+     */
+    public function doFindTheme($script) {
+    }
+
+    protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
+        if (is_file($root.'/'.$file)) {
+            if ($this->jsCombiner->process($root, $file, $app)) {
+                $this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
+            } else {
+                // Add all the files from the json
+                $files = $this->jsCombiner->getContent($root, $file);
+                $app_url = \OC_App::getAppWebPath($app);
+
+                foreach ($files as $jsFile) {
+                    $this->append($root, $jsFile, $app_url);
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
 }

lib/private/GlobalScale/Config.php

Indentation +35 added lines, -35 removed lines

@@ -27,45 +27,45 @@
 
 class Config implements \OCP\GlobalScale\IConfig {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * Config constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * Config constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * check if global scale is enabled
-	 *
-	 * @since 12.0.1
-	 * @return bool
-	 */
-	public function isGlobalScaleEnabled() {
-		$enabled = $this->config->getSystemValue('gs.enabled', false);
-		return $enabled !== false;
-	}
+    /**
+     * check if global scale is enabled
+     *
+     * @since 12.0.1
+     * @return bool
+     */
+    public function isGlobalScaleEnabled() {
+        $enabled = $this->config->getSystemValue('gs.enabled', false);
+        return $enabled !== false;
+    }
 
-	/**
-	 * check if federation should only be used internally in a global scale setup
-	 *
-	 * @since 12.0.1
-	 * @return bool
-	 */
-	public function onlyInternalFederation() {
-		// if global scale is disabled federation works always globally
-		$gsEnabled = $this->isGlobalScaleEnabled();
-		if ($gsEnabled === false) {
-			return false;
-		}
+    /**
+     * check if federation should only be used internally in a global scale setup
+     *
+     * @since 12.0.1
+     * @return bool
+     */
+    public function onlyInternalFederation() {
+        // if global scale is disabled federation works always globally
+        $gsEnabled = $this->isGlobalScaleEnabled();
+        if ($gsEnabled === false) {
+            return false;
+        }
 
-		$enabled = $this->config->getSystemValue('gs.federation', 'internal');
+        $enabled = $this->config->getSystemValue('gs.federation', 'internal');
 
-		return $enabled === 'internal';
-	}
+        return $enabled === 'internal';
+    }
 
 }

lib/public/GlobalScale/IConfig.php

Indentation +14 added lines, -14 removed lines

@@ -32,20 +32,20 @@
  */
 interface IConfig {
 
-	/**
-	 * check if global scale is enabled
-	 *
-	 * @since 12.0.1
-	 * @return bool
-	 */
-	public function isGlobalScaleEnabled();
+    /**
+     * check if global scale is enabled
+     *
+     * @since 12.0.1
+     * @return bool
+     */
+    public function isGlobalScaleEnabled();
 
-	/**
-	 * check if federation should only be used internally in a global scale setup
-	 *
-	 * @since 12.0.1
-	 * @return bool
-	 */
-	public function onlyInternalFederation();
+    /**
+     * check if federation should only be used internally in a global scale setup
+     *
+     * @since 12.0.1
+     * @return bool
+     */
+    public function onlyInternalFederation();
 
 }

lib/public/Encryption/IEncryptionModule.php

Indentation +156 added lines, -156 removed lines

@@ -35,161 +35,161 @@
  */
 interface IEncryptionModule {
 
-	/**
-	 * @return string defining the technical unique id
-	 * @since 8.1.0
-	 */
-	public function getId();
-
-	/**
-	 * In comparison to getKey() this function returns a human readable (maybe translated) name
-	 *
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getDisplayName();
-
-	/**
-	 * start receiving chunks from a file. This is the place where you can
-	 * perform some initial step before starting encrypting/decrypting the
-	 * chunks
-	 *
-	 * @param string $path to the file
-	 * @param string $user who read/write the file (null for public access)
-	 * @param string $mode php stream open mode
-	 * @param array $header contains the header data read from the file
-	 * @param array $accessList who has access to the file contains the key 'users' and 'public'
-	 *
-	 * $return array $header contain data as key-value pairs which should be
-	 *                       written to the header, in case of a write operation
-	 *                       or if no additional data is needed return a empty array
-	 * @since 8.1.0
-	 */
-	public function begin($path, $user, $mode, array $header, array $accessList);
-
-	/**
-	 * last chunk received. This is the place where you can perform some final
-	 * operation and return some remaining data if something is left in your
-	 * buffer.
-	 *
-	 * @param string $path to the file
-	 * @param string $position id of the last block (looks like "<Number>end")
-	 *
-	 * @return string remained data which should be written to the file in case
-	 *                of a write operation
-	 *
-	 * @since 8.1.0
-	 * @since 9.0.0 parameter $position added
-	 */
-	public function end($path, $position);
-
-	/**
-	 * encrypt data
-	 *
-	 * @param string $data you want to encrypt
-	 * @param string $position position of the block we want to encrypt (starts with '0')
-	 *
-	 * @return mixed encrypted data
-	 *
-	 * @since 8.1.0
-	 * @since 9.0.0 parameter $position added
-	 */
-	public function encrypt($data, $position);
-
-	/**
-	 * decrypt data
-	 *
-	 * @param string $data you want to decrypt
-	 * @param string $position position of the block we want to decrypt
-	 *
-	 * @return mixed decrypted data
-	 *
-	 * @since 8.1.0
-	 * @since 9.0.0 parameter $position added
-	 */
-	public function decrypt($data, $position);
-
-	/**
-	 * update encrypted file, e.g. give additional users access to the file
-	 *
-	 * @param string $path path to the file which should be updated
-	 * @param string $uid of the user who performs the operation
-	 * @param array $accessList who has access to the file contains the key 'users' and 'public'
-	 * @return boolean
-	 * @since 8.1.0
-	 */
-	public function update($path, $uid, array $accessList);
-
-	/**
-	 * should the file be encrypted or not
-	 *
-	 * @param string $path
-	 * @return boolean
-	 * @since 8.1.0
-	 */
-	public function shouldEncrypt($path);
-
-	/**
-	 * get size of the unencrypted payload per block.
-	 * ownCloud read/write files with a block size of 8192 byte
-	 *
-	 * @param bool $signed
-	 * @return int
-	 * @since 8.1.0 optional parameter $signed was added in 9.0.0
-	 */
-	public function getUnencryptedBlockSize($signed = false);
-
-	/**
-	 * check if the encryption module is able to read the file,
-	 * e.g. if all encryption keys exists
-	 *
-	 * @param string $path
-	 * @param string $uid user for whom we want to check if he can read the file
-	 * @return boolean
-	 * @since 8.1.0
-	 */
-	public function isReadable($path, $uid);
-
-	/**
-	 * Initial encryption of all files
-	 *
-	 * @param InputInterface $input
-	 * @param OutputInterface $output write some status information to the terminal during encryption
-	 * @since 8.2.0
-	 */
-	public function encryptAll(InputInterface $input, OutputInterface $output);
-
-	/**
-	 * prepare encryption module to decrypt all files
-	 *
-	 * @param InputInterface $input
-	 * @param OutputInterface $output write some status information to the terminal during encryption
-	 * @param $user (optional) for which the files should be decrypted, default = all users
-	 * @return bool return false on failure or if it isn't supported by the module
-	 * @since 8.2.0
-	 */
-	public function prepareDecryptAll(InputInterface $input, OutputInterface $output, $user = '');
-
-	/**
-	 * Check if the module is ready to be used by that specific user.
-	 * In case a module is not ready - because e.g. key pairs have not been generated
-	 * upon login this method can return false before any operation starts and might
-	 * cause issues during operations.
-	 *
-	 * @param string $user
-	 * @return boolean
-	 * @since 9.1.0
-	 */
-	public function isReadyForUser($user);
-
-	/**
-	 * Does the encryption module needs a detailed list of users with access to the file?
-	 * For example if the encryption module uses per-user encryption keys and needs to know
-	 * the users with access to the file to encrypt/decrypt it.
-	 *
-	 * @since 13.0.0
-	 * @return bool
-	 */
-	public function needDetailedAccessList();
+    /**
+     * @return string defining the technical unique id
+     * @since 8.1.0
+     */
+    public function getId();
+
+    /**
+     * In comparison to getKey() this function returns a human readable (maybe translated) name
+     *
+     * @return string
+     * @since 8.1.0
+     */
+    public function getDisplayName();
+
+    /**
+     * start receiving chunks from a file. This is the place where you can
+     * perform some initial step before starting encrypting/decrypting the
+     * chunks
+     *
+     * @param string $path to the file
+     * @param string $user who read/write the file (null for public access)
+     * @param string $mode php stream open mode
+     * @param array $header contains the header data read from the file
+     * @param array $accessList who has access to the file contains the key 'users' and 'public'
+     *
+     * $return array $header contain data as key-value pairs which should be
+     *                       written to the header, in case of a write operation
+     *                       or if no additional data is needed return a empty array
+     * @since 8.1.0
+     */
+    public function begin($path, $user, $mode, array $header, array $accessList);
+
+    /**
+     * last chunk received. This is the place where you can perform some final
+     * operation and return some remaining data if something is left in your
+     * buffer.
+     *
+     * @param string $path to the file
+     * @param string $position id of the last block (looks like "<Number>end")
+     *
+     * @return string remained data which should be written to the file in case
+     *                of a write operation
+     *
+     * @since 8.1.0
+     * @since 9.0.0 parameter $position added
+     */
+    public function end($path, $position);
+
+    /**
+     * encrypt data
+     *
+     * @param string $data you want to encrypt
+     * @param string $position position of the block we want to encrypt (starts with '0')
+     *
+     * @return mixed encrypted data
+     *
+     * @since 8.1.0
+     * @since 9.0.0 parameter $position added
+     */
+    public function encrypt($data, $position);
+
+    /**
+     * decrypt data
+     *
+     * @param string $data you want to decrypt
+     * @param string $position position of the block we want to decrypt
+     *
+     * @return mixed decrypted data
+     *
+     * @since 8.1.0
+     * @since 9.0.0 parameter $position added
+     */
+    public function decrypt($data, $position);
+
+    /**
+     * update encrypted file, e.g. give additional users access to the file
+     *
+     * @param string $path path to the file which should be updated
+     * @param string $uid of the user who performs the operation
+     * @param array $accessList who has access to the file contains the key 'users' and 'public'
+     * @return boolean
+     * @since 8.1.0
+     */
+    public function update($path, $uid, array $accessList);
+
+    /**
+     * should the file be encrypted or not
+     *
+     * @param string $path
+     * @return boolean
+     * @since 8.1.0
+     */
+    public function shouldEncrypt($path);
+
+    /**
+     * get size of the unencrypted payload per block.
+     * ownCloud read/write files with a block size of 8192 byte
+     *
+     * @param bool $signed
+     * @return int
+     * @since 8.1.0 optional parameter $signed was added in 9.0.0
+     */
+    public function getUnencryptedBlockSize($signed = false);
+
+    /**
+     * check if the encryption module is able to read the file,
+     * e.g. if all encryption keys exists
+     *
+     * @param string $path
+     * @param string $uid user for whom we want to check if he can read the file
+     * @return boolean
+     * @since 8.1.0
+     */
+    public function isReadable($path, $uid);
+
+    /**
+     * Initial encryption of all files
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output write some status information to the terminal during encryption
+     * @since 8.2.0
+     */
+    public function encryptAll(InputInterface $input, OutputInterface $output);
+
+    /**
+     * prepare encryption module to decrypt all files
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output write some status information to the terminal during encryption
+     * @param $user (optional) for which the files should be decrypted, default = all users
+     * @return bool return false on failure or if it isn't supported by the module
+     * @since 8.2.0
+     */
+    public function prepareDecryptAll(InputInterface $input, OutputInterface $output, $user = '');
+
+    /**
+     * Check if the module is ready to be used by that specific user.
+     * In case a module is not ready - because e.g. key pairs have not been generated
+     * upon login this method can return false before any operation starts and might
+     * cause issues during operations.
+     *
+     * @param string $user
+     * @return boolean
+     * @since 9.1.0
+     */
+    public function isReadyForUser($user);
+
+    /**
+     * Does the encryption module needs a detailed list of users with access to the file?
+     * For example if the encryption module uses per-user encryption keys and needs to know
+     * the users with access to the file to encrypt/decrypt it.
+     *
+     * @since 13.0.0
+     * @return bool
+     */
+    public function needDetailedAccessList();
 
 }

apps/encryption/lib/Migration/SetMasterKeyStatus.php

Indentation +32 added lines, -32 removed lines

@@ -35,43 +35,43 @@
 class SetMasterKeyStatus implements IRepairStep {
 
 
-	/** @var  IConfig */
-	private $config;
+    /** @var  IConfig */
+    private $config;
 
 
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Write default encryption module configuration to the database';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Write default encryption module configuration to the database';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
 
-		// if no config for the master key is set we set it explicitly to '0' in
-		// order not to break old installations because the default changed to '1'.
-		$configAlreadySet = $this->config->getAppValue('encryption', 'useMasterKey', false);
-		if ($configAlreadySet === false) {
-			$this->config->setAppValue('encryption', 'useMasterKey', '0');
-		}
-	}
+        // if no config for the master key is set we set it explicitly to '0' in
+        // order not to break old installations because the default changed to '1'.
+        $configAlreadySet = $this->config->getAppValue('encryption', 'useMasterKey', false);
+        if ($configAlreadySet === false) {
+            $this->config->setAppValue('encryption', 'useMasterKey', '0');
+        }
+    }
 
-	protected function shouldRun() {
-		$appVersion = $this->config->getAppValue('encryption', 'installed_version', '0.0.0');
-		return version_compare($appVersion, '2.0.0', '<');
-	}
+    protected function shouldRun() {
+        $appVersion = $this->config->getAppValue('encryption', 'installed_version', '0.0.0');
+        return version_compare($appVersion, '2.0.0', '<');
+    }
 
 }

apps/files_external/lib/Settings/Personal.php

Indentation +57 added lines, -57 removed lines

@@ -32,72 +32,72 @@
 
 class Personal implements ISettings {
 
-	/** @var IManager */
-	private $encryptionManager;
+    /** @var IManager */
+    private $encryptionManager;
 
-	/** @var UserGlobalStoragesService */
-	private $userGlobalStoragesService;
+    /** @var UserGlobalStoragesService */
+    private $userGlobalStoragesService;
 
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	/** @var GlobalAuth	 */
-	private $globalAuth;
+    /** @var GlobalAuth	 */
+    private $globalAuth;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(
-		IManager $encryptionManager,
-		UserGlobalStoragesService $userGlobalStoragesService,
-		BackendService $backendService,
-		GlobalAuth $globalAuth,
-		IUserSession $userSession
-	) {
-		$this->encryptionManager = $encryptionManager;
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
-		$this->backendService = $backendService;
-		$this->globalAuth = $globalAuth;
-		$this->userSession = $userSession;
-	}
+    public function __construct(
+        IManager $encryptionManager,
+        UserGlobalStoragesService $userGlobalStoragesService,
+        BackendService $backendService,
+        GlobalAuth $globalAuth,
+        IUserSession $userSession
+    ) {
+        $this->encryptionManager = $encryptionManager;
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
+        $this->backendService = $backendService;
+        $this->globalAuth = $globalAuth;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$uid = $this->userSession->getUser()->getUID();
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $uid = $this->userSession->getUser()->getUID();
 
-		$parameters = [
-			'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
-			'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
-			'storages'             => $this->userGlobalStoragesService->getStorages(),
-			'backends'             => $this->backendService->getAvailableBackends(),
-			'authMechanisms'       => $this->backendService->getAuthMechanisms(),
-			'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
-			'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
-			'globalCredentials'    => $this->globalAuth->getAuth($uid),
-			'globalCredentialsUid' => $uid,
-		];
+        $parameters = [
+            'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
+            'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
+            'storages'             => $this->userGlobalStoragesService->getStorages(),
+            'backends'             => $this->backendService->getAvailableBackends(),
+            'authMechanisms'       => $this->backendService->getAuthMechanisms(),
+            'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
+            'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
+            'globalCredentials'    => $this->globalAuth->getAuth($uid),
+            'globalCredentialsUid' => $uid,
+        ];
 
-		return new TemplateResponse('files_external', 'settings', $parameters, '');
-	}
+        return new TemplateResponse('files_external', 'settings', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'externalstorages';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'externalstorages';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 40;
+    }
 
 }

core/Command/Db/Migrations/ExecuteCommand.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 			$olderVersions = $ms->getMigratedVersions();
 			$olderVersions[] = '0';
 			$olderVersions[] = 'prev';
-			if (in_array($version,  $olderVersions, true)) {
+			if (in_array($version, $olderVersions, true)) {
 				$output->writeln('<error>Can not go back to previous migration without debug enabled</error>');
 				return 1;
 			}

Indentation +90 added lines, -90 removed lines

@@ -37,94 +37,94 @@
 
 class ExecuteCommand extends Command implements CompletionAwareInterface {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/**
-	 * ExecuteCommand constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IDBConnection $connection, IAppManager $appManager, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('migrations:execute')
-			->setDescription('Execute a single migration version manually.')
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
-			->addArgument('version', InputArgument::REQUIRED, 'The version to execute.', null);
-
-		parent::configure();
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 */
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
-		$version = $input->getArgument('version');
-
-		if ($this->config->getSystemValue('debug', false) === false) {
-			$olderVersions = $ms->getMigratedVersions();
-			$olderVersions[] = '0';
-			$olderVersions[] = 'prev';
-			if (in_array($version,  $olderVersions, true)) {
-				$output->writeln('<error>Can not go back to previous migration without debug enabled</error>');
-				return 1;
-			}
-		}
-
-
-		$ms->executeStep($version);
-		return 0;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-
-		if ($argumentName === 'version') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-
-			$ms = new MigrationService($appName, $this->connection);
-			$migrations = $ms->getAvailableVersions();
-
-			array_unshift($migrations, 'next', 'latest');
-			return $migrations;
-		}
-
-		return [];
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /**
+     * ExecuteCommand constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     */
+    public function __construct(IDBConnection $connection, IAppManager $appManager, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('migrations:execute')
+            ->setDescription('Execute a single migration version manually.')
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
+            ->addArgument('version', InputArgument::REQUIRED, 'The version to execute.', null);
+
+        parent::configure();
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+        $version = $input->getArgument('version');
+
+        if ($this->config->getSystemValue('debug', false) === false) {
+            $olderVersions = $ms->getMigratedVersions();
+            $olderVersions[] = '0';
+            $olderVersions[] = 'prev';
+            if (in_array($version,  $olderVersions, true)) {
+                $output->writeln('<error>Can not go back to previous migration without debug enabled</error>');
+                return 1;
+            }
+        }
+
+
+        $ms->executeStep($version);
+        return 0;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+
+        if ($argumentName === 'version') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+
+            $ms = new MigrationService($appName, $this->connection);
+            $migrations = $ms->getAvailableVersions();
+
+            array_unshift($migrations, 'next', 'latest');
+            return $migrations;
+        }
+
+        return [];
+    }
 }

lib/private/Migration/SimpleOutput.php

Indentation +39 added lines, -39 removed lines

@@ -36,49 +36,49 @@
  */
 class SimpleOutput implements IOutput {
 
-	/** @var ILogger */
-	private $logger;
-	private $appName;
+    /** @var ILogger */
+    private $logger;
+    private $appName;
 
-	public function __construct(ILogger $logger, $appName) {
-		$this->logger = $logger;
-		$this->appName = $appName;
-	}
+    public function __construct(ILogger $logger, $appName) {
+        $this->logger = $logger;
+        $this->appName = $appName;
+    }
 
-	/**
-	 * @param string $message
-	 * @since 9.1.0
-	 */
-	public function info($message) {
-		$this->logger->info($message, ['app' => $this->appName]);
-	}
+    /**
+     * @param string $message
+     * @since 9.1.0
+     */
+    public function info($message) {
+        $this->logger->info($message, ['app' => $this->appName]);
+    }
 
-	/**
-	 * @param string $message
-	 * @since 9.1.0
-	 */
-	public function warning($message) {
-		$this->logger->warning($message, ['app' => $this->appName]);
-	}
+    /**
+     * @param string $message
+     * @since 9.1.0
+     */
+    public function warning($message) {
+        $this->logger->warning($message, ['app' => $this->appName]);
+    }
 
-	/**
-	 * @param int $max
-	 * @since 9.1.0
-	 */
-	public function startProgress($max = 0) {
-	}
+    /**
+     * @param int $max
+     * @since 9.1.0
+     */
+    public function startProgress($max = 0) {
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 * @since 9.1.0
-	 */
-	public function advance($step = 1, $description = '') {
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     * @since 9.1.0
+     */
+    public function advance($step = 1, $description = '') {
+    }
 
-	/**
-	 * @since 9.1.0
-	 */
-	public function finishProgress() {
-	}
+    /**
+     * @since 9.1.0
+     */
+    public function finishProgress() {
+    }
 }

lib/private/Comments/ManagerFactory.php

Indentation +27 added lines, -27 removed lines

@@ -30,33 +30,33 @@
 
 class ManagerFactory implements ICommentsManagerFactory {
 
-	/**
-	 * Server container
-	 *
-	 * @var IServerContainer
-	 */
-	private $serverContainer;
+    /**
+     * Server container
+     *
+     * @var IServerContainer
+     */
+    private $serverContainer;
 
-	/**
-	 * Constructor for the comments manager factory
-	 *
-	 * @param IServerContainer $serverContainer server container
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
+    /**
+     * Constructor for the comments manager factory
+     *
+     * @param IServerContainer $serverContainer server container
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
 
-	/**
-	 * creates and returns an instance of the ICommentsManager
-	 *
-	 * @return ICommentsManager
-	 * @since 9.0.0
-	 */
-	public function getManager() {
-		return new Manager(
-			$this->serverContainer->getDatabaseConnection(),
-			$this->serverContainer->getLogger(),
-			$this->serverContainer->getConfig()
-		);
-	}
+    /**
+     * creates and returns an instance of the ICommentsManager
+     *
+     * @return ICommentsManager
+     * @since 9.0.0
+     */
+    public function getManager() {
+        return new Manager(
+            $this->serverContainer->getDatabaseConnection(),
+            $this->serverContainer->getLogger(),
+            $this->serverContainer->getConfig()
+        );
+    }
 }