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

Pass the toolbar version number from the controller, to ease transition and keep BC

Browse Source
This commit is contained in:
Javier Eguiluz 2015-07-20 15:23:16 +02:00
parent a0e03f6b2c
commit 1847285322
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
View File

@ -11,13 +11,14 @@
namespace Symfony\Bundle\WebProfilerBundle\Controller;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Profiler\Profiler;
use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\HttpKernel\Profiler\Profiler;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/**
@ -27,6 +28,9 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
*/
class ProfilerController
{
const TOOLBAR_VERSION_1 = 1;
const TOOLBAR_VERSION_2 = 2;
private $templateManager;
private $generator;
private $profiler;
@ -201,12 +205,15 @@ class ProfilerController
// the profiler is not enabled
}
$toolbarVersion = Kernel::VERSION_ID < 20800 ? self::TOOLBAR_VERSION_1 : self::TOOLBAR_VERSION_2;
return new Response($this->twig->render('@WebProfiler/Profiler/toolbar.html.twig', array(
'position' => $position,
'profile' => $profile,
'templates' => $this->getTemplateManager()->getTemplates($profile),
'profiler_url' => $url,
'token' => $token,
'toolbar_version' => $toolbarVersion,
)), 200, array('Content-Type' => 'text/html'));
}

3
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
View File

@ -30,7 +30,8 @@
'collector': profile.getcollector(name),
'profiler_url': profiler_url,
'token': profile.token,
'name': name
'name': name,
'toolbar_version': toolbar_version
})
}}
{% endfor %}