diff --git a/examples/connecting-to-databases.php b/examples/connecting-to-databases.php index d7ab1c0d..f7450646 100644 --- a/examples/connecting-to-databases.php +++ b/examples/connecting-to-databases.php @@ -74,7 +74,7 @@ try { '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 (Dibi\Exception $e) { diff --git a/src/Dibi/Bridges/Tracy/Panel.php b/src/Dibi/Bridges/Tracy/Panel.php index ecda6019..aea20ee2 100644 --- a/src/Dibi/Bridges/Tracy/Panel.php +++ b/src/Dibi/Bridges/Tracy/Panel.php @@ -143,7 +143,7 @@ class Panel implements Tracy\IBarPanel #tracy-debug tracy-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto }

Queries: ' . count($this->events) . ($totalTime === null ? '' : ', time: ' . number_format($totalTime * 1000, 1, '.', ' ') . ' ms') . ', ' - . htmlSpecialChars($connection->getConfig('driver') . ($connection->getConfig('name') ? '/' . $connection->getConfig('name') : '') + . htmlspecialchars($connection->getConfig('driver') . ($connection->getConfig('name') ? '/' . $connection->getConfig('name') : '') . ($connection->getConfig('host') ? ' @ ' . $connection->getConfig('host') : '')) . '

diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php index 1539e6d1..f28c1dd3 100644 --- a/src/Dibi/Connection.php +++ b/src/Dibi/Connection.php @@ -48,7 +48,6 @@ 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 diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php index 5b088e75..473222d5 100644 --- a/src/Dibi/DataSource.php +++ b/src/Dibi/DataSource.php @@ -10,7 +10,6 @@ namespace Dibi; /** * Default implementation of IDataSource for dibi. - * */ class DataSource implements IDataSource { diff --git a/src/Dibi/DateTime.php b/src/Dibi/DateTime.php index 2a3da08e..b43a1c2f 100644 --- a/src/Dibi/DateTime.php +++ b/src/Dibi/DateTime.php @@ -33,7 +33,7 @@ class DateTime extends \DateTime public function modifyClone($modify = '') { - $dolly = clone($this); + $dolly = clone $this; return $modify ? $dolly->modify($modify) : $dolly; } diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php index e6d6b0ac..4d65f18b 100644 --- a/src/Dibi/Drivers/FirebirdDriver.php +++ b/src/Dibi/Drivers/FirebirdDriver.php @@ -277,7 +277,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector */ public function escapeIdentifier($value) { - return '"' . str_replace('"', '""', $value). '"'; + return '"' . str_replace('"', '""', $value) . '"'; } @@ -713,9 +713,9 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector */ public function getTriggers($table = null) { - $q = "SELECT TRIM(RDB\$TRIGGER_NAME) - FROM RDB\$TRIGGERS - WHERE RDB\$SYSTEM_FLAG = 0"; + $q = 'SELECT TRIM(RDB$TRIGGER_NAME) + FROM RDB$TRIGGERS + WHERE RDB$SYSTEM_FLAG = 0'; $q .= $table === null ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table')"; $res = $this->query($q); @@ -786,9 +786,9 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector */ public function getProcedures() { - $res = $this->query(" - SELECT TRIM(RDB\$PROCEDURE_NAME) - FROM RDB\$PROCEDURES;" + $res = $this->query(' + SELECT TRIM(RDB$PROCEDURE_NAME) + FROM RDB$PROCEDURES;' ); $procedures = []; while ($row = $res->fetch(false)) { @@ -804,10 +804,10 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector */ public function getGenerators() { - $res = $this->query(" - SELECT TRIM(RDB\$GENERATOR_NAME) - FROM RDB\$GENERATORS - WHERE RDB\$SYSTEM_FLAG = 0;" + $res = $this->query(' + SELECT TRIM(RDB$GENERATOR_NAME) + FROM RDB$GENERATORS + WHERE RDB$SYSTEM_FLAG = 0;' ); $generators = []; while ($row = $res->fetch(false)) { @@ -823,10 +823,10 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector */ public function getFunctions() { - $res = $this->query(" - SELECT TRIM(RDB\$FUNCTION_NAME) - FROM RDB\$FUNCTIONS - WHERE RDB\$SYSTEM_FLAG = 0;" + $res = $this->query(' + SELECT TRIM(RDB$FUNCTION_NAME) + FROM RDB$FUNCTIONS + WHERE RDB$SYSTEM_FLAG = 0;' ); $functions = []; while ($row = $res->fetch(false)) { diff --git a/src/Dibi/Drivers/MsSqlDriver.php b/src/Dibi/Drivers/MsSqlDriver.php index 06c68787..4962f8ba 100644 --- a/src/Dibi/Drivers/MsSqlDriver.php +++ b/src/Dibi/Drivers/MsSqlDriver.php @@ -357,7 +357,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver /** * 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/src/Dibi/Drivers/MsSqlReflector.php b/src/Dibi/Drivers/MsSqlReflector.php index 4d9fa837..83784b4e 100644 --- a/src/Dibi/Drivers/MsSqlReflector.php +++ b/src/Dibi/Drivers/MsSqlReflector.php @@ -69,12 +69,12 @@ class MsSqlReflector implements Dibi\Reflector if (!is_array($row) || count($row) < 1) { if ($fallback) { $row = $this->driver->query("SELECT COUNT(*) FROM {$this->driver->escapeIdentifier($table)}")->fetch(false); - $count = intval($row[0]); + $count = (int) ($row[0]); } else { $count = false; } } else { - $count = intval($row[0]); + $count = (int) ($row[0]); } return $count; diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php index e8a46f98..52a93350 100644 --- a/src/Dibi/Drivers/OdbcDriver.php +++ b/src/Dibi/Drivers/OdbcDriver.php @@ -274,7 +274,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } - return $value->format("#m/d/Y#"); + return $value->format('#m/d/Y#'); } @@ -287,7 +287,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } - return $value->format("#m/d/Y H:i:s.u#"); + return $value->format('#m/d/Y H:i:s.u#'); } diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php index 219d05da..6e9ead9c 100644 --- a/src/Dibi/Drivers/OracleDriver.php +++ b/src/Dibi/Drivers/OracleDriver.php @@ -41,7 +41,8 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector private $autocommit = true; /** @var string Date and datetime format */ - private $fmtDate, $fmtDateTime; + private $fmtDate; + private $fmtDateTime; /** @var int|false Number of affected rows */ private $affectedRows = false; @@ -373,7 +374,7 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector // see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html $sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t ' . ($limit !== null ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '') - . ') WHERE "__rnum" > '. (int) $offset; + . ') WHERE "__rnum" > ' . (int) $offset; } elseif ($limit !== null) { $sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit; diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php index 4f3b2f25..c2cbddf2 100644 --- a/src/Dibi/Drivers/PdoDriver.php +++ b/src/Dibi/Drivers/PdoDriver.php @@ -348,7 +348,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } - return $value->format($this->driverName === 'odbc' ? "#m/d/Y H:i:s.u#" : "'Y-m-d H:i:s.u'"); + return $value->format($this->driverName === 'odbc' ? '#m/d/Y H:i:s.u#' : "'Y-m-d H:i:s.u'"); } @@ -455,7 +455,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver // see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html $sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t ' . ($limit !== null ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '') - . ') WHERE "__rnum" > '. (int) $offset; + . ') WHERE "__rnum" > ' . (int) $offset; } elseif ($limit !== null) { $sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit; @@ -474,8 +474,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver } break; } - // intentionally break omitted - + // break omitted case 'odbc': if ($offset) { throw new Dibi\NotSupportedException('Offset is not supported by this database.'); @@ -484,8 +483,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver $sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t'; break; } - // intentionally break omitted - + // break omitted default: throw new Dibi\NotSupportedException('PDO or driver does not support applying limit or offset.'); } diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php index 5f274599..ccf6150a 100644 --- a/src/Dibi/Drivers/PostgreDriver.php +++ b/src/Dibi/Drivers/PostgreDriver.php @@ -78,7 +78,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector } } - set_error_handler(function($severity, $message) use (&$error) { + set_error_handler(function ($severity, $message) use (&$error) { $error = $message; }); if (empty($config['persistent'])) { diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php index 077279fe..f59bae27 100644 --- a/src/Dibi/Drivers/Sqlite3Driver.php +++ b/src/Dibi/Drivers/Sqlite3Driver.php @@ -37,10 +37,12 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver private $autoFree = true; /** @var string Date and datetime format */ - private $fmtDate, $fmtDateTime; + private $fmtDate; + private $fmtDateTime; /** @var string character encoding */ - private $dbcharset, $charset; + private $dbcharset; + private $charset; /** diff --git a/src/Dibi/Drivers/SqlsrvReflector.php b/src/Dibi/Drivers/SqlsrvReflector.php index ba80f4c3..4cdce435 100644 --- a/src/Dibi/Drivers/SqlsrvReflector.php +++ b/src/Dibi/Drivers/SqlsrvReflector.php @@ -105,7 +105,7 @@ class SqlsrvReflector implements Dibi\Reflector */ public function getIndexes($table) { - $keyUsagesRes = $this->driver->query(sprintf("EXEC [sys].[sp_helpindex] @objname = N%s", $this->driver->escapeText($table))); + $keyUsagesRes = $this->driver->query(sprintf('EXEC [sys].[sp_helpindex] @objname = N%s', $this->driver->escapeText($table))); $keyUsages = []; while ($row = $keyUsagesRes->fetch(true)) { $keyUsages[$row['index_name']] = explode(',', $row['index_keys']); diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php index 6288866b..40a7724a 100644 --- a/src/Dibi/Fluent.php +++ b/src/Dibi/Fluent.php @@ -38,7 +38,7 @@ class Fluent implements IDataSource /** @var array */ public static $masks = [ 'SELECT' => ['SELECT', 'DISTINCT', 'FROM', 'WHERE', 'GROUP BY', - 'HAVING', 'ORDER BY', 'LIMIT', 'OFFSET'], + 'HAVING', 'ORDER BY', 'LIMIT', 'OFFSET', ], 'UPDATE' => ['UPDATE', 'SET', 'WHERE', 'ORDER BY', 'LIMIT'], 'INSERT' => ['INSERT', 'INTO', 'VALUES', 'SELECT'], 'DELETE' => ['DELETE', 'FROM', 'USING', 'WHERE', 'ORDER BY', 'LIMIT'], diff --git a/src/Dibi/Helpers.php b/src/Dibi/Helpers.php index bda55799..ea429d82 100644 --- a/src/Dibi/Helpers.php +++ b/src/Dibi/Helpers.php @@ -39,7 +39,7 @@ class Helpers echo $hasColors ? "\033[1;37m#row: $i\033[0m\n" : "#row: $i\n"; 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"; } @@ -51,14 +51,14 @@ class Helpers if ($i === 0) { echo "\n
\n\n\t\n\t\t\n"; foreach ($row as $col => $foo) { - echo "\t\t\n"; + echo "\t\t\n"; } echo "\t\n\n\n"; } echo "\t\n\t\t\n"; foreach ($row as $col) { - echo "\t\t\n"; + echo "\t\t\n"; } echo "\t\n"; } @@ -107,7 +107,7 @@ class Helpers echo trim($sql) . "\n\n"; } else { - $sql = htmlSpecialChars($sql); + $sql = htmlspecialchars($sql); $sql = preg_replace_callback($highlighter, function ($m) { if (!empty($m[1])) { // comment return '' . $m[1] . ''; diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php index c360c190..917593a1 100644 --- a/src/Dibi/Reflection/Column.php +++ b/src/Dibi/Reflection/Column.php @@ -76,7 +76,7 @@ class Column public function getTable() { if (empty($this->info['table']) || !$this->reflector) { - throw new Dibi\Exception("Table is unknown or not available."); + throw new Dibi\Exception('Table is unknown or not available.'); } return new Table($this->reflector, ['name' => $this->info['table']]); } diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php index 6c1893ff..e311115b 100644 --- a/src/Dibi/Result.php +++ b/src/Dibi/Result.php @@ -364,10 +364,10 @@ class Result 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 @@ -450,7 +450,7 @@ class Result implements IDataSource } do { - $data[ (string) $row[$key] ] = $row[$value]; + $data[(string) $row[$key]] = $row[$value]; } while ($row = $this->fetch()); return $data; diff --git a/src/Dibi/Strict.php b/src/Dibi/Strict.php index 56ff00fe..2b2f786e 100644 --- a/src/Dibi/Strict.php +++ b/src/Dibi/Strict.php @@ -129,7 +129,7 @@ trait Strict } } - $list = & self::$extMethods[strtolower($name)]; + $list = &self::$extMethods[strtolower($name)]; if ($callback === null) { // getter $cache = &$list[''][$class]; if (isset($cache)) { diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php index d789f76d..d2725eaa 100644 --- a/src/Dibi/Translator.php +++ b/src/Dibi/Translator.php @@ -340,14 +340,12 @@ final class Translator case 'in': // deprecated trigger_error('Modifier %in is deprecated, use %iN.', E_USER_DEPRECATED); - // intentionally break omitted - + // break omitted case 'iN': // signed int or null if ($value == '') { $value = null; } - // intentionally break omitted - + // break omitted case 'i': // signed int case 'u': // unsigned int, ignored if ($value === null) { @@ -360,7 +358,7 @@ final class Translator } else { return (string) (int) $value; } - + // break omitted case 'f': // float if ($value === null) { return 'NULL'; @@ -369,7 +367,7 @@ final class Translator } else { return rtrim(rtrim(number_format($value + 0, 10, '.', ''), '0'), '.'); } - + // break omitted case 'd': // date case 't': // datetime case 'dt': // datetime @@ -378,7 +376,7 @@ final class Translator } else { return $modifier === 'd' ? $this->driver->escapeDate($value) : $this->driver->escapeDateTime($value); } - + // break omitted case 'by': case 'n': // composed identifier name return $this->identifiers->$value; diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php index 4ec93a55..46945d22 100644 --- a/src/Dibi/dibi.php +++ b/src/Dibi/dibi.php @@ -49,12 +49,6 @@ class dibi FIELD_DATETIME = Type::DATETIME, FIELD_TIME = Type::TIME; - /** @var Dibi\Connection[] Connection registry storage for DibiConnection objects */ - private static $registry = []; - - /** @var Dibi\Connection Current connection */ - private static $connection; - /** @var string Last SQL command @see dibi::query() */ public static $sql; @@ -70,6 +64,12 @@ class dibi /** @var string Default dibi driver */ public static $defaultDriver = 'mysqli'; + /** @var Dibi\Connection[] Connection registry storage for DibiConnection objects */ + private static $registry = []; + + /** @var Dibi\Connection Current connection */ + private static $connection; + /** * Static class - cannot be instantiated. diff --git a/src/Dibi/interfaces.php b/src/Dibi/interfaces.php index dd676949..c43c9a1d 100644 --- a/src/Dibi/interfaces.php +++ b/src/Dibi/interfaces.php @@ -166,7 +166,7 @@ interface ResultDriver /** * 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 Exception */ function seek($row); diff --git a/tests/dibi/Connection.connect.phpt b/tests/dibi/Connection.connect.phpt index 1814e46b..04a1491f 100644 --- a/tests/dibi/Connection.connect.phpt +++ b/tests/dibi/Connection.connect.phpt @@ -4,8 +4,8 @@ * @dataProvider ../databases.ini */ -use Tester\Assert; use Dibi\Connection; +use Tester\Assert; require __DIR__ . '/bootstrap.php'; diff --git a/tests/dibi/Connection.fetch.phpt b/tests/dibi/Connection.fetch.phpt index 072d6b7e..cc73a4dd 100644 --- a/tests/dibi/Connection.fetch.phpt +++ b/tests/dibi/Connection.fetch.phpt @@ -4,8 +4,8 @@ * @dataProvider ../databases.ini */ -use Tester\Assert; use Dibi\Row; +use Tester\Assert; require __DIR__ . '/bootstrap.php'; @@ -61,9 +61,9 @@ Assert::equal([ // more complex association array -function query($conn) { - - return $conn->query(in_array($conn->getConfig('system'), ['odbc', 'sqlsrv']) ? ' +function query($conn) +{ + return $conn->query(in_array($conn->getConfig('system'), ['odbc', 'sqlsrv'], true) ? ' SELECT products.title, customers.name, orders.amount FROM ([products] INNER JOIN [orders] ON [products.product_id] = [orders.product_id]) @@ -170,11 +170,11 @@ Assert::equal([ Assert::equal([ new Row(['title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0)]), new Row([ - 'title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0)]), + 'title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0), ]), new Row([ - 'title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0)]), + 'title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0), ]), new Row([ - 'title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0)]), + 'title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0), ]), ], query($conn)->fetchAssoc('@,=')); diff --git a/tests/dibi/DataSource.phpt b/tests/dibi/DataSource.phpt index b0b89567..52d2f671 100644 --- a/tests/dibi/DataSource.phpt +++ b/tests/dibi/DataSource.phpt @@ -1,7 +1,7 @@ select(['products.title' => 'title', 'customers.name' => 'name'])->select('orders.amount')->as('amount') ->from('products') ->innerJoin('orders')->using('(product_id)') diff --git a/tests/dibi/Result.meta.phpt b/tests/dibi/Result.meta.phpt index e79e4a30..6fe64eaa 100644 --- a/tests/dibi/Result.meta.phpt +++ b/tests/dibi/Result.meta.phpt @@ -25,7 +25,7 @@ Assert::same( ); -if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'])) { +if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'], true)) { Assert::same( ['products.product_id', 'orders.order_id', 'customers.name', 'xXx'], $info->getColumnNames(true) @@ -36,18 +36,18 @@ if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'])) { $columns = $info->getColumns(); Assert::same('product_id', $columns[0]->getName()); -if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'])) { +if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'], true)) { Assert::same('products', $columns[0]->getTableName()); } Assert::null($columns[0]->getVendorInfo('xxx')); -if (!in_array($config['system'], ['sqlite', 'sqlsrv'])) { +if (!in_array($config['system'], ['sqlite', 'sqlsrv'], true)) { Assert::same('i', $columns[0]->getType()); } Assert::null($columns[0]->isNullable()); Assert::same('xXx', $columns[3]->getName()); Assert::null($columns[3]->getTableName()); -if (!in_array($config['system'], ['sqlite', 'sqlsrv'])) { +if (!in_array($config['system'], ['sqlite', 'sqlsrv'], true)) { Assert::same('i', $columns[0]->getType()); } Assert::null($columns[3]->isNullable()); diff --git a/tests/dibi/Result.normalize.phpt b/tests/dibi/Result.normalize.phpt index 0fede4a9..44e75268 100644 --- a/tests/dibi/Result.normalize.phpt +++ b/tests/dibi/Result.normalize.phpt @@ -1,17 +1,19 @@ setAccessible(true); diff --git a/tests/dibi/Sqlsrv.insert.phpt b/tests/dibi/Sqlsrv.insert.phpt index 8520a3d2..ed08e842 100644 --- a/tests/dibi/Sqlsrv.insert.phpt +++ b/tests/dibi/Sqlsrv.insert.phpt @@ -9,7 +9,7 @@ use Tester\Assert; require __DIR__ . '/bootstrap.php'; $conn = new Dibi\Connection($config); -$conn->loadFile(__DIR__ . "/data/sqlsrv.insert.sql"); +$conn->loadFile(__DIR__ . '/data/sqlsrv.insert.sql'); for ($i = 1; $i <= 5; $i++) { $conn->query('INSERT INTO %n DEFAULT VALUES', 'aaa'); diff --git a/tests/dibi/Strict.phpt b/tests/dibi/Strict.phpt index 4f17ab5c..c6c74cab 100644 --- a/tests/dibi/Strict.phpt +++ b/tests/dibi/Strict.phpt @@ -11,27 +11,37 @@ class TestClass public $public; - protected $protected; - public static $publicStatic; + protected $protected; + + public function publicMethod() - {} + { + } + public static function publicMethodStatic() - {} + { + } + protected function protectedMethod() - {} + { + } + protected static function protectedMethodS() - {} + { + } + public function getBar() { return 123; } + public function isFoo() { return 456; diff --git a/tests/dibi/Translator.phpt b/tests/dibi/Translator.phpt index 92a0f7a5..fee46ad9 100644 --- a/tests/dibi/Translator.phpt +++ b/tests/dibi/Translator.phpt @@ -4,8 +4,8 @@ * @dataProvider ../databases.ini */ -use Tester\Assert; use Dibi\DateTime; +use Tester\Assert; require __DIR__ . '/bootstrap.php'; @@ -95,7 +95,7 @@ Assert::same( $conn->translate('TEST %and', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()']) ); -// + $where = []; $where[] = '[age] > 20'; $where[] = '[email] IS NOT NULL'; @@ -156,7 +156,7 @@ if ($config['system'] === 'odbc') { Assert::same( reformat([ 'sqlsrv' => 'SELECT * FROM [products] OFFSET 1 ROWS FETCH NEXT 2 ROWS ONLY', - 'SELECT * FROM [products] LIMIT 2 OFFSET 1' + 'SELECT * FROM [products] LIMIT 2 OFFSET 1', ]), $conn->translate('SELECT * FROM [products] %lmt %ofs', 2, 1) ); @@ -549,7 +549,7 @@ Assert::same( ); -setLocale(LC_ALL, 'czech'); +setlocale(LC_ALL, 'czech'); Assert::same( reformat("UPDATE [colors] SET [color]='blue', [price]=-12.4, [spec]=-9E-005, [spec2]=1000, [spec3]=10000, [spec4]=10000 WHERE [price]=123.5"), diff --git a/tests/dibi/bootstrap.php b/tests/dibi/bootstrap.php index c879afb4..a3e56f6c 100644 --- a/tests/dibi/bootstrap.php +++ b/tests/dibi/bootstrap.php @@ -63,7 +63,7 @@ function reformat($s) return strtr($s, '[]', '``'); } elseif ($config['system'] === 'postgre') { return strtr($s, '[]', '""'); - } elseif (in_array($config['system'], ['odbc', 'sqlite', 'sqlsrv'])) { + } elseif (in_array($config['system'], ['odbc', 'sqlite', 'sqlsrv'], true)) { return $s; } else { trigger_error("Unsupported driver $config[system]", E_USER_WARNING); diff --git a/tests/dibi/exceptions.mysql.phpt b/tests/dibi/exceptions.mysql.phpt index 4f20c517..22354328 100644 --- a/tests/dibi/exceptions.mysql.phpt +++ b/tests/dibi/exceptions.mysql.phpt @@ -15,7 +15,7 @@ $conn->loadFile(__DIR__ . "/data/$config[system].sql"); $e = Assert::exception(function () use ($conn) { $conn->query('SELECT'); -}, 'Dibi\DriverException', "%a% error in your SQL syntax;%a%", 1064); +}, 'Dibi\DriverException', '%a% error in your SQL syntax;%a%', 1064); Assert::same('SELECT', $e->getSql());
#row" . htmlSpecialChars((string) $col) . "" . htmlspecialchars((string) $col) . "
", $i, "", htmlSpecialChars((string) $col), "", htmlspecialchars((string) $col), "