From b3df04bcf832cc2f8f21d4d43bb2f90f6ae0349f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@mfauth.net>
Date: Wed, 8 Jan 2025 02:26:18 -0300
Subject: [PATCH] Remove the buffer_needed global variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replaces it with Export::$bufferNeeded static property.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
---
 phpstan-baseline.neon                             | 2 +-
 psalm.xml                                         | 1 -
 src/Controllers/Export/ExportController.php       | 5 ++---
 src/Export/Export.php                             | 3 ++-
 tests/unit/Export/ExportTest.php                  | 4 ++--
 tests/unit/Plugins/Export/ExportCodegenTest.php   | 2 +-
 tests/unit/Plugins/Export/ExportCsvTest.php       | 4 ++--
 tests/unit/Plugins/Export/ExportExcelTest.php     | 4 ++--
 tests/unit/Plugins/Export/ExportHtmlwordTest.php  | 4 ++--
 tests/unit/Plugins/Export/ExportJsonTest.php      | 2 +-
 tests/unit/Plugins/Export/ExportLatexTest.php     | 2 +-
 tests/unit/Plugins/Export/ExportMediawikiTest.php | 2 +-
 tests/unit/Plugins/Export/ExportOdsTest.php       | 2 +-
 tests/unit/Plugins/Export/ExportOdtTest.php       | 2 +-
 tests/unit/Plugins/Export/ExportPdfTest.php       | 2 +-
 tests/unit/Plugins/Export/ExportPhparrayTest.php  | 2 +-
 tests/unit/Plugins/Export/ExportSqlTest.php       | 2 +-
 tests/unit/Plugins/Export/ExportTexytextTest.php  | 2 +-
 tests/unit/Plugins/Export/ExportXmlTest.php       | 2 +-
 tests/unit/Plugins/Export/ExportYamlTest.php      | 2 +-
 20 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 2391c332b3..884c46bc9e 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -7635,7 +7635,7 @@ parameters:
 		-
 			message: '#^Only booleans are allowed in an if condition, mixed given\.$#'
 			identifier: if.condNotBoolean
-			count: 3
+			count: 2
 			path: src/Export/Export.php
 
 		-
diff --git a/psalm.xml b/psalm.xml
index 66e2bc1b98..ee41655e36 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -39,7 +39,6 @@
 
     <globals>
         <var name="GLOBALS" type="array{
-            buffer_needed: bool,
             cached_affected_rows: int|numeric-string,
             charset: string,
             complete_query: string,
