Skip to content

Commit a38bf3d

Browse files
nicolas-grekasnicolas-grekas
committed
[WebProfilerBundle] Fix deprecated uses of profiler_dump
1 parent 59f9949 commit a38bf3d

File tree

5 files changed

+40
-30
lines changed

5 files changed

+40
-30
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ private function getTraces(RequestDataCollector $request, $method)
8686
{
8787
$traceRequest = Request::create(
8888
$request->getPathInfo(),
89-
$request->getRequestServer()->get('REQUEST_METHOD'),
90-
$request->getRequestAttributes()->all(),
91-
$request->getRequestCookies()->all(),
89+
$request->getRequestServer(true)->get('REQUEST_METHOD'),
90+
$request->getRequestAttributes(true)->all(),
91+
$request->getRequestCookies(true)->all(),
9292
array(),
93-
$request->getRequestServer()->all()
93+
$request->getRequestServer(true)->all()
9494
);
9595

9696
$context = $this->matcher->getContext();

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
{% endif %}
155155

156156
<h3>Request Headers</h3>
157-
{{ include('@WebProfiler/Profiler/bag.html.twig', { bag: collector.requestheaders, labels: ['Header', 'Value'] }, with_context = false) }}
157+
{{ include('@WebProfiler/Profiler/bag.html.twig', { bag: collector.requestheaders, labels: ['Header', 'Value'], maxDepth: 1 }, with_context = false) }}
158158

159159
<h3>Request Content</h3>
160160

@@ -183,7 +183,7 @@
183183
<div class="tab-content">
184184
<h3>Response Headers</h3>
185185

186-
{{ include('@WebProfiler/Profiler/bag.html.twig', { bag: collector.responseheaders, labels: ['Header', 'Value'] }, with_context = false) }}
186+
{{ include('@WebProfiler/Profiler/bag.html.twig', { bag: collector.responseheaders, labels: ['Header', 'Value'], maxDepth: 1 }, with_context = false) }}
187187
</div>
188188
</div>
189189

‎src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php

Lines 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
}

‎src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php

Lines changed: 30 additions & 20 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,10 @@ 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) {
64-
$route = is_object($value) ? $value->getPath() : $value;
56+
$attributes[$key] = $route = is_object($value) ? $value->getPath() : $value;
57+
} else {
58+
$attributes[$key] = $value;
6559
}
6660
}
6761

@@ -97,8 +91,8 @@ public function collect(Request $request, Response $response, \Exception $except
9791
'content_type' => $response->headers->get('Content-Type', 'text/html'),
9892
'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
9993
'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()),
94+
'request_query' => $request->query->all(),
95+
'request_request' => $request->request->all(),
10296
'request_headers' => $request->headers->all(),
10397
'request_server' => $request->server->all(),
10498
'request_cookies' => $request->cookies->all(),
@@ -125,6 +119,18 @@ public function collect(Request $request, Response $response, \Exception $except
125119
$this->data['request_request']['_password'] = '******';
126120
}
127121

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

171177
public function getRequestHeaders()
172178
{
173-
return new HeaderBag($this->data['request_headers']);
179+
return new ParameterBag($this->data['request_headers']);
174180
}
175181

176-
public function getRequestServer()
182+
public function getRequestServer($raw = false)
177183
{
178-
return new ParameterBag($this->data['request_server']);
184+
return new ParameterBag($raw ? $this->data['request_server'] : array_map(array($this, 'cloneVar'), $this->data['request_server']));
179185
}
180186

181-
public function getRequestCookies()
187+
public function getRequestCookies($raw = false)
182188
{
183-
return new ParameterBag($this->data['request_cookies']);
189+
return new ParameterBag($raw ? $this->data['request_cookies'] : array_map(array($this, 'cloneVar'), $this->data['request_cookies']));
184190
}
185191

186-
public function getRequestAttributes()
192+
public function getRequestAttributes($raw = false)
187193
{
188-
return new ParameterBag($this->data['request_attributes']);
194+
return new ParameterBag($raw ? $this->data['request_attributes'] : array_map(array($this, 'cloneVar'), $this->data['request_attributes']));
189195
}
190196

191197
public function getResponseHeaders()
192198
{
193-
return new ResponseHeaderBag($this->data['response_headers']);
199+
return new ParameterBag($this->data['response_headers']);
194200
}
195201

196202
public function getSessionMetadata()
@@ -264,7 +270,11 @@ public function getIdentifier()
264270
*/
265271
public function getRouteParams()
266272
{
267-
return isset($this->data['request_attributes']['_route_params']) ? $this->data['request_attributes']['_route_params'] : $this->cloneVar(array());
273+
if (!isset($this->data['request_attributes']['_route_params'])) {
274+
return array();
275+
}
276+
277+
return array_map(array($this, 'cloneVar'), $this->data['request_attributes']['_route_params']);
268278
}
269279

270280
/**

‎src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php

Lines 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)