Merge branch '5.4' into 6.0

javiereguiluz · javiereguiluz · commit bbce3dbd2a09 · 2021-12-15T20:27:29.000+01:00
* 5.4:
  Correct spelling &amp; grammar in 4.4 translation/
  Correct spelling &amp; grammar in 4.4 validation/
  Correct spelling &amp; grammar in 4.4 templating/
  Correct spelling &amp; grammar in 4.4 setup/
  Correct spelling &amp; grammar in 4.4 service_container/
  Correct spelling &amp; grammar in 4.4 security/
  Correct spelling &amp; grammar in 4.4 routing/
  Correct spelling &amp; grammar in 4.4 quick_tour/
  Correct spelling &amp; grammar in 4.4 profiler/
  Correct spelling &amp; grammar in 4.4 messenger/
  Correct spelling &amp; grammar in 4.4 logging/
  Correct spelling &amp; grammar in 4.4 introduction/
  Correct spelling &amp; grammar in 4.4 http_cache/
  Correct spelling &amp; grammar in 4.4 frontend/
diff --git a/frontend/encore/advanced-config.rst b/frontend/encore/advanced-config.rst
@@ -5,7 +5,7 @@ Summarized, Encore generates the Webpack configuration that's used in your
 ``webpack.config.js`` file. Encore doesn't support adding all of Webpack's
 `configuration options`_, because many can be added on your own.
 
-For example, suppose you need to resolve automatically a new extension.
+For example, suppose you need to automatically resolve a new extension.
 To do that, modify the config after fetching it from Encore:
 
 .. code-block:: javascript
diff --git a/frontend/encore/installation.rst b/frontend/encore/installation.rst
@@ -168,7 +168,7 @@ And the new ``assets/styles/app.css`` file:
         background-color: lightgray;
     }
 
-You'll customize and learn more about these file in :doc:`/frontend/encore/simple-example`.
+You'll customize and learn more about these files in :doc:`/frontend/encore/simple-example`.
 
 .. caution::
 
diff --git a/frontend/encore/page-specific-assets.rst b/frontend/encore/page-specific-assets.rst
@@ -24,4 +24,4 @@ page-specific JavaScript and CSS file from a page-specific entry (e.g. ``checkou
 .. tip::
 
     Be sure to use :doc:`split chunks </frontend/encore/split-chunks>`
-    to avoid duplicating and shared code between your entry files.
+    to avoid duplicate and shared code between your entry files.
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -282,7 +282,7 @@ file to ``app.scss`` and update the ``import`` statement:
     - import './styles/app.css';
     + import './styles/app.scss';
 
-Then, tell Encore to enable the Sass pre-processor:
+Then, tell Encore to enable the Sass preprocessor:
 
 .. code-block:: diff
 
diff --git a/http_cache/cache_invalidation.rst b/http_cache/cache_invalidation.rst
@@ -91,7 +91,7 @@ to support the ``PURGE`` HTTP method::
 
 **Purge** instructs the cache to drop a resource in *all its variants*
 (according to the ``Vary`` header, see :doc:`/http_cache/cache_vary`). An alternative to purging is
-**refreshing** a content. Refreshing means that the caching proxy is
+**refreshing** the content. Refreshing means that the caching proxy is
 instructed to discard its local cache and fetch the content again. This way,
 the new content is already available in the cache. The drawback of refreshing
 is that variants are not invalidated.
diff --git a/http_cache/ssi.rst b/http_cache/ssi.rst
@@ -33,7 +33,7 @@ Symfony manages only the ``#include virtual`` one.
 
 .. caution::
 
-    Be careful with SSI, your website may be victim of injections.
+    Be careful with SSI, your website may fall victim to injections.
     Please read this `OWASP article`_ first!
 
 When the web server reads an SSI directive, it requests the given URI or gives
diff --git a/http_cache/varnish.rst b/http_cache/varnish.rst
@@ -89,7 +89,7 @@ configuration of PHP, your session cookie has the name ``PHPSESSID``:
                 set req.http.Cookie = regsuball(req.http.Cookie, "^[; ]+|[; ]+$", "");
 
                 if (req.http.Cookie == "") {
-                    // If there are no more cookies, remove the header to get page cached.
+                    // If there are no more cookies, remove the header to get the page cached.
                     unset req.http.Cookie;
                 }
             }
