Merge pull request #20120 from kamil-tekiela/Remove-duplicate-Server-element

MauricioFauth · web-flow · commit e704c8118ef1 · 2026-02-17T18:48:32.000-03:00
Remove duplicate 'Server' element
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -14313,12 +14313,6 @@ parameters:
 			count: 5
 			path: tests/unit/ConfigStorage/RelationTest.php
 
-		-
-			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertArrayHasKey\(\) with ''Server'' and array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, SuhosinDisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\} will always evaluate to false\.$#'
-			identifier: staticMethod.impossibleType
-			count: 1
-			path: tests/unit/ConfigTest.php
-
 		-
 			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertIsArray\(\) with array\<int\<1, max\>, array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\> will always evaluate to true\.$#'
 			identifier: staticMethod.alreadyNarrowedType
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -113,11 +113,6 @@
     </UnusedVariable>
   </file>
   <file src="src/Config.php">
-    <InvalidPropertyAssignmentValue>
-      <code><![CDATA[$this->settings]]></code>
-      <code><![CDATA[$this->settings]]></code>
-      <code><![CDATA[$this->settings]]></code>
-    </InvalidPropertyAssignmentValue>
     <MixedAssignment>
       <code><![CDATA[$array[$part]]]></code>
     </MixedAssignment>
@@ -9172,10 +9167,6 @@
     </TypeDoesNotContainType>
   </file>
   <file src="tests/unit/ConfigTest.php">
-    <InvalidArrayOffset>
-      <code><![CDATA[$config->settings['Server']]]></code>
-      <code><![CDATA[$config->settings['Server']]]></code>
-    </InvalidArrayOffset>
     <PossiblyInvalidArgument>
       <code><![CDATA[testIsHttps]]></code>
       <code><![CDATA[testIsHttps]]></code>
diff --git a/src/Config.php b/src/Config.php
@@ -635,17 +635,14 @@ public function selectServer(mixed $serverParamFromRequest): int
         if (isset($this->config->Servers[$serverNumber])) {
             $this->hasSelectedServer = true;
             $this->selectedServer = $this->config->Servers[$serverNumber]->asArray();
-            $this->settings['Server'] = $this->selectedServer;
         } elseif (isset($this->config->Servers[$this->config->ServerDefault])) {
             $this->hasSelectedServer = true;
             $serverNumber = $this->config->ServerDefault;
             $this->selectedServer = $this->config->Servers[$this->config->ServerDefault]->asArray();
-            $this->settings['Server'] = $this->selectedServer;
         } else {
             $this->hasSelectedServer = false;
             $serverNumber = 0;
             $this->selectedServer = (new Server())->asArray();
-            $this->settings['Server'] = [];
         }
 
         $this->server = $serverNumber;
diff --git a/tests/unit/ConfigTest.php b/tests/unit/ConfigTest.php
@@ -425,16 +425,13 @@ public function testSelectServer(array $settings, string|array $request, int $ex
         $selectedServer = $config->selectServer($request);
         self::assertSame($expected, $selectedServer);
         self::assertGreaterThanOrEqual(0, $selectedServer);
-        self::assertArrayHasKey('Server', $config->settings);
         self::assertSame($expected, $config->server);
         if ($expected >= 1) {
             self::assertTrue($config->hasSelectedServer());
             $expectedServer = $config->config->Servers[$expected]->asArray();
-            self::assertSame($expectedServer, $config->settings['Server']);
             self::assertSame($expectedServer, $config->selectedServer);
         } else {
             self::assertFalse($config->hasSelectedServer());
-            self::assertSame([], $config->settings['Server']);
             self::assertSame((new Server())->asArray(), $config->selectedServer);
         }
     }
