Merge branch 'main' into datepoint

Author: seb-jean

.github/workflows/end_to_end_tests.yaml

@@ -22,7 +22,7 @@ jobs:
               with:
                   coverage: none
                   extensions: none, ctype, dom, iconv, intl, mbstring, pdo_sqlite, simplexml, tokenizer, xml, xmlwriter
-                  php-version: '8.2'
+                  php-version: '8.4'
                   tools: symfony-cli
 
             - name: Configure environment
@@ -76,7 +76,7 @@ jobs:
               with:
                   coverage: none
                   extensions: none, ctype, dom, iconv, intl, mbstring, pdo_sqlite, simplexml, tokenizer, xml, xmlwriter
-                  php-version: '8.3'
+                  php-version: '8.4'
                   tools: symfony-cli
 
             - name: Clone repository and install dependencies

.github/workflows/lint.yaml

@@ -18,10 +18,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: "Checkout code"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: PHP-CS-Fixer
-              uses: docker://ghcr.io/php-cs-fixer/php-cs-fixer:3-php8.2
+              uses: docker://ghcr.io/php-cs-fixer/php-cs-fixer:3-php8.4
               with:
                   args: check --diff --using-cache=no
 
@@ -30,11 +30,11 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.2']
+                php-version: ['8.4']
 
         steps:
             - name: "Checkout code"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP with extensions"
               uses: shivammathur/setup-php@v2
@@ -85,13 +85,13 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
                   coverage: none
-                  php-version: '8.3'
+                  php-version: '8.4'
 
             - name: Install dependencies
               run: composer install --ansi --no-interaction --no-progress

.github/workflows/tests.yaml

@@ -21,16 +21,16 @@ jobs:
         strategy:
             matrix:
                 operating-system: ['ubuntu-latest']
-                php-version: ['8.2', '8.3', '8.4', '8.5']
+                php-version: ['8.4', '8.5']
                 include:
                     - operating-system: 'macos-latest'
-                      php-version: '8.2'
+                      php-version: '8.4'
                     - operating-system: 'windows-latest'
-                      php-version: '8.2'
+                      php-version: '8.4'
 
         steps:
             - name: "Checkout code"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP with extensions"
               uses: shivammathur/setup-php@v2

.gitignore

@@ -23,3 +23,8 @@ phpstan.neon
 /.phpunit.cache/
 /phpunit.xml
 ###< phpunit/phpunit ###
+
+###> friendsofphp/php-cs-fixer ###
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
+###< friendsofphp/php-cs-fixer ###

.php-cs-fixer.dist.php

@@ -10,22 +10,25 @@
  */
 
 $fileHeaderComment = <<<COMMENT
-This file is part of the Symfony package.
+    This file is part of the Symfony package.
 
-(c) Fabien Potencier <fabien@symfony.com>
+    (c) Fabien Potencier <fabien@symfony.com>
 
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-COMMENT;
+    For the full copyright and license information, please view the LICENSE
+    file that was distributed with this source code.
+    COMMENT;
 
