fix(captcha): Use a patch to remove deprecated warning in PHP 8.4 (#27)

* fix(gregwar): Use patch to fix gregwar deprecated issue in PHP 8.4

* fix(gregwar): Allow patch for coding tools

Author: julienloizelet

CHANGELOG.md

@@ -11,6 +11,16 @@ protected methods, properties and constants belonging to the `src` folder and of
 
 ---
 
+## [1.3.1](https://github.com/crowdsecurity/cs-standalone-php-bouncer/releases/tag/v1.3.1) - 2024-12-12
+
+[_Compare with previous release_](https://github.com/crowdsecurity/cs-standalone-php-bouncer/compare/v1.3.0...v1.3.1)
+
+### Fixed
+
+- Fix Captcha deprecated warning in PHP 8.4
+
+---
+
 ## [1.3.0](https://github.com/crowdsecurity/cs-standalone-php-bouncer/releases/tag/v1.3.0) - 2024-11-05
 
 [_Compare with previous release_](https://github.com/crowdsecurity/cs-standalone-php-bouncer/compare/v1.2.0...v1.3.0)

composer.json

@@ -41,10 +41,23 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "crowdsec/bouncer": "^3.2.0"
+        "crowdsec/bouncer": "^3.2.0",
+        "cweagans/composer-patches": "^1.7"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5.30 || ^9.3",
         "mikey179/vfsstream": "^1.6.11"
+    },
+    "config": {
+        "allow-plugins": {
+            "cweagans/composer-patches": true
+        }
+    },
+    "extra": {
+        "patches": {
+            "gregwar/captcha": {
+                "Fix deprecation in CaptchaBuilder constructor": "patches/gregwar-captcha-constructor.patch"
+            }
+        }
     }
 }

patches/gregwar-captcha-constructor.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Gregwar/Captcha/CaptchaBuilder.php b/src/Gregwar/Captcha/CaptchaBuilder.php
+index ab8d93f..67e77cf 100644
+--- a/src/Gregwar/Captcha/CaptchaBuilder.php
++++ b/src/Gregwar/Captcha/CaptchaBuilder.php
+@@ -133,7 +133,7 @@ class CaptchaBuilder implements CaptchaBuilderInterface
+      */
+     public $tempDir = 'temp/';
+
+-    public function __construct($phrase = null, PhraseBuilderInterface $builder = null)
++    public function __construct($phrase = null, ?PhraseBuilderInterface $builder = null)
+     {
+         if ($builder === null) {
+             $this->builder = new PhraseBuilder;

src/Constants.php

@@ -21,5 +21,5 @@ class Constants extends LibConstants
     /** @var string The user agent suffix for CrowdSec api calls */
     public const USER_AGENT_SUFFIX = 'Standalone';
     /** @var string The last version of this bouncer */
-    public const VERSION = 'v1.3.0';
+    public const VERSION = 'v1.3.1';
 }

tools/coding-standards/composer.json

@@ -21,5 +21,10 @@
       "type": "path",
       "url": "../../"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "cweagans/composer-patches": true
+    }
   }
-}
+}