Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1fee784

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
[WebProfilerBundle] Fix deprecated uses of profiler_dump
1 parent 61cc640 commit 1fee784
Copy full SHA for 1fee784

File tree

3 files changed

+30
-23
lines changed
Filter options

3 files changed

+30
-23
lines changed

‎DataCollector/DataCollector.php

Copy file name to clipboardExpand all lines: DataCollector/DataCollector.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private function decorateVar($var)
130130
return new ClassStub($var);
131131
}
132132
}
133-
if (false !== strpos($var, DIRECTORY_SEPARATOR) && false === strpos($var, '://') && file_exists($var)) {
133+
if (false !== strpos($var, DIRECTORY_SEPARATOR) && false === strpos($var, '://') && false === strpos($var, "\0") && is_file($var)) {
134134
return new LinkStub($var);
135135
}
136136
}

‎DataCollector/RequestDataCollector.php

Copy file name to clipboardExpand all lines: DataCollector/RequestDataCollector.php
+26-19Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
namespace Symfony\Component\HttpKernel\DataCollector;
1313

1414
use Symfony\Component\HttpFoundation\ParameterBag;
15-
use Symfony\Component\HttpFoundation\HeaderBag;
1615
use Symfony\Component\HttpFoundation\Request;
1716
use Symfony\Component\HttpFoundation\Response;
18-
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
1917
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
2018
use Symfony\Component\HttpKernel\KernelEvents;
2119
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
@@ -54,14 +52,11 @@ public function collect(Request $request, Response $response, \Exception $except
5452
$attributes = array();
5553
$route = '';
5654
foreach ($request->attributes->all() as $key => $value) {
57-
if ('_route' === $key && is_object($value)) {
58-
$attributes[$key] = $this->cloneVar($value->getPath());
59-
} else {
60-
$attributes[$key] = $this->cloneVar($value);
61-
}
62-
6355
if ('_route' === $key) {
6456
$route = is_object($value) ? $value->getPath() : $value;
57+
$attributes[$key] = $route;
58+
} else {
59+
$attributes[$key] = $value;
6560
}
6661
}
6762

@@ -97,8 +92,8 @@ public function collect(Request $request, Response $response, \Exception $except
9792
'content_type' => $response->headers->get('Content-Type', 'text/html'),
9893
'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
9994
'status_code' => $statusCode,
100-
'request_query' => array_map(array($this, 'cloneVar'), $request->query->all()),
101-
'request_request' => array_map(array($this, 'cloneVar'), $request->request->all()),
95+
'request_query' => $request->query->all(),
96+
'request_request' => $request->request->all(),
10297
'request_headers' => $request->headers->all(),
10398
'request_server' => $request->server->all(),
10499
'request_cookies' => $request->cookies->all(),
@@ -125,6 +120,18 @@ public function collect(Request $request, Response $response, \Exception $except
125120
$this->data['request_request']['_password'] = '******';
126121
}
127122

123+
foreach ($this->data as $key => $value) {
124+
if (!is_array($value)) {
125+
continue;
126+
}
127+
if ('request_headers' === $key || 'response_headers' === $key) {
128+
$value = array_map(function ($v) { return isset($v[1]) ? $v : $v[0]; }, $value);
129+
}
130+
if ('request_server' !== $key && 'request_attributes' !== $key && 'request_cookies' !== $key) {
131+
$this->data[$key] = array_map(array($this, 'cloneVar'), $value);
132+
}
133+
}
134+
128135
if (isset($this->controllers[$request])) {
129136
$this->data['controller'] = $this->parseController($this->controllers[$request]);
130137
unset($this->controllers[$request]);
@@ -170,27 +177,27 @@ public function getRequestQuery()
170177

171178
public function getRequestHeaders()
172179
{
173-
return new HeaderBag($this->data['request_headers']);
180+
return new ParameterBag($this->data['request_headers']);
174181
}
175182

176-
public function getRequestServer()
183+
public function getRequestServer($raw = false)
177184
{
178-
return new ParameterBag($this->data['request_server']);
185+
return new ParameterBag($raw ? $this->data['request_server'] : array_map(array($this, 'cloneVar'), $this->data['request_server']));
179186
}
180187

181-
public function getRequestCookies()
188+
public function getRequestCookies($raw = false)
182189
{
183-
return new ParameterBag($this->data['request_cookies']);
190+
return new ParameterBag($raw ? $this->data['request_cookies'] : array_map(array($this, 'cloneVar'), $this->data['request_cookies']));
184191
}
185192

186-
public function getRequestAttributes()
193+
public function getRequestAttributes($raw = false)
187194
{
188-
return new ParameterBag($this->data['request_attributes']);
195+
return new ParameterBag($raw ? $this->data['request_attributes'] : array_map(array($this, 'cloneVar'), $this->data['request_attributes']));
189196
}
190197

191198
public function getResponseHeaders()
192199
{
193-
return new ResponseHeaderBag($this->data['response_headers']);
200+
return new ParameterBag($this->data['response_headers']);
194201
}
195202

196203
public function getSessionMetadata()
@@ -264,7 +271,7 @@ public function getIdentifier()
264271
*/
265272
public function getRouteParams()
266273
{
267-
return isset($this->data['request_attributes']['_route_params']) ? $this->data['request_attributes']['_route_params'] : $this->cloneVar(array());
274+
return isset($this->data['request_attributes']['_route_params']) ? array_map(array($this, 'cloneVar'), $this->data['request_attributes']['_route_params']) : array();
268275
}
269276

270277
/**

‎Tests/DataCollector/RequestDataCollectorTest.php

Copy file name to clipboardExpand all lines: Tests/DataCollector/RequestDataCollectorTest.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ public function testCollect()
3939
$attributes = $c->getRequestAttributes();
4040

4141
$this->assertSame('request', $c->getName());
42-
$this->assertInstanceOf('Symfony\Component\HttpFoundation\HeaderBag', $c->getRequestHeaders());
42+
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestHeaders());
4343
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestServer());
4444
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestCookies());
4545
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $attributes);
4646
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestRequest());
4747
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestQuery());
4848
$this->assertSame('html', $c->getFormat());
4949
$this->assertEquals('foobar', $c->getRoute());
50-
$this->assertEquals($cloner->cloneVar(array('name' => 'foo')), $c->getRouteParams());
50+
$this->assertEquals(array('name' => $cloner->cloneVar('foo')), $c->getRouteParams());
5151
$this->assertSame(array(), $c->getSessionAttributes());
5252
$this->assertSame('en', $c->getLocale());
5353
$this->assertEquals($cloner->cloneVar($request->attributes->get('resource')), $attributes->get('resource'));
5454
$this->assertEquals($cloner->cloneVar($request->attributes->get('object')), $attributes->get('object'));
5555

56-
$this->assertInstanceOf('Symfony\Component\HttpFoundation\HeaderBag', $c->getResponseHeaders());
56+
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getResponseHeaders());
5757
$this->assertSame('OK', $c->getStatusText());
5858
$this->assertSame(200, $c->getStatusCode());
5959
$this->assertSame('application/json', $c->getContentType());

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.