Merge remote-tracking branch 'upstream/main' into mongodb

Author: GromNaN

.devcontainer/devcontainer.json

@@ -3,15 +3,18 @@
   "features": {
     "ghcr.io/shyim/devcontainers-features/symfony-cli:0": {},
     "ghcr.io/shyim/devcontainers-features/php:0": {
-      "version": "8.2"
-    },
+      "version": "8.4"
+    }
   },
   "updateContentCommand": {
-    "composer install": ["composer", "install"],
-    "importmap:install": ["symfony", "console", "importmap:install"]
+    "composer install": ["composer", "install"]
   },
   "postAttachCommand": {
     "server": "symfony server:start",
     "sass build": ["symfony", "console", "sass:build", "-w"]
+  },
+  "containerEnv": {
+    "SYMFONY_TRUSTED_PROXIES": "127.0.0.1",
+    "SYMFONY_TRUSTED_HEADERS": "x-forwarded-for,x-forwarded-host,x-forwarded-proto,x-forwarded-port"
   }
 }

.editorconfig

@@ -3,8 +3,17 @@ root = true
 
 ; Unix-style newlines
 [*]
+charset = utf-8
 end_of_line = LF
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.php]
+[*.{php,html,twig}]
 indent_style = space
 indent_size = 4
+
+[*.md]
+max_line_length = 80
+
+[COMMIT_EDITMSG]
+max_line_length = 0

.env

@@ -29,4 +29,4 @@ MONGODB_DB=symfony_demo
 
 ###> symfony/mailer ###
 # MAILER_DSN=null://null
-###< symfony/mailer ###
+###< symfony/mailer ###

.env.dev

@@ -0,0 +1 @@
+# Define your env variables for the development environment here

.env.test

@@ -1,4 +1,4 @@
-# define your env variables for the test env here
+# Define your env variables for the test environment here
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999

.github/workflows/lint.yaml

@@ -44,23 +44,9 @@ jobs:
                   php-version: ${{ matrix.php-version }}
                   tools: composer:v2
 
-            - name: "Set composer cache directory"
-              id: composer-cache
-              run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-            - name: "Cache composer"
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
-                  restore-keys: ${{ runner.os }}-composer-
-
             - name: "Install dependencies"
-              run: composer install --ansi --no-interaction --no-progress
-
-            - name: Install PHPUnit
               id: install
-              run: vendor/bin/simple-phpunit install
+              run: composer install --ansi --no-interaction --no-progress
 
             - name: Lint YAML files
               if: always() && steps.install.outcome == 'success'
@@ -70,10 +56,14 @@ jobs:
               if: always() && steps.install.outcome == 'success'
               run: ./bin/console lint:twig templates --env=prod
 
-            - name: Lint XLIFF translations
+            - name: Lint XLIFF translation files
               if: always() && steps.install.outcome == 'success'
               run: ./bin/console lint:xliff translations
 
+            - name: Lint translation contents
+              if: always() && steps.install.outcome == 'success'
+              run: ./bin/console lint:translations
+
             - name: Lint Parameters and Services
               if: always() && steps.install.outcome == 'success'
               run: ./bin/console lint:container --no-debug
@@ -90,6 +80,25 @@ jobs:
               if: always() && steps.install.outcome == 'success'
               run: composer audit
 
+    static-analysis:
+        name: PHPStan
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  coverage: none
+                  php-version: '8.3'
+
+            - name: Install dependencies
+              run: composer install --ansi --no-interaction --no-progress
+
+            - name: Install PHPUnit
+              run: vendor/bin/simple-phpunit install
+
             - name: Run PHPStan
-              if: always() && steps.install.outcome == 'success'
-              run: ./vendor/bin/phpstan analyze
+              run: vendor/bin/phpstan analyze --no-progress

.github/workflows/tests.yaml

@@ -10,7 +10,7 @@ env:
     fail-fast: true
     PHPUNIT_FLAGS: "-v"
     SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
-    SYMFONY_DEPRECATIONS_HELPER: 0
+    SYMFONY_DEPRECATIONS_HELPER: 'max[indirect]=52'
 
 permissions:
     contents: read
@@ -24,10 +24,9 @@ jobs:
         strategy:
             matrix:
                 operating-system: ['ubuntu-latest']
-                php-version: ['8.2', '8.3']
+                php-version: ['8.2', '8.3', '8.4']
                 include:
-                    # TODO: change this to 'macos-latest' on June 2024, when '14' will become 'latest'
-                    - operating-system: 'macos-14'
+                    - operating-system: 'macos-latest'
                       php-version: '8.2'
                     - operating-system: 'windows-latest'
                       php-version: '8.2'
@@ -47,18 +46,6 @@ jobs:
             - name: "Add PHPUnit matcher"
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-            - name: "Set composer cache directory"
-              id: composer-cache
-              run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-              shell: bash
-
-            - name: "Cache composer"
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
-                  restore-keys: ${{ runner.os }}-composer-
-
             - name: "Install dependencies"
               run: composer install --ansi --no-interaction --no-progress
 

.gitignore

@@ -20,5 +20,9 @@
 
 ###> symfony/asset-mapper ###
 /public/assets/
-/assets/vendor
+/assets/vendor/
 ###< symfony/asset-mapper ###
+
+###> phpstan/phpstan ###
+phpstan.neon
+###< phpstan/phpstan ###

.php-cs-fixer.dist.php

@@ -16,7 +16,6 @@
     ->exclude('public/bundles')
     ->exclude('public/build')
     // exclude files generated by Symfony Flex recipes
-    ->notPath('bin/console')
     ->notPath('public/index.php')
     ->notPath('importmap.php')
 ;

assets/app.js

@@ -1,6 +1,6 @@
+// start the Stimulus application
+import './bootstrap.js';
 import './styles/app.scss';
-import '@fortawesome/fontawesome-free/css/all.css';
-import '@fortawesome/fontawesome-free/css/v4-shims.css';
 import 'highlight.js/styles/github-dark-dimmed.css';
 import 'lato-font/css/lato-font.css';
 
@@ -18,7 +18,5 @@ import './js/highlight.js';
 // Creates links to the Symfony documentation
 import './js/doclinks.js';
 
-// start the Stimulus application
-import './bootstrap.js';
-
 import './js/flatpicker.js';
+