Merge pull request #82 from julienloizelet/feat/memcached-php-8-1

Feat/memcached php 8 1

Author: julienloizelet

.github/workflows/test-suite.yml

@@ -62,6 +62,7 @@ jobs:
           ddev --version
           ddev exec php -v
           ddev exec -s crowdsec crowdsec -version
+          ddev php -r "echo phpversion('memcached');"
 
       - name: Clone PHP lib Crowdsec files
         uses: actions/checkout@v2
@@ -87,9 +88,12 @@ jobs:
           tar -xf GeoLite2-City.tar.gz
           rm GeoLite2-Country.tar.gz GeoLite2-Country.tar.gz.sha256.txt GeoLite2-City.tar.gz GeoLite2-City.tar.gz.sha256.txt
 
-      - name: Run PHP UNIT tests
+      - name: Run PHP UNIT tests (IP verification)
         run: |
           ddev exec BOUNCER_KEY=${{ env.BOUNCER_KEY }} LAPI_URL=http://crowdsec:8080 MEMCACHED_DSN=memcached://memcached:11211 REDIS_DSN=redis://redis:6379 /usr/bin/php ./my-own-modules/crowdsec-php-lib/vendor/bin/phpunit --testdox --colors --exclude-group ignore ./my-own-modules/crowdsec-php-lib/tests/IpVerificationTest.php
+
+      - name: Run PHP UNIT tests (Geolocation)
+        run: |
           ddev exec BOUNCER_KEY=${{ env.BOUNCER_KEY }} LAPI_URL=http://crowdsec:8080  /usr/bin/php ./my-own-modules/crowdsec-php-lib/vendor/bin/phpunit --testdox --colors --exclude-group ignore ./my-own-modules/crowdsec-php-lib/tests/GeolocationTest.php
 
       - name: Prepare Standalone Bouncer end-to-end tests

README.md

@@ -6,7 +6,7 @@
 
 ![Version](https://img.shields.io/github/v/release/crowdsecurity/php-cs-bouncer?include_prereleases)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=crowdsecurity_php-cs-bouncer&metric=alert_status)](https://sonarcloud.io/dashboard?id=crowdsecurity_php-cs-bouncer)
-![Build Status](https://img.shields.io/github/workflow/status/crowdsecurity/php-cs-bouncer/tests/main)
+[![Test suite](https://github.com/crowdsecurity/php-cs-bouncer/actions/workflows/test-suite.yml/badge.svg)](https://github.com/crowdsecurity/php-cs-bouncer/actions/workflows/test-suite.yml)
 ![Licence](https://img.shields.io/github/license/crowdsecurity/php-cs-bouncer)
 
 

docs/TECHNICAL_NOTES.md

@@ -63,3 +63,9 @@ To get a robust library and not provide security bug unmaintained, we use [compo
 The oldest PHP version compatible with these libraries is PHP 7.2.x.
 
 
+### Memcached and PHP 8.x
+
+In order to use Memcached with a PHP 8.x set up, you must have an installed version of the memcached php extension > 3.1.5. To check what is your current version, you could run :
+
+`php -r "echo phpversion('memcached');"`
+

tests/TestHelpers.php

@@ -49,14 +49,7 @@ public static function cacheAdapterProvider(): array
         $redisCacheAdapterDsn = getenv('REDIS_DSN');
         $redisClient = RedisAdapter::createConnection($redisCacheAdapterDsn);
         $redisAdapter = new RedisAdapter($redisClient);
-
-        // memcached version 3.1.5 is not ready for PHP 8.1
-        if (\PHP_VERSION_ID >= 80100 && version_compare(phpversion('memcached'), '3.1.5', '<=')) {
-            return [
-                'PhpFilesAdapter' => [$phpFilesAdapter],
-                'RedisAdapter' => [$redisAdapter],
-            ];
-        }
+        
         /** @var string */
         $memcachedCacheAdapterDsn = getenv('MEMCACHED_DSN');
         $memcachedAdapter = new MemcachedAdapter(MemcachedAdapter::createConnection($memcachedCacheAdapterDsn));