Merge pull request #126 from julienloizelet/feat/update-gregwar-captcha-bis

feat(captcha): Update gregwar captcha to 1.2.0 and remove some fixes

Author: julienloizelet

CHANGELOG.md

@@ -9,6 +9,16 @@ The [public API](https://semver.org/spec/v2.0.0.html#spec-item-1) of this librar
 
 ---
 
+## [?.?.?](https://github.com/crowdsecurity/php-cs-bouncer/releases/tag/v?.?.?) - ?.?.?
+[_Compare with previous release_](https://github.com/crowdsecurity/php-cs-bouncer/compare/v1.4.0...v?.?.?)
+
+
+### Changed
+- Update `gregwar/captcha` from `1.1.9` to `1.2.0` and remove some override fixes
+
+---
+
+
 ## [1.4.0](https://github.com/crowdsecurity/php-cs-bouncer/releases/tag/v1.4.0) - 2023-03-30
 [_Compare with previous release_](https://github.com/crowdsecurity/php-cs-bouncer/compare/v1.3.0...v1.4.0)
 

composer.json

@@ -44,7 +44,7 @@
         "crowdsec/common": "^2.1.0",
         "symfony/config": "^4.4.27 || ^5.2 || ^6.0",
         "twig/twig": "^3.4.2",
-        "gregwar/captcha": "^1.1",
+        "gregwar/captcha": "^1.2.0",
         "mlocati/ip-lib": "^1.18",
         "ext-json": "*",
         "ext-gd": "*"

src/Fixes/Gregwar/Captcha/CaptchaBuilder.php

@@ -7,8 +7,6 @@
 /**
  * Override to :
  * - fix "implicit conversion error on PHP  8.1"
- * - fix "creation of dynamic property $background error on PHP 8.2"
- *
  *
  * @see https://github.com/crowdsecurity/php-cs-bouncer/issues/62 and
  * @see https://github.com/Gregwar/Captcha/pull/101/files
@@ -18,10 +16,6 @@
  */
 class CaptchaBuilder extends GregwarCaptchaBuilder
 {
-    /**
-     * @var false|int
-     */
-    protected $background = false;
     /**
      * Writes the phrase on the image
      */
@@ -60,26 +54,4 @@ protected function writePhrase($image, $phrase, $font, $width, $height)
 
         return $col;
     }
-
-
-    /**
-     * Returns a random number or the next number in the
-     * fingerprint
-     */
-    protected function rand($min, $max)
-    {
-        if (!is_array($this->fingerprint)) {
-            $this->fingerprint = array();
-        }
-
-        if ($this->useFingerprint) {
-            $value = current($this->fingerprint);
-            next($this->fingerprint);
-        } else {
-            $value = mt_rand((int) $min, (int) $max);
-            $this->fingerprint[] = $value;
-        }
-
-        return $value;
-    }
 }

tests/Unit/StandaloneBouncerTest.php

@@ -60,7 +60,6 @@
  * @covers \CrowdSecBouncer\StandaloneBouncer::getPostedVariable
  * @covers \CrowdSecBouncer\AbstractBouncer::checkCaptcha
  * @covers \CrowdSecBouncer\AbstractBouncer::buildCaptchaCouple
- * @covers \CrowdSecBouncer\Fixes\Gregwar\Captcha\CaptchaBuilder::rand
  * @covers \CrowdSecBouncer\Fixes\Gregwar\Captcha\CaptchaBuilder::writePhrase
  * @covers \CrowdSecBouncer\AbstractBouncer::getCache
  * @covers \CrowdSecBouncer\AbstractBouncer::getBanHtml