[Serializer] Throw exception on invalid normalizers/encoders passed to Serializer

ogizanagi · ogizanagi · commit 5ab6ad409d14 · 2019-05-29T16:39:43.000+02:00
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+5.0.0
+-----
+
+ * throw an exception when creating a `Serializer` with normalizers which neither implement `NormalizerInterface` nor `DenormalizerInterface`
+ * throw an exception when creating a `Serializer` with encoders which neither implement `EncoderInterface` nor `DecoderInterface`
+
 4.3.0
 -----
 
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Serializer\Encoder\ContextAwareEncoderInterface;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Exception\LogicException;
 use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
@@ -84,8 +85,7 @@ public function __construct(array $normalizers = [], array $encoders = [])
             }
 
             if (!($normalizer instanceof NormalizerInterface || $normalizer instanceof DenormalizerInterface)) {
-                @trigger_error(\sprintf('Passing normalizers ("%s") which do not implement either "%s" or "%s" has been deprecated since Symfony 4.2.', \get_class($normalizer), NormalizerInterface::class, DenormalizerInterface::class), E_USER_DEPRECATED);
-                // throw new \InvalidArgumentException(\sprintf('The class "%s" does not implement "%s" or "%s".', \get_class($normalizer), NormalizerInterface::class, DenormalizerInterface::class));
+                throw new InvalidArgumentException(\sprintf('The class "%s" neither implements "%s" nor "%s".', \get_class($normalizer), NormalizerInterface::class, DenormalizerInterface::class));
             }
         }
         $this->normalizers = $normalizers;
@@ -104,8 +104,7 @@ public function __construct(array $normalizers = [], array $encoders = [])
             }
 
             if (!($encoder instanceof EncoderInterface || $encoder instanceof DecoderInterface)) {
-                @trigger_error(\sprintf('Passing encoders ("%s") which do not implement either "%s" or "%s" has been deprecated since Symfony 4.2.', \get_class($encoder), EncoderInterface::class, DecoderInterface::class), E_USER_DEPRECATED);
-                // throw new \InvalidArgumentException(\sprintf('The class "%s" does not implement "%s" or "%s".', \get_class($normalizer), EncoderInterface::class, DecoderInterface::class));
+                throw new InvalidArgumentException(\sprintf('The class "%s" neither implements "%s" nor "%s".', \get_class($encoder), EncoderInterface::class, DecoderInterface::class));
             }
         }
         $this->encoder = new ChainEncoder($realEncoders);
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -56,19 +56,19 @@ public function testInterface()
     }
 
     /**
-     * @expectedDeprecation Passing normalizers ("stdClass") which do not implement either "Symfony\Component\Serializer\Normalizer\NormalizerInterface" or "Symfony\Component\Serializer\Normalizer\DenormalizerInterface" has been deprecated since Symfony 4.2.
-     * @group legacy
+     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The class "stdClass" neither implements "Symfony\Component\Serializer\Normalizer\NormalizerInterface" nor "Symfony\Component\Serializer\Normalizer\DenormalizerInterface".
      */
-    public function testDeprecationErrorOnInvalidNormalizer()
+    public function testItThrowsExceptionOnInvalidNormalizer()
     {
         new Serializer([new \stdClass()]);
     }
 
     /**
-     * @expectedDeprecation Passing encoders ("stdClass") which do not implement either "Symfony\Component\Serializer\Encoder\EncoderInterface" or "Symfony\Component\Serializer\Encoder\DecoderInterface" has been deprecated since Symfony 4.2.
-     * @group legacy
+     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The class "stdClass" neither implements "Symfony\Component\Serializer\Encoder\EncoderInterface" nor "Symfony\Component\Serializer\Encoder\DecoderInterface"
      */
-    public function testDeprecationErrorOnInvalidEncoder()
+    public function testItThrowsExceptionOnInvalidEncoder()
     {
         new Serializer([], [new \stdClass()]);
     }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`use Symfony\Component\Serializer\Encoder\ContextAwareEncoderInterface;`
`18`	`18`	`use Symfony\Component\Serializer\Encoder\DecoderInterface;`
`19`	`19`	`use Symfony\Component\Serializer\Encoder\EncoderInterface;`
	`20`	`+use Symfony\Component\Serializer\Exception\InvalidArgumentException;`
