From b0beab9ca3b59f7e283d796caa575d23b3bb8b63 Mon Sep 17 00:00:00 2001
From: Yannick <y.bensacq@gmail.com>
Date: Mon, 8 Feb 2016 22:05:30 +0100
Subject: [PATCH 1/8] [DEPRECATION] : deprecated support for Traversable in 
 method

---
 src/Symfony/Component/Form/CHANGELOG.md                    | 1 +
 .../Extension/Core/EventListener/ResizeFormListener.php    | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 3671caab0898a..b5029c843e953 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * deprecated the "choices_as_values" option of ChoiceType
+ * deprecated support for Traversable in `ResizeFormListener::PreSubmit` method
 
 3.0.0
 -----
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 197f556308f25..db66a217342be 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -102,11 +102,16 @@ public function preSubmit(FormEvent $event)
         $form = $event->getForm();
         $data = $event->getData();
 
+
+        if ($data instanceof \Traversable){
+            @trigger_error('Support for Traversable is deprecated since version 3.1 and will be removed in 4.0. You should not use it anymore.', E_USER_DEPRECATED);
+        }
+
         if (null === $data || '' === $data) {
             $data = array();
         }
 
-        if (!is_array($data) && !($data instanceof \Traversable && $data instanceof \ArrayAccess)) {
+        if (!is_array($data) && !$data instanceof \ArrayAccess) {
             $data = array();
         }
 

From 39f7f548294d011b5e874af6063bb417f7b8d4b7 Mon Sep 17 00:00:00 2001
From: Yannick <y.bensacq@gmail.com>
Date: Mon, 8 Feb 2016 22:41:15 +0100
Subject: [PATCH 2/8] [DEPRECATION] : deprecated support for Traversable in 
 method

---
 .../Form/Extension/Core/EventListener/ResizeFormListener.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index db66a217342be..c76778bc30dc7 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -102,7 +102,6 @@ public function preSubmit(FormEvent $event)
         $form = $event->getForm();
         $data = $event->getData();
 
-
         if ($data instanceof \Traversable){
             @trigger_error('Support for Traversable is deprecated since version 3.1 and will be removed in 4.0. You should not use it anymore.', E_USER_DEPRECATED);
         }

From d666f3ea0c78f74071a517dd6e5fd44c383d86f2 Mon Sep 17 00:00:00 2001
From: Yannick <y.bensacq@gmail.com>
Date: Mon, 8 Feb 2016 22:53:00 +0100
Subject: [PATCH 3/8] [DEPRECATION] : deprecated support for Traversable in 
 method

---
 src/Symfony/Component/Form/CHANGELOG.md                         | 2 +-
 .../Form/Extension/Core/EventListener/ResizeFormListener.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index b5029c843e953..880d845db565c 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -5,7 +5,7 @@ CHANGELOG
 -----
 
  * deprecated the "choices_as_values" option of ChoiceType
- * deprecated support for Traversable in `ResizeFormListener::PreSubmit` method
+ * deprecated support for Traversable in `ResizeFormListener::preSubmit` method
 
 3.0.0
 -----
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index c76778bc30dc7..01b85c7294985 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -110,7 +110,7 @@ public function preSubmit(FormEvent $event)
             $data = array();
         }
 
