nextcloud / server

lib/private/App/CodeChecker/EmptyCheck.php

Indentation +38 added lines, -38 removed lines

@@ -22,47 +22,47 @@
 namespace OC\App\CodeChecker;
 
 class EmptyCheck implements ICheck {
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject) {
-		return '';
-	}
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject) {
+        return '';
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	public function getClasses() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    public function getClasses() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	public function getConstants() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    public function getConstants() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	public function getFunctions() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    public function getFunctions() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	public function getMethods() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    public function getMethods() {
+        return [];
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons() {
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons() {
+        return false;
+    }
 }

lib/private/App/CodeChecker/StrongComparisonCheck.php

Indentation +46 added lines, -46 removed lines

@@ -23,57 +23,57 @@
 namespace OC\App\CodeChecker;
 
 class StrongComparisonCheck implements ICheck {
-	/** @var ICheck */
-	protected $check;
+    /** @var ICheck */
+    protected $check;
 
-	/**
-	 * @param ICheck $check
-	 */
-	public function __construct(ICheck $check) {
-		$this->check = $check;
-	}
+    /**
+     * @param ICheck $check
+     */
+    public function __construct(ICheck $check) {
+        $this->check = $check;
+    }
 
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject) {
-		return $this->check->getDescription($errorCode, $errorObject);
-	}
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject) {
+        return $this->check->getDescription($errorCode, $errorObject);
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getClasses() {
-		return $this->check->getClasses();
-	}
+    /**
+     * @return array
+     */
+    public function getClasses() {
+        return $this->check->getClasses();
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getConstants() {
-		return $this->check->getConstants();
-	}
+    /**
+     * @return array
+     */
+    public function getConstants() {
+        return $this->check->getConstants();
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getFunctions() {
-		return $this->check->getFunctions();
-	}
+    /**
+     * @return array
+     */
+    public function getFunctions() {
+        return $this->check->getFunctions();
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getMethods() {
-		return $this->check->getMethods();
-	}
+    /**
+     * @return array
+     */
+    public function getMethods() {
+        return $this->check->getMethods();
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons() {
-		return true;
-	}
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons() {
+        return true;
+    }
 }

lib/private/App/CodeChecker/CodeChecker.php

Spacing +6 added lines, -6 removed lines

@@ -42,10 +42,10 @@ 
 	const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001;
 	const STATIC_CALL_NOT_ALLOWED = 1002;
 	const CLASS_CONST_FETCH_NOT_ALLOWED = 1003;
-	const CLASS_NEW_NOT_ALLOWED =  1004;
-	const OP_OPERATOR_USAGE_DISCOURAGED =  1005;
-	const CLASS_USE_NOT_ALLOWED =  1006;
-	const CLASS_METHOD_CALL_NOT_ALLOWED =  1007;
+	const CLASS_NEW_NOT_ALLOWED = 1004;
+	const OP_OPERATOR_USAGE_DISCOURAGED = 1005;
+	const CLASS_USE_NOT_ALLOWED = 1006;
+	const CLASS_METHOD_CALL_NOT_ALLOWED = 1007;
 
 	/** @var Parser */
 	private $parser;
@@ -85,13 +85,13 @@ 
 		}
 
 		$excludes = array_map(function($item) use ($folder) {
-			return $folder . '/' . $item;
+			return $folder.'/'.$item;
 		}, $excludedDirectories);
 
 		$iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
 		$iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
 			/** @var SplFileInfo $item */
-			foreach($excludes as $exclude) {
+			foreach ($excludes as $exclude) {
 				if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) {
 					return false;
 				}

Indentation +101 added lines, -101 removed lines

@@ -36,105 +36,105 @@
 
 class CodeChecker extends BasicEmitter {
 
-	const CLASS_EXTENDS_NOT_ALLOWED = 1000;
-	const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001;
-	const STATIC_CALL_NOT_ALLOWED = 1002;
-	const CLASS_CONST_FETCH_NOT_ALLOWED = 1003;
-	const CLASS_NEW_NOT_ALLOWED =  1004;
-	const OP_OPERATOR_USAGE_DISCOURAGED =  1005;
-	const CLASS_USE_NOT_ALLOWED =  1006;
-	const CLASS_METHOD_CALL_NOT_ALLOWED =  1007;
-
-	/** @var Parser */
-	private $parser;
-
-	/** @var ICheck */
-	protected $checkList;
-
-	/** @var bool */
-	protected $checkMigrationSchema;
-
-	public function __construct(ICheck $checkList, $checkMigrationSchema) {
-		$this->checkList = $checkList;
-		$this->checkMigrationSchema = $checkMigrationSchema;
-		$this->parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
-	}
-
-	/**
-	 * @param string $appId
-	 * @return array
-	 * @throws \RuntimeException if app with $appId is unknown
-	 */
-	public function analyse(string $appId): array {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		return $this->analyseFolder($appId, $appPath);
-	}
-
-	/**
-	 * @param string $appId
-	 * @param string $folder
-	 * @return array
-	 */
-	public function analyseFolder(string $appId, string $folder): array {
-		$errors = [];
-
-		$excludedDirectories = ['vendor', '3rdparty', '.git', 'l10n', 'tests', 'test', 'build'];
-		if ($appId === 'password_policy') {
-			$excludedDirectories[] = 'lists';
-		}
-
-		$excludes = array_map(function($item) use ($folder) {
-			return $folder . '/' . $item;
-		}, $excludedDirectories);
-
-		$iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
-		$iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
-			/** @var SplFileInfo $item */
-			foreach($excludes as $exclude) {
-				if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) {
-					return false;
-				}
-			}
-			return true;
-		});
-		$iterator = new RecursiveIteratorIterator($iterator);
-		$iterator = new RegexIterator($iterator, '/^.+\.php$/i');
-
-		foreach ($iterator as $file) {
-			/** @var SplFileInfo $file */
-			$this->emit('CodeChecker', 'analyseFileBegin', [$file->getPathname()]);
-			$fileErrors = $this->analyseFile($file->__toString());
-			$this->emit('CodeChecker', 'analyseFileFinished', [$file->getPathname(), $fileErrors]);
-			$errors = array_merge($fileErrors, $errors);
-		}
-
-		return $errors;
-	}
-
-
-	/**
-	 * @param string $file
-	 * @return array
-	 */
-	public function analyseFile(string $file): array {
-		$code = file_get_contents($file);
-		$statements = $this->parser->parse($code);
-
-		$visitor = new NodeVisitor($this->checkList);
-		$migrationVisitor = new MigrationSchemaChecker();
-		$traverser = new NodeTraverser;
-		$traverser->addVisitor($visitor);
-
-		if ($this->checkMigrationSchema && preg_match('#^.+\\/Migration\\/Version[^\\/]{1,255}\\.php$#i', $file)) {
-			$traverser->addVisitor($migrationVisitor);
-		}
-
-		$traverser->traverse($statements);
-
-		return array_merge($visitor->errors, $migrationVisitor->errors);
-	}
+    const CLASS_EXTENDS_NOT_ALLOWED = 1000;
+    const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001;
+    const STATIC_CALL_NOT_ALLOWED = 1002;
+    const CLASS_CONST_FETCH_NOT_ALLOWED = 1003;
+    const CLASS_NEW_NOT_ALLOWED =  1004;
+    const OP_OPERATOR_USAGE_DISCOURAGED =  1005;
+    const CLASS_USE_NOT_ALLOWED =  1006;
+    const CLASS_METHOD_CALL_NOT_ALLOWED =  1007;
+
+    /** @var Parser */
+    private $parser;
+
+    /** @var ICheck */
+    protected $checkList;
+
+    /** @var bool */
+    protected $checkMigrationSchema;
+
+    public function __construct(ICheck $checkList, $checkMigrationSchema) {
+        $this->checkList = $checkList;
+        $this->checkMigrationSchema = $checkMigrationSchema;
+        $this->parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
+    }
+
+    /**
+     * @param string $appId
+     * @return array
+     * @throws \RuntimeException if app with $appId is unknown
+     */
+    public function analyse(string $appId): array {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        return $this->analyseFolder($appId, $appPath);
+    }
+
+    /**
+     * @param string $appId
+     * @param string $folder
+     * @return array
+     */
+    public function analyseFolder(string $appId, string $folder): array {
+        $errors = [];
+
+        $excludedDirectories = ['vendor', '3rdparty', '.git', 'l10n', 'tests', 'test', 'build'];
+        if ($appId === 'password_policy') {
+            $excludedDirectories[] = 'lists';
+        }
+
+        $excludes = array_map(function($item) use ($folder) {
+            return $folder . '/' . $item;
+        }, $excludedDirectories);
+
+        $iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
+        $iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
+            /** @var SplFileInfo $item */
+            foreach($excludes as $exclude) {
+                if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) {
+                    return false;
+                }
+            }
+            return true;
+        });
+        $iterator = new RecursiveIteratorIterator($iterator);
+        $iterator = new RegexIterator($iterator, '/^.+\.php$/i');
+
+        foreach ($iterator as $file) {
+            /** @var SplFileInfo $file */
+            $this->emit('CodeChecker', 'analyseFileBegin', [$file->getPathname()]);
+            $fileErrors = $this->analyseFile($file->__toString());
+            $this->emit('CodeChecker', 'analyseFileFinished', [$file->getPathname(), $fileErrors]);
+            $errors = array_merge($fileErrors, $errors);
+        }
+
+        return $errors;
+    }
+
+
+    /**
+     * @param string $file
+     * @return array
+     */
+    public function analyseFile(string $file): array {
+        $code = file_get_contents($file);
+        $statements = $this->parser->parse($code);
+
+        $visitor = new NodeVisitor($this->checkList);
+        $migrationVisitor = new MigrationSchemaChecker();
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+
+        if ($this->checkMigrationSchema && preg_match('#^.+\\/Migration\\/Version[^\\/]{1,255}\\.php$#i', $file)) {
+            $traverser->addVisitor($migrationVisitor);
+        }
+
+        $traverser->traverse($statements);
+
+        return array_merge($visitor->errors, $migrationVisitor->errors);
+    }
 }

