Merge branch '3.3' into 3.4

xabbuh · xabbuh · commit 1e65fb1513e9 · 2017-12-31T18:55:51.000+01:00
* 3.3:
  Clean up
diff --git a/components/asset.rst b/components/asset.rst
@@ -66,7 +66,7 @@ any versioning::
     // Absolute path
     echo $package->getUrl('/image.png');
     // result: /image.png
-    
+
     // Relative path
     echo $package->getUrl('image.png');
     // result: image.png
@@ -113,7 +113,7 @@ suffix to any asset path::
     // Absolute path
     echo $package->getUrl('/image.png');
     // result: /image.png?v1
-    
+
     // Relative path
     echo $package->getUrl('image.png');
     // result: image.png?v1
@@ -132,7 +132,7 @@ string as the second argument of the ``StaticVersionStrategy`` constructor::
 
     echo $package->getUrl('/image.png');
     // result: /v1/image.png
-    
+
     echo $package->getUrl('image.png');
     // result: v1/image.png
 
@@ -183,7 +183,7 @@ that path over and over again::
 
     echo $package->getUrl('logo.png');
     // result: /static/images/logo.png?v1
-    
+
     // Base path is ignored when using absolute paths
     echo $package->getUrl('/logo.png');
     // result: /logo.png?v1
diff --git a/components/cache.rst b/components/cache.rst
@@ -78,7 +78,7 @@ Now you can create, retrieve, update and delete items using this object::
 
     // remove the cache key
     $cache->delete('stats.num_products');
-    
+
     // clear *all* cache keys
     $cache->clear();
 
diff --git a/components/cache/adapters/pdo_doctrine_dbal_adapter.rst b/components/cache/adapters/pdo_doctrine_dbal_adapter.rst
@@ -11,7 +11,6 @@ PDO & Doctrine DBAL Cache Adapter
 
    The PDO & Doctrine DBAL adapter was introduced in Symfony 3.2.
 
-
 This adapter stores the cache items in an SQL database. It requires a `PDO`_,
 `Doctrine DBAL Connection`_, or `Data Source Name (DSN)`_ as its first parameter, and
 optionally a namespace, default cache lifetime, and options array as its second,
diff --git a/components/cache/psr6_psr16_adapters.rst b/components/cache/psr6_psr16_adapters.rst
@@ -44,7 +44,7 @@ this use-case::
 
     // a PSR-6 cache that uses your cache internally!
     $psr6Cache = new SimpleCacheAdapter($psr16Cache);
-    
+
     // now use this wherever you want
     $githubApiClient = new GitHubApiClient($psr6Cache);
 
@@ -81,6 +81,6 @@ this use-case::
 
     // a PSR-16 cache that uses your cache internally!
     $psr16Cache = new Psr6Cache($psr6Cache);
-    
+
     // now use this wherever you want
     $githubApiClient = new GitHubApiClient($psr16Cache);
diff --git a/components/filesystem.rst b/components/filesystem.rst
@@ -6,7 +6,6 @@ The Filesystem Component
 
     The Filesystem component provides basic utilities for the filesystem.
 
-
 Installation
 ------------
 
diff --git a/components/routing.rst b/components/routing.rst
@@ -425,7 +425,6 @@ routes with UTF-8 characters:
 
         return $collection;
 
-
 In this route, the ``utf8`` option set to ``true`` makes Symfony consider the
 ``.`` requirement to match any UTF-8 characters instead of just a single
 byte character. This means that so the following URLs would match:
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -170,7 +170,6 @@ an exception when additional attributes are passed::
         'allow_extra_attributes' => false,
     ));
 
-
 Deserializing in an Existing Object
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/components/var_dumper/advanced.rst b/components/var_dumper/advanced.rst
@@ -202,9 +202,9 @@ method::
     Support for passing display options to the ``dump()`` method was introduced
     in Symfony 3.2.
 
-The output format of a dumper can be fine tuned by the two flags 
+The output format of a dumper can be fine tuned by the two flags
 ``DUMP_STRING_LENGTH`` and ``DUMP_LIGHT_ARRAY`` which are passed as a bitmap
-in the third constructor argument. They can also be set via environment 
+in the third constructor argument. They can also be set via environment
 variables when using
 :method:`assertDumpEquals($dump, $data, $message) <Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait::assertDumpEquals>`
 during unit testing.
diff --git a/controller/service.rst b/controller/service.rst
@@ -31,7 +31,7 @@ syntax:
         // You need to use Sensio's annotation to specify a service id
         use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
         // ...
