Add Symfony 7 compatibility (#56)

* Update docker image * Update symfony components and psalm * Configure cs fixer --------- Co-authored-by: Christian Kolb <[email protected]>
digital-craftsman-de · Mar 5, 2024 · a447476 · a447476
1 parent 17454e8
commit a447476
Show file tree

Hide file tree

Showing 4 changed files with 657 additions and 906 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -11,7 +11,7 @@
 
         // Automatically adds trailing commas in multiline
         'trailing_comma_in_multiline' => [
-            'elements' =>[
+            'elements' => [
                 'arrays',
                 'arguments',
                 'parameters',
@@ -33,6 +33,13 @@
             'less_and_greater' => false,
             'always_move_variable' => true,
         ],
+
+        // Add spaces around union and intersection types
+        'types_spaces' => [
+            'space' => 'single',
+        ],
+
+        // Nullable types should be explicit even with default values
+        'nullable_type_declaration_for_default_null_value' => false,
     ])
-    ->setFinder($finder)
-    ;
+    ->setFinder($finder);
diff --git a/composer.json b/composer.json
@@ -4,13 +4,13 @@
   "type": "symfony-bundle",
   "require": {
     "php": "8.2.*|8.3.*",
-    "symfony/framework-bundle": "^6.3",
-    "symfony/serializer": "^6.3",
+    "symfony/framework-bundle": "^6.3|^7.0",
+    "symfony/serializer": "^6.3|^7.0",
     "doctrine/dbal": "^2.13.8|^3.3.6",
     "symfony/polyfill-uuid": "^1.26"
   },
   "require-dev": {
-    "vimeo/psalm": "^4.12",
+    "vimeo/psalm": "^5.17",
     "friendsofphp/php-cs-fixer": "^3.3",
     "phpunit/phpunit": "^9.5",
     "infection/infection": "^0.26.15",