nextcloud / server

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 $this
-	 */
-	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
-		$this->identifierAliases[] = $identifier;
-		return $this;
-	}
+    /**
+     * @param string $identifier
+     * @return $this
+     */
+    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 $this
-	 */
-	public function addIdentifierAlias($alias) {
-		$this->identifierAliases[] = $alias;
-		return $this;
-	}
+    /**
+     * @param string $alias
+     * @return $this
+     */
+    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;
+    }
 
 }

lib/public/Files/LockNotAcquiredException.php

Indentation +20 added lines, -20 removed lines

@@ -36,27 +36,27 @@
  * @since 7.0.0
  */
 class LockNotAcquiredException extends \Exception {
-	/** @var string $path The path that could not be locked */
-	public $path;
+    /** @var string $path The path that could not be locked */
+    public $path;
 
-	/** @var integer $lockType The type of the lock that was attempted */
-	public $lockType;
+    /** @var integer $lockType The type of the lock that was attempted */
+    public $lockType;
 
-	/**
-	 * @since 7.0.0
-	 */
-	public function __construct($path, $lockType, $code = 0, \Exception $previous = null) {
-		$message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', [$lockType, $path]);
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * @since 7.0.0
+     */
+    public function __construct($path, $lockType, $code = 0, \Exception $previous = null) {
+        $message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', [$lockType, $path]);
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * custom string representation of object
-	 *
-	 * @return string
-	 * @since 7.0.0
-	 */
-	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
-	}
+    /**
+     * custom string representation of object
+     *
+     * @return string
+     * @since 7.0.0
+     */
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+    }
 }

lib/public/AppFramework/Middleware.php

Indentation +57 added lines, -57 removed lines

@@ -42,67 +42,67 @@
 abstract class Middleware {
 
 
-	/**
-	 * This is being run in normal order before the controller is being
-	 * called which allows several modifications and checks
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @since 6.0.0
-	 */
-	public function beforeController($controller, $methodName) {
-	}
+    /**
+     * This is being run in normal order before the controller is being
+     * called which allows several modifications and checks
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @since 6.0.0
+     */
+    public function beforeController($controller, $methodName) {
+    }
 
 
-	/**
-	 * This is being run when either the beforeController method or the
-	 * controller method itself is throwing an exception. The middleware is
-	 * asked in reverse order to handle the exception and to return a response.
-	 * If the response is null, it is assumed that the exception could not be
-	 * handled and the error will be thrown again
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param \Exception $exception the thrown exception
-	 * @throws \Exception the passed in exception if it can't handle it
-	 * @return Response a Response object in case that the exception was handled
-	 * @since 6.0.0
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		throw $exception;
-	}
+    /**
+     * This is being run when either the beforeController method or the
+     * controller method itself is throwing an exception. The middleware is
+     * asked in reverse order to handle the exception and to return a response.
+     * If the response is null, it is assumed that the exception could not be
+     * handled and the error will be thrown again
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param \Exception $exception the thrown exception
+     * @throws \Exception the passed in exception if it can't handle it
+     * @return Response a Response object in case that the exception was handled
+     * @since 6.0.0
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        throw $exception;
+    }
 
 
-	/**
-	 * This is being run after a successful controllermethod call and allows
-	 * the manipulation of a Response object. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param Response $response the generated response from the controller
-	 * @return Response a Response object
-	 * @since 6.0.0
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		return $response;
-	}
+    /**
+     * This is being run after a successful controllermethod call and allows
+     * the manipulation of a Response object. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param Response $response the generated response from the controller
+     * @return Response a Response object
+     * @since 6.0.0
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        return $response;
+    }
 
 
-	/**
-	 * This is being run after the response object has been rendered and
-	 * allows the manipulation of the output. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param string $output the generated output from a response
-	 * @return string the output that should be printed
-	 * @since 6.0.0
-	 */
-	public function beforeOutput($controller, $methodName, $output) {
-		return $output;
-	}
+    /**
+     * This is being run after the response object has been rendered and
+     * allows the manipulation of the output. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param string $output the generated output from a response
+     * @return string the output that should be printed
+     * @since 6.0.0
+     */
+    public function beforeOutput($controller, $methodName, $output) {
+        return $output;
+    }
 }

