Updated dependencies.

Author: Martin Brecht-Precht

README.md

@@ -15,7 +15,7 @@ A JSON HTTP client library. This project also is the reference implementation fo
 ```{json}
 {
    	"require": {
-        "markenwerk/json-http-client": "~1.0"
+        "markenwerk/json-http-client": "~2.0"
     }
 }
 ```
@@ -190,25 +190,24 @@ $message->addHeader(new Header('Custom-Header', array('CustomHeaderValue')));
 $message->addAdditionalHeader(new Header('Custom-Header', array('AnotherCustomHeaderValue')));
 ```
 
-#### Configuring a Request instance and perform the HTTP request
+#### Configuring an endpoints URL, build the Request instance and perform the HTTP request
+
+For more information about the usage of the URL object please take a look at the [PHP URL Util](https://github.com/markenwerk/php-url-util) project.
 
 ```{php}
 use BasicHttpClient\Request\Authentication\BasicAuthentication;
 use JsonHttpClient\Request\JsonRequest;
+use Url\Url;
+
+// Setting up the endpoints URL
+$url = new Url('https://john:secret@yourapihere-com-98yq3775xff0.runscope.net:443/path/to/resource?arg1=123#fragment');
 
 // Configuring and performing a Request
 $request = new JsonRequest();
 $request
 	->setUserAgent('PHP JSON HTTP Client Test 1.0')
-	->setEndpoint('https://yourapihere-com-98yq3775xff0.runscope.net/')
-	->setPort(443)
+	->setUrl($url)
 	->addAuthentication(new BasicAuthentication('username', 'password'))
-	->setQueryParameters(
-		array(
-			'paramName1' => 'paramValue1',
-			'paramName2' => 'paramValue2'
-		)
-	)
 	->setMethod(JsonRequest::REQUEST_METHOD_POST)
 	->setTransport($transport)
 	->setMessage($message)

composer.json

@@ -26,7 +26,7 @@
   },
   "require": {
     "php": ">=5.3",
-    "markenwerk/basic-http-client": "~1.0"
+    "markenwerk/basic-http-client": "~2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.8",

detaild.php

@@ -10,6 +10,7 @@
 use BasicHttpClient\Request\Transport\HttpsTransport;
 use JsonHttpClient\Request\Message\Body\JsonBody;
 use JsonHttpClient\Request\JsonRequest;
+use Url\Url;
 
 require_once('vendor/autoload.php');
 
@@ -40,18 +41,13 @@
 	->addCookie(new Cookie('PHPSESSID', '<MY_SESSION_ID>'))
 	->setBody($messageBody);
 
+$url = new Url('https://yourapihere-com-98yq3775xff0.runscope.net/');
+
 $request = new JsonRequest();
 $response = $request
 	->setUserAgent('PHP JSON HTTP Client Test 1.0')
-	->setEndpoint('https://yourapihere-com-98yq3775xff0.runscope.net/')
-	->setPort(443)
+	->setUrl($url)
 	->addAuthentication(new BasicAuthentication('username', 'password'))
-	->setQueryParameters(
-		array(
-			'paramName1' => 'paramValue1',
-			'paramName2' => 'paramValue2'
-		)
-	)
 	->setMethod(JsonRequest::REQUEST_METHOD_POST)
 	->setTransport($transport)
 	->setMessage($message)

src/JsonHttpClient.php

@@ -9,9 +9,9 @@
 use BasicHttpClient\Request\Transport\HttpsTransport;
 use BasicHttpClient\Request\Transport\HttpTransport;
 use BasicHttpClient\Response\ResponseInterface;
-use BasicHttpClient\Util\UrlUtil;
 use JsonHttpClient\Request\JsonRequest;
 use JsonHttpClient\Request\Message\Body\JsonBody;
+use Url\Url;
 
 /**
  * Class JsonHttpClient
@@ -33,9 +33,9 @@ class JsonHttpClient implements HttpClientInterface
 	 */
 	public function __construct($endpoint)
 	{
-		$urlUtil = new UrlUtil();
+		$url = new Url($endpoint);
 		$transport = new HttpTransport();
-		if ($urlUtil->getScheme($endpoint) == 'HTTPS') {
+		if (mb_strtoupper($url->getScheme()) == 'HTTPS') {
 			$transport = new HttpsTransport();
 		}
 		$message = new Message();
@@ -46,7 +46,7 @@ public function __construct($endpoint)
 		$this->request
 			->setTransport($transport)
 			->setMessage($message)
-			->setEndpoint($endpoint);
+			->setUrl($url);
 	}
 
 	/**
@@ -67,8 +67,9 @@ public function get(array $queryParameters = null)
 	{
 		$this->request
 			->setMethod(RequestInterface::REQUEST_METHOD_GET)
-			->setQueryParameters($queryParameters)
-			->perform();
+			->getUrl()
+			->setQueryParametersFromArray($queryParameters);
+		$this->request->perform();
 		return $this->request->getResponse();
 	}
 
@@ -82,8 +83,9 @@ public function head(array $queryParameters = null)
 	{
 		$this->request
 			->setMethod(RequestInterface::REQUEST_METHOD_HEAD)
-			->setQueryParameters($queryParameters)
-			->perform();
+			->getUrl()
+			->setQueryParametersFromArray($queryParameters);
+		$this->request->perform();
 		return $this->request->getResponse();
 	}
 
@@ -148,8 +150,9 @@ public function delete(array $queryParameters = null)
 	{
 		$this->request
 			->setMethod(RequestInterface::REQUEST_METHOD_DELETE)
-			->setQueryParameters($queryParameters)
-			->perform();
+			->getUrl()
+			->setQueryParametersFromArray($queryParameters);
+		$this->request->perform();
 		return $this->request->getResponse();
 	}