[1.0] Add PHP 8.5 support (#27)

* Add PHP 8.5 support

* Update UriTemplateTest.php

Author: GrahamCampbell

.github/workflows/checks.yml

@@ -11,11 +11,11 @@ permissions:
 jobs:
   composer-normalize:
     name: Composer Normalize
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Composer normalize
         uses: docker://ergebnis/composer-normalize-action

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   build-lowest-version:
     name: Build lowest version
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Set up PHP
@@ -20,7 +20,7 @@ jobs:
           extensions: mbstring
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install dependencies
         run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress
@@ -30,11 +30,11 @@ jobs:
 
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       max-parallel: 10
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     steps:
       - name: Set up PHP
@@ -46,7 +46,7 @@ jobs:
           extensions: mbstring
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install dependencies
         run: composer update --no-interaction --no-progress

.github/workflows/static.yml

@@ -11,16 +11,16 @@ permissions:
 jobs:
   phpstan:
     name: PHPStan
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.2'
           coverage: none
           extensions: mbstring, intl
 
@@ -35,11 +35,11 @@ jobs:
 
   php-cs-fixer:
     name: PHP-CS-Fixer
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -59,16 +59,16 @@ jobs:
 
   psalm:
     name: Psalm
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.2'
           coverage: none
           extensions: mbstring, intl
 

composer.json

@@ -47,7 +47,7 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "phpunit/phpunit" : "^8.5.36 || ^9.6.15",
+        "phpunit/phpunit": "^8.5.44 || ^9.6.25",
         "uri-template/tests": "1.0.0"
     },
     "autoload": {

psalm-baseline.xml

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

tests/UriTemplateTest.php

@@ -12,7 +12,7 @@
  */
 final class UriTemplateTest extends TestCase
 {
-    public function templateProvider(): array
+    public static function templateProvider(): array
     {
         $variables = [
             'var' => 'value',
@@ -126,7 +126,7 @@ public function testExpandsUriTemplates(string $template, string $expansion, arr
         self::assertSame($expansion, UriTemplate::expand($template, $variables));
     }
 
-    public function expressionProvider(): array
+    public static function expressionProvider(): array
     {
         return [
             [
@@ -167,12 +167,16 @@ public function testParsesExpressions(string $exp, array $data): void
     {
         $template = new UriTemplate();
 
-        // Access the config object
         $class = new \ReflectionClass($template);
+
         $method = $class->getMethod('parseExpression');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         $exp = \substr($exp, 1, -1);
+
         self::assertSame($data, $method->invokeArgs($template, [$exp]));
     }
 
@@ -200,7 +204,7 @@ public function testAllowsNestedArrayExpansion(): void
         self::assertSame('http://example.com/foo/bar/one,two?query=test&more%5B0%5D=fun&more%5B1%5D=ice%20cream&baz%5Bbar%5D=fizz&baz%5Btest%5D=buzz&bam=boo', $result);
     }
 
-    public function specComplianceProvider(): \Generator
+    public static function specComplianceProvider(): \Generator
     {
         foreach (['spec-examples.json', 'spec-examples-by-section.json', 'extended-tests.json'] as $filename) {
             foreach (self::parseSpecExamples($filename) as $example) {

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

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

vendor-bin/phpstan/composer.json

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

vendor-bin/psalm/composer.json

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