diff --git a/src/Controllers/Export/ExportController.php b/src/Controllers/Export/ExportController.php
index cd3874a66b..b7d236efb8 100644
--- a/src/Controllers/Export/ExportController.php
+++ b/src/Controllers/Export/ExportController.php
@@ -50,7 +50,6 @@ final class ExportController implements InvocableController
     public function __invoke(ServerRequest $request): Response
     {
         $GLOBALS['compression'] ??= null;
-        $GLOBALS['buffer_needed'] ??= null;
         $GLOBALS['file_handle'] ??= null;
         $GLOBALS['output_kanji_conversion'] ??= null;
         $GLOBALS['single_table'] ??= null;
@@ -120,7 +119,7 @@ final class ExportController implements InvocableController
          */
         $GLOBALS['compression'] = '';
         Export::$saveOnServer = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         $GLOBALS['save_filename'] = '';
         $GLOBALS['file_handle'] = '';
         $filename = '';
@@ -139,7 +138,7 @@ final class ExportController implements InvocableController
 
             if (in_array($compressionParam, $compressionMethods, true)) {
                 $GLOBALS['compression'] = $compressionParam;
-                $GLOBALS['buffer_needed'] = true;
+                Export::$bufferNeeded = true;
             }
 
             if (($isQuickExport && $quickExportOnServer) || (! $isQuickExport && $onServerParam)) {
diff --git a/src/Export/Export.php b/src/Export/Export.php
index dc5939128d..79065de102 100644
--- a/src/Export/Export.php
+++ b/src/Export/Export.php
@@ -77,6 +77,7 @@ class Export
     public static bool $asFile = false;
     public static bool $saveOnServer = false;
     public static bool $outputCharsetConversion = false;
+    public static bool $bufferNeeded = false;
 
     public function __construct(private DatabaseInterface $dbi)
     {
@@ -144,7 +145,7 @@ class Export
         }
 
         // If we have to buffer data, we will perform everything at once at the end
-        if ($GLOBALS['buffer_needed']) {
+        if (self::$bufferNeeded) {
             $this->dumpBuffer .= $line;
             if ($GLOBALS['onfly_compression']) {
                 $this->dumpBufferLength += strlen($line);
diff --git a/tests/unit/Export/ExportTest.php b/tests/unit/Export/ExportTest.php
index 123bbb75c1..691c24b0b3 100644
--- a/tests/unit/Export/ExportTest.php
+++ b/tests/unit/Export/ExportTest.php
@@ -99,7 +99,7 @@ class ExportTest extends AbstractTestCase
     public function testExportDatabase(): void
     {
         $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = false;
         Config::getInstance()->selectedServer['DisableIS'] = false;
 
@@ -156,7 +156,7 @@ SQL;
     public function testExportServer(): void
     {
         $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = false;
         $config = Config::getInstance();
         $config->selectedServer['DisableIS'] = false;
diff --git a/tests/unit/Plugins/Export/ExportCodegenTest.php b/tests/unit/Plugins/Export/ExportCodegenTest.php
index 2596ba2eba..51117fadfe 100644
--- a/tests/unit/Plugins/Export/ExportCodegenTest.php
+++ b/tests/unit/Plugins/Export/ExportCodegenTest.php
@@ -169,7 +169,7 @@ class ExportCodegenTest extends AbstractTestCase
     {
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
 
diff --git a/tests/unit/Plugins/Export/ExportCsvTest.php b/tests/unit/Plugins/Export/ExportCsvTest.php
index 2cd580c87e..f1bf277ca4 100644
--- a/tests/unit/Plugins/Export/ExportCsvTest.php
+++ b/tests/unit/Plugins/Export/ExportCsvTest.php
@@ -260,7 +260,7 @@ class ExportCsvTest extends AbstractTestCase
         // case 1
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = true;
         $GLOBALS['file_handle'] = null;
@@ -276,7 +276,7 @@ class ExportCsvTest extends AbstractTestCase
         // case 2
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
 
diff --git a/tests/unit/Plugins/Export/ExportExcelTest.php b/tests/unit/Plugins/Export/ExportExcelTest.php
index 66482a59bf..55a927edf6 100644
--- a/tests/unit/Plugins/Export/ExportExcelTest.php
+++ b/tests/unit/Plugins/Export/ExportExcelTest.php
@@ -221,7 +221,7 @@ class ExportExcelTest extends AbstractTestCase
         // case 1
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = true;
         $GLOBALS['file_handle'] = null;
@@ -237,7 +237,7 @@ class ExportExcelTest extends AbstractTestCase
         // case 2
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
 
diff --git a/tests/unit/Plugins/Export/ExportHtmlwordTest.php b/tests/unit/Plugins/Export/ExportHtmlwordTest.php
index dcc0f2eb77..5333a67aa9 100644
--- a/tests/unit/Plugins/Export/ExportHtmlwordTest.php
+++ b/tests/unit/Plugins/Export/ExportHtmlwordTest.php
@@ -64,7 +64,7 @@ class ExportHtmlwordTest extends AbstractTestCase
         );
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
         Current::$database = '';
@@ -294,7 +294,7 @@ class ExportHtmlwordTest extends AbstractTestCase
         // case 1
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
 
diff --git a/tests/unit/Plugins/Export/ExportJsonTest.php b/tests/unit/Plugins/Export/ExportJsonTest.php
index 0654d45cb2..23aaf72e58 100644
--- a/tests/unit/Plugins/Export/ExportJsonTest.php
+++ b/tests/unit/Plugins/Export/ExportJsonTest.php
@@ -37,7 +37,7 @@ class ExportJsonTest extends AbstractTestCase
         DatabaseInterface::$instance = $dbi;
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
         $this->object = new ExportJson(
diff --git a/tests/unit/Plugins/Export/ExportLatexTest.php b/tests/unit/Plugins/Export/ExportLatexTest.php
index 2344ac37d4..a68d8fb6a3 100644
--- a/tests/unit/Plugins/Export/ExportLatexTest.php
+++ b/tests/unit/Plugins/Export/ExportLatexTest.php
@@ -50,7 +50,7 @@ class ExportLatexTest extends AbstractTestCase
         DatabaseInterface::$instance = $dbi;
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
         ExportPlugin::$exportType = ExportType::Table;
diff --git a/tests/unit/Plugins/Export/ExportMediawikiTest.php b/tests/unit/Plugins/Export/ExportMediawikiTest.php
index 3ea545629d..27b062f535 100644
--- a/tests/unit/Plugins/Export/ExportMediawikiTest.php
+++ b/tests/unit/Plugins/Export/ExportMediawikiTest.php
@@ -45,7 +45,7 @@ class ExportMediawikiTest extends AbstractTestCase
         DatabaseInterface::$instance = $dbi;
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
         Current::$database = '';
diff --git a/tests/unit/Plugins/Export/ExportOdsTest.php b/tests/unit/Plugins/Export/ExportOdsTest.php
index 677c554dd5..9bab073ec6 100644
--- a/tests/unit/Plugins/Export/ExportOdsTest.php
+++ b/tests/unit/Plugins/Export/ExportOdsTest.php
@@ -54,7 +54,7 @@ class ExportOdsTest extends AbstractTestCase
         DatabaseInterface::$instance = $dbi;
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
         $this->object = new ExportOds(
diff --git a/tests/unit/Plugins/Export/ExportOdtTest.php b/tests/unit/Plugins/Export/ExportOdtTest.php
index fd37d5e05b..16c1cb289e 100644
--- a/tests/unit/Plugins/Export/ExportOdtTest.php
+++ b/tests/unit/Plugins/Export/ExportOdtTest.php
@@ -69,7 +69,7 @@ class ExportOdtTest extends AbstractTestCase
         DatabaseInterface::$instance = $this->dbi;
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
         ExportPlugin::$exportType = ExportType::Table;
diff --git a/tests/unit/Plugins/Export/ExportPdfTest.php b/tests/unit/Plugins/Export/ExportPdfTest.php
index 00a657f2a7..528faa6fea 100644
--- a/tests/unit/Plugins/Export/ExportPdfTest.php
+++ b/tests/unit/Plugins/Export/ExportPdfTest.php
@@ -40,7 +40,7 @@ class ExportPdfTest extends AbstractTestCase
         DatabaseInterface::$instance = $dbi;
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
         $this->object = new ExportPdf(
diff --git a/tests/unit/Plugins/Export/ExportPhparrayTest.php b/tests/unit/Plugins/Export/ExportPhparrayTest.php
index 727efe5e96..ac7aa5265f 100644
--- a/tests/unit/Plugins/Export/ExportPhparrayTest.php
+++ b/tests/unit/Plugins/Export/ExportPhparrayTest.php
@@ -40,7 +40,7 @@ class ExportPhparrayTest extends AbstractTestCase
         DatabaseInterface::$instance = $dbi;
         $GLOBALS['output_kanji_conversion'] = false;
         Export::$outputCharsetConversion = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = true;
         Export::$saveOnServer = false;
         Current::$database = '';
diff --git a/tests/unit/Plugins/Export/ExportSqlTest.php b/tests/unit/Plugins/Export/ExportSqlTest.php
index 3f69c4ad37..321b0ae8bc 100644
--- a/tests/unit/Plugins/Export/ExportSqlTest.php
+++ b/tests/unit/Plugins/Export/ExportSqlTest.php
@@ -68,7 +68,7 @@ class ExportSqlTest extends AbstractTestCase
         Current::$lang = 'en';
         Config::getInstance()->selectedServer['DisableIS'] = true;
         $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = false;
         Export::$saveOnServer = false;
         ExportPlugin::$exportType = ExportType::Table;
diff --git a/tests/unit/Plugins/Export/ExportTexytextTest.php b/tests/unit/Plugins/Export/ExportTexytextTest.php
index 4b27ddf554..df6765ff52 100644
--- a/tests/unit/Plugins/Export/ExportTexytextTest.php
+++ b/tests/unit/Plugins/Export/ExportTexytextTest.php
@@ -60,7 +60,7 @@ class ExportTexytextTest extends AbstractTestCase
         $this->dbi = $this->createDatabaseInterface($this->dummyDbi);
         DatabaseInterface::$instance = $this->dbi;
         $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = false;
         Export::$saveOnServer = false;
         ExportPlugin::$exportType = ExportType::Table;
diff --git a/tests/unit/Plugins/Export/ExportXmlTest.php b/tests/unit/Plugins/Export/ExportXmlTest.php
index 32aee2a782..3ce8fbe09d 100644
--- a/tests/unit/Plugins/Export/ExportXmlTest.php
+++ b/tests/unit/Plugins/Export/ExportXmlTest.php
@@ -44,7 +44,7 @@ class ExportXmlTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface();
         DatabaseInterface::$instance = $dbi;
         $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = false;
         Export::$saveOnServer = false;
         ExportPlugin::$exportType = ExportType::Table;
diff --git a/tests/unit/Plugins/Export/ExportYamlTest.php b/tests/unit/Plugins/Export/ExportYamlTest.php
index 928feb65ce..1b003935ab 100644
--- a/tests/unit/Plugins/Export/ExportYamlTest.php
+++ b/tests/unit/Plugins/Export/ExportYamlTest.php
@@ -39,7 +39,7 @@ class ExportYamlTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface();
         DatabaseInterface::$instance = $dbi;
         $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
+        Export::$bufferNeeded = false;
         Export::$asFile = false;
         Export::$saveOnServer = false;
         Current::$database = '';