-        
+
         use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 
         /**
diff --git a/create_framework/event_dispatcher.rst b/create_framework/event_dispatcher.rst
@@ -138,7 +138,7 @@ the registration of a listener for the ``response`` event::
 
         $response->setContent($response->getContent().'GA CODE');
     });
-    
+
     $controllerResolver = new ControllerResolver();
     $argumentResolver = new ArgumentResolver();
 
diff --git a/form/create_form_type_extension.rst b/form/create_form_type_extension.rst
@@ -115,10 +115,10 @@ type (``FileType``) is built. Let's see an example next.
 
 .. tip::
 
-    There is an optional tag attribute called ``priority``, which 
-    defaults to ``0`` and controls the order in which the form  
-    type extensions are loaded (the higher the priority, the earlier 
-    an extension is loaded). This is useful when you need to guarantee 
+    There is an optional tag attribute called ``priority``, which
+    defaults to ``0`` and controls the order in which the form
+    type extensions are loaded (the higher the priority, the earlier
+    an extension is loaded). This is useful when you need to guarantee
     that one extension is loaded before or after another extension.
 
     .. versionadded:: 3.2
diff --git a/frontend/encore/babel.rst b/frontend/encore/babel.rst
@@ -15,7 +15,7 @@ Need to extend the Babel configuration further? The easiest way is via
 
     Encore
         // ...
-        
+
         // first, install any presets you want to use (e.g. yarn add babel-preset-es2017)
         // then, modify the default Babel configuration
         .configureBabel(function(babelConfig) {
diff --git a/frontend/encore/custom-loaders-plugins.rst b/frontend/encore/custom-loaders-plugins.rst
@@ -52,7 +52,7 @@ to use the `IgnorePlugin`_ (see `moment/moment#2373`_):
 
     // webpack.config.js
     + var webpack = require('webpack');
-    
+
     Encore
         // ...
 
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -272,7 +272,6 @@ Full Default Configuration
             </doctrine:config>
         </container>
 
-
 .. index::
     single: Configuration; Doctrine DBAL
     single: Doctrine; DBAL configuration
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
@@ -188,7 +188,7 @@ would replace the ``choices`` option.
     The :class:`Symfony\\Component\\Form\\ChoiceList\\Loader\\CallbackChoiceLoader`
     was introduced in Symfony 3.2.
 
-You can use an instance of :class:`Symfony\\Component\\Form\\ChoiceList\\Loader\\CallbackChoiceLoader` 
+You can use an instance of :class:`Symfony\\Component\\Form\\ChoiceList\\Loader\\CallbackChoiceLoader`
 if you want to take advantage of lazy loading::
 
     use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
diff --git a/security/custom_authentication_provider.rst b/security/custom_authentication_provider.rst
@@ -255,13 +255,13 @@ the ``PasswordDigest`` header value matches with the user's password::
 
             // Try to fetch the cache item from pool
             $cacheItem = $this->cachePool->getItem(md5($nonce));
-            
+
             // Validate that the nonce is *not* in cache
             // if it is, this could be a replay attack
             if ($cacheItem->isHit()) {
                 throw new NonceExpiredException('Previously used nonce detected');
             }
-            
+
             // Store the item in cache for 5 minutes
             $cacheItem->set(null)->expiresAfter(300);
             $this->cachePool->save($cacheItem);
diff --git a/serializer/custom_encoders.rst b/serializer/custom_encoders.rst
@@ -53,7 +53,7 @@ Registering it in your app
 
 If you use the Symfony Framework. then you probably want to register this encoder
 as a service in your app. If you're using the :ref:`default services.yml configuration <service-container-services-load-example>`,
-that's done automatically! 
+that's done automatically!
 
 .. tip::
 
diff --git a/service_container.rst b/service_container.rst
@@ -669,7 +669,6 @@ But, you can control this and pass in a different logger:
             </services>
         </container>
 
-
     .. code-block:: php
 
         // app/config/services.php
diff --git a/service_container/3.3-di-changes.rst b/service_container/3.3-di-changes.rst
@@ -373,7 +373,7 @@ The third big change is that, in a new Symfony 3.3 project, your controllers are
         // app/config/services.php
 
         // ...
-        
+
         $definition->addTag('controller.service_arguments');
         $this->registerClasses($definition, 'AppBundle\\Controller\\', '../../src/AppBundle/Controller/*');
 
diff --git a/service_container/configurators.rst b/service_container/configurators.rst
@@ -184,7 +184,6 @@ all the classes are already loaded as services. All you need to do is specify th
         $container->getDefinition(GreetingCardManager::class)
             ->setConfigurator(array(new Reference(EmailConfigurator::class), 'configure'));
 
-
 .. versionadded:: 3.2
     The ``service_id:method_name`` syntax for the YAML configuration format
     was introduced in Symfony 3.2.
diff --git a/service_container/factories.rst b/service_container/factories.rst
@@ -153,7 +153,7 @@ Configuration of the service container then looks like this:
         # app/config/services.yml
 
         app.newsletter_manager:
-            class: AppBundle\Email\NewsletterManager 
+            class: AppBundle\Email\NewsletterManager
             # new syntax
             factory: 'AppBundle\Email\NewsletterManagerFactory:createNewsletterManager'
             # old syntax
diff --git a/session/avoid_session_start.rst b/session/avoid_session_start.rst
@@ -38,5 +38,5 @@ access the flash messages:
     {% endif %}
 
 .. versionadded:: 3.3
-    The ``app.flashes()`` Twig function was introduced in Symfony 3.3. Prior, 
+    The ``app.flashes()`` Twig function was introduced in Symfony 3.3. Prior,
     you had to use ``app.session.flashBag()``.
diff --git a/workflow/usage.rst b/workflow/usage.rst
@@ -233,7 +233,7 @@ order:
 ``workflow.entered``
 
     Similar to ``workflow.enter``, except the marking store is updated before this
-    event (making it a good place to flush data in Doctrine). 
+    event (making it a good place to flush data in Doctrine).
 
     The three events being dispatched are:
 
@@ -325,7 +325,6 @@ See example to make sure no blog post without title is moved to "review"::
         }
     }
 
-
 Event Methods
 ~~~~~~~~~~~~~
 

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ order:`
`233`	`233`	``workflow.entered``
`234`	`234`
`235`	`235`	Similar to ``workflow.enter``, except the marking store is updated before this
`236`		`- event (making it a good place to flush data in Doctrine).`
	`236`	`+ event (making it a good place to flush data in Doctrine).`
`237`	`237`
`238`	`238`	`The three events being dispatched are:`
`239`	`239`
`@@ -325,7 +325,6 @@ See example to make sure no blog post without title is moved to "review"::`
`325`	`325`	`}`
`326`	`326`	`}`
`327`	`327`
`328`		`-`
`329`	`328`	`Event Methods`
`330`	`329`	`~~~~~~~~~~~~~`
`331`	`330`