Merge branch 'hotfix/#5956-zend-json-server-options-enforced-as-array'

Close #5956
zendframework · Apr 3, 2014 · a52e105 · a52e105
2 parents eeb9267 + 45db1d2
commit a52e105
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/library/Zend/Json/Server/Response.php b/library/Zend/Json/Server/Response.php
@@ -79,10 +79,16 @@ public function setOptions(array $options)
      *
      * @param  string $json
      * @return void
+     * @throws Exception\RuntimeException
      */
     public function loadJson($json)
     {
         $options = Json::decode($json, Json::TYPE_ARRAY);
+
+        if (!is_array($options)) {
+            throw new Exception\RuntimeException('json is not a valid response; array expected');
+        }
+
         $this->setOptions($options);
     }
 

diff --git a/tests/ZendTest/Json/Server/ClientTest.php b/tests/ZendTest/Json/Server/ClientTest.php
@@ -217,6 +217,17 @@ public function testCustomHttpClientUserAgentIsNotOverridden()
         $this->assertSame($expectedUserAgent, $this->httpClient->getHeader('User-Agent'));
     }
 
+    /**
+     * @group 5956
+     */
+    public function testScalarServerResponseThrowsException()
+    {
+        $response = $this->makeHttpResponseFrom('false');
+        $this->httpAdapter->setResponse($response);
+        $this->setExpectedException('Zend\Json\Exception\ExceptionInterface');
+        $this->jsonClient->call('foo');
+    }
+
     // Helpers
     public function setServerResponseTo($nativeVars)
     {

diff --git a/tests/ZendTest/Json/Server/ResponseTest.php b/tests/ZendTest/Json/Server/ResponseTest.php
@@ -173,6 +173,27 @@ public function testCastToStringShouldCastToJSON()
         $this->assertEquals($this->response->getId(), $test['id']);
     }
 
+    /**
+     * @param string $json
+     *
+     * @group 5956
+     *
+     * @dataProvider provideScalarJSONResponses
+     */
+    public function testLoadingScalarJSONResponseShouldThrowException($json)
+    {
+        $this->setExpectedException('Zend\Json\Server\Exception\RuntimeException');
+        $this->response->loadJson($json);
+    }
+
+    /**
+     * @return string[][]
+     */
+    public function provideScalarJSONResponses()
+    {
+        return array(array(''), array('true'), array('null'), array('3'), array('"invalid"'));
+    }
+
     public function getOptions()
     {
         return array(