Fixed failing tests in 2.8

This failed due to symfony issue symfony/symfony#17162
boekkooi · Jan 13, 2016 · 6aec450 · 6aec450
1 parent f4eefd7
commit 6aec450
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tests/Functional/TestBundle/Form/TypeHelper.php b/tests/Functional/TestBundle/Form/TypeHelper.php
@@ -20,7 +20,7 @@ public static function type($fqcn)
 
     public static function fixCollectionOptions(array $options)
     {
-        if (FormHelper::isSymfony3Compatible()) {
+        if(FormHelper::isSymfony3Compatible() && !FormHelper::isSymfony2Compatible()) {
             return $options;
         }
 
@@ -31,7 +31,11 @@ public static function fixCollectionOptions(array $options)
 
         if (isset($options['entry_options'])) {
             $options['options'] = TypeHelper::type($options['entry_options']);
-            unset($options['entry_options']);
+
+            // Due to a bug in 2.8 and 2.8.1 we need to ensure we also set options when we run 2.8.x
+            if (!FormHelper::isSymfony3Compatible()) {
+                unset($options['entry_options']);
+            }
         }
 
         return $options;