Merge branch '7.0' into 7.1

* 7.0:
  fix merge
  fix constraint

Author: xabbuh

composer.json

@@ -29,7 +29,7 @@
         "symfony/dependency-injection": "^6.4|^7.0",
         "symfony/doctrine-messenger": "^6.4|^7.0",
         "symfony/expression-language": "^6.4|^7.0",
-        "symfony/form": "^6.4.6|^7.0",
+        "symfony/form": "^6.4.6|^7.0.6",
         "symfony/http-kernel": "^6.4|^7.0",
         "symfony/lock": "^6.4|^7.0",
         "symfony/messenger": "^6.4|^7.0",
@@ -53,7 +53,7 @@
         "doctrine/orm": "<2.15",
         "symfony/cache": "<6.4",
         "symfony/dependency-injection": "<6.4",
-        "symfony/form": "<6.4.6",
+        "symfony/form": "<6.4.6|>=7,<7.0.6",
         "symfony/http-foundation": "<6.4",
         "symfony/http-kernel": "<6.4",
         "symfony/lock": "<6.4",