Skip to content

Commit 7dc5ae3

Browse files
fabpotfabpot
committed
renamed request path property to request attributes
1 parent df8ccb4 commit 7dc5ae3

File tree

6 files changed

+51
-48
lines changed

6 files changed

+51
-48
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerManager.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function render($controller, array $options = array())
128128
*/
129129
public function getController(Request $request)
130130
{
131-
if (!$controller = $request->path->get('_controller')) {
131+
if (!$controller = $request->attributes->get('_controller')) {
132132
if (null !== $this->logger) {
133133
$this->logger->err('Unable to look for the controller as the "_controller" parameter is missing');
134134
}
@@ -192,16 +192,16 @@ public function getController(Request $request)
192192
*/
193193
public function getMethodArguments(Request $request, $controller)
194194
{
195-
$event = $this->container->get('event_dispatcher')->filter(new Event($this, 'controller_manager.filter_controller_arguments', array('controller' => $controller, 'request' => $request)), $request->path->all());
196-
$path = $event->getReturnValue();
195+
$event = $this->container->get('event_dispatcher')->filter(new Event($this, 'controller_manager.filter_controller_arguments', array('controller' => $controller, 'request' => $request)), $request->attributes->all());
196+
$attributes = $event->getReturnValue();
197197

198198
list($controller, $method) = $controller;
199199

200200
$r = new \ReflectionObject($controller);
201201
$arguments = array();
202202
foreach ($r->getMethod($method)->getParameters() as $param) {
203-
if (array_key_exists($param->getName(), $path)) {
204-
$arguments[] = $path[$param->getName()];
203+
if (array_key_exists($param->getName(), $attributes)) {
204+
$arguments[] = $attributes[$param->getName()];
205205
} elseif ($param->isDefaultValueAvailable()) {
206206
$arguments[] = $param->getDefaultValue();
207207
} else {

‎src/Symfony/Bundle/FrameworkBundle/Controller/InternalController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public function indexAction()
2626
{
2727
$request = $this->getRequest();
2828

29-
if ('none' !== $request->path->get('path'))
29+
if ('none' !== $request->attributes->get('path'))
3030
{
31-
parse_str($request->path->get('path'), $tmp);
32-
$request->path->add($tmp);
31+
parse_str($request->attributes->get('path'), $tmp);
32+
$request->attributes->add($tmp);
3333
}
3434

35-
return $this->forward($request->path->get('controller'), $request->path->all(), $request->query->all());
35+
return $this->forward($request->attributes->get('controller'), $request->attributes->all(), $request->query->all());
3636
}
3737
}

‎src/Symfony/Bundle/FrameworkBundle/DataCollector/AppDataCollector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function collect()
3535
$request = $this->container->getRequestService();
3636

3737
$this->data = array(
38-
'route' => $request->path->get('_route') ? $request->path->get('_route') : '<span style="color: #a33">NONE</span>',
38+
'route' => $request->attributes->get('_route') ? $request->attributes->get('_route') : '<span style="color: #a33">NONE</span>',
3939
'format' => $request->getRequestFormat(),
4040
'content_type' => $this->profiler->getResponse()->headers->get('Content-Type') ? $this->profiler->getResponse()->headers->get('Content-Type') : 'text/html',
4141
'code' => $this->profiler->getResponse()->getStatusCode(),

‎src/Symfony/Bundle/FrameworkBundle/RequestListener.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function resolve(Event $event)
6363
));
6464
}
6565

66-
if ($request->path->has('_controller')) {
66+
if ($request->attributes->has('_controller')) {
6767
return;
6868
}
6969

@@ -72,7 +72,7 @@ public function resolve(Event $event)
7272
$this->logger->info(sprintf('Matched route "%s" (parameters: %s)', $parameters['_route'], str_replace("\n", '', var_export($parameters, true))));
7373
}
7474

75-
$request->path->replace($parameters);
75+
$request->attributes->replace($parameters);
7676
} elseif (null !== $this->logger) {
7777
$this->logger->err(sprintf('No route found for %s', $request->getPathInfo()));
7878
}

‎src/Symfony/Components/HttpFoundation/Request.php‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
*/
2323
class Request
2424
{
25-
public $path;
25+
/**
26+
* @var \Symfony\Components\HttpFoundation\ParameterBag
27+
*/
28+
public $attributes;
2629

2730
/**
2831
* @var \Symfony\Components\HttpFoundation\ParameterBag
@@ -70,35 +73,35 @@ class Request
7073
/**
7174
* Constructor.
7275
*
73-
* @param array $query The GET parameters
74-
* @param array $request The POST parameters
75-
* @param array $path The parameters parsed from the PATH_INFO (see Router)
76-
* @param array $cookies The COOKIE parameters
77-
* @param array $files The FILES parameters
78-
* @param array $server The SERVER parameters
76+
* @param array $query The GET parameters
77+
* @param array $request The POST parameters
78+
* @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
79+
* @param array $cookies The COOKIE parameters
80+
* @param array $files The FILES parameters
81+
* @param array $server The SERVER parameters
7982
*/
80-
public function __construct(array $query = null, array $request = null, array $path = null, array $cookies = null, array $files = null, array $server = null)
83+
public function __construct(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
8184
{
82-
$this->initialize($query, $request, $path, $cookies, $files, $server);
85+
$this->initialize($query, $request, $attributes, $cookies, $files, $server);
8386
}
8487

8588
/**
8689
* Sets the parameters for this request.
8790
*
8891
* This method also re-initializes all properties.
8992
*
90-
* @param array $query The GET parameters
91-
* @param array $request The POST parameters
92-
* @param array $path The parameters parsed from the PATH_INFO
93-
* @param array $cookies The COOKIE parameters
94-
* @param array $files The FILES parameters
95-
* @param array $server The SERVER parameters
93+
* @param array $query The GET parameters
94+
* @param array $request The POST parameters
95+
* @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
96+
* @param array $cookies The COOKIE parameters
97+
* @param array $files The FILES parameters
98+
* @param array $server The SERVER parameters
9699
*/
97-
public function initialize(array $query = null, array $request = null, array $path = null, array $cookies = null, array $files = null, array $server = null)
100+
public function initialize(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
98101
{
99102
$this->request = new ParameterBag(null !== $request ? $request : $_POST);
100103
$this->query = new ParameterBag(null !== $query ? $query : $_GET);
101-
$this->path = new ParameterBag(null !== $path ? $path : array());
104+
$this->attributes = new ParameterBag(null !== $attributes ? $attributes : array());
102105
$this->cookies = new ParameterBag(null !== $cookies ? $cookies : $_COOKIE);
103106
$this->files = new ParameterBag($this->convertFileInformation(null !== $files ? $files : $_FILES));
104107
$this->server = new ParameterBag(null !== $server ? $server : $_SERVER);
@@ -176,20 +179,20 @@ static public function create($uri, $method = 'get', $parameters = array(), $coo
176179
/**
177180
* Clones a request and overrides some of its parameters.
178181
*
179-
* @param array $query The GET parameters
180-
* @param array $request The POST parameters
181-
* @param array $path The parameters parsed from the PATH_INFO
182-
* @param array $cookies The COOKIE parameters
183-
* @param array $files The FILES parameters
184-
* @param array $server The SERVER parameters
182+
* @param array $query The GET parameters
183+
* @param array $request The POST parameters
184+
* @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
185+
* @param array $cookies The COOKIE parameters
186+
* @param array $files The FILES parameters
187+
* @param array $server The SERVER parameters
185188
*/
186-
public function duplicate(array $query = null, array $request = null, array $path = null, array $cookies = null, array $files = null, array $server = null)
189+
public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
187190
{
188191
$dup = clone $this;
189192
$dup->initialize(
190193
null !== $query ? $query : $this->query->all(),
191194
null !== $request ? $request : $this->request->all(),
192-
null !== $path ? $path : $this->path->all(),
195+
null !== $attributes ? $attributes : $this->attributes->all(),
193196
null !== $cookies ? $cookies : $this->cookies->all(),
194197
null !== $files ? $files : $this->files->all(),
195198
null !== $server ? $server : $this->server->all()
@@ -200,13 +203,13 @@ public function duplicate(array $query = null, array $request = null, array $pat
200203

201204
public function __clone()
202205
{
203-
$this->query = clone $this->query;
204-
$this->request = clone $this->request;
205-
$this->path = clone $this->path;
206-
$this->cookies = clone $this->cookies;
207-
$this->files = clone $this->files;
208-
$this->server = clone $this->server;
209-
$this->headers = clone $this->headers;
206+
$this->query = clone $this->query;
207+
$this->request = clone $this->request;
208+
$this->attributes = clone $this->attributes;
209+
$this->cookies = clone $this->cookies;
210+
$this->files = clone $this->files;
211+
$this->server = clone $this->server;
212+
$this->headers = clone $this->headers;
210213
}
211214

212215
/**
@@ -234,7 +237,7 @@ public function overrideGlobals()
234237
// This method is mainly useful for libraries that want to provide some flexibility
235238
public function get($key, $default = null)
236239
{
237-
return $this->query->get($key, $this->path->get($key, $this->request->get($key, $default)));
240+
return $this->query->get($key, $this->attributes->get($key, $this->request->get($key, $default)));
238241
}
239242

240243
public function getSession()

‎tests/Symfony/Tests/Components/HttpFoundation/RequestTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testInitialize()
3737
$this->assertEquals('bar', $request->request->get('foo'), '->initialize() takes an array of request parameters as its second argument');
3838

3939
$request->initialize(null, null, array('foo' => 'bar'));
40-
$this->assertEquals('bar', $request->path->get('foo'), '->initialize() takes an array of path parameters as its thrid argument');
40+
$this->assertEquals('bar', $request->attributes->get('foo'), '->initialize() takes an array of attributes as its thrid argument');
4141

4242
$request->initialize(null, null, null, null, null, array('HTTP_FOO' => 'bar'));
4343
$this->assertEquals('bar', $request->headers->get('FOO'), '->initialize() takes an array of HTTP headers as its fourth argument');
@@ -53,14 +53,14 @@ public function testDuplicate()
5353

5454
$this->assertEquals($request->query->all(), $dup->query->all(), '->duplicate() duplicates a request an copy the current query parameters');
5555
$this->assertEquals($request->request->all(), $dup->request->all(), '->duplicate() duplicates a request an copy the current request parameters');
56-
$this->assertEquals($request->path->all(), $dup->path->all(), '->duplicate() duplicates a request an copy the current path parameters');
56+
$this->assertEquals($request->attributes->all(), $dup->attributes->all(), '->duplicate() duplicates a request an copy the current attributes');
5757
$this->assertEquals($request->headers->all(), $dup->headers->all(), '->duplicate() duplicates a request an copy the current HTTP headers');
5858

5959
$dup = $request->duplicate(array('foo' => 'foobar'), array('foo' => 'foobar'), array('foo' => 'foobar'), array(), array(), array('HTTP_FOO' => 'foobar'));
6060

6161
$this->assertEquals(array('foo' => 'foobar'), $dup->query->all(), '->duplicate() overrides the query parameters if provided');
6262
$this->assertEquals(array('foo' => 'foobar'), $dup->request->all(), '->duplicate() overrides the request parameters if provided');
63-
$this->assertEquals(array('foo' => 'foobar'), $dup->path->all(), '->duplicate() overrides the path parameters if provided');
63+
$this->assertEquals(array('foo' => 'foobar'), $dup->attributes->all(), '->duplicate() overrides the attributes if provided');
6464
$this->assertEquals(array('foo' => array('foobar')), $dup->headers->all(), '->duplicate() overrides the HTTP header if provided');
6565
}
6666

0 commit comments

Comments
 (0)