Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit cf7fa38feb83 · 2022-03-26T01:39:57.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
@@ -491,10 +491,6 @@ public static function downloadHeader(
             $headers['Content-Length'] = (string) $length;
         }
 
-        if (defined('TESTSUITE')) {
-            return;
-        }
-
         foreach ($headers as $name => $value) {
             header(sprintf('%s: %s', $name, $value));
         }
diff --git a/test/classes/Controllers/Table/GetFieldControllerTest.php b/test/classes/Controllers/Table/GetFieldControllerTest.php
@@ -17,6 +17,10 @@
  */
 class GetFieldControllerTest extends AbstractTestCase
 {
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
     public function testGetFieldController(): void
     {
         $GLOBALS['db'] = 'test_db';
diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
@@ -14,6 +14,7 @@
 use function __;
 use function _pgettext;
 use function hash;
+use function header;
 use function htmlspecialchars;
 use function mb_strpos;
 use function ob_end_clean;
@@ -993,4 +994,56 @@ public function providerForTestPopulateRequestWithEncryptedQueryParamsWithInvali
             [['eq' => 'invalid'], []],
         ];
     }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     * @requires extension xdebug
+     */
+    public function testDownloadHeader(): void
+    {
+        $GLOBALS['config']->set('PMA_USR_BROWSER_AGENT', 'FIREFOX');
+
+        header('Cache-Control: private, max-age=10800');
+
+        Core::downloadHeader('test.sql', 'text/x-sql', 100, false);
+
+        // phpcs:disable SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
+        $headersList = \xdebug_get_headers();
+        // phpcs:enable
+
+        $this->assertContains('Cache-Control: private, max-age=10800', $headersList);
+        $this->assertContains('Content-Description: File Transfer', $headersList);
+        $this->assertContains('Content-Disposition: attachment; filename="test.sql"', $headersList);
+        $this->assertContains('Content-type: text/x-sql;charset=UTF-8', $headersList);
+        $this->assertContains('Content-Transfer-Encoding: binary', $headersList);
+        $this->assertContains('Content-Length: 100', $headersList);
+        $this->assertNotContains('Content-Encoding: gzip', $headersList);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     * @requires extension xdebug
+     */
+    public function testDownloadHeader2(): void
+    {
+        $GLOBALS['config']->set('PMA_USR_BROWSER_AGENT', 'FIREFOX');
+
+        header('Cache-Control: private, max-age=10800');
+
+        Core::downloadHeader('test.sql.gz', 'application/x-gzip', 0, false);
+
+        // phpcs:disable SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
+        $headersList = \xdebug_get_headers();
+        // phpcs:enable
+
+        $this->assertContains('Cache-Control: private, max-age=10800', $headersList);
+        $this->assertContains('Content-Description: File Transfer', $headersList);
+        $this->assertContains('Content-Disposition: attachment; filename="test.sql.gz"', $headersList);
+        $this->assertContains('Content-Type: application/x-gzip', $headersList);
+        $this->assertContains('Content-Encoding: gzip', $headersList);
+        $this->assertContains('Content-Transfer-Encoding: binary', $headersList);
+        $this->assertNotContains('Content-Length: 0', $headersList);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -491,10 +491,6 @@ public static function downloadHeader(`
`491`	`491`	`$headers['Content-Length'] = (string) $length;`
`492`	`492`	`}`
`493`	`493`
`494`		`- if (defined('TESTSUITE')) {`
`495`		`- return;`
`496`		`- }`
`497`		`-`
`498`	`494`	`foreach ($headers as $name => $value) {`
`499`	`495`	`header(sprintf('%s: %s', $name, $value));`
`500`	`496`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@`
`17`	`17`	`*/`
`18`	`18`	`class GetFieldControllerTest extends AbstractTestCase`
`19`	`19`	`{`
	`20`	`+ /**`
	`21`	`+ * @runInSeparateProcess`
	`22`	`+ * @preserveGlobalState disabled`
	`23`	`+ */`
`20`	`24`	`public function testGetFieldController(): void`
`21`	`25`	`{`
`22`	`26`	`$GLOBALS['db'] = 'test_db';`