minor #23241 [Serializer] Implement missing context aware interfaces (chalasr)

fabpot · fabpot · commit 407631c6821d · 2017-06-21T07:04:30.000-07:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [Serializer] Implement missing context aware interfaces | Q | A | ------------- | --- | Branch? | 4.0 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22743 | License | MIT | Doc PR | n/a Forgot in #22743 Commits ------- 61d796a [Serializer] Implement missing context aware interfaces
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
@@ -22,7 +22,7 @@
  *
  * @final since version 3.3.
  */
-class ChainDecoder implements DecoderInterface /*, ContextAwareDecoderInterface*/
+class ChainDecoder implements ContextAwareDecoderInterface
 {
     protected $decoders = array();
     protected $decoderByFormat = array();
@@ -43,10 +43,8 @@ final public function decode($data, $format, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function supportsDecoding($format/*, array $context = array()*/)
+    public function supportsDecoding($format, array $context = array())
     {
-        $context = func_num_args() > 1 ? func_get_arg(1) : array();
-
         try {
             $this->getDecoder($format, $context);
         } catch (RuntimeException $e) {
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
@@ -22,7 +22,7 @@
  *
  * @final since version 3.3.
  */
-class ChainEncoder implements EncoderInterface /*, ContextAwareEncoderInterface*/
+class ChainEncoder implements ContextAwareEncoderInterface
 {
     protected $encoders = array();
     protected $encoderByFormat = array();
@@ -43,10 +43,8 @@ final public function encode($data, $format, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function supportsEncoding($format/*, array $context = array()*/)
+    public function supportsEncoding($format, array $context = array())
     {
-        $context = func_num_args() > 1 ? func_get_arg(1) : array();
-
         try {
             $this->getEncoder($format, $context);
         } catch (RuntimeException $e) {
@@ -64,9 +62,8 @@ public function supportsEncoding($format/*, array $context = array()*/)
      *
      * @return bool
      */
-    public function needsNormalization($format/*, array $context = array()*/)
+    public function needsNormalization($format, array $context = array())
     {
-        $context = func_num_args() > 1 ? func_get_arg(1) : array();
         $encoder = $this->getEncoder($format, $context);
 
         if (!$encoder instanceof NormalizationAwareInterface) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -24,7 +24,7 @@
  *
  * @final since version 3.3.
  */
-class ArrayDenormalizer implements DenormalizerInterface, SerializerAwareInterface
+class ArrayDenormalizer implements ContextAwareDenormalizerInterface, SerializerAwareInterface
 {
     /**
      * @var SerializerInterface|DenormalizerInterface
@@ -66,10 +66,8 @@ public function denormalize($data, $class, $format = null, array $context = arra
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null/*, array $context = array()*/)
+    public function supportsDenormalization($data, $type, $format = null, array $context = array())
     {
-        $context = func_num_args() > 3 ? func_get_arg(3) : array();
-
         return substr($type, -2) === '[]'
             && $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);
     }
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -13,8 +13,12 @@
 
 use Symfony\Component\Serializer\Encoder\ChainDecoder;
 use Symfony\Component\Serializer\Encoder\ChainEncoder;
+use Symfony\Component\Serializer\Encoder\ContextAwareDecoderInterface;
+use Symfony\Component\Serializer\Encoder\ContextAwareEncoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
+use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -37,7 +41,7 @@
  * @author Lukas Kahwe Smith <smith@pooteeweet.org>
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class Serializer implements SerializerInterface, NormalizerInterface, DenormalizerInterface, EncoderInterface, DecoderInterface
+class Serializer implements SerializerInterface, ContextAwareNormalizerInterface, ContextAwareDenormalizerInterface, ContextAwareEncoderInterface, ContextAwareDecoderInterface
 {
     /**
      * @var Encoder\ChainEncoder

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`* @final since version 3.3.`
`24`	`24`	`*/`
`25`		`-class ChainEncoder implements EncoderInterface /, ContextAwareEncoderInterface/`
	`25`	`+class ChainEncoder implements ContextAwareEncoderInterface`
`26`	`26`	`{`
`27`	`27`	`protected $encoders = array();`
`28`	`28`	`protected $encoderByFormat = array();`
`@@ -43,10 +43,8 @@ final public function encode($data, $format, array $context = array())`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritdoc}`
`45`	`45`	`*/`
`46`		`- public function supportsEncoding($format/, array $context = array()/)`
	`46`	`+ public function supportsEncoding($format, array $context = array())`
`47`	`47`	`{`
`48`		`- $context = func_num_args() > 1 ? func_get_arg(1) : array();`
`49`		`-`
`50`	`48`	`try {`
`51`	`49`	`$this->getEncoder($format, $context);`
`52`	`50`	`} catch (RuntimeException $e) {`
`@@ -64,9 +62,8 @@ public function supportsEncoding($format/, array $context = array()/)`
`64`	`62`	`*`
`65`	`63`	`* @return bool`
`66`	`64`	`*/`
`67`		`- public function needsNormalization($format/, array $context = array()/)`
	`65`	`+ public function needsNormalization($format, array $context = array())`
`68`	`66`	`{`
`69`		`- $context = func_num_args() > 1 ? func_get_arg(1) : array();`
`70`	`67`	`$encoder = $this->getEncoder($format, $context);`
`71`	`68`
`72`	`69`	`if (!$encoder instanceof NormalizationAwareInterface) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @final since version 3.3.`
`26`	`26`	`*/`
`27`		`-class ArrayDenormalizer implements DenormalizerInterface, SerializerAwareInterface`
	`27`	`+class ArrayDenormalizer implements ContextAwareDenormalizerInterface, SerializerAwareInterface`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`	`30`	`* @var SerializerInterface\|DenormalizerInterface`
`@@ -66,10 +66,8 @@ public function denormalize($data, $class, $format = null, array $context = arra`
`66`	`66`	`/**`
`67`	`67`	`* {@inheritdoc}`
`68`	`68`	`*/`
`69`		`- public function supportsDenormalization($data, $type, $format = null/, array $context = array()/)`
	`69`	`+ public function supportsDenormalization($data, $type, $format = null, array $context = array())`
`70`	`70`	`{`
`71`		`- $context = func_num_args() > 3 ? func_get_arg(3) : array();`
`72`		`-`
`73`	`71`	`return substr($type, -2) === '[]'`
`74`	`72`	`&& $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);`
`75`	`73`	`}`