lib/private/App/CodeChecker/ICheck.php

Indentation +26 added lines, -26 removed lines

@@ -22,35 +22,35 @@
 namespace OC\App\CodeChecker;
 
 interface ICheck {
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject);
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject);
 
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	public function getClasses();
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    public function getClasses();
 
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	public function getConstants();
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    public function getConstants();
 
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	public function getFunctions();
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    public function getFunctions();
 
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	public function getMethods();
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    public function getMethods();
 
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons();
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons();
 }

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 = array();
-
-		// Extensions scanning
-		foreach ($loadedExtensions as $name) {
-			if (in_array($name, array('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 = array();
+
+        // Extensions scanning
+        foreach ($loadedExtensions as $name) {
+            if (in_array($name, array('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;
+        }
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -90,8 +90,8 @@ 
 					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));
+					$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;
 
@@ -166,19 +166,19 @@ 
 			return '9999999-dev';
 		}
 		if ('dev-' === strtolower(substr($version, 0, 4))) {
-			return 'dev-' . substr($version, 4);
+			return 'dev-'.substr($version, 4);
 		}
 		// match classical versioning
-		if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+		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
+		} 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)) {
+		} 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')
@@ -191,7 +191,7 @@ 
 				if ('stable' === $matches[$index]) {
 					return $version;
 				}
-				$version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
+				$version .= '-'.$this->expandStability($matches[$index]).(!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
 			}
 			if (!empty($matches[$index + 2])) {
 				$version .= '-dev';
@@ -199,12 +199,12 @@ 
 			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-';
+		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);
+		throw new \UnexpectedValueException('Invalid version string "'.$version.'"'.$extraMessage);
 	}
 
 	/**

lib/private/DateTimeFormatter.php

Spacing +2 added lines, -2 removed lines

@@ -237,7 +237,7 @@ 
 	 * @return string Formatted date and time string
 	 */
 	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+		return $this->format($timestamp, 'datetime', $formatDate.'|'.$formatTime, $timeZone, $l);
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 			$formatDate .= '^';
 		}
 
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+		return $this->format($timestamp, 'datetime', $formatDate.'|'.$formatTime, $timeZone, $l);
 	}
 
 	/**

Indentation +268 added lines, -268 removed lines

@@ -25,294 +25,294 @@
 namespace OC;
 
 class DateTimeFormatter implements \OCP\IDateTimeFormatter {
-	/** @var \DateTimeZone */
-	protected $defaultTimeZone;
+    /** @var \DateTimeZone */
+    protected $defaultTimeZone;
 
