Merge pull request #679 from MauricioFauth/phpunit-warning

Fix PHPUnit warning in FormatterTest

Author: MauricioFauth

composer.json

@@ -74,7 +74,7 @@
         ],
         "update:baselines": [
             "@php phpstan analyse --generate-baseline",
-            "@php psalm --set-baseline=psalm-baseline.xml"
+            "@php psalm --no-cache --threads=max --set-baseline=psalm-baseline.xml"
         ]
     },
     "config": {

src/Utils/FormattingOptions.php

@@ -7,9 +7,6 @@
 use PhpMyAdmin\SqlParser\Token;
 use PhpMyAdmin\SqlParser\TokenType;
 
-use function strtolower;
-use function strtoupper;
-
 use const PHP_SAPI;
 
 final class FormattingOptions
@@ -71,14 +68,14 @@ public static function getDefaultFormats(): array
                 'flags' => Token::FLAG_KEYWORD_RESERVED,
                 'html' => 'sql-reserved',
                 'cli' => "\x1b[35m",
-                'function' => strtoupper(...),
+                'function' => 'strtoupper',
             ],
             [
                 'type' => TokenType::Keyword,
                 'flags' => 0,
                 'html' => 'sql-keyword',
                 'cli' => "\x1b[95m",
-                'function' => strtoupper(...),
+                'function' => 'strtoupper',
             ],
             [
                 'type' => TokenType::Comment,
@@ -92,14 +89,14 @@ public static function getDefaultFormats(): array
                 'flags' => 0,
                 'html' => 'sql-atom',
                 'cli' => "\x1b[36m",
-                'function' => strtoupper(...),
+                'function' => 'strtoupper',
             ],
             [
                 'type' => TokenType::Number,
                 'flags' => 0,
                 'html' => 'sql-number',
                 'cli' => "\x1b[92m",
-                'function' => strtolower(...),
+                'function' => 'strtolower',
             ],
             [
                 'type' => TokenType::String,

tests/Utils/FormatterTest.php

@@ -11,62 +11,60 @@
 use PhpMyAdmin\SqlParser\Utils\FormattingOptions;
 use PHPUnit\Framework\Attributes\DataProvider;
 
-use function strtoupper;
-
 class FormatterTest extends TestCase
 {
     public function testMergeFormats(): void
     {
         $object = new FormattingOptions(formats: []);
-        self::assertEquals($object->formats, FormattingOptions::getDefaultFormats());
+        self::assertSame($object->formats, FormattingOptions::getDefaultFormats());
 
         $object = new FormattingOptions(formats: [
             [
                 'type' => TokenType::Keyword,
                 'flags' => Token::FLAG_KEYWORD_RESERVED,
                 'html' => 'sql-foo',
                 'cli' => "\x1b[35m",
-                'function' => strtoupper(...),
+                'function' => 'strtoupper',
             ],
             [
                 'type' => TokenType::Keyword,
                 'flags' => 0,
                 'html' => 'sql-bar',
                 'cli' => "\x1b[95m",
-                'function' => strtoupper(...),
+                'function' => 'strtoupper',
             ],
             [
                 'type' => TokenType::Keyword,
                 'flags' => Token::FLAG_KEYWORD_COMPOSED,
                 'html' => 'sql-baz',
                 'cli' => "\x1b[95m",
-                'function' => strtoupper(...),
+                'function' => 'strtoupper',
             ],
 
         ]);
 
-        self::assertContainsEquals([
+        self::assertContains([
             'type' => TokenType::Keyword,
             'flags' => Token::FLAG_KEYWORD_RESERVED,
             'html' => 'sql-foo',
             'cli' => "\x1b[35m",
-            'function' => strtoupper(...),
+            'function' => 'strtoupper',
         ], $object->formats);
 
-        self::assertContainsEquals([
+        self::assertContains([
             'type' => TokenType::Keyword,
             'flags' => 0,
             'html' => 'sql-bar',
             'cli' => "\x1b[95m",
-            'function' => strtoupper(...),
+            'function' => 'strtoupper',
         ], $object->formats);
 
-        self::assertContainsEquals([
+        self::assertContains([
             'type' => TokenType::Keyword,
             'flags' => Token::FLAG_KEYWORD_COMPOSED,
             'html' => 'sql-baz',
             'cli' => "\x1b[95m",
-            'function' => strtoupper(...),
+            'function' => 'strtoupper',
         ], $object->formats);
     }