Merge pull request #105 from julienloizelet/feat/update-symfony

Feat/update symfony

Author: julienloizelet

.github/workflows/release.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Check version ${{ env.VERSION_NUMBER }} consistency in files
         # Check src/Constants.php and CHANGELOG.md
         run: |
-          : # Check public const VERSION = 'vVERSION_NUMBER'; in CHANGELOG.md in src/Constants.php
+          # Check public const VERSION = 'vVERSION_NUMBER'; in CHANGELOG.md in src/Constants.php
           CONSTANT_VERSION=$(grep -E "public const VERSION = 'v(.*)';"  src/Constants.php | sed 's/ //g')
           if [[ $CONSTANT_VERSION == "publicconstVERSION='v${{ env.VERSION_NUMBER }}';" ]]
           then
@@ -54,7 +54,7 @@ jobs:
           exit 1
           fi
           
-          : # Check top ## [VERSION_NUMBER](GITHUB_URL/releases/tag/vVERSION_NUMBER) - yyyy-mm-dd in CHANGELOG.md
+          # Check top ## [VERSION_NUMBER](GITHUB_URL/releases/tag/vVERSION_NUMBER) - yyyy-mm-dd in CHANGELOG.md
           CURRENT_DATE=$(date +'%Y-%m-%d')
           echo $CURRENT_DATE
           CHANGELOG_VERSION=$(grep -o -E "## \[(.*)\].* - $CURRENT_DATE"  CHANGELOG.md | head -1 | sed 's/ //g')
@@ -67,7 +67,7 @@ jobs:
               exit 1
           fi
           
-          : # Check top [_Compare with previous release_](GITHUB_URL/compare/vLAST_TAG...vVERSION_NUMBER) in CHANGELOG.md
+          # Check top [_Compare with previous release_](GITHUB_URL/compare/vLAST_TAG...vVERSION_NUMBER) in CHANGELOG.md
           COMPARISON=$(grep -oP "\/compare\/\K(.*)$" CHANGELOG.md | head -1)
           LAST_TAG=$(curl -Ls -o /dev/null -w %{url_effective} ${{ env.GITHUB_URL }}/releases/latest | grep -oP "\/tag\/\K(.*)$")
           if [[ $COMPARISON == "$LAST_TAG...v${{ env.VERSION_NUMBER }})" ]]

CHANGELOG.md

@@ -5,6 +5,12 @@ 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.30.0](https://github.com/crowdsecurity/php-cs-bouncer/releases/tag/v0.30.0) - 2022-09-22
+[_Compare with previous release_](https://github.com/crowdsecurity/php-cs-bouncer/compare/v0.29.0...v0.30.0)
+
+### Changed
+- Update `symfony/cache` and `symfony/config` dependencies requirement
+
 ## [0.29.0](https://github.com/crowdsecurity/php-cs-bouncer/releases/tag/v0.29.0) - 2022-08-11
 [_Compare with previous release_](https://github.com/crowdsecurity/php-cs-bouncer/compare/v0.28.0...v0.29.0)
 

composer.json

@@ -40,8 +40,8 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "symfony/config": "^4.4.27 || ^5.2",
-        "symfony/cache": "5.4.7 || 6.0.6",
+        "symfony/config": "^4.4.27 || ^5.2 || ^6.0",
+        "symfony/cache": "^5.4.11 || ^6.0.11",
         "monolog/monolog": "^1.17 || ^2.1",
         "gregwar/captcha": "^1.1",
         "mlocati/ip-lib": "^1.18",

docs/USER_GUIDE.md

@@ -42,9 +42,9 @@ Please note that first and foremost a CrowdSec agent must be installed on a serv
 
 ## Features
 
-- CrowdSec LAPI Support
+- CrowdSec Local API Support
   - Handle IP, IP ranges and Country scoped decisions
-  - Clear, prune and refresh the LAPI cache
+  - Clear, prune and refresh the Local API cache
   - `Live mode` or `Stream mode`
 - Large PHP matrix compatibility: 7.2.x, 7.3.x, 7.4.x, 8.0.x and 8.1.x
 - Built-in support for the most known cache systems like Redis, Memcached, PhpFiles
@@ -117,7 +117,7 @@ Please look at the [Settings example file](../scripts/auto-prepend/settings.exam
 
 Here is the list of available settings:
 
-##### LAPI Connection
+##### Local API Connection
 
 - `auth_type`: Select from `api_key` and `tls`. Choose if you want to use an API-KEY or a TLS (pki) authentification.
   TLS authentication is only available if you use CrowdSec agent with a version superior to 1.4.0.
@@ -147,13 +147,13 @@ Here is the list of available settings:
   Only required if you choose `tls` as `auth_type` and `tls_verify_peer` is set to true.
 
 
-- `api_url`: Define the URL to your LAPI server, default to `http://localhost:8080`.
+- `api_url`: Define the URL to your Local API server, default to `http://localhost:8080`.
 
 
-- `api_timeout`: In seconds. The timeout when calling LAPI. Must be greater or equal than 1. Default to 1 sec.
+- `api_timeout`: In seconds. The timeout when calling Local API. Must be greater or equal than 1. Default to 1 sec.
 
 
-- `use_curl`: By default, this lib call the REST LAPI using `file_get_contents` method (`allow_url_fopen` is required).
+- `use_curl`: By default, this lib call the REST Local API using `file_get_contents` method (`allow_url_fopen` is required).
   You can set `use_curl` to `true` in order to use `cURL` request instead (`curl` is in then required)
 
 

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.29.0';
+    public const VERSION = 'v0.30.0';
 
     /** @var string The user agent used to send request to LAPI */
     public const BASE_USER_AGENT = 'PHP CrowdSec Bouncer/' . self::VERSION;

src/RestClient/Curl.php

@@ -121,6 +121,7 @@ private function createOptions(
 
     /**
      * @param $handle
+     *
      * @return mixed
      */
     protected function getResponseHttpCode($handle)