Merge branch 'master' of git://github.com/zendframework/zf2 into string

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-json",
-    "description": "Zend\\Json component",
+    "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -9,11 +9,11 @@
     "homepage": "https://github.com/zendframework/zend-json",
     "autoload": {
         "psr-4": {
-            "Zend\\Json\\": "src/"
+            "Zend\\Json": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.3.3",
         "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {

src/Server/Client.php

@@ -134,11 +134,11 @@ public function doRequest($request)
         $this->lastRequest = $request;
 
         $httpRequest = $this->httpClient->getRequest();
-        if ($httpRequest->getUri() === null) {
+        if ($httpRequest->getUriString() === null) {
             $this->httpClient->setUri($this->serverAddress);
         }
 
-        $headers = $httpRequest->headers();
+        $headers = $httpRequest->getHeaders();
         $headers->addHeaders(array(
             'Content-Type' => 'application/json',
             'Accept'       => 'application/json',

test/JsonXmlTest.php

@@ -558,16 +558,12 @@ public function testNestingDepthIsHandledProperlyWhenNestingDepthExceedsMaximum(
      * @dataProvider providerNestingDepthIsHandledProperly
      */
     public function testNestingDepthIsHandledProperlyWhenNestingDepthDoesNotExceedMaximum($xmlStringContents)
-    {   
-        try {
-            Json\Json::$maxRecursionDepthAllowed = 25;
-            $jsonString = Json\Json::fromXml($xmlStringContents, true);
-            $jsonArray = Json\Json::decode($jsonString, Json\Json::TYPE_ARRAY);
-            $this->assertNotNull($jsonArray, "JSON decode result is NULL");
-            $this->assertSame('A', $jsonArray['response']['message_type']['defaults']['close_rules']['after_responses']);
-        } catch ( Zend\Json\Exception\RecursionException $ex ) {
-            $this->fail('Zend_Json::fromXml does not implement recursion check properly');
-        }
+    {
+        Json\Json::$maxRecursionDepthAllowed = 25;
+        $jsonString = Json\Json::fromXml($xmlStringContents, true);
+        $jsonArray = Json\Json::decode($jsonString, Json\Json::TYPE_ARRAY);
+        $this->assertNotNull($jsonArray, "JSON decode result is NULL");
+        $this->assertSame('A', $jsonArray['response']['message_type']['defaults']['close_rules']['after_responses']);
     }
 
     /**

test/Server/ClientTest.php

@@ -207,7 +207,7 @@ public function testSettingNoHttpClientUriForcesClientToSetUri()
         $this->jsonClient->setHttpClient($this->httpClient);
 
         $this->setServerResponseTo(null);
-        $this->assertNull($this->jsonClient->getHttpClient()->getRequest()->getUri());
+        $this->assertNull($this->jsonClient->getHttpClient()->getRequest()->getUriString());
         $this->jsonClient->call('foo');
         $uri = $this->jsonClient->getHttpClient()->getUri();