Fix php8.4 deprecations and add CI versions

composer · Mar 15, 2024 · 28fb502 · 28fb502 · Seldaek · Mar 15, 2024
1 parent 02b8774
commit 28fb502
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -22,6 +22,9 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
 
     steps:
       - name: "Checkout"

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         php-version:
           - "7.2"
-          - "8.1"
+          - "8.3"
 
     steps:
       - name: "Checkout"

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         php-version:
           - "7.2"
-          - "8.1"
+          - "8.3"
 
     steps:
       - name: "Checkout"

diff --git a/src/Preg.php b/src/Preg.php
@@ -147,7 +147,7 @@ public static function matchAllWithOffsets(string $pattern, string $subject, ?ar
      *
      * @param-out int<0, max> $count
      */
-    public static function replace($pattern, $replacement, $subject, int $limit = -1, int &$count = null): string
+    public static function replace($pattern, $replacement, $subject, int $limit = -1, ?int &$count = null): string
     {
         if (!is_scalar($subject)) {
             if (is_array($subject)) {
@@ -174,7 +174,7 @@ public static function replace($pattern, $replacement, $subject, int $limit = -1
      *
      * @param-out int<0, max> $count
      */
-    public static function replaceCallback($pattern, callable $replacement, $subject, int $limit = -1, int &$count = null, int $flags = 0): string
+    public static function replaceCallback($pattern, callable $replacement, $subject, int $limit = -1, ?int &$count = null, int $flags = 0): string
     {
         if (!is_scalar($subject)) {
             if (is_array($subject)) {
@@ -204,7 +204,7 @@ public static function replaceCallback($pattern, callable $replacement, $subject
      *
      * @param-out int<0, max> $count
      */
-    public static function replaceCallbackArray(array $pattern, $subject, int $limit = -1, int &$count = null, int $flags = 0): string
+    public static function replaceCallbackArray(array $pattern, $subject, int $limit = -1, ?int &$count = null, int $flags = 0): string
     {
         if (!is_scalar($subject)) {
             if (is_array($subject)) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,9 @@ jobs: @@
               - "7.4"
               - "8.0"
               - "8.1"
+              - "8.2"
+              - "8.3"
+              - "8.4"
         steps:
           - name: "Checkout"
@@ Expand Down @@