feat(php 8.1): Add test for PHP 8.1

Author: julienloizelet

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
 
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4', '8.0']
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1']
 
         services:
             redis:

composer.json

@@ -39,7 +39,7 @@
     "require-dev": {
         "bramus/monolog-colored-line-formatter": "^3.0",
         "symfony/var-dumper": "^5.2",
-        "phpunit/phpunit": "8.5.13",
+        "phpunit/phpunit": "8.5.21",
         "clean/phpdoc-md": "^0.19.1"
     }
 }

composer.lock

@@ -4,10 +4,19 @@ services:
         image: crowdsecurity/crowdsec:latest
         environment:
             - DISABLE_AGENT=true
-        volumes:
-            - ./var/docker-data:/var/lib/crowdsec/data
         ports:
             - 8085:8080
+    app-php8.1:
+        build:
+            context: .
+            dockerfile: ./docker/php-8.1.Dockerfile
+        env_file: ./docker/.env
+        volumes:
+            - .:/app
+        links:
+            - crowdsec
+            - redis
+            - memcached
     app-php8.0:
         build:
             context: .

docker-compose.yml

@@ -0,0 +1,25 @@
+FROM php:8.1-cli-alpine
+
+RUN apk update \
+    && apk add --no-cache git mysql-client curl libmcrypt libmcrypt-dev openssh-client icu-dev \
+    libxml2-dev freetype-dev libpng-dev libjpeg-turbo-dev g++ make autoconf libmemcached-dev \
+    && docker-php-source extract \
+    && pecl install xdebug redis memcached \
+    && docker-php-ext-enable xdebug redis memcached \
+    && docker-php-source delete \
+    && docker-php-ext-install pdo_mysql \
+    && docker-php-ext-install gd \
+    && echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.client_port=9001" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.remote_handler=dbgp" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.discover_client_host=0" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.idekey=mertblog.net" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.client_host=docker.for.mac.localhost" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && rm -rf /tmp/*
+
+ADD ./ /app
+WORKDIR /app
+
+EXPOSE 9000

docker/php-8.1.Dockerfile

@@ -3,16 +3,18 @@
 CONTAINER_NAME=${1:-app}
 
 # Delete existing LAPI database.
-[ -e ./var/docker-data/crowdsec.db ] && docker-compose exec crowdsec rm -f /var/lib/crowdsec/data/crowdsec.db
+#[ -e ./var/docker-data/crowdsec.db ] && docker-compose exec crowdsec rm -f /var/lib/crowdsec/data/crowdsec.db
 
 # Start containers.
-docker-compose up --force-recreate -d crowdsec
-docker-compose up --remove-orphans -d redis memcached
+docker-compose up --force-recreate  -d crowdsec
+docker-compose up --remove-orphans  -d redis memcached
 
 # Create a bouncer with cscli and copy expose generated key.
+docker-compose exec crowdsec /usr/local/bin/cscli bouncers delete bouncer-php-library &&
 docker-compose exec crowdsec /usr/local/bin/cscli bouncers add bouncer-php-library -o raw > ./.bouncer-key
 
 # Create a watcher with cscli.
+docker-compose exec crowdsec cscli machines delete PhpUnitTestMachine &&
 docker-compose exec crowdsec cscli machines add PhpUnitTestMachine --password PhpUnitTestMachinePassword > /dev/null 2>&1
 
 # Ensure composer deps are presents

scripts/setup-local-crowdsec.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./tests-local.sh app-php8.1

tests-local-php8.1.sh

@@ -4,4 +4,4 @@ CONTAINER_NAME=${1:-app}
 # Setup local CrowdSec instance
 ./scripts/setup-local-crowdsec.sh
 
-docker-compose run --rm $CONTAINER_NAME ./vendor/bin/phpunit --testdox --colors --exclude-group ignore tests/IpVerificationTest.php
+docker-compose run --rm $CONTAINER_NAME ./vendor/bin/phpunit --testdox --colors --exclude-group ignore tests/IpVerificationTest.php