comparison vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)
author Chris Cannam
date Fri, 23 Feb 2018 15:52:07 +0000
parents 4c8ae668cc8c
children 1fec387a4317
comparison
equal deleted inserted replaced
11:bfffd8d7479a 12:7a779792577d
18 use Symfony\Component\VarDumper\Cloner\Data; 18 use Symfony\Component\VarDumper\Cloner\Data;
19 use Symfony\Component\VarDumper\Cloner\VarCloner; 19 use Symfony\Component\VarDumper\Cloner\VarCloner;
20 use Symfony\Component\VarDumper\Dumper\CliDumper; 20 use Symfony\Component\VarDumper\Dumper\CliDumper;
21 use Symfony\Component\VarDumper\Dumper\HtmlDumper; 21 use Symfony\Component\VarDumper\Dumper\HtmlDumper;
22 use Symfony\Component\VarDumper\Dumper\DataDumperInterface; 22 use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
23 use Twig\Template;
23 24
24 /** 25 /**
25 * @author Nicolas Grekas <p@tchwork.com> 26 * @author Nicolas Grekas <p@tchwork.com>
26 */ 27 */
27 class DumpDataCollector extends DataCollector implements DataDumperInterface 28 class DumpDataCollector extends DataCollector implements DataDumperInterface
89 if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) { 90 if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) {
90 $file = $trace[$i]['file']; 91 $file = $trace[$i]['file'];
91 $line = $trace[$i]['line']; 92 $line = $trace[$i]['line'];
92 93
93 break; 94 break;
94 } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof \Twig_Template) { 95 } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof Template) {
95 $template = $trace[$i]['object']; 96 $template = $trace[$i]['object'];
96 $name = $template->getTemplateName(); 97 $name = $template->getTemplateName();
97 $src = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false); 98 $src = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false);
98 $info = $template->getDebugInfo(); 99 $info = $template->getDebugInfo();
99 if (isset($info[$trace[$i - 1]['line']])) { 100 if (isset($info[$trace[$i - 1]['line']])) {