lib/public/AppFramework/OCS/OCSNotFoundException.php

Indentation +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@
  * @since 9.1.0
  */
 class OCSNotFoundException extends OCSException {
-	/**
-	 * OCSNotFoundException constructor.
-	 *
-	 * @param string $message
-	 * @param Exception|null $previous
-	 * @since 9.1.0
-	 */
-	public function __construct($message = '', Exception $previous = null) {
-		parent::__construct($message, Http::STATUS_NOT_FOUND, $previous);
-	}
+    /**
+     * OCSNotFoundException constructor.
+     *
+     * @param string $message
+     * @param Exception|null $previous
+     * @since 9.1.0
+     */
+    public function __construct($message = '', Exception $previous = null) {
+        parent::__construct($message, Http::STATUS_NOT_FOUND, $previous);
+    }
 }

lib/public/AppFramework/OCS/OCSForbiddenException.php

Indentation +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@
  * @since 9.1.0
  */
 class OCSForbiddenException extends OCSException {
-	/**
-	 * OCSForbiddenException constructor.
-	 *
-	 * @param string $message
-	 * @param Exception|null $previous
-	 * @since 9.1.0
-	 */
-	public function __construct($message = '', Exception $previous = null) {
-		parent::__construct($message, Http::STATUS_FORBIDDEN, $previous);
-	}
+    /**
+     * OCSForbiddenException constructor.
+     *
+     * @param string $message
+     * @param Exception|null $previous
+     * @since 9.1.0
+     */
+    public function __construct($message = '', Exception $previous = null) {
+        parent::__construct($message, Http::STATUS_FORBIDDEN, $previous);
+    }
 }

lib/public/AppFramework/OCS/OCSBadRequestException.php

Indentation +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@
  * @since 9.1.0
  */
 class OCSBadRequestException extends OCSException {
-	/**
-	 * OCSBadRequestException constructor.
-	 *
-	 * @param string $message
-	 * @param Exception|null $previous
-	 * @since 9.1.0
-	 */
-	public function __construct($message = '', Exception $previous = null) {
-		parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
-	}
+    /**
+     * OCSBadRequestException constructor.
+     *
+     * @param string $message
+     * @param Exception|null $previous
+     * @since 9.1.0
+     */
+    public function __construct($message = '', Exception $previous = null) {
+        parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
+    }
 }

lib/private/App/PlatformRepository.php

Indentation +196 added lines, -196 removed lines

