nextcloud / server

lib/private/DB/MigrationException.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 
 
 class MigrationException extends \Exception {
-	private $table;
+    private $table;
 
-	public function __construct($table, $message) {
-		$this->table = $table;
-		parent::__construct($message);
-	}
+    public function __construct($table, $message) {
+        $this->table = $table;
+        parent::__construct($message);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getTable() {
-		return $this->table;
-	}
+    /**
+     * @return string
+     */
+    public function getTable() {
+        return $this->table;
+    }
 }

lib/private/DB/MDB2SchemaWriter.php

Indentation +140 added lines, -140 removed lines

@@ -31,153 +31,153 @@
 
 class MDB2SchemaWriter {
 
-	/**
-	 * @param string $file
-	 * @param \OC\DB\Connection $conn
-	 * @return bool
-	 */
-	static public function saveSchemaToFile($file, \OC\DB\Connection $conn) {
-		$config = \OC::$server->getConfig();
+    /**
+     * @param string $file
+     * @param \OC\DB\Connection $conn
+     * @return bool
+     */
+    static public function saveSchemaToFile($file, \OC\DB\Connection $conn) {
+        $config = \OC::$server->getConfig();
 
-		$xml = new \SimpleXMLElement('<database/>');
-		$xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
-		$xml->addChild('create', 'true');
-		$xml->addChild('overwrite', 'false');
-		if($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
-			$xml->addChild('charset', 'utf8mb4');
-		} else {
-			$xml->addChild('charset', 'utf8');
-		}
+        $xml = new \SimpleXMLElement('<database/>');
+        $xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
+        $xml->addChild('create', 'true');
+        $xml->addChild('overwrite', 'false');
+        if($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
+            $xml->addChild('charset', 'utf8mb4');
+        } else {
+            $xml->addChild('charset', 'utf8');
+        }
 
-		// FIX ME: bloody work around
-		if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') {
-			$filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/';
-		} else {
-			$filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/';
-		}
-		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
+        // FIX ME: bloody work around
+        if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') {
+            $filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/';
+        } else {
+            $filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/';
+        }
+        $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
 
-		foreach ($conn->getSchemaManager()->listTables() as $table) {
-			self::saveTable($table, $xml->addChild('table'));
-		}
-		file_put_contents($file, $xml->asXML());
-		return true;
-	}
+        foreach ($conn->getSchemaManager()->listTables() as $table) {
+            self::saveTable($table, $xml->addChild('table'));
+        }
+        file_put_contents($file, $xml->asXML());
+        return true;
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveTable($table, $xml) {
-		$xml->addChild('name', $table->getName());
-		$declaration = $xml->addChild('declaration');
-		foreach($table->getColumns() as $column) {
-			self::saveColumn($column, $declaration->addChild('field'));
-		}
-		foreach($table->getIndexes() as $index) {
-			if ($index->getName() == 'PRIMARY') {
-				$autoincrement = false;
-				foreach($index->getColumns() as $column) {
-					if ($table->getColumn($column)->getAutoincrement()) {
-						$autoincrement = true;
-					}
-				}
-				if ($autoincrement) {
-					continue;
-				}
-			}
-			self::saveIndex($index, $declaration->addChild('index'));
-		}
-	}
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveTable($table, $xml) {
+        $xml->addChild('name', $table->getName());
+        $declaration = $xml->addChild('declaration');
+        foreach($table->getColumns() as $column) {
+            self::saveColumn($column, $declaration->addChild('field'));
+        }
+        foreach($table->getIndexes() as $index) {
+            if ($index->getName() == 'PRIMARY') {
+                $autoincrement = false;
+                foreach($index->getColumns() as $column) {
+                    if ($table->getColumn($column)->getAutoincrement()) {
+                        $autoincrement = true;
+                    }
+                }
+                if ($autoincrement) {
+                    continue;
+                }
+            }
+            self::saveIndex($index, $declaration->addChild('index'));
+        }
+    }
 
-	/**
-	 * @param Column $column
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveColumn($column, $xml) {
-		$xml->addChild('name', $column->getName());
-		switch($column->getType()) {
-			case 'SmallInt':
-			case 'Integer':
-			case 'BigInt':
-				$xml->addChild('type', 'integer');
-				$default = $column->getDefault();
-				if (is_null($default) && $column->getAutoincrement()) {
-					$default = '0';
-				}
-				$xml->addChild('default', $default);
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				if ($column->getAutoincrement()) {
-					$xml->addChild('autoincrement', '1');
-				}
-				if ($column->getUnsigned()) {
-					$xml->addChild('unsigned', 'true');
-				}
-				$length = '4';
-				if ($column->getType() == 'SmallInt') {
-					$length = '2';
-				}
-				elseif ($column->getType() == 'BigInt') {
-					$length = '8';
-				}
-				$xml->addChild('length', $length);
-				break;
-			case 'String':
-				$xml->addChild('type', 'text');
-				$default = trim($column->getDefault());
-				if ($default === '') {
-					$default = false;
-				}
-				$xml->addChild('default', $default);
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', $column->getLength());
-				break;
-			case 'Text':
-				$xml->addChild('type', 'clob');
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				break;
-			case 'Decimal':
-				$xml->addChild('type', 'decimal');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', '15');
-				break;
-			case 'Boolean':
-				$xml->addChild('type', 'integer');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', '1');
-				break;
-			case 'DateTime':
-				$xml->addChild('type', 'timestamp');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				break;
+    /**
+     * @param Column $column
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveColumn($column, $xml) {
+        $xml->addChild('name', $column->getName());
+        switch($column->getType()) {
+            case 'SmallInt':
+            case 'Integer':
+            case 'BigInt':
+                $xml->addChild('type', 'integer');
+                $default = $column->getDefault();
+                if (is_null($default) && $column->getAutoincrement()) {
+                    $default = '0';
+                }
+                $xml->addChild('default', $default);
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                if ($column->getAutoincrement()) {
+                    $xml->addChild('autoincrement', '1');
+                }
+                if ($column->getUnsigned()) {
+                    $xml->addChild('unsigned', 'true');
+                }
+                $length = '4';
+                if ($column->getType() == 'SmallInt') {
+                    $length = '2';
+                }
+                elseif ($column->getType() == 'BigInt') {
+                    $length = '8';
+                }
+                $xml->addChild('length', $length);
+                break;
+            case 'String':
+                $xml->addChild('type', 'text');
+                $default = trim($column->getDefault());
+                if ($default === '') {
+                    $default = false;
+                }
+                $xml->addChild('default', $default);
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', $column->getLength());
+                break;
+            case 'Text':
+                $xml->addChild('type', 'clob');
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                break;
+            case 'Decimal':
+                $xml->addChild('type', 'decimal');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', '15');
+                break;
+            case 'Boolean':
+                $xml->addChild('type', 'integer');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', '1');
+                break;
+            case 'DateTime':
+                $xml->addChild('type', 'timestamp');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                break;
 
-		}
-	}
+        }
+    }
 
-	/**
-	 * @param Index $index
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveIndex($index, $xml) {
-		$xml->addChild('name', $index->getName());
-		if ($index->isPrimary()) {
-			$xml->addChild('primary', 'true');
-		}
-		elseif ($index->isUnique()) {
-			$xml->addChild('unique', 'true');
-		}
-		foreach($index->getColumns() as $column) {
-			$field = $xml->addChild('field');
-			$field->addChild('name', $column);
-			$field->addChild('sorting', 'ascending');
+    /**
+     * @param Index $index
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveIndex($index, $xml) {
+        $xml->addChild('name', $index->getName());
+        if ($index->isPrimary()) {
+            $xml->addChild('primary', 'true');
+        }
+        elseif ($index->isUnique()) {
+            $xml->addChild('unique', 'true');
+        }
+        foreach($index->getColumns() as $column) {
+            $field = $xml->addChild('field');
+            $field->addChild('name', $column);
+            $field->addChild('sorting', 'ascending');
 			
-		}
-	}
+        }
+    }
 
-	private static function toBool($bool) {
-		return $bool ? 'true' : 'false';
-	}
+    private static function toBool($bool) {
+        return $bool ? 'true' : 'false';
+    }
 }

lib/private/DB/SQLiteMigrator.php

Indentation +53 added lines, -53 removed lines

@@ -32,62 +32,62 @@
 
 class SQLiteMigrator extends Migrator {
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 * @throws \OC\DB\MigrationException
-	 *
-	 * For sqlite we simple make a copy of the entire database, and test the migration on that
-	 */
-	public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
-		$dbFile = $this->connection->getDatabase();
-		$tmpFile = $this->buildTempDatabase();
-		copy($dbFile, $tmpFile);
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     * @throws \OC\DB\MigrationException
+     *
+     * For sqlite we simple make a copy of the entire database, and test the migration on that
+     */
+    public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
+        $dbFile = $this->connection->getDatabase();
+        $tmpFile = $this->buildTempDatabase();
+        copy($dbFile, $tmpFile);
 
-		$connectionParams = array(
-			'path' => $tmpFile,
-			'driver' => 'pdo_sqlite',
-		);
-		$conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
-		try {
-			$this->applySchema($targetSchema, $conn);
-			$conn->close();
-			unlink($tmpFile);
-		} catch (DBALException $e) {
-			$conn->close();
-			unlink($tmpFile);
-			throw new MigrationException('', $e->getMessage());
-		}
-	}
+        $connectionParams = array(
+            'path' => $tmpFile,
+            'driver' => 'pdo_sqlite',
+        );
+        $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
+        try {
+            $this->applySchema($targetSchema, $conn);
+            $conn->close();
+            unlink($tmpFile);
+        } catch (DBALException $e) {
+            $conn->close();
+            unlink($tmpFile);
+            throw new MigrationException('', $e->getMessage());
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	private function buildTempDatabase() {
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
-		$tmpFile = uniqid("oc_");
-		return "$dataDir/$tmpFile.db";
-	}
+    /**
+     * @return string
+     */
+    private function buildTempDatabase() {
+        $dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
+        $tmpFile = uniqid("oc_");
+        return "$dataDir/$tmpFile.db";
+    }
 
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$platform = $connection->getDatabasePlatform();
-		$platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('varchar ', 'string');
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $platform = $connection->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('varchar ', 'string');
 
-		// with sqlite autoincrement columns is of type integer
-		foreach ($targetSchema->getTables() as $table) {
-			foreach ($table->getColumns() as $column) {
-				if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
-					$column->setType(Type::getType('integer'));
-				}
-			}
-		}
+        // with sqlite autoincrement columns is of type integer
+        foreach ($targetSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
+                    $column->setType(Type::getType('integer'));
+                }
+            }
+        }
 
