Skip to content

Commit 41b71d4

Browse files
committed
minor #105 fix bugs due to choosing the wrong base branch (xabbuh)
This PR was merged into the 2.7 branch. Discussion ---------- fix bugs due to choosing the wrong base branch This is quite important. I accidentally based #28 on the `3.0`, `3.1` or `master` branch. Some more changes need to be done in the `2.8` and `3.0` branches after merging branches up. Commits ------- aa00582 fix bugs due to choosing the wrong base branch
2 parents 289ba19 + aa00582 commit 41b71d4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

routing/debug.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ the command by running the following from the root of your project.
1111

1212
.. code-block:: bash
1313
14-
$ php bin/console debug:router
14+
$ php app/console debug:router
1515
1616
.. versionadded:: 2.6
1717
Prior to Symfony 2.6, this command was called ``router:debug``.
@@ -33,14 +33,14 @@ the route name after the command:
3333

3434
.. code-block:: bash
3535
36-
$ php bin/console debug:router article_show
36+
$ php app/console debug:router article_show
3737
3838
Likewise, if you want to test whether a URL matches a given route, you can
3939
use the ``router:match`` console command:
4040

4141
.. code-block:: bash
4242
43-
$ php bin/console router:match /blog/my-latest-post
43+
$ php app/console router:match /blog/my-latest-post
4444
4545
This command will print which route the URL matches.
4646

routing/generate_url_javascript.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ variables. The ``escape`` function helps escape any non-JavaScript-safe values:
1616

1717
<script>
1818
var route = "<?php echo $view->escape(
19-
$view['router']->generate('blow_show', array(
19+
$view['router']->path('blow_show', array(
2020
'slug' => 'my-blog-post',
2121
)),
2222
'js'

0 commit comments

Comments
 (0)