Merge branch 'hotfix/4341' into develop

Close zendframework/zendframework#4341
zendframework · Apr 29, 2013 · 536af8a · 536af8a
commit 536af8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Decoder.php b/src/Decoder.php
@@ -78,12 +78,11 @@ class Decoder
     /**
      * Constructor
      *
-     * @param string $source String source to decode
-     * @param int $decodeType How objects should be decoded -- see
+     * @param string $source     String source to decode
+     * @param int    $decodeType How objects should be decoded -- see
      * {@link Zend\Json\Json::TYPE_ARRAY} and {@link Zend\Json\Json::TYPE_OBJECT} for
      * valid values
      * @throws InvalidArgumentException
-     * @return void
      */
     protected function __construct($source, $decodeType)
     {

diff --git a/src/Server/Server.php b/src/Server/Server.php
@@ -155,8 +155,8 @@ public function fault($fault = null, $code = 404, $data = null)
      * Handle request
      *
      * @param  Request $request
-     * @throws Exception\InvalidArgumentException
      * @return null|Response
+     * @throws Exception\InvalidArgumentException
      */
     public function handle($request = false)
     {