Merged in corrections (pull request #4)

Corrections

composer.json

@@ -26,9 +26,10 @@
         "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.3",
         "friendsofphp/php-cs-fixer": "^2.0",
-        "fzaninotto/faker": "^1.6"
+        "fzaninotto/faker": "^1.6",
+        "phpstan/phpstan": "^0.12.44",
+        "phpunit/phpunit": "^4.8 || ^5.3"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+	paths:
+		- ./src
+	level: 2

src/AbstractApi.php

@@ -249,7 +249,7 @@ protected function validateResponse($response)
                 }
             }
 
-            if (property_exists($response, 'CardHolderMessageMustBeShown')) {
+            if (property_exists($response, 'CardHolderErrorMessage') && property_exists($response, 'CardHolderMessageMustBeShown')) {
                 if ($response->CardHolderMessageMustBeShown) {
                     throw new Exceptions\ResponseMessageException($response->CardHolderErrorMessage);
                 }
@@ -302,7 +302,7 @@ protected function parseUrl()
     /**
      * Build url
      *
-     * @param array $options
+     * @param array<string, string> $options
      *
      * @return bool|string
      */
@@ -328,7 +328,7 @@ protected function authRequired()
     /**
      * Set the headers to the API call
      *
-     * @return array
+     * @return array<string, string>
      */
     protected function getBasicHeaders()
     {
@@ -358,6 +358,7 @@ protected function getClient()
      * Resolve transaction
      *
      * @param OptionsResolver $resolver
+     * @return void
      */
     protected function setTransactionResolver(OptionsResolver $resolver)
     {
@@ -367,6 +368,7 @@ protected function setTransactionResolver(OptionsResolver $resolver)
      * Resolve orderlines
      *
      * @param OptionsResolver $resolver
+     * @return void
      */
     protected function setOrderLinesResolver(OptionsResolver $resolver)
     {
@@ -376,6 +378,7 @@ protected function setOrderLinesResolver(OptionsResolver $resolver)
      * Resolve amount option
      *
      * @param OptionsResolver $resolver
+     * @return void
      */
     protected function setAmountResolver(OptionsResolver $resolver)
     {
@@ -385,6 +388,7 @@ protected function setAmountResolver(OptionsResolver $resolver)
      * Resolve terminal option
      *
      * @param OptionsResolver $resolver
+     * @return void
      */
     protected function setTerminalResolver(OptionsResolver $resolver)
     {
@@ -394,6 +398,7 @@ protected function setTerminalResolver(OptionsResolver $resolver)
      * Resolve currency option
      *
      * @param OptionsResolver $resolver
+     * @return void
      */
     protected function setCurrencyResolver(OptionsResolver $resolver)
     {
@@ -403,6 +408,7 @@ protected function setCurrencyResolver(OptionsResolver $resolver)
      * Resolve shop order id
      *
      * @param OptionsResolver $resolver
+     * @return void
      */
     protected function setShopOrderIdResolver(OptionsResolver $resolver)
     {
@@ -412,6 +418,7 @@ protected function setShopOrderIdResolver(OptionsResolver $resolver)
      * Resolve transaction info option
      *
      * @param OptionsResolver $resolver
+     * @return void
      */
     protected function setTransactionInfoResolver(OptionsResolver $resolver)
     {
@@ -421,6 +428,7 @@ protected function setTransactionInfoResolver(OptionsResolver $resolver)
      * Resolve amount option
      *
      * @param OptionsResolver $resolver
+     * @return void
      */
     protected function setCustomerInfoResolver(OptionsResolver $resolver)
     {

src/Api/Ecommerce/Callback.php

@@ -33,12 +33,13 @@
  */
 class Callback
 {
+    /** @var array<string, string> */
     private $postedData;
 
     /**
      * Callback constructor.
      *
-     * @param $postedData
+     * @param array<string, string> $postedData
      */
     public function __construct($postedData)
     {

src/Api/Ecommerce/PaymentRequest.php

@@ -24,11 +24,13 @@
 namespace Altapay\Api\Ecommerce;
 
 use Altapay\AbstractApi;
+use Altapay\Exceptions;
 use Altapay\Request\Config;
 use Altapay\Response\PaymentRequestResponse;
 use Altapay\Serializer\ResponseSerializer;
 use Altapay\Traits;
 use Altapay\Types;
+use GuzzleHttp\Exception\ClientException as GuzzleHttpClientException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Symfony\Component\OptionsResolver\Options;

src/Api/Ecommerce/ResponseInfo.php

@@ -12,7 +12,7 @@ public function __construct($postedData)
     }
 
     /**
-     * @return RegisteredAddress
+     * @return string
      */
     public function getRegisteredAddress()
     {

src/Api/Payments/CaptureReservation.php

@@ -24,11 +24,13 @@
 namespace Altapay\Api\Payments;
 
 use Altapay\AbstractApi;
+use Altapay\Exceptions;
 use Altapay\Response\CaptureReservationResponse;
 use Altapay\Serializer\ResponseSerializer;
 use Altapay\Traits\AmountTrait;
 use Altapay\Traits\OrderlinesTrait;
 use Altapay\Traits\TransactionsTrait;
+use GuzzleHttp\Exception\ClientException as GuzzleHttpClientException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -96,7 +98,7 @@ public function setSalesTax($salesTax)
      * The shipping tracking info is used if you want to send the shipping tracking info
      * with invoice.
      *
-     * @param $shippingTrackingInfo
+     * @param string $shippingTrackingInfo
      *
      * @return $this
      */

src/Api/Payments/RefundCapturedReservation.php

@@ -24,9 +24,11 @@
 namespace Altapay\Api\Payments;
 
 use Altapay\AbstractApi;
+use Altapay\Exceptions;
 use Altapay\Response\RefundResponse;
 use Altapay\Serializer\ResponseSerializer;
 use Altapay\Traits;
+use GuzzleHttp\Exception\ClientException as GuzzleHttpClientException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;

src/Api/Payments/ReleaseReservation.php

@@ -24,9 +24,12 @@
 namespace Altapay\Api\Payments;
 
 use Altapay\AbstractApi;
+use Altapay\Exceptions;
 use Altapay\Response\ReleaseReservationResponse;
+use Altapay\Response\PaymentRequestResponse;
 use Altapay\Serializer\ResponseSerializer;
 use Altapay\Traits\TransactionsTrait;
+use GuzzleHttp\Exception\ClientException as GuzzleHttpClientException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -111,7 +114,7 @@ protected function getHttpMethod()
     }
 
     /**
-     * @return \Altapay\Response\AbstractResponse|PaymentRequestResponse|bool|void
+     * @return \Altapay\Response\AbstractResponse|PaymentRequestResponse|bool
      * @throws \Altapay\Exceptions\ResponseHeaderException
      * @throws \Altapay\Exceptions\ResponseMessageException
      * @throws \GuzzleHttp\Exception\GuzzleException
@@ -146,6 +149,6 @@ protected function getPostOptions()
     {
         $options = $this->options;
 
-        return http_build_query($options, null, '&');
+        return http_build_query($options, '', '&');
     }
 }

src/Api/Payments/ReservationOfFixedAmount.php

@@ -247,7 +247,7 @@ protected function handleResponse(Request $request, Response $response)
     /**
      * Url to api call
      *
-     * @param array $options Resolved options
+     * @param array<string, string> $options Resolved options
      *
      * @return string
      */

src/Request/Card.php

@@ -53,7 +53,7 @@ class Card
     /**
      * Card security code
      *
-     * @var int
+     * @var int|null
      */
     private $cvc;
 

src/Request/Customer.php

@@ -509,7 +509,7 @@ public function setClientIP($clientIP)
     /**
      * Set Client Accept Language
      *
-     * @param $clientAcceptLanguage
+     * @param string $clientAcceptLanguage
      *
      * @return Customer
      */
@@ -523,7 +523,7 @@ public function setClientAcceptLanguage($clientAcceptLanguage)
     /**
      * Set Client Accept Language
      *
-     * @param $httpUserAgent
+     * @param string $httpUserAgent
      *
      * @return Customer
      */
@@ -537,7 +537,7 @@ public function setHttpUserAgent($httpUserAgent)
     /**
      * Set Client Accept Language
      *
-     * @param $httpXForwardedFor
+     * @param string $httpXForwardedFor
      *
      * @return Customer
      */
@@ -551,7 +551,7 @@ public function setHttpXForwardedFor($httpXForwardedFor)
     /**
      * Set Client Session ID
      *
-     * @param $clientSessionID
+     * @param string $clientSessionID
      *
      * @return Customer
      */
@@ -666,9 +666,9 @@ public function serialize()
     }
 
     /**
-     * @param array   $output
-     * @param         $key
-     * @param Address $object
+     * @param array<string, string> $output
+     * @param string                $key
+     * @param Address               $object
      */
     private static function setAddress(array &$output, $key, Address $object)
     {

src/Response/AbstractResponse.php

@@ -35,7 +35,7 @@ abstract class AbstractResponse
     /**
      * Header of the result
      *
-     * @var Header;
+     * @var Header
      */
     public $Header;
 
@@ -46,6 +46,9 @@ abstract class AbstractResponse
      */
     protected $childs = [];
 
+    /**
+     * @return void
+     */
     public function headerSetter(\SimpleXMLElement $xml = null)
     {
         if ($xml) {
@@ -95,13 +98,14 @@ public function deserialize(\SimpleXMLElement $xml = null)
      *
      * @param object            $object
      * @param \SimpleXMLElement $element
+     * @return void
      */
     private function attributeSetter($object, \SimpleXMLElement $element)
     {
         if ($element) {
             /** @var \SimpleXMLElement $attribute */
             foreach ($element->attributes() as $attribute) {
-                if (isset($attribute) && $attribute) {
+                if ($attribute) {
                     if (!$this->set($object, (string)$attribute, $attribute)) {
                         throw new \InvalidArgumentException(
                             sprintf(
@@ -123,6 +127,7 @@ private function attributeSetter($object, \SimpleXMLElement $element)
      * @param object            $object
      * @param mixed             $data
      * @param \SimpleXMLElement $element
+     * @return void
      */
     private function elementSetter($object, $data, \SimpleXMLElement $element)
     {

src/Response/Embeds/Address.php

@@ -28,12 +28,12 @@
 class Address extends AbstractResponse
 {
     /**
-     * @var Firstname
+     * @var string
      */
     public $Firstname;
 
     /**
-     * @var Lastname
+     * @var string
      */
     public $Lastname;
 
@@ -43,17 +43,17 @@ class Address extends AbstractResponse
     public $Address;
 
     /**
-     * @var City
+     * @var string
      */
     public $City;
 
     /**
-     * @var PostalCode
+     * @var string
      */
     public $PostalCode;
 
     /**
-     * @var Region
+     * @var string
      */
     public $Region;
 
@@ -63,27 +63,27 @@ class Address extends AbstractResponse
     public $Country;
 
     /**
-     * @var billingAddress
+     * @var string
      */
     public $billingAddress;
 
     /**
-     * @var paymentMethod
+     * @var string
      */
     public $paymentMethod;
 
     /**
-     * @var currency
+     * @var string
      */
     public $currency;
 
     /**
-     * @var orderAmount
+     * @var string
      */
     public $orderAmount;
 
     /**
-     * @param $FirstName
+     * @param string $FirstName
      *
      * @return $this
      */