Merge branch '6.0' into 6.1

* 6.0:
  Include match examples in the code block
  Update unit_testing.rst
  Update extension.rst
  Typo
  Fixed email link issue
  call `fetchAllAssociative` for a result set
  Cleanup left over 5.x mentions
  Moving RexExp search to its own heading

Author: wouterj

bundles/extension.rst

@@ -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
     {

components/string.rst

@@ -317,9 +317,15 @@ Methods to Search and Replace
     // checks if the string contents are exactly the same as the given contents
     u('foo')->equalsTo('foo'); // true
 
-    // checks if the string content match the given regular expression
+    // checks if the string content match the given regular expression.
+    // You can pass flags for preg_match() as second argument. If PREG_PATTERN_ORDER
+    // or PREG_SET_ORDER are passed, preg_match_all() will be used.
     u('avatar-73647.png')->match('/avatar-(\d+)\.png/');
     // result = ['avatar-73647.png', '73647']
+    u('avatar-73647.png')->match('/avatar-(\d+)(-\d+)?\.png/', \PREG_UNMATCHED_AS_NULL);
+    // result = ['avatar-73647.png', '73647', null]
+    u('206-555-0100 and 800-555-1212')->match('/\d{3}-\d{3}-\d{4}/', \PREG_PATTERN_ORDER);
+    // result = [['206-555-0100', '800-555-1212']]
 
     // checks if the string contains any of the other given strings
     u('aeiou')->containsAny('a');                 // true

contributing/code_of_conduct/care_team.rst

@@ -21,7 +21,7 @@ Members
 
 Here are all the members of the CARE team (in alphabetic order). You can contact
 any of them directly using the contact details below or you can also contact all
-of them at once by emailing **[email protected]**:
+of them at once by emailing ** [email protected] **.
 
 * **Timo Bakx**
 

create_framework/unit_testing.rst

@@ -8,8 +8,13 @@ on it will exhibit the same bugs. The good news is that whenever you fix a
 bug, you are fixing a bunch of applications too.
 
 Today's mission is to write unit tests for the framework we have created by
-using `PHPUnit`_. Create a PHPUnit configuration file in
-``example.com/phpunit.xml.dist``:
+using `PHPUnit`_. At first, install PHPUnit as a development dependency:
+
+.. code-block:: terminal
+
+    $ composer require --dev phpunit/phpunit
+
+Then, create a PHPUnit configuration file in ``example.com/phpunit.xml.dist``:
 
 .. code-block:: xml
 

doctrine.rst

@@ -848,10 +848,10 @@ In addition, you can query directly with SQL if you need to::
                 ORDER BY p.price ASC
                 ';
             $stmt = $conn->prepare($sql);
-            $stmt->executeQuery(['price' => $price]);
+            $resultSet = $stmt->executeQuery(['price' => $price]);
 
             // returns an array of arrays (i.e. a raw data set)
-            return $stmt->fetchAllAssociative();
+            return $resultSet->fetchAllAssociative();
         }
     }
 

security/remember_me.rst

@@ -279,11 +279,6 @@ Persistent tokens
     You can then configure this custom handler by configuring the service
     ID in the ``service`` option under ``remember_me``.
 
-    .. versionadded:: 5.1
-
-        The ``service`` option was introduced in Symfony 5.1.
-
-
 .. _security-remember-me-signature:
 
 Using Signed Remember Me Tokens
@@ -580,10 +575,6 @@ users to change their password. You can do this by leveraging a few special
     There is also a ``IS_REMEMBERED`` attribute that grants access *only*
     when the user is authenticated via the remember me mechanism.
 
-.. versionadded:: 5.1
-
-    The ``IS_REMEMBERED`` attribute was introduced in Symfony 5.1.
-
 Customizing the Remember Me Cookie
 ----------------------------------
 
@@ -622,5 +613,3 @@ cookie created by the system:
 ``samesite`` (default value: ``null``)
     If set to ``strict``, the cookie associated with this feature will not
     be sent along with cross-site requests, even when following a regular link.
-
-.. _`5.2 version of this documentation`: https://symfony.com/doc/5.2/security/remember_me.html

translation.rst

@@ -736,12 +736,12 @@ now use the following commands to push (upload) and pull (download) translations
     # push new local translations to the Loco provider for the French locale
     # and the validators domain.
     # it will **not** update existing translations already on the provider.
-    $ php bin/console translation:push loco --locales fr --domain validators
+    $ php bin/console translation:push loco --locales fr --domains validators
 
     # push new local translations and delete provider's translations that not
     # exists anymore in local files for the French locale and the validators domain.
     # it will **not** update existing translations already on the provider.
-    $ php bin/console translation:push loco --delete-missing --locales fr --domain validators
+    $ php bin/console translation:push loco --delete-missing --locales fr --domains validators
 
     # check out the command help to see its options (format, domains, locales, etc.)
     $ php bin/console translation:push --help
@@ -756,7 +756,7 @@ now use the following commands to push (upload) and pull (download) translations
     # pull new translations from the Loco provider to local files for the French
     # locale and the validators domain.
     # it will **not** overwrite your local files, only add new translations.
-    $ php bin/console translation:pull loco --locales fr --domain validators
+    $ php bin/console translation:pull loco --locales fr --domains validators
 
     # check out the command help to see its options (format, domains, locales, intl-icu, etc.)
     $ php bin/console translation:pull --help