minor performance tweak to reduce performance lost by previous commit

schmittjoh · Jun 7, 2011 · 6212c59 · 6212c59
1 parent 854f8c8
commit 6212c59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Serializer/Serializer.php b/Serializer/Serializer.php
@@ -73,7 +73,7 @@ public function __construct(NormalizerInterface $nativePhpNormalizer, Normalizer
      */
     public final function normalize($data, $format = null)
     {
-        if ($this->customObjectNormalizers) {
+        if (is_object($data) && $this->customObjectNormalizers) {
             foreach ($this->customObjectNormalizers as $normalizer) {
                 if ($normalizer->supportsNormalization($data, $format)) {
                     return $normalizer->normalize($data, $format);

diff --git a/Tests/Serializer/SerializerTest.php b/Tests/Serializer/SerializerTest.php
@@ -51,9 +51,12 @@ public function testNormalize()
 
         $list = new AuthorList();
         $list->add(new Author('Bar'));
-        $normalized = $serializer->normalize($list);
 
+        $normalized = $serializer->normalize($list);
         $this->assertEquals(array(), $normalized);
+
+        $normalized = $serializer->normalize(array('foo'));
+        $this->assertEquals(array('foo'), $normalized);
     }
 
     public function testDenormalize()