diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch fabpot/request-create-fix (PR #7098)

Browse Source 
This PR was merged into the 2.2 branch.

Commits
-------

738de9a [HttpKernel] added a unit for the previous commit (closes #7025)
d0e4b76 [HttpFoundation] fixed, overwritten CONTENT_TYPE

Discussion
----------

Fixed content type when passed as a server value

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7025
| License       | MIT
| Doc PR        | n/a

---------------------------------------------------------------------------

by stof at 2013-02-17T14:51:35Z

👍
This commit is contained in:
Fabien Potencier 2013-02-17 16:27:25 +01:00
commit fc73d9f049
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -325,7 +325,9 @@ class Request
case 'POST':
case 'PUT':
case 'DELETE':
$server['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
if (!isset($server['CONTENT_TYPE'])) {
$server['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
}
case 'PATCH':
$request = $parameters;
$query = array();

4
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -228,13 +228,14 @@ class RequestTest extends \PHPUnit_Framework_TestCase
public function testCreateCheckPrecedence()
{
// server is used by default
$request = Request::create('/', 'GET', array(), array(), array(), array(
$request = Request::create('/', 'DELETE', array(), array(), array(), array(
'HTTP_HOST' => 'example.com',
'HTTPS' => 'on',
'SERVER_PORT' => 443,
'PHP_AUTH_USER' => 'fabien',
'PHP_AUTH_PW' => 'pa$$',
'QUERY_STRING' => 'foo=bar',
'CONTENT_TYPE' => 'application/json',
));
$this->assertEquals('example.com', $request->getHost());
$this->assertEquals(443, $request->getPort());
@ -242,6 +243,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('fabien', $request->getUser());
$this->assertEquals('pa$$', $request->getPassword());
$this->assertEquals('', $request->getQueryString());
$this->assertEquals('application/json', $request->headers->get('CONTENT_TYPE'));
// URI has precedence over server
$request = Request::create('http://thomas:pokemon@example.net:8080/?foo=bar', 'GET', array(), array(), array(), array(