Merge branch 'objects'

flint · Jul 2, 2015 · 6515c47 · 6515c47
2 parents e8a09a7 + 0692219
commit 6515c47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
 
     "extra" : {
         "branch-alias" : {
-            "dev-master" : "1.0.x-dev"
+            "dev-master" : "0.4.x-dev"
         }
     }
 }
diff --git a/src/Normalizer/ChainNormalizer.php b/src/Normalizer/ChainNormalizer.php
@@ -32,6 +32,10 @@ public function add(Normalizer $normalizer)
      */
     public function normalize($value)
     {
+        if (!is_scalar($value)) {
+            return $value;
+        }
+
         foreach ($this->normalizers as $normalizer) {
             $value = $normalizer->normalize($value);
         }