Inline the RelationController::updateForForeignKeys() method

MauricioFauth · MauricioFauth · commit e8c3985915a9 · 2023-09-04T17:05:03.000-03:00
This allows the removal of the ResponseRenderer::callExit() method.

Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -6386,7 +6386,7 @@ parameters:
 			path: src/Controllers/Table/RelationController.php
 
 		-
-			message: "#^Only booleans are allowed in \\|\\|, mixed given on the right side\\.$#"
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
 			count: 1
 			path: src/Controllers/Table/RelationController.php
 
diff --git a/src/Controllers/Table/RelationController.php b/src/Controllers/Table/RelationController.php
@@ -97,7 +97,47 @@ public function __invoke(ServerRequest $request): void
         }
 
         // updates for foreign keys
-        $this->updateForForeignKeys($table, $options, $relationsForeign);
+        $multiEditColumnsName = $_POST['foreign_key_fields_name'] ?? null;
+        $previewSqlData = '';
+        $seenError = false;
+
+        // (for now, one index name only; we keep the definitions if the
+        // foreign db is not the same)
+        if (
+            isset($_POST['destination_foreign_db'], $_POST['destination_foreign_table'])
+            && isset($_POST['destination_foreign_column'])
+        ) {
+            [$html, $previewSqlData, $displayQuery, $seenError] = $table->updateForeignKeys(
+                $_POST['destination_foreign_db'],
+                $multiEditColumnsName,
+                $_POST['destination_foreign_table'],
+                $_POST['destination_foreign_column'],
+                $options,
+                $GLOBALS['table'],
+                array_key_exists('foreign_keys_data', $relationsForeign)
+                    ? $relationsForeign['foreign_keys_data']
+                    : [],
+            );
+            $this->response->addHTML($html);
+        }
+
+        // If there is a request for SQL previewing.
+        if (isset($_POST['preview_sql'])) {
+            Core::previewSQL($previewSqlData);
+
+            return;
+        }
+
+        if (! empty($displayQuery) && ! $seenError) {
+            $GLOBALS['display_query'] = $displayQuery;
+            $this->response->addHTML(
+                Generator::getMessage(
+                    __('Your SQL query has been executed successfully.'),
+                    null,
+                    'success',
+                ),
+            );
+        }
 
         // Updates for display field
         if ($relationParameters->displayFeature !== null && isset($_POST['display_field'])) {
@@ -234,60 +274,6 @@ private function updateForDisplayField(Table $table, DisplayFeature $displayFeat
         );
     }
 
-    /**
-     * Update for FK
-     *
-     * @param Table   $table            Table
-     * @param mixed[] $options          Options
-     * @param mixed[] $relationsForeign External relations
-     */
-    private function updateForForeignKeys(Table $table, array $options, array $relationsForeign): void
-    {
-        $multiEditColumnsName = $_POST['foreign_key_fields_name'] ?? null;
-        $previewSqlData = '';
-        $seenError = false;
-
-        // (for now, one index name only; we keep the definitions if the
-        // foreign db is not the same)
-        if (
-            isset($_POST['destination_foreign_db'], $_POST['destination_foreign_table'])
-            && isset($_POST['destination_foreign_column'])
-        ) {
-            [$html, $previewSqlData, $displayQuery, $seenError] = $table->updateForeignKeys(
-                $_POST['destination_foreign_db'],
-                $multiEditColumnsName,
-                $_POST['destination_foreign_table'],
-                $_POST['destination_foreign_column'],
-                $options,
-                $GLOBALS['table'],
-                array_key_exists('foreign_keys_data', $relationsForeign)
-                    ? $relationsForeign['foreign_keys_data']
-                    : [],
-            );
-            $this->response->addHTML($html);
-        }
-
-        // If there is a request for SQL previewing.
-        if (isset($_POST['preview_sql'])) {
-            Core::previewSQL($previewSqlData);
-
-            $this->response->callExit();
-        }
-
-        if (empty($displayQuery) || $seenError) {
-            return;
-        }
-
-        $GLOBALS['display_query'] = $displayQuery;
-        $this->response->addHTML(
-            Generator::getMessage(
-                __('Your SQL query has been executed successfully.'),
-                null,
-                'success',
-            ),
-        );
-    }
-
     /**
      * Update for internal relation
      *

Original file line number	Diff line number	Diff line change
`@@ -6386,7 +6386,7 @@ parameters:`
`6386`	`6386`	`path: src/Controllers/Table/RelationController.php`
`6387`	`6387`
`6388`	`6388`	`-`
`6389`		`- message: "#^Only booleans are allowed in \\\|\\\|, mixed given on the right side\\.$#"`
	`6389`	`+ message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"`
`6390`	`6390`	`count: 1`
`6391`	`6391`	`path: src/Controllers/Table/RelationController.php`
`6392`	`6392`