diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Fabien Potencier 2012-10-11 15:43:13 +02:00
commit ccba363f64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Controller/TraceableControllerResolver.php
View File

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