Merge pull request #6 from JBZoo/develop

Show JSON props and optimize getJSON()

composer.json

@@ -23,7 +23,8 @@
         "guzzlehttp/guzzle" : "For PHP 5.4+ please use versions ^5.3|^6.2"
     },
     "require-dev"       : {
-        "jbzoo/phpunit" : "1.x-dev"
+        "jbzoo/phpunit" : "^1.10",
+        "jbzoo/utils"   : "^1.7.8"
     },
     "autoload"          : {
         "psr-4" : {

src/Response.php

@@ -24,6 +24,11 @@
  */
 class Response extends Data
 {
+    /**
+     * @var null|JSON
+     */
+    protected $_jsonData = null;
+
     /**
      * Response constructor.
      * @param array|string $data
@@ -33,6 +38,7 @@ public function __construct($data = array())
         $data['code']    = 0;
         $data['headers'] = array();
         $data['body']    = '';
+        $this->_jsonData = null;
 
         parent::__construct($data);
     }
@@ -58,6 +64,8 @@ public function getCode()
      */
     public function setBody($body)
     {
+        $this->_jsonData = null; // Force update getJSON() result
+
         $this['body'] = (string)$body;
     }
 
@@ -74,7 +82,12 @@ public function getBody()
      */
     public function getJSON()
     {
-        return new JSON($this->getBody());
+        if (null === $this->_jsonData) {
+            $this->_jsonData = new JSON($this->get('body'));
+            $this->_jsonData->setFlags(\ArrayObject::ARRAY_AS_PROPS); // For JBZoo/Data less 1.4.2
+        }
+
+        return $this->_jsonData;
     }
 
     /**

tests/DriverTest.php

@@ -17,7 +17,7 @@
 use JBZoo\HttpClient\HttpClient;
 use JBZoo\HttpClient\Options;
 use JBZoo\HttpClient\Response;
-use JBZoo\Utils\Env;
+use JBZoo\Utils\Sys;
 use JBZoo\Utils\Url;
 
 /**
@@ -41,7 +41,7 @@ abstract class DriverTest extends PHPUnit
      */
     protected function _isPHP53()
     {
-        return version_compare(Env::getVersion(), '5.4', '<');
+        return Sys::isPHP53();
     }
 
     /**

tests/ResponseTest.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * JBZoo Http-Client
+ *
+ * This file is part of the JBZoo CCK package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package   Http-Client
+ * @license   MIT
+ * @copyright Copyright (C) JBZoo.com,  All rights reserved.
+ * @link      https://github.com/JBZoo/Http-Client
+ */
+
+namespace JBZoo\PHPUnit;
+
+use JBZoo\HttpClient\Response;
+
+/**
+ * Class ResponseTest
+ * @package JBZoo\PHPUnit
+ */
+class ResponseTest extends PHPUnit
+{
+    protected $_json = '{"key-1":"value-1","key-2":"value-2"}';
+
+    public function testGetSameJSON()
+    {
+        $resp = new Response();
+
+        $resp->setBody($this->_json);
+
+        $json1 = $resp->getJSON();
+        $json2 = $resp->getJSON();
+
+        isSame('value-1', $resp->getJSON()->get('key-1'));
+        isSame('value-2', $resp->getJSON()->find('key-2'));
+        isSame($json1, $json2);
+        isSame($json1, $resp->getJSON());
+        isSame($json2, $resp->getJSON());
+
+        $resp->setBody($this->_json);
+        isNotSame($json1, $resp->getJSON());
+        isNotSame($json2, $resp->getJSON());
+        isSame($resp->getJSON(), $resp->getJSON());
+    }
+}