Merge branch '2.8' into 3.0

Author: wouterj

book/controller.rst

@@ -256,7 +256,7 @@ The controller has a single argument, ``$name``, which corresponds to the
 ``{name}`` placeholder from the matched route (e.g. ``ryan`` if you go to
 ``/hello/ryan``). When executing the controller, Symfony matches each argument
 with a placeholder from the route. So the value for ``{name}`` is passed
-to ``$name``. Just make sure they the name of the placeholder is the
+to ``$name``. Just make sure that the name of the placeholder is the
 same as the name of the argument variable.
 
 Take the following more-interesting example, where the controller has two

book/service_container.rst

@@ -292,19 +292,19 @@ Importing Configuration with ``imports``
 
 So far, you've placed your ``app.mailer`` service container definition directly
 in the application configuration file (e.g. ``app/config/config.yml``). Of
-course, since the ``Mailer`` class itself lives inside the AcmeHelloBundle, it
+course, since the ``Mailer`` class itself lives inside the AppBundle, it
 makes more sense to put the ``app.mailer`` container definition inside the
 bundle as well.
 
 First, move the ``app.mailer`` container definition into a new container resource
-file inside AcmeHelloBundle. If the ``Resources`` or ``Resources/config``
+file inside AppBundle. If the ``Resources`` or ``Resources/config``
 directories don't exist, create them.
 
 .. configuration-block::
 
     .. code-block:: yaml
 
-        # src/Acme/HelloBundle/Resources/config/services.yml
+        # src/AppBundle/Resources/config/services.yml
         parameters:
             app.mailer.transport: sendmail
 
@@ -315,7 +315,7 @@ directories don't exist, create them.
 
     .. code-block:: xml
 
-        <!-- src/Acme/HelloBundle/Resources/config/services.xml -->
+        <!-- src/AppBundle/Resources/config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -335,7 +335,7 @@ directories don't exist, create them.
 
     .. code-block:: php
 
-        // src/Acme/HelloBundle/Resources/config/services.php
+        // src/AppBundle/Resources/config/services.php
         use Symfony\Component\DependencyInjection\Definition;
 
         $container->setParameter('app.mailer.transport', 'sendmail');
@@ -356,7 +356,7 @@ configuration.
 
         # app/config/config.yml
         imports:
-            - { resource: '@AcmeHelloBundle/Resources/config/services.yml' }
+            - { resource: '@AppBundle/Resources/config/services.yml' }
 
     .. code-block:: xml
 
@@ -368,23 +368,23 @@ configuration.
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <imports>
-                <import resource="@AcmeHelloBundle/Resources/config/services.xml"/>
+                <import resource="@AppBundle/Resources/config/services.xml"/>
             </imports>
         </container>
 
     .. code-block:: php
 
         // app/config/config.php
-        $loader->import('@AcmeHelloBundle/Resources/config/services.php');
+        $loader->import('@AppBundle/Resources/config/services.php');
 
 .. include:: /components/dependency_injection/_imports-parameters-note.rst.inc
 
 The ``imports`` directive allows your application to include service container
 configuration resources from any other location (most commonly from bundles).
 The ``resource`` location, for files, is the absolute path to the resource
-file. The special ``@AcmeHelloBundle`` syntax resolves the directory path
-of the AcmeHelloBundle bundle. This helps you specify the path to the resource
-without worrying later if you move the AcmeHelloBundle to a different directory.
+file. The special ``@AppBundle`` syntax resolves the directory path
+of the AppBundle bundle. This helps you specify the path to the resource
+without worrying later if you move the AppBundle to a different directory.
 
 .. index::
    single: Service Container; Extension configuration
@@ -644,7 +644,7 @@ of the new ``mailer_configuration`` service? One way is to use an expression:
         # app/config/config.yml
         services:
             my_mailer:
-                class:        Acme\HelloBundle\Mailer
+                class:        AppBundle\Mailer
                 arguments:    ["@=service('mailer_configuration').getMailerMethod()"]
 
     .. code-block:: xml
@@ -658,7 +658,7 @@ of the new ``mailer_configuration`` service? One way is to use an expression:
             >
 
             <services>
-                <service id="my_mailer" class="Acme\HelloBundle\Mailer">
+                <service id="my_mailer" class="AppBundle\Mailer">
                     <argument type="expression">service('mailer_configuration').getMailerMethod()</argument>
                 </service>
             </services>
@@ -671,7 +671,7 @@ of the new ``mailer_configuration`` service? One way is to use an expression:
         use Symfony\Component\ExpressionLanguage\Expression;
 
         $container->setDefinition('my_mailer', new Definition(
-            'Acme\HelloBundle\Mailer',
+            'AppBundle\Mailer',
             array(new Expression('service("mailer_configuration").getMailerMethod()'))
         ));
 
@@ -693,7 +693,7 @@ via a ``container`` variable. Here's another example:
 
         services:
             my_mailer:
-                class:     Acme\HelloBundle\Mailer
+                class:     AppBundle\Mailer
                 arguments: ["@=container.hasParameter('some_param') ? parameter('some_param') : 'default_value'"]
 
     .. code-block:: xml
@@ -706,7 +706,7 @@ via a ``container`` variable. Here's another example:
             >
 
             <services>
-                <service id="my_mailer" class="Acme\HelloBundle\Mailer">
+                <service id="my_mailer" class="AppBundle\Mailer">
                     <argument type="expression">container.hasParameter('some_param') ? parameter('some_param') : 'default_value'</argument>
                 </service>
             </services>
@@ -718,7 +718,7 @@ via a ``container`` variable. Here's another example:
         use Symfony\Component\ExpressionLanguage\Expression;
 
         $container->setDefinition('my_mailer', new Definition(
-            'Acme\HelloBundle\Mailer',
+            'AppBundle\Mailer',
             array(new Expression(
                 "container.hasParameter('some_param') ? parameter('some_param') : 'default_value'"
             ))
@@ -822,7 +822,7 @@ add it as an argument to the methods that need the request or inject the
 :method:`Symfony\\Component\\HttpFoundation\\RequestStack::getCurrentRequest`
 method::
 
-    namespace Acme\HelloBundle\Newsletter;
+    namespace AppBundle\Newsletter;
 
     use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -850,15 +850,15 @@ Now, just inject the ``request_stack``, which behaves like any normal service:
 
     .. code-block:: yaml
 
-        # src/Acme/HelloBundle/Resources/config/services.yml
+        # src/AppBundle/Resources/config/services.yml
         services:
             newsletter_manager:
-                class:     Acme\HelloBundle\Newsletter\NewsletterManager
+                class:     AppBundle\Newsletter\NewsletterManager
                 arguments: ["@request_stack"]
 
     .. code-block:: xml
 
-        <!-- src/Acme/HelloBundle/Resources/config/services.xml -->
+        <!-- src/AppBundle/Resources/config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -867,7 +867,7 @@ Now, just inject the ``request_stack``, which behaves like any normal service:
             <services>
                 <service
                     id="newsletter_manager"
-                    class="Acme\HelloBundle\Newsletter\NewsletterManager"
+                    class="AppBundle\Newsletter\NewsletterManager"
                 >
                     <argument type="service" id="request_stack"/>
                 </service>
@@ -876,13 +876,13 @@ Now, just inject the ``request_stack``, which behaves like any normal service:
 
     .. code-block:: php
 
-        // src/Acme/HelloBundle/Resources/config/services.php
+        // src/AppBundle/Resources/config/services.php
         use Symfony\Component\DependencyInjection\Definition;
         use Symfony\Component\DependencyInjection\Reference;
 
         // ...
         $container->setDefinition('newsletter_manager', new Definition(
-            'Acme\HelloBundle\Newsletter\NewsletterManager',
+            'AppBundle\Newsletter\NewsletterManager',
             array(new Reference('request_stack'))
         ));
 

components/dependency_injection/autowiring.rst

@@ -205,6 +205,7 @@ subsystem isn't able to find itself the interface implementation to register:
 
             <services>
                 <service id="rot13_transformer" class="Acme\Rot13Transformer" />
+
                 <service id="twitter_client" class="Acme\TwitterClient" autowire="true" />
             </services>
         </container>
@@ -214,12 +215,11 @@ subsystem isn't able to find itself the interface implementation to register:
         use Symfony\Component\DependencyInjection\Definition;
 
         // ...
-        $definition1 = new Definition('Acme\Rot13Transformer');
-        $container->setDefinition('rot13_transformer', $definition1);
+        $container->register('rot13_transformer', 'Acme\Rot13Transformer');
 
-        $definition2 = new Definition('Acme\TwitterClient');
-        $definition2->setAutowired(true);
-        $container->setDefinition('twitter_client', $definition2);
+        $clientDefinition = new Definition('Acme\TwitterClient');
+        $clientDefinition->setAutowired(true);
+        $container->setDefinition('twitter_client', $clientDefinition);
 
 The autowiring subsystem detects that the ``rot13_transformer`` service implements
 the ``TransformerInterface`` and injects it automatically. Even when using
@@ -252,7 +252,7 @@ returning the result of the ROT13 transformation uppercased::
 
 This class is intended to decorate any transformer and return its value uppercased.
 
-We can now refactor the controller to add another endpoint leveraging this new
+The controller can now be refactored to add a new endpoint using this uppercase
 transformer::
 
     namespace Acme\Controller;
@@ -316,13 +316,13 @@ and a Twitter client using it:
                 class:    Acme\TwitterClient
                 autowire: true
 
-            uppercase_rot13_transformer:
-                class:    Acme\UppercaseRot13Transformer
+            uppercase_transformer:
+                class:    Acme\UppercaseTransformer
                 autowire: true
 
             uppercase_twitter_client:
                 class:     Acme\TwitterClient
-                arguments: ['@uppercase_rot13_transformer']
+                arguments: ['@uppercase_transformer']
 
     .. code-block:: xml
 
@@ -335,10 +335,15 @@ and a Twitter client using it:
                 <service id="rot13_transformer" class="Acme\Rot13Transformer">
                     <autowiring-type>Acme\TransformerInterface</autowiring-type>
                 </service>
+
                 <service id="twitter_client" class="Acme\TwitterClient" autowire="true" />
-                <service id="uppercase_rot13_transformer" class="Acme\UppercaseRot13Transformer" autowire="true" />
+
+                <service id="uppercase_transformer" class="Acme\UppercaseTransformer"
+                    autowire="true"
+                />
+
                 <service id="uppercase_twitter_client" class="Acme\TwitterClient">
-                    <argument type="service" id="uppercase_rot13_transformer" />
+                    <argument type="service" id="uppercase_transformer" />
                 </service>
             </services>
         </container>
@@ -349,21 +354,22 @@ and a Twitter client using it:
         use Symfony\Component\DependencyInjection\Definition;
 
         // ...
-        $definition1 = new Definition('Acme\Rot13Transformer');
-        $definition1->setAutowiringTypes(array('Acme\TransformerInterface'));
-        $container->setDefinition('rot13_transformer', $definition1);
+        $rot13Definition = new Definition('Acme\Rot13Transformer');
+        $rot13Definition->setAutowiringTypes(array('Acme\TransformerInterface'));
+        $container->setDefinition('rot13_transformer', $rot13Definition);
 
-        $definition2 = new Definition('Acme\TwitterClient');
-        $definition2->setAutowired(true);
-        $container->setDefinition('twitter_client', $definition2);
+        $clientDefinition = new Definition('Acme\TwitterClient');
+        $clientDefinition->setAutowired(true);
+        $container->setDefinition('twitter_client', $clientDefinition);
 
-        $definition3 = new Definition('Acme\UppercaseRot13Transformer');
-        $definition3->setAutowired(true);
-        $container->setDefinition('uppercase_rot13_transformer', $definition3);
+        $uppercaseDefinition = new Definition('Acme\UppercaseTransformer');
+        $uppercaseDefinition->setAutowired(true);
+        $container->setDefinition('uppercase_transformer', $uppercaseDefinition);
 
-        $definition4 = new Definition('Acme\TwitterClient');
-        $definition4->addArgument(new Reference('uppercase_rot13_transformer'));
-        $container->setDefinition('uppercase_twitter_client', $definition4);
+        $uppercaseClientDefinition = new Definition('Acme\TwitterClient', array(
+            new Reference('uppercase_transformer'),
+        ));
+        $container->setDefinition('uppercase_twitter_client', $uppercaseClientDefinition);
 
 This deserves some explanations. You now have two services implementing the
 ``TransformerInterface``. The autowiring subsystem cannot guess which one
@@ -378,9 +384,9 @@ Fortunately, the ``autowiring_types`` key is here to specify which implementatio
 to use by default. This key can take a list of types if necessary.
 
 Thanks to this setting, the ``rot13_transformer`` service is automatically injected
-as an argument of the ``uppercase_rot13_transformer`` and ``twitter_client`` services. For
-the ``uppercase_twitter_client``, we use a standard service definition to inject
-the specific ``uppercase_rot13_transformer`` service.
+as an argument of the ``uppercase_transformer`` and ``twitter_client`` services. For
+the ``uppercase_twitter_client``, a standard service definition is used to
+inject the specific ``uppercase_transformer`` service.
 
 As for other RAD features such as the FrameworkBundle controller or annotations,
 keep in mind to not use autowiring in public bundles nor in large projects with

components/options_resolver.rst

@@ -19,9 +19,6 @@ You can install the component in 2 different ways:
 
 .. include:: /components/require_autoload.rst.inc
 
-Notes on Previous Versions
---------------------------
-
 Usage
 -----
 

contributing/documentation/overview.rst

@@ -107,6 +107,12 @@ your project:
     upstream  https://github.com/symfony/symfony-docs.git (fetch)
     upstream  https://github.com/symfony/symfony-docs.git (push)
 
+Fetch all the commits of the upstream branches by executing this command:
+
+.. code-block:: bash
+
+    $ git fetch upstream
+
 The purpose of this step is to allow you work simultaneously on the official
 Symfony repository and on your own fork. You'll see this in action in a moment.
 
@@ -208,6 +214,7 @@ contribution to the Symfony docs:
 
     # create a new branch based on the oldest maintained version
     $ cd projects/symfony-docs/
+    $ git fetch upstream
     $ git checkout -b my_changes upstream/2.7
 
     # ... do your changes