Make OCP\Http strict

* Handle private files
* Add return types
* Add scalar typehints
* Made strict
* Fixed requiring proper guzzle message interface that is passed around

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

3 files changed, 14 insertions, 11 deletions

diff --git a/lib/public/Http/Client/IClient.php b/lib/public/Http/Client/IClient.php
index 49e679a7ade..50addc230eb 100644
--- a/lib/public/Http/Client/IClient.php
+++ b/lib/public/Http/Client/IClient.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -59,7 +60,7 @@ interface IClient {
 	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
-	public function get($uri, array $options = []);
+	public function get(string $uri, array $options = []): IResponse;
 
 	/**
 	 * Sends a HEAD request
@@ -84,7 +85,7 @@ interface IClient {
 	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
-	public function head($uri, $options = []);
+	public function head(string $uri, array $options = []): IResponse;
 
 	/**
 	 * Sends a POST request
@@ -114,7 +115,7 @@ interface IClient {
 	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
-	public function post($uri, array $options = []);
+	public function post(string $uri, array $options = []): IResponse;
 
 	/**
 	 * Sends a PUT request
@@ -144,7 +145,7 @@ interface IClient {
 	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
-	public function put($uri, array $options = []);
+	public function put(string $uri, array $options = []): IResponse;
 
 	/**
 	 * Sends a DELETE request
@@ -174,7 +175,7 @@ interface IClient {
 	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
-	public function delete($uri, array $options = []);
+	public function delete(string $uri, array $options = []): IResponse;
 
 	/**
 	 * Sends a options request
@@ -204,5 +205,5 @@ interface IClient {
 	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
-	public function options($uri, array $options = []);
+	public function options(string $uri, array $options = []): IResponse;
 }
diff --git a/lib/public/Http/Client/IClientService.php b/lib/public/Http/Client/IClientService.php
index 09a1f1f7b40..d34302744e1 100644
--- a/lib/public/Http/Client/IClientService.php
+++ b/lib/public/Http/Client/IClientService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -34,5 +35,5 @@ interface IClientService {
 	 * @return IClient
 	 * @since 8.1.0
 	 */
-	public function newClient();
+	public function newClient(): IClient;
 }
diff --git a/lib/public/Http/Client/IResponse.php b/lib/public/Http/Client/IResponse.php
index 94817f012b3..e935067d8c2 100644
--- a/lib/public/Http/Client/IResponse.php
+++ b/lib/public/Http/Client/IResponse.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -41,18 +42,18 @@ interface IResponse {
 	 * @return int
 	 * @since 8.1.0
 	 */
-	public function getStatusCode();
+	public function getStatusCode(): int;
 
 	/**
-	 * @param $key
+	 * @param string $key
 	 * @return string
 	 * @since 8.1.0
 	 */
-	public function getHeader($key);
+	public function getHeader(string $key): string;
 
 	/**
 	 * @return array
 	 * @since 8.1.0
 	 */
-	public function getHeaders();
+	public function getHeaders(): array;
 }