-        if (!is_array($data) && !$data instanceof \ArrayAccess) {
+        if (!is_array($data)) {
             $data = array();
         }
 

From 042b899057b732cf2c666669330e10e2cfbfd51c Mon Sep 17 00:00:00 2001
From: Yannick <y.bensacq@gmail.com>
Date: Mon, 8 Feb 2016 22:53:13 +0100
Subject: [PATCH 4/8] [DEPRECATION] : deprecated support for Traversable in 
 method

---
 .../Form/Extension/Core/EventListener/ResizeFormListener.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 01b85c7294985..654345e5c23dc 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -102,6 +102,7 @@ public function preSubmit(FormEvent $event)
         $form = $event->getForm();
         $data = $event->getData();
 
+
         if ($data instanceof \Traversable){
             @trigger_error('Support for Traversable is deprecated since version 3.1 and will be removed in 4.0. You should not use it anymore.', E_USER_DEPRECATED);
         }

From 188e7807f4cf54a6394a329e87e19bf1b57893d5 Mon Sep 17 00:00:00 2001
From: Yannick <y.bensacq@gmail.com>
Date: Mon, 8 Feb 2016 22:53:20 +0100
Subject: [PATCH 5/8] [DEPRECATION] : deprecated support for Traversable in 
 method

---
 .../Form/Extension/Core/EventListener/ResizeFormListener.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 654345e5c23dc..01b85c7294985 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -102,7 +102,6 @@ public function preSubmit(FormEvent $event)
         $form = $event->getForm();
         $data = $event->getData();
 
-
         if ($data instanceof \Traversable){
             @trigger_error('Support for Traversable is deprecated since version 3.1 and will be removed in 4.0. You should not use it anymore.', E_USER_DEPRECATED);
         }

From 554307c6fcdf1ea9349caa0dc98a5fec9c047479 Mon Sep 17 00:00:00 2001
From: Yannick <y.bensacq@gmail.com>
Date: Tue, 9 Feb 2016 08:41:28 +0100
Subject: [PATCH 6/8] fix BC breack

---
 src/Symfony/Component/Form/CHANGELOG.md                       | 2 +-
 .../Form/Extension/Core/EventListener/ResizeFormListener.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 880d845db565c..aecf85dd026a9 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -5,7 +5,7 @@ CHANGELOG
 -----
 
  * deprecated the "choices_as_values" option of ChoiceType
- * deprecated support for Traversable in `ResizeFormListener::preSubmit` method
+ * deprecated support for data objects that implements both \Traversable and \ArrayAccess in ResizeFormListener::preSubmit method
 
 3.0.0
 -----
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 01b85c7294985..e19edb2fc0f14 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -102,7 +102,7 @@ public function preSubmit(FormEvent $event)
         $form = $event->getForm();
         $data = $event->getData();
 
-        if ($data instanceof \Traversable){
+        if ($data instanceof \Traversable) {
             @trigger_error('Support for Traversable is deprecated since version 3.1 and will be removed in 4.0. You should not use it anymore.', E_USER_DEPRECATED);
         }
 
@@ -110,7 +110,7 @@ public function preSubmit(FormEvent $event)
             $data = array();
         }
 
-        if (!is_array($data)) {
+        if (!is_array($data) && !($data instanceof \Traversable && $data instanceof \ArrayAccess)) {
             $data = array();
         }
 

From 59ff58181dd164f8f510aea79e4942f65f6132eb Mon Sep 17 00:00:00 2001
From: Yannick <y.bensacq@gmail.com>
Date: Tue, 9 Feb 2016 16:23:50 +0100
Subject: [PATCH 7/8] update Documentation files

---
 UPGRADE-3.1.md                                                | 2 ++
 UPGRADE-4.0.md                                                | 1 +
 .../Form/Extension/Core/EventListener/ResizeFormListener.php  | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md
index e4844dd62077c..5dc2306466a76 100644
--- a/UPGRADE-3.1.md
+++ b/UPGRADE-3.1.md
@@ -15,6 +15,8 @@ Form
 
  * The `choices_as_values` option of the `ChoiceType` has been deprecated and
    will be removed in Symfony 4.0.
+ * Support for data objects that implements both \Traversable and \ArrayAccess in ResizeFormListener::preSubmit method has been deprecated
+   and will be removed in Symfony 4.0.
 
 HttpKernel
 ----------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index a485e69023766..86b3af5b4c4f9 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -13,6 +13,7 @@ Form
 ----
 
  * The `choices_as_values` option of the `ChoiceType` has been removed.
+ * Support for data objects that implements both \Traversable and \ArrayAccess in ResizeFormListener::preSubmit method has been removed
 
 Serializer
 ----------
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index e19edb2fc0f14..ee0bca1c152ec 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -102,8 +102,8 @@ public function preSubmit(FormEvent $event)
         $form = $event->getForm();
         $data = $event->getData();
 
-        if ($data instanceof \Traversable) {
-            @trigger_error('Support for Traversable is deprecated since version 3.1 and will be removed in 4.0. You should not use it anymore.', E_USER_DEPRECATED);
+        if ($data instanceof \Traversable && $data instanceof \ArrayAccess) {
+            @trigger_error('Support for objects implementing both \Traversable and \ArrayAccess is deprecated since version 3.1 and will be removed in 4.0.Use an array instead.', E_USER_DEPRECATED);
         }
 
         if (null === $data || '' === $data) {

From 176d30d9cc7971e11d1094dd8bf8efe85f8d1391 Mon Sep 17 00:00:00 2001
From: Yannick <y.bensacq@gmail.com>
Date: Tue, 9 Feb 2016 19:47:37 +0100
Subject: [PATCH 8/8] Fix backticks in .md

---
 UPGRADE-3.1.md                                               | 5 +++--
 UPGRADE-4.0.md                                               | 3 ++-
 src/Symfony/Component/Form/CHANGELOG.md                      | 3 ++-
 .../Form/Extension/Core/EventListener/ResizeFormListener.php | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md
index 5dc2306466a76..dcdd7f3acc904 100644
--- a/UPGRADE-3.1.md
+++ b/UPGRADE-3.1.md
@@ -15,8 +15,9 @@ Form
 
  * The `choices_as_values` option of the `ChoiceType` has been deprecated and
    will be removed in Symfony 4.0.
- * Support for data objects that implements both \Traversable and \ArrayAccess in ResizeFormListener::preSubmit method has been deprecated
-   and will be removed in Symfony 4.0.
+ * Support for data objects that implements both `\Traversable` and `\ArrayAccess`
+   in `ResizeFormListener::preSubmit` method has been deprecated and will be
+   removed in Symfony 4.0.
 
 HttpKernel
 ----------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 86b3af5b4c4f9..69a7d9a0ff51b 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -13,7 +13,8 @@ Form
 ----
 
  * The `choices_as_values` option of the `ChoiceType` has been removed.
- * Support for data objects that implements both \Traversable and \ArrayAccess in ResizeFormListener::preSubmit method has been removed
+ * Support for data objects that implements both `\Traversable` and
+   `\ArrayAccess` in `ResizeFormListener::preSubmit` method has been removed
 
 Serializer
 ----------
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index aecf85dd026a9..b82f644e31cdd 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -5,7 +5,8 @@ CHANGELOG
 -----
 
  * deprecated the "choices_as_values" option of ChoiceType
- * deprecated support for data objects that implements both \Traversable and \ArrayAccess in ResizeFormListener::preSubmit method
+ * deprecated support for data objects that implements both `\Traversable` and
+   `\ArrayAccess` in `ResizeFormListener::preSubmit` method
 
 3.0.0
 -----
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index ee0bca1c152ec..cd00cf368e8cc 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -103,7 +103,7 @@ public function preSubmit(FormEvent $event)
         $data = $event->getData();
 
         if ($data instanceof \Traversable && $data instanceof \ArrayAccess) {
-            @trigger_error('Support for objects implementing both \Traversable and \ArrayAccess is deprecated since version 3.1 and will be removed in 4.0.Use an array instead.', E_USER_DEPRECATED);
+            @trigger_error('Support for objects implementing both \Traversable and \ArrayAccess is deprecated since version 3.1 and will be removed in 4.0. Use an array instead.', E_USER_DEPRECATED);
         }
 
         if (null === $data || '' === $data) {