minor #107 fix bugs due to choosing the wrong base branch (xabbuh)

This PR was merged into the 2.8 branch.

Discussion
----------

fix bugs due to choosing the wrong base branch

Commits
-------

54a145c fix some issues after merging 2.7 into 2.8

Author: xabbuh

form/action_method.rst

@@ -49,7 +49,9 @@ to the ``form()`` or the ``form_start()`` helper functions:
 
         <!-- app/Resources/views/default/newAction.html.php -->
         <?php echo $view['form']->start($form, array(
-            'action' => $view['router']->generate('target_route'),
+            // The path() method was introduced in Symfony 2.8. Prior to 2.8,
+            // you had to use generate().
+            'action' => $view['router']->path('target_route'),
             'method' => 'GET',
         )) ?>
 

http_cache/esi.rst

@@ -151,7 +151,7 @@ matter), Symfony uses the standard ``render`` helper to configure ESI tags:
         <?php echo $view['actions']->render(
             // The url() method was introduced in Symfony 2.8. Prior to 2.8,
             // you had to use generate($name, $parameters, UrlGeneratorInterface::ABSOLUTE_URL)
-            $view['router']->generate(
+            $view['router']->path(
                 'latest_news',
                 array('maxPerPage' => 5)
             ),

routing/debug.rst

@@ -13,9 +13,6 @@ the command by running the following from the root of your project.
 
     $ php app/console debug:router
 
-.. versionadded:: 2.6
-    Prior to Symfony 2.6, this command was called ``router:debug``.
-
 This command will print a helpful list of *all* the configured routes in
 your application:
 

routing/generate_url_javascript.rst

@@ -16,13 +16,17 @@ variables. The ``escape`` function helps escape any non-JavaScript-safe values:
 
         <script>
         var route = "<?php echo $view->escape(
-            $view['router']->generate('blog_show', array(
+            $view['router']->path('blog_show', array(
                 'slug' => 'my-blog-post',
             )),
             'js'
         ) ?>";
         </script>
 
+.. versionadded:: 2.8
+    The ``path()`` PHP templating helper was introduced in Symfony 2.8. Prior
+    to 2.8, you had to use the ``generate()`` helper method.
+
 But if you *actually* need to generate routes in pure JavaScript, consider using
 the `FOSJsRoutingBundle`_. It makes the following possible:
 

templating/formats.rst

@@ -49,7 +49,9 @@ key in the parameter hash:
 
     .. code-block:: html+php
 
-        <a href="<?php echo $view['router']->generate('article_show', array(
+        <!-- The path() method was introduced in Symfony 2.8. Prior to 2.8, you
+             had to use generate(). -->
+        <a href="<?php echo $view['router']->path('article_show', array(
             'id' => 123,
             '_format' => 'pdf',
         )) ?>">

templating/render_without_controller.rst

@@ -72,8 +72,11 @@ this is probably only useful if you'd like to cache this page partial (see
         use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
         ?>
 
+        <!-- The url() method was introduced in Symfony 2.8. Prior to 2.8, you
+             had to use generate() with UrlGeneratorInterface::ABSOLUTE_URL
+             passed as the third argument. -->
         <?php echo $view['actions']->render(
-            $view['router']->generate('acme_privacy', array(), UrlGeneratorInterface::ABSOLUTE_URL)
+            $view['router']->url('acme_privacy', array())
         ) ?>
 
 .. _templating-no-controller-caching: