feat(php 8.5): Handle deprecated warnings

.github/workflows/coding-standards.yml

@@ -5,6 +5,11 @@ on:
       - main
     paths-ignore:
       - '**.md'
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '**.md'
   workflow_dispatch:
     inputs:
       coverage_report:
@@ -20,7 +25,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
@@ -77,7 +82,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: Prepare integration tests

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

@@ -47,7 +47,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/unit-and-integration-test.yml

@@ -35,7 +35,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

src/Client/AbstractClient.php

@@ -36,6 +36,9 @@ public function __construct(
         parent::__construct($configs, $this->capiHandler, $logger);
     }
 
+    /**
+     * @psalm-api
+     */
     public function getCapiHandler(): CapiHandlerInterface
     {
         return $this->capiHandler;

src/Client/CapiHandler/CapiHandlerInterface.php

@@ -20,6 +20,7 @@ interface CapiHandlerInterface extends RequestHandlerInterface
 {
     /**
      * Retrieve decisions list from a blocklist url.
+     * @psalm-api
      */
     public function getListDecisions(string $url, array $headers = []): string;
 }

src/Client/CapiHandler/Curl.php

@@ -16,9 +16,12 @@
  *
  * @copyright Copyright (c) 2022+ CrowdSec
  * @license   MIT License
+ *
+ * @psalm-api
  */
 class Curl extends CommonCurl implements CapiHandlerInterface
 {
+    #[\Override]
     public function getListDecisions(string $url, array $headers = []): string
     {
         $handle = curl_init();
@@ -30,7 +33,9 @@ public function getListDecisions(string $url, array $headers = []): string
 
         $statusCode = $this->getResponseHttpCode($handle);
 
-        curl_close($handle);
+        if (PHP_VERSION_ID < 80000) {
+            curl_close($handle);
+        }
 
         return 200 === $statusCode ? (string) $response : '';
     }

src/Client/CapiHandler/FileGetContents.php

@@ -16,9 +16,13 @@
  *
  * @copyright Copyright (c) 2022+ CrowdSec
  * @license   MIT License
+ *
+ * @psalm-api
+ *
  */
 class FileGetContents extends CommonFileGetContents implements CapiHandlerInterface
 {
+    #[\Override]
     public function getListDecisions(string $url, array $headers = []): string
     {
         $config = $this->createListContextConfig($headers);

src/Configuration/Signal.php

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

src/Configuration/Signal/Decisions.php

@@ -40,6 +40,7 @@ class Decisions extends AbstractConfiguration
      * Keep only necessary configs
      * Override because $configs is an array of array (decision) and we want to clean each decision.
      */
+    #[\Override]
     public function cleanConfigs(array $configs): array
     {
         $result = [];
@@ -54,6 +55,7 @@ public function cleanConfigs(array $configs): array
      * @throws \InvalidArgumentException
      * @throws \RuntimeException
      */
+    #[\Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('signalDecisionsConfig');

src/Configuration/Signal/Source.php

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

src/Configuration/Watcher.php

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

src/Storage/FileStorage.php

@@ -15,6 +15,8 @@
  *
  * @copyright Copyright (c) 2022+ CrowdSec
  * @license   MIT License
+ *
+ * @psalm-api
  */
 class FileStorage implements StorageInterface
 {
@@ -38,34 +40,39 @@ public function __construct(string $rootDir = __DIR__, string $env = Constants::
         $this->env = $env;
     }
 
+    #[\Override]
     public function retrieveMachineId(): ?string
     {
         $storageContent = $this->readFile($this->getBasePath() . self::MACHINE_ID_FILE);
 
         return !empty($storageContent['machine_id']) ? $storageContent['machine_id'] : null;
     }
 
+    #[\Override]
     public function retrievePassword(): ?string
     {
         $storageContent = $this->readFile($this->getBasePath() . self::PASSWORD_FILE);
 
         return !empty($storageContent['password']) ? $storageContent['password'] : null;
     }
 
+    #[\Override]
     public function retrieveScenarios(): ?array
     {
         $storageContent = $this->readFile($this->getBasePath() . self::SCENARIOS_FILE);
 
         return !empty($storageContent['scenarios']) ? $storageContent['scenarios'] : null;
     }
 
+    #[\Override]
     public function retrieveToken(): ?string
     {
         $storageContent = $this->readFile($this->getBasePath() . self::TOKEN_FILE);
 
         return !empty($storageContent['token']) ? $storageContent['token'] : null;
     }
 
+    #[\Override]
     public function storeMachineId(string $machineId): bool
     {
         try {
@@ -78,6 +85,7 @@ public function storeMachineId(string $machineId): bool
         return true;
     }
 
+    #[\Override]
     public function storePassword(string $password): bool
     {
         try {
@@ -90,6 +98,7 @@ public function storePassword(string $password): bool
         return true;
     }
 
+    #[\Override]
     public function storeScenarios(array $scenarios): bool
     {
         try {
@@ -102,6 +111,7 @@ public function storeScenarios(array $scenarios): bool
         return true;
     }
 
+    #[\Override]
     public function storeToken(string $token): bool
     {
         try {

src/Storage/StorageInterface.php

@@ -15,6 +15,8 @@
  *
  * @copyright Copyright (c) 2022+ CrowdSec
  * @license   MIT License
+ *
+ * @psalm-api
  */
 interface StorageInterface
 {

src/Watcher.php

@@ -20,6 +20,8 @@
  *
  * @see      https://crowdsec.net CrowdSec Official Website
  *
+ * @psalm-api
+ *
  * @copyright Copyright (c) 2022+ CrowdSec
  * @license   MIT License
  */

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

@@ -2,6 +2,7 @@
 <psalm
     errorLevel="5"
     resolveFromConfigFile="true"
+    findUnusedIssueHandlerSuppression="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
@@ -14,6 +15,7 @@
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
+        <UnusedMethodCall errorLevel="info"/>
         <UndefinedInterfaceMethod>
             <errorLevel type="suppress">
                 <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::integerNode"/>