Fix tests regarding outdated error expectations

Author: leonardfischer

tests/Idoit/APIClient/APITest.php

@@ -327,7 +327,7 @@ public function testInvalidBatchRequest($request) {
         foreach ($response as $result) {
             $this->isError($result);
             $this->assertNull($result['id']);
-            $this->assertSame(-32600, $result['error']['code']);
+            $this->assertSame(-32604, $result['error']['code']); // <-- Previously 'Invalid request' -32600
         }
     }
 
@@ -347,7 +347,7 @@ public function testRequestWithMissingParameters() {
         $this->assertIsArray($response);
         $this->isError($response);
         $this->hasValidJSONRPCIdentifier($request, $response);
-        $this->assertSame(-32602, $response['error']['code']);
+        $this->assertSame(-32604, $response['error']['code']); // <-- Previously 'Invalid params' -32602
     }
 
     /**
@@ -385,7 +385,7 @@ public function testRequestWithInvalidParameters($parameters) {
         $this->assertIsArray($response);
         $this->isError($response);
         $this->hasValidJSONRPCIdentifier($request, $response);
-        $this->assertSame(-32602, $response['error']['code']);
+        $this->assertSame(-32604, $response['error']['code']); // <-- Previously 'Invalid params' -32602
     }
 
     /**
@@ -406,7 +406,7 @@ public function testRequestWithMissingApiKey() {
         $this->assertIsArray($response);
         $this->isError($response);
         $this->hasValidJSONRPCIdentifier($request, $response);
-        $this->assertSame(-32099, $response['error']['code']);
+        $this->assertSame(-32604, $response['error']['code']); // <-- Previously 'System error' -32099
     }
 
     /**
@@ -449,7 +449,7 @@ public function testRequestWithInvalidApiKeys($apiKey) {
         $this->assertIsArray($response);
         $this->isError($response);
         $this->hasValidJSONRPCIdentifier($request, $response);
-        $this->assertSame(-32099, $response['error']['code']);
+        $this->assertSame(-32604, $response['error']['code']); // <-- Previously 'System error' -32099
     }
 
     /**

tests/Idoit/APIClient/BaseTest.php

@@ -741,14 +741,8 @@ protected function isIDAsString(string $value) {
     protected function isConstant(string $value) {
         $this->assertNotEmpty($value);
 
-        // @todo Remove this method switch if PHPunit >= v9 is in use:
-        if (method_exists($this, 'assertMatchesRegularExpression')) {
-            $this->assertMatchesRegularExpression('/([A-Z0-9_]+)/', $value);
-            $this->assertMatchesRegularExpression('/^([A-Z]+)/', $value);
-        } else {
-            $this->assertRegExp('/([A-Z0-9_]+)/', $value);
-            $this->assertRegExp('/^([A-Z]+)/', $value);
-        }
+        $this->assertMatchesRegularExpression('/([A-Z0-9_]+)/', $value);
+        $this->assertMatchesRegularExpression('/^([A-Z]+)/', $value);
     }
 
     protected function isValidResponse(array $response, array $request) {