Merge pull request #18688 from kamil-tekiela/Fix-ChangeController

MauricioFauth · web-flow · commit 73844a974d35 · 2023-09-04T17:02:52.000-03:00
Fix ChangeController
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5255,11 +5255,6 @@ parameters:
 			count: 2
 			path: src/Controllers/Table/AddFieldController.php
 
-		-
-			message: "#^Parameter \\#2 \\$numFields of method PhpMyAdmin\\\\Table\\\\ColumnsDefinition\\:\\:displayForm\\(\\) expects int, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Table/AddFieldController.php
-
 		-
 			message: "#^Parameter \\#2 \\$sqlQuery of static method PhpMyAdmin\\\\Html\\\\Generator\\:\\:getMessage\\(\\) expects string\\|null, mixed given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -3234,7 +3234,6 @@
     <InvalidArrayOffset>
       <code><![CDATA[$GLOBALS['active_page']]]></code>
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
-      <code><![CDATA[$GLOBALS['num_fields']]]></code>
       <code><![CDATA[$GLOBALS['regenerate']]]></code>
       <code><![CDATA[$GLOBALS['result']]]></code>
     </InvalidArrayOffset>
@@ -3248,7 +3247,6 @@
     <MixedAssignment>
       <code><![CDATA[$GLOBALS['active_page']]]></code>
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
-      <code><![CDATA[$GLOBALS['num_fields']]]></code>
       <code><![CDATA[$GLOBALS['regenerate']]]></code>
       <code><![CDATA[$GLOBALS['result']]]></code>
     </MixedAssignment>
@@ -3972,16 +3970,10 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="src/Controllers/Table/Structure/ChangeController.php">
-    <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['num_fields']]]></code>
-    </InvalidArrayOffset>
     <MixedArgumentTypeCoercion>
       <code>$selected</code>
       <code><![CDATA[[$request->getParam('field')]]]></code>
     </MixedArgumentTypeCoercion>
-    <MixedAssignment>
-      <code><![CDATA[$GLOBALS['num_fields']]]></code>
-    </MixedAssignment>
   </file>
   <file src="src/Controllers/Table/Structure/MoveColumnsController.php">
     <MixedArgument>
diff --git a/src/Controllers/Table/AddFieldController.php b/src/Controllers/Table/AddFieldController.php
@@ -51,7 +51,6 @@ public function __invoke(ServerRequest $request): void
         $GLOBALS['errorUrl'] ??= null;
         $GLOBALS['message'] ??= null;
         $GLOBALS['active_page'] ??= null;
-        $GLOBALS['num_fields'] ??= null;
         $GLOBALS['regenerate'] ??= null;
         $GLOBALS['result'] ??= null;
 
@@ -81,15 +80,15 @@ public function __invoke(ServerRequest $request): void
                 $_POST['field_where'] = $_POST['orig_field_where'];
             }
 
-            $GLOBALS['num_fields'] = min(
+            $numFields = min(
                 intval($_POST['orig_num_fields']) + intval($_POST['added_fields']),
                 4096,
             );
             $GLOBALS['regenerate'] = true;
         } elseif (is_numeric($numberOfFields) && $numberOfFields > 0) {
-            $GLOBALS['num_fields'] = min(4096, (int) $numberOfFields);
+            $numFields = min(4096, (int) $numberOfFields);
         } else {
-            $GLOBALS['num_fields'] = 1;
+            $numFields = 1;
         }
 
         if (isset($_POST['do_save_data'])) {
@@ -201,15 +200,11 @@ public function __invoke(ServerRequest $request): void
 
         $this->addScriptFiles(['vendor/jquery/jquery.uitablefilter.js']);
 
-        if (! $this->checkParameters(['server', 'db', 'table', 'num_fields'])) {
+        if (! $this->checkParameters(['server', 'db', 'table'])) {
             return;
         }
 
-        $templateData = $this->columnsDefinition->displayForm(
-            '/table/add-field',
-            $GLOBALS['num_fields'],
-            $GLOBALS['regenerate'],
-        );
+        $templateData = $this->columnsDefinition->displayForm('/table/add-field', $numFields, $GLOBALS['regenerate']);
 
         $this->render('columns_definitions/column_definitions_form', $templateData);
     }
diff --git a/src/Controllers/Table/Structure/ChangeController.php b/src/Controllers/Table/Structure/ChangeController.php
@@ -34,11 +34,11 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        if ($request->getParam('change_column') !== null) {
-            if (! $this->checkParameters(['server', 'db', 'table', 'num_fields'])) {
-                return;
-            }
+        if (! $this->checkParameters(['server', 'db', 'table'])) {
+            return;
+        }
 
+        if ($request->getParam('change_column') !== null) {
             $this->displayHtmlForColumnChange([$request->getParam('field')]);
 
             return;
@@ -53,10 +53,6 @@ public function __invoke(ServerRequest $request): void
             return;
         }
 
-        if (! $this->checkParameters(['server', 'db', 'table', 'num_fields'])) {
-            return;
-        }
-
         $this->displayHtmlForColumnChange($selected);
     }
 
@@ -67,8 +63,6 @@ public function __invoke(ServerRequest $request): void
      */
     private function displayHtmlForColumnChange(array $selected): void
     {
-        $GLOBALS['num_fields'] ??= null;
-
         $fieldsMeta = $this->dbi->getColumns($GLOBALS['db'], $GLOBALS['table'], true);
         $fieldsMeta = array_values(array_filter(
             $fieldsMeta,
@@ -87,8 +81,6 @@ private function displayHtmlForColumnChange(array $selected): void
             'Comment' => $column->comment,
         ], $fieldsMeta);
 
-        $GLOBALS['num_fields'] = count($fieldsMeta);
-
         /**
          * Form for changing properties.
          */
@@ -99,7 +91,7 @@ private function displayHtmlForColumnChange(array $selected): void
 
         $templateData = $this->columnsDefinition->displayForm(
             '/table/structure/save',
-            $GLOBALS['num_fields'],
+            count($fieldsMeta),
             null,
             $selected,
             $fieldsMeta,
diff --git a/test/classes/Controllers/Table/AddFieldControllerTest.php b/test/classes/Controllers/Table/AddFieldControllerTest.php
@@ -30,7 +30,6 @@ public function testInvoke(): void
         $_POST = [
             'db' => 'test_db',
             'table' => 'test_table',
-            'num_fields' => '1',
             'field_where' => 'after',
             'after_field' => 'datetimefield',
         ];
