Merge branch '0.8' into 0.9

Respect · May 28, 2015 · d0f36de · d0f36de
2 parents fc08c96 + abc712d
commit d0f36de
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/library/Rules/Json.php b/library/Rules/Json.php
@@ -5,6 +5,11 @@ class Json extends AbstractRule
 {
     public function validate($input)
     {
-        return (bool) (json_decode($input));
+        if (is_string($input)
+            && strtolower($input) == 'null') {
+            return true;
+        }
+
+        return (null !== json_decode($input));
     }
 }
diff --git a/tests/Rules/JsonTest.php b/tests/Rules/JsonTest.php
@@ -38,6 +38,10 @@ public function providerForPass()
             array('[1,2,3]'),
             array('["foo", "bar", "number", 1]'),
             array('{"foo": "bar", "number":1}'),
+            array('[]'),
+            array('{}'),
+            array('false'),
+            array('null'),
         );
     }