coding style: fixed spaces & use statements order

dg · dg · commit a919cb5e1722 · 2017-07-21T21:27:52.000+02:00
diff --git a/src/Bridges/DatabaseDI/DatabaseExtension.php b/src/Bridges/DatabaseDI/DatabaseExtension.php
@@ -130,5 +130,4 @@ private function setupDatabase($config, $name): void
 			$builder->addAlias("nette.database.$name.context", $this->prefix("$name.context"));
 		}
 	}
-
 }
diff --git a/src/Bridges/DatabaseTracy/ConnectionPanel.php b/src/Bridges/DatabaseTracy/ConnectionPanel.php
@@ -139,5 +139,4 @@ public function getPanel(): ?string
 		require __DIR__ . '/templates/ConnectionPanel.panel.phtml';
 		return ob_get_clean();
 	}
-
 }
diff --git a/src/Bridges/DatabaseTracy/templates/ConnectionPanel.panel.phtml b/src/Bridges/DatabaseTracy/templates/ConnectionPanel.panel.phtml
@@ -2,8 +2,8 @@
 
 namespace Nette\Bridges\DatabaseTracy;
 
-use Tracy;
 use Nette\Database\Helpers;
+use Tracy;
 
 ?>
 <style class="tracy-debug">
diff --git a/src/Database/Context.php b/src/Database/Context.php
@@ -152,5 +152,4 @@ public static function literal($value, ...$params): SqlLiteral
 	{
 		return new SqlLiteral($value, $params);
 	}
-
 }
diff --git a/src/Database/Conventions/DiscoveredConventions.php b/src/Database/Conventions/DiscoveredConventions.php
@@ -100,5 +100,4 @@ public function getBelongsToReference(string $table, string $key): ?array
 		$this->structure->rebuild();
 		return $this->getBelongsToReference($table, $key);
 	}
-
 }
diff --git a/src/Database/Conventions/StaticConventions.php b/src/Database/Conventions/StaticConventions.php
@@ -78,5 +78,4 @@ protected function getColumnFromTable(string $name): string
 
 		return $name;
 	}
-
 }
diff --git a/src/Database/DriverException.php b/src/Database/DriverException.php
@@ -62,5 +62,4 @@ public function getQueryString(): ?string
 	{
 		return $this->queryString;
 	}
-
 }
diff --git a/src/Database/Drivers/MsSqlDriver.php b/src/Database/Drivers/MsSqlDriver.php
@@ -143,5 +143,4 @@ public function isSupported(string $item): bool
 	{
 		return $item === self::SUPPORT_SUBSELECT;
 	}
-
 }
diff --git a/src/Database/Drivers/MySqlDriver.php b/src/Database/Drivers/MySqlDriver.php
@@ -234,5 +234,4 @@ public function isSupported(string $item): bool
 		// and more.
 		return $item === self::SUPPORT_SELECT_UNGROUPED_COLUMNS || $item === self::SUPPORT_MULTI_COLUMN_AS_OR_COND;
 	}
-
 }
diff --git a/src/Database/Drivers/OciDriver.php b/src/Database/Drivers/OciDriver.php
@@ -172,5 +172,4 @@ public function isSupported(string $item): bool
 	{
 		return $item === self::SUPPORT_SEQUENCE || $item === self::SUPPORT_SUBSELECT;
 	}
-
 }
diff --git a/src/Database/Drivers/OdbcDriver.php b/src/Database/Drivers/OdbcDriver.php
@@ -142,5 +142,4 @@ public function isSupported(string $item): bool
 	{
 		return $item === self::SUPPORT_SUBSELECT;
 	}
-
 }
diff --git a/src/Database/Drivers/PgSqlDriver.php b/src/Database/Drivers/PgSqlDriver.php
@@ -266,5 +266,4 @@ private function delimiteFQN(string $name): string
 	{
 		return implode('.', array_map([$this, 'delimite'], explode('.', $name)));
 	}
-
 }
