fix: Make SDK compatible with PHP 8.4

.changeset/swift-lions-listen.md

@@ -0,0 +1,5 @@
+---
+"@rebilly/client-php": patch
+---
+
+fix(sdk): Make SDK compatible with PHP 8.4

.github/workflows/pr.yaml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: "Checkout"
@@ -42,17 +42,12 @@ jobs:
         run: composer install --no-interaction --no-scripts --no-suggest
 
       - name: "Run tests"
-        run: vendor/bin/psalm
+        run: vendor/bin/psalm --php-version=${{ matrix.php-version }}
 
   cs:
     name: "Coding Standards"
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version: ['8.0', '8.1', '8.2']
-
     steps:
       - name: "Checkout"
         uses: actions/checkout@v4
@@ -63,7 +58,7 @@ jobs:
       - name: "Install PHP w/ Extensions"
         uses: rebilly/setup-php@main
         with:
-          php-version: ${{ matrix.php-version }}
+          php-version: '8.0'
           extensions: mbstring, intl, curl, json
           tools: composer:v2
 

.github/workflows/preview.yaml

@@ -31,6 +31,8 @@ jobs:
         with:
           node-version: "24"
           cache: "npm"
+          registry-url: "https://npm.pkg.github.com/"
+          scope: "@rebilly"
           cache-dependency-path: |
             package-lock.json
 

README.md

@@ -1,5 +1,6 @@
 # Rebilly SDK for PHP
 
+
 [![Latest Version on Packagist][ico-version]][link-packagist] 
 [![Software License][ico-license]](LICENSE) 
 [![Total Downloads][ico-downloads]][link-downloads] 

composer.json

@@ -18,8 +18,8 @@
     }
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.23",
-    "vimeo/psalm": "^5.14"
+    "friendsofphp/php-cs-fixer": "^3.64",
+    "vimeo/psalm": "^5.26 || ^6.0"
   },
   "autoload-dev": {
     "psr-4": {

package.json

@@ -5,7 +5,7 @@
   "devDependencies": {
     "@changesets/cli": "^2.26.2",
     "@changesets/write": "^0.2.3",
-    "@rebilly/regenerator": "^0.0.7",
+    "@rebilly/regenerator": "^0.0.9",
     "ts-node": "^10.9.2"
   },
   "scripts": {

psalm.xml

@@ -32,5 +32,6 @@
         <UnusedMethod errorLevel="suppress"/>
         <PossiblyUnusedReturnValue errorLevel="suppress"/>
         <ForbiddenCode errorLevel="suppress"/>
+        <MissingOverrideAttribute errorLevel="suppress"/>
     </issueHandlers>
 </psalm>

sdk-generator/templates/static/psalm.xml.handlebars

@@ -32,5 +32,6 @@
         <UnusedMethod errorLevel="suppress"/>
         <PossiblyUnusedReturnValue errorLevel="suppress"/>
         <ForbiddenCode errorLevel="suppress"/>
+        <MissingOverrideAttribute errorLevel="suppress"/>
     </issueHandlers>
 </psalm>

sdk-generator/templates/static/src/Exception/DataValidationException.php.handlebars

@@ -10,7 +10,7 @@ final class DataValidationException extends HttpException
 {
     private array $validationErrors = [];
 
-    public function __construct(array $content = [], $message = '', $code = 0, Exception $previous = null)
+    public function __construct(array $content = [], $message = '', $code = 0, ?Exception $previous = null)
     {
         if (isset($content['invalidFields']) && is_array($content['invalidFields'])) {
             $this->validationErrors = $content['invalidFields'];

src/Exception/DataValidationException.php

@@ -20,7 +20,7 @@ final class DataValidationException extends HttpException
 {
     private array $validationErrors = [];
 
-    public function __construct(array $content = [], $message = '', $code = 0, Exception $previous = null)
+    public function __construct(array $content = [], $message = '', $code = 0, ?Exception $previous = null)
     {
         if (isset($content['invalidFields']) && is_array($content['invalidFields'])) {
             $this->validationErrors = $content['invalidFields'];

src/Exception/GoneException.php

@@ -18,7 +18,7 @@
 
 final class GoneException extends ClientException
 {
-    public function __construct($message = '', $code = 0, Exception $previous = null)
+    public function __construct($message = '', $code = 0, ?Exception $previous = null)
     {
         parent::__construct(410, $message, $code, $previous);
     }

src/Exception/HttpException.php

@@ -20,7 +20,7 @@ class HttpException extends Exception
 {
     private int $statusCode;
 
-    public function __construct($status, $message = '', $code = 0, Exception $previous = null)
+    public function __construct($status, $message = '', $code = 0, ?Exception $previous = null)
     {
         $this->statusCode = (int) $status;
         parent::__construct($message, $code, $previous);

src/Exception/NotFoundException.php

@@ -18,7 +18,7 @@
 
 final class NotFoundException extends ClientException
 {
-    public function __construct($message = '', $code = 0, Exception $previous = null)
+    public function __construct($message = '', $code = 0, ?Exception $previous = null)
     {
         parent::__construct(404, $message, $code, $previous);
     }

src/Exception/TooManyRequestsException.php

@@ -22,7 +22,7 @@ final class TooManyRequestsException extends ClientException
 
     private int $rateLimit;
 
-    public function __construct($retryAfter, $rateLimit = 0, $message = '', $code = 0, Exception $previous = null)
+    public function __construct($retryAfter, $rateLimit = 0, $message = '', $code = 0, ?Exception $previous = null)
     {
         $this->retryAfter = $retryAfter;
         $this->rateLimit = (int) $rateLimit;