diff --git a/introduction/from_flat_php_to_symfony.rst b/introduction/from_flat_php_to_symfony.rst
@@ -402,7 +402,7 @@ have *many* controller functions: one for each page.
 
 By now, the application has evolved from a single PHP file into a structure
 that is organized and allows for code reuse. You should be happier, but far
-from satisfied. For example, the routing system is fickle, and wouldn't
+from being satisfied. For example, the routing system is fickle, and wouldn't
 recognize that the list page - ``/index.php``  - should be accessible also via ``/``
 (if Apache rewrite rules were added). Also, instead of developing the blog,
 a lot of time is being spent working on the "architecture" of the code (e.g.
diff --git a/introduction/http_fundamentals.rst b/introduction/http_fundamentals.rst
@@ -234,10 +234,10 @@ have all the request information at your fingertips::
     $request->getMethod();    // e.g. GET, POST, PUT, DELETE or HEAD
     $request->getLanguages(); // an array of languages the client accepts
 
-As a bonus, the ``Request`` class does a lot of work in the background that
-you'll never need to worry about. For example, the ``isSecure()`` method
+As a bonus, the ``Request`` class does a lot of work in the background about which
+you will never need to worry. For example, the ``isSecure()`` method
 checks the *three* different values in PHP that can indicate whether or not
-the user is connecting via a secured connection (i.e. HTTPS).
+the user is connecting via a secure connection (i.e. HTTPS).
 
 Symfony Response Object
 ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/logging/handlers.rst b/logging/handlers.rst
@@ -5,7 +5,7 @@ ElasticsearchLogstashHandler
 ----------------------------
 
 This handler deals directly with the HTTP interface of Elasticsearch. This means
-it will slow down your application if Elasticsearch takes times to answer. Even
+it will slow down your application if Elasticsearch takes time to answer. Even
 if all HTTP calls are done asynchronously.
 
 In a development environment, it's fine to keep the default configuration: for
diff --git a/logging/monolog_console.rst b/logging/monolog_console.rst
@@ -61,7 +61,7 @@ The example above could then be rewritten as::
 
 Depending on the verbosity level that the command is run in and the user's
 configuration (see below), these messages may or may not be displayed to
-the console. If they are displayed, they are timestamped and colored appropriately.
+the console. If they are displayed, they are time-stamped and colored appropriately.
 Additionally, error logs are written to the error output (``php://stderr``).
 There is no need to conditionally handle the verbosity settings anymore.
 
diff --git a/logging/monolog_email.rst b/logging/monolog_email.rst
@@ -145,8 +145,8 @@ is then passed onto the ``deduplicated`` handler.
 
 The ``deduplicated`` handler keeps all the messages for a request and then
 passes them onto the nested handler in one go, but only if the records are
-unique over a given period of time (60 seconds by default). If the records are
-duplicated they are discarded. Adding this handler reduces the amount of
+unique over a given period of time (60 seconds by default). Duplicated records are
+discarded. Adding this handler reduces the amount of
 notifications to a manageable level, specially in critical failure scenarios.
 You can adjust the time period using the ``time`` option:
 
diff --git a/logging/processors.rst b/logging/processors.rst
@@ -186,7 +186,7 @@ Symfony's MonologBridge provides processors that can be registered inside your a
     Adds information about current route (controller, action, route parameters).
 
 :class:`Symfony\\Bridge\\Monolog\\Processor\\ConsoleCommandProcessor`
-    Adds information about current console command.
+    Adds information about the current console command.
 
 .. seealso::
 
diff --git a/messenger/dispatch_after_current_bus.rst b/messenger/dispatch_after_current_bus.rst
@@ -126,7 +126,7 @@ will not be rolled back.
     If ``WhenUserRegisteredThenSendWelcomeEmail`` throws an exception, that
     exception will be wrapped into a ``DelayedMessageHandlingException``. Using
     ``DelayedMessageHandlingException::getExceptions`` will give you all
-    exceptions that are thrown while handing a message with the
+    exceptions that are thrown while handling a message with the
     ``DispatchAfterCurrentBusStamp``.
 
 The ``dispatch_after_current_bus`` middleware is enabled by default. If you're
diff --git a/messenger/multiple_buses.rst b/messenger/multiple_buses.rst
@@ -227,7 +227,7 @@ Debugging the Buses
 -------------------
 
 The ``debug:messenger`` command lists available messages & handlers per bus.
-You can also restrict the list to a specific bus by providing its name as argument.
+You can also restrict the list to a specific bus by providing its name as an argument.
 
 .. code-block:: terminal
 
diff --git a/quick_tour/flex_recipes.rst b/quick_tour/flex_recipes.rst
@@ -29,7 +29,7 @@ are included in your ``composer.json`` file:
         "symfony/yaml": "^4.1"
     }
 
-This makes Symfony different than any other PHP framework! Instead of starting with
+This makes Symfony different from any other PHP framework! Instead of starting with
 a *bulky* app with *every* possible feature you might ever need, a Symfony app is
 small, simple and *fast*. And you're in total control of what you add.
 
@@ -253,7 +253,7 @@ Not convinced yet? No problem: remove the library:
 
     $ composer remove api
 
-Flex will *uninstall* the recipes: removing files and un-doing changes to put your
+Flex will *uninstall* the recipes: removing files and undoing changes to put your
 app back in its original state. Experiment without worry.
 
 More Features, Architecture and Speed
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -287,8 +287,7 @@ Environment Variables
 ---------------------
 
 Every app contains configuration that's different on each server - like database
-connection information or passwords. How should these be stored? In files? Or some
-other way?
+connection information or passwords. How should these be stored? In files? Or another way?
 
 Symfony follows the industry best practice by storing server-based configuration
 as *environment* variables. This means that Symfony works *perfectly* with
diff --git a/routing/custom_route_loader.rst b/routing/custom_route_loader.rst
@@ -82,7 +82,7 @@ Symfony provides several route loaders for the most common needs:
 
 .. note::
 
-    When importing resources, the key (e.g. ``app_file``) is the name of collection.
+    When importing resources, the key (e.g. ``app_file``) is the name of the collection.
     Just be sure that it's unique per file so no other lines override it.
 
 If your application needs are different, you can create your own custom route
diff --git a/routing/routing_from_database.rst b/routing/routing_from_database.rst
@@ -24,7 +24,7 @@ When all routes are known during deploy time and the number is not too
 high, using a :doc:`custom route loader <custom_route_loader>` is the
 preferred way to add more routes. When working with only one type of
 objects, a slug parameter on the object and the ``@ParamConverter``
-annotation work fine (see `FrameworkExtraBundle`_) .
+annotation works fine (see `FrameworkExtraBundle`_) .
 
 The ``DynamicRouter`` is useful when you need ``Route`` objects with
 the full feature set of Symfony. Each route can define a specific
diff --git a/security/voters.rst b/security/voters.rst
@@ -28,7 +28,7 @@ example for voters.
 
     Take a look at the
     :doc:`authorization </components/security/authorization>`
-    article for an even deeper understanding on voters.
+    article for an even deeper understanding of voters.
 
 Here's how Symfony works with voters:
 All voters are called each time you use the ``isGranted()`` method on Symfony's
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
@@ -186,7 +186,7 @@ If there is *not* a service whose id exactly matches the type, a clear exception
 will be thrown.
 
 Autowiring is a great way to automate configuration, and Symfony tries to be as
-*predictable* and clear as possible.
+*predictable* and as clear as possible.
 
 .. _service-autowiring-alias:
 
diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst
@@ -191,7 +191,7 @@ This approach is useful if you need to configure your service according to your
 so, here's the advantages of immutable-setters:
 
 * Immutable setters works with optional dependencies, this way, if you don't need
-  a dependency, the setter don't need to be called.
+  a dependency, the setter doesn't need to be called.
 
 * Like the constructor injection, using immutable setters force the dependency to stay
   the same during the lifetime of a service.
diff --git a/setup/bundles.rst b/setup/bundles.rst
@@ -4,7 +4,7 @@
 Upgrading a Third-Party Bundle for a Major Symfony Version
 ==========================================================
 
-Symfony 3 was released on November 2015. Although this version doesn't contain
+Symfony 3 was released in November 2015. Although this version doesn't contain
 any new features, it removes all the backward compatibility layers included in
 the previous 2.8 version. If your bundle uses any deprecated feature and it's
 published as a third-party bundle, applications upgrading to Symfony 3 will no
@@ -26,8 +26,8 @@ Most third-party bundles define their Symfony dependencies using the ``~2.N`` or
         }
     }
 
