Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · c66b1db · c66b1db
commit c66b1db
Show file tree

Hide file tree

Showing 20 changed files with 191 additions and 107 deletions.
diff --git a/src/Expr.php b/src/Expr.php
@@ -22,13 +22,13 @@
  *     'integer'  => 9,
  *     'string'   => 'test string',
  *     'function' => Zend\Json\Expr(
- *         'function() { window.alert("javascript function encoded by Zend\Json\Json") }'
+ *         'function () { window.alert("javascript function encoded by Zend\Json\Json") }'
  *     ),
  * );
  *
  * Zend\Json\Json::encode($foo, false, array('enableJsonExprFinder' => true));
  * // it will returns json encoded string:
- * // {"integer":9,"string":"test string","function":function() {window.alert("javascript function encoded by Zend\Json\Json")}}
+ * // {"integer":9,"string":"test string","function":function () {window.alert("javascript function encoded by Zend\Json\Json")}}
  * </code>
  */
 class Expr

diff --git a/src/Json.php b/src/Json.php
@@ -31,7 +31,7 @@ class Json
       *
       * @var int
       */
-    public static $maxRecursionDepthAllowed=25;
+    public static $maxRecursionDepthAllowed = 25;
 
     /**
      * @var bool

diff --git a/src/Server/Client.php b/src/Server/Client.php
@@ -144,7 +144,7 @@ public function doRequest($request)
 
         $this->lastResponse = $response;
 
-        // import all response data form JSON HTTP response
+        // import all response data from JSON HTTP response
         $response->loadJson($httpResponse->getBody());
 
         return $response;

diff --git a/src/Server/Error.php b/src/Server/Error.php
@@ -11,7 +11,7 @@
 
 class Error
 {
-    const ERROR_PARSE           = -32768;
+    const ERROR_PARSE           = -32700;
     const ERROR_INVALID_REQUEST = -32600;
     const ERROR_INVALID_METHOD  = -32601;
     const ERROR_INVALID_PARAMS  = -32602;

diff --git a/src/Server/Request.php b/src/Server/Request.php
@@ -28,6 +28,12 @@ class Request
      */
     protected $isMethodError = false;
 
+    /**
+     * Flag
+     * @var bool
+     */
+    protected $isParseError = false;
+
     /**
      * Requested method
      * @var string
@@ -178,6 +184,16 @@ public function isMethodError()
         return $this->isMethodError;
     }
 
+    /**
+     * Was a malformed JSON provided?
+     *
+     * @return bool
+     */
+    public function isParseError()
+    {
+        return $this->isParseError;
+    }
+
     /**
      * Set request identifier
      *
@@ -234,8 +250,12 @@ public function getVersion()
      */
     public function loadJson($json)
     {
-        $options = Json\Json::decode($json, Json\Json::TYPE_ARRAY);
-        $this->setOptions($options);
+        try {
+            $options = Json\Json::decode($json, Json\Json::TYPE_ARRAY);
+            $this->setOptions($options);
+        } catch(\Exception $e) {
+            $this->isParseError = true;
+        }
     }
 
     /**

diff --git a/src/Server/Server.php b/src/Server/Server.php
@@ -86,6 +86,7 @@ public function addFunction($function, $namespace = '')
             $argv = array_slice($argv, 2);
         }
 
+        $class = null;
         if (is_string($function)) {
             $method = Reflection::reflectFunction($function, $argv, $namespace);
         } else {
@@ -106,7 +107,7 @@ public function addFunction($function, $namespace = '')
             }
         }
 
-        $definition = $this->_buildSignature($method);
+        $definition = $this->_buildSignature($method, $class);
         $this->_addMethodServiceMap($definition);
 
         return $this;
@@ -483,6 +484,10 @@ protected function _handle()
     {
         $request = $this->getRequest();
 
+        if($request->isParseError()){
+            return $this->fault('Parse error', Error::ERROR_PARSE);
+        }
+
         if (!$request->isMethodError() && (null === $request->getMethod())) {
             return $this->fault('Invalid Request', Error::ERROR_INVALID_REQUEST);
         }

diff --git a/test/JsonTest.php b/test/JsonTest.php
@@ -5,17 +5,13 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json;
 
 use Zend\Json;
 
 /**
- * @category   Zend
- * @package    Zend_JSON
- * @subpackage UnitTests
  * @group      Zend_JSON
  */
 class JsonTest extends \PHPUnit_Framework_TestCase
@@ -307,7 +303,7 @@ protected function _toArray($value)
         }
 
         $array = array();
