Commit52f4da9

committed

Clone messages to show in profiler

1 parent4bbdf06 commit52f4da9Copy full SHA for 52f4da9

File tree

+23

-7

lines changed

src/Symfony/Bundle
- FrameworkBundle/DataCollector
  - MessengerDataCollector.php
- WebProfilerBundle/Resources/views/Collector
  - messages.html.twig

+23

-7

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public function handle($message, callable $next)`
`53`	`53`	`$debugRepresentation =array(`
`54`	`54`	`'message' =>array(`
`55`	`55`	`'type' =>get_class($message),`
	`56`	`+'object' =>$this->cloneVar($message),`
`56`	`57`	`),`
`57`	`58`	`);`
`58`	`59`
`@@ -63,6 +64,12 @@ public function handle($message, callable $next)`
`63`	`64`	`if (is_object($result)) {`
`64`	`65`	`$debugRepresentation['result'] =array(`
`65`	`66`	`'type' =>get_class($result),`
	`67`	`+'object' =>$this->cloneVar($result),`
	`68`	`+ );`
	`69`	`+ }elseif (is_array($result)) {`
	`70`	`+$debugRepresentation['result'] =array(`
	`71`	`+'type' =>'array',`
	`72`	`+'object' =>$this->cloneVar($result),`
`66`	`73`	`);`
`67`	`74`	`}else {`
`68`	`75`	`$debugRepresentation['result'] =array(`
`@@ -77,7 +84,7 @@ public function handle($message, callable $next)`
`77`	`84`	`);`
`78`	`85`	`}`
`79`	`86`
`80`		`-$this->data[] =$debugRepresentation;`
	`87`	`+$this->data['messages'][] =$debugRepresentation;`
`81`	`88`
`82`	`89`	`if (null !==$exception) {`
`83`	`90`	`throw$exception;`
`@@ -88,6 +95,6 @@ public function handle($message, callable $next)`
`88`	`95`
`89`	`96`	`publicfunctiongetMessages():array`
`90`	`97`	`{`
`91`		`-return$this->data;`
	`98`	`+return$this->data['messages'];`
`92`	`99`	`}`
`93`	`100`	`}`

Lines changed: 14 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,22 @@`
`31`	`31`	`<tbody>`
`32`	`32`	`{%formessageincollector.messages %}`
`33`	`33`	`<tr>`
`34`		`- <td>{{message.message.type }}</td>`
`35`	`34`	`<td>`
`36`		`- {%ifmessage.result.typeisdefined %}`
	`35`	`+ {%ifmessage.result.objectisdefined %}`
	`36`	`+ {{ profiler_dump(message.message.object, maxDepth=2) }}`
	`37`	`+ {%else %}`
	`38`	`+ {{message.message.type }}`
	`39`	`+ {%endif %}`
	`40`	`+ </td>`
	`41`	`+ <td>`
	`42`	`+ {%ifmessage.result.objectisdefined %}`
	`43`	`+ {{ profiler_dump(message.result.object, maxDepth=2) }}`
	`44`	`+ {%elseifmessage.result.typeisdefined %}`
`37`	`45`	`{{message.result.type }}`
	`46`	`+ {%ifmessage.result.valueisdefined %}`
	`47`	`+ {{message.result.value }}`
	`48`	`+ {%endif %}`
`38`	`49`	`{%endif %}`
`39`		`-`
`40`	`50`	`{%ifmessage.exception.typeisdefined %}`
`41`	`51`	`{{message.exception.type }}`
`42`	`52`	`{%endif %}`
`@@ -50,10 +60,9 @@`
`50`	`60`
`51`	`61`	`{%blocktoolbar %}`
`52`	`62`	`{%setcolor_code='normal' %}`
`53`		`- {%setmessage_count=0 %}`
`54`	`63`	`{%seticon %}`
`55`	`64`	`{{include('@WebProfiler/Icon/messages.svg') }}`
`56`		`- <spanclass="sf-toolbar-value">{{message_count }}</span>`
	`65`	`+ <spanclass="sf-toolbar-value">{{collector.messages\|length }}</span>`
`57`	`66`	`{%endset %}`
`58`	`67`
`59`	`68`	`{{include('@WebProfiler/Profiler/toolbar_item.html.twig', {link:'messages',status:color_code }) }}`

Comments

(0)