-These constraints prevent the bundle from using Symfony 3 components, so it makes
-it impossible to install it in a Symfony 3 based application. Thanks to the
+These constraints prevent the bundle from using Symfony 3 components, which
+means the bundle cannot be installed in a Symfony 3 based application. Thanks to the
 flexibility of Composer dependencies constraints, you can specify more than one
 major version by replacing ``~2.N`` by ``~2.N|~3.0`` (or ``^2.N`` by ``^2.N|~3.0``).
 
diff --git a/templating/global_variables.rst b/templating/global_variables.rst
@@ -4,7 +4,7 @@
 How to Inject Variables Automatically into all Templates
 ========================================================
 
-Twig allows to inject automatically one or more variables into all templates.
+Twig allows you to automatically inject one or more variables into all templates.
 These global variables are defined in the ``twig.globals`` option inside the
 main Twig configuration file:
 
diff --git a/translation/locale.rst b/translation/locale.rst
@@ -31,7 +31,7 @@ it::
     The custom listener must be called **before** ``LocaleListener``, which
     initializes the locale based on the current request. To do so, set your
     listener priority to a higher value than ``LocaleListener`` priority (which
-    you can obtain running the ``debug:event kernel.request`` command).
+    you can obtain by running the ``debug:event kernel.request`` command).
 
 Read :doc:`/session/locale_sticky_session` for more information on making
 the user's locale "sticky" to their session.
