Remove IS_TRANSFORMATION_WRAPPER constant

MauricioFauth · MauricioFauth · commit e16682d57a2c · 2022-03-09T21:59:06.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Controllers/Transformation/WrapperController.php b/libraries/classes/Controllers/Transformation/WrapperController.php
@@ -16,7 +16,6 @@
 use PhpMyAdmin\Util;
 
 use function __;
-use function define;
 use function htmlspecialchars;
 use function in_array;
 use function intval;
@@ -54,11 +53,11 @@ public function __construct(
 
     public function __invoke(): void
     {
-        define('IS_TRANSFORMATION_WRAPPER', true);
+        $this->response->getHeader()->setIsTransformationWrapper(true);
 
         $relationParameters = $this->relation->getRelationParameters();
 
-        DbTableExists::check($GLOBALS['db'], $GLOBALS['table']);
+        DbTableExists::check($GLOBALS['db'], $GLOBALS['table'], true);
 
         /**
          * Sets globals from $_REQUEST
diff --git a/libraries/classes/DbTableExists.php b/libraries/classes/DbTableExists.php
@@ -14,13 +14,13 @@ final class DbTableExists
     /**
      * Ensure the database and the table exist (else move to the "parent" script) and display headers.
      */
-    public static function check(string $db, string $table): void
+    public static function check(string $db, string $table, bool $isTransformationWrapper = false): void
     {
-        self::checkDatabase($db);
-        self::checkTable($db, $table);
+        self::checkDatabase($db, $isTransformationWrapper);
+        self::checkTable($db, $table, $isTransformationWrapper);
     }
 
-    private static function checkDatabase(string $db): void
+    private static function checkDatabase(string $db, bool $isTransformationWrapper): void
     {
         if (! empty($GLOBALS['is_db'])) {
             return;
@@ -31,7 +31,7 @@ private static function checkDatabase(string $db): void
             $GLOBALS['is_db'] = @$GLOBALS['dbi']->selectDb($db);
         }
 
-        if ($GLOBALS['is_db'] || defined('IS_TRANSFORMATION_WRAPPER')) {
+        if ($GLOBALS['is_db'] || $isTransformationWrapper) {
             return;
         }
 
@@ -65,7 +65,7 @@ private static function checkDatabase(string $db): void
         exit;
     }
 
-    private static function checkTable(string $db, string $table): void
+    private static function checkTable(string $db, string $table, bool $isTransformationWrapper): void
     {
         if (! empty($GLOBALS['is_table']) || defined('PMA_SUBMIT_MULT') || defined('TABLE_MAY_BE_ABSENT')) {
             return;
@@ -86,7 +86,7 @@ private static function checkTable(string $db, string $table): void
             return;
         }
 
-        if (defined('IS_TRANSFORMATION_WRAPPER')) {
+        if ($isTransformationWrapper) {
             exit;
         }
 
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
@@ -97,6 +97,9 @@ class Header
     /** @var Template */
     private $template;
 
+    /** @var bool */
+    private $isTransformationWrapper = false;
+
     /**
      * Creates a new class instance
      */
@@ -522,7 +525,10 @@ private function getHttpHeaders(): array
 
         $headers = array_merge($headers, Core::getNoCacheHeaders());
 
-        if (! defined('IS_TRANSFORMATION_WRAPPER')) {
+        /**
+         * A different Content-Type is set in {@see \PhpMyAdmin\Controllers\Transformation\WrapperController}.
+         */
+        if (! $this->isTransformationWrapper) {
             // Define the charset to be used
             $headers['Content-Type'] = 'text/html; charset=utf-8';
         }
@@ -666,4 +672,9 @@ private function getVariablesForJavaScript(): string
             'max_input_vars' => $maxInputVarsValue,
         ]);
     }
+
+    public function setIsTransformationWrapper(bool $isTransformationWrapper): void
+    {
+        $this->isTransformationWrapper = $isTransformationWrapper;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,13 @@ final class DbTableExists`
`14`	`14`	`/**`
`15`	`15`	`* Ensure the database and the table exist (else move to the "parent" script) and display headers.`
`16`	`16`	`*/`
`17`		`- public static function check(string $db, string $table): void`
	`17`	`+ public static function check(string $db, string $table, bool $isTransformationWrapper = false): void`
`18`	`18`	`{`
`19`		`- self::checkDatabase($db);`
`20`		`- self::checkTable($db, $table);`
	`19`	`+ self::checkDatabase($db, $isTransformationWrapper);`
	`20`	`+ self::checkTable($db, $table, $isTransformationWrapper);`
`21`	`21`	`}`
`22`	`22`
`23`		`- private static function checkDatabase(string $db): void`
	`23`	`+ private static function checkDatabase(string $db, bool $isTransformationWrapper): void`
`24`	`24`	`{`
`25`	`25`	`if (! empty($GLOBALS['is_db'])) {`
`26`	`26`	`return;`
`@@ -31,7 +31,7 @@ private static function checkDatabase(string $db): void`
`31`	`31`	`$GLOBALS['is_db'] = @$GLOBALS['dbi']->selectDb($db);`
`32`	`32`	`}`
`33`	`33`
`34`		`- if ($GLOBALS['is_db'] \|\| defined('IS_TRANSFORMATION_WRAPPER')) {`
	`34`	`+ if ($GLOBALS['is_db'] \|\| $isTransformationWrapper) {`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`	`37`
`@@ -65,7 +65,7 @@ private static function checkDatabase(string $db): void`
`65`	`65`	`exit;`
`66`	`66`	`}`
`67`	`67`
`68`		`- private static function checkTable(string $db, string $table): void`
	`68`	`+ private static function checkTable(string $db, string $table, bool $isTransformationWrapper): void`
`69`	`69`	`{`
`70`	`70`	`if (! empty($GLOBALS['is_table']) \|\| defined('PMA_SUBMIT_MULT') \|\| defined('TABLE_MAY_BE_ABSENT')) {`
`71`	`71`	`return;`
`@@ -86,7 +86,7 @@ private static function checkTable(string $db, string $table): void`
`86`	`86`	`return;`
`87`	`87`	`}`
`88`	`88`
`89`		`- if (defined('IS_TRANSFORMATION_WRAPPER')) {`
	`89`	`+ if ($isTransformationWrapper) {`
`90`	`90`	`exit;`
`91`	`91`	`}`
`92`	`92`