Merge branch '6.1' into TristanPouliquen-patch-request-matcher

Author: TristanPouliquen

.doctor-rst.yaml

@@ -53,16 +53,16 @@ rules:
 
     #   master
     versionadded_directive_major_version:
-        major_version: 5
+        major_version: 6
 
     versionadded_directive_min_version:
-        min_version: '5.0'
+        min_version: '6.0'
 
     deprecated_directive_major_version:
-        major_version: 5
+        major_version: 6
 
     deprecated_directive_min_version:
-        min_version: '5.0'
+        min_version: '6.0'
 
 # do not report as violation
 whitelist:
@@ -89,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

.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

@@ -118,7 +118,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

@@ -513,11 +513,14 @@
 /components/stopwatch https://github.com/symfony/stopwatch
 /service_container/3.3-di-changes https://symfony.com/doc/3.4/service_container/3.3-di-changes.html
 /frontend/encore/shared-entry /frontend/encore/split-chunks
+/frontend/encore/page-specific-assets /frontend/encore/simple-example#page-specific-javascript-or-css
 /testing/functional_tests_assertions /testing#testing-application-assertions
 /components https://symfony.com/components
 /components/index https://symfony.com/components
+/serializer/normalizers /components/serializer#normalizers
 /logging/monolog_regex_based_excludes /logging/monolog_exclude_http_codes
 /security/named_encoders /security/named_hashers
+/components/inflector /components/string#inflector
 /security/experimental_authenticators /security
 /security/user_provider /security/user_providers
 /security/reset_password /security/passwords#reset-password
@@ -532,3 +535,11 @@
 /security/authenticator_manager /security
 /security/multiple_guard_authenticators /security/entry_point
 /security/guard_authentication /security/custom_authenticator
+/components/security/authentication /security#authenticating-users
+/components/security/authorization /security#access-control-authorization
+/components/security/firewall /security#the-firewall
+/components/security/secure_tools /security/passwords
+/components/security /security
+/email /mailer
+/frontend/assetic /frontend
+/frontend/assetic/index /frontend

CODE_OF_CONDUCT.md

@@ -3,7 +3,6 @@ Akamai
 analytics
 Ansi
 Ansible
-Assetic
 async
 authenticator
 authenticators

_build/redirection_map

@@ -30,7 +30,7 @@ to create new Symfony applications:
 
 .. code-block:: terminal
 
-    $ symfony new my_project_name
+    $ symfony new my_project_directory
 
 Under the hood, this Symfony binary command executes the needed `Composer`_
 command to :ref:`create a new Symfony application <creating-symfony-applications>`
