Test against PHP 8.4

Require PHP >= 7.3
Required Guzzle >= 7
Update phpunit config
Fix parsing of account balance object
Fix wrong body parsing in SuccessfulResponseParsingException
Update readme

Author: nickdnk

.github/workflows/test.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
     steps:
       - uses: actions/checkout@v2
       - run: mkdir -p build/logs

.gitignore

@@ -1,3 +1,4 @@
 .idea/
 vendor/
-.phpunit.result.cache
+.phpunit.result.cache
+composer.lock

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.0.0 - 2025-02-05
+* Require at least PHP 7.3.
+* Test against PHP 8.4.
+* Dropped support for Guzzle 6 (now requires Guzzle 7).
+* Updated requirements for `guzzlehttp/oauth-subscriber` to minimum `0.8.1` to address [CVE-2025-21617](https://nvd.nist.gov/vuln/detail/CVE-2025-21617).
+
 ## 3.3.1 - 2024-09-02
 * Test against PHP 8.3.
 * Round the total cost of messages to 5 decimal points.

composer.json

@@ -3,14 +3,14 @@
   "description": "PHP library based on Guzzle for integration with gatewayapi.com",
   "type": "library",
   "require": {
-    "php": "^7.1 || ^8.0",
+    "php": "^7.3 || ^8.0",
     "ext-json": "*",
-    "guzzlehttp/guzzle": "^6.0 || ^7.0",
-    "guzzlehttp/oauth-subscriber": "0.3.* || 0.4.* || 0.5.* || 0.6.*"
+    "guzzlehttp/guzzle": "^7.0",
+    "guzzlehttp/oauth-subscriber": "~0.8.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-    "php-coveralls/php-coveralls": "^v2.5.2"
+    "phpunit/phpunit": "^9.0",
+    "php-coveralls/php-coveralls": "^v2.7.0"
   },
   "license": "mit",
   "authors": [

phpunit.xml

@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false"
+         stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory>./src/</directory>
+        </include>
+        <exclude>
+            <file>./src/Exceptions/ConnectionException.php</file>
+        </exclude>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
     <testsuites>
         <testsuite name="Test">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-            <exclude>
-                <file>./src/Exceptions/ConnectionException.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-</phpunit>
+    <logging/>
+</phpunit>

readme.md

@@ -2,7 +2,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/nickdnk/gatewayapi-php/badge.svg?branch=master)](https://coveralls.io/github/nickdnk/gatewayapi-php?branch=master)
 # GatewayAPI PHP Library
 
-This library will allow you to integrate the **GatewayAPI.com** API in your project using modern PHP7 and an OOP structure.
+This library will allow you to integrate the **GatewayAPI.com** API in your project using modern PHP.
 For full description of their API, error codes and so on, see: <https://gatewayapi.com/docs>.
 
 ### Prerequisites
@@ -15,7 +15,7 @@ Once you have that you need to generate an API key/secret pair under **API** ->
 
 To include this in your project, install it using Composer.
 
-This library requires PHP >= 7.1 and works on 8.0, 8.1 and 8.2.
+This library requires PHP >= 7.3 and is tested against 8.0, 8.1, 8.2, 8.3 and 8.4.
 
 `composer require nickdnk/gatewayapi-php`
 

src/Entities/Constructable.php

@@ -67,7 +67,7 @@ public static function constructFromResponse(ResponseInterface $response)
         } catch (InvalidArgumentException $exception) {
 
             throw new SuccessfulResponseParsingException(
-                'Failed to construct \'' . static::class . '\' from: ' . json_encode($response->getBody()), $response
+                'Failed to construct \'' . static::class . '\' from: ' . $response->getBody(), $response
             );
 
         }

src/Entities/Response/AccountBalance.php

@@ -69,19 +69,19 @@ public function getId(): int
     public static function constructFromArray(array $array): AccountBalance
     {
 
+        // Apparently credit is now a string, but used to be a float.
         if (array_key_exists('credit', $array)
             && array_key_exists('currency', $array)
             && array_key_exists('id', $array)
-            && is_float($array['credit'])
+            && (is_float($array['credit']) || is_string($array['credit']))
             && is_string($array['currency'])
             && is_integer($array['id'])) {
 
-            return new AccountBalance($array['credit'], $array['currency'], $array['id']);
+            return new AccountBalance((float)$array['credit'], $array['currency'], $array['id']);
 
         }
 
         throw new InvalidArgumentException('Array passed to ' . self::class . ' is missing required parameters.');
 
     }
 }
-

tests/AccountBalanceTest.php

@@ -17,7 +17,7 @@ public function testConstructFromResponse()
         $response = new Response(
             200, [], json_encode(
                    [
-                       'credit'   => 1453.55,
+                       'credit'   => '1453.55',
                        'currency' => 'eur',
                        'id'       => 1232323
                    ]