Merge branch '6.4' into 7.0

* 6.4:
  [Uid] v7 is the new default version
  Minor
  Fix incorrect placement of is_empty_callback
  [Tests] Update PHPUnit documentation links
  Mention Rector in the upgrading articles
  Update custom_authenticator.rst
  Remove incomplete duplicate

Author: javiereguiluz

best_practices.rst

@@ -454,4 +454,4 @@ you must set up a redirection.
 .. _`feature toggles`: https://en.wikipedia.org/wiki/Feature_toggle
 .. _`smoke testing`: https://en.wikipedia.org/wiki/Smoke_testing_(software)
 .. _`Webpack`: https://webpack.js.org/
-.. _`PHPUnit data providers`: https://docs.phpunit.de/en/9.5/writing-tests-for-phpunit.html#data-providers
+.. _`PHPUnit data providers`: https://docs.phpunit.de/en/9.6/writing-tests-for-phpunit.html#data-providers

components/phpunit_bridge.rst

@@ -1053,11 +1053,11 @@ not find the SUT:
 .. _`PHPUnit`: https://phpunit.de
 .. _`PHPUnit event listener`: https://docs.phpunit.de/en/10.0/extending-phpunit.html#phpunit-s-event-system
 .. _`ErrorHandler component`: https://github.com/symfony/error-handler
-.. _`PHPUnit's assertStringMatchesFormat()`: https://docs.phpunit.de/en/9.5/assertions.html#assertstringmatchesformat
+.. _`PHPUnit's assertStringMatchesFormat()`: https://docs.phpunit.de/en/9.6/assertions.html#assertstringmatchesformat
 .. _`PHP error handler`: https://www.php.net/manual/en/book.errorfunc.php
-.. _`environment variable`: https://docs.phpunit.de/en/9.5/configuration.html#the-env-element
+.. _`environment variable`: https://docs.phpunit.de/en/9.6/configuration.html#the-env-element
 .. _`@-silencing operator`: https://www.php.net/manual/en/language.operators.errorcontrol.php
 .. _`Travis CI`: https://travis-ci.org/
-.. _`test listener`: https://docs.phpunit.de/en/9.5/configuration.html#the-extensions-element
-.. _`@covers`: https://docs.phpunit.de/en/9.5/annotations.html#covers
+.. _`test listener`: https://docs.phpunit.de/en/9.6/configuration.html#the-extensions-element
+.. _`@covers`: https://docs.phpunit.de/en/9.6/annotations.html#covers
 .. _`PHP namespace resolutions rules`: https://www.php.net/manual/en/language.namespaces.rules.php

components/uid.rst

@@ -94,10 +94,10 @@ configure the behavior of the factory using configuration files::
         # config/packages/uid.yaml
         framework:
             uid:
-                default_uuid_version: 6
+                default_uuid_version: 7
                 name_based_uuid_version: 5
                 name_based_uuid_namespace: 6ba7b810-9dad-11d1-80b4-00c04fd430c8
-                time_based_uuid_version: 6
+                time_based_uuid_version: 7
                 time_based_uuid_node: 121212121212
 
     .. code-block:: xml
@@ -113,10 +113,10 @@ configure the behavior of the factory using configuration files::
 
             <framework:config>
                 <framework:uid
-                    default_uuid_version="6"
+                    default_uuid_version="7"
                     name_based_uuid_version="5"
                     name_based_uuid_namespace="6ba7b810-9dad-11d1-80b4-00c04fd430c8"
-                    time_based_uuid_version="6"
+                    time_based_uuid_version="7"
                     time_based_uuid_node="121212121212"
                 />
             </framework:config>
@@ -135,10 +135,10 @@ configure the behavior of the factory using configuration files::
 
             $container->extension('framework', [
                 'uid' => [
-                    'default_uuid_version' => 6,
+                    'default_uuid_version' => 7,
                     'name_based_uuid_version' => 5,
                     'name_based_uuid_namespace' => '6ba7b810-9dad-11d1-80b4-00c04fd430c8',
-                    'time_based_uuid_version' => 6,
+                    'time_based_uuid_version' => 7,
                     'time_based_uuid_node' => 121212121212,
                 ],
             ]);
