PHP 8.4 support (#75)

GrahamCampbell · web-flow · commit 647f42eed906 · 2024-07-20T22:39:40.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -9,6 +9,7 @@
 /phpstan-baseline.neon export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
+/psalm-baseline.xml export-ignore
 /psalm.xml export-ignore
 /README.md export-ignore
 /vendor-bin export-ignore
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout Code
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+        "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -21,7 +21,7 @@ parameters:
 			path: src/PhpOption/Option.php
 
 		-
-			message: "#^Parameter \\#2 \\$callback of function array_reduce expects callable\\(mixed, mixed\\)\\: mixed, Closure\\(mixed, PhpOption\\\\Option\\)\\: mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$callback of function array_reduce expects callable\\(bool\\|TReturn, mixed\\)\\: \\(bool\\|TReturn\\), Closure\\(mixed, PhpOption\\\\Option\\)\\: \\(bool\\|TReturn\\) given\\.$#"
 			count: 1
 			path: src/PhpOption/Option.php
 
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -5,4 +5,3 @@ parameters:
     level: max
     paths:
         - src
-    checkGenericClassInNonGenericObjectType: false
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505"/>
diff --git a/psalm.xml b/psalm.xml
@@ -5,6 +5,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "phpstan/phpstan": "1.10.41"
+        "phpstan/phpstan": "1.11.7"
     },
     "config": {
         "preferred-install": "dist"
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "psalm/phar": "5.15.0"
+        "psalm/phar": "5.25.0"
     },
     "config": {
         "preferred-install": "dist"

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ parameters:`
`21`	`21`	`path: src/PhpOption/Option.php`
`22`	`22`
`23`	`23`	`-`
`24`		`- message: "#^Parameter \\#2 \\$callback of function array_reduce expects callable\\(mixed, mixed\\)\\: mixed, Closure\\(mixed, PhpOption\\\\Option\\)\\: mixed given\\.$#"`
	`24`	`+ message: "#^Parameter \\#2 \\$callback of function array_reduce expects callable\\(bool\\\|TReturn, mixed\\)\\: \\(bool\\\|TReturn\\), Closure\\(mixed, PhpOption\\\\Option\\)\\: \\(bool\\\|TReturn\\) given\\.$#"`
`25`	`25`	`count: 1`
`26`	`26`	`path: src/PhpOption/Option.php`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?xml version="1.0" encoding="UTF-8"?>`
	`2`	`+<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505"/>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "phpstan/phpstan": "1.10.41"`
	`3`	`+ "phpstan/phpstan": "1.11.7"`
`4`	`4`	`},`
`5`	`5`	`"config": {`
`6`	`6`	`"preferred-install": "dist"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "psalm/phar": "5.15.0"`
	`3`	`+ "psalm/phar": "5.25.0"`
`4`	`4`	`},`
`5`	`5`	`"config": {`
`6`	`6`	`"preferred-install": "dist"`