Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit de41795e29b4 · 2019-05-03T09:30:51.000+02:00
* 3.4:
  reformat code example
  Fixed indentation
  fix indention
  use code block bash instead of php
diff --git a/components/cache.rst b/components/cache.rst
@@ -35,7 +35,7 @@ Cache Contracts versus PSR-6
 This component includes *two* different approaches to caching:
 
 :ref:`PSR-6 Caching <cache-component-psr6-caching>`:
-     A generic cache system, which involves cache "pools" and cache "items".
+    A generic cache system, which involves cache "pools" and cache "items".
 
 :ref:`Cache Contracts <cache-component-contracts>`:
     A simpler yet more powerful way to cache values based on recomputation callbacks.
diff --git a/components/console/helpers/formatterhelper.rst b/components/console/helpers/formatterhelper.rst
@@ -108,6 +108,7 @@ If you don't want to use suffix at all, pass an empty string::
 
     $truncatedMessage = $formatter->truncate($message, 7, '!!'); // result: This is!!
     $truncatedMessage = $formatter->truncate($message, 7, '');   // result: This is
+
     $truncatedMessage = $formatter->truncate('test', 10);
-    /* result: test
-       because length of the "test..." string is shorter than 10 */
+    // result: test
+    // because length of the "test..." string is shorter than 10
diff --git a/components/console/single_command_tool.rst b/components/console/single_command_tool.rst
@@ -19,15 +19,15 @@ it is possible to remove this need by declaring a single command application::
     use Symfony\Component\Console\Output\OutputInterface;
 
     (new Application('echo', '1.0.0'))
-      ->register('echo')
-          ->addArgument('foo', InputArgument::OPTIONAL, 'The directory')
-          ->addOption('bar', null, InputOption::VALUE_REQUIRED)
-          ->setCode(function(InputInterface $input, OutputInterface $output) {
-              // output arguments and options
-          })
-      ->getApplication()
-      ->setDefaultCommand('echo', true) // Single command application
-      ->run();
+        ->register('echo')
+            ->addArgument('foo', InputArgument::OPTIONAL, 'The directory')
+            ->addOption('bar', null, InputOption::VALUE_REQUIRED)
+            ->setCode(function(InputInterface $input, OutputInterface $output) {
+                // output arguments and options
+            })
+        ->getApplication()
+        ->setDefaultCommand('echo', true) // Single command application
+        ->run();
 
 The method :method:`Symfony\\Component\\Console\\Application::setDefaultCommand`
 accepts a boolean as second parameter. If true, the command ``echo`` will then
diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
@@ -48,7 +48,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``:
 
     <!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
     >
 
         <!-- ... -->
@@ -172,7 +172,7 @@ message, enclosed with ``/``. For example, with:
 
     <!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
     >
 
         <!-- ... -->
@@ -276,7 +276,9 @@ By default, the PHPUnit Bridge displays only deprecation messages.
 To show the full stack trace related to a deprecation, set the value of ``SYMFONY_DEPRECATIONS_HELPER``
 to a regular expression matching the deprecation message.
 
-For example, if the following deprecation notice is thrown::
+For example, if the following deprecation notice is thrown:
+
+.. code-block:: bash
 
     1x: Doctrine\Common\ClassLoader is deprecated.
       1x in EntityTypeTest::setUp from Symfony\Bridge\Doctrine\Tests\Form\Type
@@ -524,7 +526,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
 
     <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
     >
 
         <!-- ... -->
@@ -669,7 +671,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file:
 
     <!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
     >
 
         <!-- ... -->
diff --git a/components/translation/usage.rst b/components/translation/usage.rst
@@ -433,7 +433,7 @@ loaded/dumped when using this component inside a Symfony application:
 
     <?xml version="1.0" encoding="UTF-8"?>
     <xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0"
-           srcLang="fr-FR" trgLang="en-US">
+        srcLang="fr-FR" trgLang="en-US">
         <file id="messages.en_US">
             <unit id="LCa0a2j" name="original-content">
                 <notes>
diff --git a/components/var_dumper/advanced.rst b/components/var_dumper/advanced.rst
@@ -64,6 +64,10 @@ you can configure these limits:
     items will be cloned. The default value is ``1``, which is consistent
     with older Symfony versions.
 
