From 2ae206462d3dc498e7ff8e057ff7d1f12faf61b5 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 15 Jul 2014 11:01:47 -0400
Subject: [PATCH] Fix some very minor code quality issues

---
 common.php                               | 6 +++---
 core/abstract/abstract_driver.php        | 6 +++---
 core/abstract/abstract_query_builder.php | 4 ++--
 phpci.yml                                | 3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common.php b/common.php
index efd930b..8afacc9 100644
--- a/common.php
+++ b/common.php
@@ -145,15 +145,15 @@ function Query($params = '')
 	}
 	elseif ( ! is_scalar($params) && ! is_null($params))
 	{
-		$p = new stdClass();
+		$params_object = new stdClass();
 
 		foreach($params as $k => $v)
 		{
-			$p->$k = $v;
+			$params_object->$k = $v;
 		}
 
 		// Otherwise, return a new connection
-		return $cmanager->connect($p);
+		return $cmanager->connect($params_object);
 	}
 // @codeCoverageIgnoreStart
 }
diff --git a/core/abstract/abstract_driver.php b/core/abstract/abstract_driver.php
index 3f9c54e..6ef523f 100644
--- a/core/abstract/abstract_driver.php
+++ b/core/abstract/abstract_driver.php
@@ -107,9 +107,9 @@ abstract class Abstract_Driver extends \PDO implements Driver_Interface {
 		$this_class = get_class($this);
 		$ns_array = explode("\\", $this_class);
 		$base_class = array_pop($ns_array);
-		$ns = implode('\\', $ns_array);
-		$sql_class = "{$ns}\\SQL\\{$base_class}_SQL";
-		$util_class = "{$ns}\\Util\\{$base_class}_Util";
+		$namespace = implode('\\', $ns_array);
+		$sql_class = "{$namespace}\\SQL\\{$base_class}_SQL";
+		$util_class = "{$namespace}\\Util\\{$base_class}_Util";
 
 		$this->sql = new $sql_class();
 		$this->util = new $util_class($this);
diff --git a/core/abstract/abstract_query_builder.php b/core/abstract/abstract_query_builder.php
index 83102b3..649abf4 100644
--- a/core/abstract/abstract_query_builder.php
+++ b/core/abstract/abstract_query_builder.php
@@ -274,7 +274,7 @@ abstract class Abstract_Query_Builder {
 		$field = $this->db->quote_ident($field);
 
 		// Add the like string into the order map
-		$l = $field. " {$like} ?";
+		$like = $field. " {$like} ?";
 
 		if ($pos == 'before')
 		{
@@ -290,7 +290,7 @@ abstract class Abstract_Query_Builder {
 		}
 
 		$conj = (empty($this->query_map)) ? ' WHERE ' : " {$conj} ";
-		$this->_append_map($conj, $l, 'like');
+		$this->_append_map($conj, $like, 'like');
 
 		// Add to the values array
 		$this->where_values[] = $val;
diff --git a/phpci.yml b/phpci.yml
index 4fbf8fe..ad6dc9e 100644
--- a/phpci.yml
+++ b/phpci.yml
@@ -17,5 +17,6 @@ test:
         allowed_warnings: 0
         skip_classes: true
     php_loc:
-
+    php_mess_detector:
+        allow_failures: true
 complete:
\ No newline at end of file