merged PR zendframework/zf1#680 to fix "Zend_Json::decode null or emp…

…ty string throw Zend_Json_Exception on PHP7"
zf1s · Sep 14, 2017 · 674d8e9 · 674d8e9
1 parent f1da5cc
commit 674d8e9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/library/Zend/Json.php b/library/Zend/Json.php
@@ -73,6 +73,9 @@ class Zend_Json
      */
     public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
     {
+        if (in_array($encodedValue, array(null, ''))) {
+            return null;
+        }
         $encodedValue = (string) $encodedValue;
         if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
             $decode = json_decode($encodedValue, $objectDecodeType);