-	/** @var \OCP\IL10N */
-	protected $defaultL10N;
+    /** @var \OCP\IL10N */
+    protected $defaultL10N;
 
-	/**
-	 * Constructor
-	 *
-	 * @param \DateTimeZone $defaultTimeZone Set the timezone for the format
-	 * @param \OCP\IL10N $defaultL10N Set the language for the format
-	 */
-	public function __construct(\DateTimeZone $defaultTimeZone, \OCP\IL10N $defaultL10N) {
-		$this->defaultTimeZone = $defaultTimeZone;
-		$this->defaultL10N = $defaultL10N;
-	}
+    /**
+     * Constructor
+     *
+     * @param \DateTimeZone $defaultTimeZone Set the timezone for the format
+     * @param \OCP\IL10N $defaultL10N Set the language for the format
+     */
+    public function __construct(\DateTimeZone $defaultTimeZone, \OCP\IL10N $defaultL10N) {
+        $this->defaultTimeZone = $defaultTimeZone;
+        $this->defaultL10N = $defaultL10N;
+    }
 
-	/**
-	 * Get TimeZone to use
-	 *
-	 * @param \DateTimeZone $timeZone	The timezone to use
-	 * @return \DateTimeZone		The timezone to use, falling back to the current user's timezone
-	 */
-	protected function getTimeZone($timeZone = null) {
-		if ($timeZone === null) {
-			$timeZone = $this->defaultTimeZone;
-		}
+    /**
+     * Get TimeZone to use
+     *
+     * @param \DateTimeZone $timeZone	The timezone to use
+     * @return \DateTimeZone		The timezone to use, falling back to the current user's timezone
+     */
+    protected function getTimeZone($timeZone = null) {
+        if ($timeZone === null) {
+            $timeZone = $this->defaultTimeZone;
+        }
 
-		return $timeZone;
-	}
+        return $timeZone;
+    }
 
