Fix Psalm, Phpstan and unit tests.

Author: niconoe-

src/Tools/ContextGenerator.php

@@ -13,7 +13,7 @@
 use function basename;
 use function count;
 use function dirname;
-use function file;
+use function end;
 use function file_put_contents;
 use function implode;
 use function ksort;
@@ -169,14 +169,8 @@ public static function sortWords(array &$arr)
      */
     public static function readWords(array $files)
     {
-        $wordsByFile = array_map(
-            static function (string $file): array {
-                return file($file);
-            },
-            $files
-        );
         /** @psalm-var list<string> $words */
-        $words = array_merge(...$wordsByFile);
+        $words = array_merge(...array_map('\\file', $files));
 
         /** @var array<string, int> $types */
         $types = [];
@@ -290,7 +284,7 @@ public static function formatName($name)
     {
         /* Split name and version */
         $parts = [];
-        if (preg_match('/([^[0-9]*)([0-9]*)/', $name, $parts) === false) {
+        if (preg_match('/^(\D+)(\d+)$/', $name, $parts) === 0) {
             return $name;
         }
 
@@ -311,10 +305,10 @@ public static function formatName($name)
             $versionString = '0' . $versionString;
         }
 
-        $version = array_map('intval', str_split($versionString, 2));
+        $version = array_map('\\intval', str_split($versionString, 2));
         /* Remove trailing zero */
-        if ($version[count($version) - 1] === 0) {
-            $version = array_slice($version, 0, count($version) - 1);
+        if (end($version) === 0) {
+            $version = array_slice($version, 0, -1);
         }
 
         /* Create name */

tests/Tools/ContextGeneratorTest.php

@@ -15,6 +15,9 @@ class ContextGeneratorTest extends TestCase
 {
     public function testFormatName(): void
     {
+        $name = ContextGenerator::formatName('00InvalidFormat00');
+        $this->assertEquals('00InvalidFormat00', $name);
+
         $name = ContextGenerator::formatName('MySql80000');
         $this->assertEquals('MySQL 8.0', $name);
 
@@ -23,6 +26,9 @@ public function testFormatName(): void
 
         $name = ContextGenerator::formatName('MariaDb100000');
         $this->assertEquals('MariaDB 10.0', $name);
+
+        $name = ContextGenerator::formatName('FutureDBMS45784012500');
+        $this->assertEquals('FutureDBMS 4.57.84.1.25', $name);
     }
 
     public function testSortWords(): void

tests/Tools/contexts/testContext.txt

@@ -1,14 +1,16 @@
 RESERVED (R)
-RESERVED2 (R)
-RESERVED3 (R)
-RESERVED4 (R)
-RESERVED5 (R)
+ RESERVED2 (R)
+  RESERVED3 (R)
+ RESERVED4 (R)
+reserved5 (R)
 
 FUNCTION (F)
 DATATYPE (D)
 KEYWORD (K)
 
+ 	 
+
 NO_FLAG
 COMPOSED KEYWORD
 
-FUNCTION
+FUNCTION