Don't use function in for loop test.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
phpmyadmin · Dec 18, 2013 · 493f9c5 · 493f9c5 · lem9 · Dec 18, 2013
1 parent 8381c6e
commit 493f9c5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
@@ -879,7 +879,7 @@ private function _getOptionsZoom($dataLabel)
             . __("Use this column to label each point") . '</label></td>';
         $html_output .= '<td><select name="dataLabel" id="dataLabel" >'
             . '<option value = "">' . __('None') . '</option>';
-        for ($j = 0; $j < count($this->_columnNames); $j++) {
+        for ($j = 0, $nb = count($this->_columnNames); $j < $nb; $j++) {
             if (isset($dataLabel)
                 && $dataLabel == htmlspecialchars($this->_columnNames[$j])
             ) {
@@ -970,8 +970,8 @@ private function _getRowsNormal()
         $html_output = '';
         // for every column present in table
         for (
-            $column_index = 0;
-            $column_index < count($this->_columnNames);
+            $column_index = 0, $nb = count($this->_columnNames);
+            $column_index < $nb;
             $column_index++
         ) {
             $html_output .= '<tr class="noclick '

diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
@@ -547,7 +547,7 @@ public function selectDb($dbname, $link = null)
     public function realQuery($query, $link = null, $options = 0)
     {
         $query = trim(preg_replace('/  */', ' ', str_replace("\n", ' ', $query)));
-        for ($i = 0; $i < count($GLOBALS['dummy_queries']); $i++) {
+        for ($i = 0, $nb = count($GLOBALS['dummy_queries']); $i < $nb; $i++) {
             if ($GLOBALS['dummy_queries'][$i]['query'] != $query) {
                 continue;
             }

diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php
@@ -452,7 +452,7 @@ public static function isPointInsidePolygon($point, $polygon)
     public static function getPointOnSurface($ring)
     {
         // Find two consecutive distinct points.
-        for ($i = 0; $i < count($ring) - 1; $i++) {
+        for ($i = 0, $nb = count($ring) - 1; $i < $nb; $i++) {
             if ($ring[$i]['y'] != $ring[$i + 1]['y']) {
                 $x0 = $ring[$i]['x'];
                 $x1 = $ring[$i + 1]['x'];

diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
@@ -1543,7 +1543,7 @@ function PMA_getAfterInsertDropDown($where_clause, $after_insert, $found_unique_
         if (! is_array($where_clause)) {
             $where_clause = array($where_clause);
         }
-        for ($i = 0; $i < count($where_clause); $i++) {
+        for ($i = 0, $nb = count($where_clause); $i < $nb; $i++) {
             $is_numeric = preg_match(
                 '@^[\s]*`[^`]*`[\.]`[^`]*` = [0-9]+@',
                 $where_clause[$i]

diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
@@ -1152,7 +1152,7 @@ function PMA_RTN_getQueryFromRequest()
         $item_param_type = $_REQUEST['item_param_type'];
         $item_param_length = $_REQUEST['item_param_length'];
 
-        for ($i=0; $i < count($item_param_name); $i++) {
+        for ($i=0, $nb = count($item_param_name); $i < $nb; $i++) {
             if (! empty($item_param_name[$i])
                 && ! empty($item_param_type[$i])
             ) {

diff --git a/libraries/server_plugins.lib.php b/libraries/server_plugins.lib.php
@@ -182,7 +182,7 @@ function PMA_getModuleList($modules)
             $html .= '<td><b class="plugin-type">'
                 . htmlspecialchars($plugin_type) . '</b></td>';
             $html .= '<td>';
-            for ($i = 0; $i < count($plugin_list); $i++) {
+            for ($i = 0, $nb = count($plugin_list); $i < $nb; $i++) {
                 $html .= ($i != 0 ? '<br />' : '')
                     . htmlspecialchars($plugin_list[$i]['plugin_name']);
                 if (!$plugin_list[$i]['is_active']) {

diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php
@@ -121,7 +121,7 @@ private static function _getVarExport($var_name, $var_value, $crlf)
      */
     private static function _isZeroBasedArray(array $array)
     {
-        for ($i = 0; $i < count($array); $i++) {
+        for ($i = 0, $nb = count($array); $i < $nb; $i++) {
             if (! isset($array[$i])) {
                 return false;
             }