#40 Upgrade to Symfony 7.4 & PHP 8.5

.docker/apache2/Dockerfile

@@ -1,3 +1,13 @@
-FROM ubuntu/apache2:latest
+FROM ubuntu/apache2:2.4-22.04_beta
 
-RUN a2enmod proxy_fcgi
+ARG UID
+ARG GID
+
+ENV TZ=Europe/Paris
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+# Enable required modules
+RUN a2enmod proxy_fcgi
+
+RUN usermod -u $UID www-data \
+    && groupmod -g $GID www-data

.docker/apache2/conf/apache2.conf

@@ -12,7 +12,7 @@
         # SetHandler proxy:unix:/var/run/php/php7.4-fpm.sock|fcgi://dummy
 
         # when PHP-FPM is configured to use TCP
-        SetHandler proxy:fcgi://php:9000
+        SetHandler proxy:fcgi://php-fpm:9000
     </FilesMatch>
 
     DocumentRoot /var/www/public

.docker/compose.yaml

@@ -4,8 +4,7 @@ x-base-php: &base-php
     args:
       UID: ${UID:-1000}
       GID: ${GID:-1000}
-      PHP_VERSION: ${PHP_VERSION:-8.4}
-      XDEBUG_VERSION: ${XDEBUG_VERSION:-3.4.5}
+      PHP_VERSION: ${PHP_VERSION:-8.5}
   env_file: .env
   volumes:
     - ../:/var/www
@@ -29,7 +28,7 @@ x-base-apache2: &base-apache2
     - ../:/var/www
     - ./apache2/conf/apache2.conf:/etc/apache2/sites-available/000-default.conf
   depends_on:
-    - php
+    - php-fpm
 
 x-base-mysql: &base-mysql
   build:
@@ -59,7 +58,7 @@ x-base-sftp: &base-sftp
 name: cleverage-process-bundle-demo
 
 services:
-  php:
+  php-fpm:
     <<: *base-php
     tty: true
     depends_on:

.docker/mysql/Dockerfile

@@ -1,12 +1,13 @@
 ARG MYSQL_VERSION=9.1.0
 FROM mysql:${MYSQL_VERSION}
 
+ARG UNAME=mysql
 ARG UID
 ARG GID
 
 ENV TZ=Europe/Paris
 
-RUN usermod -u $UID mysql \
-    && groupmod -g $GID mysql
+RUN usermod -u $UID $UNAME \
+    && groupmod -g $GID $UNAME
 
-USER mysql:mysql
+USER $UNAME:$UNAME

.docker/php/Dockerfile

@@ -1,47 +1,49 @@
-ARG PHP_VERSION=8.1
-FROM php:${PHP_VERSION}-fpm-alpine AS php
-
-ARG XDEBUG_VERSION=3.1.4
+ARG PHP_VERSION=8.5
+FROM php:${PHP_VERSION}-fpm
 
+ARG UNAME=www-data
 ARG UID
 ARG GID
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 COPY /conf.d/ "$PHP_INI_DIR/conf.d/"
 
-RUN apk update && apk add \
+ENV TZ="Europe/Paris"
+RUN sed -i "s/^;date.timezone =.*/date.timezone = Europe\/Paris/" $PHP_INI_DIR/php.ini
+
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
     tzdata \
-    shadow \
     nano \
     bash \
-    icu-dev icu-data-full \
-    libxml2-dev \
-    libzip-dev \
-    postgresql-dev \
-    unzip \
-    wget \
     git \
+    unzip \
+    libicu-dev \
+    libzip-dev \
+    libxml2-dev \
     && docker-php-ext-configure intl \
-    && docker-php-ext-install intl soap opcache zip pdo pdo_pgsql pdo_mysql \
-    && docker-php-ext-enable soap opcache
+    && docker-php-ext-install intl \
+        pdo \
+        pdo_mysql \
+        zip \
+        soap \
+    && docker-php-ext-enable soap
 
-RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} \
-  && apk add --update linux-headers \
-  && pecl install xdebug-${XDEBUG_VERSION} \
-  && apk del pcre-dev ${PHPIZE_DEPS}
+# For PHP_VERSION < 8.5
+#RUN docker-php-ext-install opcache \
+#    && docker-php-ext-enable opcache
 
-RUN ln -s /usr/share/zoneinfo/Europe/Paris /etc/localtime \
-    && sed -i "s/^;date.timezone =.*/date.timezone = Europe\/Paris/" $PHP_INI_DIR/php.ini
+COPY --link --from=composer:2 /usr/bin/composer /usr/bin/composer
 
-COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
+RUN pie install xdebug/xdebug
 
-RUN usermod -u $UID www-data \
-    && groupmod -g $GID www-data
+RUN usermod -u $UID $UNAME \
+    && groupmod -g $GID $UNAME
 
-USER www-data:www-data
+USER $UNAME:$UNAME
 
 WORKDIR /var/www
-
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["entrypoint.sh"]
-CMD ["php-fpm"]

.editorconfig

@@ -0,0 +1,17 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{compose.yaml,compose.*.yaml}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

.env

@@ -17,6 +17,7 @@
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_SECRET=
+APP_SHARE_DIR=var/share
 ###< symfony/framework-bundle ###
 
 ###> symfony/messenger ###
@@ -30,7 +31,7 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 # Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
 #
-# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
+# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data_%kernel.environment%.db"
 DATABASE_URL="mysql://app:app@mysql:3306/app?serverVersion=9.1.0&charset=utf8mb4"
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
 # DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
