Merge branch 'php85'

Author: lkrms

.github/workflows/ci.yml

@@ -140,6 +140,8 @@ jobs:
             php-version: "8.0"
           - os: ubuntu-24.04
             php-version: "7.4"
+          - os: ubuntu-24.04
+            php-version: "8.5"
 
     runs-on: ${{ matrix.os }}
 
@@ -284,6 +286,8 @@ jobs:
             php-version: "8.0"
           - os: ubuntu-24.04
             php-version: "7.4"
+          - os: ubuntu-24.04
+            php-version: "8.5"
 
     runs-on: ${{ matrix.os }}
 

.php-cs-fixer.dist.php

@@ -5,6 +5,8 @@
     'T_PROTECTED_SET',
     'T_PUBLIC_SET',
     'T_PROPERTY_C',
+    'T_VOID_CAST',
+    'T_PIPE',
     'T_ATTRIBUTE_COMMENT',
     'T_CLOSE_ALT',
     'T_NULL',

.vscode/launch.json

@@ -111,7 +111,7 @@
             ]
         },
         {
-            "name": "Format current file, with optional arguments (PHP 8.4)",
+            "name": "Format current file, with optional arguments (PHP 8.5)",
             "type": "php",
             "request": "launch",
             "program": "${workspaceFolder:pretty-php}/bin/pretty-php",
@@ -120,7 +120,7 @@
             "runtimeExecutable": "bash",
             "runtimeArgs": [
                 "-c",
-                "eval \"args=(${*: -1})\" && php84 \"${@:1:$#-1}\" \"${args[@]}\"",
+                "eval \"args=(${*: -1})\" && php85 \"${@:1:$#-1}\" \"${args[@]}\"",
                 "bash",
                 "-dzend_extension=xdebug.so",
                 "-dxdebug.start_with_request=yes",

bootstrap.php

@@ -19,6 +19,9 @@
         'T_PROTECTED_SET' => false,
         'T_PUBLIC_SET' => false,
         'T_PROPERTY_C' => false,
+        // PHP 8.5
+        'T_VOID_CAST' => false,
+        'T_PIPE' => false,
         // Custom
         'T_ATTRIBUTE_COMMENT' => false,
         'T_CLOSE_ALT' => false,
@@ -77,6 +80,10 @@
     defined('T_PUBLIC_SET') || define('T_PUBLIC_SET', $getNextId());
     defined('T_PROPERTY_C') || define('T_PROPERTY_C', $getNextId());
 
+    // Define PHP 8.5 tokens
+    defined('T_VOID_CAST') || define('T_VOID_CAST', $getNextId());
+    defined('T_PIPE') || define('T_PIPE', $getNextId());
+
     // Define custom tokens
     $id = 20000;
     defined('T_ATTRIBUTE_COMMENT') || define('T_ATTRIBUTE_COMMENT', $getNextId());

composer.json

@@ -18,14 +18,14 @@
         "ext-mbstring": "*",
         "ext-tokenizer": "*",
         "composer-runtime-api": "^2.2",
-        "salient/cli": "0.99.79",
-        "salient/collections": "0.99.79",
-        "salient/console": "0.99.79",
-        "salient/contracts": "0.99.79",
-        "salient/core": "0.99.79",
-        "salient/phpdoc": "0.99.79",
-        "salient/polyfills": "0.99.79",
-        "salient/utils": "0.99.79",
+        "salient/cli": "0.99.81",
+        "salient/collections": "0.99.81",
+        "salient/console": "0.99.81",
+        "salient/contracts": "0.99.81",
+        "salient/core": "0.99.81",
+        "salient/phpdoc": "0.99.81",
+        "salient/polyfills": "0.99.81",
+        "salient/utils": "0.99.81",
         "sebastian/diff": "^4 || ^5"
     },
     "require-dev": {
@@ -36,9 +36,9 @@
         "phpstan/phpstan-deprecation-rules": "^2",
         "phpstan/phpstan-phpunit": "^2",
         "phpunit/phpunit": "^9",
-        "salient/phpstan": "0.99.79",
-        "salient/sli": "0.99.79",
-        "salient/testing": "0.99.79"
+        "salient/phpstan": "0.99.81",
+        "salient/sli": "0.99.81",
+        "salient/testing": "0.99.81"
     },
     "autoload": {
         "psr-4": {