From b439ee9df1e9500f4886a0ba465bbedc45a345d9 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Fri, 21 Jul 2017 22:25:33 +0200 Subject: [PATCH] coding style: fixed spaces & use statements order --- examples/using-substitutions.php | 1 + src/Dibi/Bridges/Nette/DibiExtension22.php | 1 - src/Dibi/Bridges/Tracy/Panel.php | 1 - src/Dibi/Connection.php | 3 +-- src/Dibi/DataSource.php | 1 - src/Dibi/DateTime.php | 1 - src/Dibi/Drivers/FirebirdDriver.php | 1 - src/Dibi/Drivers/MsSqlDriver.php | 1 - src/Dibi/Drivers/MsSqlReflector.php | 1 - src/Dibi/Drivers/MySqlDriver.php | 1 - src/Dibi/Drivers/MySqlReflector.php | 1 - src/Dibi/Drivers/MySqliDriver.php | 1 - src/Dibi/Drivers/OdbcDriver.php | 1 - src/Dibi/Drivers/OracleDriver.php | 1 - src/Dibi/Drivers/PdoDriver.php | 1 - src/Dibi/Drivers/PostgreDriver.php | 1 - src/Dibi/Drivers/Sqlite3Driver.php | 1 - src/Dibi/Drivers/SqliteReflector.php | 1 - src/Dibi/Drivers/SqlsrvDriver.php | 1 - src/Dibi/Drivers/SqlsrvReflector.php | 1 - src/Dibi/Event.php | 1 - src/Dibi/Fluent.php | 1 - src/Dibi/HashMap.php | 3 --- src/Dibi/Helpers.php | 2 +- src/Dibi/Literal.php | 1 - src/Dibi/Loggers/FileLogger.php | 1 - src/Dibi/Loggers/FirePhpLogger.php | 1 - src/Dibi/Reflection/Column.php | 1 - src/Dibi/Reflection/Database.php | 1 - src/Dibi/Reflection/ForeignKey.php | 1 - src/Dibi/Reflection/Index.php | 1 - src/Dibi/Reflection/Result.php | 1 - src/Dibi/Reflection/Table.php | 1 - src/Dibi/Result.php | 3 --- src/Dibi/ResultIterator.php | 1 - src/Dibi/Row.php | 2 -- src/Dibi/Strict.php | 1 - src/Dibi/Translator.php | 1 - src/Dibi/Type.php | 2 +- src/Dibi/dibi.php | 1 - src/Dibi/exceptions.php | 3 --- src/Dibi/interfaces.php | 3 --- 42 files changed, 4 insertions(+), 51 deletions(-) diff --git a/examples/using-substitutions.php b/examples/using-substitutions.php index 0c48963e..570c8eac 100644 --- a/examples/using-substitutions.php +++ b/examples/using-substitutions.php @@ -38,6 +38,7 @@ function substFallBack($expr) } } + // define callback dibi::getSubstitutes()->setCallback('substFallBack'); diff --git a/src/Dibi/Bridges/Nette/DibiExtension22.php b/src/Dibi/Bridges/Nette/DibiExtension22.php index 5693728c..9d45064a 100644 --- a/src/Dibi/Bridges/Nette/DibiExtension22.php +++ b/src/Dibi/Bridges/Nette/DibiExtension22.php @@ -68,5 +68,4 @@ class DibiExtension22 extends Nette\DI\CompilerExtension $connection->addSetup([$panel, 'register'], [$connection]); } } - } diff --git a/src/Dibi/Bridges/Tracy/Panel.php b/src/Dibi/Bridges/Tracy/Panel.php index df1909d0..dd2c4e1d 100644 --- a/src/Dibi/Bridges/Tracy/Panel.php +++ b/src/Dibi/Bridges/Tracy/Panel.php @@ -151,5 +151,4 @@ class Panel implements Tracy\IBarPanel '; } - } diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php index a812a31c..cbd6c58a 100644 --- a/src/Dibi/Connection.php +++ b/src/Dibi/Connection.php @@ -48,7 +48,7 @@ class Connection * - run (bool) => enable profiler? * - file => file to log * - substitutes (array) => map of driver specific substitutes (under development) - + * @param mixed connection parameters * @param string connection name * @throws Exception @@ -658,5 +658,4 @@ class Connection call_user_func($handler, $arg); } } - } diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php index 1511506f..a7048fa6 100644 --- a/src/Dibi/DataSource.php +++ b/src/Dibi/DataSource.php @@ -305,5 +305,4 @@ FROM %SQL', $this->sql, ' } return $this->totalCount; } - } diff --git a/src/Dibi/DateTime.php b/src/Dibi/DateTime.php index fbc1d08c..28871532 100644 --- a/src/Dibi/DateTime.php +++ b/src/Dibi/DateTime.php @@ -71,5 +71,4 @@ class DateTime extends \DateTime parent::__wakeup(); } } - } diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php index 58e1afea..2e8f1776 100644 --- a/src/Dibi/Drivers/FirebirdDriver.php +++ b/src/Dibi/Drivers/FirebirdDriver.php @@ -834,5 +834,4 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector } return $functions; } - } diff --git a/src/Dibi/Drivers/MsSqlDriver.php b/src/Dibi/Drivers/MsSqlDriver.php index 62545bc8..b718122d 100644 --- a/src/Dibi/Drivers/MsSqlDriver.php +++ b/src/Dibi/Drivers/MsSqlDriver.php @@ -406,5 +406,4 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver $this->autoFree = FALSE; return is_resource($this->resultSet) ? $this->resultSet : NULL; } - } diff --git a/src/Dibi/Drivers/MsSqlReflector.php b/src/Dibi/Drivers/MsSqlReflector.php index 52cc9fd4..653111ac 100644 --- a/src/Dibi/Drivers/MsSqlReflector.php +++ b/src/Dibi/Drivers/MsSqlReflector.php @@ -212,5 +212,4 @@ class MsSqlReflector implements Dibi\Reflector } return array_values($keys); } - } diff --git a/src/Dibi/Drivers/MySqlDriver.php b/src/Dibi/Drivers/MySqlDriver.php index 93ab512f..875ce3f7 100644 --- a/src/Dibi/Drivers/MySqlDriver.php +++ b/src/Dibi/Drivers/MySqlDriver.php @@ -499,5 +499,4 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver $this->autoFree = FALSE; return is_resource($this->resultSet) ? $this->resultSet : NULL; } - } diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/MySqlReflector.php index 97c3280b..4fa34ab8 100644 --- a/src/Dibi/Drivers/MySqlReflector.php +++ b/src/Dibi/Drivers/MySqlReflector.php @@ -131,5 +131,4 @@ class MySqlReflector implements Dibi\Reflector } return array_values($foreignKeys); } - } diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php index 5b19e4bf..4fce01e0 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -518,5 +518,4 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver $this->autoFree = FALSE; return $this->resultSet; } - } diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php index bc5d5f37..3b725286 100644 --- a/src/Dibi/Drivers/OdbcDriver.php +++ b/src/Dibi/Drivers/OdbcDriver.php @@ -516,5 +516,4 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector { throw new Dibi\NotImplementedException; } - } diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php index 16476f48..76c3d4b4 100644 --- a/src/Dibi/Drivers/OracleDriver.php +++ b/src/Dibi/Drivers/OracleDriver.php @@ -536,5 +536,4 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector { throw new Dibi\NotImplementedException; } - } diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php index 1f7b0a26..7f24a865 100644 --- a/src/Dibi/Drivers/PdoDriver.php +++ b/src/Dibi/Drivers/PdoDriver.php @@ -577,5 +577,4 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver { return $this->resultSet; } - } diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php index 4ad48caa..fd53a193 100644 --- a/src/Dibi/Drivers/PostgreDriver.php +++ b/src/Dibi/Drivers/PostgreDriver.php @@ -740,5 +740,4 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector return $fKeys; } - } diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php index a8a1d180..c9e936fe 100644 --- a/src/Dibi/Drivers/Sqlite3Driver.php +++ b/src/Dibi/Drivers/Sqlite3Driver.php @@ -492,5 +492,4 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver { $this->connection->createAggregate($name, $rowCallback, $agrCallback, $numArgs); } - } diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/SqliteReflector.php index f1f9749f..f7ba46ef 100644 --- a/src/Dibi/Drivers/SqliteReflector.php +++ b/src/Dibi/Drivers/SqliteReflector.php @@ -150,5 +150,4 @@ class SqliteReflector implements Dibi\Reflector } return array_values($keys); } - } diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php index ef154ba7..652fb12a 100644 --- a/src/Dibi/Drivers/SqlsrvDriver.php +++ b/src/Dibi/Drivers/SqlsrvDriver.php @@ -436,5 +436,4 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver $this->autoFree = FALSE; return is_resource($this->resultSet) ? $this->resultSet : NULL; } - } diff --git a/src/Dibi/Drivers/SqlsrvReflector.php b/src/Dibi/Drivers/SqlsrvReflector.php index 37bb6ba6..748783e9 100644 --- a/src/Dibi/Drivers/SqlsrvReflector.php +++ b/src/Dibi/Drivers/SqlsrvReflector.php @@ -132,5 +132,4 @@ class SqlsrvReflector implements Dibi\Reflector { throw new Dibi\NotImplementedException; } - } diff --git a/src/Dibi/Event.php b/src/Dibi/Event.php index 156b1ee9..6a521d0e 100644 --- a/src/Dibi/Event.php +++ b/src/Dibi/Event.php @@ -94,5 +94,4 @@ class Event \dibi::$totalTime += $this->time; return $this; } - } diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php index 8e064a18..7eb2960c 100644 --- a/src/Dibi/Fluent.php +++ b/src/Dibi/Fluent.php @@ -517,5 +517,4 @@ class Fluent implements IDataSource } $this->cursor = &$foo; } - } diff --git a/src/Dibi/HashMap.php b/src/Dibi/HashMap.php index e33bc5c6..e9ea34ba 100644 --- a/src/Dibi/HashMap.php +++ b/src/Dibi/HashMap.php @@ -33,7 +33,6 @@ abstract class HashMapBase { return $this->callback; } - } @@ -44,7 +43,6 @@ abstract class HashMapBase */ final class HashMap extends HashMapBase { - public function __set($nm, $val) { if ($nm == '') { @@ -63,5 +61,4 @@ final class HashMap extends HashMapBase return $this->$nm = call_user_func($this->getCallback(), $nm); } } - } diff --git a/src/Dibi/Helpers.php b/src/Dibi/Helpers.php index 267e6c85..5bcd709e 100644 --- a/src/Dibi/Helpers.php +++ b/src/Dibi/Helpers.php @@ -15,6 +15,7 @@ class Helpers /** @var array */ private static $types; + /** * Prints out a syntax highlighted version of the SQL command or Result. * @param string|Result @@ -281,5 +282,4 @@ class Helpers fclose($handle); return $count; } - } diff --git a/src/Dibi/Literal.php b/src/Dibi/Literal.php index a01f8f07..69778721 100644 --- a/src/Dibi/Literal.php +++ b/src/Dibi/Literal.php @@ -32,5 +32,4 @@ class Literal { return $this->value; } - } diff --git a/src/Dibi/Loggers/FileLogger.php b/src/Dibi/Loggers/FileLogger.php index 9e903887..fc3dbb53 100644 --- a/src/Dibi/Loggers/FileLogger.php +++ b/src/Dibi/Loggers/FileLogger.php @@ -72,5 +72,4 @@ class FileLogger } fclose($handle); } - } diff --git a/src/Dibi/Loggers/FirePhpLogger.php b/src/Dibi/Loggers/FirePhpLogger.php index 6325b344..843e661a 100644 --- a/src/Dibi/Loggers/FirePhpLogger.php +++ b/src/Dibi/Loggers/FirePhpLogger.php @@ -91,5 +91,4 @@ class FirePhpLogger } header("X-Wf-dibi-1-1-d$num: |$s|"); } - } diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php index 7f6593de..31753cb7 100644 --- a/src/Dibi/Reflection/Column.php +++ b/src/Dibi/Reflection/Column.php @@ -162,5 +162,4 @@ class Column { return isset($this->info['vendor'][$key]) ? $this->info['vendor'][$key] : NULL; } - } diff --git a/src/Dibi/Reflection/Database.php b/src/Dibi/Reflection/Database.php index 6ac4ddb9..8c46663e 100644 --- a/src/Dibi/Reflection/Database.php +++ b/src/Dibi/Reflection/Database.php @@ -111,5 +111,4 @@ class Database } } } - } diff --git a/src/Dibi/Reflection/ForeignKey.php b/src/Dibi/Reflection/ForeignKey.php index 1a2212d9..b3401840 100644 --- a/src/Dibi/Reflection/ForeignKey.php +++ b/src/Dibi/Reflection/ForeignKey.php @@ -50,5 +50,4 @@ class ForeignKey { return $this->references; } - } diff --git a/src/Dibi/Reflection/Index.php b/src/Dibi/Reflection/Index.php index 51ed2866..93bb8d45 100644 --- a/src/Dibi/Reflection/Index.php +++ b/src/Dibi/Reflection/Index.php @@ -66,5 +66,4 @@ class Index { return !empty($this->info['primary']); } - } diff --git a/src/Dibi/Reflection/Result.php b/src/Dibi/Reflection/Result.php index 9fa06709..b6a5f2f0 100644 --- a/src/Dibi/Reflection/Result.php +++ b/src/Dibi/Reflection/Result.php @@ -102,5 +102,4 @@ class Result } } } - } diff --git a/src/Dibi/Reflection/Table.php b/src/Dibi/Reflection/Table.php index c3eab10c..c7f4e2b5 100644 --- a/src/Dibi/Reflection/Table.php +++ b/src/Dibi/Reflection/Table.php @@ -197,5 +197,4 @@ class Table { throw new Dibi\NotImplementedException; } - } diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php index 6019b589..f25d5aee 100644 --- a/src/Dibi/Result.php +++ b/src/Dibi/Result.php @@ -319,7 +319,6 @@ class Result implements IDataSource if ($x === NULL) { // build leaf $x = $row; } - } while ($row = $this->fetch()); unset($x); @@ -392,7 +391,6 @@ class Result implements IDataSource $x = $row; } } - } while ($row = $this->fetch()); unset($x); @@ -616,5 +614,4 @@ class Result implements IDataSource { echo Helpers::dump($this); } - } diff --git a/src/Dibi/ResultIterator.php b/src/Dibi/ResultIterator.php index 473d768b..b2a3aa1c 100644 --- a/src/Dibi/ResultIterator.php +++ b/src/Dibi/ResultIterator.php @@ -104,5 +104,4 @@ class ResultIterator implements \Iterator, \Countable { return $this->result->getRowCount(); } - } diff --git a/src/Dibi/Row.php b/src/Dibi/Row.php index 0bb3dc0c..2a95e668 100644 --- a/src/Dibi/Row.php +++ b/src/Dibi/Row.php @@ -13,7 +13,6 @@ namespace Dibi; */ class Row implements \ArrayAccess, \IteratorAggregate, \Countable { - public function __construct($arr) { foreach ($arr as $k => $v) { @@ -91,5 +90,4 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable { unset($this->$nm); } - } diff --git a/src/Dibi/Strict.php b/src/Dibi/Strict.php index e3a4329c..93487e0b 100644 --- a/src/Dibi/Strict.php +++ b/src/Dibi/Strict.php @@ -148,5 +148,4 @@ trait Strict $list[''] = NULL; } } - } diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php index ce08e0ea..cfb672c5 100644 --- a/src/Dibi/Translator.php +++ b/src/Dibi/Translator.php @@ -607,5 +607,4 @@ final class Translator } return implode('.', $parts); } - } diff --git a/src/Dibi/Type.php b/src/Dibi/Type.php index f6c40e8e..12d1bad1 100644 --- a/src/Dibi/Type.php +++ b/src/Dibi/Type.php @@ -24,9 +24,9 @@ class Type TIME = 't', TIME_INTERVAL = 'ti'; + final public function __construct() { throw new \LogicException('Cannot instantiate static class ' . __CLASS__); } - } diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php index cdfd8088..31b8e796 100644 --- a/src/Dibi/dibi.php +++ b/src/Dibi/dibi.php @@ -450,5 +450,4 @@ class dibi { return Dibi\Helpers::dump($sql, $return); } - } diff --git a/src/Dibi/exceptions.php b/src/Dibi/exceptions.php index 4a8f7fb6..1702b313 100644 --- a/src/Dibi/exceptions.php +++ b/src/Dibi/exceptions.php @@ -47,7 +47,6 @@ class Exception extends \Exception { return parent::__toString() . ($this->sql ? "\nSQL: " . $this->sql : ''); } - } @@ -64,7 +63,6 @@ class DriverException extends Exception */ class PcreException extends Exception { - public function __construct($message = '%msg.') { static $messages = [ @@ -120,7 +118,6 @@ class ProcedureException extends Exception { $this->severity; } - } diff --git a/src/Dibi/interfaces.php b/src/Dibi/interfaces.php index f7292274..5603c690 100644 --- a/src/Dibi/interfaces.php +++ b/src/Dibi/interfaces.php @@ -148,7 +148,6 @@ interface Driver * @return void */ function applyLimit(&$sql, $limit, $offset); - } @@ -205,7 +204,6 @@ interface ResultDriver * @return string */ function unescapeBinary($value); - } @@ -241,5 +239,4 @@ interface Reflector * @return array */ function getForeignKeys($table); - }