Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 6561d539e3b5 · 2026-04-29T20:17:56.000+02:00
* 7.4:
  Fix merge
  Revert "[PropertyAccess] Add InvalidTypeException thrown on type mismatch"
  [PropertyAccess] Add InvalidTypeException thrown on type mismatch
  [FrameworkBundle][TwigBridge] Bump symfony/mime requirement
diff --git a/Tests/Normalizer/ObjectNormalizerTest.php b/Tests/Normalizer/ObjectNormalizerTest.php
@@ -533,7 +533,7 @@ public function testTypeMismatchOnTypedPropertyIsCollectedAsDenormalizationError
             $this->assertInstanceOf(NotNormalizableValueException::class, $error);
             $this->assertSame('name', $error->getPath());
             $this->assertSame('array', $error->getCurrentType());
-            $this->assertSame(['string'], $error->getExpectedTypes());
+            $this->assertSame([class_exists(InvalidTypeException::class) ? 'string' : 'unknown'], $error->getExpectedTypes());
         }
     }
 
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "symfony/http-kernel": "^7.4|^8.0",
         "symfony/messenger": "^7.4|^8.0",
         "symfony/mime": "^7.4|^8.0",
-        "symfony/property-access": "^7.4|^8.0",
+        "symfony/property-access": "^7.4.9|^8.0.9",
         "symfony/property-info": "^7.4|^8.0",
         "symfony/translation-contracts": "^2.5|^3",
         "symfony/type-info": "^7.4|^8.0",
@@ -47,6 +47,7 @@
     "conflict": {
         "phpdocumentor/reflection-docblock": "<5.2|>=7",
         "phpdocumentor/type-resolver": "<1.5.1",
+        "symfony/property-access": "<7.4.9|>=8.0,<8.0.9",
         "symfony/property-info": "<7.4",
         "symfony/type-info": "<7.4"
     },

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ public function testTypeMismatchOnTypedPropertyIsCollectedAsDenormalizationError`
`533`	`533`	`$this->assertInstanceOf(NotNormalizableValueException::class, $error);`
`534`	`534`	`$this->assertSame('name', $error->getPath());`
`535`	`535`	`$this->assertSame('array', $error->getCurrentType());`
`536`		`- $this->assertSame(['string'], $error->getExpectedTypes());`
	`536`	`+ $this->assertSame([class_exists(InvalidTypeException::class) ? 'string' : 'unknown'], $error->getExpectedTypes());`
`537`	`537`	`}`
`538`	`538`	`}`
`539`	`539`