Merge branch '4.0'

xabbuh · xabbuh · commit e49526e062e7 · 2018-01-01T21:36:17.000+01:00
* 4.0:
  Clean up
  Clean up
  Clean up
  Fix not existing secret parameter
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/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/http_kernel.rst b/components/http_kernel.rst
@@ -234,7 +234,6 @@ This implementation is explained more in the sidebar below::
         public function getController(Request $request);
     }
 
-
 Internally, the ``HttpKernel::handle()`` method first calls
 :method:`Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface::getController`
 on the controller resolver. This method is passed the ``Request`` and is responsible
diff --git a/components/lock.rst b/components/lock.rst
@@ -143,7 +143,6 @@ Locks are created and managed in ``Stores``, which are classes that implement
 :class:`Symfony\\Component\\Lock\\StoreInterface`. The component includes the
 following built-in store types:
 
-
 ============================================  ======  ========  ========
 Store                                         Scope   Blocking  Expiring
 ============================================  ======  ========  ========
diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
@@ -493,7 +493,6 @@ Consider the following example::
         }
     }
 
-
 The ``FooTest::test`` method executes every single line of code of both ``Foo``
 and ``Bar`` classes, but ``Bar`` is not truly tested. The ``CoverageListener``
 aims to fix this behavior by adding the appropriate `@covers`_ annotation on
diff --git a/components/routing.rst b/components/routing.rst
@@ -417,7 +417,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
@@ -166,7 +166,6 @@ an exception when additional attributes are passed::
         'allow_extra_attributes' => false,
     ));
 
-
 Deserializing in an Existing Object
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/components/var_dumper.rst b/components/var_dumper.rst
@@ -80,7 +80,7 @@ DebugBundle and Twig Integration
 --------------------------------
 
 The DebugBundle allows greater integration of this component into Symfony
-applications. 
+applications.
 
 Since generating (even debug) output in the controller or in the model
 of your application may just break it by e.g. sending HTTP headers or
diff --git a/console.rst b/console.rst
@@ -186,7 +186,7 @@ as a service, you can use normal dependency injection. Imagine you have a
         public function __construct(UserManager $userManager)
         {
             $this->userManager = $userManager;
-            
+
             parent::__construct();
         }
 
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/create_framework/http_kernel_controller_resolver.rst b/create_framework/http_kernel_controller_resolver.rst
@@ -56,7 +56,6 @@ based on a Request object. All controller resolvers implement the following inte
         public function getController(Request $request);
     }
 
-
 The ``getController()`` method relies on the same convention as the one we
 have defined earlier: the ``_controller`` request attribute must contain the
 controller associated with the Request. Besides the built-in PHP callbacks,
@@ -100,7 +99,6 @@ following interface::
         public function getArguments(Request $request, $controller);
     }
 
-
 The ``indexAction()`` method needs the Request object as an argument.
 ``getArguments()`` knows when to inject it properly if it is type-hinted
 correctly::
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/logging/monolog_console.rst b/logging/monolog_console.rst
@@ -39,7 +39,7 @@ The example above could then be rewritten as::
     use Symfony\Component\Console\Input\InputInterface;
     use Symfony\Component\Console\Output\OutputInterface;
     // ...
