Merge pull request #66 from academe/misc-fixes

judgej · web-flow · commit 6027cfba8283 · 2023-09-19T19:26:49.000+01:00
Misc fixes
diff --git a/.gitignore b/.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
diff --git a/.travis.yml b/.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
diff --git a/composer.json b/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": {
diff --git a/phpunit.xml b/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>
diff --git a/src/Request/AbstractInstruction.php b/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 = [];
diff --git a/src/Request/CreateCardIdentifier.php b/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();
diff --git a/src/Request/CreatePayment.php b/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.
diff --git a/src/Request/CreateRefund.php b/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.
diff --git a/src/Request/CreateRelease.php b/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();
diff --git a/src/Request/CreateRepeatPayment.php b/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.
diff --git a/src/Request/CreateSecure3D.php b/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 [
diff --git a/src/Request/CreateSessionKey.php b/src/Request/CreateSessionKey.php
@@ -27,6 +27,7 @@ public function __construct(Endpoint $endpoint, Auth $auth)
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [
diff --git a/src/Request/FetchInstructions.php b/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()
     {
     }
diff --git a/src/Request/FetchSessionKey.php b/src/Request/FetchSessionKey.php
@@ -50,6 +50,7 @@ public function getMerchantSessionKey()
     /**
      * This message has no body.
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
     }
diff --git a/src/Request/FetchTransaction.php b/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()
     {
     }
diff --git a/src/Request/LinkSecurityCode.php b/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 = [
diff --git a/src/Request/Model/Address.php b/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 = [
diff --git a/src/Request/Model/Person.php b/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.
diff --git a/src/Request/Model/ReusableCard.php b/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 = [
diff --git a/src/Request/Model/ReusableCvvCard.php b/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 = [
diff --git a/src/Request/Model/SingleUseCard.php b/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 = [
diff --git a/src/Response/AbstractInstruction.php b/src/Response/AbstractInstruction.php
@@ -44,6 +44,7 @@ public function getDate()
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [
diff --git a/src/Response/AbstractTransaction.php b/src/Response/AbstractTransaction.php
@@ -294,6 +294,7 @@ public function getAvsCvcCheck()
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = [];
diff --git a/src/Response/CardIdentifier.php b/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 [
diff --git a/src/Response/ErrorCollection.php b/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 = [
diff --git a/src/Response/InstructionCollection.php b/src/Response/InstructionCollection.php
@@ -42,6 +42,7 @@ public function setData($data, $httpCode = null)
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [
diff --git a/src/Response/Model/Amount.php b/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();
diff --git a/src/Response/Model/AvsCvcCheck.php b/src/Response/Model/AvsCvcCheck.php
@@ -152,6 +152,7 @@ public function getData()
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getData();
diff --git a/src/Response/Model/Card.php b/src/Response/Model/Card.php
@@ -128,6 +128,7 @@ public function getData()
      * Serialisation for storage.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getData();
diff --git a/src/Response/Model/Error.php b/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 = [
diff --git a/src/Response/NoContent.php b/src/Response/NoContent.php
@@ -20,6 +20,7 @@ public function setData($data)
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [];
diff --git a/src/Response/Secure3D.php b/src/Response/Secure3D.php
@@ -61,6 +61,7 @@ public function isSuccess()
      * Convenient serialisation for logging and debugging.
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $return = [];
diff --git a/src/Response/Secure3DRedirect.php b/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();
diff --git a/src/Response/SessionKey.php b/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 [
diff --git a/src/Security/SensitiveValue.php b/src/Security/SensitiveValue.php
@@ -64,6 +64,7 @@ public function unserialize($serialized)
     /**
      * {@inheritDoc}
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
     }
diff --git a/src/ServerRequest/Secure3DAcs.php b/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 [
diff --git a/tests/Request/Model/AddressTest.php b/tests/Request/Model/AddressTest.php

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public function __construct(Endpoint $endpoint, Auth $auth, $transactionId)`
`33`	`33`	`* Get the message body data for serializing.`
`34`	`34`	`* @return array`
`35`	`35`	`*/`
	`36`	`+ #[\ReturnTypeWillChange]`
`36`	`37`	`public function jsonSerialize()`
`37`	`38`	`{`
`38`	`39`	`$body = [];`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ public function getSecurityCode()`
`101`	`101`	`* Replace all card detail characters with asterisks.`
`102`	`102`	`* @return array`
`103`	`103`	`*/`
	`104`	`+ #[\ReturnTypeWillChange]`
`104`	`105`	`public function jsonSerialize()`
`105`	`106`	`{`
`106`	`107`	`$data = $this->jsonSerializePeek();`
Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,7 @@ public function withReferrerId($referrerId)`
`328`	`328`	`* Get the message body data for serializing.`
`329`	`329`	`* @return array`
`330`	`330`	`*/`
	`331`	`+ #[\ReturnTypeWillChange]`
`331`	`332`	`public function jsonSerialize()`
`332`	`333`	`{`
`333`	`334`	`// The mandatory fields.`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ protected function getTransactionId()`
`115`	`115`	`* Get the message body data for serializing.`
`116`	`116`	`* @return array`
`117`	`117`	`*/`
	`118`	`+ #[\ReturnTypeWillChange]`
`118`	`119`	`public function jsonSerialize()`
`119`	`120`	`{`
`120`	`121`	`// The mandatory fields.`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public function __construct(Endpoint $endpoint, Auth $auth, $transactionId, Amou`
`34`	`34`	`* Get the message body data for serializing.`
`35`	`35`	`* @return array`
`36`	`36`	`*/`
	`37`	`+ #[\ReturnTypeWillChange]`
`37`	`38`	`public function jsonSerialize()`
`38`	`39`	`{`
`39`	`40`	`$body = parent::jsonSerialize();`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ public function withGiftAid($giftAid)`
`185`	`185`	`* Get the message body data for serializing.`
`186`	`186`	`* @return array`
`187`	`187`	`*/`
	`188`	`+ #[\ReturnTypeWillChange]`
`188`	`189`	`public function jsonSerialize()`
`189`	`190`	`{`
`190`	`191`	`// The mandatory fields.`