feat(php 8.2): Updates for PHP 8.2 compatibility

Author: julienloizelet

CHANGELOG.md

@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Do not cache bypass decision in stream mode
 - Replace unauthorized chars by underscore `_` in cache key
 
+### Added
+- Add compatibility with PHP 8.2
+
 ### Fixed
 - Fix decision duration parsing when it uses milliseconds
 

composer.json

@@ -50,7 +50,7 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "8.5.27",
+        "phpunit/phpunit": "^8.5.30 || ^9.3",
         "ext-curl": "*"
     },
     "suggest": {

src/AbstractCache.php

@@ -583,7 +583,8 @@ private function configureAdapter(): void
                     $this->adapter = new RedisTagAwareAdapter((RedisAdapter::createConnection($redisDsn)));
                 } catch (Exception $e) {
                     throw new BouncerException('Error when connecting to Redis.' .
-                                               ' Please fix the Redis DSN or select another cache technology.');
+                                               ' Please fix the Redis DSN or select another cache technology.' .
+                                                ' Initial error was: ' . $e->getMessage());
                 }
                 break;
 
@@ -619,7 +620,7 @@ private static function parseDurationToSeconds(string $duration): int
         $re = '/(-?)(?:(?:(\d+)h)?(\d+)m)?(\d+).\d+(m?)s/m';
         preg_match($re, $duration, $matches);
         if (!\count($matches)) {
-            throw new BouncerException("Unable to parse the following duration: ${$duration}.");
+            throw new BouncerException('Unable to parse the following duration: ' . $duration);
         }
         $seconds = 0;
         if (isset($matches[2])) {

src/Fixes/Gregwar/Captcha/CaptchaBuilder.php

@@ -5,14 +5,22 @@
 use Gregwar\Captcha\CaptchaBuilder as GregwarCaptchaBuilder;
 
 /**
- * Override to fix "implicit conversion error on PHP  8.1"
+ * 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
  * @SuppressWarnings(PHPMD.ElseExpression)
  *
  */
 class CaptchaBuilder extends GregwarCaptchaBuilder
 {
+    /**
+     * @var false|int
+     */
+    protected $background = false;
     /**
      * Writes the phrase on the image
      */

src/Remediation.php

@@ -57,8 +57,8 @@ public static function sortRemediationByPriority(array $remediations): array
         }
 
         // Sort by priorities.
-        /** @var callable $compareFunction */
-        $compareFunction = 'self::comparePriorities';
+        /** @var callable $compareFunction  */
+        $compareFunction = self::class . '::comparePriorities';
         usort($remediationsWithPriorities, $compareFunction);
 
         return $remediationsWithPriorities;

tests/end-to-end/package.json

@@ -23,8 +23,7 @@
     "jest-playwright-preset": "^1.4.3",
     "jest-runner": "^26.6.3",
     "lodash": "^4.17.21",
-    "playwright-chromium": "1.22.2",
-    "soap": "^0.42.0",
+    "playwright-chromium": "^1.27.1",
     "ws": "^7.4.6"
   }
 }