merged branch duplabe/customnormalizer-fix (PR #4273)

fabpot · fabpot · commit 6fba6d7389c9 · 2012-05-14T13:29:22.000+02:00
Commits ------- e647eaa [Serializer] Fix CustomNormalizer supportsDenormalization interface check. Discussion ---------- [Serializer] Fix CustomNormalizer supportsDenormalization interface check. Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - License of the code: MIT Documentation PR: - Fixes the previous PR: #4257 --------------------------------------------------------------------------- by travisbot at 2012-05-13T20:57:00Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1322002) (merged e647eaa into 459942b).
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -59,6 +59,6 @@ public function supportsDenormalization($data, $type, $format = null)
     {
         $class = new \ReflectionClass($type);
 
-        return $class->isSubclassOf('Symfony\Component\Serializer\Normalizer\NormalizableInterface');
+        return $class->isSubclassOf('Symfony\Component\Serializer\Normalizer\DenormalizableInterface');
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+use Symfony\Component\Serializer\Normalizer\DenormalizableInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+class DenormalizableDummy implements DenormalizableInterface
+{
+
+    function denormalize(DenormalizerInterface $denormalizer, $data, $format = null)
+    {
+
+    }
+
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php
@@ -12,10 +12,11 @@
 namespace Symfony\Component\Serializer\Tests\Fixtures;
 
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizableInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-class Dummy implements NormalizableInterface
+class Dummy implements NormalizableInterface, DenormalizableInterface
 {
     public $foo;
     public $bar;
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php
@@ -12,10 +12,11 @@
 namespace Symfony\Component\Serializer\Tests\Fixtures;
 
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizableInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-class NormalizableTraversableDummy extends TraversableDummy implements NormalizableInterface
+class NormalizableTraversableDummy extends TraversableDummy implements NormalizableInterface, DenormalizableInterface
 {
     public function normalize(NormalizerInterface $normalizer, $format = null)
     {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
@@ -53,5 +53,6 @@ public function testSupportsDenormalization()
     {
         $this->assertTrue($this->normalizer->supportsDenormalization(array(), 'Symfony\Component\Serializer\Tests\Fixtures\ScalarDummy'));
         $this->assertFalse($this->normalizer->supportsDenormalization(array(), 'stdClass'));
+        $this->assertTrue($this->normalizer->supportsDenormalization(array(), 'Symfony\Component\Serializer\Tests\Fixtures\DenormalizableDummy'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ public function supportsDenormalization($data, $type, $format = null)`
`59`	`59`	`{`
`60`	`60`	`$class = new \ReflectionClass($type);`
`61`	`61`
`62`		`- return $class->isSubclassOf('Symfony\Component\Serializer\Normalizer\NormalizableInterface');`
	`62`	`+ return $class->isSubclassOf('Symfony\Component\Serializer\Normalizer\DenormalizableInterface');`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,11 @@`
`12`	`12`	`namespace Symfony\Component\Serializer\Tests\Fixtures;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Serializer\Normalizer\NormalizableInterface;`
	`15`	`+use Symfony\Component\Serializer\Normalizer\DenormalizableInterface;`
`15`	`16`	`use Symfony\Component\Serializer\Normalizer\NormalizerInterface;`
`16`	`17`	`use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;`
`17`	`18`
`18`		`-class NormalizableTraversableDummy extends TraversableDummy implements NormalizableInterface`
	`19`	`+class NormalizableTraversableDummy extends TraversableDummy implements NormalizableInterface, DenormalizableInterface`
`19`	`20`	`{`
`20`	`21`	`public function normalize(NormalizerInterface $normalizer, $format = null)`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,6 @@ public function testSupportsDenormalization()`
`53`	`53`	`{`
`54`	`54`	`$this->assertTrue($this->normalizer->supportsDenormalization(array(), 'Symfony\Component\Serializer\Tests\Fixtures\ScalarDummy'));`
`55`	`55`	`$this->assertFalse($this->normalizer->supportsDenormalization(array(), 'stdClass'));`
	`56`	`+ $this->assertTrue($this->normalizer->supportsDenormalization(array(), 'Symfony\Component\Serializer\Tests\Fixtures\DenormalizableDummy'));`
`56`	`57`	`}`
`57`	`58`	`}`