-    
+
     class YourCommand extends Command
     {
         private $logger;
diff --git a/quick_tour/flex_recipes.rst b/quick_tour/flex_recipes.rst
@@ -79,7 +79,7 @@ Thanks to Flex, after one command, you can start using Twig immediately:
     // ...
 
     + use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
- 
+
     -class DefaultController
     +class DefaultController extends AbstractController
      {
@@ -216,16 +216,16 @@ me? List your routes by running:
 
 .. code-block:: text
 
-    ------------------------------ -------- ------------------------------------- 
-     Name                           Method   Path                                 
-    ------------------------------ -------- ------------------------------------- 
-     api_products_get_collection    GET      /api/products.{_format}              
-     api_products_post_collection   POST     /api/products.{_format}              
-     api_products_get_item          GET      /api/products/{id}.{_format}         
-     api_products_put_item          PUT      /api/products/{id}.{_format}         
-     api_products_delete_item       DELETE   /api/products/{id}.{_format}         
+    ------------------------------ -------- -------------------------------------
+     Name                           Method   Path
+    ------------------------------ -------- -------------------------------------
+     api_products_get_collection    GET      /api/products.{_format}
+     api_products_post_collection   POST     /api/products.{_format}
+     api_products_get_item          GET      /api/products/{id}.{_format}
+     api_products_put_item          PUT      /api/products/{id}.{_format}
+     api_products_delete_item       DELETE   /api/products/{id}.{_format}
      ...
-    ------------------------------ -------- ------------------------------------- 
+    ------------------------------ -------- -------------------------------------
 
 Easily Remove Recipes
 ---------------------
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -113,7 +113,7 @@ difference is that it's done in the constructor:
     class GreetingGenerator
     {
     +     private $logger;
-    + 
+    +
     +     public function __construct(LoggerInterface $logger)
     +     {
     +         $this->logger = $logger;
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -149,21 +149,21 @@ Instead, add the route *right above* the controller method:
 
     // src/Controller/DefaultController.php
     // ...
-    
+
     + use Symfony\Component\Routing\Annotation\Route;
-    
+
     + /**
     +  * @Route("/hello/{name}")
     +  */
     public function index($name)
-    
+
 This works just like before! But by using annotations, the route and controller
 live right next to each other. Need another page? Just add another route and method
 in ``DefaultController``::
 
     // src/Controller/DefaultController.php
     // ...
-    
+
     /**
      * @Route("/simplicity")
      */
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/routing.rst b/routing.rst
@@ -343,7 +343,7 @@ As your app grows, you'll eventually have a *lot* of routes! To see them all, ru
 .. code-block:: text
 
     ------------------------------ -------- -------------------------------------
-     Name                           Method   Path                                 
+     Name                           Method   Path
     ------------------------------ -------- -------------------------------------
      app_lucky_number              ANY    /lucky/number/{max}
      ...
diff --git a/security/entity_provider.rst b/security/entity_provider.rst
@@ -41,7 +41,7 @@ Before you begin, first make sure you install the Security component:
 .. code-block:: terminal
 
     $ composer require security
-    
+
 For this entry, suppose that you already have a ``User`` entity
 with the following fields: ``id``, ``username``, ``password``,
 ``email`` and ``isActive``::
diff --git a/security/remember_me.rst b/security/remember_me.rst
@@ -22,7 +22,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option:
                 main:
                     # ...
                     remember_me:
-                        secret:   '%secret%'
+                        secret:   '%kernel.secret%'
                         lifetime: 604800 # 1 week in seconds
                         path:     /
                         # by default, the feature is enabled by checking a
@@ -48,7 +48,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option:
 
                     <!-- 604800 is 1 week in seconds -->
                     <remember-me
-                        secret="%secret%"
+                        secret="%kernel.secret%"
                         lifetime="604800"
                         path="/" />
                     <!-- by default, the feature is enabled by checking a checkbox
@@ -68,7 +68,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option:
                 'main' => array(
                     // ...
                     'remember_me' => array(
-                        'secret'   => '%secret%',
+                        'secret'   => '%kernel.secret%',
                         'lifetime' => 604800, // 1 week in seconds
                         'path'     => '/',
                         // by default, the feature is enabled by checking a
diff --git a/service_container.rst b/service_container.rst
@@ -592,7 +592,6 @@ But, you can control this and pass in a different logger:
             </services>
         </container>
 
-
     .. code-block:: php
 
         // config/services.php
diff --git a/setup/unstable_versions.rst b/setup/unstable_versions.rst
@@ -16,7 +16,7 @@ execute the following command:
 
     # Download the latest beta version
     $ composer create-project symfony/skeleton my_project "4.0.*" -s beta
-    
+
     # Download the absolute latest commit
     $ composer create-project symfony/skeleton my_project "4.0.*" -s dev
 
diff --git a/workflow/usage.rst b/workflow/usage.rst
@@ -359,7 +359,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
`@@ -234,7 +234,6 @@ This implementation is explained more in the sidebar below::`
`234`	`234`	`public function getController(Request $request);`
`235`	`235`	`}`
`236`	`236`
`237`		`-`
`238`	`237`	Internally, the ``HttpKernel::handle()`` method first calls
`239`	`238`	:method:`Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface::getController`
`240`	`239`	on the controller resolver. This method is passed the ``Request`` and is responsible
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,6 @@ Consider the following example::`
`493`	`493`	`}`
`494`	`494`	`}`
`495`	`495`
`496`		`-`
`497`	`496`	The ``FooTest::test`` method executes every single line of code of both ``Foo``
`498`	`497`	and ``Bar`` classes, but ``Bar`` is not truly tested. The ``CoverageListener``
`499`	`498`	aims to fix this behavior by adding the appropriate `@covers`_ annotation on
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ as a service, you can use normal dependency injection. Imagine you have a`
`186`	`186`	`public function __construct(UserManager $userManager)`
`187`	`187`	`{`
`188`	`188`	`$this->userManager = $userManager;`
`189`		`-`
	`189`	`+`
`190`	`190`	`parent::__construct();`
`191`	`191`	`}`
`192`	`192`