diff --git a/src/Database/Drivers/SqliteDriver.php b/src/Database/Drivers/SqliteDriver.php
@@ -271,5 +271,4 @@ public function isSupported(string $item): bool
 	{
 		return $item === self::SUPPORT_MULTI_INSERT_AS_SELECT || $item === self::SUPPORT_SUBSELECT || $item === self::SUPPORT_MULTI_COLUMN_AS_OR_COND;
 	}
-
 }
diff --git a/src/Database/Drivers/SqlsrvDriver.php b/src/Database/Drivers/SqlsrvDriver.php
@@ -273,5 +273,4 @@ public function isSupported(string $item): bool
 	{
 		return $item === self::SUPPORT_SUBSELECT;
 	}
-
 }
diff --git a/src/Database/Helpers.php b/src/Database/Helpers.php
@@ -289,5 +289,4 @@ public static function findDuplicates(\PDOStatement $statement): string
 		}
 		return implode(', ', $duplicates);
 	}
-
 }
diff --git a/src/Database/IConventions.php b/src/Database/IConventions.php
@@ -44,5 +44,4 @@ function getHasManyReference(string $table, string $key): ?array;
 	 * @return array|NULL   array(referenced table, referencing column)
 	 */
 	function getBelongsToReference(string $table, string $key): ?array;
-
 }
diff --git a/src/Database/IRowContainer.php b/src/Database/IRowContainer.php
@@ -46,5 +46,4 @@ function fetchAll(): array;
 	 * @param  string  associative descriptor
 	 */
 	function fetchAssoc(string $path): array;
-
 }
diff --git a/src/Database/IStructure.php b/src/Database/IStructure.php
@@ -74,5 +74,4 @@ function rebuild(): void;
 	 * Returns true if database cached structure has been rebuilt.
 	 */
 	function isRebuilt(): bool;
-
 }
diff --git a/src/Database/ISupplementalDriver.php b/src/Database/ISupplementalDriver.php
@@ -56,10 +56,8 @@ function formatLike(string $value, int $pos): string;
 	 */
 	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
 
-
 	/********************* reflection ****************d*g**/
 
-
 	/**
 	 * Returns list of tables.
 	 * @return array of [name [, (bool) view]]
@@ -93,5 +91,4 @@ function getColumnTypes(\PDOStatement $statement): array;
 	 * @param  string self::SUPPORT_* property
 	 */
 	function isSupported(string $item): bool;
-
 }
diff --git a/src/Database/ResultSet.php b/src/Database/ResultSet.php
@@ -135,7 +135,7 @@ public function normalizeRow(array $row): array
 		foreach ($this->types as $key => $type) {
 			$value = $row[$key];
 			if ($value === NULL || $value === FALSE || $type === IStructure::FIELD_TEXT) {
-
+				// do nothing
 			} elseif ($type === IStructure::FIELD_INTEGER) {
 				$row[$key] = is_float($tmp = $value * 1) ? $value : $tmp;
 
@@ -285,5 +285,4 @@ public function fetchAssoc(string $path): array
 	{
 		return Nette\Utils\Arrays::associate($this->fetchAll(), $path);
 	}
-
 }
diff --git a/src/Database/Row.php b/src/Database/Row.php
@@ -17,7 +17,6 @@
  */
 class Row extends Nette\Utils\ArrayHash implements IRow
 {
-
 	public function __get($key)
 	{
 		$hint = Nette\Utils\ObjectMixin::getSuggestion(array_keys((array) $this), $key);
@@ -54,5 +53,4 @@ public function offsetExists($key): bool
 		}
 		return parent::offsetExists($key);
 	}
-
 }
diff --git a/src/Database/SqlLiteral.php b/src/Database/SqlLiteral.php
@@ -43,5 +43,4 @@ public function __toString(): string
 	{
 		return $this->value;
 	}
-
 }
diff --git a/src/Database/SqlPreprocessor.php b/src/Database/SqlPreprocessor.php
@@ -251,5 +251,4 @@ private function delimite(string $name): string
 	{
 		return implode('.', array_map([$this->driver, 'delimite'], explode('.', $name)));
 	}
-
 }
diff --git a/src/Database/Structure.php b/src/Database/Structure.php
@@ -272,5 +272,4 @@ protected function resolveFQTableName(string $table): string
 
 		throw new Nette\InvalidArgumentException("Table '$name' does not exist.");
 	}
