Merge branch '3.4' into 4.2

* 3.4:
  Fixed more wrong white spaces
  typos and repetetive words
  fix whitespace
  Update psr4_class_loader.rst

Author: javiereguiluz

_includes/_annotation_loader_tip.rst.inc

@@ -8,7 +8,7 @@
     Annotation classes aren't loaded automatically, so you must load them
     using a class loader like this::
 
-        use Composer\Autoload\ClassLoader;
+        use Composer\Autoload\ClassLoader;
         use Doctrine\Common\Annotations\AnnotationRegistry;
 
         /** @var ClassLoader $loader */

components/cache/adapters/php_files_adapter.rst

@@ -37,7 +37,7 @@ file similar to the following::
 
     If you have configured OPcache to
     :ref:`not check the file timestamps <performance-dont-check-timestamps>`
-    the cached items will not not be invalidated unless you clear OPcache.
+    the cached items will not be invalidated unless you clear OPcache.
 
 The PhpFilesAdapter can optionally be provided a namespace, default cache lifetime, and cache
 directory path as constructor arguments::

components/ldap.rst

@@ -40,7 +40,7 @@ following options:
     The encryption protocol: ``ssl``, ``tls`` or ``none`` (default)
 
 ``connection_string``
-    You may use this option instead of ``host`` and ``port`` to connect to the
+    You may use this option instead of ``host`` and ``port`` to connect to the
     LDAP server
 
 ``optReferrals``

components/yaml/yaml_format.rst

@@ -321,7 +321,7 @@ The following YAML features are not supported by the Symfony Yaml component:
 * Complex mapping keys and complex values starting with ``?``;
 * Tagged values as keys;
 * The following tags and types: `!!set`, `!!omap`, `!!pairs`, `!!set`, `!!seq`,
-  `!!bool`, `!!int`, `!!merge`, `!!null`, `!!timestamp`, `!!value`, `!!yaml`;
+  `!!bool`, `!!int`, `!!merge`, `!!null`, `!!timestamp`, `!!value`, `!!yaml`;
 * Tags (``TAG`` directive; example: ``%TAG ! tag:example.com,2000:app/``)
   and tag references (example: ``!<tag:example.com,2000:app/foo>``);
 * Using sequence-like syntax for mapping elements (example: ``{foo, bar}``; use

configuration/environment_variables.rst

@@ -460,7 +460,7 @@ Symfony provides the following env var processors:
             parameters:
                 env(SECRETS_FILE): '/opt/application/.secrets.json'
                 database_password: '%env(key:database_password:json:file:SECRETS_FILE)%'
-                # if SECRETS_FILE contents are: {"database_password": "secret"} it returns "secret"
+                # if SECRETS_FILE contents are: {"database_password": "secret"} it returns "secret"
 
         .. code-block:: xml
 

deployment.rst

@@ -169,8 +169,8 @@ as you normally do:
 .. caution::
 
     If you get a "class not found" error during this step, you may need to
-    run ``export APP_ENV=prod`` (or ``export SYMFONY_ENV=prod`` if you're not
-    using :doc:`Symfony Flex </setup/flex>`) before running this command so
+    run ``export APP_ENV=prod`` (or ``export SYMFONY_ENV=prod`` if you're not
+    using :doc:`Symfony Flex </setup/flex>`) before running this command so
     that the ``post-install-cmd`` scripts run in the ``prod`` environment.
 
 D) Clear your Symfony Cache

reference/configuration/doctrine.rst

@@ -116,10 +116,10 @@ The following block shows all possible configuration keys:
     to find your PostgreSQL version and ``mysql -V`` to get your MySQL
     version).
 
-    If you are running a MariaDB database, you must prefix the ``server_version``
+    If you are running a MariaDB database, you must prefix the ``server_version``
     value with ``mariadb-`` (e.g. ``server_version: mariadb-10.2.12``).
 
-    Always wrap the server version number with quotes to parse it as a string
+    Always wrap the server version number with quotes to parse it as a string
     instead of a float number. Otherwise, the floating-point representation
     issues can make your version be considered a different number (e.g. ``5.6``
     will be rounded as ``5.5999999999999996447286321199499070644378662109375``).

reference/forms/types/entity.rst

@@ -216,12 +216,12 @@ loading all entities.
 
 .. caution::
 
-    The entity used in the ``FROM`` clause of the ``query_builder`` option
+    The entity used in the ``FROM`` clause of the ``query_builder`` option
     will always be validated against the class which you have specified at the
     `class`_ option. If you return another entity instead of the
     one used in your ``FROM`` clause (for instance if you return an entity
     from a joined table), it will break validation.
-    
+
 Overridden Options
 ------------------
 

reference/twig_reference.rst

@@ -18,7 +18,7 @@ describe these extra features.
 
 .. tip::
 
-    Technically, most of the extensions live in the `Twig Bridge`_. That code
+    Technically, most of the extensions live in the `Twig Bridge`_. That code
     might give you some ideas when you need to write your own Twig extension
     as described in :doc:`/templating/twig_extension`.
 
@@ -30,7 +30,7 @@ describe these extra features.
 
 .. tip::
 
-    The `Twig Extensions repository`_ contains some additional Twig extensions
+    The `Twig Extensions repository`_ contains some additional Twig extensions
     that do not belong to the Twig core, so you might want to have a look at
     the `Twig Extensions documentation`_.
 

service_container/3.3-di-changes.rst

@@ -565,7 +565,7 @@ Start by updating the service ids to class names:
     Services associated with global PHP classes (i.e. not using PHP namespaces)
     must maintain the ``class`` parameter. For example, when using the old Twig
     classes (e.g. ``Twig_Extensions_Extension_Intl`` instead of ``Twig\Extensions\IntlExtension``),
-    you can't redefine the service as ``Twig_Extensions_Extension_Intl: ~`` and
+    you can't redefine the service as ``Twig_Extensions_Extension_Intl: ~`` and
     you must keep the original ``class`` parameter.
 
 .. caution::