Author: fabien
Date: 2010-09-01 19:00:07 +0200 (Wed, 01 Sep 2010)
New Revision: 30807
Added:
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/public/favicon.ico
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Profiler.php
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.php
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/menu.php
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.php
branches/2.0/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
Log:
Merge branch 'master' of git://github.com/symfony/symfony
Modified: branches/2.0/src/Symfony/Bundle/FrameworkBundle/Profiler.php
===================================================================
--- branches/2.0/src/Symfony/Bundle/FrameworkBundle/Profiler.php
2010-09-01 16:15:28 UTC (rev 30806)
+++ branches/2.0/src/Symfony/Bundle/FrameworkBundle/Profiler.php
2010-09-01 17:00:07 UTC (rev 30807)
@@ -28,7 +28,7 @@
parent::__construct($storage, $logger);
foreach ($container->findTaggedServiceIds('data_collector') as $id =>
$attributes) {
- $this->addCollector($container->get($id));
+ $this->add($container->get($id));
}
}
}
Modified:
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
2010-09-01 16:15:28 UTC (rev 30806)
+++
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
2010-09-01 17:00:07 UTC (rev 30807)
@@ -44,7 +44,7 @@
return
$this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:index',
array(
'token' => $token,
'profiler' => new SafeDecorator($profiler),
- 'collector' => $profiler->getCollector('request'),
+ 'collector' => $profiler->get('request'),
'template' => $this->getTemplate($profiler, '_panel',
'request'),
'panel' => 'request',
));
@@ -164,7 +164,7 @@
$this->container->get('profiler')->disable();
$profiler = $this->container->get('profiler')->loadFromToken($token);
- if (!$profiler->hasCollector($panel)) {
+ if (!$profiler->has($panel)) {
throw new NotFoundHttpException(sprintf('Panel "%s" is not
registered.', $panel));
}
@@ -176,7 +176,7 @@
return
$this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:panel',
array(
'token' => $token,
'profiler' => new SafeDecorator($profiler),
- 'collector' => new
SafeDecorator($profiler->getCollector($panel)),
+ 'collector' => new SafeDecorator($profiler->get($panel)),
'template' => $this->getTemplate($profiler, '_panel', $panel),
'panel' => $panel,
));
@@ -292,7 +292,7 @@
{
$templates = array();
foreach ($this->container->getParameter('data_collector.templates') as
$name => $template) {
- if ($profiler->hasCollector($name)) {
+ if ($profiler->has($name)) {
if
(!$this->container->get('templating')->exists($template.$suffix)) {
continue;
}
Added:
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/public/favicon.ico
===================================================================
---
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/public/favicon.ico
(rev 0)
+++
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/public/favicon.ico
2010-09-01 17:00:07 UTC (rev 30807)
@@ -0,0 +1 @@
+ h ( ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
‹‹‹²VVVšUUUīUUUīUUUīUUUīUUUīUUUīVVVš‹‹‹²˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ cccź{{{´ ±
± ±{{{»ooo×{{{»{{{´cccź˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ eeeé
²tttÖtttÖ‚‚‚±ttt×hhh˙ttt× ²eeeé˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
———ˇ}}}Ļzzz¼wwwĘzzz×sssĻcccīvvvĘ}}}Ļ———ˇ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ įįį pppč ´
×www˙ ׉‰‰± ´pppčįįį ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ £££w„„„Ü Ęnnnī
ʨ¨¨±„„„Ü£££w˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ōōō Ķ Ø——— ——— Ø
Ķōōō ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ČČČ>•••Š˙˙˙ ˙˙˙ •••ŠČČČ>˙˙˙ ˙˙˙
˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ®®® ˙˙˙ ˙˙˙ ®®® ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ĢĢĢ~˙˙˙ ˙˙˙ ĢĢĢ~˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
˙˙˙ ĻĻĻ~˙˙˙ ˙˙˙ ĻĻĻ~˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
ŗŗŗæŃŃŃ~ŃŃŃ~ŗŗŗæ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
˛˛˛^˛˛˛^˛˛˛^˛˛˛^˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙
˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙˙ ˙˙ ˙˙ ą ą ą ą š ų ų żæ żæ ˙˙ ˙˙ żæ
˙˙ ˙˙
\ No newline at end of file
Modified:
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.php
2010-09-01 16:15:28 UTC (rev 30806)
+++
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.php
2010-09-01 17:00:07 UTC (rev 30807)
@@ -6,6 +6,7 @@
<?php echo $view->get('stylesheets') ?>
<?php echo $view->get('javascripts') ?>
<link href="<?php echo
$view->get('assets')->getUrl('bundles/webprofiler/css/profiler.css') ?>"
rel="stylesheet" type="text/css" media="screen" />
+ <link rel="shortcut icon" type="image/x-icon" href="<?php echo
$view->get('assets')->getUrl('bundles/webprofiler/favicon.ico', true) ?>" />
</head>
<body>
<?php $view->get('slots')->output('_content') ?>
Modified:
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/menu.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/menu.php
2010-09-01 16:15:28 UTC (rev 30806)
+++
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/menu.php
2010-09-01 17:00:07 UTC (rev 30807)
@@ -4,7 +4,7 @@
<?php if ($name == $panel): ?>class="selected"<?php endif; ?>
>
<a href="<?php echo
$view->get('router')->generate('_profiler_panel', array('token' => $token,
'panel' => $name)) ?>">
- <?php echo $view->render($template, array('data' =>
$profiler->getCollector($name))) ?>
+ <?php echo $view->render($template, array('data' =>
$profiler->get($name))) ?>
</a>
</li>
<?php endforeach; ?>
Modified:
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.php
2010-09-01 16:15:28 UTC (rev 30806)
+++
branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.php
2010-09-01 17:00:07 UTC (rev 30807)
@@ -24,7 +24,7 @@
<?php endif; ?>
>
<?php foreach ($templates as $name => $template): ?>
- <?php echo $view->render($template, array('data' =>
$profiler->getCollector($name))) ?>
+ <?php echo $view->render($template, array('data' =>
$profiler->get($name))) ?>
<?php endforeach; ?>
</div>
<!-- END of Symfony 2 Web Debug Toolbar -->
Modified: branches/2.0/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
===================================================================
--- branches/2.0/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
2010-09-01 16:15:28 UTC (rev 30806)
+++ branches/2.0/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
2010-09-01 17:00:07 UTC (rev 30807)
@@ -142,7 +142,7 @@
if (false !== $items = $this->storage->read($token)) {
list($data, $this->ip, $this->url, $this->time) = $items;
- $this->setCollectors(unserialize(pack('H*', $data)));
+ $this->set(unserialize(pack('H*', $data)));
$this->empty = false;
} else {
@@ -258,7 +258,7 @@
*
* @return array An array of collectors
*/
- public function getCollectors()
+ public function all()
{
return $this->collectors;
}
@@ -268,11 +268,11 @@
*
* @param array $collectors An array of collectors
*/
- public function setCollectors(array $collectors = array())
+ public function set(array $collectors = array())
{
$this->collectors = array();
foreach ($collectors as $name => $collector) {
- $this->addCollector($collector);
+ $this->add($collector);
}
}
@@ -281,7 +281,7 @@
*
* @param DataCollectorInterface $collector A DataCollectorInterface
instance
*/
- public function addCollector(DataCollectorInterface $collector)
+ public function add(DataCollectorInterface $collector)
{
$this->collectors[$collector->getName()] = $collector;
}
@@ -291,7 +291,7 @@
*
* @param string $name A collector name
*/
- public function hasCollector($name)
+ public function has($name)
{
return isset($this->collectors[$name]);
}
@@ -305,7 +305,7 @@
*
* @throws \InvalidArgumentException if the collector does not exist
*/
- public function getCollector($name)
+ public function get($name)
{
if (!isset($this->collectors[$name])) {
throw new \InvalidArgumentException(sprintf('Collector "%s" does
not exist.', $name));
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
