test new versions of phpunit

src/Api/AuthorizedRequestInterface.php

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

src/Api/HttpResponseInterface.php

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

src/Api/RequestInterface.php

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

src/Api/ResponseInterface.php

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

src/AuthorizedClient.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank;
 

src/Base/AbstractAuthorizedRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Base;
 

src/Base/AbstractPublicRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Base;
 

src/Base/AbstractRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Base;
 

src/Base/AbstractResponse.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Base;
 

src/Base/Client.php

@@ -1,7 +1,10 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Base;
 
+use GuzzleHttp\Client as GuzzleHttpClient;
 use GuzzleHttp\Exception\GuzzleException;
 use SergeyNezbritskiy\PrivatBank\Request;
 
@@ -31,17 +34,23 @@ class Client
      */
     public function request(string $request, array $params = array()): HttpResponse
     {
-        $params = array_merge([
-            'method' => 'GET',
-            'query' => [],
-            'body' => '',
-        ], $params);
+        $params = array_merge(
+            [
+                'method' => 'GET',
+                'query' => [],
+                'body' => '',
+            ],
+            $params
+        );
 
-        $request = new Request($request, ...[
+        $request = new Request(
+            $request,
+            ...[
             $params['method'],
             $params['query'],
             $params['body'],
-        ]);
+            ]
+        );
 
         return $this->send($request);
     }
@@ -53,13 +62,17 @@ public function request(string $request, array $params = array()): HttpResponse
      */
     public function send(Request $request): HttpResponse
     {
-        $client = new \GuzzleHttp\Client();
+        $client = new GuzzleHttpClient();
         $uri = $this->url . $request->getRequestUri();
         try {
-            $response = $client->request($request->getMethod(), $uri, [
-                'query' => $request->getQuery(),
-                'body' => $request->getBody(),
-            ]);
+            $response = $client->request(
+                $request->getMethod(),
+                $uri,
+                [
+                    'query' => $request->getQuery(),
+                    'body' => $request->getBody(),
+                ]
+            );
             $result = new HttpResponse(
                 $response->getBody()->getContents(),
                 $response->getStatusCode(),

src/Base/HttpResponse.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Base;
 

src/Base/PrivatBankApiException.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Base;
 

src/Base/Validator.php

@@ -1,16 +1,20 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Base;
 
+use InvalidArgumentException;
+
 /**
  * Class Validator
  * @package SergeyNezbritskiy\PrivatBank\Base
  */
 class Validator
 {
 
-    const TYPE_REQUIRED = 'required';
-    const TYPE_DEFAULT = 'default';
+    public const TYPE_REQUIRED = 'required';
+    public const TYPE_DEFAULT = 'default';
 
     /**
      * @param array $params
@@ -41,7 +45,7 @@ private function validateParams(array &$params, $rule, array $fields, array $rul
             case self::TYPE_REQUIRED:
                 foreach ($fields as $field) {
                     if (!array_key_exists($field, $params)) {
-                        throw new \InvalidArgumentException("Argument $field required");
+                        throw new InvalidArgumentException("Argument $field required");
                     }
                 }
                 break;
@@ -58,7 +62,7 @@ private function validateParams(array &$params, $rule, array $fields, array $rul
                 }
                 break;
             default:
-                throw new \InvalidArgumentException("Unknown validator $rule");
+                throw new InvalidArgumentException("Unknown validator $rule");
         }
     }
 }

src/Merchant.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank;
 

src/PublicClient.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank;
 

src/Request.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank;
 

src/Request/BalanceRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 

src/Request/CheckPaymentMobileRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 

src/Request/CheckPaymentRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 

src/Request/ExchangeRatesArchiveRequest.php

@@ -1,11 +1,14 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 
-use DateTime;
+use InvalidArgumentException;
 use SergeyNezbritskiy\PrivatBank\Api\HttpResponseInterface;
 use SergeyNezbritskiy\PrivatBank\Api\ResponseInterface;
 use SergeyNezbritskiy\PrivatBank\Base\AbstractPublicRequest;
+use SergeyNezbritskiy\PrivatBank\Base\PrivatBankApiException;
 use SergeyNezbritskiy\PrivatBank\Base\Validator;
 use SergeyNezbritskiy\PrivatBank\Response\ExchangeRatesArchiveResponse;
 
@@ -42,7 +45,7 @@ public function getQuery(): array
     /**
      * @param HttpResponseInterface $httpResponse
      * @return ResponseInterface
-     * @throws \SergeyNezbritskiy\PrivatBank\Base\PrivatBankApiException
+     * @throws PrivatBankApiException
      */
     public function getResponse(HttpResponseInterface $httpResponse): ResponseInterface
     {
@@ -56,9 +59,9 @@ protected function getValidationRules(): array
     {
         $callback = function ($params) {
             $dateInput = $params['date'];
-            $date = DateTime::createFromFormat('d.m.Y', $params['date']);
+            $date = date_create_from_format('d.m.Y', $params['date']);
             if (($date === false) || ($date->format('d.m.Y') !== $dateInput)) {
-                throw new \InvalidArgumentException('Argument date must conform format d.M.Y., e.g. 01.12.2018');
+                throw new InvalidArgumentException('Argument date must conform format d.M.Y., e.g. 01.12.2018');
             }
         };
         return [

src/Request/ExchangeRatesRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 
@@ -19,9 +21,9 @@
 class ExchangeRatesRequest extends AbstractPublicRequest
 {
 
-    const CASH = 5;
-    const NON_CASH = 11;
-    const NATIONAL_BANK_CASH = 3;
+    public const CASH = 5;
+    public const NON_CASH = 11;
+    public const NATIONAL_BANK_CASH = 3;
 
     /**
      * @return string

src/Request/InfrastructureRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 
@@ -22,8 +24,8 @@
 class InfrastructureRequest extends AbstractPublicRequest
 {
 
-    const TYPE_ATM = 'atm';
-    const TYPE_TERMINAL = 'tso';
+    public const TYPE_ATM = 'atm';
+    public const TYPE_TERMINAL = 'tso';
 
     /**
      * @return string

src/Request/OfficesRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 

src/Request/PaymentInternalRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 

src/Request/PaymentMobileRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 

src/Request/PaymentUkraineRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 

src/Request/PaymentVisaRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;
 

src/Request/StatementsRequest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace SergeyNezbritskiy\PrivatBank\Request;