Merge pull request #66 from academe/misc-fixes

Misc fixes

.gitignore

@@ -34,4 +34,8 @@ atlassian-ide-plugin.xml
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
-crashlytics-build.properties
+crashlytics-build.properties
+
+vendor
+.phpunit.result.cache
+composer.lock

.travis.yml

@@ -1,11 +1,11 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
- 
+  - 7.4
+  - 8.0
+  - 8.1
+  - 8.2
+
 before_script:
   - composer self-update
   - composer install --no-interaction

composer.json

@@ -30,7 +30,8 @@
         "guzzlehttp/guzzle": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.0"
+        "phpunit/phpunit": "^9.6",
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -7,8 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
     <testsuites>
         <testsuite name="SagePay Pi Test Suite">
             <directory suffix=".php">./tests/</directory>

src/Request/AbstractInstruction.php

@@ -33,6 +33,7 @@ public function __construct(Endpoint $endpoint, Auth $auth, $transactionId)
      * Get the message body data for serializing.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $body = [];

src/Request/CreateCardIdentifier.php

@@ -101,6 +101,7 @@ public function getSecurityCode()
      * Replace all card detail characters with asterisks.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $data = $this->jsonSerializePeek();

src/Request/CreatePayment.php

@@ -328,6 +328,7 @@ public function withReferrerId($referrerId)
      * Get the message body data for serializing.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         // The mandatory fields.

src/Request/CreateRefund.php

@@ -115,6 +115,7 @@ protected function getTransactionId()
      * Get the message body data for serializing.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         // The mandatory fields.

src/Request/CreateRelease.php

@@ -34,6 +34,7 @@ public function __construct(Endpoint $endpoint, Auth $auth, $transactionId, Amou
      * Get the message body data for serializing.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $body = parent::jsonSerialize();

src/Request/CreateRepeatPayment.php

@@ -185,6 +185,7 @@ public function withGiftAid($giftAid)
      * Get the message body data for serializing.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         // The mandatory fields.

src/Request/CreateSecure3D.php

@@ -44,6 +44,7 @@ public function __construct(Endpoint $endpoint, Auth $auth, $paRes, $transaction
      * Get the message body data for serializing.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [

src/Request/CreateSessionKey.php

@@ -27,6 +27,7 @@ public function __construct(Endpoint $endpoint, Auth $auth)
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [

src/Request/FetchInstructions.php

@@ -15,6 +15,7 @@ class FetchInstructions extends AbstractInstruction
      * Get the message body data for serializing.
      * There is no body data for this message.
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
     }

src/Request/FetchSessionKey.php

@@ -50,6 +50,7 @@ public function getMerchantSessionKey()
     /**
      * This message has no body.
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
     }

src/Request/FetchTransaction.php

@@ -40,6 +40,7 @@ public function getTransactionId()
      * Get the message body data for serializing.
      * There is no body data for this message.
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
     }

src/Request/LinkSecurityCode.php

@@ -69,6 +69,7 @@ public function getCardIdentifier()
      * Get the message body data for serializing.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = [

src/Request/Model/Address.php

@@ -124,6 +124,7 @@ protected function addFieldPrefix($field)
      *
      * @return array Data for passing to the API, requiring JSON conversion first.
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = [

src/Request/Model/Person.php

@@ -79,6 +79,7 @@ public function getPhone()
     /**
      * @return array The Person returned as an array for the API, requiring conversion to JSON
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         // First/last name is always required.

src/Request/Model/ReusableCard.php

@@ -55,6 +55,7 @@ public static function fromData($data)
      * Return the complete object data for serialized storage.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $message = [

src/Request/Model/ReusableCvvCard.php

@@ -30,6 +30,7 @@ public function __construct($sessionKey, $cardIdentifier)
      * Return the complete object data for serialized storage.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $message = [

src/Request/Model/SingleUseCard.php

@@ -79,6 +79,7 @@ public function withSave($save = true)
      * Return the complete object data for serialized storage.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $message = [

src/Response/AbstractInstruction.php

@@ -44,6 +44,7 @@ public function getDate()
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [

src/Response/AbstractTransaction.php

@@ -294,6 +294,7 @@ public function getAvsCvcCheck()
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = [];

src/Response/CardIdentifier.php

@@ -103,6 +103,7 @@ public function isExpired()
      * Reduce the object to an array so it can be serialised and stored between pages.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [

src/Response/ErrorCollection.php

@@ -123,6 +123,7 @@ public function isError()
      * Reduce the object to an array so it can be serialised.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = [

src/Response/InstructionCollection.php

@@ -42,6 +42,7 @@ public function setData($data, $httpCode = null)
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [

src/Response/Model/Amount.php

@@ -112,6 +112,7 @@ public function getData()
      * Serialisation for storage/logging/debug.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getData();

src/Response/Model/AvsCvcCheck.php

@@ -152,6 +152,7 @@ public function getData()
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getData();

src/Response/Model/Card.php

@@ -128,6 +128,7 @@ public function getData()
      * Serialisation for storage.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getData();

src/Response/Model/Error.php

@@ -209,6 +209,7 @@ public static function fromData($data, $httpCode = null)
      * Reduce the object to an array so it can be serialised.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = [

src/Response/NoContent.php

@@ -20,6 +20,7 @@ public function setData($data)
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [];

src/Response/Secure3D.php

@@ -61,6 +61,7 @@ public function isSuccess()
      * Convenient serialisation for logging and debugging.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = [];

src/Response/Secure3DRedirect.php

@@ -84,6 +84,7 @@ public function getPaRequestFields($termUrl = null, $md = null)
      * Convenient serialisation for logging and debugging.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = parent::jsonSerialize();

src/Response/SessionKey.php

@@ -122,6 +122,7 @@ public function toHtmlElements()
      * Reduce the object to an array so it can be serialised.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [

src/Security/SensitiveValue.php

@@ -64,6 +64,7 @@ public function unserialize($serialized)
     /**
      * {@inheritDoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
     }

src/ServerRequest/Secure3DAcs.php

@@ -41,6 +41,7 @@ protected function setData($data)
      * Only needed for debugging or logging.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [