PHP 7 language features

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - nightly
   - hhvm

build/ruleset.xml

@@ -10,6 +10,8 @@
 		<exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
 		<exclude name="SlevomatCodingStandard.Namespaces.UseOnlyWhitelistedNamespaces"/>
 	</rule>
+	<rule ref="SlevomatCodingStandard.Typehints.DeclareStrictTypes" />
+	<rule ref="SlevomatCodingStandard.Typehints.ReturnTypehintSpacing" />
 	<rule ref="Consistence.NamingConventions.ValidVariableName.NotCamelCaps">
 		<exclude-pattern>tests/unit/Crypto/GlobalFunctionsMock.php</exclude-pattern>
 	</rule>

composer.json

@@ -15,14 +15,14 @@
 	},
 	"require": {
 		"ext-openssl": "*",
-		"php": "^5.6.0|^7.0"
+		"php": "^7.0"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^0.10.0",
 		"jakub-onderka/php-parallel-lint": "^0.9",
 		"phing/phing": "~2.12",
-		"phpunit/phpunit": "^5.0.4",
-		"slevomat/coding-standard": "^1.0.5",
+		"phpunit/phpunit": "^5.2.12",
+		"slevomat/coding-standard": "dev-php7#5dceec0",
 		"guzzlehttp/guzzle": "^6.1",
 		"satooshi/php-coveralls": "^1.0"
 	},

src/Api/ApiClient.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 
@@ -28,15 +28,10 @@ class ApiClient
 	 */
 	private $apiUrl;
 
