Merge branch '7.0' into 7.1

xabbuh · xabbuh · commit 9ba818e93c1d · 2024-03-19T10:40:36.000+01:00
* 7.0:
  fix merge
  fix constraint
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);
 

Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,7 @@ public function testSamePropertyAsMethod()`
`885`	`885`
`886`	`886`	`public function testSamePropertyAsMethodWithPropertySerializedName()`
`887`	`887`	`{`
`888`		`- $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));`
	`888`	`+ $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());`
`889`	`889`	`$this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));`
`890`	`890`	`$this->normalizer->setSerializer($this->serializer);`
`891`	`891`
`@@ -902,7 +902,7 @@ public function testSamePropertyAsMethodWithPropertySerializedName()`
`902`	`902`
`903`	`903`	`public function testSamePropertyAsMethodWithMethodSerializedName()`
`904`	`904`	`{`
`905`		`- $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));`
	`905`	`+ $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());`
`906`	`906`	`$this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));`
`907`	`907`	`$this->normalizer->setSerializer($this->serializer);`
`908`	`908`