Merge branch 'hotfix/2365'

zendframework · Sep 17, 2012 · 3bc62a9 · 3bc62a9
commit 3bc62a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Decoder.php b/src/Decoder.php
@@ -179,7 +179,7 @@ protected function _decodeValue()
      * array.
      *
      * @return array|stdClass
-     * @throws Zend\Json\Exception\RuntimeException
+     * @throws RuntimeException
      */
     protected function _decodeObject()
     {
@@ -239,7 +239,7 @@ protected function _decodeObject()
      *    [element, element2,...,elementN]
      *
      * @return array
-     * @throws Zend\Json\Exception\RuntimeException
+     * @throws RuntimeException
      */
     protected function _decodeArray()
     {
@@ -290,7 +290,7 @@ protected function _eatWhitespace()
      * Retrieves the next token from the source stream
      *
      * @return int Token constant value specified in class definition
-     * @throws Zend\Json\Exception\RuntimeException
+     * @throws RuntimeException
      */
     protected function _getNextToken()
     {

diff --git a/src/Encoder.php b/src/Encoder.php
@@ -104,8 +104,8 @@ protected function _encodeValue(&$value)
      *
      * @param $value object
      * @return string
-     * @throws Zend\Json\Exception\RecursionException If recursive checks are enabled
-     *                                                and the object has been serialized previously
+     * @throws RecursionException If recursive checks are enabled and the
+     *                            object has been serialized previously
      */
     protected function _encodeObject(&$value)
     {
@@ -398,7 +398,7 @@ private static function _encodeVariables(ReflectionClass $cls)
      * @param $package string Optional package name appended to JavaScript
      * proxy class name
      * @return string The class2 (JavaScript) encoding of the class
-     * @throws Zend\Json\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function encodeClass($className, $package = '')
     {

diff --git a/src/Json.php b/src/Json.php
@@ -52,7 +52,7 @@ class Json
      * @param int $objectDecodeType Optional; flag indicating how to decode
      * objects. See {@link Zend_Json_Decoder::decode()} for details.
      * @return mixed
-     * @throws Zend\Json\Exception\RuntimeException
+     * @throws RuntimeException
      */
     public static function decode($encodedValue, $objectDecodeType = self::TYPE_OBJECT)
     {