+    .. versionadded:: 3.4
+
+        The ``setMinDepth()`` method was introduced in Symfony 3.4.
+
 :method:`Symfony\\Component\\VarDumper\\Cloner\\VarCloner::setMaxString`
     Configures the maximum number of characters that will be cloned before
     cutting overlong strings.  Specifying ``-1`` removes the limit.
diff --git a/components/web_link.rst b/components/web_link.rst
@@ -5,8 +5,8 @@
 The WebLink Component
 ======================
 
-   The WebLink component provides tools to manage the ``Link`` HTTP header needed
-   for `Web Linking`_ when using `HTTP/2 Server Push`_ as well as `Resource Hints`_.
+    The WebLink component provides tools to manage the ``Link`` HTTP header needed
+    for `Web Linking`_ when using `HTTP/2 Server Push`_ as well as `Resource Hints`_.
 
 Installation
 ------------
diff --git a/console/input.rst b/console/input.rst
@@ -166,8 +166,8 @@ flag:
 
 .. tip::
 
-     You can also declare a one-letter shortcut that you can call with a single
-     dash, like ``-i``::
+    You can also declare a one-letter shortcut that you can call with a single
+    dash, like ``-i``::
 
         $this
             // ...
diff --git a/contributing/documentation/index.rst b/contributing/documentation/index.rst
@@ -5,21 +5,21 @@ These short articles explain everything you need to contribute to the Symfony
 documentation:
 
 :doc:`The Contribution Process </contributing/documentation/overview>`
-  Explains the steps to follow to contribute fixes and new contents. It's the
-  same contribution process followed by most open source projects, so you may
-  already know everything that is needed.
+    Explains the steps to follow to contribute fixes and new contents. It's the
+    same contribution process followed by most open source projects, so you may
+    already know everything that is needed.
 
 :doc:`Documentation Formats </contributing/documentation/format>`
-  Explains the technical details of the reStructuredText format that is used to
-  write the docs. Skip it if you are already familiar with this format.
+    Explains the technical details of the reStructuredText format that is used to
+    write the docs. Skip it if you are already familiar with this format.
 
 :doc:`Documentation Standards </contributing/documentation/standards>`
-  Explains how to write docs and code examples to match the style and tone of
-  the rest of the existing documentation.
+    Explains how to write docs and code examples to match the style and tone of
+    the rest of the existing documentation.
 
 :doc:`License </contributing/documentation/license>`
-  Explains the details of the Creative Commons BY-SA 3.0 license used for the
-  Symfony Documentation.
+    Explains the details of the Creative Commons BY-SA 3.0 license used for the
+    Symfony Documentation.
 
 .. toctree::
     :hidden:
diff --git a/create_framework/routing.rst b/create_framework/routing.rst
@@ -93,23 +93,23 @@ The ``match()`` method takes a request path and returns an array of attributes
 (notice that the matched route is automatically stored under the special
 ``_route`` attribute)::
 
-    print_r($matcher->match('/bye'));
-    /* Gives:
+    $matcher->match('/bye');
+    /* Result:
     [
         '_route' => 'bye',
     ];
     */
 
-    print_r($matcher->match('/hello/Fabien'));
-    /* Gives:
+    $matcher->match('/hello/Fabien');
+    /* Result:
     [
         'name' => 'Fabien',
         '_route' => 'hello',
     ];
     */
 