-	/**
-	 * Get \OCP\IL10N to use
-	 *
-	 * @param \OCP\IL10N $l	The locale to use
-	 * @return \OCP\IL10N		The locale to use, falling back to the current user's locale
-	 */
-	protected function getLocale($l = null) {
-		if ($l === null) {
-			$l = $this->defaultL10N;
-		}
+    /**
+     * Get \OCP\IL10N to use
+     *
+     * @param \OCP\IL10N $l	The locale to use
+     * @return \OCP\IL10N		The locale to use, falling back to the current user's locale
+     */
+    protected function getLocale($l = null) {
+        if ($l === null) {
+            $l = $this->defaultL10N;
+        }
 
-		return $l;
-	}
+        return $l;
+    }
 
-	/**
-	 * Generates a DateTime object with the given timestamp and TimeZone
-	 *
-	 * @param mixed $timestamp
-	 * @param \DateTimeZone $timeZone	The timezone to use
-	 * @return \DateTime
-	 */
-	protected function getDateTime($timestamp, \DateTimeZone $timeZone = null) {
-		if ($timestamp === null) {
-			return new \DateTime('now', $timeZone);
-		} else if (!$timestamp instanceof \DateTime) {
-			$dateTime = new \DateTime('now', $timeZone);
-			$dateTime->setTimestamp($timestamp);
-			return $dateTime;
-		}
-		if ($timeZone) {
-			$timestamp->setTimezone($timeZone);
-		}
-		return $timestamp;
-	}
+    /**
+     * Generates a DateTime object with the given timestamp and TimeZone
+     *
+     * @param mixed $timestamp
+     * @param \DateTimeZone $timeZone	The timezone to use
+     * @return \DateTime
+     */
+    protected function getDateTime($timestamp, \DateTimeZone $timeZone = null) {
+        if ($timestamp === null) {
+            return new \DateTime('now', $timeZone);
+        } else if (!$timestamp instanceof \DateTime) {
+            $dateTime = new \DateTime('now', $timeZone);
+            $dateTime->setTimestamp($timestamp);
+            return $dateTime;
+        }
+        if ($timeZone) {
+            $timestamp->setTimezone($timeZone);
+        }
+        return $timestamp;
+    }
 
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date string
-	 */
-	public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'date', $format, $timeZone, $l);
-	}
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date string
+     */
+    public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'date', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted relative date string
-	 */
-	public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		if (substr($format, -1) !== '*' && substr($format, -1) !== '*') {
-			$format .= '^';
-		}
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted relative date string
+     */
+    public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        if (substr($format, -1) !== '*' && substr($format, -1) !== '*') {
+            $format .= '^';
+        }
 