@@ -269,7 +269,7 @@ Templates
 Use Snake Case for Template Names and Variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Use lowercased snake_case for template names, directories and variables (e.g.
+Use lowercase snake_case for template names, directories and variables (e.g.
 ``user_profile`` instead of ``userProfile`` and ``product/edit_form.html.twig``
 instead of ``Product/EditForm.html.twig``).
 
@@ -371,14 +371,15 @@ Use the ``auto`` Password Hasher
 
 The :ref:`auto password hasher <reference-security-encoder-auto>` automatically
 selects the best possible encoder/hasher depending on your PHP installation.
-Starting from Symfony 5.3, the default auto hasher is ``bcrypt``.
+Currently, the default auto hasher is ``bcrypt``.
 
 Use Voters to Implement Fine-grained Security Restrictions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If your security logic is complex, you should create custom
 :doc:`security voters </security/voters>` instead of defining long expressions
-inside the ``@Security`` annotation.
+inside the ``#[Security]`` attribute (or in the ``@Security`` annotation if your
+PHP version doesn't support attributes yet).
 
 Web Assets
 ----------
@@ -387,7 +388,7 @@ Use Webpack Encore to Process Web Assets
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Web assets are things like CSS, JavaScript and image files that make the
-frontend of your site look and work great. `Webpack`_ is the leading JavaScript
+frontend of your site looks and works great. `Webpack`_ is the leading JavaScript
 module bundler that compiles, transforms and packages assets for usage in a browser.
 
 :doc:`Webpack Encore </frontend>` is a JavaScript library that gets rid of most
@@ -439,7 +440,9 @@ Add this test while creating your application because it requires little effort
 and checks that none of your pages returns an error. Later, you'll add more
 specific tests for each page.
 
-Hardcode URLs in a Functional Test
+.. _hardcode-urls-in-a-functional-test:
+
+Hard-code URLs in a Functional Test
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In Symfony applications, it's recommended to :ref:`generate URLs <routing-generating-urls>`

_build/spelling_word_list.txt

@@ -34,7 +34,7 @@ This is how the extension of an AcmeHelloBundle should look like::
     namespace Acme\HelloBundle\DependencyInjection;
 
     use Symfony\Component\DependencyInjection\ContainerBuilder;
-    use Symfony\Component\DependencyInjection\Extension\Extension;
+    use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
     class AcmeHelloExtension extends Extension
     {

_images/contributing/docs-github-create-pr.png

@@ -27,14 +27,9 @@ The following example shows a typical usage of the cache::
     // ... and to remove the cache key
     $pool->delete('my_cache_key');
 
-Symfony supports Cache Contracts, PSR-6/16 and Doctrine Cache interfaces.
+Symfony supports Cache Contracts and PSR-6/16 interfaces.
 You can read more about these at the :doc:`component documentation </components/cache>`.
 
-.. deprecated:: 5.4
-
-    Support for Doctrine Cache was deprecated in Symfony 5.4
-    and it will be removed in Symfony 6.0.
-
 .. _cache-configuration-with-frameworkbundle:
 
 Configuring Cache with FrameworkBundle
@@ -50,7 +45,7 @@ of:
     An adapter is a *template* that you use to create pools.
 **Provider**
     A provider is a service that some adapters use to connect to the storage.
-    Redis and Memcached are example of such adapters. If a DSN is used as the
+    Redis and Memcached are examples of such adapters. If a DSN is used as the
     provider then a service is automatically created.
 
 There are two pools that are always enabled by default. They are ``cache.app`` and
@@ -104,18 +99,13 @@ The Cache component comes with a series of adapters pre-configured:
 
 * :doc:`cache.adapter.apcu </components/cache/adapters/apcu_adapter>`
 * :doc:`cache.adapter.array </components/cache/adapters/array_cache_adapter>`
-* :doc:`cache.adapter.doctrine </components/cache/adapters/doctrine_adapter>`
 * :doc:`cache.adapter.filesystem </components/cache/adapters/filesystem_adapter>`
 * :doc:`cache.adapter.memcached </components/cache/adapters/memcached_adapter>`
 * :doc:`cache.adapter.pdo </components/cache/adapters/pdo_doctrine_dbal_adapter>`
 * :doc:`cache.adapter.psr6 </components/cache/adapters/proxy_adapter>`
 * :doc:`cache.adapter.redis </components/cache/adapters/redis_adapter>`
 * :ref:`cache.adapter.redis_tag_aware <redis-tag-aware-adapter>` (Redis adapter optimized to work with tags)
 
-.. versionadded:: 5.2
-
-    ``cache.adapter.redis_tag_aware`` has been introduced in Symfony 5.2.
-
 Some of these adapters could be configured via shortcuts. Using these shortcuts
 will create pools with service IDs that follow the pattern ``cache.[type]``.
 
@@ -128,8 +118,6 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
             cache:
                 directory: '%kernel.cache_dir%/pools' # Only used with cache.adapter.filesystem
 
-                # service: cache.doctrine
-                default_doctrine_provider: 'app.doctrine_cache'
                 # service: cache.psr6
                 default_psr6_provider: 'app.my_psr6_service'
                 # service: cache.redis
@@ -153,15 +141,13 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
 
             <framework:config>
                 <!--
-                default_doctrine_provider: Service: cache.doctrine
                 default_psr6_provider: Service: cache.psr6
                 default_redis_provider: Service: cache.redis
                 default_memcached_provider: Service: cache.memcached
                 default_pdo_provider: Service: cache.pdo
                 -->
                 <!-- "directory" attribute is only used with cache.adapter.filesystem -->
                 <framework:cache directory="%kernel.cache_dir%/pools"
-                    default_doctrine_provider="app.doctrine_cache"
                     default_psr6_provider="app.my_psr6_service"
                     default_redis_provider="redis://localhost"
                     default_memcached_provider="memcached://localhost"
@@ -179,8 +165,6 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
             $framework->cache()
                 // Only used with cache.adapter.filesystem
                 ->directory('%kernel.cache_dir%/pools')
-                // Service: cache.doctrine
-                ->defaultDoctrineProvider('app.doctrine_cache')
                 // Service: cache.psr6
                 ->defaultPsr6Provider('app.my_psr6_service')
                 // Service: cache.redis
@@ -192,11 +176,6 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
             ;
         };
 
-.. deprecated:: 5.4
-
-    The ``default_doctrine_provider`` option was deprecated in Symfony 5.4 and
-    it will be removed in Symfony 6.0.
-
 .. _cache-create-pools:
 
 Creating Custom (Namespaced) Pools
@@ -730,11 +709,6 @@ Clear all caches everywhere:
 Encrypting the Cache
 --------------------
 
-.. versionadded:: 5.1
-
-    The :class:`Symfony\\Component\\Cache\\Marshaller\\SodiumMarshaller`
-    class was introduced in Symfony 5.1.
-
 To encrypt the cache using ``libsodium``, you can use the
 :class:`Symfony\\Component\\Cache\\Marshaller\\SodiumMarshaller`.
 
@@ -810,5 +784,5 @@ Then, register the ``SodiumMarshaller`` service using this key:
 
 When configuring multiple keys, the first key will be used for reading and
 writing, and the additional key(s) will only be used for reading. Once all
-cache items encrypted with the old key have expired, you can remove
-``OLD_CACHE_DECRYPTION_KEY`` completely.
+cache items encrypted with the old key have expired, you can completely remove
+``OLD_CACHE_DECRYPTION_KEY``.

_images/contributing/docs-github-edit-page.png

@@ -8,7 +8,7 @@ The Asset Component
     The Asset component manages URL generation and versioning of web assets such
     as CSS stylesheets, JavaScript files and image files.
 
-In the past, it was common for web applications to hardcode URLs of web assets.
+In the past, it was common for web applications to hard-code the URLs of web assets.
 For example:
 
 .. code-block:: html
@@ -183,10 +183,6 @@ listed in the manifest::
     echo $package->getUrl('not-found.css');
     // error:
 
-.. versionadded:: 5.4
-
-    The ``$strictMode`` option was introduced in Symfony 5.4.
-
 If your JSON file is not on your local filesystem but is accessible over HTTP,
 use the :class:`Symfony\\Component\\Asset\\VersionStrategy\\RemoteJsonManifestVersionStrategy`
 with the :doc:`HttpClient component </http_client>`::
@@ -199,10 +195,6 @@ with the :doc:`HttpClient component </http_client>`::
     $manifestUrl = 'https://cdn.example.com/rev-manifest.json';
     $package = new Package(new RemoteJsonManifestVersionStrategy($manifestUrl, $httpClient));
 
-.. versionadded:: 5.1
-
-    The ``RemoteJsonManifestVersionStrategy`` was introduced in Symfony 5.1.
-
 Custom Version Strategies
 .........................
 
@@ -395,7 +387,7 @@ they all have different base paths::
     $packages = new Packages($defaultPackage, $namedPackages);
 
 The ``Packages`` class allows to define a default package, which will be applied
-to assets that don't define the name of package to use. In addition, this
+to assets that don't define the name of the package to use. In addition, this
 application defines a package named ``img`` to serve images from an external
 domain and a ``doc`` package to avoid repeating long paths when linking to a
 document inside a template::