-    print_r($matcher->match('/hello'));
-    /* Gives:
+    $matcher->match('/hello');
+    /* Result:
     [
         'name' => 'World',
         '_route' => 'hello',
diff --git a/forms.rst b/forms.rst
@@ -572,8 +572,8 @@ the correct values of a number of field options.
 
 .. caution::
 
-  These field options are *only* guessed if you're using Symfony to guess
-  the field type (i.e. omit or pass ``null`` as the second argument to ``add()``).
+    These field options are *only* guessed if you're using Symfony to guess
+    the field type (i.e. omit or pass ``null`` as the second argument to ``add()``).
 
 If you'd like to change one of the guessed values, you can override it by
 passing the option in the options field array::
diff --git a/reference/configuration/debug.rst b/reference/configuration/debug.rst
@@ -77,7 +77,7 @@ destination for dumps. Typically, you would set this to ``php://stderr``:
 
         # config/packages/debug.yaml
         debug:
-           dump_destination: php://stderr
+            dump_destination: php://stderr
 
     .. code-block:: xml
 
@@ -97,7 +97,7 @@ destination for dumps. Typically, you would set this to ``php://stderr``:
 
         // config/packages/debug.php
         $container->loadFromExtension('debug', [
-           'dump_destination' => 'php://stderr',
+            'dump_destination' => 'php://stderr',
         ]);
 
 Configure it to ``"tcp://%env(VAR_DUMPER_SERVER)%"`` in order to use the :ref:`ServerDumper feature <var-dumper-dump-server>`.
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -348,7 +348,7 @@ need to escape the percent signs (``%``) by doubling them.
         // as /path/to/host/.../file on the host
         // and /var/www/app/ as /projects/my_project/ also
         'myide://%%f:%%l&/path/to/guest/>/path/to/host/&/var/www/app/>/projects/my_project/&...'
-        
+
         // example for PhpStorm
         'phpstorm://open?file=%%f&line=%%l&/var/www/app/>/projects/my_project/'
 
@@ -1325,7 +1325,7 @@ individually for each asset package:
     .. code-block:: yaml
 
         # config/packages/framework.yaml
-       framework:
+        framework:
             assets:
                 # this strategy is applied to every asset (including packages)
                 version_strategy: 'app.asset.my_versioning_strategy'
@@ -1423,7 +1423,7 @@ package:
     .. code-block:: yaml
 
         # config/packages/framework.yaml
-       framework:
+        framework:
             assets:
                 # this manifest is applied to every asset (including packages)
                 json_manifest_path: "%kernel.project_dir%/public/build/manifest.json"
diff --git a/security/expressions.rst b/security/expressions.rst
@@ -43,7 +43,7 @@ Inside the expression, you have access to a number of variables:
     :ref:`role hierarchy <security-role-hierarchy>` but not including the
     ``IS_AUTHENTICATED_*`` attributes (see the functions below).
 ``object``
-     The object (if any) that's passed as the second argument to ``isGranted()``.
+    The object (if any) that's passed as the second argument to ``isGranted()``.
 ``token``
     The token object.
 ``trust_resolver``
diff --git a/templating.rst b/templating.rst
@@ -113,7 +113,7 @@ with alternating ``odd``, ``even`` classes:
 
     {% for i in 1..10 %}
         <div class="{{ cycle(['even', 'odd'], i) }}">
-          <!-- some HTML here -->
+            <!-- some HTML here -->
         </div>
     {% endfor %}
 
diff --git a/templating/PHP.rst b/templating/PHP.rst
@@ -502,7 +502,7 @@ resource to use such a layout:
                 ],
             ],
 
-             // ...
+            // ...
         ]);
 
 If you only want to make the change in one template, add the following line to
diff --git a/translation.rst b/translation.rst
@@ -326,7 +326,7 @@ texts* and complex expressions:
 
     .. code-block:: twig
 
-           {% trans_default_domain 'app' %}
+        {% trans_default_domain 'app' %}
 
     Note that this only influences the current template, not any "included"
     template (in order to avoid side effects).
diff --git a/workflow.rst b/workflow.rst
@@ -92,7 +92,7 @@ like this:
                     <framework:audit-trail enabled="true"/>
 
                     <framework:marking-store type="single_state">
-                      <framework:argument>currentPlace</framework:argument>
+                        <framework:argument>currentPlace</framework:argument>
                     </framework:marking-store>
 
                     <framework:support>AppBundle\Entity\BlogPost</framework:support>
@@ -104,19 +104,16 @@ like this:
 
                     <framework:transition name="to_review">
                         <framework:from>draft</framework:from>
-
                         <framework:to>reviewed</framework:to>
                     </framework:transition>
 
                     <framework:transition name="publish">
                         <framework:from>reviewed</framework:from>
-
                         <framework:to>published</framework:to>
                     </framework:transition>
 
                     <framework:transition name="reject">
                         <framework:from>reviewed</framework:from>
-
                         <framework:to>rejected</framework:to>
                     </framework:transition>
 

-Original file line number
+Diff line change
                 ],
             ],
 -             // ...
 +            // ...
         ]);
 If you only want to make the change in one template, add the following line to