Merge branch '5.4' into patch-1

Author: upyx

.doctor-rst.yaml

@@ -1,12 +1,17 @@
 rules:
     american_english: ~
+    argument_variable_must_match_type:
+        arguments:
+            - { type: 'ContainerBuilder', name: 'containerBuilder' }
+            - { type: 'ContainerConfigurator', name: 'containerConfigurator' }
     avoid_repetetive_words: ~
     blank_line_after_anchor: ~
     blank_line_after_directive: ~
     blank_line_before_directive: ~
     composer_dev_option_not_at_the_end: ~
     correct_code_block_directive_based_on_the_content: ~
     deprecated_directive_should_have_version: ~
+    ensure_exactly_one_space_before_directive_type: ~
     ensure_exactly_one_space_between_link_definition_and_link: ~
     ensure_link_definition_contains_valid_url: ~
     ensure_order_of_code_blocks_in_configuration_block: ~
@@ -49,7 +54,7 @@ rules:
     versionadded_directive_should_have_version: ~
     yaml_instead_of_yml_suffix: ~
     yarn_dev_option_at_the_end: ~
-#    no_app_bundle: ~
+    no_merge_conflict:
 
     #   master
     versionadded_directive_major_version:
@@ -68,41 +73,24 @@ rules:
 whitelist:
     regex:
         - '/FOSUserBundle(.*)\.yml/'
-        - '/``.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'
-        - 'code in production without a proxy, it becomes trivially easy to abuse your'
-        - '.. _`EasyDeployBundle`: https://github.com/EasyCorp/easy-deploy-bundle'
         - 'The bin/console Command'
-        - '# username is your full Gmail or Google Apps email address'
         - '.. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection'
         - '.. versionadded:: 1.9.0' # Encore
-        - '.. versionadded:: 0.28.4' # Encore
-        - '.. versionadded:: 2.4.0' # SwiftMailer
-        - '.. versionadded:: 1.30' # Twig
-        - '.. versionadded:: 1.35' # Twig
         - '.. versionadded:: 1.11' # Messenger (Middleware / DoctrineBundle)
         - '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst
         - '.. versionadded:: 1.0.0' # Encore
         - '.. versionadded:: 5.1' # Private Services
-        - '0 => 123' # assertion for var_dumper - components/var_dumper.rst
-        - '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
         - '123,' # assertion for var_dumper - components/var_dumper.rst
         - '"foo",' # assertion for var_dumper - components/var_dumper.rst
         - '$var .= "Because of this `\xE9` octet (\\xE9),\n";'
-        - "`Deploying Symfony 4 Apps on Heroku`_."
-        - ".. _`Deploying Symfony 4 Apps on Heroku`: https://devcenter.heroku.com/articles/deploying-symfony4"
-        - "//                  224, 165, 141, 224, 164, 164, 224, 165, 135])"
         - '.. versionadded:: 0.2' # MercureBundle
-        - 'provides a ``loginUser()`` method to simulate logging in in your functional'
-        - '.. code-block:: twig'
         - '.. versionadded:: 3.6' # MonologBundle
+        - '.. versionadded:: 3.8' # 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/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
 
         steps:
             -   name: "Checkout"
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
 
             -   name: "Set-up PHP"
                 uses: shivammathur/setup-php@v2
@@ -36,7 +36,7 @@ jobs:
                 run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
             -   name: Cache dependencies
-                uses: actions/cache@v2
+                uses: actions/cache@v3
                 with:
                     path: ${{ steps.composercache.outputs.dir }}
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -57,7 +57,7 @@ jobs:
 
         steps:
             -   name: "Checkout"
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
 
             -   name: "Create cache dir"
                 run: mkdir .cache
@@ -67,13 +67,13 @@ jobs:
                 id: extract_base_branch
 
             -   name: "Cache DOCtor-RST"
-                uses: actions/cache@v2
+                uses: actions/cache@v3
                 with:
                     path: .cache
                     key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
 
             -   name: "Run DOCtor-RST"
-                uses: docker://oskarstark/doctor-rst
+                uses: docker://oskarstark/doctor-rst:1.38.2
                 with:
                     args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
 
@@ -83,7 +83,7 @@ jobs:
         continue-on-error: true
         steps:
           - name: Checkout code
-            uses: actions/checkout@v2
+            uses: actions/checkout@v3
             with:
                 path: 'docs'
 
@@ -109,7 +109,7 @@ jobs:
 
           - name: Cache dependencies
             if: ${{ steps.find-files.outputs.files }}
-            uses: actions/cache@v2
+            uses: actions/cache@v3
             with:
                 path: ${{ steps.composercache.outputs.dir }}
                 key: ${{ runner.os }}-composer-codeBlocks-${{ hashFiles('_checker/composer.lock', '_sf_app/composer.lock') }}

README.markdown

@@ -26,8 +26,8 @@ Contributing
 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).
 
-**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).
+**Important**: use `5.4` branch as the base of your pull requests, unless you are
+documenting a feature that was introduced *after* Symfony 5.4 (e.g. in Symfony 6.2).
 
 Build Documentation Locally
 ---------------------------

_build/build.php

@@ -20,7 +20,7 @@
 
         $outputDir = __DIR__.'/output';
         $buildConfig = (new BuildConfig())
-            ->setSymfonyVersion('4.4')
+            ->setSymfonyVersion('5.4')
             ->setContentDir(__DIR__.'/..')
             ->setOutputDir($outputDir)
             ->setImagesDir(__DIR__.'/output/_images')

_build/composer.json

@@ -3,7 +3,7 @@
     "prefer-stable": true,
     "config": {
         "platform": {
-            "php": "7.4.14"
+            "php": "8.1.0"
         },
         "preferred-install": {
             "*": "dist"
@@ -14,9 +14,9 @@
         }
     },
     "require": {
-        "php": ">=7.4",
-        "symfony/console": "^5.4",
-        "symfony/process": "^5.4",
+        "php": ">=8.1",
+        "symfony/console": "^6.2",
+        "symfony/process": "^6.2",
         "symfony-tools/docs-builder": "^0.18"
     }
 }