Merge pull request #69 from cedric-anne/feature/php-8.4

vearutop · web-flow · commit 7ebc4eab95bc · 2025-03-10T09:22:10.000+01:00
Add PHP 8.4 support
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ 'ubuntu-latest' ]
-        php-versions: [ '5.6', '7.0', '7.1', '7.2', '7.3', '8.0', '8.1' ]
+        php-versions: [ '7.1', '7.2', '7.3', '8.0', '8.1', '8.2', '8.3', '8.4' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/composer.json b/composer.json
@@ -10,7 +10,8 @@
     }
   ],
   "require": {
-    "ext-json": "*"
+    "ext-json": "*",
+    "php": ">=7.1"
   },
   "require-dev": {
     "phperf/phpunit": "4.8.37"
@@ -27,7 +28,7 @@
   },
   "config": {
     "platform": {
-      "php": "5.4.45"
+      "php": "7.1.33"
     }
   }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/src/InvalidFieldTypeException.php b/src/InvalidFieldTypeException.php
@@ -27,7 +27,7 @@ public function __construct(
         $expectedType,
         $operation,
         $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     )
     {
         parent::__construct(
diff --git a/src/MissingFieldException.php b/src/MissingFieldException.php
@@ -22,7 +22,7 @@ public function __construct(
         $missingField,
         $operation,
         $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     )
     {
         parent::__construct('Missing "' . $missingField . '" in operation data', $code, $previous);
diff --git a/src/PatchTestOperationFailedException.php b/src/PatchTestOperationFailedException.php
@@ -23,7 +23,7 @@ public function __construct(
         $operation,
         $actualValue,
         $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     )
     {
         parent::__construct('Test operation ' . json_encode($operation, JSON_UNESCAPED_SLASHES)
diff --git a/src/PathException.php b/src/PathException.php
@@ -29,7 +29,7 @@ public function __construct(
         $operation,
         $field,
         $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     )
     {
         parent::__construct($message, $code, $previous);
diff --git a/src/UnknownOperationException.php b/src/UnknownOperationException.php
@@ -19,7 +19,7 @@ class UnknownOperationException extends Exception
     public function __construct(
         $operation,
         $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     )
     {
         // @phpstan-ignore-next-line MissingFieldOperation will be thrown if op is not set

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
`13`		`- "ext-json": "*"`
	`13`	`+ "ext-json": "*",`
	`14`	`+ "php": ">=7.1"`
`14`	`15`	`},`
`15`	`16`	`"require-dev": {`
`16`	`17`	`"phperf/phpunit": "4.8.37"`
`@@ -27,7 +28,7 @@`
`27`	`28`	`},`
`28`	`29`	`"config": {`
`29`	`30`	`"platform": {`
`30`		`- "php": "5.4.45"`
	`31`	`+ "php": "7.1.33"`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __construct(`
`27`	`27`	`$expectedType,`
`28`	`28`	`$operation,`
`29`	`29`	`$code = 0,`
`30`		`- Throwable $previous = null`
	`30`	`+ ?Throwable $previous = null`
`31`	`31`	`)`
`32`	`32`	`{`
`33`	`33`	`parent::__construct(`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(`
`22`	`22`	`$missingField,`
`23`	`23`	`$operation,`
`24`	`24`	`$code = 0,`
`25`		`- Throwable $previous = null`
	`25`	`+ ?Throwable $previous = null`
`26`	`26`	`)`
`27`	`27`	`{`
`28`	`28`	`parent::__construct('Missing "' . $missingField . '" in operation data', $code, $previous);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function __construct(`
`23`	`23`	`$operation,`
`24`	`24`	`$actualValue,`
`25`	`25`	`$code = 0,`
`26`		`- Throwable $previous = null`
	`26`	`+ ?Throwable $previous = null`
`27`	`27`	`)`
`28`	`28`	`{`
`29`	`29`	`parent::__construct('Test operation ' . json_encode($operation, JSON_UNESCAPED_SLASHES)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(`
`29`	`29`	`$operation,`
`30`	`30`	`$field,`
`31`	`31`	`$code = 0,`
`32`		`- Throwable $previous = null`
	`32`	`+ ?Throwable $previous = null`
`33`	`33`	`)`
`34`	`34`	`{`
`35`	`35`	`parent::__construct($message, $code, $previous);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class UnknownOperationException extends Exception`
`19`	`19`	`public function __construct(`
`20`	`20`	`$operation,`
`21`	`21`	`$code = 0,`
`22`		`- Throwable $previous = null`
	`22`	`+ ?Throwable $previous = null`
`23`	`23`	`)`
`24`	`24`	`{`
`25`	`25`	`// @phpstan-ignore-next-line MissingFieldOperation will be thrown if op is not set`