-	/**
-	 * @param ApiClientDriver $driver
-	 * @param CryptoService $cryptoService
-	 * @param string|null $apiUrl
-	 */
 	public function __construct(
 		ApiClientDriver $driver,
 		CryptoService $cryptoService,
-		$apiUrl = null
+		string $apiUrl = null
 	)
 	{
 		$this->driver = $driver;
@@ -60,12 +55,12 @@ public function __construct(
 	 * @throws ApiClientDriverException
 	 */
 	public function get(
-		$url,
+		string $url,
 		array $data = [],
 		SignatureDataFormatter $requestSignatureDataFormatter,
 		SignatureDataFormatter $responseSignatureDataFormatter,
 		\Closure $responseValidityCallback = null
-	)
+	): Response
 	{
 		return $this->request(
 			new HttpMethod(HttpMethod::GET),
@@ -92,11 +87,11 @@ public function get(
 	 * @throws ApiClientDriverException
 	 */
 	public function post(
-		$url,
+		string $url,
 		array $data = [],
 		SignatureDataFormatter $requestSignatureDataFormatter,
 		SignatureDataFormatter $responseSignatureDataFormatter
-	)
+	): Response
 	{
 		return $this->request(
 			new HttpMethod(HttpMethod::POST),
@@ -122,11 +117,11 @@ public function post(
 	 * @throws ApiClientDriverException
 	 */
 	public function put(
-		$url,
+		string $url,
 		array $data = [],
 		SignatureDataFormatter $requestSignatureDataFormatter,
 		SignatureDataFormatter $responseSignatureDataFormatter
-	)
+	): Response
 	{
 		return $this->request(
 			new HttpMethod(HttpMethod::PUT),
@@ -155,16 +150,16 @@ public function put(
 	 */
 	public function request(
 		HttpMethod $method,
-		$url,
+		string $url,
 		array $queries = [],
 		array $data = null,
 		SignatureDataFormatter $responseSignatureDataFormatter,
 		\Closure $responseValidityCallback = null
-	)
+	): Response
 	{
 		foreach ($queries as $key => $value) {
 			if (strpos($url, '{' . $key . '}') !== false) {
-				$url = str_replace('{' . $key . '}', urlencode($value), $url);
+				$url = str_replace('{' . $key . '}', urlencode((string) $value), $url);
 				unset($queries[$key]);
 			}
 		}
@@ -230,7 +225,7 @@ public function request(
 	 * @throws PublicKeyFileException
 	 * @throws VerificationFailedException
 	 */
-	public function createResponseByData(array $data, SignatureDataFormatter $responseSignatureDataFormatter)
+	public function createResponseByData(array $data, SignatureDataFormatter $responseSignatureDataFormatter): Response
 	{
 		$response = new Response(
 			new ResponseCode(ResponseCode::S200_OK),
@@ -252,7 +247,7 @@ public function createResponseByData(array $data, SignatureDataFormatter $respon
 	 * @throws PrivateKeyFileException
 	 * @throws SigningFailedException
 	 */
-	private function prepareData(array $data, SignatureDataFormatter $signatureDataFormatter)
+	private function prepareData(array $data, SignatureDataFormatter $signatureDataFormatter): array
 	{
 		$data['dttm'] = (new DateTimeImmutable())->format('YmdHis');
 		$data['signature'] = $this->cryptoService->signData($data, $signatureDataFormatter);
@@ -269,7 +264,7 @@ private function prepareData(array $data, SignatureDataFormatter $signatureDataF
 	 * @throws PublicKeyFileException
 	 * @throws VerificationFailedException
 	 */
-	private function decodeData(Response $response, SignatureDataFormatter $signatureDataFormatter)
+	private function decodeData(Response $response, SignatureDataFormatter $signatureDataFormatter): array
 	{
 		$data = $response->getData();
 

src/Api/ApiClientDriver.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 
@@ -12,6 +12,6 @@ interface ApiClientDriver
 	 * @param string[] $headers
 	 * @return Response
 	 */
-	public function request(HttpMethod $method, $url, array $data = null, array $headers = []);
+	public function request(HttpMethod $method, string $url, array $data = null, array $headers = []): Response;
 
 }

src/Api/ApiClientDriverException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/BadRequestException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/Driver/CurlDriver.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api\Driver;
 
@@ -21,7 +21,7 @@ class CurlDriver implements ApiClientDriver
 	 * @return Response
 	 * @throws CurlDriverException
 	 */
-	public function request(HttpMethod $method, $url, array $data = null, array $headers = [])
+	public function request(HttpMethod $method, string $url, array $data = null, array $headers = []): Response
 	{
 		$ch = curl_init($url);
 
@@ -55,7 +55,7 @@ public function request(HttpMethod $method, $url, array $data = null, array $hea
 
 		return new Response(
 			$responseCode,
-			json_decode($body, JSON_OBJECT_AS_ARRAY),
+			json_decode($body, true),
 			$this->parseHeaders($headers)
 		);
 	}
@@ -64,7 +64,7 @@ public function request(HttpMethod $method, $url, array $data = null, array $hea
 	 * @param string $rawHeaders
 	 * @return string[]
 	 */
-	private function parseHeaders($rawHeaders)
+	private function parseHeaders(string $rawHeaders): array
 	{
 		$headers = [];
 

src/Api/Driver/CurlDriverException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api\Driver;
 

src/Api/Driver/GuzzleDriver.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api\Driver;
 
@@ -29,7 +29,7 @@ public function __construct(Client $client)
 	 * @return Response
 	 * @throws GuzzleDriverException
 	 */
-	public function request(HttpMethod $method, $url, array $data = null, array $headers = [])
+	public function request(HttpMethod $method, string $url, array $data = null, array $headers = []): Response
 	{
 		$postData = null;
 		if ($method->equalsValue(HttpMethod::POST) || $method->equalsValue(HttpMethod::PUT)) {
@@ -52,10 +52,10 @@ public function request(HttpMethod $method, $url, array $data = null, array $hea
 
 			return new Response(
 				$responseCode,
-				json_decode($httpResponse->getBody(), JSON_OBJECT_AS_ARRAY),
+				json_decode((string) $httpResponse->getBody(), true),
 				$responseHeaders
 			);
-		} catch (\Exception $e) {
+		} catch (\Throwable $e) {
 			throw new GuzzleDriverException($e);
 		}
 	}

src/Api/Driver/GuzzleDriverException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api\Driver;
 
@@ -7,9 +7,9 @@
 class GuzzleDriverException extends \RuntimeException implements ApiClientDriverException
 {
 
-	public function __construct(\Exception $e)
+	public function __construct(\Throwable $previous)
 	{
-		parent::__construct('Request error: ' . $e->getMessage(), $e->getCode(), $e);
+		parent::__construct('Request error: ' . $previous->getMessage(), $previous->getCode(), $previous);
 	}
 
 }

src/Api/ForbiddenException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/HttpMethod.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/InternalErrorException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/InvalidPaymentException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 
@@ -10,21 +10,13 @@ class InvalidPaymentException extends RequestException
 	/** @var ProcessPaymentRequest */
 	private $request;
 
-	/**
-	 * @param ProcessPaymentRequest $request
-	 * @param Response $response
-	 * @param string $payId
-	 */
-	public function __construct(ProcessPaymentRequest $request, Response $response, $payId)
+	public function __construct(ProcessPaymentRequest $request, Response $response, string $payId)
 	{
 		parent::__construct(sprintf('PayId %s is invalid or expired.', $payId), $response);
 		$this->request = $request;
 	}
 
-	/**
-	 * @return ProcessPaymentRequest
-	 */
-	public function getRequest()
+	public function getRequest(): ProcessPaymentRequest
 	{
 		return $this->request;
 	}

src/Api/InvalidSignatureException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/MethodNotAllowedException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/NotFoundException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/RequestException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 
@@ -10,21 +10,14 @@ abstract class RequestException extends \RuntimeException
 	 */
 	private $response;
 
-	/**
-	 * @param string $message
-	 * @param Response $response
-	 */
-	public function __construct($message, Response $response)
+	public function __construct(string $message, Response $response)
 	{
 		parent::__construct($message);
 
 		$this->response = $response;
 	}
 
-	/**
-	 * @return Response
-	 */
-	public function getResponse()
+	public function getResponse(): Response
 	{
 		return $this->response;
 	}

src/Api/Response.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 
@@ -36,10 +36,7 @@ public function __construct(
 		$this->headers = $headers;
 	}
 
-	/**
-	 * @return ResponseCode
-	 */
-	public function getResponseCode()
+	public function getResponseCode(): ResponseCode
 	{
 		return $this->responseCode;
 	}
@@ -55,7 +52,7 @@ public function getData()
 	/**
 	 * @return string[]
 	 */
-	public function getHeaders()
+	public function getHeaders(): array
 	{
 		return $this->headers;
 	}

src/Api/ResponseCode.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/ServiceUnavailableException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;
 

src/Api/TooManyRequestsException.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace SlevomatCsobGateway\Api;