Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit b7ab85888275 · 2019-02-22T17:23:48.000+01:00
* 3.4:
  Bootstraped the documentation of Workflow options
  Some docs fixes
  Documented the missing validation.static_method option
  Documented the missing session.use_cookies config option
  be keen to newcomers
  removed php open tag
diff --git a/bundles/best_practices.rst b/bundles/best_practices.rst
@@ -309,7 +309,6 @@ following standardized instructions in your ``README.md`` file.
         in the `app/AppKernel.php` file of your project:
 
         ```php
-        <?php
         // app/AppKernel.php
 
         // ...
diff --git a/components/debug.rst b/components/debug.rst
@@ -22,7 +22,7 @@ Usage
 -----
 
 The Debug component provides several tools to help you debug PHP code.
-Enabling them all can be done by calling the static method ``Debug::enable()``::
+Enable all of them by calling this method::
 
     use Symfony\Component\Debug\Debug;
 
@@ -83,7 +83,7 @@ throw more helpful exceptions when a class isn't found by the registered
 autoloaders. All autoloaders that implement a ``findFile()`` method are replaced
 with a ``DebugClassLoader`` wrapper.
 
-To activate the ``DebugClassLoader``, call its static
+Using the ``DebugClassLoader`` is done by calling its static
 :method:`Symfony\\Component\\Debug\\DebugClassLoader::enable` method::
 
     use Symfony\Component\Debug\DebugClassLoader;
diff --git a/components/http_kernel.rst b/components/http_kernel.rst
@@ -174,7 +174,7 @@ to the login page or a 403 Access Denied response.
 If a ``Response`` is returned at this stage, the process skips directly to
 the :ref:`kernel.response <component-http-kernel-kernel-response>` event.
 
-Other listeners simply initialize things or add more information to the request.
+Other listeners initialize things or add more information to the request.
 For example, a listener might determine and set the locale on the ``Request``
 object.
 
diff --git a/components/stopwatch.rst b/components/stopwatch.rst
@@ -21,7 +21,7 @@ Alternatively, you can clone the `<https://github.com/symfony/stopwatch>`_ repos
 Usage
 -----
 
-The Stopwatch component provides an easy and consistent way to measure execution
+The Stopwatch component provides a consistent way to measure execution
 time of certain parts of code so that you don't constantly have to parse
 microtime by yourself. Instead, use the
 :class:`Symfony\\Component\\Stopwatch\\Stopwatch` class::
diff --git a/console/commands_as_services.rst b/console/commands_as_services.rst
@@ -113,7 +113,7 @@ Or set the ``command`` attribute on the ``console.command`` tag in your service
 
         // config/services.php
         use App\Command\SunshineCommand;
-        //...
+        // ...
 
         $container
             ->register(SunshineCommand::class)
diff --git a/console/input.rst b/console/input.rst
@@ -119,7 +119,7 @@ Using Command Options
 Unlike arguments, options are not ordered (meaning you can specify them in any
 order) and are specified with two dashes (e.g. ``--yell``). Options are
 *always* optional, and can be setup to accept a value (e.g. ``--dir=src``) or
-simply as a boolean flag without a value (e.g.  ``--yell``).
+as a boolean flag without a value (e.g.  ``--yell``).
 
 For example, add a new option to the command that can be used to specify
 how many times in a row the message should be printed::
diff --git a/console/request_context.rst b/console/request_context.rst
@@ -68,8 +68,8 @@ will override the defaults.
 Configuring the Request Context per Command
 -------------------------------------------
 
-To change it only in one command you can fetch the Request Context from the
-router service and override its settings::
+To change it only in one command you need to fetch the Request Context
+from the ``router`` service and override its settings::
 
     // src/Command/DemoCommand.php
     use Symfony\Component\Routing\RouterInterface;
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
@@ -29,9 +29,7 @@ Symfony Coding Standards in Detail
 If you want to learn about the Symfony coding standards in detail, here's a
 short example containing most features described below:
 
