Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 56ce31d19127 · 2024-06-28T09:59:05.000+02:00
* 5.4:
  [HttpClient][Mailer] Revert "Let curl handle transfer encoding", use HTTP/1.1 for Mailgun
  Reviewed Catalan missing translations
  Fix typo: synchronous -&gt; synchronously
  [Serializer] Check if exception message in test is correct
  Ibexa is sponsoring Symfony 5.4, thanks to them! \o/
  [String] Add `alias` case to `EnglishInflector`
diff --git a/Tests/Fixtures/NotNormalizableDummy.php b/Tests/Fixtures/NotNormalizableDummy.php
@@ -26,6 +26,6 @@ public function __construct()
 
     public function denormalize(DenormalizerInterface $denormalizer, $data, ?string $format = null, array $context = []): void
     {
-        throw new NotNormalizableValueException();
+        throw new NotNormalizableValueException('Custom exception message');
     }
 }
diff --git a/Tests/Normalizer/AbstractObjectNormalizerTest.php b/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -888,6 +888,7 @@ public function testDenormalizeUntypedFormat()
     public function testDenormalizeUntypedFormatNotNormalizable()
     {
         $this->expectException(NotNormalizableValueException::class);
+        $this->expectExceptionMessage('Custom exception message');
         $serializer = new Serializer([new CustomNormalizer(), new ObjectNormalizer(null, null, null, new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]))]);
         $serializer->denormalize(['value' => 'test'], DummyWithNotNormalizable::class, 'xml');
     }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ public function __construct()`
`26`	`26`
`27`	`27`	`public function denormalize(DenormalizerInterface $denormalizer, $data, ?string $format = null, array $context = []): void`
`28`	`28`	`{`
`29`		`- throw new NotNormalizableValueException();`
	`29`	`+ throw new NotNormalizableValueException('Custom exception message');`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -888,6 +888,7 @@ public function testDenormalizeUntypedFormat()`
`888`	`888`	`public function testDenormalizeUntypedFormatNotNormalizable()`
`889`	`889`	`{`
`890`	`890`	`$this->expectException(NotNormalizableValueException::class);`
	`891`	`+ $this->expectExceptionMessage('Custom exception message');`
`891`	`892`	`$serializer = new Serializer([new CustomNormalizer(), new ObjectNormalizer(null, null, null, new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]))]);`
`892`	`893`	`$serializer->denormalize(['value' => 'test'], DummyWithNotNormalizable::class, 'xml');`
`893`	`894`	`}`