Fix TypeError in Server\ReplicationController class

Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17875

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

5 files changed, 13 insertions, 14 deletions

diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php
index 8d210a9ed4..0609e328bf 100644
--- a/libraries/classes/Controllers/Server/ReplicationController.php
+++ b/libraries/classes/Controllers/Server/ReplicationController.php
@@ -45,8 +45,7 @@ class ReplicationController extends AbstractController
         $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null;
         $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null;
 
-        /** @var bool|null $replClearScr */
-        $replClearScr = $request->getParsedBodyParam('repl_clear_scr');
+        $hasReplicaClearScreen = (bool) $request->getParsedBodyParam('replica_clear_screen');
         $replicaConfigure = $request->getParsedBodyParam('replica_configure');
         $primaryConfigure = $request->getParsedBodyParam('primary_configure');
 
@@ -106,7 +105,7 @@ class ReplicationController extends AbstractController
 
             $primaryReplicationHtml = $this->replicationGui->getHtmlForPrimaryReplication(
                 $primaryConnection,
-                $replClearScr,
+                $hasReplicaClearScreen,
                 $primaryAddUser,
                 $username,
                 $hostname
@@ -116,7 +115,7 @@ class ReplicationController extends AbstractController
         if ($primaryConfigure !== null) {
             $primaryConfigurationHtml = $this->replicationGui->getHtmlForPrimaryConfiguration();
         } else {
-            if ($replClearScr === null) {
+            if (! $hasReplicaClearScreen) {
                 $replicaConfigurationHtml = $this->replicationGui->getHtmlForReplicaConfiguration(
                     $primaryConnection,
                     $replicaInfo['status'],
@@ -137,7 +136,7 @@ class ReplicationController extends AbstractController
             'is_primary' => $primaryInfo['status'],
             'primary_configure' => $primaryConfigure,
             'replica_configure' => $replicaConfigure,
-            'clear_screen' => $replClearScr,
+            'clear_screen' => $hasReplicaClearScreen,
             'primary_replication_html' => $primaryReplicationHtml ?? '',
             'primary_configuration_html' => $primaryConfigurationHtml ?? '',
             'replica_configuration_html' => $replicaConfigurationHtml ?? '',
diff --git a/libraries/classes/ReplicationGui.php b/libraries/classes/ReplicationGui.php
index 8c72de9e98..766370248c 100644
--- a/libraries/classes/ReplicationGui.php
+++ b/libraries/classes/ReplicationGui.php
@@ -71,18 +71,18 @@ class ReplicationGui
      */
     public function getHtmlForPrimaryReplication(
         ?string $connection,
-        ?bool $replClearScr,
+        bool $hasReplicaClearScreen,
         ?string $primaryAddUser,
         ?string $username,
         ?string $hostname
     ): string {
-        if ($replClearScr === null) {
+        if (! $hasReplicaClearScreen) {
             $primaryStatusTable = $this->getHtmlForReplicationStatusTable($connection, 'primary', true, false);
             $replicas = $GLOBALS['dbi']->fetchResult('SHOW SLAVE HOSTS', null, null);
 
             $urlParams = $GLOBALS['urlParams'];
             $urlParams['primary_add_user'] = true;
-            $urlParams['repl_clear_scr'] = true;
+            $urlParams['replica_clear_screen'] = true;
         }
 
         if ($primaryAddUser !== null) {
@@ -90,7 +90,7 @@ class ReplicationGui
         }
 
         return $this->template->render('server/replication/primary_replication', [
-            'clear_screen' => $replClearScr !== null,
+            'clear_screen' => $hasReplicaClearScreen,
             'primary_status_table' => $primaryStatusTable ?? '',
             'replicas' => $replicas ?? [],
             'url_params' => $urlParams ?? [],
@@ -176,7 +176,7 @@ class ReplicationGui
 
             $urlParams = $GLOBALS['urlParams'];
             $urlParams['replica_configure'] = true;
-            $urlParams['repl_clear_scr'] = true;
+            $urlParams['replica_clear_screen'] = true;
 
             $reconfigurePrimaryLink = Url::getCommon($urlParams, '', false);
 
diff --git a/templates/server/replication/index.twig b/templates/server/replication/index.twig
index 78387876bb..309c4d061f 100644
--- a/templates/server/replication/index.twig
+++ b/templates/server/replication/index.twig
@@ -13,7 +13,7 @@
 
     {% if is_primary %}
       {{ primary_replication_html|raw }}
-    {% elseif primary_configure is null and clear_screen is null %}
+    {% elseif primary_configure is null and not clear_screen %}
       <div class="card mb-2">
         <div class="card-header">{% trans 'Primary replication' %}</div>
         <div class="card-body">
@@ -29,7 +29,7 @@
     {% if primary_configure is not null %}
       {{ primary_configuration_html|raw }}
     {% else %}
-      {% if clear_screen is null %}
+      {% if not clear_screen %}
         {{ replica_configuration_html|raw }}
       {% endif %}
       {% if replica_configure is not null %}
diff --git a/templates/server/replication/replica_configuration.twig b/templates/server/replication/replica_configuration.twig
index b6bad1c0a6..5054a78acf 100644
--- a/templates/server/replication/replica_configuration.twig
+++ b/templates/server/replication/replica_configuration.twig
@@ -102,7 +102,7 @@
   {% elseif not has_replica_configure %}
     {% apply format('<a href="' ~ url('/server/replication') ~ '" data-post="' ~ get_common(url_params|merge({
       'replica_configure': true,
-      'repl_clear_scr': true
+      'replica_clear_screen': true
     })) ~ '">', '</a>')|raw %}
       {% trans 'This server is not configured as replica in a replication process. Would you like to %sconfigure%s it?' %}
     {% endapply %}
diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php
index 49c084e8cc..9c621aa7c1 100644
--- a/test/classes/ReplicationGuiTest.php
+++ b/test/classes/ReplicationGuiTest.php
@@ -55,7 +55,7 @@ class ReplicationGuiTest extends AbstractTestCase
      */
     public function testGetHtmlForPrimaryReplication(): void
     {
-        $html = $this->replicationGui->getHtmlForPrimaryReplication(null, null, 'primary_add_user', null, null);
+        $html = $this->replicationGui->getHtmlForPrimaryReplication(null, false, 'primary_add_user', null, null);
 
         //validate 1: Primary replication
         $this->assertStringContainsString('<div class="card-header">Primary replication</div>', $html);