diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index cc366186fc0f8..196a73b64a1c8 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -48,13 +48,20 @@ public function collect(Request $request, Response $response, \Exception $except
$responseHeaders['Set-Cookie'] = $cookies;
}
+ // attributes are serialized and as they can be anything, they need to be converted to strings.
$attributes = array();
foreach ($request->attributes->all() as $key => $value) {
if ('_route' === $key && is_object($value)) {
- $value = $value->getPath();
+ $attributes[$key] = $this->varToString($value->getPath());
+ } elseif ('_route_params' === $key) {
+ // we need to keep route params as an array (see getRouteParams())
+ foreach ($value as $k => $v) {
+ $value[$k] = $this->varToString($v);
+ }
+ $attributes[$key] = $value;
+ } else {
+ $attributes[$key] = $this->varToString($value);
}
-
- $attributes[$key] = $value;
}
$content = null;
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
index bb80781ebeb56..02a85b9cd8ba7 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -22,20 +22,19 @@
class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase
{
- /**
- * @dataProvider provider
- */
- public function testCollect(Request $request, Response $response)
+ public function testCollect()
{
$c = new RequestDataCollector();
- $c->collect($request, $response);
+ $c->collect($this->createRequest(), $this->createResponse());
+
+ $attributes = $c->getRequestAttributes();
$this->assertSame('request', $c->getName());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\HeaderBag', $c->getRequestHeaders());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestServer());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestCookies());
- $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestAttributes());
+ $this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $attributes);
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestRequest());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestQuery());
$this->assertSame('html', $c->getFormat());
@@ -43,6 +42,8 @@ public function testCollect(Request $request, Response $response)
$this->assertSame(array('name' => 'foo'), $c->getRouteParams());
$this->assertSame(array(), $c->getSessionAttributes());
$this->assertSame('en', $c->getLocale());
+ $this->assertSame('Resource(stream)', $attributes->get('resource'));
+ $this->assertSame('Object(stdClass)', $attributes->get('object'));
$this->assertInstanceOf('Symfony\Component\HttpFoundation\HeaderBag', $c->getResponseHeaders());
$this->assertSame('OK', $c->getStatusText());
@@ -52,10 +53,8 @@ public function testCollect(Request $request, Response $response)
/**
* Test various types of controller callables.
- *
- * @dataProvider provider
*/
- public function testControllerInspection(Request $request, Response $response)
+ public function testControllerInspection()
{
// make sure we always match the line number
$r1 = new \ReflectionMethod($this, 'testControllerInspection');
@@ -136,7 +135,8 @@ function () { return 'foo'; },
);
$c = new RequestDataCollector();
-
+ $request = $this->createRequest();
+ $response = $this->createResponse();
foreach ($controllerTests as $controllerTest) {
$this->injectController($c, $controllerTest[1], $request);
$c->collect($request, $response);
@@ -144,17 +144,20 @@ function () { return 'foo'; },
}
}
- public function provider()
+ protected function createRequest()
{
- if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
- return array(array(null, null));
- }
-
$request = Request::create('http://test.com/foo?bar=baz');
$request->attributes->set('foo', 'bar');
$request->attributes->set('_route', 'foobar');
$request->attributes->set('_route_params', array('name' => 'foo'));
+ $request->attributes->set('resource', fopen(__FILE__, 'r'));
+ $request->attributes->set('object', new \stdClass());
+
+ return $request;
+ }
+ protected function createResponse()
+ {
$response = new Response();
$response->setStatusCode(200);
$response->headers->set('Content-Type', 'application/json');
@@ -162,9 +165,7 @@ public function provider()
$response->headers->setCookie(new Cookie('bar','foo',new \DateTime('@946684800')));
$response->headers->setCookie(new Cookie('bazz','foo','2000-12-12'));
- return array(
- array($request, $response)
- );
+ return $response;
}
/**
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy