Merge branch '2.7' into 2.8

weaverryan · weaverryan · commit fcb423392bce · 2016-07-10T11:55:23.000-04:00
* 2.7: (31 commits) Removing old :term: stuff Replacing missing link Fixing typo Final changes [WIP] More changes [WIP] More changes [WIP] Removing multiple formats - it makes no sense here [WIP] More changes [WIP] Reading through the changes changes according to comments after PR + some other typos typo fix in hyperlink typo fix in hyperlink colon corrections made some new changes, corrected mistakes, undo some foolish deletions [] changes in the first four ch of the book [#6656] Fix syntax to comply with docs standards Clarify usage of handler channel configuration replace occurrences of <?php echo with <?= Improve comment If context is defined, it is used instead of the firewall ...
diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -48,8 +48,8 @@ persisted to the database. Writing in flat PHP is quick and dirty:
             <ul>
                 <?php while ($row = $result->fetch(PDO::FETCH_ASSOC)): ?>
                 <li>
-                    <a href="/show.php?id=<?php echo $row['id'] ?>">
-                        <?php echo $row['title'] ?>
+                    <a href="/show.php?id=<?= $row['id'] ?>">
+                        <?= $row['title'] ?>
                     </a>
                 </li>
                 <?php endwhile ?>
@@ -118,8 +118,8 @@ is primarily an HTML file that uses a template-like PHP syntax:
             <ul>
                 <?php foreach ($posts as $post): ?>
                 <li>
-                    <a href="/show.php?id=<?php echo $post['id'] ?>">
-                        <?php echo $post['title'] ?>
+                    <a href="/show.php?id=<?= $post['id'] ?>">
+                        <?= $post['title'] ?>
                     </a>
                 </li>
                 <?php endforeach ?>
@@ -211,10 +211,10 @@ that by creating a new ``templates/layout.php`` file:
     <!DOCTYPE html>
     <html>
         <head>
-            <title><?php echo $title ?></title>
+            <title><?= $title ?></title>
         </head>
         <body>
-            <?php echo $content ?>
+            <?= $content ?>
         </body>
     </html>
 
@@ -231,8 +231,8 @@ the ``templates/layout.php``:
         <ul>
             <?php foreach ($posts as $post): ?>
             <li>
-                <a href="/show.php?id=<?php echo $post['id'] ?>">
-                    <?php echo $post['title'] ?>
+                <a href="/show.php?id=<?= $post['id'] ?>">
+                    <?= $post['title'] ?>
                 </a>
             </li>
             <?php endforeach ?>
@@ -294,11 +294,11 @@ the individual blog post:
     <?php $title = $post['title'] ?>
 
     <?php ob_start() ?>
-        <h1><?php echo $post['title'] ?></h1>
+        <h1><?= $post['title'] ?></h1>
 
-        <div class="date"><?php echo $post['created_at'] ?></div>
+        <div class="date"><?= $post['created_at'] ?></div>
         <div class="body">
-            <?php echo $post['body'] ?>
+            <?= $post['body'] ?>
         </div>
     <?php $content = ob_get_clean() ?>
 
@@ -601,7 +601,7 @@ database and the Templating component to render a template and return a
                 'blog_show',
                 array('id' => $post->getId())
             ) ?>">
-                <?php echo $post->getTitle() ?>
+                <?= $post->getTitle() ?>
             </a>
         </li>
         <?php endforeach ?>
@@ -615,13 +615,13 @@ The ``layout.php`` file is nearly identical:
     <!DOCTYPE html>
     <html>
         <head>
-            <title><?php echo $view['slots']->output(
+            <title><?= $view['slots']->output(
                 'title',
                 'Default title'
             ) ?></title>
         </head>
         <body>
-            <?php echo $view['slots']->output('_content') ?>
+            <?= $view['slots']->output('_content') ?>
         </body>
     </html>
 
diff --git a/book/routing.rst b/book/routing.rst
@@ -1169,11 +1169,11 @@ each separated by a colon:
 
 For example, a ``_controller`` value of ``AppBundle:Blog:show`` means:
 
-=========  ==================  ==============
-Bundle     Controller Class    Method Name
-=========  ==================  ==============
-AppBundle  ``BlogController``  ``showAction``
-=========  ==================  ==============
+=============  ==================  ==============
+Bundle         Controller Class    Method Name
+=============  ==================  ==============
+``AppBundle``  ``BlogController``  ``showAction``
+=============  ==================  ==============
 
 The controller might look like this::
 
@@ -1507,7 +1507,7 @@ In an upcoming section, you'll learn how to generate URLs from inside templates.
 
         var url = Routing.generate(
             'blog_show',
-            {"slug": 'my-blog-post'}
+            {'slug': 'my-blog-post'}
         );
 
     For more information, see the documentation for that bundle.
@@ -1532,7 +1532,7 @@ Generating URLs from a Template
 
 The most common place to generate a URL is from within a template when linking
 between pages in your application. This is done just as before, but using
-a template helper function:
+the ``path()`` function to generate a relative URL:
 
 .. configuration-block::
 
diff --git a/book/testing.rst b/book/testing.rst
@@ -263,7 +263,8 @@ document::
             $client->getResponse()->headers->contains(
                 'Content-Type',
                 'application/json'
-            )
+            ),
+            'the "Content-Type" header is "application/json"' // optional message shown on failure
         );
 
         // Assert that the response content contains a string
@@ -272,7 +273,7 @@ document::
         $this->assertRegExp('/foo(bar)?/', $client->getResponse()->getContent());
 
         // Assert that the response status code is 2xx
-        $this->assertTrue($client->getResponse()->isSuccessful());
+        $this->assertTrue($client->getResponse()->isSuccessful(), 'response status is 2xx');
         // Assert that the response status code is 404
         $this->assertTrue($client->getResponse()->isNotFound());
         // Assert a specific 200 status code
@@ -283,7 +284,8 @@ document::
 
         // Assert that the response is a redirect to /demo/contact
         $this->assertTrue(
-            $client->getResponse()->isRedirect('/demo/contact')
+            $client->getResponse()->isRedirect('/demo/contact'),
+            'response is a redirect to /demo/contact'
         );
         // ...or simply check that the response is a redirect to any URL
         $this->assertTrue($client->getResponse()->isRedirect());
diff --git a/components/dependency_injection/lazy_services.rst b/components/dependency_injection/lazy_services.rst
@@ -35,12 +35,11 @@ the `ProxyManager bridge`_:
 .. note::
 
     If you're using the full-stack framework, the proxy manager bridge is
-    already included but the actual proxy manager needs to be included.
-    So, run:
+    already included but the actual proxy manager still needs to be installed:
 
     .. code-block:: bash
-
-        $ composer require ocramius/proxy-manager:~1.0
+    
+        $ composer require ocramius/proxy-manager
 
     Afterwards compile your container and check to make sure that you get
     a proxy for your lazy services.
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
@@ -173,7 +173,7 @@ Structure
 
 * Calls to :phpfunction:`trigger_error` with type ``E_USER_DEPRECATED`` must be
   switched to opt-in via ``@`` operator.
-  Read more at :ref:`contributing-code-conventions-deprecations`.
+  Read more at :ref:`contributing-code-conventions-deprecations`;
 
 * Do not use ``else``, ``elseif``, ``break`` after ``if`` and ``case`` conditions
   which return or throw something.
diff --git a/cookbook/controller/service.rst b/cookbook/controller/service.rst
@@ -119,7 +119,8 @@ the route ``_controller`` value:
 .. tip::
 
     You can also use annotations to configure routing using a controller
-    defined as a service. See the `FrameworkExtraBundle documentation`_ for
+    defined as a service. Make sure you specify the service ID in the
+    ``@Route`` annotation. See the `FrameworkExtraBundle documentation`_ for
     details.
 
 .. tip::
@@ -335,4 +336,4 @@ controller:
 
 .. _`Controller class source code`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
 .. _`base Controller class`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
-.. _`FrameworkExtraBundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/routing.html
+.. _`FrameworkExtraBundle documentation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/routing.html#controller-as-service
diff --git a/cookbook/logging/channels_handlers.rst b/cookbook/logging/channels_handlers.rst
@@ -95,6 +95,13 @@ in all environments, or just ``config_prod.yml`` to happen only in ``prod``:
             ),
         ));
 
+.. caution::
+
+    The ``channels`` configuration only works for top level handlers. Handlers
+    that are nested inside a group, buffer, filter, fingers crossed or other
+    such handler will ignore this configuration and will process every message
+    passed to them.
+
 YAML Specification
 ------------------
 
diff --git a/cookbook/routing/method_parameters.rst b/cookbook/routing/method_parameters.rst
@@ -74,14 +74,6 @@ delete it by matching on GET, PUT and DELETE.
 Faking the Method with ``_method``
 ----------------------------------
 
-.. note::
-
-    The ``_method`` functionality shown here is disabled by default in Symfony 2.2
-    and enabled by default in Symfony 2.3. To control it in Symfony 2.2, you
-    must call :method:`Request::enableHttpMethodParameterOverride <Symfony\\Component\\HttpFoundation\\Request::enableHttpMethodParameterOverride>`
-    before you handle the request (e.g. in your front controller). In Symfony
-    2.3, use the :ref:`configuration-framework-http_method_override` option.
-
 Unfortunately, life isn't quite this simple, since most browsers do not support
 sending PUT and DELETE requests via the `method` attribute in an HTML form. Fortunately,
 Symfony provides you with a simple way of working around this limitation. By including
@@ -90,3 +82,8 @@ will use this as the method when matching routes. Forms automatically include a
 hidden field for this parameter if their submission method is not GET or POST.
 See :ref:`the related chapter in the forms documentation<book-forms-changing-action-and-method>`
 for more information.
+
+.. tip::
+
+    You can disable the ``_method`` functionality shown here using the
+    :ref:`configuration-framework-http_method_override` option.
diff --git a/cookbook/testing/simulating_authentication.rst b/cookbook/testing/simulating_authentication.rst
@@ -9,8 +9,7 @@ It could become an issue especially when ``form_login`` is used, since
 it requires additional requests to fill in and submit the form.
 
 One of the solutions is to configure your firewall to use ``http_basic`` in
-the test environment as explained in
-:doc:`/cookbook/testing/http_authentication`.
+the test environment as explained in :doc:`/cookbook/testing/http_authentication`.
 Another way would be to create a token yourself and store it in a session.
 While doing this, you have to make sure that an appropriate cookie is sent
 with a request. The following example demonstrates this technique::
@@ -45,7 +44,9 @@ with a request. The following example demonstrates this technique::
         {
             $session = $this->client->getContainer()->get('session');
 
+            // the firewall context (defaults to the firewall name)
             $firewall = 'secured_area';
+
             $token = new UsernamePasswordToken('admin', null, $firewall, array('ROLE_ADMIN'));
             $session->set('_security_'.$firewall, serialize($token));
             $session->save();