@@ -42,4 +43,10 @@ SFTP_PORT=22
 SFTP_USERNAME=sftp
 SFTP_PASSWORD=password
 SFTP_ROOT=data
-###< docker/atmoz-sftp ###
+###< docker/atmoz-sftp ###
+
+###> symfony/routing ###
+# Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
+# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
+DEFAULT_URI=http://process-bundle-demo.localhost
+###< symfony/routing ###

.env.test

@@ -1,6 +1,3 @@
 # define your env variables for the test env here
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots

.github/workflows/quality.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           coverage: none
           tools: composer:v2
       - name: Install Composer dependencies (locked)
@@ -38,7 +38,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           coverage: none
           tools: composer:v2
       - name: Install Composer dependencies (locked)
@@ -55,7 +55,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           coverage: none
           tools: composer:v2
       - name: Install Composer dependencies (locked)

.github/workflows/test.yml

@@ -23,16 +23,12 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+          - '8.5'
         dependencies: [highest]
         allowed-to-fail: [false]
         symfony-require: ['']
         variant: [normal]
         include:
-          - php-version: '8.1'
-            dependencies: highest
-            allowed-to-fail: false
-            symfony-require: 6.4.*
-            variant: symfony/symfony:"6.4.*"
           - php-version: '8.2'
             dependencies: highest
             allowed-to-fail: false
@@ -41,8 +37,8 @@ jobs:
           - php-version: '8.2'
             dependencies: highest
             allowed-to-fail: false
-            symfony-require: 7.3.*
-            variant: symfony/symfony:"7.3.*"
+            symfony-require: 7.4.*
+            variant: symfony/symfony:"7.4.*"
           - php-version: '8.3'
             dependencies: highest
             allowed-to-fail: false
@@ -51,8 +47,8 @@ jobs:
           - php-version: '8.3'
             dependencies: highest
             allowed-to-fail: false
-            symfony-require: 7.3.*
-            variant: symfony/symfony:"7.3.*"
+            symfony-require: 7.4.*
+            variant: symfony/symfony:"7.4.*"
           - php-version: '8.4'
             dependencies: highest
             allowed-to-fail: false
@@ -61,9 +57,28 @@ jobs:
           - php-version: '8.4'
             dependencies: highest
             allowed-to-fail: false
-            symfony-require: 7.3.*
-            variant: symfony/symfony:"7.3.*"
-
+            symfony-require: 7.4.*
+            variant: symfony/symfony:"7.4.*"
+          - php-version: '8.4'
+            dependencies: highest
+            allowed-to-fail: false
+            symfony-require: 8.*
+            variant: symfony/symfony:"8.*"
+          - php-version: '8.5'
+            dependencies: highest
+            allowed-to-fail: false
+            symfony-require: 6.4.*
+            variant: symfony/symfony:"6.4.*"
+          - php-version: '8.5'
+            dependencies: highest
+            allowed-to-fail: false
+            symfony-require: 7.4.*
+            variant: symfony/symfony:"7.4.*"
+          - php-version: '8.5'
+            dependencies: highest
+            allowed-to-fail: false
+            symfony-require: 8.*
+            variant: symfony/symfony:"8.*"
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitignore

@@ -24,5 +24,5 @@
 
 ###> phpunit/phpunit ###
 /phpunit.xml
-.phpunit.result.cache
+/.phpunit.cache/
 ###< phpunit/phpunit ###

.php-cs-fixer.dist.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the CleverAge/ProcessBundleDemo package.
  *
@@ -24,9 +26,8 @@
 
 return (new PhpCsFixer\Config())
     ->setRules([
-        '@PHP71Migration' => true,
-        '@PHP82Migration' => true,
-        '@PHPUnit75Migration:risky' => true,
+        '@PHP8x2Migration' => true,
+        '@PHPUnit7x5Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@DoctrineAnnotation' => true,
@@ -35,12 +36,13 @@
         'header_comment' => ['header' => $fileHeaderComment],
         'modernize_strpos' => true,
         'get_class_to_class_keyword' => true,
+        'declare_strict_types' => true,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
         (new PhpCsFixer\Finder())
             ->in(__DIR__.'/src')
-            ->in(__DIR__.'/tests')
+//            ->in(__DIR__.'/tests')
             ->append([__FILE__])
     )
     ->setCacheFile('.php-cs-fixer.cache')

Makefile

@@ -1,7 +1,7 @@
 .ONESHELL:
 SHELL := /bin/bash
 
-DOCKER_RUN_PHP = docker compose -f .docker/compose.yaml run --rm php "bash" "-c"
+DOCKER_RUN_PHP = docker compose -f .docker/compose.yaml run --rm php-fpm "bash" "-c"
 DOCKER_COMPOSE = docker compose -f .docker/compose.yaml
 
 start: upd doctrine/migrations doctrine/fixtures assets/install #[Global] Start application
@@ -32,7 +32,7 @@ ps: # [Docker] Show running containers
 	$(DOCKER_COMPOSE) ps
 
 bash: #[Docker] Connect to php container with current host user
-	$(DOCKER_COMPOSE) exec -u $$(id -u $${USER}):$$(id -g $${USER}) php bash
+	$(DOCKER_COMPOSE) exec -u $$(id -u $${USER}):$$(id -g $${USER}) php-fpm bash
 
 logs: #[Docker] Show logs
 	$(DOCKER_COMPOSE) logs -f

bin/phpunit

@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+
+require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';