Merge branch 'main' into ft-sf-ux-stimulus-demo

Author: javiereguiluz

.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+  "features": {
+    "ghcr.io/shyim/devcontainers-features/symfony-cli:0": {},
+    "ghcr.io/shyim/devcontainers-features/php:0": {
+      "version": "8.1"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "lts"
+    }
+  },
+  "updateContentCommand": {
+    "composer install": ["composer", "install"],
+    "yarn": ["yarn"]
+  },
+  "postAttachCommand": {
+    "server": "symfony server:start",
+    "yarn": ["yarn", "watch"]
+  }
+}

.env

@@ -9,6 +9,7 @@
 # Real environment variables win over .env files.
 #
 # DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
@@ -30,5 +31,5 @@ DATABASE_URL=sqlite:///%kernel.project_dir%/data/database.sqlite
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/mailer ###
-# MAILER_DSN=smtp://localhost
+# MAILER_DSN=null://null
 ###< symfony/mailer ###

.github/workflows/lint.yaml

@@ -9,13 +9,16 @@ on:
 env:
     fail-fast: true
 
+permissions:
+    contents: read
+
 jobs:
     php-cs-fixer:
         name: PHP-CS-Fixer
         runs-on: ubuntu-latest
         steps:
             - name: "Checkout code"
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: PHP-CS-Fixer
               uses: docker://oskarstark/php-cs-fixer-ga
@@ -27,14 +30,14 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.0']
+                php-version: ['8.1']
 
         steps:
             - name: "Checkout code"
-              uses: actions/checkout@v2.3.3
+              uses: actions/checkout@v3
 
             - name: "Install PHP with extensions"
-              uses: shivammathur/setup-php@2.7.0
+              uses: shivammathur/setup-php@v2
               with:
                   coverage: "none"
                   extensions: intl
@@ -43,10 +46,10 @@ jobs:
 
             - name: "Set 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 composer"
-              uses: actions/cache@v2.1.2
+              uses: actions/cache@v3
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}
@@ -83,13 +86,9 @@ jobs:
               if: always() && steps.install.outcome == 'success'
               run: composer validate --strict
 
-            - name: Download Symfony CLI
-              if: always() && steps.install.outcome == 'success'
-              run: wget https://get.symfony.com/cli/installer -O - | bash
-
             - name: Check if any dependencies are compromised
               if: always() && steps.install.outcome == 'success'
-              run: /home/runner/.symfony/bin/symfony check:security
+              run: composer audit
 
             - name: Run PHPStan
               if: always() && steps.install.outcome == 'success'

.github/workflows/tests.yaml

@@ -10,12 +10,10 @@ env:
     fail-fast: true
     PHPUNIT_FLAGS: "-v"
     SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
-    SYMFONY_REQUIRE: ">=4.4"
-    # 40x: Since symfony/monolog-bridge 5.2:
-    # Passing an actionLevel (int|string) as constructor's 3rd argument of
-    # "Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy"
-    # is deprecated, "Monolog\Handler\FingersCrossed\ActivationStrategyInterface" expected.
-    SYMFONY_DEPRECATIONS_HELPER: 40
+    SYMFONY_DEPRECATIONS_HELPER: 7
+
+permissions:
+    contents: read
 
 jobs:
     test:
@@ -25,15 +23,20 @@ jobs:
 
         strategy:
             matrix:
-                operating-system: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-                php-version: ['8.0']
+                operating-system: ['ubuntu-latest']
+                php-version: ['8.1']
+                include:
+                    - operating-system: 'macos-latest'
+                      php-version: '8.1'
+                    - operating-system: 'windows-latest'
+                      php-version: '8.1'
 
         steps:
             - name: "Checkout code"
-              uses: actions/checkout@v2.3.3
+              uses: actions/checkout@v3
 
             - name: "Install PHP with extensions"
-              uses: shivammathur/setup-php@2.7.0
+              uses: shivammathur/setup-php@v2
               with:
                   coverage: "none"
                   extensions: "intl, mbstring, pdo_sqlite"
@@ -45,19 +48,18 @@ jobs:
 
             - name: "Set 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
+              shell: bash
 
             - name: "Cache composer"
-              uses: actions/cache@v2.1.2
+              uses: actions/cache@v3
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}
                   restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-
 
-            - name: "Require symfony/flex"
-              run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
-
-            - run: composer update
+            - name: "Install dependencies"
+              run: composer install --no-interaction --no-progress
 
             - name: "Install PHPUnit"
               run: vendor/bin/simple-phpunit install

.php-cs-fixer.dist.php

@@ -36,7 +36,8 @@
         'phpdoc_order' => true,
         'strict_comparison' => true,
         'strict_param' => true,
+        'blank_line_between_import_groups' => false,
     ])
     ->setFinder($finder)
-    ->setCacheFile(__DIR__.'/var/.php_cs.cache')
+    ->setCacheFile(__DIR__.'/var/.php-cs-fixer.cache')
 ;

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2020 Fabien Potencier
+Copyright (c) 2015-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,10 +4,12 @@ Symfony Demo Application
 The "Symfony Demo Application" is a reference application created to show how
 to develop applications following the [Symfony Best Practices][1].
 
