From bea78f6b0bcb4e7ccefc2a275c7ececc62e675d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 7 May 2024 12:21:39 -0300
Subject: [PATCH] Remove ResponseRenderer::disable from
 Preferences\ManageController
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Creates a new Response object instead of using the response from
ResponseRenderer class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 app/services_controllers.php                  |  1 +
 .../Preferences/ManageController.php          | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/services_controllers.php b/app/services_controllers.php
index 14bdab3e78..195bd0daf6 100644
--- a/app/services_controllers.php
+++ b/app/services_controllers.php
@@ -588,6 +588,7 @@ return [
                 '$relation' => '@relation',
                 '$config' => '@config',
                 '$themeManager' => '@' . PhpMyAdmin\Theme\ThemeManager::class,
+                '$responseFactory' => '@' . ResponseFactory::class,
             ],
         ],
         Preferences\NavigationController::class => [
diff --git a/src/Controllers/Preferences/ManageController.php b/src/Controllers/Preferences/ManageController.php
index 355359f253..fb7878d681 100644
--- a/src/Controllers/Preferences/ManageController.php
+++ b/src/Controllers/Preferences/ManageController.php
@@ -11,6 +11,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\Controllers\InvocableController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\File;
+use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Message;
@@ -51,6 +52,7 @@ final class ManageController implements InvocableController
         private readonly Relation $relation,
         private readonly Config $config,
         private readonly ThemeManager $themeManager,
+        private readonly ResponseFactory $responseFactory,
     ) {
     }
 
@@ -69,29 +71,29 @@ final class ManageController implements InvocableController
         $GLOBALS['error'] = '';
         if ($request->hasBodyParam('submit_export') && $request->getParsedBodyParam('export_type') === 'text_file') {
             // export to JSON file
-            $this->response->disable();
+            $response = $this->responseFactory->createResponse();
             $filename = 'phpMyAdmin-config-' . urlencode(Core::getEnv('HTTP_HOST')) . '.json';
             Core::downloadHeader($filename, 'application/json');
             $settings = $this->userPreferences->load();
-            echo json_encode($settings['config_data'], JSON_PRETTY_PRINT);
 
-            return null;
+            return $response->write((string) json_encode($settings['config_data'], JSON_PRETTY_PRINT));
         }
 
         if ($request->hasBodyParam('submit_export') && $request->getParsedBodyParam('export_type') === 'php_file') {
-            // export to JSON file
-            $this->response->disable();
+            // export to PHP file
+            $response = $this->responseFactory->createResponse();
             $filename = 'phpMyAdmin-config-' . urlencode(Core::getEnv('HTTP_HOST')) . '.php';
             Core::downloadHeader($filename, 'application/php');
             $settings = $this->userPreferences->load();
-            echo '/* ' . __('phpMyAdmin configuration snippet') . " */\n\n";
-            echo '/* ' . __('Paste it to your config.inc.php') . " */\n\n";
+
+            $output = '/* ' . __('phpMyAdmin configuration snippet') . " */\n\n";
+            $output .= '/* ' . __('Paste it to your config.inc.php') . " */\n\n";
             foreach ($settings['config_data'] as $key => $val) {
-                echo '$cfg[\'' . str_replace('/', '\'][\'', $key) . '\'] = ';
-                echo var_export($val, true) . ";\n";
+                $output .= '$cfg[\'' . str_replace('/', '\'][\'', $key) . '\'] = ';
+                $output .= var_export($val, true) . ";\n";
             }
 
-            return null;
+            return $response->write($output);
         }
 
         if ($request->hasBodyParam('submit_get_json')) {