feat(*): Prepare release 0.26.0

Author: julienloizelet

CHANGELOG.md

@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
+## [0.26.0] - 2022-07-28
+
+### Changed
+- *Breaking change*: Modify all constructors (`Bouncer`, `ApiCache`, `ApiClient`, `RestClient`) to use only 
+  configurations and logger as parameters
+- Use `shouldBounceCurrentIp` method of Standalone before bouncer instantiation
+- Modify logger constructor
+
 ## [0.25.0] - 2022-07-22
 
 ### Added

scripts/auto-prepend/refresh-cache.php

@@ -16,7 +16,7 @@
 }elseif($crowdSecStandaloneBouncerConfig['bouncing_level'] === 'flex_boucing'){
     $crowdSecStandaloneBouncerConfig['bouncing_level'] = 'flex_bouncing';
 }
-
+$bounce->initLogger($crowdSecStandaloneBouncerConfig);
 $bouncer = $bounce->init($crowdSecStandaloneBouncerConfig);
 $bouncer->refreshBlocklistCache();
 echo 'Cache has been refreshed'.PHP_EOL;

src/Constants.php

@@ -20,7 +20,7 @@ class Constants
     public const DEFAULT_LAPI_URL = 'http://localhost:8080';
 
     /** @var string The last version of this library */
-    public const VERSION = 'v0.25.0';
+    public const VERSION = 'v0.26.0';
 
     /** @var string The user agent used to send request to LAPI */
     public const BASE_USER_AGENT = 'PHP CrowdSec Bouncer/' . self::VERSION;

src/StandaloneBounce.php

@@ -363,8 +363,8 @@ public function safelyBounce(array $configs): bool
             if ($this->shouldBounceCurrentIp()) {
                 $this->init($configs);
                 $this->run();
+                $result = true;
             }
-            $result = true;
         } catch (Exception $e) {
             if ($this->logger) {
                 $this->logger->error('', [

tests/end-to-end/php-scripts/cache-actions.php.dist

@@ -13,6 +13,7 @@ if (isset($_GET['action']) && in_array($_GET['action'],['refresh', 'clear', 'pru
     $action = $_GET['action'];
     $bounce = new StandaloneBounce();
     /** @var $crowdSecStandaloneBouncerConfig */
+    $bounce->initLogger($crowdSecStandaloneBouncerConfig);
     $bouncer = $bounce->init($crowdSecStandaloneBouncerConfig);
     switch ($action) {
         case 'refresh':

tests/end-to-end/php-scripts/geolocation-test.php.dist

@@ -30,6 +30,7 @@ if (isset($_GET['ip'])) {
     $bounce = new StandaloneBounce();
     /** @var $crowdSecStandaloneBouncerConfig */
     $finalConfig = array_merge($crowdSecStandaloneBouncerConfig, ['geolocation' => $geolocConfig]);
+    $bounce->initLogger($finalConfig);
     $bouncer = $bounce->init($finalConfig);
     $apiCache = $bouncer->getApiCache();