feature #50558 [Serializer] Remove abstract uid denormalization code (fancyweb)

nicolas-grekas · nicolas-grekas · commit 9a2d19fba8ff · 2023-06-05T18:07:59.000+02:00
This PR was merged into the 7.0 branch. Discussion ---------- [Serializer] Remove abstract uid denormalization code | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Removes the code that was deprecated in #44721 Commits ------- 79028f9 [Serializer] Remove abstract uid denormalization code
diff --git a/UPGRADE-7.0.md b/UPGRADE-7.0.md
@@ -5,4 +5,8 @@ Symfony 6.4 and Symfony 7.0 will be released simultaneously at the end of Novemb
 release process, both versions will have the same features, but Symfony 7.0 won't include any deprecated features.
 To upgrade, make sure to resolve all deprecation notices.
 
-This file will be updated on the branch 7.0 for each deprecated feature that is removed.
+Serializer
+----------
+
+* Remove denormalization support for `AbstractUid` in `UidNormalizer`, use one of `AbstractUid` child class instead
+* Denormalizing to an abstract class in `UidNormalizer` now throws an `\Error`
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+7.0
+---
+
+ * Remove denormalization support for `AbstractUid` in `UidNormalizer`, use one of `AbstractUid` child class instead
+ * Denormalizing to an abstract class in `UidNormalizer` now throws an `\Error`
+
 6.3
 ---
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Serializer\Exception\LogicException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Uid\AbstractUid;
-use Symfony\Component\Uid\Uuid;
 
 final class UidNormalizer implements NormalizerInterface, DenormalizerInterface, CacheableSupportsMethodInterface
 {
@@ -70,32 +69,14 @@ public function supportsNormalization(mixed $data, string $format = null, array
     public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
     {
         try {
-            if (AbstractUid::class === $type) {
-                trigger_deprecation('symfony/serializer', '6.1', 'Denormalizing to an abstract class in "%s" is deprecated.', __CLASS__);
-
-                return Uuid::fromString($data);
-            }
-
             return $type::fromString($data);
         } catch (\InvalidArgumentException|\TypeError) {
             throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The data is not a valid "%s" string representation.', $type), $data, [Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);
-        } catch (\Error $e) { // @deprecated remove this catch block in 7.0
-            if (str_starts_with($e->getMessage(), 'Cannot instantiate abstract class')) {
-                return $this->denormalize($data, AbstractUid::class, $format, $context);
-            }
-
-            throw $e;
         }
     }
 
     public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
     {
-        if (AbstractUid::class === $type) {
-            trigger_deprecation('symfony/serializer', '6.1', 'Supporting denormalization for the "%s" type in "%s" is deprecated, use one of "%s" child class instead.', AbstractUid::class, __CLASS__, AbstractUid::class);
-
-            return true;
-        }
-
         return is_subclass_of($type, AbstractUid::class, true);
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/UidNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/UidNormalizerTest.php
@@ -146,14 +146,9 @@ public function testSupportsDenormalizationForNonUid()
         $this->assertFalse($this->normalizer->supportsDenormalization('foo', \stdClass::class));
     }
 
-    /**
-     * @group legacy
-     */
     public function testSupportOurAbstractUid()
     {
-        $this->expectDeprecation('Since symfony/serializer 6.1: Supporting denormalization for the "Symfony\Component\Uid\AbstractUid" type in "Symfony\Component\Serializer\Normalizer\UidNormalizer" is deprecated, use one of "Symfony\Component\Uid\AbstractUid" child class instead.');
-
-        $this->assertTrue($this->normalizer->supportsDenormalization('1ea6ecef-eb9a-66fe-b62b-957b45f17e43', AbstractUid::class));
+        $this->assertFalse($this->normalizer->supportsDenormalization('1ea6ecef-eb9a-66fe-b62b-957b45f17e43', AbstractUid::class));
     }
 
     public function testSupportCustomAbstractUid()
@@ -169,22 +164,18 @@ public function testDenormalize($uuidString, $class)
         $this->assertEquals($class::fromString($uuidString), $this->normalizer->denormalize($uuidString, $class));
     }
 
-    /**
-     * @group legacy
-     */
     public function testDenormalizeOurAbstractUid()
     {
-        $this->expectDeprecation('Since symfony/serializer 6.1: Denormalizing to an abstract class in "Symfony\Component\Serializer\Normalizer\UidNormalizer" is deprecated.');
+        $this->expectException(\Error::class);
+        $this->expectExceptionMessage('Cannot call abstract method Symfony\Component\Uid\AbstractUid::fromString()');
 
         $this->assertEquals(Uuid::fromString($uuidString = '1ea6ecef-eb9a-66fe-b62b-957b45f17e43'), $this->normalizer->denormalize($uuidString, AbstractUid::class));
     }
 
-    /**
-     * @group legacy
-     */
     public function testDenormalizeCustomAbstractUid()
     {
-        $this->expectDeprecation('Since symfony/serializer 6.1: Denormalizing to an abstract class in "Symfony\Component\Serializer\Normalizer\UidNormalizer" is deprecated.');
+        $this->expectException(\Error::class);
+        $this->expectExceptionMessage('Cannot instantiate abstract class Symfony\Component\Serializer\Tests\Normalizer\TestAbstractCustomUid');
 
         $this->assertEquals(Uuid::fromString($uuidString = '1ea6ecef-eb9a-66fe-b62b-957b45f17e43'), $this->normalizer->denormalize($uuidString, TestAbstractCustomUid::class));
     }

Original file line number	Diff line number	Diff line change
`@@ -146,14 +146,9 @@ public function testSupportsDenormalizationForNonUid()`
`146`	`146`	`$this->assertFalse($this->normalizer->supportsDenormalization('foo', \stdClass::class));`
`147`	`147`	`}`
`148`	`148`
`149`		`- /**`
`150`		`- * @group legacy`
`151`		`- */`
`152`	`149`	`public function testSupportOurAbstractUid()`
`153`	`150`	`{`
`154`		`- $this->expectDeprecation('Since symfony/serializer 6.1: Supporting denormalization for the "Symfony\Component\Uid\AbstractUid" type in "Symfony\Component\Serializer\Normalizer\UidNormalizer" is deprecated, use one of "Symfony\Component\Uid\AbstractUid" child class instead.');`
`155`		`-`
`156`		`- $this->assertTrue($this->normalizer->supportsDenormalization('1ea6ecef-eb9a-66fe-b62b-957b45f17e43', AbstractUid::class));`
	`151`	`+ $this->assertFalse($this->normalizer->supportsDenormalization('1ea6ecef-eb9a-66fe-b62b-957b45f17e43', AbstractUid::class));`
`157`	`152`	`}`
`158`	`153`
`159`	`154`	`public function testSupportCustomAbstractUid()`
`@@ -169,22 +164,18 @@ public function testDenormalize($uuidString, $class)`
`169`	`164`	`$this->assertEquals($class::fromString($uuidString), $this->normalizer->denormalize($uuidString, $class));`
`170`	`165`	`}`
`171`	`166`
`172`		`- /**`
`173`		`- * @group legacy`
`174`		`- */`
`175`	`167`	`public function testDenormalizeOurAbstractUid()`
`176`	`168`	`{`
`177`		`- $this->expectDeprecation('Since symfony/serializer 6.1: Denormalizing to an abstract class in "Symfony\Component\Serializer\Normalizer\UidNormalizer" is deprecated.');`
	`169`	`+ $this->expectException(\Error::class);`
	`170`	`+ $this->expectExceptionMessage('Cannot call abstract method Symfony\Component\Uid\AbstractUid::fromString()');`
`178`	`171`
`179`	`172`	`$this->assertEquals(Uuid::fromString($uuidString = '1ea6ecef-eb9a-66fe-b62b-957b45f17e43'), $this->normalizer->denormalize($uuidString, AbstractUid::class));`
`180`	`173`	`}`
`181`	`174`
`182`		`- /**`
`183`		`- * @group legacy`
`184`		`- */`
`185`	`175`	`public function testDenormalizeCustomAbstractUid()`
`186`	`176`	`{`
`187`		`- $this->expectDeprecation('Since symfony/serializer 6.1: Denormalizing to an abstract class in "Symfony\Component\Serializer\Normalizer\UidNormalizer" is deprecated.');`
	`177`	`+ $this->expectException(\Error::class);`
	`178`	`+ $this->expectExceptionMessage('Cannot instantiate abstract class Symfony\Component\Serializer\Tests\Normalizer\TestAbstractCustomUid');`
`188`	`179`
`189`	`180`	`$this->assertEquals(Uuid::fromString($uuidString = '1ea6ecef-eb9a-66fe-b62b-957b45f17e43'), $this->normalizer->denormalize($uuidString, TestAbstractCustomUid::class));`
`190`	`181`	`}`