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

[Form] Fixed: If a form is not present in a request, it is not automatically submitted

Browse Source
This commit is contained in:
Bernhard Schussek 2013-08-01 17:20:43 +02:00
parent bd30a5cc30
commit cb5e765f58
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
View File

@ -56,10 +56,13 @@ class HttpFoundationRequestHandler implements RequestHandlerInterface
if ('' === $name) {
$params = $request->request->all();
$files = $request->files->all();
} else {
} elseif ($request->request->has($name) || $request->files->has($name)) {
$default = $form->getConfig()->getCompound() ? array() : null;
$params = $request->request->get($name, $default);
$files = $request->files->get($name, $default);
} else {
// Don't submit the form if it is not present in the request
return;
}
if (is_array($params) && is_array($files)) {

9
src/Symfony/Component/Form/NativeRequestHandler.php
View File

@ -72,10 +72,13 @@ class NativeRequestHandler implements RequestHandlerInterface
if ('' === $name) {
$params = $_POST;
$files = $fixedFiles;
} else {
} elseif (array_key_exists($name, $_POST) || array_key_exists($name, $fixedFiles)) {
$default = $form->getConfig()->getCompound() ? array() : null;
$params = isset($_POST[$name]) ? $_POST[$name] : $default;
$files = isset($fixedFiles[$name]) ? $fixedFiles[$name] : $default;
$params = array_key_exists($name, $_POST) ? $_POST[$name] : $default;
$files = array_key_exists($name, $fixedFiles) ? $fixedFiles[$name] : $default;
} else {
// Don't submit the form if it is not present in the request
return;
}
if (is_array($params) && is_array($files)) {

14
src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
View File

@ -86,7 +86,7 @@ abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider methodExceptGetProvider
*/
public function testSubmitSimpleFormWithNullIfNameNotInRequestAndNotGetRequest($method)
public function testDoNoSubmitSimpleFormIfNameNotInRequestAndNotGetRequest($method)
{
$form = $this->getMockForm('param1', $method, false);
@ -94,9 +94,8 @@ abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
'paramx' => array(),
));
$form->expects($this->once())
->method('submit')
->with($this->identicalTo(null), 'PATCH' !== $method);
$form->expects($this->never())
->method('submit');
$this->requestHandler->handleRequest($form, $this->request);
}
@ -104,7 +103,7 @@ abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider methodExceptGetProvider
*/
public function testSubmitCompoundFormWithArrayIfNameNotInRequestAndNotGetRequest($method)
public function testDoNotSubmitCompoundFormIfNameNotInRequestAndNotGetRequest($method)
{
$form = $this->getMockForm('param1', $method, true);
@ -112,9 +111,8 @@ abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
'paramx' => array(),
));
$form->expects($this->once())
->method('submit')
->with($this->identicalTo(array()), 'PATCH' !== $method);
$form->expects($this->never())
->method('submit');
$this->requestHandler->handleRequest($form, $this->request);
}