Merge branch '4.1'

* 4.1:
  Update 3.3-di-changes.rst
  Fix typo and add weblink in core_team.rst
  use latest version in example
  Fix link for webpack encore
  Missing root node in yaml example
  Fix a typo in security/impersonating_user.rst
  [FrameworkBundle] Improve the DX of TemplateController

Author: javiereguiluz

components/config/definition.rst

@@ -18,20 +18,21 @@ be a boolean value"):
 
 .. code-block:: yaml
 
-    auto_connect: true
-    default_connection: mysql
-    connections:
-        mysql:
-            host:     localhost
-            driver:   mysql
-            username: user
-            password: pass
-        sqlite:
-            host:     localhost
-            driver:   sqlite
-            memory:   true
-            username: user
-            password: pass
+    database:
+        auto_connect: true
+        default_connection: mysql
+        connections:
+            mysql:
+                host:     localhost
+                driver:   mysql
+                username: user
+                password: pass
+            sqlite:
+                host:     localhost
+                driver:   sqlite
+                memory:   true
+                username: user
+                password: pass
 
 When loading multiple configuration files, it should be possible to merge
 and overwrite some values. Other values should not be merged and stay as

contributing/code/core_team.rst

@@ -70,8 +70,8 @@ Active Core Members
   * **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
     bundles;
 
-  * **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_ and the Serializer_
-    component;
+  * **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_, the Serializer_
+    and the WebLink_ components;
 
   * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ and Intl_
     components;
@@ -235,6 +235,7 @@ discretion of the **Project Leader**.
 .. _Workflow: https://github.com/symfony/workflow
 .. _Yaml: https://github.com/symfony/yaml
 .. _WebProfilerBundle: https://github.com/symfony/web-profiler-bundle
+.. _WebLink: https://github.com/symfony/weblink
 .. _`symfony-docs repository`: https://github.com/symfony/symfony-docs
 .. _`fabpot`: https://github.com/fabpot/
 .. _`webmozart`: https://github.com/webmozart/

deployment.rst

@@ -179,7 +179,7 @@ setup:
 * Running any database migrations
 * Clearing your APC cache
 * Add/edit CRON jobs
-* ref:`Building and minifying your assets <how-do-i-deploy-my-encore-assets>` with Webpack Encore
+* :ref:`Building and minifying your assets <how-do-i-deploy-my-encore-assets>` with Webpack Encore
 * Pushing assets to a CDN
 * ...
 

security/impersonating_user.rst

@@ -91,7 +91,7 @@ to show a link to exit impersonation:
 
 In some cases you may need to get the object that represents the impersonator
 user rather than the impersonated user. Use the following snippet to iterate
-over the user's roles until you find one that a ``SwitchUserRole`` object::
+over the user's roles until you find one that is a ``SwitchUserRole`` object::
 
     use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
     use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;

service_container/3.3-di-changes.rst

@@ -578,6 +578,14 @@ Start by updating the service ids to class names:
     Furthermore it is always recommended to check for definition existence
     using ``has()`` function.
 
+.. note::
+
+    If you get rid of deprecations and make your controllers extend from
+    ``AbstractController`` instead of ``Controller``, you can skip the rest of
+    this step because ``AbstractController`` doesn't provide a container where
+    you can get the services from. All services need to be injected as explained
+    in the :ref:`step 5 of this article <step-5>`.
+
 But, this change will break our app! The old service ids (e.g. ``app.github_notifier``)
 no longer exist. The simplest way to fix this is to find all your old service ids
 and update them to the new class id: ``app.github_notifier`` to ``App\Service\GitHubNotifier``.
@@ -708,6 +716,8 @@ will be used. If you *don't* have this, the auto-registration feature will try t
 register a third ``ApiClient`` service and use that for autowiring (which will fail,
 because the class has a non-autowireable argument).
 
+.. _step-5:
+
 Step 5) Cleanup!
 ~~~~~~~~~~~~~~~~
 

setup/flex.rst

@@ -111,7 +111,7 @@ Symfony application by executing the following command:
 
 .. code-block:: terminal
 
-    $ composer create-project symfony/skeleton:3.4.* my-project
+    $ composer create-project symfony/skeleton:4.1.* my-project
 
 .. note::
 

templating/render_without_controller.rst

@@ -8,7 +8,7 @@ Usually, when you need to create a page, you need to create a controller
 and render a template from within that controller. But if you're rendering
 a simple template that doesn't need any data passed into it, you can avoid
 creating the controller entirely, by using the built-in
-``Symfony\Bundle\FrameworkBundle\Controller\TemplateController::templateAction``
+:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\TemplateController`
 controller.
 
 For example, suppose you want to render a ``static/privacy.html.twig``
@@ -22,7 +22,7 @@ can do this without creating a controller:
         # config/routes.yaml
         acme_privacy:
             path:         /privacy
-            controller:   Symfony\Bundle\FrameworkBundle\Controller\TemplateController::templateAction
+            controller:   Symfony\Bundle\FrameworkBundle\Controller\TemplateController
             defaults:
                 template: static/privacy.html.twig
 
@@ -35,7 +35,7 @@ can do this without creating a controller:
             xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="acme_privacy" path="/privacy">
-                <default key="_controller">Symfony\Bundle\FrameworkBundle\Controller\TemplateController::templateAction</default>
+                <default key="_controller">Symfony\Bundle\FrameworkBundle\Controller\TemplateController</default>
                 <default key="template">static/privacy.html.twig</default>
             </route>
         </routes>
@@ -48,7 +48,7 @@ can do this without creating a controller:
 
         $routes = new RouteCollection();
         $routes->add('acme_privacy', new Route('/privacy', array(
-            '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\TemplateController::templateAction',
+            '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\TemplateController',
             'template'    => 'static/privacy.html.twig',
         )));
 
@@ -83,7 +83,7 @@ other variables in your route, you can control exactly how your page is cached:
         # config/routes.yaml
         acme_privacy:
             path:          /privacy
-            controller:    Symfony\Bundle\FrameworkBundle\Controller\TemplateController::templateAction
+            controller:    Symfony\Bundle\FrameworkBundle\Controller\TemplateController
             defaults:
                 template:  'static/privacy.html.twig'
                 maxAge:    86400
@@ -98,7 +98,7 @@ other variables in your route, you can control exactly how your page is cached:
             xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="acme_privacy" path="/privacy">
-                <default key="_controller">Symfony\Bundle\FrameworkBundle\Controller\TemplateController::templateAction</default>
+                <default key="_controller">Symfony\Bundle\FrameworkBundle\Controller\TemplateController</default>
                 <default key="template">static/privacy.html.twig</default>
                 <default key="maxAge">86400</default>
                 <default key="sharedAge">86400</default>
@@ -113,7 +113,7 @@ other variables in your route, you can control exactly how your page is cached:
 
         $routes = new RouteCollection();
         $routes->add('acme_privacy', new Route('/privacy', array(
-            '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\TemplateController::templateAction',
+            '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\TemplateController',
             'template'    => 'static/privacy.html.twig',
             'maxAge'      => 86400,
             'sharedAge'   => 86400,