Merge branch '7.0' into 7.1

* 7.0: fix merge fix constraint
symfony · Mar 19, 2024 · 9ba818e · 9ba818e
2 parents e6ae9d0 + e8fbd7d
commit 9ba818e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/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",

diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -885,7 +885,7 @@ public function testSamePropertyAsMethod()
 
     public function testSamePropertyAsMethodWithPropertySerializedName()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
         $this->normalizer->setSerializer($this->serializer);
 
@@ -902,7 +902,7 @@ public function testSamePropertyAsMethodWithPropertySerializedName()
 
     public function testSamePropertyAsMethodWithMethodSerializedName()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
         $this->normalizer->setSerializer($this->serializer);