-
 }
diff --git a/src/Database/Table/ActiveRow.php b/src/Database/Table/ActiveRow.php
@@ -318,5 +318,4 @@ protected function removeAccessColumn($key): void
 	{
 		$this->table->removeAccessColumn($key);
 	}
-
 }
diff --git a/src/Database/Table/GroupedSelection.php b/src/Database/Table/GroupedSelection.php
@@ -261,5 +261,4 @@ public function delete(): int
 		$this->sqlBuilder = $builder;
 		return $return;
 	}
-
 }
diff --git a/src/Database/Table/IRow.php b/src/Database/Table/IRow.php
@@ -17,7 +17,6 @@
  */
 interface IRow extends Database\IRow
 {
-
 	function setTable(Selection $name);
 
 	function getTable(): Selection;
@@ -43,5 +42,4 @@ function related(string $key, string $throughColumn = NULL): GroupedSelection;
 	 * @return IRow|NULL if the row does not exist
 	 */
 	function ref(string $key, string $throughColumn = NULL): ?IRow;
-
 }
diff --git a/src/Database/Table/Selection.php b/src/Database/Table/Selection.php
@@ -1044,5 +1044,4 @@ public function offsetUnset($key): void
 		$this->execute();
 		unset($this->rows[$key], $this->data[$key]);
 	}
-
 }
diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
@@ -10,11 +10,11 @@
 namespace Nette\Database\Table;
 
 use Nette;
-use Nette\Database\ISupplementalDriver;
-use Nette\Database\SqlLiteral;
-use Nette\Database\IConventions;
 use Nette\Database\Context;
+use Nette\Database\IConventions;
 use Nette\Database\IStructure;
