Remove trigger_error from Config::checkServers()

MauricioFauth · MauricioFauth · commit ab80bd8730c9 · 2023-02-14T16:36:06.000-03:00
Silent removes invalid server keys.

Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
@@ -57,12 +57,10 @@
 use function substr;
 use function sys_get_temp_dir;
 use function time;
-use function trigger_error;
 use function trim;
 
 use const ARRAY_FILTER_USE_KEY;
 use const DIRECTORY_SEPARATOR;
-use const E_USER_ERROR;
 use const PHP_OS;
 use const PHP_URL_PATH;
 use const PHP_URL_SCHEME;
@@ -1164,10 +1162,7 @@ public function checkServers(): void
         foreach ($this->settings['Servers'] as $server_index => $each_server) {
             // Detect wrong configuration
             if (! is_int($server_index) || $server_index < 1) {
-                trigger_error(
-                    sprintf(__('Invalid server index: %s'), $server_index),
-                    E_USER_ERROR
-                );
+                continue;
             }
 
             $each_server = array_merge($this->defaultServer, $each_server);
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -291,7 +291,6 @@
       <code>$gd_nfo['GD Version']</code>
       <code>$path</code>
       <code>$server['verbose']</code>
-      <code>$server_index</code>
       <code>$this-&gt;settings['Servers']</code>
       <code>$this-&gt;settings['ThemeDefault']</code>
       <code>$this-&gt;settings['ThemeDefault']</code>
@@ -16570,10 +16569,6 @@
     </DeprecatedMethod>
   </file>
   <file src="test/classes/ConfigTest.php">
-    <DeprecatedMethod>
-      <code>expectError</code>
-      <code>expectErrorMessage</code>
-    </DeprecatedMethod>
     <InvalidArgument>
       <code>$v</code>
     </InvalidArgument>
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
@@ -1110,18 +1110,16 @@ public static function serverSettingsProvider(): array
         ];
     }
 
-    /**
-     * @group with-trigger-error
-     */
     public function testCheckServersWithInvalidServer(): void
     {
-        $this->expectError();
-        $this->expectErrorMessage('Invalid server index: invalid');
-
-        $this->object->settings['Servers'] = ['invalid' => ['host' => '127.0.0.1'], 1 => ['host' => '127.0.0.1']];
+        $server = ['host' => '127.0.0.1'];
+        $this->object->settings['Servers'] = ['invalid' => $server, 0 => $server, 1 => $server];
         $this->object->checkServers();
-        $expected = array_merge($this->object->defaultServer, ['host' => '127.0.0.1']);
+        $expected = array_merge($this->object->defaultServer, $server);
 
+        $this->assertArrayNotHasKey('invalid', $this->object->settings['Servers']);
+        $this->assertArrayNotHasKey(0, $this->object->settings['Servers']);
+        $this->assertArrayHasKey(1, $this->object->settings['Servers']);
         $this->assertEquals($expected, $this->object->settings['Servers'][1]);
     }
 
