Merge branch '5.4' into 14123

Author: JohJohan

.doctor-rst.yaml

@@ -71,6 +71,7 @@ whitelist:
         - '/``.yml``/'
         - '/(.*)\.orm\.yml/' # currently DoctrineBundle only supports .yml
         - '/rst-class/'
+        - /docker-compose\.yml/
     lines:
         - 'in config files, so the old ``app/config/config_dev.yml`` goes to'
         - '#. The most important config file is ``app/config/services.yml``, which now is'
@@ -88,7 +89,7 @@ whitelist:
         - '.. versionadded:: 1.11' # MakerBundle
         - '.. versionadded:: 1.3' # MakerBundle
         - '.. versionadded:: 1.8' # MakerBundle
-        - '.. versionadded:: 1.6' # Flex in setup/upgrade_minor.rst
+        - '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst
         - '.. versionadded:: 1.0.0' # Encore
         - '0 => 123' # assertion for var_dumper - components/var_dumper.rst
         - '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
@@ -102,6 +103,8 @@ whitelist:
         - 'provides a ``loginUser()`` method to simulate logging in in your functional'
         - '.. code-block:: twig'
         - '.. versionadded:: 3.6' # MonologBundle
+        - '// bin/console'
         - 'End to End Tests (E2E)'
         - '.. code-block:: php'
         - '.. _`a feature to test applications using Mercure`: https://github.com/symfony/panther#creating-isolated-browsers-to-test-apps-using-mercure-or-websocket'
+        - '..  End to End Tests (E2E)'

.github/CODE_OF_CONDUCT.md

@@ -4,6 +4,6 @@ If your pull request fixes a BUG, use the oldest maintained branch that contains
 the bug (see https://symfony.com/releases for the list of maintained branches).
 
 If your pull request documents a NEW FEATURE, use the same Symfony branch where
-the feature was introduced (and `5.x` for features of unreleased versions).
+the feature was introduced (and `6.x` for features of unreleased versions).
 
 -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,32 +9,6 @@ on:
             - 'github-comments'
 
 jobs:
-    sphinx-build:
-        name: Build (Sphinx)
-
-        runs-on: ubuntu-latest
-
-        container: python:3.7-alpine
-
-        steps:
-            -   name: "Checkout"
-                uses: actions/checkout@v2
-
-            -   name: "Display Python version"
-                run: python -c "import sys; print(sys.version)"
-
-            -   name: "Install Sphinx"
-                run: pip install --user sphinx
-
-            -   name: "Install dependencies"
-                run: apk add --no-cache git make
-
-            -   name: "Install custom requirements via pip"
-                run: pip install -r _build/.requirements.txt
-
-            -   name: "Build documentation"
-                run: make -C _build SPHINXOPTS="-nqW -j auto" html
-
     symfony-docs-builder-build:
         name: Build (symfony-tools/docs-builder)
 
@@ -49,7 +23,7 @@ jobs:
             -   name: "Set-up PHP"
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.1
                     coverage: none
                     tools: "composer:v2"
 
@@ -71,11 +45,7 @@ jobs:
 
             -   name: "Build the docs"
                 working-directory: _build
-                run: php build.php -vvv
-
-            -   name: Show log file
-                if: ${{ always() }}
-                run: cat _build/logs.txt || true
+                run: php build.php --disable-cache
 
     doctor-rst:
         name: Lint (DOCtor-RST)
@@ -117,7 +87,7 @@ jobs:
           - name: Set-up PHP
             uses: shivammathur/setup-php@v2
             with:
-                php-version: 8.0
+                php-version: 8.1
                 coverage: none
 
           - name: Fetch branch from where the PR started
@@ -144,7 +114,7 @@ jobs:
 
           - name: Install dependencies
             if: ${{ steps.find-files.outputs.files }}
-            run: composer create-project symfony-tools/code-block-checker _checker
+            run: composer create-project symfony-tools/code-block-checker:@dev _checker
 
           - name: Install test application
             if: ${{ steps.find-files.outputs.files }}

.github/workflows/ci.yaml

@@ -1,7 +1,2 @@
-/_build/doctrees
-/_build/spelling
-/_build/html
-/_build/logs.txt
 /_build/vendor
 /_build/output
-*.pyc

.gitignore

@@ -19,34 +19,33 @@
 Contributing
 ------------
 
-We love contributors! For more information on how you can contribute to the
-Symfony documentation, please read
-[Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
+We love contributors! For more information on how you can contribute, please read
+the [Symfony Docs Contributing Guide](https://symfony.com/doc/current/contributing/documentation/overview.html)
 
-> **Note**
-> All pull requests must be based on the ``4.4`` branch,
-> unless you are documenting a feature that was introduced *after* Symfony 4.4
-> (e.g. in Symfony 5.2), **not** the ``5.x`` or older branches.
+**Important**: use `4.4` branch as the base of your pull requests, unless you are
+documenting a feature that was introduced *after* Symfony 4.4 (e.g. in Symfony 5.4).
 
-SymfonyCloud
-------------
+Build Documentation Locally
+---------------------------
 
-Thanks to [SymfonyCloud](https://symfony.com/cloud) for providing an integration
-server where Pull Requests are built and can be reviewed by contributors.
+This is not needed for contributing, but it's useful if you want to debug some
+issue in the docs or if you want to read Symfony Documentation offline.
 
-Docker
-------
+```bash
+$ git clone git@github.com:symfony/symfony-docs.git
 
-You can build the documentation project locally with these commands:
+$ cd symfony-docs/
+$ cd _build/
 
-```bash
-# build the image...
-$ docker build . -t symfony-docs
+$ composer install
 
-# ...and start the local web server
-# (if it's already in use, change the '8080' port by any other port)
-$ docker run --rm -p 8080:80 symfony-docs
+$ php build.php
+```
+
+After generating docs, serve them with the internal PHP server:
+
+```bash
+$ php -S localhost:8000 -t output/
 ```
 
-You can now read the docs at http://127.0.0.1:8080 (if you use a virtual
-machine, browse its IP instead of localhost; e.g. `http://192.168.99.100:8080`).
+Browse `http://localhost:8000` to read the docs.