PHP 8.4 support

Author: GrahamCampbell

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
     strategy:
       max-parallel: 10
       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: Set up PHP

phpstan-baseline.neon

@@ -0,0 +1,19 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Cannot cast mixed to string\.$#'
+			identifier: cast.string
+			count: 5
+			path: src/UriTemplate.php
+
+		-
+			message: '#^Method GuzzleHttp\\UriTemplate\\UriTemplate\:\:isAssoc\(\) has parameter \$array with no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
+			count: 1
+			path: src/UriTemplate.php
+
+		-
+			message: '#^Parameter \#1 \$matches of static method GuzzleHttp\\UriTemplate\\UriTemplate\:\:expandMatch\(\) expects array\<string\>, array given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/UriTemplate.php

phpstan.neon.dist

@@ -1,10 +1,4 @@
 parameters:
     level: max
-    checkMissingIterableValueType: false
     paths:
         - src
-    ignoreErrors:
-        -
-            message: "#^Cannot cast mixed to string\\.$#"
-            count: 5
-            path: src/UriTemplate.php

psalm-baseline.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="src/UriTemplate.php">
     <UndefinedFunction>
-      <code>\preg_last_error_msg()</code>
+      <code><![CDATA[\preg_last_error_msg()]]></code>
     </UndefinedFunction>
   </file>
 </files>

psalm.xml

@@ -6,6 +6,8 @@
     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" />

vendor-bin/php-cs-fixer/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "friendsofphp/php-cs-fixer": "3.52.1"
+        "friendsofphp/php-cs-fixer": "3.68.5"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/phpstan/composer.json

@@ -1,8 +1,8 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpstan/phpstan": "1.10.47",
-        "phpstan/phpstan-deprecation-rules": "1.1.4"
+        "phpstan/phpstan": "2.1.2",
+        "phpstan/phpstan-deprecation-rules": "2.0.1"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/psalm/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "psalm/phar": "5.16.0"
+        "psalm/phar": "5.26.1"
     },
     "config": {
         "preferred-install": "dist"