Move to Frankenphp. Fix deprecation messages in actions.

.env.test

@@ -5,7 +5,7 @@ MANTICORE_HOST="127.0.0.1"
 MANTICORE_PORT="9308"
 DB_HOST="127.0.0.1"
 DB_PORT="3306"
-DB_USER="root"
-DB_PASS=""
-DB_NAME="bewelcome_test"
-DATABASE_URL="mysql://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
+DB_USER="bewelcome"
+DB_PASS="bewelcome"
+DB_NAME="bewelcome"
+DATABASE_URL="mysql://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}?serverVersion=10.11.2-MariaDB&charset=utf8mb4"

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -48,8 +48,8 @@ jobs:
       - name: Run phpcpd tests
         run: vendor/bin/phpcpd src --exclude=src/Entity --exclude=src/Repository
 
-  phpunit:
-    name: PHPUnit
+  tests:
+    name: Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -64,7 +64,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -77,19 +77,38 @@ jobs:
         run: composer install --prefer-dist --no-progress --no-suggest --no-interaction --no-scripts
 
       - name: Run phpunit tests
-        run: bin/phpunit --coverage-text --coverage-xml=build/logs/phpunit/coverage-xml --coverage-clover=build/logs/phpunit/clover.xml --log-junit=build/logs/phpunit/unit.xml --colors=never --order-by=random --exclude-group=integration
+        run: bin/phpunit --coverage-text --coverage-xml=build/logs/phpunit/coverage-xml --coverage-clover=build/logs/phpunit/clover.xml --log-junit=build/logs/phpunit/junit.xml --colors=never --order-by=random --exclude-group=integration
 
-#      - name: Run Infection tests
-#        run: vendor/bin/infection --coverage=build/logs/phpunit --min-covered-msi=85 --threads=30
+      - name: Run Infection tests
+        run: vendor/bin/infection --skip-initial-tests --coverage=build/logs/phpunit --min-covered-msi=80 --threads=30
 
-#      - name: Run Integration tests
-#        run: bin/phpunit --log-junit=build/logs/phpunit/integration.xml --colors=never --order-by=random --group=integration
+      - name: Install MariaDB
+        uses: getong/mariadb-action@v1.11
+        with:
+          mysql database: 'bewelcome_test'
+          mysql user: 'bewelcome'
+          mysql password: 'bewelcome'
 
-#      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # tag=v4.6.2
-#        if: ${{ always() }}
-#        with:
-#          name: infection.log
-#          path: infection.log
+      - name: Create test database
+        run: bin/console test:database:create --env=test
+
+      - name: Setup Yarn
+        uses: threeal/setup-yarn-action@v2.0.0
+        with:
+          version: latest
+          cache: false
+
+      - name: Install yarn dependencies and run webpack
+        run: yarn install --frozen-lock ; yarn encore dev
+
+      - name: Run Integration tests
+        run: bin/phpunit --log-junit=build/logs/phpunit/integration.xml --colors=never --order-by=random --group=integration
+
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # tag=v4.6.2
+        if: ${{ always() }}
+        with:
+          name: infection.log
+          path: infection.log
 
   phploc:
     name: PHPLoc
@@ -106,7 +125,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -137,7 +156,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -168,7 +187,7 @@ jobs:
 #
 #      - name: Get Composer Cache Directory
 #        id: composer-cache
-#        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+#        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 #
 #      - name: Cache dependencies
 #        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -198,7 +217,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -228,7 +247,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -258,7 +277,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -288,7 +307,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -322,7 +341,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
         uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809  # tag=v4.2.4
@@ -341,3 +360,14 @@ jobs:
 
       - name: Run JS security checker
         run: yarn audit --groups dependencies
+
+
+
+
+
+
+
+
+
+
+

.gitignore

@@ -2,6 +2,7 @@
 # Here is a sample: https://gist.github.com/vincentchalamon/d5defad563ed49d9306a4aa57dfd4498
 errors.log
 rox_local.ini
+.php-version
 *.cache.ini
 .php_cs.cache
 .php-cs-fixer.cache
@@ -59,6 +60,7 @@ allCountries.zip
 /public/bundles/
 /var/
 /vendor/
+/config/reference.php
 ###< symfony/framework-bundle ###
 ###> symfony/webpack-encore-bundle ###
 /node_modules/

Dockerfile

@@ -5,11 +5,11 @@
 
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
 ARG PHP_VERSION=8.5
-ARG NGINX_VERSION=1.29
+ARG FRANKENPHP_VERSION=1.11
 
 
 # "php" stage