diff --git a/translation/message_format.rst b/translation/message_format.rst
@@ -5,7 +5,7 @@ How to Translate Messages using the ICU MessageFormat
 =====================================================
 
 Messages (i.e. strings) in applications are almost never completely static.
-They contain variables or other complex logic like pluralization. In order to
+They contain variables or other complex logic like pluralization. To
 handle this, the Translator component supports the `ICU MessageFormat`_ syntax.
 
 .. tip::
@@ -88,7 +88,7 @@ Selecting Different Messages Based on a Condition
 
 The curly brace syntax allows to "modify" the output of the variable. One of
 these functions is the ``select`` function. It acts like PHP's `switch statement`_
-and allows to use different strings based on the value of the variable. A
+and allows you to use different strings based on the value of the variable. A
 typical usage of this is gender:
 
 .. configuration-block::
@@ -100,9 +100,9 @@ typical usage of this is gender:
         # the 'other' key is required, and is selected if no other case matches
         invitation_title: >-
             {organizer_gender, select,
-                female {{organizer_name} has invited you for her party!}
-                male   {{organizer_name} has invited you for his party!}
-                other  {{organizer_name} have invited you for their party!}
+                female {{organizer_name} has invited you to her party!}
+                male   {{organizer_name} has invited you to his party!}
+                other  {{organizer_name} have invited you to their party!}
             }
 
     .. code-block:: xml
@@ -116,9 +116,9 @@ typical usage of this is gender:
                         <source>invitation_title</source>
                         <!-- the 'other' key is required, and is selected if no other case matches -->
                         <target>{organizer_gender, select,
-                            female {{organizer_name} has invited you for her party!}
-                            male {{organizer_name} has invited you for his party!}
-                            other {{organizer_name} have invited you for their party!}
+                            female {{organizer_name} has invited you to her party!}
+                            male {{organizer_name} has invited you to his party!}
+                            other {{organizer_name} have invited you to their party!}
                         }</target>
                     </trans-unit>
                 </body>
@@ -131,9 +131,9 @@ typical usage of this is gender:
         return [
             // the 'other' key is required, and is selected if no other case matches
             'invitation_title' => '{organizer_gender, select,
-                female {{organizer_name} has invited you for her party!}
-                male   {{organizer_name} has invited you for his party!}
-                other  {{organizer_name} have invited you for their party!}
+                female {{organizer_name} has invited you to her party!}
+                male   {{organizer_name} has invited you to his party!}
+                other  {{organizer_name} have invited you to their party!}
             }',
         ];
 
@@ -143,13 +143,13 @@ later, ``function_statement`` is optional for some functions). In this case,
 the function name is ``select`` and its statement contains the "cases" of this
 select. This function is applied over the ``organizer_gender`` variable::
 
-    // prints "Ryan has invited you for his party!"
+    // prints "Ryan has invited you to his party!"
     echo $translator->trans('invitation_title', [
         'organizer_name' => 'Ryan',
         'organizer_gender' => 'male',
     ]);
 
