merged branch jonathaningram/patch-10 (PR #5718)

This PR was merged into the master branch. Commits ------- 74e2c5e Fix incorrect inheritdoc blocks Discussion ---------- Fix incorrect inheritdoc blocks Also add a docblock to stopwatch member variable.
2012-10-11 15:43:13 +02:00 · 2012-10-11 15:43:13 +02:00 · ccba363f64
commit ccba363f64
parent 1c1cda67db 74e2c5ef89
1 changed files with 2 additions and 2 deletions
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/TraceableControllerResolver.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TraceableControllerResolver.php
@ -42,7 +42,7 @@ class TraceableControllerResolver extends ControllerResolver
    }

    /**
-     * @{inheritdoc}
+     * {@inheritdoc}
     */
    public function getController(Request $request)
    {
@ -56,7 +56,7 @@ class TraceableControllerResolver extends ControllerResolver
    }

    /**
-     * @{inheritdoc}
+     * {@inheritdoc}
     */
    public function getArguments(Request $request, $controller)
    {