-FROM php:${PHP_VERSION}-fpm-alpine AS bewelcome_php
+FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}-alpine AS bewelcome_php
 
 # persistent / runtime deps
 RUN apk add --no-cache \
@@ -25,49 +25,19 @@ RUN apk add --no-cache \
 		python3 \
 	;
 
-ARG APCU_VERSION=5.1.24
 RUN set -eux; \
-	apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		freetype-dev \
-		icu-dev \
-		libjpeg-turbo-dev \
-		libpng-dev \
-		libxslt-dev \
-		libzip-dev \
-		zlib-dev \
-	; \
-	\
-	docker-php-ext-configure zip; \
-	docker-php-ext-configure gd --with-freetype --with-jpeg=/usr/include/ --enable-gd; \
-	docker-php-ext-install -j$(nproc) \
+	install-php-extensions \
+		apcu \
 		intl \
 		gd \
 		mysqli \
 		pcntl \
 		pdo_mysql \
 		xsl \
 		zip \
-        exif \
-	; \
-	pecl install \
-		apcu-${APCU_VERSION} \
-	; \
-	pecl clear-cache; \
-	docker-php-ext-enable \
-		apcu \
+		exif \
 		opcache \
-	; \
-	\
-	runDeps="$( \
-		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
-			| tr ',' '\n' \
-			| sort -u \
-			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-	)"; \
-	apk add --no-cache --virtual .phpexts-rundeps $runDeps; \
-	\
-	apk del .build-deps
+	;
 
 # https://github.com/nodejs/docker-node/issues/1126
 RUN set -eux; \
@@ -80,12 +50,6 @@ RUN export PATH="/usr/local/bin:$PATH"
 RUN ln -s $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini
 COPY docker/php/conf.d/bewelcome.prod.ini $PHP_INI_DIR/conf.d/bewelcome.ini
 
-RUN set -eux; \
-	{ \
-		echo '[www]'; \
-		echo 'ping.path = /ping'; \
-	} | tee /usr/local/etc/php-fpm.d/docker-healthcheck.conf
-
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
 ENV COMPOSER_ALLOW_SUPERUSER=1
 
@@ -143,27 +107,16 @@ RUN set -eux; \
 VOLUME /srv/bewelcome/var
 VOLUME /srv/bewelcome/data
 
-COPY docker/php/docker-healthcheck.sh /usr/local/bin/docker-healthcheck
-RUN chmod +x /usr/local/bin/docker-healthcheck
+COPY docker/frankenphp/Caddyfile /etc/caddy/Caddyfile
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=3 CMD ["docker-healthcheck"]
+HEALTHCHECK --interval=10s --timeout=3s --retries=3 CMD ["frankenphp", "php-cli", "-r", "echo 1;"]
 
 COPY docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint
 
 ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]
-
-
-# "nginx" stage
-# depends on the "php" stage above
-FROM nginx:${NGINX_VERSION}-alpine AS bewelcome_nginx
-
-COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
-
-WORKDIR /srv/bewelcome/public
+CMD ["frankenphp", "run", "--config", "/etc/caddy/Caddyfile"]
 
-COPY --from=bewelcome_php /srv/bewelcome/public ./
 
 # "php" dev stage
 # depends on the "php" stage above

Makefile

@@ -88,7 +88,7 @@ int-test:
 	"./bin/phpunit" --log-junit=build/logs/phpunit/junit.xml --colors=never  --order-by=random --group=integration
 
 infection: phpunit
-	"./vendor/bin/infection" --coverage=build/logs/phpunit --min-covered-msi=85 --threads=30
+	"./vendor/bin/infection" --skip-initial-tests --coverage=build/logs/phpunit --min-covered-msi=80 --threads=30
 
 #behat: encore
 #	bin/console doctrine:database:create --env=test --if-not-exists

composer.json

@@ -89,9 +89,9 @@
         "alexandresalome/mailcatcher": "^1.3",
         "behat/behat": "^3.7",
         "cmgmyr/phploc": "^8.0",
-        "dama/doctrine-test-bundle": "8.*",
-        "doctrine/data-fixtures": "2.*",
-        "fakerphp/faker": "^v1.14.1",
+        "dama/doctrine-test-bundle": "^8.0",
+        "doctrine/data-fixtures": "^2.0",
+        "fakerphp/faker": "^v1.14",
         "friends-of-behat/mink": "^1.8",
         "friends-of-behat/mink-browserkit-driver": "^1.4",
         "friends-of-behat/mink-extension": "^2.4",