diff --git a/dibi/bridges/Nette-2.1/DibiNettePanel.php b/dibi/bridges/Nette-2.1/DibiNettePanel.php index b98ca67f..2ae543c6 100644 --- a/dibi/bridges/Nette-2.1/DibiNettePanel.php +++ b/dibi/bridges/Nette-2.1/DibiNettePanel.php @@ -124,7 +124,8 @@ class DibiNettePanel extends DibiObject implements IBarPanel $event->connection->onEvent = NULL; $cmd = is_string($this->explain) ? $this->explain : ($event->connection->getConfig('driver') === 'oracle' ? 'EXPLAIN PLAN' : 'EXPLAIN'); $explain = dibi::dump($event->connection->nativeQuery("$cmd $event->sql"), TRUE); - } catch (DibiException $e) {} + } catch (DibiException $e) { + } list($event->connection->onEvent, dibi::$numOfQueries, dibi::$totalTime) = $backup; } diff --git a/dibi/bridges/Nette-2.2/DibiNette22Extension.php b/dibi/bridges/Nette-2.2/DibiNette22Extension.php index 6dce37c0..99dffd71 100644 --- a/dibi/bridges/Nette-2.2/DibiNette22Extension.php +++ b/dibi/bridges/Nette-2.2/DibiNette22Extension.php @@ -7,8 +7,8 @@ namespace Dibi\Bridges\Nette; -use dibi, - Nette; +use dibi; +use Nette; /** diff --git a/dibi/bridges/Tracy/Panel.php b/dibi/bridges/Tracy/Panel.php index bb4577ee..29633352 100644 --- a/dibi/bridges/Tracy/Panel.php +++ b/dibi/bridges/Tracy/Panel.php @@ -7,13 +7,13 @@ namespace Dibi\Bridges\Tracy; -use dibi, - Tracy; +use dibi; +use Tracy; /** * Dibi panel for Tracy. - * + * @package dibi\nette * @author David Grudl */ class Panel extends \DibiObject implements Tracy\IBarPanel @@ -108,7 +108,8 @@ class Panel extends \DibiObject implements Tracy\IBarPanel $event->connection->onEvent = NULL; $cmd = is_string($this->explain) ? $this->explain : ($event->connection->getConfig('driver') === 'oracle' ? 'EXPLAIN PLAN' : 'EXPLAIN'); $explain = dibi::dump($event->connection->nativeQuery("$cmd $event->sql"), TRUE); - } catch (\DibiException $e) {} + } catch (\DibiException $e) { + } list($event->connection->onEvent, dibi::$numOfQueries, dibi::$totalTime) = $backup; } diff --git a/dibi/drivers/DibiFirebirdDriver.php b/dibi/drivers/DibiFirebirdDriver.php index f4b92c94..e7dd2e4c 100644 --- a/dibi/drivers/DibiFirebirdDriver.php +++ b/dibi/drivers/DibiFirebirdDriver.php @@ -88,7 +88,6 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD throw new DibiDriverException(ibase_errmsg(), ibase_errcode()); } } - } @@ -349,7 +348,7 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD */ public function getRowCount() { - throw new DibiNotSupportedException("Firebird/Interbase do not support returning number of rows in result set."); + throw new DibiNotSupportedException('Firebird/Interbase do not support returning number of rows in result set.'); } @@ -379,13 +378,13 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD /** * Moves cursor position without fetching row. - * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @param int the 0-based cursor pos to seek to + * @return bool TRUE on success, FALSE if unable to seek to specified record * @throws DibiException */ public function seek($row) { - throw new DibiNotSupportedException("Firebird/Interbase do not support seek in result set."); + throw new DibiNotSupportedException('Firebird/Interbase do not support seek in result set.'); } @@ -656,7 +655,7 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD END AS TRIGGER_ENABLED FROM RDB\$TRIGGERS WHERE RDB\$SYSTEM_FLAG = 0" - . ($table === NULL ? ";" : " AND RDB\$RELATION_NAME = UPPER('$table');") + . ($table === NULL ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table');") ); $triggers = array(); while ($row = $res->fetch(TRUE)) { @@ -683,7 +682,7 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiResultD $q = "SELECT TRIM(RDB\$TRIGGER_NAME) FROM RDB\$TRIGGERS WHERE RDB\$SYSTEM_FLAG = 0"; - $q .= $table === NULL ? ";" : " AND RDB\$RELATION_NAME = UPPER('$table')"; + $q .= $table === NULL ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table')"; $res = $this->query($q); $triggers = array(); diff --git a/dibi/drivers/DibiMsSql2005Driver.php b/dibi/drivers/DibiMsSql2005Driver.php index 32f62910..1d18fa6b 100644 --- a/dibi/drivers/DibiMsSql2005Driver.php +++ b/dibi/drivers/DibiMsSql2005Driver.php @@ -327,8 +327,8 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver, IDibiResult /** * Moves cursor position without fetching row. - * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @param int the 0-based cursor pos to seek to + * @return bool TRUE on success, FALSE if unable to seek to specified record */ public function seek($row) { diff --git a/dibi/drivers/DibiMsSql2005Reflector.php b/dibi/drivers/DibiMsSql2005Reflector.php index c69484ab..3eb24f09 100644 --- a/dibi/drivers/DibiMsSql2005Reflector.php +++ b/dibi/drivers/DibiMsSql2005Reflector.php @@ -104,7 +104,7 @@ class DibiMsSql2005Reflector extends DibiObject implements IDibiReflector { $keyUsagesRes = $this->driver->query("SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE TABLE_NAME = {$this->driver->escape($table, dibi::TEXT)}"); $keyUsages = array(); - while( $row = $keyUsagesRes->fetch(TRUE) ) { + while ($row = $keyUsagesRes->fetch(TRUE)) { $keyUsages[$row['CONSTRAINT_NAME']][(int) $row['ORDINAL_POSITION'] - 1] = $row['COLUMN_NAME']; } diff --git a/dibi/drivers/DibiMsSqlDriver.php b/dibi/drivers/DibiMsSqlDriver.php index 530313fd..9a243bea 100644 --- a/dibi/drivers/DibiMsSqlDriver.php +++ b/dibi/drivers/DibiMsSqlDriver.php @@ -363,5 +363,4 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv return is_resource($this->resultSet) ? $this->resultSet : NULL; } - } diff --git a/dibi/drivers/DibiMsSqlReflector.php b/dibi/drivers/DibiMsSqlReflector.php index 27f13165..1ff29e66 100644 --- a/dibi/drivers/DibiMsSqlReflector.php +++ b/dibi/drivers/DibiMsSqlReflector.php @@ -34,10 +34,10 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector */ public function getTables() { - $res = $this->driver->query(" + $res = $this->driver->query(' SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES - "); + '); $tables = array(); while ($row = $res->fetch(FALSE)) { $tables[] = array( @@ -52,12 +52,12 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector /** * Returns count of rows in a table * @param string - * @return integer + * @return int */ - public function getTableCount($table, $fallback=true) + public function getTableCount($table, $fallback = TRUE) { if (empty($table)) { - return false; + return FALSE; } $result = $this->driver->query(" SELECT MAX(rowcnt) @@ -71,7 +71,7 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector $row = $this->driver->query("SELECT COUNT(*) FROM {$this->driver->escape($table, dibi::IDENTIFIER)}")->fetch(FALSE); $count = intval($row[0]); } else { - $count = false; + $count = FALSE; } } else { $count = intval($row[0]); @@ -96,16 +96,16 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector "); $columns = array(); while ($row = $res->fetch(TRUE)) { - $size = false; + $size = FALSE; $type = strtoupper($row['DATA_TYPE']); $size_cols = array( - 'DATETIME'=>'DATETIME_PRECISION', - 'DECIMAL'=>'NUMERIC_PRECISION', - 'CHAR'=>'CHARACTER_MAXIMUM_LENGTH', - 'NCHAR'=>'CHARACTER_OCTET_LENGTH', - 'NVARCHAR'=>'CHARACTER_OCTET_LENGTH', - 'VARCHAR'=>'CHARACTER_OCTET_LENGTH' + 'DATETIME' => 'DATETIME_PRECISION', + 'DECIMAL' => 'NUMERIC_PRECISION', + 'CHAR' => 'CHARACTER_MAXIMUM_LENGTH', + 'NCHAR' => 'CHARACTER_OCTET_LENGTH', + 'NVARCHAR' => 'CHARACTER_OCTET_LENGTH', + 'VARCHAR' => 'CHARACTER_OCTET_LENGTH', ); if (isset($size_cols[$type])) { @@ -122,7 +122,7 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector 'unsigned' => NULL, 'nullable' => $row['IS_NULLABLE'] === 'YES', 'default' => $row['COLUMN_DEFAULT'], - 'autoincrement' => false, + 'autoincrement' => FALSE, 'vendor' => $row, ); } @@ -161,8 +161,8 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector if (!isset($indexes[$index_name])) { $indexes[$index_name] = array(); $indexes[$index_name]['name'] = $index_name; - $indexes[$index_name]['unique'] = (bool)$row['is_unique']; - $indexes[$index_name]['primary'] = (bool)$row['is_primary_key']; + $indexes[$index_name]['unique'] = (bool) $row['is_unique']; + $indexes[$index_name]['primary'] = (bool) $row['is_primary_key']; $indexes[$index_name]['columns'] = array(); } $indexes[$index_name]['columns'][] = $row['column_name']; @@ -203,8 +203,8 @@ class DibiMsSqlReflector extends DibiObject implements IDibiReflector $keys[$key_name]['local'] = array($row['column_name']); // local columns $keys[$key_name]['table'] = $row['reference_table_name']; // referenced table $keys[$key_name]['foreign'] = array($row['reference_column_name']); // referenced columns - $keys[$key_name]['onDelete'] = false; - $keys[$key_name]['onUpdate'] = false; + $keys[$key_name]['onDelete'] = FALSE; + $keys[$key_name]['onUpdate'] = FALSE; } else { $keys[$key_name]['local'][] = $row['column_name']; // local columns $keys[$key_name]['foreign'][] = $row['reference_column_name']; // referenced columns diff --git a/dibi/drivers/DibiMySqlDriver.php b/dibi/drivers/DibiMySqlDriver.php index 1a33e646..7e0a7d24 100644 --- a/dibi/drivers/DibiMySqlDriver.php +++ b/dibi/drivers/DibiMySqlDriver.php @@ -406,8 +406,8 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiResultDriv /** * Moves cursor position without fetching row. - * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @param int the 0-based cursor pos to seek to + * @return bool TRUE on success, FALSE if unable to seek to specified record * @throws DibiException */ public function seek($row) diff --git a/dibi/drivers/DibiMySqlReflector.php b/dibi/drivers/DibiMySqlReflector.php index d1e1f9e4..93497b33 100644 --- a/dibi/drivers/DibiMySqlReflector.php +++ b/dibi/drivers/DibiMySqlReflector.php @@ -36,7 +36,7 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = DATABASE() ");*/ - $res = $this->driver->query("SHOW FULL TABLES"); + $res = $this->driver->query('SHOW FULL TABLES'); $tables = array(); while ($row = $res->fetch(FALSE)) { $tables[] = array( @@ -138,9 +138,9 @@ class DibiMySqlReflector extends DibiObject implements IDibiReflector $keyName = $row['CONSTRAINT_NAME']; $foreignKeys[$keyName]['name'] = $keyName; - $foreignKeys[$keyName]['local'] = explode(",", $row['COLUMNS']); + $foreignKeys[$keyName]['local'] = explode(',', $row['COLUMNS']); $foreignKeys[$keyName]['table'] = $row['REFERENCED_TABLE_NAME']; - $foreignKeys[$keyName]['foreign'] = explode(",", $row['REFERENCED_COLUMNS']); + $foreignKeys[$keyName]['foreign'] = explode(',', $row['REFERENCED_COLUMNS']); $foreignKeys[$keyName]['onDelete'] = $row['DELETE_RULE']; $foreignKeys[$keyName]['onUpdate'] = $row['UPDATE_RULE']; } diff --git a/dibi/drivers/DibiMySqliDriver.php b/dibi/drivers/DibiMySqliDriver.php index 1f9a6191..d3947480 100644 --- a/dibi/drivers/DibiMySqliDriver.php +++ b/dibi/drivers/DibiMySqliDriver.php @@ -389,8 +389,8 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri /** * Moves cursor position without fetching row. - * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @param int the 0-based cursor pos to seek to + * @return bool TRUE on success, FALSE if unable to seek to specified record * @throws DibiException */ public function seek($row) diff --git a/dibi/drivers/DibiOdbcDriver.php b/dibi/drivers/DibiOdbcDriver.php index df239109..dc4a79bf 100644 --- a/dibi/drivers/DibiOdbcDriver.php +++ b/dibi/drivers/DibiOdbcDriver.php @@ -339,7 +339,9 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive } $count = odbc_num_fields($set); $cols = array(); - for ($i = 1; $i <= $count; $i++) $cols[] = odbc_result($set, $i); + for ($i = 1; $i <= $count; $i++) { + $cols[] = odbc_result($set, $i); + } return $cols; } } @@ -347,8 +349,8 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive /** * Moves cursor position without fetching row. - * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @param int the 0-based cursor pos to seek to + * @return bool TRUE on success, FALSE if unable to seek to specified record */ public function seek($row) { @@ -378,10 +380,10 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiResultDrive $columns = array(); for ($i = 1; $i <= $count; $i++) { $columns[] = array( - 'name' => odbc_field_name($this->resultSet, $i), - 'table' => NULL, - 'fullname' => odbc_field_name($this->resultSet, $i), - 'nativetype'=> odbc_field_type($this->resultSet, $i), + 'name' => odbc_field_name($this->resultSet, $i), + 'table' => NULL, + 'fullname' => odbc_field_name($this->resultSet, $i), + 'nativetype' => odbc_field_type($this->resultSet, $i), ); } return $columns; diff --git a/dibi/drivers/DibiOracleDriver.php b/dibi/drivers/DibiOracleDriver.php index cec06d97..cd76cb59 100644 --- a/dibi/drivers/DibiOracleDriver.php +++ b/dibi/drivers/DibiOracleDriver.php @@ -331,8 +331,8 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiResultDri /** * Moves cursor position without fetching row. - * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @param int the 0-based cursor pos to seek to + * @return bool TRUE on success, FALSE if unable to seek to specified record */ public function seek($row) { diff --git a/dibi/drivers/DibiPdoDriver.php b/dibi/drivers/DibiPdoDriver.php index b927f7d8..ecddb024 100644 --- a/dibi/drivers/DibiPdoDriver.php +++ b/dibi/drivers/DibiPdoDriver.php @@ -64,12 +64,13 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver if ($config['resource'] instanceof PDO) { $this->connection = $config['resource']; - } else try { + } else { + try { $this->connection = new PDO($config['dsn'], $config['username'], $config['password'], $config['options']); - } catch (PDOException $e) { throw new DibiDriverException($e->getMessage(), $e->getCode()); } + } if (!$this->connection) { throw new DibiDriverException('Connecting error.'); @@ -401,7 +402,7 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver, IDibiResultDriver /** * Moves cursor position without fetching row. * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @return bool TRUE on success, FALSE if unable to seek to specified record */ public function seek($row) { diff --git a/dibi/drivers/DibiPostgreDriver.php b/dibi/drivers/DibiPostgreDriver.php index 4fcdab4a..6da62640 100644 --- a/dibi/drivers/DibiPostgreDriver.php +++ b/dibi/drivers/DibiPostgreDriver.php @@ -154,7 +154,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr { if ($sequence === NULL) { // PostgreSQL 8.1 is needed - $res = $this->query("SELECT LASTVAL()"); + $res = $this->query('SELECT LASTVAL()'); } else { $res = $this->query("SELECT CURRVAL('$sequence')"); } @@ -376,7 +376,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr /** * Moves cursor position without fetching row. * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @return bool TRUE on success, FALSE if unable to seek to specified record */ public function seek($row) { @@ -454,14 +454,14 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr table_schema = ANY (current_schemas(false))"; if ($version >= 9.3) { - $query .= " + $query .= ' UNION ALL SELECT matviewname, 1 FROM pg_matviews WHERE - schemaname = ANY (current_schemas(false))"; + schemaname = ANY (current_schemas(false))'; } $res = $this->query($query); diff --git a/dibi/drivers/DibiSqlite3Driver.php b/dibi/drivers/DibiSqlite3Driver.php index bb0a664c..a70fdb24 100644 --- a/dibi/drivers/DibiSqlite3Driver.php +++ b/dibi/drivers/DibiSqlite3Driver.php @@ -66,11 +66,12 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr if (isset($config['resource']) && $config['resource'] instanceof SQLite3) { $this->connection = $config['resource']; - } else try { - $this->connection = new SQLite3($config['database']); - - } catch (Exception $e) { - throw new DibiDriverException($e->getMessage(), $e->getCode()); + } else { + try { + $this->connection = new SQLite3($config['database']); + } catch (Exception $e) { + throw new DibiDriverException($e->getMessage(), $e->getCode()); + } } $this->dbcharset = empty($config['dbcharset']) ? 'UTF-8' : $config['dbcharset']; @@ -82,7 +83,7 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr // enable foreign keys support (defaultly disabled; if disabled then foreign key constraints are not enforced) $version = SQLite3::version(); if ($version['versionNumber'] >= '3006019') { - $this->query("PRAGMA foreign_keys = ON"); + $this->query('PRAGMA foreign_keys = ON'); } } @@ -336,8 +337,8 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr /** * Moves cursor position without fetching row. - * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @param int the 0-based cursor pos to seek to + * @return bool TRUE on success, FALSE if unable to seek to specified record * @throws DibiNotSupportedException */ public function seek($row) @@ -368,7 +369,7 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiResultDr static $types = array(SQLITE3_INTEGER => 'int', SQLITE3_FLOAT => 'float', SQLITE3_TEXT => 'text', SQLITE3_BLOB => 'blob', SQLITE3_NULL => 'null'); for ($i = 0; $i < $count; $i++) { $columns[] = array( - 'name' => $this->resultSet->columnName($i), + 'name' => $this->resultSet->columnName($i), 'table' => NULL, 'fullname' => $this->resultSet->columnName($i), 'nativetype' => $types[$this->resultSet->columnType($i)], diff --git a/dibi/drivers/DibiSqliteDriver.php b/dibi/drivers/DibiSqliteDriver.php index d41f9c8c..e43fc844 100644 --- a/dibi/drivers/DibiSqliteDriver.php +++ b/dibi/drivers/DibiSqliteDriver.php @@ -332,8 +332,8 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri /** * Moves cursor position without fetching row. - * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @param int the 0-based cursor pos to seek to + * @return bool TRUE on success, FALSE if unable to seek to specified record * @throws DibiException */ public function seek($row) @@ -367,7 +367,7 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiResultDri $name = str_replace(array('[', ']'), '', sqlite_field_name($this->resultSet, $i)); $pair = explode('.', $name); $columns[] = array( - 'name' => isset($pair[1]) ? $pair[1] : $pair[0], + 'name' => isset($pair[1]) ? $pair[1] : $pair[0], 'table' => isset($pair[1]) ? $pair[0] : NULL, 'fullname' => $name, 'nativetype' => NULL, diff --git a/dibi/libs/Dibi.php b/dibi/libs/Dibi.php index ab573b4d..80f780c7 100644 --- a/dibi/libs/Dibi.php +++ b/dibi/libs/Dibi.php @@ -29,14 +29,14 @@ class dibi AFFECTED_ROWS = 'a'; /** @deprecated */ - const FIELD_TEXT = dibi::TEXT, - FIELD_BINARY = dibi::BINARY, - FIELD_BOOL = dibi::BOOL, - FIELD_INTEGER = dibi::INTEGER, - FIELD_FLOAT = dibi::FLOAT, - FIELD_DATE = dibi::DATE, - FIELD_DATETIME = dibi::DATETIME, - FIELD_TIME = dibi::TIME; + const FIELD_TEXT = self::TEXT, + FIELD_BINARY = self::BINARY, + FIELD_BOOL = self::BOOL, + FIELD_INTEGER = self::INTEGER, + FIELD_FLOAT = self::FLOAT, + FIELD_DATE = self::DATE, + FIELD_DATETIME = self::DATETIME, + FIELD_TIME = self::TIME; /** version */ const VERSION = '2.2.3', @@ -76,7 +76,7 @@ class dibi */ final public function __construct() { - throw new LogicException("Cannot instantiate static class " . get_class($this)); + throw new LogicException('Cannot instantiate static class ' . get_class($this)); } @@ -296,7 +296,7 @@ class dibi * @return int * @throws DibiException */ - public static function getInsertId($sequence=NULL) + public static function getInsertId($sequence = NULL) { return self::getConnection()->getInsertId($sequence); } @@ -308,7 +308,7 @@ class dibi * @return int * @throws DibiException */ - public static function insertId($sequence=NULL) + public static function insertId($sequence = NULL) { return self::getConnection()->getInsertId($sequence); } @@ -479,7 +479,7 @@ class dibi $sql = preg_replace("#(?<=[\\s,(])($keywords1)(?=[\\s,)])#i", "\n\$1", $sql); // reduce spaces - $sql = preg_replace('#[ \t]{2,}#', " ", $sql); + $sql = preg_replace('#[ \t]{2,}#', ' ', $sql); $sql = wordwrap($sql, 100); $sql = preg_replace("#([ \t]*\r?\n){2,}#", "\n", $sql); diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php index 3c7435c7..94ee618f 100644 --- a/dibi/libs/DibiConnection.php +++ b/dibi/libs/DibiConnection.php @@ -21,7 +21,7 @@ */ class DibiConnection extends DibiObject { - /** @var array of function(DibiEvent $event); Occurs after query is executed */ + /** @var array of function (DibiEvent $event); Occurs after query is executed */ public $onEvent; /** @var array Current connection configuration */ diff --git a/dibi/libs/DibiException.php b/dibi/libs/DibiException.php index 063f01d2..04ea86fd 100644 --- a/dibi/libs/DibiException.php +++ b/dibi/libs/DibiException.php @@ -117,8 +117,8 @@ class DibiDriverException extends DibiException * @author David Grudl * @package dibi */ -class DibiPcreException extends Exception { - +class DibiPcreException extends Exception +{ public function __construct($message = '%msg.') { static $messages = array( diff --git a/dibi/libs/DibiFileLogger.php b/dibi/libs/DibiFileLogger.php index 18d5caae..fd452f8b 100644 --- a/dibi/libs/DibiFileLogger.php +++ b/dibi/libs/DibiFileLogger.php @@ -58,7 +58,7 @@ class DibiFileLogger extends DibiObject ); } else { fwrite($handle, - "OK: " . $event->sql + 'OK: ' . $event->sql . ($event->count ? ";\n-- rows: " . $event->count : '') . "\n-- takes: " . sprintf('%0.3f ms', $event->time * 1000) . "\n-- source: " . implode(':', $event->source) diff --git a/dibi/libs/DibiFirePhpLogger.php b/dibi/libs/DibiFirePhpLogger.php index 843aab1a..ec4e876a 100644 --- a/dibi/libs/DibiFirePhpLogger.php +++ b/dibi/libs/DibiFirePhpLogger.php @@ -64,7 +64,7 @@ class DibiFirePhpLogger extends DibiObject sprintf('%0.3f', $event->time * 1000), strlen($event->sql) > self::$maxLength ? substr($event->sql, 0, self::$maxLength) . '...' : $event->sql, $event->result instanceof Exception ? 'ERROR' : (string) $event->count, - $event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name') + $event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name'), ); header('X-Wf-Protocol-dibi: http://meta.wildfirehq.org/Protocol/JsonStream/0.2'); diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php index 4e75c15b..d5a39d64 100644 --- a/dibi/libs/DibiFluent.php +++ b/dibi/libs/DibiFluent.php @@ -405,7 +405,7 @@ class DibiFluent extends DibiObject implements IDataSource public function count() { return (int) $this->query(array( - 'SELECT COUNT(*) FROM (%ex', $this->_export(), ') AS [data]' + 'SELECT COUNT(*) FROM (%ex', $this->_export(), ') AS [data]', ))->fetchSingle(); } diff --git a/dibi/libs/DibiObject.php b/dibi/libs/DibiObject.php index 4f882308..b4f75e6b 100644 --- a/dibi/libs/DibiObject.php +++ b/dibi/libs/DibiObject.php @@ -39,7 +39,7 @@ * Adding method to class (i.e. to all instances) works similar to JavaScript * prototype property. The syntax for adding a new method is: * - * MyClass::extensionMethod('newMethod', function(MyClass $obj, $arg, ...) { ... }); + * MyClass::extensionMethod('newMethod', function (MyClass $obj, $arg, ...) { ... }); * $obj = new MyClass; * $obj->newMethod($x); * diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php index cf3b385c..66ce49ec 100644 --- a/dibi/libs/DibiResult.php +++ b/dibi/libs/DibiResult.php @@ -109,7 +109,7 @@ class DibiResult extends DibiObject implements IDataSource /** * Moves cursor position without fetching row. * @param int the 0-based cursor pos to seek to - * @return boolean TRUE on success, FALSE if unable to seek to specified record + * @return bool TRUE on success, FALSE if unable to seek to specified record * @throws DibiException */ final public function seek($row) @@ -188,7 +188,7 @@ class DibiResult extends DibiObject implements IDataSource /** * Fetches the row at current position, process optional type conversion. * and moves the internal cursor to the next position - * @return DibiRow|FALSE array on success, FALSE if no next record + * @return DibiRow|FALSE array on success, FALSE if no next record */ final public function fetch() { @@ -209,7 +209,7 @@ class DibiResult extends DibiObject implements IDataSource /** * Like fetch(), but returns only first field. - * @return mixed value on success, FALSE if no next record + * @return mixed value on success, FALSE if no next record */ final public function fetchSingle() { @@ -303,16 +303,16 @@ class DibiResult extends DibiObject implements IDataSource $x = & $x[]; } elseif ($as === '=') { // "value" node - $x = $row->{$assoc[$i+1]}; + $x = $row->{$assoc[$i + 1]}; continue 2; } elseif ($as === '->') { // "object" node if ($x === NULL) { $x = clone $row; - $x = & $x->{$assoc[$i+1]}; + $x = & $x->{$assoc[$i + 1]}; $x = NULL; // prepare child node } else { - $x = & $x->{$assoc[$i+1]}; + $x = & $x->{$assoc[$i + 1]}; } } elseif ($as !== '|') { // associative-array node @@ -369,22 +369,21 @@ class DibiResult extends DibiObject implements IDataSource } elseif ($as === '=') { // "record" node if ($x === NULL) { $x = $row->toArray(); - $x = & $x[ $assoc[$i+1] ]; + $x = & $x[ $assoc[$i + 1] ]; $x = NULL; // prepare child node } else { - $x = & $x[ $assoc[$i+1] ]; + $x = & $x[ $assoc[$i + 1] ]; } } elseif ($as === '@') { // "object" node if ($x === NULL) { $x = clone $row; - $x = & $x->{$assoc[$i+1]}; + $x = & $x->{$assoc[$i + 1]}; $x = NULL; // prepare child node } else { - $x = & $x->{$assoc[$i+1]}; + $x = & $x->{$assoc[$i + 1]}; } - } else { // associative-array node $x = & $x[$row->$as]; } @@ -424,7 +423,7 @@ class DibiResult extends DibiObject implements IDataSource if ($value === NULL) { if ($key !== NULL) { - throw new InvalidArgumentException("Either none or both columns must be specified."); + throw new InvalidArgumentException('Either none or both columns must be specified.'); } // autodetect @@ -478,7 +477,8 @@ class DibiResult extends DibiObject implements IDataSource foreach ($this->getResultDriver()->getResultColumns() as $col) { $this->types[$col['name']] = $cache->{$col['nativetype']}; } - } catch (DibiNotSupportedException $e) {} + } catch (DibiNotSupportedException $e) { + } } @@ -619,7 +619,7 @@ class DibiResult extends DibiObject implements IDataSource foreach ($row as $col => $val) { $spaces = $maxLen - mb_strlen($col) + 2; - echo "$col" . str_repeat(" ", $spaces) . "$val\n"; + echo "$col" . str_repeat(' ', $spaces) . "$val\n"; } echo "\n"; diff --git a/dibi/libs/DibiTranslator.php b/dibi/libs/DibiTranslator.php index 3a34d055..a1acbc09 100644 --- a/dibi/libs/DibiTranslator.php +++ b/dibi/libs/DibiTranslator.php @@ -160,7 +160,7 @@ final class DibiTranslator extends DibiObject if ($comment) { - $sql[] = "*/"; + $sql[] = '*/'; } $sql = implode(' ', $sql); @@ -187,7 +187,7 @@ final class DibiTranslator extends DibiObject public function formatValue($value, $modifier) { if ($this->comment) { - return "..."; + return '...'; } if (!$this->driver) { @@ -489,7 +489,7 @@ final class DibiTranslator extends DibiObject if ($cursor >= count($this->args)) { $this->hasError = TRUE; - return "**Extra placeholder**"; + return '**Extra placeholder**'; } $cursor++; @@ -512,7 +512,7 @@ final class DibiTranslator extends DibiObject // open comment $this->ifLevelStart = $this->ifLevel; $this->comment = TRUE; - return "/*"; + return '/*'; } return ''; @@ -520,11 +520,11 @@ final class DibiTranslator extends DibiObject if ($this->ifLevelStart === $this->ifLevel) { $this->ifLevelStart = 0; $this->comment = FALSE; - return "*/"; + return '*/'; } elseif (!$this->comment) { $this->ifLevelStart = $this->ifLevel; $this->comment = TRUE; - return "/*"; + return '/*'; } } elseif ($mod === 'end') { @@ -533,7 +533,7 @@ final class DibiTranslator extends DibiObject // close comment $this->ifLevelStart = 0; $this->comment = FALSE; - return "*/"; + return '*/'; } return ''; @@ -572,10 +572,10 @@ final class DibiTranslator extends DibiObject return $this->identifiers->{$matches[2]}; } elseif ($matches[3]) { // SQL strings: '...' - return $this->driver->escape( str_replace("''", "'", $matches[4]), dibi::TEXT); + return $this->driver->escape(str_replace("''", "'", $matches[4]), dibi::TEXT); } elseif ($matches[5]) { // SQL strings: "..." - return $this->driver->escape( str_replace('""', '"', $matches[6]), dibi::TEXT); + return $this->driver->escape(str_replace('""', '"', $matches[6]), dibi::TEXT); } elseif ($matches[7]) { // string quote $this->hasError = TRUE; diff --git a/examples/connecting-to-databases.php b/examples/connecting-to-databases.php index bd383a46..dd64cd22 100644 --- a/examples/connecting-to-databases.php +++ b/examples/connecting-to-databases.php @@ -11,11 +11,10 @@ require __DIR__ . '/../dibi/dibi.php'; echo '

Connecting to Sqlite: '; try { dibi::connect(array( - 'driver' => 'sqlite3', + 'driver' => 'sqlite3', 'database' => 'data/sample.s3db', )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -26,11 +25,10 @@ echo "

\n"; echo '

Connecting to Sqlite: '; try { $connection = new DibiConnection(array( - 'driver' => 'sqlite3', + 'driver' => 'sqlite3', 'database' => 'data/sample.s3db', )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -42,7 +40,6 @@ echo '

Connecting to MySQL: '; try { dibi::connect('driver=mysql&host=localhost&username=root&password=xxx&database=test&charset=cp1250'); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -53,18 +50,17 @@ echo "

\n"; echo '

Connecting to MySQLi: '; try { dibi::connect(array( - 'driver' => 'mysqli', - 'host' => 'localhost', + 'driver' => 'mysqli', + 'host' => 'localhost', 'username' => 'root', 'password' => 'xxx', 'database' => 'dibi', - 'options' => array( - MYSQLI_OPT_CONNECT_TIMEOUT => 30 + 'options' => array( + MYSQLI_OPT_CONNECT_TIMEOUT => 30, ), - 'flags' => MYSQLI_CLIENT_COMPRESS, + 'flags' => MYSQLI_CLIENT_COMPRESS, )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -75,13 +71,12 @@ echo "

\n"; echo '

Connecting to ODBC: '; try { dibi::connect(array( - 'driver' => 'odbc', + 'driver' => 'odbc', 'username' => 'root', 'password' => '***', - 'dsn' => 'Driver={Microsoft Access Driver (*.mdb)};Dbq='.__DIR__.'/data/sample.mdb', + 'dsn' => 'Driver={Microsoft Access Driver (*.mdb)};Dbq='.__DIR__.'/data/sample.mdb', )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -92,12 +87,11 @@ echo "

\n"; echo '

Connecting to PostgreSql: '; try { dibi::connect(array( - 'driver' => 'postgre', - 'string' => 'host=localhost port=5432 dbname=mary', + 'driver' => 'postgre', + 'string' => 'host=localhost port=5432 dbname=mary', 'persistent' => TRUE, )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -108,11 +102,10 @@ echo "

\n"; echo '

Connecting to Sqlite via PDO: '; try { dibi::connect(array( - 'driver' => 'pdo', - 'dsn' => 'sqlite2::memory:', + 'driver' => 'pdo', + 'dsn' => 'sqlite2::memory:', )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -123,13 +116,12 @@ echo "

\n"; echo '

Connecting to MS SQL: '; try { dibi::connect(array( - 'driver' => 'mssql', - 'host' => 'localhost', + 'driver' => 'mssql', + 'host' => 'localhost', 'username' => 'root', 'password' => 'xxx', )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -140,14 +132,13 @@ echo "

\n"; echo '

Connecting to MS SQL 2005: '; try { dibi::connect(array( - 'driver' => 'mssql2005', - 'host' => '(local)', + 'driver' => 'mssql2005', + 'host' => '(local)', 'username' => 'Administrator', 'password' => 'xxx', 'database' => 'main', )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } @@ -158,13 +149,12 @@ echo "

\n"; echo '

Connecting to Oracle: '; try { dibi::connect(array( - 'driver' => 'oracle', + 'driver' => 'oracle', 'username' => 'root', 'password' => 'xxx', 'database' => 'db', )); echo 'OK'; - } catch (DibiException $e) { echo get_class($e), ': ', $e->getMessage(), "\n"; } diff --git a/examples/database-reflection.php b/examples/database-reflection.php index 73da28fa..e1660009 100644 --- a/examples/database-reflection.php +++ b/examples/database-reflection.php @@ -8,7 +8,7 @@ require __DIR__ . '/../dibi/dibi.php'; dibi::connect(array( - 'driver' => 'sqlite3', + 'driver' => 'sqlite3', 'database' => 'data/sample.s3db', )); @@ -37,7 +37,7 @@ foreach ($table->getColumns() as $column) { echo "\n"; -echo "Indexes"; +echo 'Indexes'; echo "