Skip to content

Commit

Permalink
merged branch raziel057/patch-2 (PR #5847)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the master branch (closes #5847).

Commits
-------

00d2823 Improve comments in ProfilerController

Discussion
----------

Improve comments in ProfilerController

---------------------------------------------------------------------------

by raziel057 at 2012-10-27T21:55:17Z

It's fixed.
  • Loading branch information
fabpot committed Oct 28, 2012
2 parents 7ddedab + 00d2823 commit eb05fb0
Showing 1 changed file with 22 additions and 8 deletions.
Expand Up @@ -34,6 +34,15 @@ class ProfilerController
private $templates;
private $toolbarPosition;

/**
* Constructor.
*
* @param UrlGeneratorInterface $generator The Url Generator
* @param Profiler $profiler The profiler
* @param \Twig_Environment $twig The twig environment
* @param array $templates The templates
* @param string $toolbarPosition The toolbar position (top, bottom, normal, or null -- use the configuration)
*/
public function __construct(UrlGeneratorInterface $generator, Profiler $profiler, \Twig_Environment $twig, array $templates, $toolbarPosition = 'normal')
{
$this->generator = $generator;
Expand All @@ -46,7 +55,7 @@ public function __construct(UrlGeneratorInterface $generator, Profiler $profiler
/**
* Renders a profiler panel for the given token.
*
* @param Request $request The HTTP request
* @param Request $request The current HTTP request
* @param string $token The profiler token
*
* @return Response A Response instance
Expand Down Expand Up @@ -115,7 +124,7 @@ public function purgeAction()
/**
* Imports token data.
*
* @param Request $request
* @param Request $request The current HTTP Request
*
* @return Response A Response instance
*/
Expand All @@ -139,7 +148,7 @@ public function importAction(Request $request)
/**
* Displays information page.
*
* @param string $about
* @param string $about The about message
*
* @return Response A Response instance
*/
Expand All @@ -155,7 +164,7 @@ public function infoAction($about)
/**
* Renders the Web Debug Toolbar.
*
* @param Request $request The current Request
* @param Request $request The current HTTP Request
* @param string $token The profiler token
* @param string $position The toolbar position (top, bottom, normal, or null -- use the configuration)
*
Expand Down Expand Up @@ -203,7 +212,7 @@ public function toolbarAction(Request $request, $token, $position = null)
/**
* Renders the profiler search bar.
*
* @param Request $request The current Request
* @param Request $request The current HTTP Request
*
* @return Response A Response instance
*/
Expand Down Expand Up @@ -237,8 +246,8 @@ public function searchBarAction(Request $request)
/**
* Search results.
*
* @param Request $request The current Request
* @param string $token The token
* @param Request $request The current HTTP Request
* @param string $token The token
*
* @return Response A Response instance
*/
Expand Down Expand Up @@ -268,7 +277,7 @@ public function searchResultsAction(Request $request, $token)
/**
* Narrow the search bar.
*
* @param Request $request The current Request
* @param Request $request The current HTTP Request
*
* @return Response A Response instance
*/
Expand Down Expand Up @@ -321,6 +330,11 @@ public function phpinfoAction()
return new Response($phpinfo);
}

/**
* Gets the Template Manager.
*
* @return TemplateManager The Template Manager
*/
protected function getTemplateManager()
{
if (null === $this->templateManager) {
Expand Down

0 comments on commit eb05fb0

Please sign in to comment.