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/PrivateCheck.php

Indentation +55 added lines, -55 removed lines

@@ -23,63 +23,63 @@
 namespace OC\App\CodeChecker;
 
 class PrivateCheck extends AbstractCheck implements ICheck {
-	/**
-	 * @return string
-	 */
-	protected function getLocalDescription() {
-		return 'private';
-	}
+    /**
+     * @return string
+     */
+    protected function getLocalDescription() {
+        return 'private';
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalClasses() {
-		return [
-			// classes replaced by the public api
-			'OC_API' => '6.0.0',
-			'OC_App' => '6.0.0',
-			'OC_AppConfig' => '6.0.0',
-			'OC_Avatar' => '6.0.0',
-			'OC_BackgroundJob' => '6.0.0',
-			'OC_Config' => '6.0.0',
-			'OC_DB' => '6.0.0',
-			'OC_Files' => '6.0.0',
-			'OC_Helper' => '6.0.0',
-			'OC_Hook' => '6.0.0',
-			'OC_Image' => '6.0.0',
-			'OC_JSON' => '6.0.0',
-			'OC_L10N' => '6.0.0',
-			'OC_Log' => '6.0.0',
-			'OC_Mail' => '6.0.0',
-			'OC_Preferences' => '6.0.0',
-			'OC_Search_Provider' => '6.0.0',
-			'OC_Search_Result' => '6.0.0',
-			'OC_Request' => '6.0.0',
-			'OC_Response' => '6.0.0',
-			'OC_Template' => '6.0.0',
-			'OC_User' => '6.0.0',
-			'OC_Util' => '6.0.0',
-		];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalClasses() {
+        return [
+            // classes replaced by the public api
+            'OC_API' => '6.0.0',
+            'OC_App' => '6.0.0',
+            'OC_AppConfig' => '6.0.0',
+            'OC_Avatar' => '6.0.0',
+            'OC_BackgroundJob' => '6.0.0',
+            'OC_Config' => '6.0.0',
+            'OC_DB' => '6.0.0',
+            'OC_Files' => '6.0.0',
+            'OC_Helper' => '6.0.0',
+            'OC_Hook' => '6.0.0',
+            'OC_Image' => '6.0.0',
+            'OC_JSON' => '6.0.0',
+            'OC_L10N' => '6.0.0',
+            'OC_Log' => '6.0.0',
+            'OC_Mail' => '6.0.0',
+            'OC_Preferences' => '6.0.0',
+            'OC_Search_Provider' => '6.0.0',
+            'OC_Search_Result' => '6.0.0',
+            'OC_Request' => '6.0.0',
+            'OC_Response' => '6.0.0',
+            'OC_Template' => '6.0.0',
+            'OC_User' => '6.0.0',
+            'OC_Util' => '6.0.0',
+        ];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalConstants() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalConstants() {
+        return [];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalFunctions() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalFunctions() {
+        return [];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalMethods() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalMethods() {
+        return [];
+    }
 }

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 +100 added lines, -100 removed lines

@@ -36,104 +36,104 @@
 
 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 Parser(new Lexer);
-	}
-
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$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($appId, $folder) {
-		$errors = [];
-
-		$excludedDirectories = ['vendor', '3rdparty', '.git', 'l10n', 'tests', 'test'];
-		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);
-			$this->emit('CodeChecker', 'analyseFileFinished', [$file->getPathname(), $fileErrors]);
-			$errors = array_merge($fileErrors, $errors);
-		}
-
-		return $errors;
-	}
-
-
-	/**
-	 * @param string $file
-	 * @return array
-	 */
-	public function analyseFile($file) {
-		$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 Parser(new Lexer);
+    }
+
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $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($appId, $folder) {
+        $errors = [];
+
+        $excludedDirectories = ['vendor', '3rdparty', '.git', 'l10n', 'tests', 'test'];
+        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);
+            $this->emit('CodeChecker', 'analyseFileFinished', [$file->getPathname(), $fileErrors]);
+            $errors = array_merge($fileErrors, $errors);
+        }
+
+        return $errors;
+    }
+
+
+    /**
+     * @param string $file
+     * @return array
+     */
+    public function analyseFile($file) {
+        $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/Preview/MSOffice2003.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 
 //.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
 class MSOffice2003 extends Office {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/application\/vnd.ms-.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/application\/vnd.ms-.*/';
+    }
 }

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/OpenDocument.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 
 //.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
 class OpenDocument extends Office {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/application\/vnd.oasis.opendocument.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/application\/vnd.oasis.opendocument.*/';
+    }
 }