detain / db_abstraction

src/Pgsql/Db.php

Braces +25 added lines, -50 removed lines

@@ -17,8 +17,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
     /* public: this is an api revision, not a CVS revision. */
     public $type = 'pgsql';
     public $port = '';
@@ -33,8 +32,7 @@ 
      * @param false|string $quote optional indicate the value needs quoted
      * @return string
      */
-    public function ifadd($add, $me, $quote = false)
-    {
+    public function ifadd($add, $me, $quote = false) {
         if ('' != $add) {
             return ' '.$me.($quote === false ? '' : $quote).$add.($quote === false ? '' : $quote);
         }
@@ -45,8 +43,7 @@ 
      * @param $string
      * @return string
      */
-    public function real_escape($string = '')
-    {
+    public function real_escape($string = '') {
         return $this->escape($string);
     }
 
@@ -56,8 +53,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function useDb($database)
-    {
+    public function useDb($database) {
         $this->selectDb($database);
     }
 
@@ -67,8 +63,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function selectDb($database)
-    {
+    public function selectDb($database) {
         /*if ($database != $this->database) {
             $this->database = $database;
             $this->linkId = null;
@@ -80,8 +75,7 @@ 
      * Db::connect()
      * @return void
      */
-    public function connect()
-    {
+    public function connect() {
         if (0 == $this->linkId) {
             $connectString = trim($this->ifadd($this->host, 'host=').
                              $this->ifadd($this->port, 'port=').
@@ -101,8 +95,7 @@ 
      * Db::disconnect()
      * @return bool
      */
-    public function disconnect()
-    {
+    public function disconnect() {
         return @pg_close($this->linkId);
     }
 
@@ -117,8 +110,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function queryReturn($query, $line = '', $file = '')
-    {
+    public function queryReturn($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() == 0) {
             return false;
@@ -144,8 +136,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -159,8 +150,7 @@ 
      * @param string $file
      * @return mixed 0 if no query or query id handler, safe to ignore this return
      */
-    public function query($queryString, $line = '', $file = '')
-    {
+    public function query($queryString, $line = '', $file = '') {
         /* No empty queries, please, since PHP4 chokes on them. */
         /* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
@@ -191,8 +181,7 @@ 
      *
      * @return void
      */
-    public function free()
-    {
+    public function free() {
         @pg_freeresult($this->queryId);
         $this->queryId = 0;
     }
@@ -202,8 +191,7 @@ 
      * @param mixed $resultType
      * @return bool
      */
-    public function next_record($resultType = PGSQL_BOTH)
-    {
+    public function next_record($resultType = PGSQL_BOTH) {
         $this->Record = @pg_fetch_array($this->queryId, $this->Row++, $resultType);
 
         $this->Error = pg_errormessage($this->linkId);
@@ -223,8 +211,7 @@ 
      * @param mixed $pos
      * @return void
      */
-    public function seek($pos)
-    {
+    public function seek($pos) {
         $this->Row = $pos;
     }
 
@@ -233,8 +220,7 @@ 
      *
      * @return mixed
      */
-    public function transactionBegin()
-    {
+    public function transactionBegin() {
         return $this->query('begin');
     }
 
@@ -242,8 +228,7 @@ 
      * Db::transactionCommit()
      * @return bool|mixed
      */
-    public function transactionCommit()
-    {
+    public function transactionCommit() {
         if (!$this->Errno) {
             return pg_exec($this->linkId, 'commit');
         } else {
@@ -255,8 +240,7 @@ 
      * Db::transactionAbort()
      * @return mixed
      */
-    public function transactionAbort()
-    {
+    public function transactionAbort() {
         return pg_exec($this->linkId, 'rollback');
     }
 
@@ -266,8 +250,7 @@ 
      * @param mixed $field
      * @return int
      */
-    public function getLastInsertId($table, $field)
-    {
+    public function getLastInsertId($table, $field) {
         /* This will get the last insert ID created on the current connection.  Should only be called
         * after an insert query is run on a table that has an auto incrementing field.  Of note, table
         * and field are required because pgsql returns the last inserted OID, which is unique across
@@ -304,8 +287,7 @@ 
      * @param string $mode
      * @return int|mixed
      */
-    public function lock($table, $mode = 'write')
-    {
+    public function lock($table, $mode = 'write') {
         $result = $this->transactionBegin();
 
         if ($mode == 'write') {
@@ -327,8 +309,7 @@ 
      * Db::unlock()
      * @return bool|mixed
      */
-    public function unlock()
-    {
+    public function unlock() {
         return $this->transactionCommit();
     }
 
@@ -336,8 +317,7 @@ 
      * Db::affectedRows()
      * @return void
      */
-    public function affectedRows()
-    {
+    public function affectedRows() {
         return pg_cmdtuples($this->queryId);
     }
 
@@ -345,8 +325,7 @@ 
      * Db::num_rows()
      * @return int
      */
-    public function num_rows()
-    {
+    public function num_rows() {
         return pg_numrows($this->queryId);
     }
 
@@ -354,8 +333,7 @@ 
      * Db::num_fields()
      * @return int
      */
-    public function num_fields()
-    {
+    public function num_fields() {
         return pg_numfields($this->queryId);
     }
 
@@ -365,8 +343,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
+    public function haltmsg($msg, $line = '', $file = '') {
         $this->log("Database error: $msg", $line, $file, 'error');
         if ($this->Errno != '0' || $this->Error != '()') {
             $this->log('PostgreSQL Error: '.pg_last_error($this->linkId), $line, $file, 'error');
@@ -379,8 +356,7 @@ 
      *
      * @return array
      */
-    public function tableNames()
-    {
+    public function tableNames() {
         $return = [];
         $this->query("select relname from pg_class where relkind = 'r' and not relname like 'pg_%'");
         $i = 0;
@@ -398,8 +374,7 @@ 
      *
      * @return array
      */
-    public function indexNames()
-    {
+    public function indexNames() {
         $return = [];
         $this->query("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relkind ='i' ORDER BY relname");
         $i = 0;

src/Loader.php

Braces +10 added lines, -20 removed lines

@@ -15,8 +15,7 @@ 
  *
  * @package MyDb
  */
-class Loader
-{
+class Loader {
     /* public: connection parameters */
     public $Type = 'mysqli';
     public $host = 'localhost';
@@ -56,8 +55,7 @@ 
      * @param string $host Optional The hostname where the server is, or default to localhost
      * @param string $query Optional query to perform immediately
      */
-    public function __construct($Type = '', $database = '', $user = '', $password = '', $host = 'localhost', $query = '')
-    {
+    public function __construct($Type = '', $database = '', $user = '', $password = '', $host = 'localhost', $query = '') {
         $this->Type = $Type;
         if (!defined('db')) {
             switch ($this->Type) {
@@ -98,24 +96,21 @@ 
      * @param string $line
      * @param string $file
      */
-    public function log($message, $line = '', $file = '')
-    {
+    public function log($message, $line = '', $file = '') {
         error_log($message);
     }
 
     /**
      * @return int
      */
-    public function linkId()
-    {
+    public function linkId() {
         return $this->linkId;
     }
 
     /**
      * @return int
      */
-    public function queryId()
-    {
+    public function queryId() {
         return $this->queryId;
     }
 
@@ -123,8 +118,7 @@ 
      * @param $str
      * @return string
      */
-    public function dbAddslashes($str)
-    {
+    public function dbAddslashes($str) {
         if (!isset($str) || $str == '') {
             return '';
         }
@@ -142,8 +136,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -155,8 +148,7 @@ 
      * @param string $file
      * @return void
      */
-    public function halt($msg, $line = '', $file = '')
-    {
+    public function halt($msg, $line = '', $file = '') {
         $this->unlock(false);
 
         if ($this->haltOnError == 'no') {
@@ -182,8 +174,7 @@ 
     /**
      * @param $msg
      */
-    public function haltmsg($msg)
-    {
+    public function haltmsg($msg) {
         $this->log("Database error: $msg", __LINE__, __FILE__);
         if ($this->Errno != '0' || $this->Error != '()') {
             $this->log('SQL Error: '.$this->Errno.' ('.$this->Error.')', __LINE__, __FILE__);
@@ -193,8 +184,7 @@ 
     /**
      * @return array
      */
-    public function indexNames()
-    {
+    public function indexNames() {
         return [];
     }
 }

src/Mdb2/Db.php

Braces +5 added lines, -10 removed lines

@@ -18,8 +18,7 @@ 
  *
  * @access public
  */
-class Db extends MysqliDb implements Db_Interface
-{
+class Db extends MysqliDb implements Db_Interface {
     public $host = 'localhost';
     public $user = 'pdns';
     public $password = '';
@@ -34,8 +33,7 @@ 
      * @param string $type
      * @return string
      */
-    public function quote($text = '', $type = 'text')
-    {
+    public function quote($text = '', $type = 'text') {
         switch ($type) {
             case 'text':
                 return "'".$this->escape($text)."'";
@@ -57,8 +55,7 @@ 
      * @param string $file
      * @return bool
      */
-    public function queryOne($query, $line = '', $file = '')
-    {
+    public function queryOne($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() > 0) {
             $this->next_record();
@@ -76,8 +73,7 @@ 
      * @param string $file
      * @return array|bool
      */
-    public function queryRow($query, $line = '', $file = '')
-    {
+    public function queryRow($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() > 0) {
             $this->next_record();
@@ -93,8 +89,7 @@ 
      * @param mixed $field
      * @return int
      */
-    public function lastInsertId($table, $field)
-    {
+    public function lastInsertId($table, $field) {
         return $this->getLastInsertId($table, $field);
     }
 }

src/Mysqli/Db.php

Braces +24 added lines, -48 removed lines

@@ -17,8 +17,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
     /**
      * @var string
      */
@@ -30,8 +29,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function useDb($database)
-    {
+    public function useDb($database) {
         $this->selectDb($database);
     }
 
@@ -41,8 +39,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function selectDb($database)
-    {
+    public function selectDb($database) {
         $this->connect();
         mysqli_select_db($this->linkId, $database);
     }
@@ -57,8 +54,7 @@ 
      * @param string $password
      * @return int|\mysqli
      */
-    public function connect($database = '', $host = '', $user = '', $password = '', $port = '')
-    {
+    public function connect($database = '', $host = '', $user = '', $password = '', $port = '') {
         /* Handle defaults */
         if ($database == '') {
             $database = $this->database;
@@ -105,8 +101,7 @@ 
      * Db::disconnect()
      * @return bool
      */
-    public function disconnect()
-    {
+    public function disconnect() {
         $return = !is_int($this->linkId) && method_exists($this->linkId, 'close') ? $this->linkId->close() : false;
         $this->linkId = 0;
         return $return;
@@ -116,8 +111,7 @@ 
      * @param $string
      * @return string
      */
-    public function real_escape($string = '')
-    {
+    public function real_escape($string = '') {
         if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) {
             return $this->escape($string);
         }
@@ -128,8 +122,7 @@ 
      * discard the query result
      * @return void
      */
-    public function free()
-    {
+    public function free() {
         if (is_resource($this->queryId)) {
             @mysqli_free_result($this->queryId);
         }
@@ -147,8 +140,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function queryReturn($query, $line = '', $file = '')
-    {
+    public function queryReturn($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() == 0) {
             return false;
@@ -174,8 +166,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -187,8 +178,7 @@ 
      * @param string $line
      * @param string $file
      */
-    public function prepare($query, $line = '', $file = '')
-    {
+    public function prepare($query, $line = '', $file = '') {
         if (!$this->connect()) {
             return 0;
         }
@@ -210,8 +200,7 @@ 
      * @param string $file
      * @return mixed 0 if no query or query id handler, safe to ignore this return
      */
-    public function query($queryString, $line = '', $file = '')
-    {
+    public function query($queryString, $line = '', $file = '') {
         /* No empty queries, please, since PHP4 chokes on them. */
         /* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
@@ -289,8 +278,7 @@ 
     /**
      * @return array|null|object
      */
-    public function fetchObject()
-    {
+    public function fetchObject() {
         $this->Record = @mysqli_fetch_object($this->queryId);
         return $this->Record;
     }
@@ -303,8 +291,7 @@ 
      * @param mixed $resultType
      * @return bool
      */
-    public function next_record($resultType = MYSQLI_BOTH)
-    {
+    public function next_record($resultType = MYSQLI_BOTH) {
         if ($this->queryId === false) {
             $this->haltmsg('next_record called with no query pending.');
             return 0;
@@ -328,8 +315,7 @@ 
      * @param integer $pos the row numbe starting at 0 to switch to
      * @return bool whetherit was successfu or not.
      */
-    public function seek($pos = 0)
-    {
+    public function seek($pos = 0) {
         $status = @mysqli_data_seek($this->queryId, $pos);
         if ($status) {
             $this->Row = $pos;
@@ -349,8 +335,7 @@ 
      *
      * @return bool
      */
-    public function transactionBegin()
-    {
+    public function transactionBegin() {
         if (version_compare(PHP_VERSION, '5.5.0') < 0) {
             return true;
         }
@@ -365,8 +350,7 @@ 
      *
      * @return bool
      */
-    public function transactionCommit()
-    {
+    public function transactionCommit() {
         if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
             return true;
         }
@@ -378,8 +362,7 @@ 
      *
      * @return bool
      */
-    public function transactionAbort()
-    {
+    public function transactionAbort() {
         if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
             return true;
         }
@@ -395,8 +378,7 @@ 
      * @param string $field
      * @return int|string
      */
-    public function getLastInsertId($table, $field)
-    {
+    public function getLastInsertId($table, $field) {
         if (!isset($table) || $table == '' || !isset($field) || $field == '') {
             return -1;
         }
@@ -412,8 +394,7 @@ 
      * @param string $mode
      * @return bool|int|\mysqli_result
      */
-    public function lock($table, $mode = 'write')
-    {
+    public function lock($table, $mode = 'write') {
         $this->connect();
         $query = 'lock tables ';
         if (is_array($table)) {
@@ -441,8 +422,7 @@ 
      * @param bool $haltOnError optional, defaults to TRUE, whether or not to halt on error
      * @return bool|int|\mysqli_result
      */
-    public function unlock($haltOnError = true)
-    {
+    public function unlock($haltOnError = true) {
         $this->connect();
 
         $res = @mysqli_query($this->linkId, 'unlock tables');
@@ -459,8 +439,7 @@ 
      * Db::affectedRows()
      * @return int
      */
-    public function affectedRows()
-    {
+    public function affectedRows() {
         return @mysqli_affected_rows($this->linkId);
     }
 
@@ -468,8 +447,7 @@ 
      * Db::num_rows()
      * @return int
      */
-    public function num_rows()
-    {
+    public function num_rows() {
         return @mysqli_num_rows($this->queryId);
     }
 
@@ -477,8 +455,7 @@ 
      * Db::num_fields()
      * @return int
      */
-    public function num_fields()
-    {
+    public function num_fields() {
         return @mysqli_num_fields($this->queryId);
     }
 
@@ -487,8 +464,7 @@ 
      *
      * @return array
      */
-    public function tableNames()
-    {
+    public function tableNames() {
         $return = [];
         $this->query('SHOW TABLES');
         $i = 0;

src/Db_Interface.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  *
  * @package MyDb
  */
-interface Db_Interface
-{
+interface Db_Interface {
     /**
      * Db_Interface constructor.
      *

src/Adodb/Db.php

Braces +21 added lines, -42 removed lines

@@ -17,8 +17,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
     public $driver = 'mysql';
     public $Rows = [];
     public $type = 'adodb';
@@ -32,8 +31,7 @@ 
      * @param string $driver
      * @return bool|\the
      */
-    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql')
-    {
+    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql') {
         /* Handle defaults */
         if ('' == $database) {
             $database = $this->database;
@@ -64,16 +62,14 @@ 
      * Db::disconnect()
      * @return void
      */
-    public function disconnect()
-    {
+    public function disconnect() {
     }
 
     /**
      * @param $string
      * @return string
      */
-    public function real_escape($string = '')
-    {
+    public function real_escape($string = '') {
         return escapeshellarg($string);
     }
 
@@ -81,8 +77,7 @@ 
      * discard the query result
      * @return void
      */
-    public function free()
-    {
+    public function free() {
         //			@mysql_free_result($this->queryId);
         //			$this->queryId = 0;
     }
@@ -98,8 +93,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function queryReturn($query, $line = '', $file = '')
-    {
+    public function queryReturn($query, $line = '', $file = '') {
         $this->query($query, $line, $file);
         if ($this->num_rows() == 0) {
             return false;
@@ -125,8 +119,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -140,8 +133,7 @@ 
      * @param string $file
      * @return mixed 0 if no query or query id handler, safe to ignore this return
      */
-    public function query($queryString, $line = '', $file = '')
-    {
+    public function query($queryString, $line = '', $file = '') {
         /* No empty queries, please, since PHP4 chokes on them. */
         /* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
@@ -184,8 +176,7 @@ 
      * @param mixed $resultType
      * @return bool
      */
-    public function next_record($resultType = MYSQL_ASSOC)
-    {
+    public function next_record($resultType = MYSQL_ASSOC) {
         if (!$this->queryId) {
             $this->halt('next_record called with no query pending.');
             return 0;
@@ -206,8 +197,7 @@ 
      * @param integer $pos
      * @return int
      */
-    public function seek($pos = 0)
-    {
+    public function seek($pos = 0) {
         if (isset($this->Rows[$pos])) {
             $this->Row = $pos;
         } else {
@@ -225,8 +215,7 @@ 
      * Db::transactionBegin()
      * @return bool
      */
-    public function transactionBegin()
-    {
+    public function transactionBegin() {
         return true;
     }
 
@@ -234,8 +223,7 @@ 
      * Db::transactionCommit()
      * @return bool
      */
-    public function transactionCommit()
-    {
+    public function transactionCommit() {
         return true;
     }
 
@@ -243,8 +231,7 @@ 
      * Db::transactionAbort()
      * @return bool
      */
-    public function transactionAbort()
-    {
+    public function transactionAbort() {
         return true;
     }
 
@@ -255,8 +242,7 @@ 
      * @param mixed $field
      * @return mixed
      */
-    public function getLastInsertId($table, $field)
-    {
+    public function getLastInsertId($table, $field) {
         return $this->linkId->Insert_ID($table, $field);
     }
 
@@ -268,8 +254,7 @@ 
      * @param string $mode
      * @return void
      */
-    public function lock($table, $mode = 'write')
-    {
+    public function lock($table, $mode = 'write') {
         /*			$this->connect();
 
         * $query = "lock tables ";
@@ -306,8 +291,7 @@ 
      * Db::unlock()
      * @return void
      */
-    public function unlock()
-    {
+    public function unlock() {
         /*			$this->connect();
 
         * $res = @mysql_query("unlock tables");
@@ -327,8 +311,7 @@ 
      *
      * @return mixed
      */
-    public function affectedRows()
-    {
+    public function affectedRows() {
         return @$this->linkId->Affected_Rows();
         //			return @$this->queryId->rowCount();
     }
@@ -338,8 +321,7 @@ 
      *
      * @return mixed
      */
-    public function num_rows()
-    {
+    public function num_rows() {
         return $this->queryId->NumRows();
     }
 
@@ -348,8 +330,7 @@ 
      *
      * @return mixed
      */
-    public function num_fields()
-    {
+    public function num_fields() {
         return $this->queryId->NumCols();
     }
 
@@ -359,8 +340,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
+    public function haltmsg($msg, $line = '', $file = '') {
         $this->log("Database error: $msg", $line, $file, 'error');
         if ($this->linkId->ErrorNo() != '0' && $this->linkId->ErrorMsg() != '') {
             $this->log('ADOdb SQL Error: '.$this->linkId->ErrorMsg(), $line, $file, 'error');
@@ -373,8 +353,7 @@ 
      *
      * @return array
      */
-    public function tableNames()
-    {
+    public function tableNames() {
         $return = [];
         $this->query('SHOW TABLES');
         $i = 0;

src/Pdo/Db.php

Braces +20 added lines, -40 removed lines

@@ -18,8 +18,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
     /* public: connection parameters */
     public $driver = 'mysql';
     public $Rows = [];
@@ -32,8 +31,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function selectDb($database)
-    {
+    public function selectDb($database) {
         $dSN = "{$this->driver}:dbname={$database};host={$this->host}";
         if ($this->characterSet != '') {
             $dSN .= ';charset='.$this->characterSet;
@@ -49,8 +47,7 @@ 
      * @param string $database the name of the database to use
      * @return void
      */
-    public function useDb($database)
-    {
+    public function useDb($database) {
         $this->selectDb($database);
     }
 
@@ -65,8 +62,7 @@ 
      * @param string $driver
      * @return bool|int|PDO
      */
-    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql')
-    {
+    public function connect($database = '', $host = '', $user = '', $password = '', $driver = 'mysql') {
         /* Handle defaults */
         if ('' == $database) {
             $database = $this->database;
@@ -105,8 +101,7 @@ 
      * Db::disconnect()
      * @return void
      */
-    public function disconnect()
-    {
+    public function disconnect() {
     }
 
     /* public: discard the query result */
@@ -115,8 +110,7 @@ 
      * Db::free()
      * @return void
      */
-    public function free()
-    {
+    public function free() {
         //			@mysql_free_result($this->queryId);
         //			$this->queryId = 0;
     }
@@ -131,8 +125,7 @@ 
      * @param string $file
      * @return mixed 0 if no query or query id handler, safe to ignore this return
      */
-    public function query($queryString, $line = '', $file = '')
-    {
+    public function query($queryString, $line = '', $file = '') {
         /* No empty queries, please, since PHP4 chokes on them. */
         /* The empty query string is passed on from the constructor,
         * when calling the class without a query, e.g. in situations
@@ -177,8 +170,7 @@ 
      * @param mixed $resultType
      * @return bool
      */
-    public function next_record($resultType = MYSQLI_ASSOC)
-    {
+    public function next_record($resultType = MYSQLI_ASSOC) {
         // PDO result types so far seem to be +1
         ++$resultType;
         if (!$this->queryId) {
@@ -203,8 +195,7 @@ 
      * @param integer $pos
      * @return int
      */
-    public function seek($pos = 0)
-    {
+    public function seek($pos = 0) {
         if (isset($this->Rows[$pos])) {
             $this->Row = $pos;
         } else {
@@ -222,8 +213,7 @@ 
      * Initiates a transaction
      * @return bool
      */
-    public function transactionBegin()
-    {
+    public function transactionBegin() {
         return $this->linkId->beginTransaction();
     }
 
@@ -231,8 +221,7 @@ 
      * Commits a transaction
      * @return bool
      */
-    public function transactionCommit()
-    {
+    public function transactionCommit() {
         return $this->linkId->commit();
     }
 
@@ -240,8 +229,7 @@ 
      * Rolls back a transaction
      * @return bool
      */
-    public function transactionAbort()
-    {
+    public function transactionAbort() {
         return $this->linkId->rollBack();
     }
 
@@ -251,8 +239,7 @@ 
      * @param mixed $field
      * @return int
      */
-    public function getLastInsertId($table, $field)
-    {
+    public function getLastInsertId($table, $field) {
         if (!isset($table) || $table == '' || !isset($field) || $field == '') {
             return -1;
         }
@@ -267,8 +254,7 @@ 
      * @param string $mode
      * @return void
      */
-    public function lock($table, $mode = 'write')
-    {
+    public function lock($table, $mode = 'write') {
         /*			$this->connect();
 
         * $query = "lock tables ";
@@ -305,8 +291,7 @@ 
      * Db::unlock()
      * @return void
      */
-    public function unlock()
-    {
+    public function unlock() {
         /*			$this->connect();
 
         * $res = @mysql_query("unlock tables");
@@ -326,8 +311,7 @@ 
      *
      * @return mixed
      */
-    public function affectedRows()
-    {
+    public function affectedRows() {
         return @$this->queryId->rowCount();
     }
 
@@ -335,8 +319,7 @@ 
      * Db::num_rows()
      * @return int
      */
-    public function num_rows()
-    {
+    public function num_rows() {
         return count($this->Rows);
     }
 
@@ -344,8 +327,7 @@ 
      * Db::num_fields()
      * @return int
      */
-    public function num_fields()
-    {
+    public function num_fields() {
         $keys = array_keys($this->Rows);
         return count($this->Rows[$keys[0]]);
     }
@@ -356,8 +338,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
+    public function haltmsg($msg, $line = '', $file = '') {
         $this->log("Database error: $msg", $line, $file, 'error');
         if ($this->Errno != '0' || $this->Error != '()') {
             $this->log('PDO MySQL Error: '.json_encode($this->linkId->errorInfo()), $line, $file, 'error');
@@ -370,8 +351,7 @@ 
      *
      * @return array
      */
-    public function tableNames()
-    {
+    public function tableNames() {
         $return = [];
         $this->query('SHOW TABLES');
         foreach ($this->Rows as $i => $info) {

src/Generic.php

Braces +20 added lines, -40 removed lines

@@ -12,8 +12,7 @@ 
 /**
  * Class Generic
  */
-abstract class Generic
-{
+abstract class Generic {
     /* public: connection parameters */
     public $host = 'localhost';
     public $database = '';
@@ -71,8 +70,7 @@ 
      * @param string $query Optional query to perform immediately
      * @param string $port optional port for the connection
      */
-    public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '')
-    {
+    public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '') {
         $this->database = $database;
         $this->user = $user;
         $this->password = $password;
@@ -90,24 +88,21 @@ 
      * @param string $file
      * @return void
      */
-    public function log($message, $line = '', $file = '', $level = 'info')
-    {
+    public function log($message, $line = '', $file = '', $level = 'info') {
         error_log($message);
     }
 
     /**
      * @return int|object
      */
-    public function linkId()
-    {
+    public function linkId() {
         return $this->linkId;
     }
 
     /**
      * @return int|object
      */
-    public function queryId()
-    {
+    public function queryId() {
         return $this->queryId;
     }
 
@@ -115,8 +110,7 @@ 
      * @param $string
      * @return string
      */
-    public function real_escape($string = '')
-    {
+    public function real_escape($string = '') {
         if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) {
             return $this->escape($string);
         }
@@ -127,8 +121,7 @@ 
      * @param $string
      * @return string
      */
-    public function escape($string = '')
-    {
+    public function escape($string = '') {
         //if (function_exists('mysql_escape_string'))
         //return mysql_escape_string($string);
         return str_replace(['\\', "\0", "\n", "\r", "'", '"', "\x1a"], ['\\\\', '\\0', '\\n', '\\r', "\\'", '\\"', '\\Z'], $string);
@@ -138,8 +131,7 @@ 
      * @param mixed $str
      * @return string
      */
-    public function dbAddslashes($str = '')
-    {
+    public function dbAddslashes($str = '') {
         if (!isset($str) || $str == '') {
             return '';
         }
@@ -151,8 +143,7 @@ 
      * @param mixed $epoch
      * @return bool|string
      */
-    public function toTimestamp($epoch)
-    {
+    public function toTimestamp($epoch) {
         return date('Y-m-d H:i:s', is_float($epoch) ? intval($epoch) : $epoch);
     }
 
@@ -161,8 +152,7 @@ 
      * @param mixed $timestamp
      * @return bool|int|mixed
      */
-    public function fromTimestamp($timestamp)
-    {
+    public function fromTimestamp($timestamp) {
         if (preg_match('/([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $timestamp, $parts)) {
             $time = mktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]);
         } elseif (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $timestamp, $parts)) {
@@ -188,8 +178,7 @@ 
      * @param string $file
      * @return mixed
      */
-    public function limitQuery($queryString, $numRows = '', $offset = 0, $line = '', $file = '')
-    {
+    public function limitQuery($queryString, $numRows = '', $offset = 0, $line = '', $file = '') {
         if (!$numRows) {
             $numRows = $this->maxMatches;
         }
@@ -216,8 +205,7 @@ 
      * @param string $file optionally pass __FILE__ calling the query for logging
      * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
      */
-    public function qr($query, $line = '', $file = '')
-    {
+    public function qr($query, $line = '', $file = '') {
         return $this->queryReturn($query, $line, $file);
     }
 
@@ -228,8 +216,7 @@ 
      * @param string $stripSlashes
      * @return string
      */
-    public function f($name, $stripSlashes = '')
-    {
+    public function f($name, $stripSlashes = '') {
         if (is_null($this->Record)) {
             return null;
         } elseif ($stripSlashes || ($this->autoStripslashes && !$stripSlashes)) {
@@ -247,8 +234,7 @@ 
      * @param string $file
      * @return void
      */
-    public function halt($msg, $line = '', $file = '')
-    {
+    public function halt($msg, $line = '', $file = '') {
         $this->unlock(false);
         /* Just in case there is a table currently locked */
 
@@ -275,8 +261,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function logBackTrace($msg, $line = '', $file = '')
-    {
+    public function logBackTrace($msg, $line = '', $file = '') {
         $backtrace = (function_exists('debug_backtrace') ? debug_backtrace() : []);
         $this->log(
             ('' !== getenv('REQUEST_URI') ? ' '.getenv('REQUEST_URI') : '').
@@ -307,8 +292,7 @@ 
         }
     }
 
-    public function emailError($queryString, $error, $line, $file)
-    {
+    public function emailError($queryString, $error, $line, $file) {
         $subject = php_uname('n').' MySQLi Error '.$queryString;
         if (class_exists('\\TFSmarty')) {
             $smarty = new \TFSmarty();
@@ -337,8 +321,7 @@ 
      * @param string $file
      * @return mixed|void
      */
-    public function haltmsg($msg, $line = '', $file = '')
-    {
+    public function haltmsg($msg, $line = '', $file = '') {
         $email = "DB Error {$msg} {$file}:{$line}";
         if (class_exists('\\MyAdmin\Mail')) {
             \MyAdmin\Mail::failsafeMail($email, $email, ['detain@interserver.net', 'john@interserver.net']);
@@ -355,8 +338,7 @@ 
     /**
      * @return array
      */
-    public function indexNames()
-    {
+    public function indexNames() {
         return [];
     }
 
@@ -368,8 +350,7 @@ 
      * @param string|int $line Line Number
      * @param string $file File Name
      */
-    public function addLog($statement, $time, $line = '', $file = '')
-    {
+    public function addLog($statement, $time, $line = '', $file = '') {
         $query = [
             'statement' => $statement,
             'time' => $time * 1000
@@ -391,8 +372,7 @@ 
      * Return logged queries.
      * @return array Logged queries
      */
-    public function getLog()
-    {
+    public function getLog() {
         return $this->log;
     }
 }