Merge pull request #1624 from ConductionNL/feature/GW-1596/Symfony54

PHP 8.2 and Symfony 5.4 update
ConductionNL · Mar 14, 2024 · d68f3fc · d68f3fc
2 parents 58b1376 + aebe051
commit d68f3fc
Show file tree

Hide file tree

Showing 52 changed files with 3,174 additions and 7,045 deletions.
diff --git a/api/.gitignore b/api/.gitignore
@@ -6,12 +6,6 @@
 /.env.*.local
 /vendor/
 ###< symfony/framework-bundle ###
-
-###> friendsofphp/php-cs-fixer ###
-/.php_cs
-/.php_cs.cache
-###< friendsofphp/php-cs-fixer ###
-
 ###> phpunit/phpunit ###
 /phpunit.xml
 .phpunit.result.cache

diff --git a/api/.php-cs-fixer.dist.php b/api/.php-cs-fixer.dist.php
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine AS api_platform_php
+FROM php:8.2-fpm-alpine AS api_platform_php
 
 # Create a user
 RUN addgroup -S -g 101 commonground-gateway && adduser -S -D -u 101 commonground-gateway
@@ -18,7 +18,7 @@ RUN apk add --no-cache \
 		bash \
 	;
 
-ARG APCU_VERSION=5.1.17
+ARG APCU_VERSION=5.1.21
 ARG SQLSRV_VERSION=5.10.1
 
 RUN set -eux; \
@@ -48,6 +48,7 @@ RUN set -eux; \
 		pcntl \
 		gd \
 		gmp \
+    	ftp \
 	; \
 	pecl install \
 		apcu-${APCU_VERSION} \

diff --git a/api/composer.json b/api/composer.json
@@ -4,7 +4,7 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": "^7.4.0",
+        "php": "^7.4.0 || ^8.1.0 || ^8.2.0",
         "ext-ctype": "*",
         "ext-fileinfo": "*",
         "ext-iconv": "*",
@@ -13,53 +13,64 @@
         "alcaeus/mongo-php-adapter": "^1.2",
         "api-platform/core": "^2.6",
         "beberlei/doctrineextensions": "^1.3",
-        "commongateway/corebundle": "^1.2",
+        "commongateway/corebundle": "^1.3",
         "composer/package-versions-deprecated": "1.11.99.3",
-        "conduction/commongroundbundle": "dev-feature-gateway",
-        "conduction/digidbundle": "dev-master",
-        "conduction/samlbundle": "dev-master",
-        "doctrine/annotations": "^1.0",
-        "doctrine/doctrine-bundle": "^2.4",
+        "composer/semver": "*",
+        "composer/xdebug-handler": "*",
+        "doctrine/annotations": "^1.14",
+        "doctrine/doctrine-bundle": "^2.7",
+        "doctrine/doctrine-fixtures-bundle": "^3.2",
         "doctrine/doctrine-migrations-bundle": "^3.1",
-        "doctrine/orm": "^2.9",
+        "doctrine/event-manager": "^1.2",
+        "doctrine/lexer": "^2.0",
+        "doctrine/orm": "^2.14",
+        "doctrine/persistence": "^2.4",
         "dompdf/dompdf": "^2",
-        "endroid/qr-code-bundle": "3.4",
-        "guzzlehttp/guzzle": "6.5.8",
-        "guzzlehttp/psr7": "1.9",
+        "friendsofphp/proxy-manager-lts": "*",
+        "gedmo/doctrine-extensions": "^3.5",
         "hautelook/alice-bundle": "^2.9.0",
         "jwadhams/json-logic-php": "^1.4",
+        "laminas/laminas-code": "*",
+        "laminas/laminas-escaper": "*",
         "league/flysystem-bundle": "^2.4",
         "league/flysystem-ftp": "^2.4",
+        "league/html-to-markdown": "*",
         "mongodb/mongodb": "^1.15",
         "monolog/monolog": "^2.8.0",
         "nelmio/cors-bundle": "^2.1",
         "phpdocumentor/reflection-docblock": "^5.2",
         "phpoffice/phpspreadsheet": "^1.29",
         "phpoffice/phpword": "^0.18.2",
+        "phpstan/phpdoc-parser": "^1.25",
+        "ramsey/uuid": "*",
+        "ramsey/uuid-doctrine": "^2.0",
         "respect/validation": "^2.2",
         "setono/cron-expression-bundle": "^1.5",
-        "symfony/asset": "5.3.*",
-        "symfony/console": "5.3.*",
+        "symfony/asset": "5.3.* | ^5.4",
+        "symfony/console": "5.3.* | ^5.4",
         "symfony/contracts": "^2.4.0",
-        "symfony/dotenv": "5.3.*",
-        "symfony/expression-language": "5.3.*",
+        "symfony/dotenv": "5.3.* | ^5.4",
+        "symfony/expression-language": "5.3.* | ^5.4",
         "symfony/flex": "^1.3.1",
-        "symfony/framework-bundle": "5.3.*",
-        "symfony/http-client": "5.3.*",
-        "symfony/mailer": "5.3.*",
-        "symfony/mailgun-mailer": "5.3.*",
-        "symfony/messenger": "5.3.*",
-        "symfony/property-access": "5.3.*",
-        "symfony/property-info": "5.3.*",
-        "symfony/proxy-manager-bridge": "5.3.*",
-        "symfony/runtime": "5.3.*",
-        "symfony/security-bundle": "5.3.*",
-        "symfony/sendinblue-mailer": "5.3.*",
-        "symfony/serializer": "5.3.*",
-        "symfony/twig-bundle": "5.3.*",
-        "symfony/validator": "5.3.*",
-        "symfony/web-profiler-bundle": "5.3.*",
-        "symfony/yaml": "5.3.*"
+        "symfony/framework-bundle": "5.3.* | ^5.4",
+        "symfony/http-client": "5.3.* | ^5.4",
+        "symfony/mailer": "5.3.* | ^5.4",
+        "symfony/mailgun-mailer": "5.3.* | ^5.4",
+        "symfony/messenger": "5.3.* | ^5.4",
+        "symfony/process": "5.3.* | ^5.4",
+        "symfony/property-access": "5.3.* | ^5.4",
+        "symfony/property-info": "5.3.* | ^5.4",
+        "symfony/proxy-manager-bridge": "5.3.* | ^5.4",
+        "symfony/runtime": "5.3.* | ^5.4",
+        "symfony/security-bundle": "5.3.* | ^5.4",
+        "symfony/sendinblue-mailer": "5.3.* | ^5.4",
+        "symfony/serializer": "^5.4",
+        "symfony/twig-bundle": "5.3.* | ^5.4",
+        "symfony/validator": "5.3.* | ^5.4",
+        "symfony/web-profiler-bundle": "5.3.* | ^5.4",
+        "symfony/yaml": "^5.4",
+        "thecodingmachine/safe": "*",
+        "web-token/jwt-framework": "*"
     },
     "config": {
         "optimize-autoloader": true,
@@ -106,14 +117,14 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "5.3.*"
+            "require": "5.3.* | ^5.4 | ^5.4"
         }
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "symfony/browser-kit": "5.3.*",
-        "symfony/css-selector": "5.3.*",
+        "symfony/browser-kit": "5.3.* | ^5.4",
+        "symfony/css-selector": "5.3.* | ^5.4",
         "symfony/phpunit-bridge": "^6.1",
-        "symfony/stopwatch": "5.3.*"
+        "symfony/stopwatch": "5.3.* | ^5.4"
     }
 }