Merge pull request joomla#96 from frankmayer/remove-callable-calls

Improvements joomla#1
wilsonge · Jun 26, 2017 · 705a71e · 705a71e
2 parents a332b87 + bc3865d
commit 705a71e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/DatabaseDriver.php b/src/DatabaseDriver.php
@@ -397,7 +397,7 @@ public static function splitSql($sql)
 
 						if ($comment && $start < $i)
 						{
-							$query = $query . substr($sql, $start, ($i - $start));
+							$query .= substr($sql, $start, ($i - $start));
 						}
 					}
 				}
@@ -412,7 +412,7 @@ public static function splitSql($sql)
 			{
 				if ($start <= $i)
 				{
-					$query = $query . substr($sql, $start, ($i - $start + 1));
+					$query .= substr($sql, $start, ($i - $start + 1));
 				}
 
 				$query = trim($query);
@@ -421,7 +421,7 @@ public static function splitSql($sql)
 				{
 					if (($i == $end - 1) && ($current != ';'))
 					{
-						$query = $query . ';';
+						$query .= ';';
 					}
 
 					$queries[] = $query;

diff --git a/src/Mysqli/MysqliDriver.php b/src/Mysqli/MysqliDriver.php
@@ -637,7 +637,7 @@ public function execute()
 					$bindParams = array();
 					$bindParams[] = &$typeString;
 
-					for ($i = 0; $i < count($params); $i++)
+					for ($i = 0, $iMax = count($params); $i < $iMax; $i++)
 					{
 						$bindParams[] = &$params[$i];
 					}

diff --git a/src/Pgsql/PgsqlDriver.php b/src/Pgsql/PgsqlDriver.php
@@ -821,7 +821,7 @@ public function replacePrefix($sql, $prefix = '#__')
 			{
 				$sql = explode('currval', $sql);
 
-				for ($nIndex = 1; $nIndex < count($sql); $nIndex = $nIndex + 2)
+				for ($nIndex = 1, $nIndexMax = count($sql); $nIndex < $nIndexMax; $nIndex += 2)
 				{
 					$sql[$nIndex] = str_replace($prefix, $this->tablePrefix, $sql[$nIndex]);
 				}
@@ -834,7 +834,7 @@ public function replacePrefix($sql, $prefix = '#__')
 			{
 				$sql = explode('nextval', $sql);
 
-				for ($nIndex = 1; $nIndex < count($sql); $nIndex = $nIndex + 2)
+				for ($nIndex = 1, $nIndexMax = count($sql); $nIndex < $nIndexMax; $nIndex += 2)
 				{
 					$sql[$nIndex] = str_replace($prefix, $this->tablePrefix, $sql[$nIndex]);
 				}
@@ -847,7 +847,7 @@ public function replacePrefix($sql, $prefix = '#__')
 			{
 				$sql = explode('setval', $sql);
 
-				for ($nIndex = 1; $nIndex < count($sql); $nIndex = $nIndex + 2)
+				for ($nIndex = 1, $nIndexMax = count($sql); $nIndex < $nIndexMax; $nIndex += 2)
 				{
 					$sql[$nIndex] = str_replace($prefix, $this->tablePrefix, $sql[$nIndex]);
 				}
@@ -857,7 +857,7 @@ public function replacePrefix($sql, $prefix = '#__')
 
 			$explodedQuery = explode('\'', $sql);
 
-			for ($nIndex = 0; $nIndex < count($explodedQuery); $nIndex = $nIndex + 2)
+			for ($nIndex = 0, $nIndexMax = count($explodedQuery); $nIndex < $nIndexMax; $nIndex += 2)
 			{
 				if (strpos($explodedQuery[$nIndex], $prefix))
 				{

diff --git a/src/Postgresql/PostgresqlDriver.php b/src/Postgresql/PostgresqlDriver.php
@@ -1417,7 +1417,7 @@ public function replacePrefix($sql, $prefix = '#__')
 			{
 				$sql = explode('currval', $sql);
 
-				for ($nIndex = 1; $nIndex < count($sql); $nIndex = $nIndex + 2)
+				for ($nIndex = 1, $nIndexMax = count($sql); $nIndex < $nIndexMax; $nIndex += 2)
 				{
 					$sql[$nIndex] = str_replace($prefix, $this->tablePrefix, $sql[$nIndex]);
 				}
@@ -1430,7 +1430,7 @@ public function replacePrefix($sql, $prefix = '#__')
 			{
 				$sql = explode('nextval', $sql);
 
-				for ($nIndex = 1; $nIndex < count($sql); $nIndex = $nIndex + 2)
+				for ($nIndex = 1, $nIndexMax = count($sql); $nIndex < $nIndexMax; $nIndex += 2)
 				{
 					$sql[$nIndex] = str_replace($prefix, $this->tablePrefix, $sql[$nIndex]);
 				}
@@ -1443,7 +1443,7 @@ public function replacePrefix($sql, $prefix = '#__')
 			{
 				$sql = explode('setval', $sql);
 
-				for ($nIndex = 1; $nIndex < count($sql); $nIndex = $nIndex + 2)
+				for ($nIndex = 1, $nIndexMax = count($sql); $nIndex < $nIndexMax; $nIndex += 2)
 				{
 					$sql[$nIndex] = str_replace($prefix, $this->tablePrefix, $sql[$nIndex]);
 				}
@@ -1453,7 +1453,7 @@ public function replacePrefix($sql, $prefix = '#__')
 
 			$explodedQuery = explode('\'', $sql);
 
-			for ($nIndex = 0; $nIndex < count($explodedQuery); $nIndex = $nIndex + 2)
+			for ($nIndex = 0, $nIndexMax = count($explodedQuery); $nIndex < $nIndexMax; $nIndex += 2)
 			{
 				if (strpos($explodedQuery[$nIndex], $prefix))
 				{