Merge branch '6.4' into 7.0

* 6.4:
  synchronize require-dev and conflict sections
  [AssetMapper] Normalizing path in test to fix / \ comparison in Windows

Author: fabpot

composer.json

@@ -90,6 +90,7 @@
         "symfony/mime": "<6.4",
         "symfony/property-info": "<6.4",
         "symfony/property-access": "<6.4",
+        "symfony/scheduler": "<6.4",
         "symfony/serializer": "<6.4",
         "symfony/security-csrf": "<6.4",
         "symfony/security-core": "<6.4",