-		return parent::getDiff($targetSchema, $connection);
-	}
+        return parent::getDiff($targetSchema, $connection);
+    }
 }

lib/private/App/AppStore/Version/Version.php

Indentation +24 added lines, -24 removed lines

@@ -22,31 +22,31 @@
 namespace OC\App\AppStore\Version;
 
 class Version {
-	/** @var string */
-	private $minVersion;
-	/** @var string */
-	private $maxVersion;
+    /** @var string */
+    private $minVersion;
+    /** @var string */
+    private $maxVersion;
 
-	/**
-	 * @param string $minVersion
-	 * @param string $maxVersion
-	 */
-	public function __construct($minVersion, $maxVersion) {
-		$this->minVersion = $minVersion;
-		$this->maxVersion = $maxVersion;
-	}
+    /**
+     * @param string $minVersion
+     * @param string $maxVersion
+     */
+    public function __construct($minVersion, $maxVersion) {
+        $this->minVersion = $minVersion;
+        $this->maxVersion = $maxVersion;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getMinimumVersion() {
-		return $this->minVersion;
-	}
+    /**
+     * @return string
+     */
+    public function getMinimumVersion() {
+        return $this->minVersion;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getMaximumVersion() {
-		return $this->maxVersion;
-	}
+    /**
+     * @return string
+     */
+    public function getMaximumVersion() {
+        return $this->maxVersion;
+    }
 }

lib/private/App/CodeChecker/AbstractCheck.php

Indentation +114 added lines, -114 removed lines

@@ -23,118 +23,118 @@
 namespace OC\App\CodeChecker;
 
 abstract class AbstractCheck implements ICheck {
-	/** @var ICheck */
-	protected $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) {
-		switch ($errorCode) {
-			case CodeChecker::STATIC_CALL_NOT_ALLOWED:
-				$functions = $this->getLocalFunctions();
-				$functions = array_change_key_case($functions, CASE_LOWER);
-				if (isset($functions[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			// no break;
-			case CodeChecker::CLASS_EXTENDS_NOT_ALLOWED:
-			case CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED:
-			case CodeChecker::CLASS_NEW_NOT_ALLOWED:
-			case CodeChecker::CLASS_USE_NOT_ALLOWED:
-				$classes = $this->getLocalClasses();
-				$classes = array_change_key_case($classes, CASE_LOWER);
-				if (isset($classes[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-
-			case CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED:
-				$constants = $this->getLocalConstants();
-				$constants = array_change_key_case($constants, CASE_LOWER);
-				if (isset($constants[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-
-			case CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED:
-				$methods = $this->getLocalMethods();
-				$methods = array_change_key_case($methods, CASE_LOWER);
-				if (isset($methods[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-		}
-
-		return $this->check->getDescription($errorCode, $errorObject);
-	}
-
-	/**
-	 * @return string
-	 */
-	abstract protected function getLocalDescription();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalClasses();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalConstants();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalFunctions();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalMethods();
-
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	public function getClasses() {
-		return array_merge($this->getLocalClasses(), $this->check->getClasses());
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	public function getConstants() {
-		return array_merge($this->getLocalConstants(), $this->check->getConstants());
-	}
-
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	public function getFunctions() {
-		return array_merge($this->getLocalFunctions(), $this->check->getFunctions());
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	public function getMethods() {
-		return array_merge($this->getLocalMethods(), $this->check->getMethods());
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons() {
-		return $this->check->checkStrongComparisons();
-	}
+    /** @var ICheck */
+    protected $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) {
+        switch ($errorCode) {
+            case CodeChecker::STATIC_CALL_NOT_ALLOWED:
+                $functions = $this->getLocalFunctions();
+                $functions = array_change_key_case($functions, CASE_LOWER);
+                if (isset($functions[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            // no break;
+            case CodeChecker::CLASS_EXTENDS_NOT_ALLOWED:
+            case CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED:
+            case CodeChecker::CLASS_NEW_NOT_ALLOWED:
+            case CodeChecker::CLASS_USE_NOT_ALLOWED:
+                $classes = $this->getLocalClasses();
+                $classes = array_change_key_case($classes, CASE_LOWER);
+                if (isset($classes[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+
+            case CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED:
+                $constants = $this->getLocalConstants();
+                $constants = array_change_key_case($constants, CASE_LOWER);
+                if (isset($constants[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+
+            case CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED:
+                $methods = $this->getLocalMethods();
+                $methods = array_change_key_case($methods, CASE_LOWER);
+                if (isset($methods[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+        }
+
+        return $this->check->getDescription($errorCode, $errorObject);
+    }
+
+    /**
+     * @return string
+     */
+    abstract protected function getLocalDescription();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalClasses();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalConstants();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalFunctions();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalMethods();
+
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    public function getClasses() {
+        return array_merge($this->getLocalClasses(), $this->check->getClasses());
+    }
+
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    public function getConstants() {
+        return array_merge($this->getLocalConstants(), $this->check->getConstants());
+    }
+
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    public function getFunctions() {
+        return array_merge($this->getLocalFunctions(), $this->check->getFunctions());
+    }
+
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    public function getMethods() {
+        return array_merge($this->getLocalMethods(), $this->check->getMethods());
+    }
+
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons() {
+        return $this->check->checkStrongComparisons();
+    }
 }

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/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;
+        }
+    }
 }