ByTIC / framework

src/database/profiler/Profiler.php

Indentation +79 added lines, -79 removed lines

@@ -18,85 +18,85 @@
     public $filterTypes = null;    
     
 
-	public function start($queryText = false) {
-		if (!$this->checkEnabled()) {
-			return;
-		}
-
-		// make sure we have a query type
-		switch (strtolower(substr($queryText, 0, 6))) {
-			case 'insert':
-				$queryType = 'INSERT';
-				break;
-
-			case 'update':
-				$queryType = 'UPDATE';
-				break;
-
-			case 'delete':
-				$queryType = 'DELETE';
-				break;
-
-			case 'select':
-				$queryType = 'SELECT';
-				break;
-
-			default:
-				$queryType = 'QUERY';
-				break;
-		}
-
-		$this->profiles[] = new Nip_DB_Profiler_Query($queryText, $queryType);
-
-		$profileID = $this->lastProcessID();
-		$this->addRunningProces($profileID);
-		return $profileID;
-	}
+    public function start($queryText = false) {
+        if (!$this->checkEnabled()) {
+            return;
+        }
+
+        // make sure we have a query type
+        switch (strtolower(substr($queryText, 0, 6))) {
+            case 'insert':
+                $queryType = 'INSERT';
+                break;
+
+            case 'update':
+                $queryType = 'UPDATE';
+                break;
+
+            case 'delete':
+                $queryType = 'DELETE';
+                break;
+
+            case 'select':
+                $queryType = 'SELECT';
+                break;
+
+            default:
+                $queryType = 'QUERY';
+                break;
+        }
+
+        $this->profiles[] = new Nip_DB_Profiler_Query($queryText, $queryType);
+
+        $profileID = $this->lastProcessID();
+        $this->addRunningProces($profileID);
+        return $profileID;
+    }
     
 
-	public function end($profileID = false) {
-		if (!$this->checkEnabled()) {
-			return;
-		}
-
-		if ($profileID == false) {
-			$profileID = $this->getLastRunningProces();
-		}
-
-		$profile = $this->endProfile($profileID);
-		if (is_object($profile)) {
-			$this->secondsFilter($profile);
-			$this->typeFilter($profile);
-		}
-		return;
-	}
-
-
-	public function typeFilter($profile){
-		if (is_array($this->filterTypes) && in_array($profile->type, $this->filterTypes)) {
-			$this->deleteProfile($profileID);
-			return;
-		}
-	}
-
-
-	public function setFilterQueryType($queryTypes = null){
-		$this->filterTypes = $queryTypes;
-
-		return $this;
-	}
-
-
-	/**
-	 * Singleton
-	 *
-	 * @return Nip_DB_Profiler
-	 */
-	public static function instance() {
-		static $instance;
-		if (!($instance instanceof self)) {
-			$instance = new self();
-		}
-		return $instance;
-	}
+    public function end($profileID = false) {
+        if (!$this->checkEnabled()) {
+            return;
+        }
+
+        if ($profileID == false) {
+            $profileID = $this->getLastRunningProces();
+        }
+
+        $profile = $this->endProfile($profileID);
+        if (is_object($profile)) {
+            $this->secondsFilter($profile);
+            $this->typeFilter($profile);
+        }
+        return;
+    }
+
+
+    public function typeFilter($profile){
+        if (is_array($this->filterTypes) && in_array($profile->type, $this->filterTypes)) {
+            $this->deleteProfile($profileID);
+            return;
+        }
+    }
+
+
+    public function setFilterQueryType($queryTypes = null){
+        $this->filterTypes = $queryTypes;
+
+        return $this;
+    }
+
+
+    /**
+     * Singleton
+     *
+     * @return Nip_DB_Profiler
+     */
+    public static function instance() {
+        static $instance;
+        if (!($instance instanceof self)) {
+            $instance = new self();
+        }
+        return $instance;
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 	}
 
 
-	public function typeFilter($profile){
+	public function typeFilter($profile) {
 		if (is_array($this->filterTypes) && in_array($profile->type, $this->filterTypes)) {
 			$this->deleteProfile($profileID);
 			return;
@@ -80,7 +80,7 @@ 
 	}
 
 
-	public function setFilterQueryType($queryTypes = null){
+	public function setFilterQueryType($queryTypes = null) {
 		$this->filterTypes = $queryTypes;
 
 		return $this;

src/database/Exception.php

Indentation +4 added lines, -4 removed lines

@@ -3,9 +3,9 @@
 class Nip_DB_Exception extends Exception
 {
 
-	public function __construct($message, $code = E_USER_ERROR)
-	{
-		parent::__construct($message, $code);
-	}
+    public function __construct($message, $code = E_USER_ERROR)
+    {
+        parent::__construct($message, $code);
+    }
 
 }
\ No newline at end of file

src/database/query/Delete.php

Indentation +25 added lines, -25 removed lines

@@ -5,30 +5,30 @@
 class Nip_DB_Query_Delete extends _Abstract
 {
 
-	/**
-	 * Joins together DELETE, FROM, WHERE, ORDER, and LIMIT parts of SQL query
-	 * @return string
-	 */
-	public function assemble()
-	{
-		$where = $this->parseWhere();
-		$order = $this->parseOrder();
-
-		$query = 'DELETE FROM ' . $this->getManager()->protect($this->getTable());
-
-		if (!empty($where)) {
-			$query .= ' WHERE ' . $where;
-		}
-
-		if (!empty($order)) {
-			$query .= ' ORDER BY ' . $order;
-		}
-
-		if (!empty($this->limit)) {
-			$query .= ' LIMIT ' . $this->limit;
-		}
-
-		return $query;
-	}
+    /**
+     * Joins together DELETE, FROM, WHERE, ORDER, and LIMIT parts of SQL query
+     * @return string
+     */
+    public function assemble()
+    {
+        $where = $this->parseWhere();
+        $order = $this->parseOrder();
+
+        $query = 'DELETE FROM ' . $this->getManager()->protect($this->getTable());
+
+        if (!empty($where)) {
+            $query .= ' WHERE ' . $where;
+        }
+
+        if (!empty($order)) {
+            $query .= ' ORDER BY ' . $order;
+        }
+
+        if (!empty($this->limit)) {
+            $query .= ' LIMIT ' . $this->limit;
+        }
+
+        return $query;
+    }
 
 }
\ No newline at end of file

src/database/query/Truncate.php

Indentation +4 added lines, -4 removed lines

@@ -5,9 +5,9 @@
 class Nip_DB_Query_Truncate extends _Abstract
 {
 
-	public function assemble()
-	{
-		return 'TRUNCATE TABLE ' . $this->getTable();
-	}
+    public function assemble()
+    {
+        return 'TRUNCATE TABLE ' . $this->getTable();
+    }
 
 }
\ No newline at end of file

src/database/query/Condition/OrCondition.php

Spacing +1 added lines, -1 removed lines

@@ -10,6 +10,6 @@
     }
 
     public function getString() {
-        return $this->protectCondition($this->_condition->getString()) ." OR ". $this->protectCondition($this->_orCondition->getString()) ."";
+        return $this->protectCondition($this->_condition->getString()) . " OR " . $this->protectCondition($this->_orCondition->getString()) . "";
     }
 }
\ No newline at end of file

src/database/query/Condition/AndCondition.php

Indentation +11 added lines, -11 removed lines

@@ -3,18 +3,18 @@
 class Nip_DB_Query_AndCondition extends Nip_DB_Query_Condition
 {
 
-	protected $_condition;
-	protected $_andCondition;
+    protected $_condition;
+    protected $_andCondition;
 
-	public function __construct($condition, $andCondition)
-	{
-		$this->_condition = $condition;
-		$this->_andCondition = $andCondition;
-	}
+    public function __construct($condition, $andCondition)
+    {
+        $this->_condition = $condition;
+        $this->_andCondition = $andCondition;
+    }
 
-	public function getString()
-	{
-		return $this->protectCondition($this->_condition->getString()) . " AND " . $this->protectCondition($this->_andCondition->getString()) . "";
-	}
+    public function getString()
+    {
+        return $this->protectCondition($this->_condition->getString()) . " AND " . $this->protectCondition($this->_andCondition->getString()) . "";
+    }
 
 }
\ No newline at end of file

src/database/query/Replace.php

Indentation +5 added lines, -5 removed lines

@@ -3,10 +3,10 @@
 class Nip_DB_Query_Replace extends Nip_DB_Query_Insert
 {
 
-	public function assemble()
-	{
-		$query = "REPLACE INTO " . $this->protect($this->getTable()) . $this->parseCols() . $this->parseValues();
-		return $query;
-	}
+    public function assemble()
+    {
+        $query = "REPLACE INTO " . $this->protect($this->getTable()) . $this->parseCols() . $this->parseValues();
+        return $query;
+    }
 
 }
\ No newline at end of file

src/database/adapters/Interface.php

Indentation +13 added lines, -13 removed lines

@@ -2,29 +2,29 @@
 interface Nip_DB_Adapters_Interface
 {
 
-	function execute($sql);
+    function execute($sql);
 
-	function lastInsertID();
+    function lastInsertID();
 
-	function affectedRows();
+    function affectedRows();
 
-	function numRows($result);
+    function numRows($result);
 
-	function fetchArray($result);
+    function fetchArray($result);
 
-	function fetchAssoc($result);
+    function fetchAssoc($result);
 
-	function fetchObject($result);
+    function fetchObject($result);
 
-	function result($result, $row, $field);
+    function result($result, $row, $field);
 
-	function freeResults($result);
+    function freeResults($result);
 
-	function describeTable($table);
+    function describeTable($table);
 
-	function cleanData($data);
+    function cleanData($data);
 
-	function error();
+    function error();
 
-	function disconnect();
+    function disconnect();
 }
\ No newline at end of file

src/database/adapters/MySQLi.php

Indentation +156 added lines, -156 removed lines

@@ -3,39 +3,39 @@ 
 class Nip_DB_Adapters_MySQLi extends Nip_DB_Adapters_Abstract implements Nip_DB_Adapters_Interface
 {
 
-	protected $_connection;
-
-	/**
-	 * Connects to MySQL server
-	 *
-	 * @param string $host
-	 * @param string $user
-	 * @param string $password
-	 * @param string $database
-	 * @return resource
-	 */
-	public function connect($host = false, $user = false, $password = false, $database = false, $newLink = false)
-	{
-		$this->_connection = mysqli_connect($host, $user, $password, $newLink);
+    protected $_connection;
+
+    /**
+     * Connects to MySQL server
+     *
+     * @param string $host
+     * @param string $user
+     * @param string $password
+     * @param string $database
+     * @return resource
+     */
+    public function connect($host = false, $user = false, $password = false, $database = false, $newLink = false)
+    {
+        $this->_connection = mysqli_connect($host, $user, $password, $newLink);
         
-		if ($this->_connection) {
-			if ($this->selectDatabase($database)) {
-				$this->query("SET CHARACTER SET utf8");
-				$this->query("SET NAMES utf8");
-				return $this->_connection;
-			} else {
-				$message = 'Cannot select database ' . $database;
-			}
-		} else {
-			$message = mysqli_error();
-		}
-
-		if (!$this->_connection) {
-			trigger_error($message, E_USER_WARNING);
-		}
-
-		return false;
-	}
+        if ($this->_connection) {
+            if ($this->selectDatabase($database)) {
+                $this->query("SET CHARACTER SET utf8");
+                $this->query("SET NAMES utf8");
+                return $this->_connection;
+            } else {
+                $message = 'Cannot select database ' . $database;
+            }
+        } else {
+            $message = mysqli_error();
+        }
+
+        if (!$this->_connection) {
+            trigger_error($message, E_USER_WARNING);
+        }
+
+        return false;
+    }
 
 
     public function selectDatabase($database)
@@ -43,130 +43,130 @@ 
         return mysqli_select_db($this->_connection, $database);
     }
 
-	/**
-	 * Executes SQL query
-	 *
-	 * @param string $sql
-	 * @return result ID
-	 */
-	public function query($sql)
-	{
-		return mysqli_query($this->_connection, $sql);
-	}
-
-	public function lastInsertID()
-	{
-		return mysqli_insert_id($this->_connection);
-	}
-
-	public function affectedRows()
-	{
-		return mysqli_affected_rows($this->_connection);
-	}
-
-	public function info()
-	{
-		return mysqli_info($this->_connection);
-	}
-
-	public function numRows($result)
-	{
-		return mysqli_num_rows($result);
-	}
-
-	public function fetchArray($result)
-	{
-		return mysqli_fetch_array($result);
-	}
-
-	public function fetchAssoc($result)
-	{
-		return mysqli_fetch_assoc($result);
-	}
-
-	public function fetchObject($result)
-	{
-		return mysqli_fetch_object($result);
-	}
-
-	public function result($result, $row, $field)
-	{
-		return mysqli_result($result, $row, $field);
-	}
-
-	public function freeResults($result)
-	{
-		return mysqli_free_result($result);
-	}
-
-	public function describeTable($table)
-	{
-		$return = array('fields' => array(), 'indexes' => array());
-
-		$result = $this->execute('SHOW INDEX IN ' . $table);
-		if (mysqli_num_rows($result)) {
-			while ($row = $this->fetchAssoc($result)) {
-				if (!$return['indexes'][$row['Key_name']]) {
-					$return['indexes'][$row['Key_name']] = array();
-				}
-				$return['indexes'][$row['Key_name']]['fields'][] = $row['Column_name'];
-				$return['indexes'][$row['Key_name']]['unique'] = $row['Non_unique'] == '0';
-				$return['indexes'][$row['Key_name']]['fulltext'] = $row['Index_type'] == 'FULLTEXT';
-				$return['indexes'][$row['Key_name']]['type'] = $row['Index_type'];
-			}
-		}
-
-		$result = $this->execute('DESCRIBE ' . $table);
-		if (mysqli_num_rows($result)) {
-			while ($row = $this->fetchAssoc($result)) {
-				$return['fields'][$row['Field']] = array(
-					'field' => $row['Field'],
-					'type' => $row['Type'],
-					'primary' => ($return['indexes']['PRIMARY']['fields'][0] == $row['Field']),
-					'default' => $row['Default'],
-					'auto_increment' => ($row['Extra'] === 'auto_increment')
-				);
-			}
-		}
-
-		return $return;
-	}
-
-	public function getTables()
-	{
-		$return = array();
+    /**
+     * Executes SQL query
+     *
+     * @param string $sql
+     * @return result ID
+     */
+    public function query($sql)
+    {
+        return mysqli_query($this->_connection, $sql);
+    }
+
+    public function lastInsertID()
+    {
+        return mysqli_insert_id($this->_connection);
+    }
+
+    public function affectedRows()
+    {
+        return mysqli_affected_rows($this->_connection);
+    }
+
+    public function info()
+    {
+        return mysqli_info($this->_connection);
+    }
+
+    public function numRows($result)
+    {
+        return mysqli_num_rows($result);
+    }
+
+    public function fetchArray($result)
+    {
+        return mysqli_fetch_array($result);
+    }
+
+    public function fetchAssoc($result)
+    {
+        return mysqli_fetch_assoc($result);
+    }
+
+    public function fetchObject($result)
+    {
+        return mysqli_fetch_object($result);
+    }
+
+    public function result($result, $row, $field)
+    {
+        return mysqli_result($result, $row, $field);
+    }
+
+    public function freeResults($result)
+    {
+        return mysqli_free_result($result);
+    }
+
+    public function describeTable($table)
+    {
+        $return = array('fields' => array(), 'indexes' => array());
+
+        $result = $this->execute('SHOW INDEX IN ' . $table);
+        if (mysqli_num_rows($result)) {
+            while ($row = $this->fetchAssoc($result)) {
+                if (!$return['indexes'][$row['Key_name']]) {
+                    $return['indexes'][$row['Key_name']] = array();
+                }
+                $return['indexes'][$row['Key_name']]['fields'][] = $row['Column_name'];
+                $return['indexes'][$row['Key_name']]['unique'] = $row['Non_unique'] == '0';
+                $return['indexes'][$row['Key_name']]['fulltext'] = $row['Index_type'] == 'FULLTEXT';
+                $return['indexes'][$row['Key_name']]['type'] = $row['Index_type'];
+            }
+        }
+
+        $result = $this->execute('DESCRIBE ' . $table);
+        if (mysqli_num_rows($result)) {
+            while ($row = $this->fetchAssoc($result)) {
+                $return['fields'][$row['Field']] = array(
+                    'field' => $row['Field'],
+                    'type' => $row['Type'],
+                    'primary' => ($return['indexes']['PRIMARY']['fields'][0] == $row['Field']),
+                    'default' => $row['Default'],
+                    'auto_increment' => ($row['Extra'] === 'auto_increment')
+                );
+            }
+        }
+
+        return $return;
+    }
+
+    public function getTables()
+    {
+        $return = array();
 		
-		$result = $this->execute("SHOW FULL TABLES");
-		if ($this->numRows($result)) {
-			while ($row = $this->fetchArray($result)) {
-				$return[$row[0]] = array(
-					"type" => $row[1] == "BASE TABLE" ? "table" : "view"
-				);
-			}
-		}
-
-		return $return;
-	}
-
-	public function quote($value)
-	{
-		$value = $this->cleanData($value);
-		return is_numeric($value) ? $value : "'$value'";
-	}
-
-	public function cleanData($data)
-	{
-		return mysqli_real_escape_string($this->_connection, $data);
-	}
-
-	public function error()
-	{
-		return mysqli_error($this->_connection);
-	}
-
-	public function disconnect()
-	{
-		mysqli_close($this->_connection);
-	}
+        $result = $this->execute("SHOW FULL TABLES");
+        if ($this->numRows($result)) {
+            while ($row = $this->fetchArray($result)) {
+                $return[$row[0]] = array(
+                    "type" => $row[1] == "BASE TABLE" ? "table" : "view"
+                );
+            }
+        }
+
+        return $return;
+    }
+
+    public function quote($value)
+    {
+        $value = $this->cleanData($value);
+        return is_numeric($value) ? $value : "'$value'";
+    }
+
+    public function cleanData($data)
+    {
+        return mysqli_real_escape_string($this->_connection, $data);
+    }
+
+    public function error()
+    {
+        return mysqli_error($this->_connection);
+    }
+
+    public function disconnect()
+    {
+        mysqli_close($this->_connection);
+    }
 
 }
\ No newline at end of file