bug #18589 [Serializer] fix parent class of AbstractNormalizer (xabbuh)

fabpot · fabpot · commit 1253700e0116 · 2016-04-20T08:29:49.000+02:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [Serializer] fix parent class of AbstractNormalizer | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17545 (comment) | License | MIT | Doc PR | We must maintain the parent class to not break BC. Commits ------- 45b9ed9 fix parent class of AbstractNormalizer
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -25,10 +25,8 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
+abstract class AbstractNormalizer extends SerializerAwareNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
 {
-    use SerializerAwareTrait;
-
     const CIRCULAR_REFERENCE_LIMIT = 'circular_reference_limit';
     const OBJECT_TO_POPULATE = 'object_to_populate';
     const GROUPS = 'groups';

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,8 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`27`	`27`	`*/`
`28`		`-abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface`
	`28`	`+abstract class AbstractNormalizer extends SerializerAwareNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface`
`29`	`29`	`{`
`30`		`- use SerializerAwareTrait;`
`31`		`-`
`32`	`30`	`const CIRCULAR_REFERENCE_LIMIT = 'circular_reference_limit';`
`33`	`31`	`const OBJECT_TO_POPULATE = 'object_to_populate';`
`34`	`32`	`const GROUPS = 'groups';`