Merge branch '5.1' into 5.2

userfrosting · Nov 30, 2024 · c791afc · c791afc
2 parents b5ec0b7 + 4828684
commit c791afc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['8.1', '8.2', '8.3']
+        php_versions: ['8.1', '8.2', '8.3', '8.4']
         os: [ubuntu-latest, windows-latest]
 
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/PHPStan.yml b/.github/workflows/PHPStan.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['8.1', '8.2', '8.3']
+        php_versions: ['8.1', '8.2', '8.3', '8.4']
 
     runs-on: ubuntu-latest
     name: PHPStan - ${{ matrix.php_versions }}

diff --git a/src/Fortress/ServerSideValidator.php b/src/Fortress/ServerSideValidator.php
@@ -86,7 +86,7 @@ public function data(): array
      *
      * @return mixed[]|bool
      */
-    public function errors(string $field = null)
+    public function errors(string|null $field = null)
     {
         if ($field !== null) {
             return isset($this->errors[$field]) ? $this->errors[$field] : false;