-.. code-block:: html+php
-
-    <?php
+.. code-block:: php
 
     /*
      * This file is part of the Symfony package.
diff --git a/create_framework/dependency_injection.rst b/create_framework/dependency_injection.rst
@@ -66,15 +66,15 @@ framework more configurable, but at the same time, it introduces a lot of
 issues:
 
 * We are not able to register custom listeners anymore as the dispatcher is
-  not available outside the Framework class (an easy workaround could be the
+  not available outside the Framework class (a workaround could be the
   adding of a ``Framework::getEventDispatcher()`` method);
 
 * We have lost the flexibility we had before; you cannot change the
   implementation of the ``UrlMatcher`` or of the ``ControllerResolver``
   anymore;
 
-* Related to the previous point, we cannot test our framework easily anymore
-  as it's impossible to mock internal objects;
+* Related to the previous point, we cannot test our framework without much
+  effort anymore as it's impossible to mock internal objects;
 
 * We cannot change the charset passed to ``ResponseListener`` anymore (a
   workaround could be to pass it as a constructor argument).
@@ -234,7 +234,7 @@ And the related change in the front controller::
 
     $container->setParameter('routes', include __DIR__.'/../src/app.php');
 
-We have obviously barely scratched the surface of what you can do with the
+We have barely scratched the surface of what you can do with the
 container: from class names as parameters, to overriding existing object
 definitions, from shared service support to dumping a container to a plain PHP class,
 and much more. The Symfony dependency injection container is really powerful
diff --git a/create_framework/event_dispatcher.rst b/create_framework/event_dispatcher.rst
@@ -3,8 +3,7 @@ The EventDispatcher Component
 
 Our framework is still missing a major characteristic of any good framework:
 *extensibility*. Being extensible means that the developer should be able to
-easily hook into the framework life cycle to modify the way the request is
-handled.
+hook into the framework life cycle to modify the way the request is handled.
 
 What kind of hooks are we talking about? Authentication or caching for
 instance. To be flexible, hooks must be plug-and-play; the ones you "register"
diff --git a/create_framework/front_controller.rst b/create_framework/front_controller.rst
@@ -61,8 +61,8 @@ which name is exposed to the end user via the URL
 (``http://127.0.0.1:4321/bye.php``): there is a direct mapping between the PHP
 script name and the client URL. This is because the dispatching of the request
 is done by the web server directly. It might be a good idea to move this
-dispatching to our code for better flexibility. This can be achieved by
-routing all client requests to a single PHP script.
+dispatching to our code for better flexibility. This can be achieved by routing
+all client requests to a single PHP script.
 
 .. tip::
 
diff --git a/create_framework/http_kernel_httpkernel_class.rst b/create_framework/http_kernel_httpkernel_class.rst
@@ -4,7 +4,7 @@ The HttpKernel Component: The HttpKernel Class
 If you were to use our framework right now, you would probably have to add
 support for custom error messages. We do have 404 and 500 error support but
 the responses are hardcoded in the framework itself. Making them customizable
-is easy enough though: dispatch a new event and listen to it. Doing it right
+is straightforward though: dispatch a new event and listen to it. Doing it right
 means that the listener has to call a regular controller. But what if the
 error controller throws an exception? You will end up in an infinite loop.
 There should be an easier way, right?
@@ -114,8 +114,8 @@ client; that's what the ``ResponseListener`` does::
 
     $dispatcher->addSubscriber(new HttpKernel\EventListener\ResponseListener('UTF-8'));
 
-This one was easy too! Let's take another one: do you want out of the box
-support for streamed responses? Subscribe to ``StreamedResponseListener``::
+If you want out of the box support for streamed responses, subscribe
+to ``StreamedResponseListener``::
 
     $dispatcher->addSubscriber(new HttpKernel\EventListener\StreamedResponseListener());
 
diff --git a/create_framework/http_kernel_httpkernelinterface.rst b/create_framework/http_kernel_httpkernelinterface.rst
@@ -46,7 +46,7 @@ Update your framework so that it implements this interface::
         }
     }
 
-Even if this change looks trivial, it brings us a lot! Let's talk about one of
+Even if this change looks not too complex, it brings us a lot! Let's talk about one of
 the most impressive one: transparent :doc:`HTTP caching </http_cache>` support.
 
 The ``HttpCache`` class implements a fully-featured reverse proxy, written in
diff --git a/create_framework/routing.rst b/create_framework/routing.rst
@@ -189,8 +189,7 @@ more flexible than the previous one. Enjoy!
 Using the Routing component has one big additional benefit: the ability to
 generate URLs based on Route definitions. When using both URL matching and URL
 generation in your code, changing the URL patterns should have no other
-impact. Want to know how to use the generator? Calling the ``generate`` method
-is all it takes::
+impact. You can use the generator this way::
 
     use Symfony\Component\Routing;
 
diff --git a/create_framework/separation_of_concerns.rst b/create_framework/separation_of_concerns.rst
@@ -171,7 +171,7 @@ a well defined goal:
   our application;
 
 * ``src/Simplex``: The reusable framework code that abstracts the handling of
-  incoming Requests (by the way, it makes your controllers/templates easily
+  incoming Requests (by the way, it makes your controllers/templates better
   testable -- more about that later on);
 
 * ``src/Calendar``: Our application specific code (the controllers and the
diff --git a/create_framework/unit_testing.rst b/create_framework/unit_testing.rst
@@ -135,8 +135,7 @@ Execute this test by running ``phpunit`` in the ``example.com`` directory:
 After the test ran, you should see a green bar. If not, you have a bug
 either in the test or in the framework code!
 
-Adding a unit test for any exception thrown in a controller means expecting a
-response code of 500::
+Adding a unit test for any exception thrown in a controller::
 
     public function testErrorHandling()
     {
diff --git a/http_cache.rst b/http_cache.rst
@@ -282,7 +282,7 @@ Validation Caching
    single: Cache; Cache-Control header
    single: HTTP headers; Cache-Control
 
-With expiration caching, you simply say "cache for 3600 seconds!". But, when someone
+With expiration caching, you say "cache for 3600 seconds!". But, when someone
 updates cached content, you won't see that content on your site until the cache
 expires.
 
diff --git a/page_creation.rst b/page_creation.rst
@@ -44,7 +44,6 @@ Suppose you want to create a page - ``/lucky/number`` - that generates a lucky (
 random) number and prints it. To do that, create a "Controller class" and a
 "controller" method inside of it::
 
-    <?php
     // src/Controller/LuckyController.php
     namespace App\Controller;
 
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
diff --git a/reference/constraints/Collection.rst b/reference/constraints/Collection.rst
diff --git a/reference/constraints/IsNull.rst b/reference/constraints/IsNull.rst
diff --git a/security.rst b/security.rst
diff --git a/service_container/service_subscribers_locators.rst b/service_container/service_subscribers_locators.rst
diff --git a/session/php_bridge.rst b/session/php_bridge.rst
diff --git a/testing/profiling.rst b/testing/profiling.rst
diff --git a/validation/raw_values.rst b/validation/raw_values.rst
diff --git a/validation/translations.rst b/validation/translations.rst

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ Update your framework so that it implements this interface::`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-Even if this change looks trivial, it brings us a lot! Let's talk about one of`
	`49`	`+Even if this change looks not too complex, it brings us a lot! Let's talk about one of`
`50`	`50`	the most impressive one: transparent :doc:`HTTP caching </http_cache>` support.
`51`	`51`
`52`	`52`	The ``HttpCache`` class implements a fully-featured reverse proxy, written in
Original file line number	Diff line number	Diff line change
@@ -135,8 +135,7 @@ Execute this test by running ``phpunit`` in the ``example.com`` directory:
`135`	`135`	`After the test ran, you should see a green bar. If not, you have a bug`
`136`	`136`	`either in the test or in the framework code!`
`137`	`137`
`138`		`-Adding a unit test for any exception thrown in a controller means expecting a`
`139`		`-response code of 500::`
	`138`	`+Adding a unit test for any exception thrown in a controller::`
`140`	`139`
`141`	`140`	`public function testErrorHandling()`
`142`	`141`	`{`