8000 [Form] Fixed ContextErrorException in FileType by chihiro-adachi · Pull Request #25102 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Form] Fixed ContextErrorException in FileType #25102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+24 −1
Closed

[Form] Fixed ContextErrorException in FileType #25102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7092c9f
[Form] Fixed ContextErrorException in FileType
Nov 22, 2017
2362056
Fix to allow only arrays
Nov 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[Form] Fixed ContextErrorException in FileType
  • Loading branch information
chihiro-adachi committed Nov 22, 2017
commit 7092c9f4786f98e177ff33c661b90efeed86ec92
7 changes: 6 additions & 1 deletion src/Symfony/Component/Form/Extension/Core/Type/FileType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)

if ($options['multiple']) {
$data = array();
$files = $event->getData();

foreach ($event->getData() as $file) {
if (!is_array($files)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about checking for null here first and then dropping everything afterwards that is not an array?

8000

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe just:

if (!is_array($files)) {
    $files = array(null);
}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xabbuh Thank you, I fixed it.

$files = array($files);
}

foreach ($files as $file) {
if ($requestHandler->isFileUpload($file)) {
$data[] = $file;
}
Expand Down
18 changes: 18 additions & 0 deletions src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,24 @@ public function testMultipleSubmittedFilePathsAreDropped(RequestHandlerInterface
$this->assertCount(1, $form->getData());
}

/**
* @dataProvider requestHandlerProvider
*/
public function testSubmitNonArrayValueWhenMultiple(RequestHandlerInterface $requestHandler)
{
$form = $this->factory
->createBuilder(static::TESTED_TYPE, null, array(
'multiple' => true,
))
->setRequestHandler($requestHandler)
->getForm();
$form->submit(null);

$this->assertSame(array(), $form->getData());
$this->assertSame(array(), $form->getNormData());
$this->assertSame(array(), $form->getViewData());
}

public function requestHandlerProvider()
{
return array(
Expand Down
0