@@ -30,200 +30,200 @@
  * @package OC\App
  */
 class PlatformRepository {
-	public function __construct() {
-		$this->packages = $this->initialize();
-	}
-
-	protected function initialize() {
-		$loadedExtensions = get_loaded_extensions();
-		$packages = [];
-
-		// Extensions scanning
-		foreach ($loadedExtensions as $name) {
-			if (in_array($name, ['standard', 'Core'])) {
-				continue;
-			}
-
-			$ext = new \ReflectionExtension($name);
-			try {
-				$prettyVersion = $ext->getVersion();
-				$prettyVersion = $this->normalizeVersion($prettyVersion);
-			} catch (\UnexpectedValueException $e) {
-				$prettyVersion = '0';
-				$prettyVersion = $this->normalizeVersion($prettyVersion);
-			}
-
-			$packages[$this->buildPackageName($name)] = $prettyVersion;
-		}
-
-		foreach ($loadedExtensions as $name) {
-			$prettyVersion = null;
-			switch ($name) {
-				case 'curl':
-					$curlVersion = curl_version();
-					$prettyVersion = $curlVersion['version'];
-					break;
-
-				case 'iconv':
-					$prettyVersion = ICONV_VERSION;
-					break;
-
-				case 'intl':
-					$name = 'ICU';
-					if (defined('INTL_ICU_VERSION')) {
-						$prettyVersion = INTL_ICU_VERSION;
-					} else {
-						$reflector = new \ReflectionExtension('intl');
-
-						ob_start();
-						$reflector->info();
-						$output = ob_get_clean();
-
-						preg_match('/^ICU version => (.*)$/m', $output, $matches);
-						$prettyVersion = $matches[1];
-					}
-
-					break;
-
-				case 'libxml':
-					$prettyVersion = LIBXML_DOTTED_VERSION;
-					break;
-
-				case 'openssl':
-					$prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) {
-						return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96));
-					}, OPENSSL_VERSION_TEXT);
-					break;
-
-				case 'pcre':
-					$prettyVersion = preg_replace('{^(\S+).*}', '$1', PCRE_VERSION);
-					break;
-
-				case 'uuid':
-					$prettyVersion = phpversion('uuid');
-					break;
-
-				case 'xsl':
-					$prettyVersion = LIBXSLT_DOTTED_VERSION;
-					break;
-
-				default:
-					// None handled extensions have no special cases, skip
-					continue 2;
-			}
-
-			try {
-				$prettyVersion = $this->normalizeVersion($prettyVersion);
-			} catch (\UnexpectedValueException $e) {
-				continue;
-			}
-
-			$packages[$this->buildPackageName($name)] = $prettyVersion;
-		}
-
-		return $packages;
-	}
-
-	private function buildPackageName($name) {
-		return str_replace(' ', '-', $name);
-	}
-
-	/**
-	 * @param $name
-	 * @return string
-	 */
-	public function findLibrary($name) {
-		$extName = $this->buildPackageName($name);
-		if (isset($this->packages[$extName])) {
-			return $this->packages[$extName];
-		}
-		return null;
-	}
-
-	private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?';
-
-	/**
-	 * Normalizes a version string to be able to perform comparisons on it
-	 *
-	 * https://github.com/composer/composer/blob/master/src/Composer/Package/Version/VersionParser.php#L94
-	 *
-	 * @param string $version
-	 * @param string $fullVersion optional complete version string to give more context
-	 * @throws \UnexpectedValueException
-	 * @return string
-	 */
-	public function normalizeVersion($version, $fullVersion = null) {
-		$version = trim($version);
-		if (null === $fullVersion) {
-			$fullVersion = $version;
-		}
-		// ignore aliases and just assume the alias is required instead of the source
-		if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) {
-			$version = $match[1];
-		}
-		// match master-like branches
-		if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) {
-			return '9999999-dev';
-		}
-		if ('dev-' === strtolower(substr($version, 0, 4))) {
-			return 'dev-' . substr($version, 4);
-		}
-		// match classical versioning
-		if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
-			$version = $matches[1]
-				. (!empty($matches[2]) ? $matches[2] : '.0')
-				. (!empty($matches[3]) ? $matches[3] : '.0')
-				. (!empty($matches[4]) ? $matches[4] : '.0');
-			$index = 5;
-		} elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning
-			$version = preg_replace('{\D}', '-', $matches[1]);
-			$index = 2;
-		} elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
-			$version = $matches[1]
-				. (!empty($matches[2]) ? $matches[2] : '.0')
-				. (!empty($matches[3]) ? $matches[3] : '.0')
-				. (!empty($matches[4]) ? $matches[4] : '.0');
-			$index = 5;
-		}
-		// add version modifiers if a version was matched
-		if (isset($index)) {
-			if (!empty($matches[$index])) {
-				if ('stable' === $matches[$index]) {
-					return $version;
-				}
-				$version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
-			}
-			if (!empty($matches[$index + 2])) {
-				$version .= '-dev';
-			}
-			return $version;
-		}
-		$extraMessage = '';
-		if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) {
-			$extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
-		} elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) {
-			$extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
-		}
-		throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
-	}
-
-	/**
-	 * @param string $stability
-	 */
-	private function expandStability($stability) {
-		$stability = strtolower($stability);
-		switch ($stability) {
-			case 'a':
-				return 'alpha';
-			case 'b':
-				return 'beta';
-			case 'p':
-			case 'pl':
-				return 'patch';
-			case 'rc':
-				return 'RC';
-			default:
-				return $stability;
-		}
-	}
+    public function __construct() {
+        $this->packages = $this->initialize();
+    }
+
+    protected function initialize() {
+        $loadedExtensions = get_loaded_extensions();
+        $packages = [];
+
+        // Extensions scanning
+        foreach ($loadedExtensions as $name) {
+            if (in_array($name, ['standard', 'Core'])) {
+                continue;
+            }
+
+            $ext = new \ReflectionExtension($name);
+            try {
+                $prettyVersion = $ext->getVersion();
+                $prettyVersion = $this->normalizeVersion($prettyVersion);
+            } catch (\UnexpectedValueException $e) {
+                $prettyVersion = '0';
+                $prettyVersion = $this->normalizeVersion($prettyVersion);
+            }
+
+            $packages[$this->buildPackageName($name)] = $prettyVersion;
+        }
+
+        foreach ($loadedExtensions as $name) {
+            $prettyVersion = null;
+            switch ($name) {
+                case 'curl':
+                    $curlVersion = curl_version();
+                    $prettyVersion = $curlVersion['version'];
+                    break;
+
+                case 'iconv':
+                    $prettyVersion = ICONV_VERSION;
+                    break;
+
+                case 'intl':
+                    $name = 'ICU';
+                    if (defined('INTL_ICU_VERSION')) {
+                        $prettyVersion = INTL_ICU_VERSION;
+                    } else {
+                        $reflector = new \ReflectionExtension('intl');
+
+                        ob_start();
+                        $reflector->info();
+                        $output = ob_get_clean();
+
+                        preg_match('/^ICU version => (.*)$/m', $output, $matches);
+                        $prettyVersion = $matches[1];
+                    }
+
+                    break;
+
+                case 'libxml':
+                    $prettyVersion = LIBXML_DOTTED_VERSION;
+                    break;
+
+                case 'openssl':
+                    $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) {
+                        return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96));
+                    }, OPENSSL_VERSION_TEXT);
+                    break;
+
+                case 'pcre':
+                    $prettyVersion = preg_replace('{^(\S+).*}', '$1', PCRE_VERSION);
+                    break;
+
+                case 'uuid':
+                    $prettyVersion = phpversion('uuid');
+                    break;
+
+                case 'xsl':
+                    $prettyVersion = LIBXSLT_DOTTED_VERSION;
+                    break;
+
+                default:
+                    // None handled extensions have no special cases, skip
+                    continue 2;
+            }
+
+            try {
+                $prettyVersion = $this->normalizeVersion($prettyVersion);
+            } catch (\UnexpectedValueException $e) {
+                continue;
+            }
+
+            $packages[$this->buildPackageName($name)] = $prettyVersion;
+        }
+
+        return $packages;
+    }
+
+    private function buildPackageName($name) {
+        return str_replace(' ', '-', $name);
+    }
+
+    /**
+     * @param $name
+     * @return string
+     */
+    public function findLibrary($name) {
+        $extName = $this->buildPackageName($name);
+        if (isset($this->packages[$extName])) {
+            return $this->packages[$extName];
+        }
+        return null;
+    }
+
+    private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?';
+
+    /**
+     * Normalizes a version string to be able to perform comparisons on it
+     *
+     * https://github.com/composer/composer/blob/master/src/Composer/Package/Version/VersionParser.php#L94
+     *
+     * @param string $version
+     * @param string $fullVersion optional complete version string to give more context
+     * @throws \UnexpectedValueException
+     * @return string
+     */
+    public function normalizeVersion($version, $fullVersion = null) {
+        $version = trim($version);
+        if (null === $fullVersion) {
+            $fullVersion = $version;
+        }
+        // ignore aliases and just assume the alias is required instead of the source
+        if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) {
+            $version = $match[1];
+        }
+        // match master-like branches
+        if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) {
+            return '9999999-dev';
+        }
+        if ('dev-' === strtolower(substr($version, 0, 4))) {
+            return 'dev-' . substr($version, 4);
+        }
+        // match classical versioning
+        if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+            $version = $matches[1]
+                . (!empty($matches[2]) ? $matches[2] : '.0')
+                . (!empty($matches[3]) ? $matches[3] : '.0')
+                . (!empty($matches[4]) ? $matches[4] : '.0');
+            $index = 5;
+        } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning
+            $version = preg_replace('{\D}', '-', $matches[1]);
+            $index = 2;
+        } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+            $version = $matches[1]
+                . (!empty($matches[2]) ? $matches[2] : '.0')
+                . (!empty($matches[3]) ? $matches[3] : '.0')
+                . (!empty($matches[4]) ? $matches[4] : '.0');
+            $index = 5;
+        }
+        // add version modifiers if a version was matched
+        if (isset($index)) {
+            if (!empty($matches[$index])) {
+                if ('stable' === $matches[$index]) {
+                    return $version;
+                }
+                $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
+            }
+            if (!empty($matches[$index + 2])) {
+                $version .= '-dev';
+            }
+            return $version;
+        }
+        $extraMessage = '';
+        if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) {
+            $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
+        } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) {
+            $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
+        }
+        throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
+    }
+
+    /**
+     * @param string $stability
+     */
+    private function expandStability($stability) {
+        $stability = strtolower($stability);
+        switch ($stability) {
+            case 'a':
+                return 'alpha';
+            case 'b':
+                return 'beta';
+            case 'p':
+            case 'pl':
+                return 'patch';
+            case 'rc':
+                return 'RC';
+            default:
+                return $stability;
+        }
+    }
 }