+use Nette\Database\ISupplementalDriver;
+use Nette\Database\SqlLiteral;
 
 
 /**
@@ -797,5 +797,4 @@ private function getCachedTableList(): array
 
 		return $this->cacheTableList;
 	}
-
 }
diff --git a/tests/Database.DI/DatabaseExtension.basic.phpt b/tests/Database.DI/DatabaseExtension.basic.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Nette\DI;
 use Nette\Bridges\DatabaseDI\DatabaseExtension;
+use Nette\DI;
 use Tester\Assert;
 
 
diff --git a/tests/Database.DI/DatabaseExtension.multiple.phpt b/tests/Database.DI/DatabaseExtension.multiple.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Nette\DI;
 use Nette\Bridges\DatabaseDI\DatabaseExtension;
+use Nette\DI;
 use Tester\Assert;
 
 
diff --git a/tests/Database/Connection.getInsertId().mysql.phpt b/tests/Database/Connection.getInsertId().mysql.phpt
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use Tester\Assert;
-use Nette\Utils\DateTime;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
 
diff --git a/tests/Database/Connection.getInsertId().postgre.phpt b/tests/Database/Connection.getInsertId().postgre.phpt
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use Tester\Assert;
-use Nette\Utils\DateTime;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
 
diff --git a/tests/Database/Connection.getInsertId().sqlite.phpt b/tests/Database/Connection.getInsertId().sqlite.phpt
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use Tester\Assert;
-use Nette\Utils\DateTime;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
 
diff --git a/tests/Database/Connection.getInsertId().sqlsrv.phpt b/tests/Database/Connection.getInsertId().sqlsrv.phpt
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use Tester\Assert;
-use Nette\Utils\DateTime;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
 
diff --git a/tests/Database/Drivers/MsSqlDriver.applyLimit.phpt b/tests/Database/Drivers/MsSqlDriver.applyLimit.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Tester\Assert;
diff --git a/tests/Database/Drivers/OciDriver.applyLimit.phpt b/tests/Database/Drivers/OciDriver.applyLimit.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Tester\Assert;
diff --git a/tests/Database/Drivers/OdbcDriver.applyLimit.phpt b/tests/Database/Drivers/OdbcDriver.applyLimit.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Tester\Assert;
diff --git a/tests/Database/Drivers/PgSqlDriver.applyLimit.phpt b/tests/Database/Drivers/PgSqlDriver.applyLimit.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Tester\Assert;
diff --git a/tests/Database/Drivers/SqliteDriver.applyLimit.phpt b/tests/Database/Drivers/SqliteDriver.applyLimit.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Tester\Assert;
diff --git a/tests/Database/Drivers/SqlsrvDriver.applyLimit.phpt b/tests/Database/Drivers/SqlsrvDriver.applyLimit.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Tester\Assert;
diff --git a/tests/Database/Reflection.postgre.phpt b/tests/Database/Reflection.postgre.phpt
@@ -32,7 +32,9 @@ Nette\Database\Helpers::loadFromFile($connection, Tester\FileMock::create('
 '));
 $driver = $connection->getSupplementalDriver();
 
-function filter($columns) {
+
+function filter($columns)
+{
 	array_walk($columns, function (&$item) { $item = $item['name']; });
 	sort($columns);
 	return $columns;
diff --git a/tests/Database/ResultSet.fetch().phpt b/tests/Database/ResultSet.fetch().phpt
@@ -46,10 +46,12 @@ test(function () use ($context, $driverName) { // tests closeCursor()
 		$context->getConnection()->getPdo()->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, FALSE);
 
 		$res = $context->query('CALL testProc(1)');
-		foreach ($res as $row) {}
+		foreach ($res as $row) {
+		}
 
 		$res = $context->query('SELECT * FROM book');
-		foreach ($res as $row) {}
+		foreach ($res as $row) {
+		}
 	}
 });
 
diff --git a/tests/Database/ResultSet.normalizeRow.mysql.phpt b/tests/Database/ResultSet.normalizeRow.mysql.phpt
@@ -7,8 +7,8 @@
 
 declare(strict_types=1);
 
-use Tester\Assert;
 use Nette\Utils\DateTime;
+use Tester\Assert;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
 
diff --git a/tests/Database/ResultSet.normalizeRow.postgre.phpt b/tests/Database/ResultSet.normalizeRow.postgre.phpt
@@ -7,8 +7,8 @@
 
 declare(strict_types=1);
 
-use Tester\Assert;
 use Nette\Utils\DateTime;
+use Tester\Assert;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
 
diff --git a/tests/Database/ResultSet.normalizeRow.sqlite.phpt b/tests/Database/ResultSet.normalizeRow.sqlite.phpt
@@ -7,8 +7,8 @@
 
 declare(strict_types=1);
 
-use Tester\Assert;
 use Nette\Utils\DateTime;
+use Tester\Assert;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
 
diff --git a/tests/Database/ResultSet.normalizeRow.sqlsrv.phpt b/tests/Database/ResultSet.normalizeRow.sqlsrv.phpt
@@ -7,8 +7,8 @@
 
 declare(strict_types=1);
 
-use Tester\Assert;
 use Nette\Utils\DateTime;
+use Tester\Assert;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
 
@@ -124,10 +124,12 @@ Assert::same([
 ], (array) @$res->fetch());
 
 
-function isTimestamp($str) {
+function isTimestamp($str)
+{
 	return is_string($str) && preg_match('#[0-9A-F]{16}#', $str);
 }
 
+
 $row = (array) $context->query('SELECT [datetimeoffset], CAST([sql_variant] AS int) AS [sql_variant], [timestamp] FROM types2 WHERE id = 1')->fetch();
 Assert::type('DateTime', $row['datetimeoffset']);
 Assert::same($row['datetimeoffset']->format('Y-m-d H:i:s P'), '2012-10-13 10:10:10 +02:00');
diff --git a/tests/Database/ResultSet.parameters.mysql.phpt b/tests/Database/ResultSet.parameters.mysql.phpt
diff --git a/tests/Database/ResultSet.parameters.postgre.phpt b/tests/Database/ResultSet.parameters.postgre.phpt
diff --git a/tests/Database/SqlPreprocessor.phpt b/tests/Database/SqlPreprocessor.phpt
diff --git a/tests/Database/Structure.phpt b/tests/Database/Structure.phpt
diff --git a/tests/Database/Structure.schemas.phpt b/tests/Database/Structure.schemas.phpt
diff --git a/tests/Database/Table/Selection.get().phpt b/tests/Database/Table/Selection.get().phpt
diff --git a/tests/Database/Table/SqlBuilder.addAlias().phpt b/tests/Database/Table/SqlBuilder.addAlias().phpt
diff --git a/tests/Database/Table/SqlBuilder.addWhere().phpt b/tests/Database/Table/SqlBuilder.addWhere().phpt
diff --git a/tests/Database/Table/SqlBuilder.order.phpt b/tests/Database/Table/SqlBuilder.order.phpt
diff --git a/tests/Database/Table/SqlBuilder.parseJoinConditions().phpt b/tests/Database/Table/SqlBuilder.parseJoinConditions().phpt
diff --git a/tests/Database/Table/SqlBuilder.parseJoins().phpt b/tests/Database/Table/SqlBuilder.parseJoins().phpt
diff --git a/tests/Database/Table/Table.cache.observer.phpt b/tests/Database/Table/Table.cache.observer.phpt
diff --git a/tests/Database/Table/Table.cache.observer2.phpt b/tests/Database/Table/Table.cache.observer2.phpt
diff --git a/tests/Database/Table/Table.cache.phpt b/tests/Database/Table/Table.cache.phpt
diff --git a/tests/Database/Table/Table.placeholders.phpt b/tests/Database/Table/Table.placeholders.phpt
diff --git a/tests/Database/Table/Table.related().phpt b/tests/Database/Table/Table.related().phpt
diff --git a/tests/Database/Table/bugs/deleteCacheBug.phpt b/tests/Database/Table/bugs/deleteCacheBug.phpt
diff --git a/tests/Database/Table/bugs/query.count.phpt b/tests/Database/Table/bugs/query.count.phpt
diff --git a/tests/bootstrap.php b/tests/bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -130,5 +130,4 @@ private function setupDatabase($config, $name): void`
`130`	`130`	`$builder->addAlias("nette.database.$name.context", $this->prefix("$name.context"));`
`131`	`131`	`}`
`132`	`132`	`}`
`133`		`-`
`134`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,5 +139,4 @@ public function getPanel(): ?string`
`139`	`139`	`require __DIR__ . '/templates/ConnectionPanel.panel.phtml';`
`140`	`140`	`return ob_get_clean();`
`141`	`141`	`}`
`142`		`-`
`143`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,5 +152,4 @@ public static function literal($value, ...$params): SqlLiteral`
`152`	`152`	`{`
`153`	`153`	`return new SqlLiteral($value, $params);`
`154`	`154`	`}`
`155`		`-`
`156`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,5 +100,4 @@ public function getBelongsToReference(string $table, string $key): ?array`
`100`	`100`	`$this->structure->rebuild();`
`101`	`101`	`return $this->getBelongsToReference($table, $key);`
`102`	`102`	`}`
`103`		`-`
`104`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,4 @@ protected function getColumnFromTable(string $name): string`
`78`	`78`
`79`	`79`	`return $name;`
`80`	`80`	`}`
`81`		`-`
`82`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,4 @@ public function getQueryString(): ?string`
`62`	`62`	`{`
`63`	`63`	`return $this->queryString;`
`64`	`64`	`}`
`65`		`-`
`66`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,5 +143,4 @@ public function isSupported(string $item): bool`
`143`	`143`	`{`
`144`	`144`	`return $item === self::SUPPORT_SUBSELECT;`
`145`	`145`	`}`
`146`		`-`
`147`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,5 +234,4 @@ public function isSupported(string $item): bool`
`234`	`234`	`// and more.`
`235`	`235`	`return $item === self::SUPPORT_SELECT_UNGROUPED_COLUMNS \|\| $item === self::SUPPORT_MULTI_COLUMN_AS_OR_COND;`
`236`	`236`	`}`
`237`		`-`
`238`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,5 +172,4 @@ public function isSupported(string $item): bool`
`172`	`172`	`{`
`173`	`173`	`return $item === self::SUPPORT_SEQUENCE \|\| $item === self::SUPPORT_SUBSELECT;`
`174`	`174`	`}`
`175`		`-`
`176`	`175`	`}`