From 7092c9f4786f98e177ff33c661b90efeed86ec92 Mon Sep 17 00:00:00 2001
From: chihiro-adachi <chihiro_adachi@lockon.co.jp>
Date: Wed, 22 Nov 2017 19:00:37 +0900
Subject: [PATCH 1/2] [Form] Fixed ContextErrorException in FileType

---
 .../Form/Extension/Core/Type/FileType.php      |  7 ++++++-
 .../Tests/Extension/Core/Type/FileTypeTest.php | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index fc5b1aae68329..6fb611213ad3c 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -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)) {
+                    $files = array($files);
+                }
+
+                foreach ($files as $file) {
                     if ($requestHandler->isFileUpload($file)) {
                         $data[] = $file;
                     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
index 5d6fe1e20d668..646470ff5abf9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
@@ -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(

From 23620566d190b81304ef71fb6c8532ffe7c77f4c Mon Sep 17 00:00:00 2001
From: chihiro-adachi <chihiro_adachi@lockon.co.jp>
Date: Thu, 23 Nov 2017 14:51:16 +0900
Subject: [PATCH 2/2] Fix to allow only arrays

---
 src/Symfony/Component/Form/Extension/Core/Type/FileType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 6fb611213ad3c..cff7adf1bb2c8 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -37,7 +37,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $files = $event->getData();
 
                 if (!is_array($files)) {
-                    $files = array($files);
+                    $files = array(null);
                 }
 
                 foreach ($files as $file) {