Replace or improve use of 'for'

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
phpmyadmin · Jan 12, 2019 · 7685733 · 7685733
1 parent dd74c49
commit 7685733
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php
@@ -659,7 +659,7 @@ private function _extractPartitionDetails()
 
         $partitionDetails['partitions'] = [];
 
-        for ($i = 0; $i < intval($partitionDetails['partition_count']); $i++) {
+        for ($i = 0, $iMax = (int) $partitionDetails['partition_count']; $i < $iMax; $i++) {
             if (! isset($stmt->partitions[$i])) {
                 $partitionDetails['partitions'][$i] = [
                     'name' => 'p' . $i,
@@ -704,7 +704,7 @@ private function _extractPartitionDetails()
                 $partition['subpartition_count'] = $partitionDetails['subpartition_count'];
                 $partition['subpartitions'] = [];
 
-                for ($j = 0; $j < intval($partitionDetails['subpartition_count']); $j++) {
+                for ($j = 0, $jMax = (int) $partitionDetails['subpartition_count']; $j < $jMax; $j++) {
                     if (! isset($stmt->partitions[$i]->subpartitions[$j])) {
                         $partition['subpartitions'][$j] = [
                             'name' => $partition['name'] . '_s' . $j,

diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
@@ -1235,7 +1235,7 @@ public function buildSql(
             $inTables = false;
         }
 
-        $params = ['db' => (string) $db_name];
+        $params = ['db' => $db_name];
         $db_url = 'db_structure.php' . Url::getCommon($params);
         $db_ops_url = 'db_operations.php' . Url::getCommon($params);
 
@@ -1271,19 +1271,18 @@ public function buildSql(
 
         unset($params);
 
-        $num_tables = count($tables);
-        for ($i = 0; $i < $num_tables; ++$i) {
+        foreach ($tables as $table) {
             $params = [
-                'db' => (string) $db_name,
-                'table' => (string) $tables[$i][self::TBL_NAME],
+                'db' => $db_name,
+                'table' => (string) $table[self::TBL_NAME],
             ];
             $tbl_url = 'sql.php' . Url::getCommon($params);
             $tbl_struct_url = 'tbl_structure.php' . Url::getCommon($params);
             $tbl_ops_url = 'tbl_operations.php' . Url::getCommon($params);
 
             unset($params);
 
-            $_table = new Table($tables[$i][self::TBL_NAME], $db_name);
+            $_table = new Table($table[self::TBL_NAME], $db_name);
             if (! $_table->isView()) {
                 $message .= sprintf(
                     '<li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">' . __(
@@ -1293,22 +1292,22 @@ public function buildSql(
                     sprintf(
                         __('Go to table: %s'),
                         htmlspecialchars(
-                            Util::backquote($tables[$i][self::TBL_NAME])
+                            Util::backquote($table[self::TBL_NAME])
                         )
                     ),
-                    htmlspecialchars($tables[$i][self::TBL_NAME]),
+                    htmlspecialchars($table[self::TBL_NAME]),
                     $tbl_struct_url,
                     sprintf(
                         __('Structure of %s'),
                         htmlspecialchars(
-                            Util::backquote($tables[$i][self::TBL_NAME])
+                            Util::backquote($table[self::TBL_NAME])
                         )
                     ),
                     $tbl_ops_url,
                     sprintf(
                         __('Edit settings for %s'),
                         htmlspecialchars(
-                            Util::backquote($tables[$i][self::TBL_NAME])
+                            Util::backquote($table[self::TBL_NAME])
                         )
                     )
                 );
@@ -1319,10 +1318,10 @@ public function buildSql(
                     sprintf(
                         __('Go to view: %s'),
                         htmlspecialchars(
-                            Util::backquote($tables[$i][self::TBL_NAME])
+                            Util::backquote($table[self::TBL_NAME])
                         )
                     ),
-                    htmlspecialchars($tables[$i][self::TBL_NAME])
+                    htmlspecialchars($table[self::TBL_NAME])
                 );
             }
         }

diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php
@@ -431,7 +431,7 @@ private function _delimiterReplace($replace, $subject)
         $partial_separator = false;
 
         // Parse text char by char
-        for ($i = 0; $i < strlen($subject); $i++) {
+        for ($i = 0, $iMax = strlen($subject); $i < $iMax; $i++) {
             $cur_char = $subject[$i];
             // Check for separators
             if ($cur_char == '|') {

diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
@@ -3548,10 +3548,7 @@ public static function getGISDatatypes($upper_case = false)
             'geometrycollection',
         ];
         if ($upper_case) {
-            for ($i = 0, $nb = count($gis_data_types); $i < $nb; $i++) {
-                $gis_data_types[$i]
-                    = mb_strtoupper($gis_data_types[$i]);
-            }
+            $gis_data_types = array_map('mb_strtoupper', $gis_data_types);
         }
         return $gis_data_types;
     }