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

[TwigBundle/DebugBundle] move dump extension & cleanups

Browse Source
This commit is contained in:
Nicolas Grekas 2014-11-10 16:30:03 +01:00 committed by Fabien Potencier
parent 14fbdb8dff
commit 8cf3d69ce5
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Symfony/Bridge/Twig/Extension/DumpExtension.php
View File

@ -22,7 +22,9 @@ use Symfony\Component\VarDumper\Dumper\HtmlDumper;
*/
class DumpExtension extends \Twig_Extension
{
public function __construct(ClonerInterface $cloner = null)
private $cloner;
public function __construct(ClonerInterface $cloner)
{
$this->cloner = $cloner;
}
@ -46,7 +48,7 @@ class DumpExtension extends \Twig_Extension
public function dump(\Twig_Environment $env, $context)
{
if (!$env->isDebug() || !$this->cloner) {
if (!$env->isDebug()) {
return;
}
@ -64,17 +66,14 @@ class DumpExtension extends \Twig_Extension
unset($vars[0], $vars[1]);
}
$html = '';
$dumper = new HtmlDumper(function ($line, $depth) use (&$html) {
if (-1 !== $depth) {
$html .= str_repeat(' ', $depth).$line."\n";
}
});
$dump = fopen('php://memory', 'r+b');
$dumper = new HtmlDumper($dump);
foreach ($vars as $value) {
$dumper->dump($this->cloner->cloneVar($value));
}
rewind($dump);
return $html;
return stream_get_contents($dump);
}
}

5
src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
View File

@ -5,6 +5,11 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="twig.extension.dump" class="Symfony\Bridge\Twig\Extension\DumpExtension" public="false">
<tag name="twig.extension" />
<argument type="service" id="var_dumper.cloner" />
</service>
<service id="data_collector.dump" class="Symfony\Component\HttpKernel\DataCollector\DumpDataCollector">
<tag name="data_collector" id="dump" template="@Debug/Profiler/dump.html.twig" />
<argument type="service" id="debug.stopwatch" on-invalid="ignore" />

3
src/Symfony/Bundle/TwigBundle/Resources/config/debug.xml
View File

@ -16,9 +16,8 @@
<argument type="service" id="debug.stopwatch" />
</service>
<service id="twig.extension.dump" class="Symfony\Bridge\Twig\Extension\DumpExtension" public="false">
<service id="twig.extension.debug" class="Twig_Extension_Debug" public="false">
<tag name="twig.extension" />
<argument type="service" id="var_dumper.cloner" on-invalid="null" />
</service>
</services>
</container>

19
src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
View File

@ -155,24 +155,21 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)
{
$data = fopen('php://memory' 'r+b');
if ('html' === $format) {
$dumper = new HtmlDumper();
$dumper = new HtmlDumper($data);
} else {
throw new \InvalidArgumentException(sprintf('Invalid dump format: %s', $format));
}
$dumps = array();
foreach ($this->data as $dump) {
$data = '';
$dumper->dump(
$dump['data']->getLimitedClone($maxDepthLimit, $maxItemsPerDepth),
function ($line, $depth) use (&$data) {
if (-1 !== $depth) {
$data .= str_repeat(' ', $depth).$line."\n";
}
}
);
$dump['data'] = $data;
$dumper->dump($dump['data']->getLimitedClone($maxDepthLimit, $maxItemsPerDepth));
rewind($data);
$dump['data'] = stream_get_contents($data);
ftruncate($data, 0);
rewind($data);
$dumps[] = $dump;
}

6
src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
View File

@ -115,7 +115,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
*/
protected function dumpLine($depth)
{
call_user_func($this->lineDumper, $this->line, $depth);
call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
$this->line = '';
}
@ -125,10 +125,10 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
* @param string $line The line to write.
* @param int $depth The recursive depth in the dumped structure.
*/
protected function echoLine($line, $depth)
protected function echoLine($line, $depth, $indentPad)
{
if (-1 !== $depth) {
fwrite($this->outputStream, str_repeat($this->indentPad, $depth).$line."\n");
fwrite($this->outputStream, str_repeat($indentPad, $depth).$line."\n");
}
}
}

6
src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
View File

@ -51,9 +51,11 @@ class HtmlDumper extends CliDumper
*/
public function setOutput($output)
{
$this->headerIsDumped = false;
if ($output !== $prev = parent::setOutput($output)) {
$this->headerIsDumped = false;
}
return parent::setOutput($output);
return $prev;
}
/**