lib/private/App/AppStore/Bundles/Bundle.php

Indentation +28 added lines, -28 removed lines

@@ -24,36 +24,36 @@
 use OCP\IL10N;
 
 abstract class Bundle {
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Get the identifier of the bundle
-	 *
-	 * @return string
-	 */
-	final public function getIdentifier() {
-		return substr(strrchr(get_class($this), '\\'), 1);
-	}
+    /**
+     * Get the identifier of the bundle
+     *
+     * @return string
+     */
+    final public function getIdentifier() {
+        return substr(strrchr(get_class($this), '\\'), 1);
+    }
 
-	/**
-	 * Get the name of the bundle
-	 *
-	 * @return string
-	 */
-	abstract public function getName();
+    /**
+     * Get the name of the bundle
+     *
+     * @return string
+     */
+    abstract public function getName();
 
-	/**
-	 * Get the list of app identifiers in the bundle
-	 *
-	 * @return array
-	 */
-	abstract public function getAppIdentifiers();
+    /**
+     * Get the list of app identifiers in the bundle
+     *
+     * @return array
+     */
+    abstract public function getAppIdentifiers();
 }

lib/private/Repair/MoveUpdaterStepFile.php

Indentation +39 added lines, -39 removed lines

@@ -28,51 +28,51 @@
 
 class MoveUpdaterStepFile implements IRepairStep {
 
-	/** @var \OCP\IConfig */
-	protected $config;
+    /** @var \OCP\IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
 
-	public function getName() {
-		return 'Move .step file of updater to backup location';
-	}
+    public function getName() {
+        return 'Move .step file of updater to backup location';
+    }
 
-	public function run(IOutput $output) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+    public function run(IOutput $output) {
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        $instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if (!is_string($instanceId) || empty($instanceId)) {
-			return;
-		}
+        if (!is_string($instanceId) || empty($instanceId)) {
+            return;
+        }
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
-		if (file_exists($stepFile)) {
-			$output->info('.step file exists');
+        $updaterFolderPath = $dataDir . '/updater-' . $instanceId;
+        $stepFile = $updaterFolderPath . '/.step';
+        if (file_exists($stepFile)) {
+            $output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+            $previousStepFile = $updaterFolderPath . '/.step-previous-update';
 
-			// cleanup
-			if (file_exists($previousStepFile)) {
-				if (\OC_Helper::rmdirr($previousStepFile)) {
-					$output->info('.step-previous-update removed');
-				} else {
-					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
-					return;
-				}
-			}
+            // cleanup
+            if (file_exists($previousStepFile)) {
+                if (\OC_Helper::rmdirr($previousStepFile)) {
+                    $output->info('.step-previous-update removed');
+                } else {
+                    $output->info('.step-previous-update can\'t be removed - abort move of .step file');
+                    return;
+                }
+            }
 
-			// move step file
-			if (rename($stepFile, $previousStepFile)) {
-				$output->info('.step file moved to .step-previous-update');
-			} else {
-				$output->warning('.step file can\'t be moved');
-			}
-		}
-	}
+            // move step file
+            if (rename($stepFile, $previousStepFile)) {
+                $output->info('.step file moved to .step-previous-update');
+            } else {
+                $output->warning('.step file can\'t be moved');
+            }
+        }
+    }
 }