+You can also learn about these practices in [the official Symfony Book][5].
+
 Requirements
 ------------
 
-  * PHP 7.3 or higher;
+  * PHP 8.1.0 or higher;
   * PDO-SQLite PHP extension enabled;
   * and the [usual Symfony application requirements][2].
 
@@ -27,6 +29,13 @@ Alternatively, you can use Composer:
 $ composer create-project symfony/symfony-demo my_project
 ```
 
+If you want to test the demo without installing anything locally, you can also
+deploy it on Platform.sh, the official Symfony PaaS:
+
+<p align="center">
+<a href="https://console.platform.sh/projects/create-project?template=https://raw.githubusercontent.com/symfonycorp/platformsh-symfony-template-metadata/main/template-metadata-demo.yaml&utm_content=symfonycorp&utm_source=github&utm_medium=button&utm_campaign=deploy_on_platform"><img src="https://platform.sh/images/deploy/lg-blue.svg" alt="Deploy on Platform.sh" width="180px" /></a>
+</p>
+
 Usage
 -----
 
@@ -55,6 +64,7 @@ $ ./bin/phpunit
 ```
 
 [1]: https://symfony.com/doc/current/best_practices.html
-[2]: https://symfony.com/doc/current/reference/requirements.html
-[3]: https://symfony.com/doc/current/cookbook/configuration/web_server_configuration.html
+[2]: https://symfony.com/doc/current/setup.html#technical-requirements
+[3]: https://symfony.com/doc/current/setup/web_server_configuration.html
 [4]: https://symfony.com/download
+[5]: https://symfony.com/book

assets/bootstrap.js

@@ -4,7 +4,7 @@ import { startStimulusApp } from '@symfony/stimulus-bridge';
 export const app = startStimulusApp(require.context(
     '@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
     true,
-    /\.(j|t)sx?$/
+    /\.[jt]sx?$/
 ));
 
 // register any custom, 3rd party controllers here

assets/js/doclinks.js

@@ -10,32 +10,37 @@ $(function() {
         return '<a class="doclink" target="_blank" href="' + url + '">' + content + '</a>';
     };
 
+    function wrap(content, links) {
+        return content.replace(
+            new RegExp(Object.keys(links).join('|'), 'g'),
+            token => anchor(links[token], token)
+        );
+    };
+
     // Wraps links to the Symfony documentation
     $modal.find('.hljs-comment').each(function() {
         $(this).html($(this).html().replace(/https:\/\/symfony.com\/doc\/[\w/.#-]+/g, function(url) {
             return anchor(url, url);
         }));
     });
 
-    // Wraps Symfony's annotations
-    var annotations = {
-        '@Cache': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html',
-        '@IsGranted': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html#isgranted',
-        '@ParamConverter': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html',
-        '@Route': 'https://symfony.com/doc/current/routing.html#creating-routes-as-annotations',
-        '@Security': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html#security'
+    // Wraps Symfony's attributes
+    var attributes = {
+        'Cache': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html',
+        'IsGranted': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html#isgranted',
+        'ParamConverter': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html',
+        'Route': 'https://symfony.com/doc/current/routing.html#creating-routes-as-attributes-or-annotations',
+        'Security': 'https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html#security'
     };
 
-    $controllerCode.find('.hljs-doctag').each(function() {
-        var annotation = $(this).text();
+    $controllerCode.find('.hljs-meta').each(function() {
+        var src = $(this).text();
 
-        if (annotations[annotation]) {
-            $(this).html(anchor(annotations[annotation], annotation));
-        }
+        $(this).html(wrap(src, attributes));
     });
 
     // Wraps Twig's tags
-    $templateCode.find('.hljs-template-tag > .hljs-name').each(function() {
+    $templateCode.find('.hljs-template-tag + .hljs-name').each(function() {
         var tag = $(this).text();
 
         if ('else' === tag || tag.match(/^end/)) {

assets/js/highlight.js

@@ -5,4 +5,4 @@ import twig from 'highlight.js/lib/languages/twig';
 hljs.registerLanguage('php', php);
 hljs.registerLanguage('twig', twig);
 
-hljs.initHighlightingOnLoad();
+hljs.highlightAll();

assets/styles/app.scss

@@ -12,7 +12,7 @@ $lato-font-path: '~lato-font/fonts';
 @import "~bootswatch/flatly/bootswatch";
 @import "~@fortawesome/fontawesome-free/css/all.css";
 @import "~@fortawesome/fontawesome-free/css/v4-shims.css";
-@import "~highlight.js/styles/solarized-light.css";
+@import "~highlight.js/styles/github-dark-dimmed.css";
 
 // pick the Lato fonts individually to avoid importing the entire font family
 @import '~lato-font/scss/public-api';
@@ -56,6 +56,14 @@ i {
    ------------------------------------------------------------------------- */
 .m-b-0 { margin-bottom: 0 }
 
+@media (min-width: $screen-md-min) {
+  .modal-xl { width: $modal-lg; }
+}
+
+@media (min-width: $screen-lg-min) {
+  .modal-xl { width: $screen-lg-min - 60px; }
+}
+
 /* Page elements
    ------------------------------------------------------------------------- */
 body {