Merge branch 'main' into renovate/major-github-actions

ci/php-cs-fixer/config.php

@@ -2,14 +2,17 @@
 
 declare(strict_types=1);
 
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
 $basePath = __DIR__.'/../../';
 
-$finder = PhpCsFixer\Finder::create()
+$finder = Finder::create()
     ->in($basePath.'ci')
     ->in($basePath.'src')
     ->in($basePath.'tests');
 
-$config = new PhpCsFixer\Config();
+$config = new Config();
 
 return $config
     ->setRules(

composer.json

@@ -46,11 +46,11 @@
         "doctrine/annotations": "^2.0",
         "doctrine/orm": "~2.5||~3.0",
         "ekino/phpstan-banned-code": "^1.0",
-        "friendsofphp/php-cs-fixer": "^3.46.0",
+        "friendsofphp/php-cs-fixer": "^3.48.0",
         "php-coveralls/php-coveralls": "^2.7.0",
         "phpstan/phpstan": "^1.10.56",
         "phpstan/phpstan-phpunit": "^1.3.15",
-        "phpunit/phpunit": "^10.5.7",
+        "phpunit/phpunit": "^10.5.8",
         "qossmic/deptrac-shim": "^1.0.2",
         "rector/rector": "^0.19",
         "symfony/cache": "^6.4||^7.0"

tests/MartinGeorgiev/Doctrine/DBAL/Types/TextArrayTest.php

@@ -51,15 +51,13 @@ public static function provideValidTransformations(): array
                     'and some here',
                     <<<'END'
 ''"quotes"'' ain't no """worry""", '''right''' Alexander O'Vechkin?
-END
-                    ,
+END,
                     'back-slashing\double-slashing\\\hooking though',
                     'and "double-quotes"',
                 ],
                 'postgresValue' => <<<'END'
 {1,2,"text","some text here","and some here","''\"quotes\"'' ain't no \"\"\"worry\"\"\", '''right''' Alexander O'Vechkin?","back-slashing\\double-slashing\\\\hooking though","and \"double-quotes\""}
-END
-                ,
+END,
             ],
         ];
     }