-		return $this->format($timestamp, 'date', $format, $timeZone, $l);
-	}
+        return $this->format($timestamp, 'date', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Gives the relative date of the timestamp
-	 * Only works for past dates
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @return string	Dates returned are:
-	 * 				<  1 month	=> Today, Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date span
-	 */
-	public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timestamp = $this->getDateTime($timestamp);
-		$timestamp->setTime(0, 0, 0);
+    /**
+     * Gives the relative date of the timestamp
+     * Only works for past dates
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @return string	Dates returned are:
+     * 				<  1 month	=> Today, Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date span
+     */
+    public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timestamp = $this->getDateTime($timestamp);
+        $timestamp->setTime(0, 0, 0);
 
-		if ($baseTimestamp === null) {
-			$baseTimestamp = time();
-		}
-		$baseTimestamp = $this->getDateTime($baseTimestamp);
-		$baseTimestamp->setTime(0, 0, 0);
-		$dateInterval = $timestamp->diff($baseTimestamp);
+        if ($baseTimestamp === null) {
+            $baseTimestamp = time();
+        }
+        $baseTimestamp = $this->getDateTime($baseTimestamp);
+        $baseTimestamp->setTime(0, 0, 0);
+        $dateInterval = $timestamp->diff($baseTimestamp);
 
-		if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 0) {
-			return $l->t('today');
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('tomorrow');
-			} else {
-				return $l->t('yesterday');
-			}
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n day', 'in %n days', $dateInterval->d);
-			} else {
-				return $l->n('%n day ago', '%n days ago', $dateInterval->d);
-			}
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('next month');
-			} else {
-				return $l->t('last month');
-			}
-		} else if ($dateInterval->y == 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n month', 'in %n months', $dateInterval->m);
-			} else {
-				return $l->n('%n month ago', '%n months ago', $dateInterval->m);
-			}
-		} else if ($dateInterval->y == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('next year');
-			} else {
-				return $l->t('last year');
-			}
-		}
-		if ($timestamp > $baseTimestamp) {
-			return $l->n('in %n year', 'in %n years', $dateInterval->y);
-		} else {
-			return $l->n('%n year ago', '%n years ago', $dateInterval->y);
-		}
-	}
+        if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 0) {
+            return $l->t('today');
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('tomorrow');
+            } else {
+                return $l->t('yesterday');
+            }
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n day', 'in %n days', $dateInterval->d);
+            } else {
+                return $l->n('%n day ago', '%n days ago', $dateInterval->d);
+            }
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('next month');
+            } else {
+                return $l->t('last month');
+            }
+        } else if ($dateInterval->y == 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n month', 'in %n months', $dateInterval->m);
+            } else {
+                return $l->n('%n month ago', '%n months ago', $dateInterval->m);
+            }
+        } else if ($dateInterval->y == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('next year');
+            } else {
+                return $l->t('last year');
+            }
+        }
+        if ($timestamp > $baseTimestamp) {
+            return $l->n('in %n year', 'in %n years', $dateInterval->y);
+        } else {
+            return $l->n('%n year ago', '%n years ago', $dateInterval->y);
+        }
+    }
 
