feat(log): Allow symfony v7 and monolog v3

crowdsecurity · Jan 31, 2025 · cc8b47f · cc8b47f
1 parent 71e93e2
commit cc8b47f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,14 +11,24 @@ As far as possible, we try to adhere to [Symfony guidelines](https://symfony.com
 
 ---
 
+## [4.2.0](https://github.com/crowdsecurity/php-cs-bouncer/releases/tag/v4.1.0) - 2025-01-31
+[_Compare with previous release_](https://github.com/crowdsecurity/php-cs-bouncer/compare/v4.1.0...v4.2.0)
+
+
+### Changed
+
+- Allow Monolog 3 package and Symfony 7 packages
+
+---
+
 
 ## [4.1.0](https://github.com/crowdsecurity/php-cs-bouncer/releases/tag/v4.1.0) - 2025-01-10
 [_Compare with previous release_](https://github.com/crowdsecurity/php-cs-bouncer/compare/v4.0.0...v4.1.0)
 
 
 ### Changed
 
-- Do not save origins count when the bouncer does not bounce the IP, due to business logic. This avoids sending a 
+- Do not save origins count when the bouncer does not bounce the IP, due to business logic. This avoids sending a
   "processed" usage metrics to the LAPI when the IP is not bounced at all.
 
 ---

diff --git a/composer.json b/composer.json
@@ -41,18 +41,25 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "crowdsec/remediation-engine": "^4.0.0",
-        "crowdsec/common": "^2.3.2",
-        "symfony/config": "^4.4.27 || ^5.2 || ^6.0",
+        "crowdsec/remediation-engine": "^4.2.0",
+        "crowdsec/lapi-client": "^3.6.0",
+        "crowdsec/common": "^3.0.0",
+        "symfony/config": "^4.4.27 || ^5.2 || ^6.0 || ^7.2",
+        "monolog/monolog": "^1.17 || ^2.1 || ^3.8",
+        "psr/log": "^1.0 || ^2.0 || ^3.0",
         "twig/twig": "^3.4.2",
         "gregwar/captcha": "^1.2.1",
         "mlocati/ip-lib": "^1.18",
         "ext-json": "*",
         "ext-gd": "*"
     },
+    "suggest": {
+        "ext-curl": "*"
+    },
     "require-dev": {
         "phpunit/phpunit": "^8.5.30 || ^9.3",
         "mikey179/vfsstream": "^1.6.11",
-        "nikic/php-parser": "^4.18"
+        "nikic/php-parser": "^4.18",
+        "ext-curl": "*"
     }
 }
diff --git a/src/Constants.php b/src/Constants.php
@@ -31,7 +31,7 @@ class Constants extends RemConstants
     /** @var string Path for html templates folder (e.g. ban and captcha wall) */
     public const TEMPLATES_DIR = __DIR__ . '/templates';
     /** @var string The last version of this library */
-    public const VERSION = 'v4.1.0';
+    public const VERSION = 'v4.2.0';
     /** @var string The "disabled" x-forwarded-for setting */
     public const X_FORWARDED_DISABLED = 'no_forward';
 }
diff --git a/tests/Integration/AbstractBouncerTest.php b/tests/Integration/AbstractBouncerTest.php
@@ -126,7 +126,7 @@ protected function setUp(): void
         $currentDate = date('Y-m-d');
         $this->debugFile = 'debug-' . $currentDate . '.log';
         $this->prodFile = 'prod-' . $currentDate . '.log';
-        $this->logger = new FileLog(['log_directory_path' => $this->root->url(), 'debug_mode' => true]);
+        $this->logger = new FileLog(['log_directory_path' => $this->root->url(), 'debug_mode' => true, 'log_rotator' => true]);
 
         $bouncerConfigs = [
             'auth_type' => $this->useTls ? \CrowdSec\LapiClient\Constants::AUTH_TLS : Constants::AUTH_KEY,