detain / db_abstraction

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 = '';
@@ -69,8 +68,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($database = '', $user = '', $password = '', $host = 'localhost', $query = '')
-	{
+	public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '') {
 		$this->database = $database;
 		$this->user = $user;
 		$this->password = $password;
@@ -87,24 +85,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;
 	}
 
@@ -112,8 +107,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);
 		}
@@ -124,8 +118,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(array('\\', "\0", "\n", "\r", "'", '"', "\x1a"), array('\\\\', '\\0', '\\n', '\\r', "\\'", '\\"', '\\Z'), $string);
@@ -135,8 +128,7 @@ 
 	 * @param mixed $str
 	 * @return string
 	 */
-	public function dbAddslashes($str = '')
-	{
+	public function dbAddslashes($str = '') {
 		if (!isset($str) || $str == '') {
 			return '';
 		}
@@ -148,8 +140,7 @@ 
 	 * @param mixed $epoch
 	 * @return bool|string
 	 */
-	public function toTimestamp($epoch)
-	{
+	public function toTimestamp($epoch) {
 		return date('Y-m-d H:i:s', $epoch);
 	}
 
@@ -158,8 +149,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)) {
@@ -185,8 +175,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;
 		}
@@ -213,8 +202,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);
 	}
 
@@ -225,8 +213,7 @@ 
 	 * @param string $stripSlashes
 	 * @return string
 	 */
-	public function f($name, $stripSlashes = '')
-	{
+	public function f($name, $stripSlashes = '') {
 		if ($stripSlashes || ($this->autoStripslashes && !$stripSlashes)) {
 			return stripslashes($this->Record[$name]);
 		} else {
@@ -242,8 +229,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 */
 
@@ -271,8 +257,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') : '').
@@ -303,8 +288,7 @@ 
 		}
 	}
 
-	public function emailError($queryString, $error, $line, $file)
-	{
+	public function emailError($queryString, $error, $line, $file) {
 		$subject = php_uname('n').' MySQLi Error';
 		$smarty = new \TFSmarty();
 		$smarty->assign([
@@ -331,8 +315,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' || !in_array($this->Error, ['', '()'])) {
 			$sqlstate = mysqli_sqlstate($this->linkId);
@@ -344,8 +327,7 @@ 
 	/**
 	 * @return array
 	 */
-	public function indexNames()
-	{
+	public function indexNames() {
 		return [];
 	}
 	
@@ -357,8 +339,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
@@ -380,8 +361,7 @@ 
 	 * Return logged queries.
 	 * @return array Logged queries
 	 */
-	public function getLog()
-	{
+	public function getLog() {
 		return $this->log;
 	}    
 }

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 = '')
-	{
+	public function connect($database = '', $host = '', $user = '', $password = '') {
 		/* Handle defaults */
 		if ($database == '') {
 			$database = $this->database;
@@ -98,8 +94,7 @@ 
 	 * Db::disconnect()
 	 * @return bool
 	 */
-	public function disconnect()
-	{
+	public function disconnect() {
 		$return = method_exists($this->linkId, 'close') ? $this->linkId->close() : false;
 		$this->linkId = 0;
 		return $return;
@@ -109,8 +104,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);
 		}
@@ -121,8 +115,7 @@ 
 	 * discard the query result
 	 * @return void
 	 */
-	public function free()
-	{
+	public function free() {
 		if (is_resource($this->queryId)) {
 			@mysqli_free_result($this->queryId);
 		}
@@ -140,8 +133,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;
@@ -167,8 +159,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);
 	}
 
@@ -178,8 +169,7 @@ 
 	 * @param string $query sql query like INSERT INTO table (col) VALUES (?)  or  SELECT * from table WHERE col1 = ? and col2 = ?  or  UPDATE table SET col1 = ?, col2 = ? WHERE col3 = ?
 	 * @return int|\MyDb\Mysqli\mysqli_stmt
 	 */
-	public function prepare($query)
-	{
+	public function prepare($query) {
 		if (!$this->connect()) {
 			return 0;
 		}
@@ -198,8 +188,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
@@ -255,8 +244,7 @@ 
 	/**
 	 * @return array|null|object
 	 */
-	public function fetchObject()
-	{
+	public function fetchObject() {
 		$this->Record = @mysqli_fetch_object($this->queryId);
 		return $this->Record;
 	}
@@ -269,8 +257,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;
@@ -294,8 +281,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;
@@ -315,8 +301,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function transactionBegin()
-	{
+	public function transactionBegin() {
 		if (version_compare(PHP_VERSION, '5.5.0') < 0) {
 			return true;
 		}
@@ -331,8 +316,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function transactionCommit()
-	{
+	public function transactionCommit() {
 		if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
 			return true;
 		}
@@ -344,8 +328,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function transactionAbort()
-	{
+	public function transactionAbort() {
 		if (version_compare(PHP_VERSION, '5.5.0') < 0 || $this->linkId === 0) {
 			return true;
 		}
@@ -361,8 +344,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;
 		}
@@ -378,8 +360,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)) {
@@ -407,8 +388,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');
@@ -425,8 +405,7 @@ 
 	 * Db::affectedRows()
 	 * @return int
 	 */
-	public function affectedRows()
-	{
+	public function affectedRows() {
 		return @mysqli_affected_rows($this->linkId);
 	}
 
@@ -434,8 +413,7 @@ 
 	 * Db::num_rows()
 	 * @return int
 	 */
-	public function num_rows()
-	{
+	public function num_rows() {
 		return @mysqli_num_rows($this->queryId);
 	}
 
@@ -443,8 +421,7 @@ 
 	 * Db::num_fields()
 	 * @return int
 	 */
-	public function num_fields()
-	{
+	public function num_fields() {
 		return @mysqli_num_fields($this->queryId);
 	}
 
@@ -453,8 +430,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function tableNames()
-	{
+	public function tableNames() {
 		$return = [];
 		$this->query('SHOW TABLES');
 		$i = 0;