@@ -160,7 +160,7 @@ on the configuration you defined::
 
         public function generate(): void
         {
-            // This creates a UUID of the version given in the configuration file (v6 by default)
+            // This creates a UUID of the version given in the configuration file (v7 by default)
             $uuid = $this->uuidFactory->create();
 
             $nameBasedUuid = $this->uuidFactory->nameBased(/** ... */);

create_framework/unit_testing.rst

@@ -212,6 +212,6 @@ Symfony code.
 Now that we are confident (again) about the code we have written, we can
 safely think about the next batch of features we want to add to our framework.
 
-.. _`PHPUnit`: https://docs.phpunit.de/en/9.5/
-.. _`test doubles`: https://docs.phpunit.de/en/9.5/test-doubles.html
+.. _`PHPUnit`: https://docs.phpunit.de/en/9.6/
+.. _`test doubles`: https://docs.phpunit.de/en/9.6/test-doubles.html
 .. _`XDebug`: https://xdebug.org/

form/unit_testing.rst

@@ -241,4 +241,4 @@ guessers using the :method:`Symfony\\Component\\Form\\Test\\FormIntegrationTestC
 and :method:`Symfony\\Component\\Form\\Test\\FormIntegrationTestCase::getTypeGuessers`
 methods.
 
-.. _`PHPUnit data providers`: https://docs.phpunit.de/en/9.5/writing-tests-for-phpunit.html#data-providers
+.. _`PHPUnit data providers`: https://docs.phpunit.de/en/9.6/writing-tests-for-phpunit.html#data-providers

reference/constraints/UniqueEntity.rst

@@ -254,11 +254,6 @@ each with a single field.
 ``ignoreNull``
 ~~~~~~~~~~~~~~
 
-**type**: ``boolean`` **default**: ``true``
-
-``ignoreNull``
-~~~~~~~~~~~~~~
-
 **type**: ``boolean`` | ``string`` | ``array`` **default**: ``true``
 
 If this option is set to ``true``, then the constraint will allow multiple

reference/forms/types/form.rst

@@ -61,15 +61,15 @@ The actual default value of this option depends on other field options:
 * If ``data_class`` is not set and ``compound`` is ``false``, then ``''``
   (empty string).
 
+.. include:: /reference/forms/types/options/empty_data_description.rst.inc
+
 ``is_empty_callback``
 ~~~~~~~~~~~~~~~~~~~~~
 
 **type**: ``callable`` **default**: ``null``
 
 This callable takes form data and returns whether value is considered empty.
 
-.. include:: /reference/forms/types/options/empty_data_description.rst.inc
-
 .. _reference-form-option-error-bubbling:
 
 .. include:: /reference/forms/types/options/error_bubbling.rst.inc

security/custom_authenticator.rst

@@ -239,7 +239,7 @@ using :ref:`the user provider <security-user-providers>`::
                 // ...
 
                 return new Passport(
-                    new UserBadge($email, function (string $userIdentifier): ?User {
+                    new UserBadge($email, function (string $userIdentifier): ?UserInterface {
                         return $this->userRepository->findOneBy(['email' => $userIdentifier]);
                     }),
                     $credentials

setup/upgrade_major.rst

@@ -54,6 +54,12 @@ And sometimes, the warning may come from a third-party library or bundle
 that you're using. If that's true, there's a good chance that those deprecations
 have already been updated. In that case, upgrade the library to fix them.
 
+.. tip::
+
+    `Rector`_ is a third-party project that automates the upgrading and
+    refactoring of PHP projects. Rector includes some rules to fix certain
+    Symfony deprecations automatically.
+
 Once all the deprecation warnings are gone, you can upgrade with a lot
 more confidence.
 
@@ -310,3 +316,4 @@ Classes in the ``vendor/`` directory are always ignored.
        Now, you can safely allow ``^6.0`` for the Symfony dependencies.
 
 .. _`PHP CS Fixer`: https://github.com/friendsofphp/php-cs-fixer
+.. _`Rector`: https://github.com/rectorphp/rector

setup/upgrade_minor.rst

@@ -84,6 +84,12 @@ included in the Symfony directory that describes these changes. If you follow
 the instructions in the document and update your code accordingly, it should be
 safe to update in the future.
 
+.. tip::
+
+    `Rector`_ is a third-party project that automates the upgrading and
+    refactoring of PHP projects. Rector includes some rules to fix certain
+    Symfony deprecations automatically.
+
 These documents can also be found in the `Symfony Repository`_.
 
 .. _updating-flex-recipes:
@@ -92,3 +98,4 @@ These documents can also be found in the `Symfony Repository`_.
 
 .. _`Symfony Repository`: https://github.com/symfony/symfony
 .. _`UPGRADE-5.4.md`: https://github.com/symfony/symfony/blob/5.4/UPGRADE-5.4.md
+.. _`Rector`: https://github.com/rectorphp/rector

testing.rst

@@ -1085,12 +1085,12 @@ Learn more
 
 .. _`PHPUnit`: https://phpunit.de/
 .. _`documentation`: https://docs.phpunit.de/
-.. _`Writing Tests for PHPUnit`: https://docs.phpunit.de/en/9.5/writing-tests-for-phpunit.html
-.. _`PHPUnit documentation`: https://docs.phpunit.de/en/9.5/configuration.html
+.. _`Writing Tests for PHPUnit`: https://docs.phpunit.de/en/9.6/writing-tests-for-phpunit.html
+.. _`PHPUnit documentation`: https://docs.phpunit.de/en/9.6/configuration.html
 .. _`unit test`: https://en.wikipedia.org/wiki/Unit_testing
 .. _`DAMADoctrineTestBundle`: https://github.com/dmaicher/doctrine-test-bundle
 .. _`Doctrine data fixtures`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
 .. _`DoctrineFixturesBundle documentation`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
 .. _`SymfonyMakerBundle`: https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html
-.. _`PHPUnit Assertion`: https://docs.phpunit.de/en/9.5/assertions.html
+.. _`PHPUnit Assertion`: https://docs.phpunit.de/en/9.6/assertions.html
 .. _`section 4.1.18 of RFC 3875`: https://tools.ietf.org/html/rfc3875#section-4.1.18