Remove unneeded writing to $_POST in Database\Structure controllers

MauricioFauth · MauricioFauth · commit 46fdea0d0e30 · 2022-10-12T18:07:10.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php
@@ -36,8 +36,6 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $selected = $_POST['selected'] ?? [];
 
         $GLOBALS['sql_query'] = '';
@@ -55,10 +53,6 @@ public function __invoke(ServerRequest $request): void
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         ($this->structureController)($request);
     }
 }
diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableController.php b/libraries/classes/Controllers/Database/Structure/CopyTableController.php
@@ -36,8 +36,6 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $selected = $_POST['selected'] ?? [];
         $targetDb = $_POST['target_db'] ?? null;
         $selectedCount = count($selected);
@@ -63,10 +61,6 @@ public function __invoke(ServerRequest $request): void
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         ($this->structureController)($request);
     }
 }
diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php
@@ -32,8 +32,6 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $selected = $_POST['selected'] ?? [];
         $fromPrefix = $_POST['from_prefix'] ?? null;
         $toPrefix = $_POST['to_prefix'] ?? null;
@@ -58,10 +56,6 @@ public function __invoke(ServerRequest $request): void
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         ($this->structureController)($request);
     }
 }
diff --git a/libraries/classes/Controllers/Database/Structure/DropTableController.php b/libraries/classes/Controllers/Database/Structure/DropTableController.php
@@ -45,8 +45,6 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $GLOBALS['reload'] = $_POST['reload'] ?? $GLOBALS['reload'] ?? null;
         $multBtn = $_POST['mult_btn'] ?? '';
         $selected = $_POST['selected'] ?? [];
@@ -56,10 +54,6 @@ public function __invoke(ServerRequest $request): void
         if ($multBtn !== __('Yes')) {
             $GLOBALS['message'] = Message::success(__('No change'));
 
-            if (empty($_POST['message'])) {
-                $_POST['message'] = Message::success();
-            }
-
             unset($_POST['mult_btn']);
 
             ($this->structureController)($request);
@@ -121,10 +115,6 @@ public function __invoke(ServerRequest $request): void
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         unset($_POST['mult_btn']);
 
         ($this->structureController)($request);
diff --git a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php
@@ -64,8 +64,6 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $multBtn = $_POST['mult_btn'] ?? '';
         $selected = $_POST['selected'] ?? [];
 
@@ -107,10 +105,6 @@ public function __invoke(ServerRequest $request): void
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         unset($_POST['mult_btn']);
 
         ($this->structureController)($request);
diff --git a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php
@@ -38,8 +38,6 @@ public function __construct(
 
     public function __invoke(ServerRequest $request): void
     {
-        $GLOBALS['message'] = $GLOBALS['message'] ?? null;
-
         $selected = $_POST['selected'] ?? [];
         $fromPrefix = $_POST['from_prefix'] ?? '';
         $toPrefix = $_POST['to_prefix'] ?? '';
@@ -67,10 +65,6 @@ public function __invoke(ServerRequest $request): void
 
         $GLOBALS['message'] = Message::success();
 
-        if (empty($_POST['message'])) {
-            $_POST['message'] = $GLOBALS['message'];
-        }
-
         ($this->structureController)($request);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ public function __construct(`
`36`	`36`
`37`	`37`	`public function __invoke(ServerRequest $request): void`
`38`	`38`	`{`
`39`		`- $GLOBALS['message'] = $GLOBALS['message'] ?? null;`
`40`		`-`
`41`	`39`	`$selected = $_POST['selected'] ?? [];`
`42`	`40`
`43`	`41`	`$GLOBALS['sql_query'] = '';`
`@@ -55,10 +53,6 @@ public function __invoke(ServerRequest $request): void`
`55`	`53`
`56`	`54`	`$GLOBALS['message'] = Message::success();`
`57`	`55`
`58`		`- if (empty($_POST['message'])) {`
`59`		`- $_POST['message'] = $GLOBALS['message'];`
`60`		`- }`
`61`		`-`
`62`	`56`	`($this->structureController)($request);`
`63`	`57`	`}`
`64`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ public function __construct(`
`32`	`32`
`33`	`33`	`public function __invoke(ServerRequest $request): void`
`34`	`34`	`{`
`35`		`- $GLOBALS['message'] = $GLOBALS['message'] ?? null;`
`36`		`-`
`37`	`35`	`$selected = $_POST['selected'] ?? [];`
`38`	`36`	`$fromPrefix = $_POST['from_prefix'] ?? null;`
`39`	`37`	`$toPrefix = $_POST['to_prefix'] ?? null;`
`@@ -58,10 +56,6 @@ public function __invoke(ServerRequest $request): void`
`58`	`56`
`59`	`57`	`$GLOBALS['message'] = Message::success();`
`60`	`58`
`61`		`- if (empty($_POST['message'])) {`
`62`		`- $_POST['message'] = $GLOBALS['message'];`
`63`		`- }`
`64`		`-`
`65`	`59`	`($this->structureController)($request);`
`66`	`60`	`}`
`67`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ public function __construct(`
`38`	`38`
`39`	`39`	`public function __invoke(ServerRequest $request): void`
`40`	`40`	`{`
`41`		`- $GLOBALS['message'] = $GLOBALS['message'] ?? null;`
`42`		`-`
`43`	`41`	`$selected = $_POST['selected'] ?? [];`
`44`	`42`	`$fromPrefix = $_POST['from_prefix'] ?? '';`
`45`	`43`	`$toPrefix = $_POST['to_prefix'] ?? '';`
`@@ -67,10 +65,6 @@ public function __invoke(ServerRequest $request): void`
`67`	`65`
`68`	`66`	`$GLOBALS['message'] = Message::success();`
`69`	`67`
`70`		`- if (empty($_POST['message'])) {`
`71`		`- $_POST['message'] = $GLOBALS['message'];`
`72`		`- }`
`73`		`-`
`74`	`68`	`($this->structureController)($request);`
`75`	`69`	`}`
`76`	`70`	`}`