-        foreach ((array)$value as $k => $v) {
+        foreach ((array) $value as $k => $v) {
             $array[$k] = $this->_toArray($v);
         }
         return $array;
@@ -543,12 +539,12 @@ public function testEncodingMultipleNestedSwitchingSameNameKeysWithDifferentJSON
     {
         $data = array(
             0 => array(
-                "alpha" => new Json\Expr("function() {}"),
+                "alpha" => new Json\Expr("function () {}"),
                 "beta"  => "gamma",
             ),
             1 => array(
                 "alpha" => "gamma",
-                "beta"  => new Json\Expr("function() {}"),
+                "beta"  => new Json\Expr("function () {}"),
             ),
             2 => array(
                 "alpha" => "gamma",
@@ -558,7 +554,7 @@ public function testEncodingMultipleNestedSwitchingSameNameKeysWithDifferentJSON
         $result = Json\Json::encode($data, false, array('enableJsonExprFinder' => true));
 
         $this->assertEquals(
-            '[{"alpha":function() {},"beta":"gamma"},{"alpha":"gamma","beta":function() {}},{"alpha":"gamma","beta":"gamma"}]',
+            '[{"alpha":function () {},"beta":"gamma"},{"alpha":"gamma","beta":function () {}},{"alpha":"gamma","beta":"gamma"}]',
             $result
         );
     }
@@ -598,7 +594,7 @@ public function testDisabledJSONExprFinder()
 
         $data = array(
             0 => array(
-                "alpha" => new Json\Expr("function() {}"),
+                "alpha" => new Json\Expr("function () {}"),
                 "beta"  => "gamma",
             ),
         );
@@ -1012,7 +1008,6 @@ public function toJson()
 
 /**
  * ISSUE  ZF-4946
- *
  */
 class ToJSONWithExpr
 {

diff --git a/test/JsonXmlTest.php b/test/JsonXmlTest.php
@@ -5,7 +5,6 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json;
@@ -23,9 +22,6 @@
  */
 
 /**
- * @category   Zend
- * @package    Zend_JSON
- * @subpackage UnitTests
  * @group      Zend_JSON
  */
 class JsonXmlTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Server/CacheTest.php b/test/Server/CacheTest.php
@@ -5,7 +5,6 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json\Server;
@@ -15,9 +14,6 @@
 /**
  * Test class for Zend_JSON_Server_Cache
  *
- * @category   Zend
- * @package    Zend_JSON_Server
- * @subpackage UnitTests
  * @group      Zend_JSON
  * @group      Zend_JSON_Server
  */

diff --git a/test/Server/ClientTest.php b/test/Server/ClientTest.php
@@ -5,7 +5,6 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json\Server;
@@ -18,9 +17,6 @@
 use Zend\Json\Server\Response;
 
 /**
- * @category   Zend
- * @package    Zend_Json
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ClientTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Server/ErrorTest.php b/test/Server/ErrorTest.php
@@ -5,7 +5,6 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json\Server;
@@ -16,9 +15,6 @@
 /**
  * Test class for Zend_JSON_Server_Error
  *
- * @category   Zend
- * @package    Zend_JSON_Server
- * @subpackage UnitTests
  * @group      Zend_JSON
  * @group      Zend_JSON_Server
  */
@@ -52,8 +48,8 @@ public function testCodeShouldBeErrOtherByDefault()
 
     public function testSetCodeShouldCastToInteger()
     {
-        $this->error->setCode('-32768');
-        $this->assertEquals(-32768, $this->error->getCode());
+        $this->error->setCode('-32700');
+        $this->assertEquals(-32700, $this->error->getCode());
     }
 
     public function testCodeShouldBeLimitedToStandardIntegers()

diff --git a/test/Server/RequestTest.php b/test/Server/RequestTest.php
@@ -5,17 +5,13 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json\Server;
 
 use Zend\Json;
 
 /**
- * @category   Zend
- * @package    Zend_JSON_Server
- * @subpackage UnitTests
  * @group      Zend_JSON
  * @group      Zend_JSON_Server
  */
@@ -233,6 +229,13 @@ public function testMethodNamesShouldAllowDotNamespacing()
         $this->assertEquals('foo.bar', $this->request->getMethod());
     }
 
+    public function testIsParseErrorSetOnMalformedJson()
+    {
+        $testJson = '{"id":1, "method": "test", "params:"[1,2,3]}';
+        $this->request->loadJson($testJson);
+        $this->assertTrue($this->request->isParseError());
+    }
+
     public function getOptions()
     {
         return array(

diff --git a/test/Server/ResponseTest.php b/test/Server/ResponseTest.php
@@ -5,7 +5,6 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json\Server;
@@ -16,9 +15,6 @@
 /**
  * Test class for Zend_JSON_Server_Response
  *
- * @category   Zend
- * @package    Zend_JSON_Server
- * @subpackage UnitTests
  * @group      Zend_JSON
  * @group      Zend_JSON_Server
  */

diff --git a/test/Server/Smd/ServiceTest.php b/test/Server/Smd/ServiceTest.php
@@ -5,7 +5,6 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json\Server\Smd;
@@ -16,9 +15,6 @@
 /**
  * Test class for Zend_JSON_Server_Smd_Service
  *
- * @category   Zend
- * @package    Zend_JSON_Server
- * @subpackage UnitTests
  * @group      Zend_JSON
  * @group      Zend_JSON_Server
  */

diff --git a/test/Server/SmdTest.php b/test/Server/SmdTest.php
@@ -5,7 +5,6 @@
  * @link      https://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Json
  */
 
 namespace ZendTest\Json\Server;
@@ -19,9 +18,6 @@
 /**
  * Test class for Zend_JSON_Server_Smd
  *
- * @category   Zend
- * @package    Zend_Json_Server
- * @subpackage UnitTests
  * @group      Zend_Json
  * @group      Zend_Json_Server
  */