-    // prints "John & Jane have invited you for their party!"
+    // prints "John & Jane have invited you to their party!"
     echo $translator->trans('invitation_title', [
         'organizer_name' => 'John & Jane',
         'organizer_gender' => 'not_applicable',
@@ -160,10 +160,10 @@ you to use literal text in the select statements:
 
 #. The first ``{organizer_gender, select, ...}`` block starts the "code" mode,
    which means ``organizer_gender`` is processed as a variable.
-#. The inner ``{... has invited you for her party!}`` block brings you back in
+#. The inner ``{... has invited you to her party!}`` block brings you back in
    "literal" mode, meaning the text is not processed.
 #. Inside this block, ``{organizer_name}`` starts "code" mode again, allowing
-   ``organizer_name`` to be processed as variable.
+   ``organizer_name`` to be processed as a variable.
 
 .. tip::
 
@@ -240,7 +240,7 @@ handle pluralization in your messages (e.g. ``There are 3 apples`` vs
 Pluralization rules are actually quite complex and differ for each language.
 For instance, Russian uses different plural forms for numbers ending with 1;
 numbers ending with 2, 3 or 4; numbers ending with 5, 6, 7, 8 or 9; and even
-some exceptions of this!
+some exceptions to this!
 
 In order to properly translate this, the possible cases in the ``plural``
 function are also different for each language. For instance, Russian has
@@ -294,7 +294,7 @@ Usage of this string is the same as with variables and select::
 .. sidebar:: Using Ranges in Messages
 
     The pluralization in the legacy Symfony syntax could be used with custom
-    ranges (e.g. have a different messages for 0-12, 12-40 and 40+). The ICU
+    ranges (e.g. have different messages for 0-12, 12-40 and 40+). The ICU
     message format does not have this feature. Instead, this logic should be
     moved to PHP code::
 
diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst
@@ -97,7 +97,7 @@ The validator class only has one required method ``validate()``::
                 // separate multiple types using pipes
                 // throw new UnexpectedValueException($value, 'string|int');
             }
-            
+
             // access your configuration options like this:
             if ('strict' === $constraint->mode) {
                 // ...
@@ -256,8 +256,8 @@ With this, the validator's ``validate()`` method gets an object as its first arg
 
 .. tip::
 
-    The ``atPath()`` method defines the property which the validation error is
-    associated to. Use any :doc:`valid PropertyAccess syntax </components/property_access>`
+    The ``atPath()`` method defines the property with which the validation error is
+    associated. Use any :doc:`valid PropertyAccess syntax </components/property_access>`
     to define that property.
 
 A class constraint validator is applied to the class itself, and
diff --git a/validation/groups.rst b/validation/groups.rst
@@ -163,7 +163,7 @@ With this configuration, there are three validation groups:
 
 ``registration``
     This is a custom validation group, so it only contains the constraints
-    explicitly associated to it. In this example, only the ``email`` and
+    that are explicitly associated with it. In this example, only the ``email`` and
     ``password`` fields.
 
 Constraints in the ``Default`` group of a class are the constraints that have
diff --git a/validation/sequence_provider.rst b/validation/sequence_provider.rst
@@ -336,7 +336,7 @@ method, which should return an array of groups to use::
         public function getGroupSequence()
         {
             // when returning a simple array, if there's a violation in any group
-            // the rest of groups are not validated. E.g. if 'User' fails,
+            // the rest of the groups are not validated. E.g. if 'User' fails,
             // 'Premium' and 'Api' are not validated:
             return ['User', 'Premium', 'Api'];
 

Original file line number	Diff line number	Diff line change
@@ -168,7 +168,7 @@ And the new ``assets/styles/app.css`` file:
`168`	`168`	`background-color: lightgray;`
`169`	`169`	`}`
`170`	`170`
`171`		-You'll customize and learn more about these file in :doc:`/frontend/encore/simple-example`.
	`171`	+You'll customize and learn more about these files in :doc:`/frontend/encore/simple-example`.
`172`	`172`
`173`	`173`	`.. caution::`
`174`	`174`
Original file line number	Diff line number	Diff line change
@@ -89,7 +89,7 @@ configuration of PHP, your session cookie has the name ``PHPSESSID``:
`89`	`89`	`set req.http.Cookie = regsuball(req.http.Cookie, "^[; ]+\|[; ]+$", "");`
`90`	`90`
`91`	`91`	`if (req.http.Cookie == "") {`
`92`		`- // If there are no more cookies, remove the header to get page cached.`
	`92`	`+ // If there are no more cookies, remove the header to get the page cached.`
`93`	`93`	`unset req.http.Cookie;`
`94`	`94`	`}`
`95`	`95`	`}`