Merge branch 'php-8.5-support'

Author: lkrms

.gitattributes

@@ -11,7 +11,12 @@
 /docs export-ignore
 /phpstan* export-ignore
 /phpstan-baseline-7.4.neon linguist-generated
+/phpstan-baseline-8.0.neon linguist-generated
+/phpstan-baseline-8.1.neon linguist-generated
+/phpstan-baseline-8.2.neon linguist-generated
 /phpstan-baseline-8.3.neon linguist-generated
+/phpstan-baseline-8.4.neon linguist-generated
+/phpstan-baseline-8.5.neon linguist-generated
 /phpunit* export-ignore
 /scripts export-ignore
 /src/Toolkit/Cli/CliOptionBuilder.php linguist-generated

.github/workflows/ci.yml

@@ -57,12 +57,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      # PHP 8.3 is needed to parse DNF types in test fixtures, and
-      # php-cs-fixer doesn't support PHP 8.4
+      # PHP 8.3+ is needed to parse DNF types in test fixtures
       - name: Setup PHP and Composer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           coverage: none
 
       - name: Get Composer cache directory
@@ -101,7 +100,12 @@ jobs:
       matrix:
         php-version:
           - "8.4"
+          - "8.3"
+          - "8.2"
+          - "8.1"
+          - "8.0"
           - "7.4"
+          - "8.5"
 
     runs-on: ubuntu-24.04
 
@@ -169,6 +173,8 @@ jobs:
             php-version: "7.4"
           - os: windows-latest
             php-version: "7.4"
+          - os: ubuntu-24.04
+            php-version: "8.5"
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/documentation.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup PHP and Composer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           coverage: none
 
       - name: Get Composer cache directory

.phive/phars.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.94" location="./tools/pretty-php" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.46.0" installed="3.87.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.46.0" installed="3.89.2" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="salient-labs/changelog" version="^1.0.5" installed="1.0.8" location="./tools/changelog" copy="true"/>
-  <phar name="composer-require-checker" version="^4.16.1" installed="4.16.1" location="./tools/composer-require-checker" copy="true"/>
+  <phar name="composer-require-checker" version="^4.16.1" installed="4.18.0" location="./tools/composer-require-checker" copy="true"/>
 </phive>

.php-cs-fixer.dist.php

@@ -1,10 +1,8 @@
 <?php
 
 $customTokens = [
-    'T_PRIVATE_SET',
-    'T_PROTECTED_SET',
-    'T_PUBLIC_SET',
-    'T_PROPERTY_C',
+    'T_VOID_CAST',
+    'T_PIPE',
     'T_OPEN_BRACE',
     'T_OPEN_BRACKET',
     'T_OPEN_PARENTHESIS',
@@ -40,6 +38,7 @@
 
 /** @disregard P1009 */
 return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRules([
         'fully_qualified_strict_types' => true,
         'is_null' => true,

composer.json

@@ -16,7 +16,7 @@
     "require": {
         "php": ">=7.4",
         "composer-runtime-api": "^2.2",
-        "lkrms/dice": "^4.1.11",
+        "lkrms/dice": "^4.1.12",
         "psr/container": "^2",
         "psr/event-dispatcher": "^1",
         "psr/http-client": "^1",
@@ -26,7 +26,7 @@
         "psr/simple-cache": "^1 || ^2"
     },
     "require-dev": {
-        "adodb/adodb-php": "^5",
+        "adodb/adodb-php": "dev-master",
         "analog/analog": "^1",
         "ergebnis/phpunit-slow-test-detector": "^2",
         "firebase/php-jwt": "^6",