diff --git a/ci/php-cs-fixer/config.php b/ci/php-cs-fixer/config.php
index 8567404d..59dc9edf 100644
--- a/ci/php-cs-fixer/config.php
+++ b/ci/php-cs-fixer/config.php
@@ -4,6 +4,7 @@
 
 use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
 
 $basePath = __DIR__.'/../../';
 
@@ -13,9 +14,7 @@
     ->in($basePath.'src')
     ->in($basePath.'tests');
 
-$config = new Config();
-
-return $config
+$config = (new Config())
     ->setRules(
         [
             '@PSR2' => true,
@@ -54,6 +53,13 @@
     )
     ->setRiskyAllowed(true)
     ->setUsingCache(false)
+
     ->setIndent('    ')
     ->setLineEnding("\n")
     ->setFinder($finder);
+
+if (\method_exists($config, 'setParallelConfig')) {
+    $config->setParallelConfig(ParallelConfigFactory::detect());
+}
+
+return $config;
diff --git a/composer.json b/composer.json
index 49842cef..c7daab01 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,7 @@
             "deptrac analyze --config-file=./ci/deptrac/config.yml --cache-file=./ci/deptrac/.cache --no-interaction --no-progress"
         ],
         "php-cs-fixer": [
-            "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --config=./ci/php-cs-fixer/config.php --show-progress=none --no-interaction --diff -v"
+            "php-cs-fixer fix --config=./ci/php-cs-fixer/config.php --allow-unsupported-php-version=yes --show-progress=none --no-interaction --diff -v"
         ],
         "phpstan": [
             "phpstan analyse --configuration=./ci/phpstan/config.neon"
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/JsonTransformer.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/JsonTransformer.php
index d1c75e84..7008f3af 100644
--- a/src/MartinGeorgiev/Doctrine/DBAL/Types/JsonTransformer.php
+++ b/src/MartinGeorgiev/Doctrine/DBAL/Types/JsonTransformer.php
@@ -32,7 +32,7 @@ protected function transformToPostgresJson(mixed $phpValue): string
         return $postgresValue;
     }
 
-    protected function transformFromPostgresJson(string $postgresValue): null|array|bool|float|int|string
+    protected function transformFromPostgresJson(string $postgresValue): array|bool|float|int|string|null
     {
         return PostgresJsonToPHPArrayTransformer::transformPostgresJsonEncodedValueToPHPValue($postgresValue);
     }
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/Jsonb.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/Jsonb.php
index 34e75385..6bdd73b7 100644
--- a/src/MartinGeorgiev/Doctrine/DBAL/Types/Jsonb.php
+++ b/src/MartinGeorgiev/Doctrine/DBAL/Types/Jsonb.php
@@ -42,7 +42,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
      *
      * @param string|null $value the value to convert
      */
-    public function convertToPHPValue($value, AbstractPlatform $platform): null|array|bool|float|int|string
+    public function convertToPHPValue($value, AbstractPlatform $platform): array|bool|float|int|string|null
     {
         if ($value === null) {
             return null;
diff --git a/src/MartinGeorgiev/Utils/PostgresJsonToPHPArrayTransformer.php b/src/MartinGeorgiev/Utils/PostgresJsonToPHPArrayTransformer.php
index da55e048..9718f188 100644
--- a/src/MartinGeorgiev/Utils/PostgresJsonToPHPArrayTransformer.php
+++ b/src/MartinGeorgiev/Utils/PostgresJsonToPHPArrayTransformer.php
@@ -53,7 +53,7 @@ public static function transformPostgresJsonEncodedValueToPHPArray(string $postg
     /**
      * @throws InvalidJsonItemForPHPException When the PostgreSQL value is not JSON-decodable
      */
-    public static function transformPostgresJsonEncodedValueToPHPValue(string $postgresValue): null|array|bool|float|int|string
+    public static function transformPostgresJsonEncodedValueToPHPValue(string $postgresValue): array|bool|float|int|string|null
     {
         try {
             // @phpstan-ignore-next-line
diff --git a/tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/JsonbTest.php b/tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/JsonbTest.php
index e09c9c2f..c68638a2 100644
--- a/tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/JsonbTest.php
+++ b/tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/JsonbTest.php
@@ -37,14 +37,14 @@ public function has_name(): void
 
     #[DataProvider('provideValidTransformations')]
     #[Test]
-    public function can_transform_from_php_value(null|array|bool|float|int|string $phpValue, ?string $postgresValue): void
+    public function can_transform_from_php_value(array|bool|float|int|string|null $phpValue, ?string $postgresValue): void
     {
         $this->assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
     }
 
     #[DataProvider('provideValidTransformations')]
     #[Test]
-    public function can_transform_to_php_value(null|array|bool|float|int|string $phpValue, ?string $postgresValue): void
+    public function can_transform_to_php_value(array|bool|float|int|string|null $phpValue, ?string $postgresValue): void
     {
         $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
     }
diff --git a/tests/Unit/MartinGeorgiev/Utils/PostgresJsonToPHPArrayTransformerTest.php b/tests/Unit/MartinGeorgiev/Utils/PostgresJsonToPHPArrayTransformerTest.php
index 65a4e8c4..aad9d8ac 100644
--- a/tests/Unit/MartinGeorgiev/Utils/PostgresJsonToPHPArrayTransformerTest.php
+++ b/tests/Unit/MartinGeorgiev/Utils/PostgresJsonToPHPArrayTransformerTest.php
@@ -15,7 +15,7 @@ class PostgresJsonToPHPArrayTransformerTest extends TestCase
 {
     #[DataProvider('provideValidJsonTransformations')]
     #[Test]
-    public function can_transform_json_to_php_value(null|array|bool|int|string $phpValue, string $postgresValue): void
+    public function can_transform_json_to_php_value(array|bool|int|string|null $phpValue, string $postgresValue): void
     {
         $this->assertEquals($phpValue, PostgresJsonToPHPArrayTransformer::transformPostgresJsonEncodedValueToPHPValue($postgresValue));
     }