fix sf4 deprecated: remove choices_as_values form option

Export/Formatter/CSVFormatter.php

@@ -122,7 +122,6 @@ class CSVFormatter implements FormatterInterface
                  range(1, $nbAggregators),
                  range(1, $nbAggregators)
                  ),
-           'choices_as_values' => true,
            'multiple' => false,
            'expanded' => false
         ));
@@ -132,7 +131,6 @@ class CSVFormatter implements FormatterInterface
               'row' => 'r',
               'column' => 'c'
            ),
-           'choices_as_values' => true,
            'multiple' => false,
            'expanded' => false
         ));

Export/Formatter/CSVListFormatter.php

@@ -103,7 +103,6 @@ class CSVListFormatter implements FormatterInterface
             'expanded' => true,
             'multiple' => false,
             'label' => "Add a number on first column",
-            'choices_as_values' => true,
             'data' => true
         ));
     }

Export/Formatter/CSVPivotedListFormatter.php

@@ -102,7 +102,6 @@ class CSVPivotedListFormatter implements FormatterInterface
             'expanded' => true,
             'multiple' => false,
             'label' => "Add a number on first column",
-            'choices_as_values' => true,
             'data' => true
         ));
     }

Export/Formatter/SpreadSheetFormatter.php

@@ -160,7 +160,6 @@ class SpreadSheetFormatter implements FormatterInterface
                 'Microsoft Excel 2007-2013 XML (.xlsx) (Microsoft Excel, LibreOffice)' => 'xlsx',
                 'Comma separated values (.csv)' => 'csv'
             ),
-            'choices_as_values' => true,
             'placeholder' => 'Choose the format'
         ));
 
@@ -194,7 +193,6 @@ class SpreadSheetFormatter implements FormatterInterface
                  range(1, $nbAggregators),
                  range(1, $nbAggregators)
                  ),
-           'choices_as_values' => true,
            'multiple' => false,
            'expanded' => false
         ));

Export/Formatter/SpreadsheetListFormatter.php

@@ -99,7 +99,6 @@ class SpreadsheetListFormatter implements FormatterInterface
                     'OpenDocument Format (.ods) (LibreOffice, ...)' => 'ods',
                     'Microsoft Excel 2007-2013 XML (.xlsx) (Microsoft Excel, LibreOffice)' => 'xlsx'
                 ),
-                'choices_as_values' => true,
                 'placeholder' => 'Choose the format'
             ))
             ->add('numerotation', ChoiceType::class, array(
@@ -110,7 +109,6 @@ class SpreadsheetListFormatter implements FormatterInterface
                 'expanded' => true,
                 'multiple' => false,
                 'label' => "Add a number on first column",
-                'choices_as_values' => true,
                 'data' => true
         ));
     }

Form/Type/AppendScopeChoiceTypeTrait.php

@@ -122,7 +122,6 @@ trait AppendScopeChoiceTypeTrait
                             $builder
                             ->create($name, ChoiceType::class, array(
                                 'choices' => array_combine(array_values($choices),array_keys($choices)),
-                                'choices_as_values' => true,
                                 'auto_initialize' => false
                                 )
                             )

Form/Type/ComposedRoleScopeType.php

@@ -91,7 +91,6 @@ class ComposedRoleScopeType extends AbstractType
         $builder
             ->add('role', ChoiceType::class, array(
                'choices' => array_combine(array_values($values),array_keys($values)),
-               'choices_as_values' => true,
                'placeholder' => 'Choose amongst roles',
                'choice_attr' => function($role) use ($rolesWithoutScopes) {
                     if (in_array($role, $rolesWithoutScopes)) {

Form/Type/DateIntervalType.php

@@ -72,7 +72,6 @@ class DateIntervalType extends AbstractType
             ])
             ->add('unit', ChoiceType::class, [
                 'choices' => $options['unit_choices'],
-                'choices_as_values' => true
             ])
             ;
         

Form/Type/Export/PickFormatterType.php

@@ -55,7 +55,6 @@ class PickFormatterType extends AbstractType
 
         $builder->add('alias', ChoiceType::class, array(
             'choices' => $choices,
-            'choices_as_values' => true,
             'multiple' => false,
             'placeholder' => 'Choose a format'
         ));

Form/Type/Select2ChoiceType.php

@@ -46,7 +46,6 @@ class Select2ChoiceType extends AbstractType
         $resolver->setDefaults(
               array(
                   'attr' => array('class' => 'select2 '),
-                  'choices_as_values' => true
               ));
     }
 }

Form/UserType.php

@@ -63,7 +63,6 @@ class UserType extends AbstractType
                         ),
                         'expanded' => false,
                         'multiple' => false,
-                        'choices_as_values' => true // Can be removed when upgraded to Sf3.
                         ))
                 );
         }