-	/**
-	 * Formats the time of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
-	 * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
-	 * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
-	 * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted time string
-	 */
-	public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'time', $format, $timeZone, $l);
-	}
+    /**
+     * Formats the time of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
+     * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
+     * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
+     * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted time string
+     */
+    public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'time', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Gives the relative past time of the timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @return string	Dates returned are:
-	 * 				< 60 sec	=> seconds ago
-	 * 				<  1 hour	=> n minutes ago
-	 * 				<  1 day	=> n hours ago
-	 * 				<  1 month	=> Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted time span
-	 */
-	public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timestamp = $this->getDateTime($timestamp);
-		if ($baseTimestamp === null) {
-			$baseTimestamp = time();
-		}
-		$baseTimestamp = $this->getDateTime($baseTimestamp);
+    /**
+     * Gives the relative past time of the timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @return string	Dates returned are:
+     * 				< 60 sec	=> seconds ago
+     * 				<  1 hour	=> n minutes ago
+     * 				<  1 day	=> n hours ago
+     * 				<  1 month	=> Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted time span
+     */
+    public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timestamp = $this->getDateTime($timestamp);
+        if ($baseTimestamp === null) {
+            $baseTimestamp = time();
+        }
+        $baseTimestamp = $this->getDateTime($baseTimestamp);
 
-		$diff = $timestamp->diff($baseTimestamp);
-		if ($diff->y > 0 || $diff->m > 0 || $diff->d > 0) {
-			return $this->formatDateSpan($timestamp, $baseTimestamp, $l);
-		}
+        $diff = $timestamp->diff($baseTimestamp);
+        if ($diff->y > 0 || $diff->m > 0 || $diff->d > 0) {
+            return $this->formatDateSpan($timestamp, $baseTimestamp, $l);
+        }
 
-		if ($diff->h > 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n hour', 'in %n hours', $diff->h);
-			} else {
-				return $l->n('%n hour ago', '%n hours ago', $diff->h);
-			}
-		} else if ($diff->i > 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n minute', 'in %n minutes', $diff->i);
-			} else {
-				return $l->n('%n minute ago', '%n minutes ago', $diff->i);
-			}
-		}
-		if ($timestamp > $baseTimestamp) {
-			return $l->t('in a few seconds');
-		} else {
-			return $l->t('seconds ago');
-		}
-	}
+        if ($diff->h > 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n hour', 'in %n hours', $diff->h);
+            } else {
+                return $l->n('%n hour ago', '%n hours ago', $diff->h);
+            }
+        } else if ($diff->i > 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n minute', 'in %n minutes', $diff->i);
+            } else {
+                return $l->n('%n minute ago', '%n minutes ago', $diff->i);
+            }
+        }
+        if ($timestamp > $baseTimestamp) {
+            return $l->t('in a few seconds');
+        } else {
+            return $l->t('seconds ago');
+        }
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string		$formatDate		See formatDate() for description
-	 * @param string		$formatTime		See formatTime() for description
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date and time string
-	 */
-	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
-	}
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string		$formatDate		See formatDate() for description
+     * @param string		$formatTime		See formatTime() for description
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date and time string
+     */
+    public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$formatDate		See formatDate() for description
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param string	$formatTime		See formatTime() for description
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted relative date and time string
-	 */
-	public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		if (substr($formatDate, -1) !== '^' && substr($formatDate, -1) !== '*') {
-			$formatDate .= '^';
-		}
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$formatDate		See formatDate() for description
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param string	$formatTime		See formatTime() for description
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted relative date and time string
+     */
+    public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        if (substr($formatDate, -1) !== '^' && substr($formatDate, -1) !== '*') {
+            $formatDate .= '^';
+        }
 
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
-	}
+        return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string		$type		One of 'date', 'datetime' or 'time'
-	 * @param string		$format		Format string
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date and time string
-	 */
-	protected function format($timestamp, $type, $format, \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timeZone = $this->getTimeZone($timeZone);
-		$timestamp = $this->getDateTime($timestamp, $timeZone);
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string		$type		One of 'date', 'datetime' or 'time'
+     * @param string		$format		Format string
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date and time string
+     */
+    protected function format($timestamp, $type, $format, \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timeZone = $this->getTimeZone($timeZone);
+        $timestamp = $this->getDateTime($timestamp, $timeZone);
 
-		return $l->l($type, $timestamp, array(
-			'width' => $format,
-		));
-	}
+        return $l->l($type, $timestamp, array(
+            'width' => $format,
+        ));
+    }
 }

