feat(*): Add php 8.5 compatibility

.github/workflows/coding-standards.yml

@@ -27,7 +27,7 @@ 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 test
     runs-on: ubuntu-latest
@@ -89,7 +89,6 @@ jobs:
         run: ddev phpstan /var/www/html/${{env.EXTENSION_PATH}}/tools/coding-standards phpstan/phpstan.neon /var/www/html/${{env.EXTENSION_PATH}}/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 /var/www/html/${{env.EXTENSION_PATH}}/tools/coding-standards/psalm
 
       - name: Run PHPUNIT Code Coverage

.github/workflows/php-sdk-development-tests.yml

@@ -37,7 +37,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: Unit and integration test
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -2,12 +2,11 @@ name: Create Release
 # example: gh workflow run release.yml -f tag_name=v1.1.4
 on:
   workflow_dispatch:
-    branches:
-      - main
     inputs:
       tag_name:
         type: string
         required: true
+        description: Tag with v prefix
 
 jobs:
   prepare-release:

.github/workflows/unit-and-integration-test.yml

@@ -33,7 +33,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: Unit and integration test
     runs-on: ubuntu-latest

docs/DEVELOPER.md

@@ -129,12 +129,18 @@ mkdir cfssl
 cp -r .ddev/okaeli-add-on/custom_files/crowdsec/cfssl/* cfssl
 ```
 
+Delete existing decisions: 
+
+```bash
+ddev exec -s crowdsec cscli alerts delete --all 
+```
+
 Finally, run
 
 In order to launch integration tests, we have to set some environment variables:
 
 ```bash
-ddev exec BOUNCER_KEY=<BOUNCER_KEY> AGENT_TLS_PATH=/var/www/html/cfssl APPSEC_URL=http://crowdsec:7422 LAPI_URL=https://crowdsec:8080 php ./my-code/lapi-client/vendor/bin/phpunit  ./my-code/lapi-client/tests/Integration --configuration ./my-code/lapi-client/tools/coding-standards/phpunit/phpunit.xml --testdox --exclude-group timeout     
+ddev exec BOUNCER_KEY=<BOUNCER_KEY> AGENT_TLS_PATH=/var/www/html/cfssl APPSEC_URL=http://crowdsec:7422 LAPI_URL=https://crowdsec:8080 php ./my-code/lapi-client/vendor/bin/phpunit  --configuration ./my-code/lapi-client/tools/coding-standards/phpunit/phpunit.xml --testsuite Integration-Watcher,Integration-Bouncer --testdox --exclude-group timeout,appsec     
 ```
 
 `<BOUNCER_KEY>` should have been created and retrieved before this test by running `ddev create-bouncer`.
@@ -143,7 +149,7 @@ If you need to test with a TLS authentication, you should launch:
 
 ```bash
 ddev exec BOUNCER_TLS_PATH=/var/www/html/cfssl BOUNCER_KEY=<BOUNCER_KEY> AGENT_TLS_PATH=/var/www/html/cfssl 
-APPSEC_URL=http://crowdsec:7422 LAPI_URL=https://crowdsec:8080 php ./my-code/lapi-client/vendor/bin/phpunit  ./my-code/lapi-client/tests/Integration --testdox --exclude-group timeout     
+APPSEC_URL=http://crowdsec:7422 LAPI_URL=https://crowdsec:8080 php ./my-code/lapi-client/vendor/bin/phpunit  --configuration ./my-code/lapi-client/tools/coding-standards/phpunit/phpunit.xml --testsuite Integration-Watcher,Integration-Bouncer --testdox --exclude-group timeout     
 ```
 
 #### Coding standards

src/Bouncer.php

@@ -14,6 +14,8 @@
  * @copyright Copyright (c) 2022+ CrowdSec
  * @license   MIT License
  *
+ * @psalm-api
+ *
  * @psalm-import-type TMetric       from \CrowdSec\LapiClient\Metrics
  * @psalm-import-type TOS           from \CrowdSec\LapiClient\Metrics
  * @psalm-import-type TMeta         from \CrowdSec\LapiClient\Metrics

src/Configuration.php

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

src/Configuration/Alert.php

@@ -25,6 +25,7 @@ class Alert extends AbstractConfiguration
         'remediation',
     ];
 
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('alert');

src/Configuration/Alert/Decision.php

@@ -20,6 +20,7 @@ class Decision extends AbstractConfiguration
         'scenario',
     ];
 
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('decision');

src/Configuration/Alert/Event.php

@@ -15,6 +15,7 @@ class Event extends AbstractConfiguration
         'timestamp',
     ];
 
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('event');

src/Configuration/Alert/Meta.php

@@ -15,6 +15,7 @@ class Meta extends AbstractConfiguration
         'value',
     ];
 
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('meta');

src/Configuration/Alert/Source.php

@@ -22,6 +22,7 @@ class Source extends AbstractConfiguration
         'longitude',
     ];
 
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('source');

src/Configuration/Metrics.php

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

src/Configuration/Metrics/Items.php

@@ -32,6 +32,7 @@ class Items extends AbstractConfiguration
      * Keep only necessary configs
      * Override because $configs is an array of array (metrics item) and we want to clean each item.
      */
+    #[\Override]
     public function cleanConfigs(array $configs): array
     {
         $result = [];
@@ -46,6 +47,7 @@ public function cleanConfigs(array $configs): array
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      */
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('metricsItemsConfig');

src/Configuration/Metrics/Meta.php

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

src/Configuration/Watcher.php

@@ -67,6 +67,7 @@ class Watcher extends Configuration
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      */
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = parent::getConfigTreeBuilder();
@@ -88,6 +89,7 @@ public function getConfigTreeBuilder(): TreeBuilder
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      */
+    #[\Override]
     protected function validateApiKey($rootNode): void
     {
         $rootNode

src/Payload/Alert.php

@@ -133,6 +133,7 @@ public function __construct(
     }
 
     /**
+     * @psalm-api
      * @param TAlertFull $data
      */
     public static function fromArray(array $data): self
@@ -186,6 +187,7 @@ public function toArray(): array
      * @return array
      */
     #[\ReturnTypeWillChange]
+    #[\Override]
     public function jsonSerialize()
     {
         return $this->toArray();

src/Watcher.php

@@ -18,6 +18,8 @@
  *
  * If you use `auth_type = api_key` you must provide configs `machine_id` and `password`.
  *
+ * @psalm-api
+ *
  * @psalm-import-type TWatcherConfig from WatcherConfig
  * @psalm-import-type TAlertFull from \CrowdSec\LapiClient\Payload\Alert
  * @psalm-import-type TDecision from \CrowdSec\LapiClient\Payload\Alert
@@ -210,6 +212,7 @@ public function getAlertById(int $id): ?array
     /**
      * @inheritDoc
      */
+    #[\Override]
     protected function getConfiguration(): Configuration
     {
         return new WatcherConfig();

tests/PHPUnitUtil.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);
     }

tools/coding-standards/composer.json

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

tools/coding-standards/psalm/psalm.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <psalm
         errorLevel="5"
+        findUnusedIssueHandlerSuppression="false"
         resolveFromConfigFile="true"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="https://getpsalm.org/schema/config"
@@ -28,6 +29,7 @@
                 <file name="../../../src/Payload/Alert.php"/>
             </errorLevel>
         </UndefinedMethod>
+        <UnusedMethodCall errorLevel="suppress"/>
         <RiskyTruthyFalsyComparison>
             <errorLevel type="suppress">
                 <file name="../../../src/Bouncer.php"/>