-return (new PhpCsFixer\Config())
+return new PhpCsFixer\Config()
     ->setFinder(
         PhpCsFixer\Finder::create()->in(['src', 'tests'])->append([__FILE__])
     )
     ->setRiskyAllowed(true)
     ->setRules([
+        '@PHP8x4Migration' => true,
+        '@PHP8x4Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        'declare_strict_types' => false, // depends how project wants to handle type matching and untaint user input
         'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
         'no_useless_else' => true,
         'no_useless_return' => true,

assets/styles/app.scss

@@ -1,3 +1,4 @@
+// Add your SASS styles in this file
 @import "variables";
 @import "./bootswatch/variables";
 

composer.json

@@ -6,41 +6,40 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "ext-pdo_sqlite": "*",
         "doctrine/dbal": "^4.0",
-        "doctrine/doctrine-bundle": "^2.16",
-        "doctrine/doctrine-migrations-bundle": "^3.3",
+        "doctrine/doctrine-bundle": "^3.0",
         "doctrine/orm": "^3.5",
         "league/commonmark": "^2.1",
         "symfony/apache-pack": "^1.0",
-        "symfony/asset": "^7",
-        "symfony/asset-mapper": "^7",
-        "symfony/console": "^7",
-        "symfony/dotenv": "^7",
-        "symfony/expression-language": "^7",
+        "symfony/asset": "^8",
+        "symfony/asset-mapper": "^8",
+        "symfony/console": "^8",
+        "symfony/dotenv": "^8",
+        "symfony/expression-language": "^8",
         "symfony/flex": "^2",
-        "symfony/form": "^7",
-        "symfony/framework-bundle": "^7",
-        "symfony/html-sanitizer": "^7",
-        "symfony/http-client": "^7",
-        "symfony/intl": "^7",
-        "symfony/mailer": "^7",
-        "symfony/monolog-bundle": "^3.7",
+        "symfony/form": "^8",
+        "symfony/framework-bundle": "^8",
+        "symfony/html-sanitizer": "^8",
+        "symfony/http-client": "^8",
+        "symfony/intl": "^8",
+        "symfony/mailer": "^8",
+        "symfony/monolog-bundle": "^4",
         "symfony/polyfill-intl-messageformatter": "^1.12",
-        "symfony/runtime": "^7",
-        "symfony/security-bundle": "^7",
+        "symfony/runtime": "^8",
+        "symfony/security-bundle": "^8",
         "symfony/stimulus-bundle": "^2.12",
-        "symfony/string": "^7",
-        "symfony/translation": "^7",
-        "symfony/twig-bundle": "^7",
+        "symfony/string": "^8",
+        "symfony/translation": "^8",
+        "symfony/twig-bundle": "^8",
         "symfony/ux-icons": "^2.20",
         "symfony/ux-live-component": "^2.6",
-        "symfony/validator": "^7",
-        "symfony/yaml": "^7",
-        "symfonycasts/sass-bundle": "^0.8.3",
+        "symfony/validator": "^8",
+        "symfony/yaml": "^8",
+        "symfonycasts/sass-bundle": "^0.9.0",
         "twbs/bootstrap": "^5",
         "twig/extra-bundle": "^3.3",
         "twig/intl-extra": "^3.3",
@@ -49,16 +48,17 @@
     "require-dev": {
         "dama/doctrine-test-bundle": "^8.0.2",
         "doctrine/doctrine-fixtures-bundle": "^4.1",
+        "friendsofphp/php-cs-fixer": "^3.92",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-doctrine": "^2.0",
         "phpstan/phpstan-symfony": "^2.0",
-        "phpunit/phpunit": "^11.3",
-        "symfony/browser-kit": "^7",
-        "symfony/css-selector": "^7",
-        "symfony/debug-bundle": "^7",
+        "phpunit/phpunit": "^11.5.50",
+        "symfony/browser-kit": "^8",
+        "symfony/css-selector": "^8",
+        "symfony/debug-bundle": "^8",
         "symfony/maker-bundle": "^1.36",
-        "symfony/stopwatch": "^7",
-        "symfony/web-profiler-bundle": "^7"
+        "symfony/stopwatch": "^8",
+        "symfony/web-profiler-bundle": "^8"
     },
     "replace": {
         "symfony/polyfill-ctype": "*",
@@ -68,15 +68,17 @@
         "symfony/polyfill-php74": "*",
         "symfony/polyfill-php80": "*",
         "symfony/polyfill-php81": "*",
-        "symfony/polyfill-php82": "*"
+        "symfony/polyfill-php82": "*",
+        "symfony/polyfill-php83": "*",
+        "symfony/polyfill-php84": "*"
     },
     "config": {
         "allow-plugins": {
             "symfony/flex": true,
             "symfony/runtime": true
         },
         "platform": {
-            "php": "8.2.0"
+            "php": "8.4.0"
         },
         "preferred-install": {
             "*": "dist"
@@ -111,7 +113,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "7.4.*"
+            "require": "8.0.*"
         }
     }
 }