lib/private/Preview/Provider.php

Indentation +33 added lines, -33 removed lines

@@ -28,41 +28,41 @@
 use OCP\Preview\IProvider;
 
 abstract class Provider implements IProvider {
-	private $options;
+    private $options;
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $options
-	 */
-	public function __construct(array $options = []) {
-		$this->options = $options;
-	}
+    /**
+     * Constructor
+     *
+     * @param array $options
+     */
+    public function __construct(array $options = []) {
+        $this->options = $options;
+    }
 
-	/**
-	 * @return string Regex with the mimetypes that are supported by this provider
-	 */
-	abstract public function getMimeType();
+    /**
+     * @return string Regex with the mimetypes that are supported by this provider
+     */
+    abstract public function getMimeType();
 
-	/**
-	 * Check if a preview can be generated for $path
-	 *
-	 * @param \OCP\Files\FileInfo $file
-	 * @return bool
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file) {
-		return true;
-	}
+    /**
+     * Check if a preview can be generated for $path
+     *
+     * @param \OCP\Files\FileInfo $file
+     * @return bool
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file) {
+        return true;
+    }
 
-	/**
-	 * Generates thumbnail which fits in $maxX and $maxY and keeps the aspect ratio, for file at path $path
-	 *
-	 * @param string $path Path of file
-	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param bool $scalingup Disable/Enable upscaling of previews
-	 * @param \OC\Files\View $fileview fileview object of user folder
-	 * @return bool|\OCP\IImage false if no preview was generated
-	 */
-	abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
+    /**
+     * Generates thumbnail which fits in $maxX and $maxY and keeps the aspect ratio, for file at path $path
+     *
+     * @param string $path Path of file
+     * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param bool $scalingup Disable/Enable upscaling of previews
+     * @param \OC\Files\View $fileview fileview object of user folder
+     * @return bool|\OCP\IImage false if no preview was generated
+     */
+    abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
 }

lib/private/Preview/Movie.php

Spacing +7 added lines, -7 removed lines

@@ -84,15 +84,15 @@
 		$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
 
 		if (self::$avconvBinary) {
-			$cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
+			$cmd = self::$avconvBinary.' -y -ss '.escapeshellarg($second).
+				' -i '.escapeshellarg($absPath).
+				' -an -f mjpeg -vframes 1 -vsync 1 '.escapeshellarg($tmpPath).
 				' > /dev/null 2>&1';
 		} else {
-			$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -f mjpeg -vframes 1' .
-				' ' . escapeshellarg($tmpPath) .
+			$cmd = self::$ffmpegBinary.' -y -ss '.escapeshellarg($second).
+				' -i '.escapeshellarg($absPath).
+				' -f mjpeg -vframes 1'.
+				' '.escapeshellarg($tmpPath).
 				' > /dev/null 2>&1';
 		}
 

Indentation +58 added lines, -58 removed lines

