feat(*): Handle PHP 8.5

Author: julienloizelet

.github/workflows/coding-standards.yml

@@ -24,11 +24,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     name: Coding standards
     runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, 'chore(') }}
     env:
       EXTENSION_PATH: "my-code/crowdsec-bouncer-lib"
 
@@ -86,7 +85,6 @@ jobs:
         run: ddev phpmd ./${{env.EXTENSION_PATH}}/tools/coding-standards phpmd/rulesets.xml ../../src
 
       - name: Run PSALM
-        if: contains(fromJson('["7.4","8.0","8.1","8.2","8.3"]'),matrix.php-version)
         run: ddev psalm ./${{env.EXTENSION_PATH}}/tools/coding-standards ./${{env.EXTENSION_PATH}}/tools/coding-standards/psalm
 
       - name: Prepare for Code Coverage

.github/workflows/keepalive.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     name: Test suite
     runs-on: ubuntu-latest

.github/workflows/test-suite.yml

@@ -41,14 +41,14 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "crowdsec/remediation-engine": "^4.2.0",
-        "crowdsec/lapi-client": "^3.6.0",
-        "crowdsec/common": "^3.0.0",
+        "crowdsec/remediation-engine": "^4.3.2",
+        "crowdsec/lapi-client": "^3.7.1",
+        "crowdsec/common": "^3.0.1",
         "symfony/config": "^4.4.27 || ^5.2 || ^6.0 || ^7.2",
         "monolog/monolog": "^1.17 || ^2.1 || ^3.8",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "twig/twig": "^3.4.2",
-        "gregwar/captcha": "^1.2.1",
+        "gregwar/captcha": "^1.3.0",
         "mlocati/ip-lib": "^1.18",
         "ext-json": "*",
         "ext-gd": "*"

composer.json

@@ -33,6 +33,7 @@
  *
  * @copyright Copyright (c) 2021+ CrowdSec
  * @license   MIT License
+ * @psalm-api
  */
 abstract class AbstractBouncer
 {

src/AbstractBouncer.php

@@ -46,6 +46,7 @@ class Configuration extends AbstractConfiguration
     /**
      * @throws \InvalidArgumentException
      */
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('config');

src/Configuration.php

@@ -140,7 +140,7 @@ private function getMultipartRawBody(
 
             foreach ($filesData as $fileKey => $fileArray) {
                 $fileNames = is_array($fileArray['name']) ? $fileArray['name'] : [$fileArray['name']];
-                foreach ($fileNames as $index => $fileName) {
+                foreach ($fileNames as $index => $_fileName) {
                     $remainingSize = $threshold - $currentSize;
                     $fileData =
                         $this->appendFileData($fileArray, $index, $fileKey, $boundary, $remainingSize, $currentSize);

src/Helper.php

@@ -6,7 +6,6 @@
 
 use CrowdSec\Common\Client\RequestHandler\Curl;
 use CrowdSec\Common\Client\RequestHandler\FileGetContents;
-use CrowdSec\Common\Logger\ConsoleLog;
 use CrowdSec\Common\Logger\FileLog;
 use CrowdSec\LapiClient\Bouncer as BouncerClient;
 use CrowdSec\RemediationEngine\CacheStorage\AbstractCache;

tests/Integration/AbstractBouncerTest.php

@@ -22,7 +22,10 @@ public static function callMethod($obj, $name, array $args)
     {
         $class = new \ReflectionClass($obj);
         $method = $class->getMethod($name);
-        $method->setAccessible(true);
+        // setAccessible() is only needed for PHP < 8.1 and deprecated in PHP 8.5
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         return $method->invokeArgs($obj, $args);
     }

tests/PHPUnitUtil.php

@@ -4,9 +4,8 @@
     "friendsofphp/php-cs-fixer": "^v3.8.0",
     "phpstan/phpstan": "^1.8.0",
     "phpmd/phpmd": "^2.12.0",
-    "squizlabs/php_codesniffer": "3.7.1",
-    "vimeo/psalm": "^4.24.0 || ^5.26.0",
-    "nikic/php-parser": "^4.18",
+    "squizlabs/php_codesniffer": "3.7.1 || ^4.0.1",
+    "vimeo/psalm": "^4.24.0 || ^5.26 || ^6.13.1",
     "phpunit/phpunit": "^9.3",
     "phpunit/php-code-coverage": "^9.2.15",
     "mikey179/vfsstream": "^1.6.11",