Merge branch 'hotfix/3827' into develop

Forward port zendframework/zendframework#3827
zendframework · Mar 5, 2013 · e1c3e3c · e1c3e3c
commit e1c3e3c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Json.php b/src/Json.php
@@ -153,8 +153,10 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar
      * NOTE: This method is used internally by the encode method.
      *
      * @see encode
-     * @param mixed $valueToCheck a string - object property to be encoded
-     * @return void
+     * @param mixed $value a string - object property to be encoded
+     * @param array $javascriptExpressions
+     * @param null|string|int $currentKey
+     * @return mixed
      */
     protected static function _recursiveJsonExprFinder(
         &$value, array &$javascriptExpressions, $currentKey = null