Fix php8.4 deprecations and add CI versions

Seldaek · Seldaek · commit 28fb502a83ad · 2024-03-15T13:59:09.000+01:00
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
           - "7.4"
           - "8.0"
           - "8.1"
 +          - "8.2"
 +          - "8.3"
 +          - "8.4"
     steps:
       - name: "Checkout"
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public static function matchAllWithOffsets(string $pattern, string $subject, ?ar`
`147`	`147`	`*`
`148`	`148`	`* @param-out int<0, max> $count`
`149`	`149`	`*/`
`150`		`- public static function replace($pattern, $replacement, $subject, int $limit = -1, int &$count = null): string`
	`150`	`+ public static function replace($pattern, $replacement, $subject, int $limit = -1, ?int &$count = null): string`
`151`	`151`	`{`
`152`	`152`	`if (!is_scalar($subject)) {`
`153`	`153`	`if (is_array($subject)) {`
`@@ -174,7 +174,7 @@ public static function replace($pattern, $replacement, $subject, int $limit = -1`
`174`	`174`	`*`
`175`	`175`	`* @param-out int<0, max> $count`
`176`	`176`	`*/`
`177`		`- public static function replaceCallback($pattern, callable $replacement, $subject, int $limit = -1, int &$count = null, int $flags = 0): string`
	`177`	`+ public static function replaceCallback($pattern, callable $replacement, $subject, int $limit = -1, ?int &$count = null, int $flags = 0): string`
`178`	`178`	`{`
`179`	`179`	`if (!is_scalar($subject)) {`
`180`	`180`	`if (is_array($subject)) {`
`@@ -204,7 +204,7 @@ public static function replaceCallback($pattern, callable $replacement, $subject`
`204`	`204`	`*`
`205`	`205`	`* @param-out int<0, max> $count`
`206`	`206`	`*/`
`207`		`- public static function replaceCallbackArray(array $pattern, $subject, int $limit = -1, int &$count = null, int $flags = 0): string`
	`207`	`+ public static function replaceCallbackArray(array $pattern, $subject, int $limit = -1, ?int &$count = null, int $flags = 0): string`
`208`	`208`	`{`
`209`	`209`	`if (!is_scalar($subject)) {`
`210`	`210`	`if (is_array($subject)) {`