`20`	`21`	`use Symfony\Component\Serializer\Exception\LogicException;`
`21`	`22`	`use Symfony\Component\Serializer\Exception\NotEncodableValueException;`
`22`	`23`	`use Symfony\Component\Serializer\Exception\NotNormalizableValueException;`
`@@ -84,8 +85,7 @@ public function __construct(array $normalizers = [], array $encoders = [])`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`if (!($normalizer instanceof NormalizerInterface \|\| $normalizer instanceof DenormalizerInterface)) {`
`87`		`- @trigger_error(\sprintf('Passing normalizers ("%s") which do not implement either "%s" or "%s" has been deprecated since Symfony 4.2.', \get_class($normalizer), NormalizerInterface::class, DenormalizerInterface::class), E_USER_DEPRECATED);`
`88`		`- // throw new \InvalidArgumentException(\sprintf('The class "%s" does not implement "%s" or "%s".', \get_class($normalizer), NormalizerInterface::class, DenormalizerInterface::class));`
	`88`	`+ throw new InvalidArgumentException(\sprintf('The class "%s" neither implements "%s" nor "%s".', \get_class($normalizer), NormalizerInterface::class, DenormalizerInterface::class));`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`$this->normalizers = $normalizers;`
`@@ -104,8 +104,7 @@ public function __construct(array $normalizers = [], array $encoders = [])`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`if (!($encoder instanceof EncoderInterface \|\| $encoder instanceof DecoderInterface)) {`
`107`		`- @trigger_error(\sprintf('Passing encoders ("%s") which do not implement either "%s" or "%s" has been deprecated since Symfony 4.2.', \get_class($encoder), EncoderInterface::class, DecoderInterface::class), E_USER_DEPRECATED);`
`108`		`- // throw new \InvalidArgumentException(\sprintf('The class "%s" does not implement "%s" or "%s".', \get_class($normalizer), EncoderInterface::class, DecoderInterface::class));`
	`107`	`+ throw new InvalidArgumentException(\sprintf('The class "%s" neither implements "%s" nor "%s".', \get_class($encoder), EncoderInterface::class, DecoderInterface::class));`
`109`	`108`	`}`
`110`	`109`	`}`
`111`	`110`	`$this->encoder = new ChainEncoder($realEncoders);`
Original file line number	Diff line number	Diff line change
`@@ -56,19 +56,19 @@ public function testInterface()`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`59`		`- * @expectedDeprecation Passing normalizers ("stdClass") which do not implement either "Symfony\Component\Serializer\Normalizer\NormalizerInterface" or "Symfony\Component\Serializer\Normalizer\DenormalizerInterface" has been deprecated since Symfony 4.2.`
`60`		`- * @group legacy`
	`59`	`+ * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException`
	`60`	`+ * @expectedExceptionMessage The class "stdClass" neither implements "Symfony\Component\Serializer\Normalizer\NormalizerInterface" nor "Symfony\Component\Serializer\Normalizer\DenormalizerInterface".`
`61`	`61`	`*/`
`62`		`- public function testDeprecationErrorOnInvalidNormalizer()`
	`62`	`+ public function testItThrowsExceptionOnInvalidNormalizer()`
`63`	`63`	`{`
`64`	`64`	`new Serializer([new \stdClass()]);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
`68`		`- * @expectedDeprecation Passing encoders ("stdClass") which do not implement either "Symfony\Component\Serializer\Encoder\EncoderInterface" or "Symfony\Component\Serializer\Encoder\DecoderInterface" has been deprecated since Symfony 4.2.`
`69`		`- * @group legacy`
	`68`	`+ * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException`
	`69`	`+ * @expectedExceptionMessage The class "stdClass" neither implements "Symfony\Component\Serializer\Encoder\EncoderInterface" nor "Symfony\Component\Serializer\Encoder\DecoderInterface"`
`70`	`70`	`*/`
`71`		`- public function testDeprecationErrorOnInvalidEncoder()`
	`71`	`+ public function testItThrowsExceptionOnInvalidEncoder()`
`72`	`72`	`{`
`73`	`73`	`new Serializer([], [new \stdClass()]);`
`74`	`74`	`}`