nextcloud / server

lib/private/DB/QueryBuilder/Parameter.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 use OCP\DB\QueryBuilder\IParameter;
 
 class Parameter implements IParameter {
-	/** @var mixed */
-	protected $name;
+    /** @var mixed */
+    protected $name;
 
-	public function __construct($name) {
-		$this->name = $name;
-	}
+    public function __construct($name) {
+        $this->name = $name;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return (string) $this->name;
-	}
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return (string) $this->name;
+    }
 }

lib/private/DB/PgSqlTools.php

Indentation +32 added lines, -32 removed lines

@@ -31,41 +31,41 @@
 */
 class PgSqlTools {
 
-	/** @var \OCP\IConfig */
-	private $config;
+    /** @var \OCP\IConfig */
+    private $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	* @brief Resynchronizes all sequences of a database after using INSERTs
-	*        without leaving out the auto-incremented column.
-	* @param \OC\DB\Connection $conn
-	* @return null
-	*/
-	public function resynchronizeDatabaseSequences(Connection $conn) {
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-		$databaseName = $conn->getDatabase();
-		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
+    /**
+     * @brief Resynchronizes all sequences of a database after using INSERTs
+     *        without leaving out the auto-incremented column.
+     * @param \OC\DB\Connection $conn
+     * @return null
+     */
+    public function resynchronizeDatabaseSequences(Connection $conn) {
+        $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+        $databaseName = $conn->getDatabase();
+        $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
 
-		foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
-			$sequenceName = $sequence->getName();
-			$sqlInfo = 'SELECT table_schema, table_name, column_name
+        foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
+            $sequenceName = $sequence->getName();
+            $sqlInfo = 'SELECT table_schema, table_name, column_name
 				FROM information_schema.columns
 				WHERE column_default = ? AND table_catalog = ?';
-			$sequenceInfo = $conn->fetchAssoc($sqlInfo, array(
-				"nextval('$sequenceName'::regclass)",
-				$databaseName
-			));
-			$tableName = $sequenceInfo['table_name'];
-			$columnName = $sequenceInfo['column_name'];
-			$sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
-			$sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
-			$conn->executeQuery($sqlSetval);
-		}
-	}
+            $sequenceInfo = $conn->fetchAssoc($sqlInfo, array(
+                "nextval('$sequenceName'::regclass)",
+                $databaseName
+            ));
+            $tableName = $sequenceInfo['table_name'];
+            $columnName = $sequenceInfo['column_name'];
+            $sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
+            $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
+            $conn->executeQuery($sqlSetval);
+        }
+    }
 }

lib/private/DB/PostgreSqlMigrator.php

Indentation +25 added lines, -25 removed lines

@@ -25,32 +25,32 @@
 use Doctrine\DBAL\Schema\Schema;
 
 class PostgreSqlMigrator extends Migrator {
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
 
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
-			// see https://github.com/doctrine/dbal/issues/2427
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
-					if ($changedProperties !== 'default') {
-						return true;
-					}
-					$fromDefault = $column->fromColumn->getDefault();
-					$toDefault = $column->column->getDefault();
-					$fromDefault = trim($fromDefault, "()");
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            // fix default value in brackets - pg 9.4 is returning a negative default value in ()
+            // see https://github.com/doctrine/dbal/issues/2427
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
+                    if ($changedProperties !== 'default') {
+                        return true;
+                    }
+                    $fromDefault = $column->fromColumn->getDefault();
+                    $toDefault = $column->column->getDefault();
+                    $fromDefault = trim($fromDefault, "()");
 
-					// by intention usage of !=
-					return $fromDefault != $toDefault;
-				});
-			}
-		}
+                    // by intention usage of !=
+                    return $fromDefault != $toDefault;
+                });
+            }
+        }
 
-		return $schemaDiff;
-	}
+        return $schemaDiff;
+    }
 }

lib/private/DB/AdapterMySQL.php

Indentation +27 added lines, -27 removed lines

@@ -27,31 +27,31 @@
 
 class AdapterMySQL extends Adapter {
 
-	/** @var string */
-	protected $charset;
-
-	/**
-	 * @param string $tableName
-	 */
-	public function lockTable($tableName) {
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
-	}
-
-	public function unlockTable() {
-		$this->conn->executeUpdate('UNLOCK TABLES');
-	}
-
-	public function fixupStatement($statement) {
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
-		return $statement;
-	}
-
-	protected function getCharset() {
-		if (!$this->charset) {
-			$params = $this->conn->getParams();
-			$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
-		}
-
-		return $this->charset;
-	}
+    /** @var string */
+    protected $charset;
+
+    /**
+     * @param string $tableName
+     */
+    public function lockTable($tableName) {
+        $this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
+    }
+
+    public function unlockTable() {
+        $this->conn->executeUpdate('UNLOCK TABLES');
+    }
+
+    public function fixupStatement($statement) {
+        $statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
+        return $statement;
+    }
+
+    protected function getCharset() {
+        if (!$this->charset) {
+            $params = $this->conn->getParams();
+            $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
+        }
+
+        return $this->charset;
+    }
 }

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();
+    }
 }