@@ -29,73 +29,73 @@
 use OCP\IImage;
 
 class Movie extends ProviderV2 {
-	public static $avconvBinary;
-	public static $ffmpegBinary;
+    public static $avconvBinary;
+    public static $ffmpegBinary;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/video\/.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/video\/.*/';
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		// TODO: use proc_open() and stream the source file ?
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        // TODO: use proc_open() and stream the source file ?
 
-		$absPath = $this->getLocalFile($file, 5242880); // only use the first 5MB
+        $absPath = $this->getLocalFile($file, 5242880); // only use the first 5MB
 
-		$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
-		if ($result === false) {
-			$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
-			if ($result === false) {
-				$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
-			}
-		}
+        $result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
+        if ($result === false) {
+            $result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
+            if ($result === false) {
+                $result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
+            }
+        }
 
-		$this->cleanTmpFiles();
+        $this->cleanTmpFiles();
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * @param int $maxX
-	 * @param int $maxY
-	 * @param string $absPath
-	 * @param int $second
-	 * @return null|\OCP\IImage
-	 */
-	private function generateThumbNail($maxX, $maxY, $absPath, $second): ?IImage {
-		$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
+    /**
+     * @param int $maxX
+     * @param int $maxY
+     * @param string $absPath
+     * @param int $second
+     * @return null|\OCP\IImage
+     */
+    private function generateThumbNail($maxX, $maxY, $absPath, $second): ?IImage {
+        $tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
 
-		if (self::$avconvBinary) {
-			$cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
-				' > /dev/null 2>&1';
-		} else {
-			$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -f mjpeg -vframes 1' .
-				' ' . escapeshellarg($tmpPath) .
-				' > /dev/null 2>&1';
-		}
+        if (self::$avconvBinary) {
+            $cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
+                ' -i ' . escapeshellarg($absPath) .
+                ' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
+                ' > /dev/null 2>&1';
+        } else {
+            $cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
+                ' -i ' . escapeshellarg($absPath) .
+                ' -f mjpeg -vframes 1' .
+                ' ' . escapeshellarg($tmpPath) .
+                ' > /dev/null 2>&1';
+        }
 
-		exec($cmd, $output, $returnCode);
+        exec($cmd, $output, $returnCode);
 
-		if ($returnCode === 0) {
-			$image = new \OC_Image();
-			$image->loadFromFile($tmpPath);
-			unlink($tmpPath);
-			if ($image->valid()) {
-				$image->scaleDownToFit($maxX, $maxY);
+        if ($returnCode === 0) {
+            $image = new \OC_Image();
+            $image->loadFromFile($tmpPath);
+            unlink($tmpPath);
+            if ($image->valid()) {
+                $image->scaleDownToFit($maxX, $maxY);
 
-				return $image;
-			}
-		}
-		unlink($tmpPath);
-		return null;
-	}
+                return $image;
+            }
+        }
+        unlink($tmpPath);
+        return null;
+    }
 }

lib/private/Share20/Hooks.php

Indentation +9 added lines, -9 removed lines

@@ -22,15 +22,15 @@
 namespace OC\Share20;
 
 class Hooks {
-	public static function post_deleteUser($arguments) {
-		\OC::$server->getShareManager()->userDeleted($arguments['uid']);
-	}
+    public static function post_deleteUser($arguments) {
+        \OC::$server->getShareManager()->userDeleted($arguments['uid']);
+    }
 
-	public static function post_deleteGroup($arguments) {
-		\OC::$server->getShareManager()->groupDeleted($arguments['gid']);
-	}
+    public static function post_deleteGroup($arguments) {
+        \OC::$server->getShareManager()->groupDeleted($arguments['gid']);
+    }
 
-	public static function post_removeFromGroup($arguments) {
-		\OC::$server->getShareManager()->userDeletedFromGroup($arguments['uid'], $arguments['gid']);
-	}
+    public static function post_removeFromGroup($arguments) {
+        \OC::$server->getShareManager()->userDeletedFromGroup($arguments['uid'], $arguments['gid']);
+    }
 }