Fix merge

nicolas-grekas · nicolas-grekas · commit 632e61f7a6d0 · 2016-02-01T21:47:29.000+01:00
diff --git a/Normalizer/CustomNormalizer.php b/Normalizer/CustomNormalizer.php
@@ -59,10 +59,6 @@ public function supportsNormalization($data, $format = null)
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        if (PHP_VERSION_ID < 50307) {
-            return class_exists($type) && in_array('Symfony\Component\Serializer\Normalizer\DenormalizableInterface', class_implements($type), true);
-        }
-
         return is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,6 @@ public function supportsNormalization($data, $format = null)`
`59`	`59`	`*/`
`60`	`60`	`public function supportsDenormalization($data, $type, $format = null)`
`61`	`61`	`{`
`62`		`- if (PHP_VERSION_ID < 50307) {`
`63`		`- return class_exists($type) && in_array('Symfony\Component\Serializer\Normalizer\DenormalizableInterface', class_implements($type), true);`
`64`		`- }`
`65`		`-`
`66`	`62`	`return is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');`
`67`	`63`	`}`
`68`	`64`	`}`