Language level migration.

Author: Martin Brecht-Precht

.codeclimate.yml

@@ -1,37 +1,34 @@
 {
-  "name": "markenwerk/basic-http-client",
-  "type": "library",
-  "description": "A basic yet extensible HTTP client library providing different authentication methods written in PHP.",
-  "keywords": [
-    "HTTP client",
-    "RESTful",
-    "JSON",
-    "SSL",
-    "Basic Auth",
-    "Client Certificate Auth"
-  ],
-  "homepage": "http://markenwerk.net/",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Martin Brecht-Precht",
-      "email": "[email protected]",
-      "homepage": "http://markenwerk.net"
-    }
-  ],
-  "autoload": {
-    "psr-4": {
-      "Markenwerk\\BasicHttpClient\\": "src/"
-    }
-  },
-  "require": {
-    "php": ">=5.3",
-    "lib-curl": "*",
-    "markenwerk/url-util": "~2.0",
-    "markenwerk/common-exceptions": "~3.0"
-  },
-  "require-dev": {
-    "phpunit/phpunit": ">=4.8.26",
-    "codeclimate/php-test-reporter": "dev-master"
-  }
+	"name": "markenwerk/basic-http-client",
+	"type": "library",
+	"description": "A basic yet extensible HTTP client library providing different authentication methods written in PHP.",
+	"keywords": [
+		"HTTP client",
+		"RESTful",
+		"JSON",
+		"SSL",
+		"Basic Auth",
+		"Client Certificate Auth"
+	],
+	"homepage": "http://markenwerk.net/",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Martin Brecht-Precht",
+			"email": "[email protected]",
+			"homepage": "http://markenwerk.net"
+		}
+	],
+	"autoload": {
+		"psr-4": {
+			"Markenwerk\\BasicHttpClient\\": "src/"
+		}
+	},
+	"require": {
+		"php": "^7.1",
+		"ext-curl": "*",
+		"ext-mbstring": "*",
+		"markenwerk/url-util": "~2.0",
+		"markenwerk/common-exceptions": "~3.0"
+	}
 }

.travis.yml

@@ -31,15 +31,11 @@ class BasicHttpClient implements HttpClientInterface
 	 *
 	 * @param string $endpoint
 	 */
-	public function __construct($endpoint)
+	public function __construct(string $endpoint)
 	{
-		if (!is_string($endpoint)) {
-			$argumentType = (is_object($endpoint)) ? get_class($endpoint) : gettype($endpoint);
-			throw new \InvalidArgumentException('Expected the endpoint as string. Got ' . $argumentType);
-		}
 		$url = new Url($endpoint);
 		$transport = new HttpTransport();
-		if (mb_strtoupper($url->getScheme()) == 'HTTPS') {
+		if (mb_strtoupper($url->getScheme()) === 'HTTPS') {
 			$transport = new HttpsTransport();
 		}
 		$this->request = new Request();
@@ -52,7 +48,7 @@ public function __construct($endpoint)
 	/**
 	 * @return RequestInterface
 	 */
-	public function getRequest()
+	public function getRequest(): RequestInterface
 	{
 		return $this->request;
 	}
@@ -63,7 +59,7 @@ public function getRequest()
 	 * @throws NetworkException
 	 * @throws ConnectionTimeoutException
 	 */
-	public function get(array $queryParameters = array())
+	public function get(array $queryParameters = array()): ResponseInterface
 	{
 		$this->request
 			->setMethod(RequestInterface::REQUEST_METHOD_GET)
@@ -79,7 +75,7 @@ public function get(array $queryParameters = array())
 	 * @throws NetworkException
 	 * @throws ConnectionTimeoutException
 	 */
-	public function head(array $queryParameters = array())
+	public function head(array $queryParameters = array()): ResponseInterface
 	{
 		$this->request
 			->setMethod(RequestInterface::REQUEST_METHOD_HEAD)
@@ -95,7 +91,7 @@ public function head(array $queryParameters = array())
 	 * @throws NetworkException
 	 * @throws ConnectionTimeoutException
 	 */
-	public function post(array $postData = array())
+	public function post(array $postData = array()): ResponseInterface
 	{
 		$body = new Body();
 		$body->setBodyTextFromArray($postData);
@@ -114,7 +110,7 @@ public function post(array $postData = array())
 	 * @throws NetworkException
 	 * @throws ConnectionTimeoutException
 	 */
-	public function put(array $putData = array())
+	public function put(array $putData = array()): ResponseInterface
 	{
 		$body = new Body();
 		$body->setBodyTextFromArray($putData);
@@ -133,7 +129,7 @@ public function put(array $putData = array())
 	 * @throws NetworkException
 	 * @throws ConnectionTimeoutException
 	 */
-	public function patch(array $patchData = array())
+	public function patch(array $patchData = array()): ResponseInterface
 	{
 		$body = new Body();
 		$body->setBodyTextFromArray($patchData);
@@ -152,7 +148,7 @@ public function patch(array $patchData = array())
 	 * @throws NetworkException
 	 * @throws ConnectionTimeoutException
 	 */
-	public function delete(array $queryParameters = array())
+	public function delete(array $queryParameters = array()): ResponseInterface
 	{
 		$this->request
 			->setMethod(RequestInterface::REQUEST_METHOD_DELETE)

composer.json

@@ -16,42 +16,42 @@ interface HttpClientInterface
 	/**
 	 * @return RequestInterface
 	 */
-	public function getRequest();
+	public function getRequest(): RequestInterface;
 
 	/**
 	 * @param mixed[] $queryParameters
 	 * @return ResponseInterface
 	 */
-	public function get(array $queryParameters = array());
+	public function get(array $queryParameters = array()): ResponseInterface;
 
 	/**
 	 * @param mixed[] $queryParameters
 	 * @return ResponseInterface
 	 */
-	public function head(array $queryParameters = array());
+	public function head(array $queryParameters = array()): ResponseInterface;
 
 	/**
 	 * @param array $postData
 	 * @return ResponseInterface
 	 */
-	public function post(array $postData = array());
+	public function post(array $postData = array()): ResponseInterface;
 
 	/**
 	 * @param array $putData
 	 * @return ResponseInterface
 	 */
-	public function put(array $putData = array());
+	public function put(array $putData = array()): ResponseInterface;
 
 	/**
 	 * @param array $patchData
 	 * @return ResponseInterface
 	 */
-	public function patch(array $patchData = array());
+	public function patch(array $patchData = array()): ResponseInterface;
 
 	/**
 	 * @param mixed[] $queryParameters
 	 * @return ResponseInterface
 	 */
-	public function delete(array $queryParameters = array());
+	public function delete(array $queryParameters = array()): ResponseInterface;
 
 }