fix deprecations: use choices_as_values=true and flip content of the choice options

Export/Export/ListActivity.php

@@ -44,39 +44,39 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  */
 class ListActivity implements ListInterface
 {
-    
+
     /**
      *
      * @var EntityManagerInterface
      */
     protected $entityManager;
-    
+
     /**
      *
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
     /**
-     * 
-     * @var TranslatableStringHelper 
+     *
+     * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     protected $fields = array(
-        'id',  
-        'date', 
-        'durationTime', 
-        'attendee', 
-        'list_reasons', 
-        'user_username', 
-        'circle_name', 
-        'type_name', 
+        'id',
+        'date',
+        'durationTime',
+        'attendee',
+        'list_reasons',
+        'user_username',
+        'circle_name',
+        'type_name',
         'person_firstname',
         'person_lastname',
         'person_id'
     );
-    
+
     public function __construct(
             EntityManagerInterface $em,
             TranslatorInterface $translator,
@@ -87,10 +87,10 @@ class ListActivity implements ListInterface
         $this->translator = $translator;
         $this->translatableStringHelper = $translatableStringHelper;
     }
-    
+
     /**
      * {@inheritDoc}
-     * 
+     *
      * @param FormBuilderInterface $builder
      */
     public function buildForm(FormBuilderInterface $builder)
@@ -99,6 +99,7 @@ class ListActivity implements ListInterface
             'multiple' => true,
             'expanded' => true,
             'choices' => array_combine($this->fields, $this->fields),
+            'choices_as_values' => true,
             'label'    => 'Fields to include in export',
             'constraints' => [new Callback(array(
                 'callback' => function($selected, ExecutionContextInterface $context) {
@@ -115,7 +116,7 @@ class ListActivity implements ListInterface
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @return type
      */
     public function getAllowedFormattersTypes()
@@ -130,35 +131,35 @@ class ListActivity implements ListInterface
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) 
+        switch ($key)
         {
             case 'date' :
                 return function($value) {
                     if ($value === '_header') return 'date';
-                    
+
                     $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
-                    
+
                     return $date->format('d-m-Y');
                 };
             case 'attendee':
                 return function($value) {
                     if ($value === '_header') return 'attendee';
-                    
+
                     return $value ? 1 : 0;
                 };
             case 'list_reasons' :
                 /* @var $activityReasonsRepository EntityRepository */
                 $activityRepository = $this->entityManager
                     ->getRepository('ChillActivityBundle:Activity');
-                
+
                 return function($value) use ($activityRepository) {
                     if ($value === '_header') return 'activity reasons';
-                    
+
                     $activity = $activityRepository
                             ->find($value);
-                    
+
                     return implode(", ", array_map(function(ActivityReason $r) {
-                        
+
                         return '"'.
                                 $this->translatableStringHelper->localize($r->getCategory()->getName())
                                 .' > '.
@@ -169,21 +170,21 @@ class ListActivity implements ListInterface
             case 'circle_name' :
                 return function($value) {
                     if ($value === '_header') return 'circle';
-                    
+
                     return $this->translatableStringHelper
                             ->localize(json_decode($value, true));
                 };
             case 'type_name' :
                 return function($value) {
                     if ($value === '_header') return 'activity type';
-                    
+
                     return $this->translatableStringHelper
                             ->localize(json_decode($value, true));
                 };
             default:
                 return function($value) use ($key) {
                     if ($value === '_header') return $key;
-                    
+
                     return $value;
                 };
         }
@@ -212,15 +213,15 @@ class ListActivity implements ListInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = array())
     {
         $centers = array_map(function($el) { return $el['center']; }, $acl);
-        
+
         // throw an error if any fields are present
         if (!\array_key_exists('fields', $data)) {
             throw new \Doctrine\DBAL\Exception\InvalidArgumentException("any fields "
                 . "have been checked");
         }
-        
+
         $qb = $this->entityManager->createQueryBuilder();
-                
+
         $qb
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.person', 'person')
@@ -228,7 +229,7 @@ class ListActivity implements ListInterface
                 ->andWhere('center IN (:authorized_centers)')
                 ->setParameter('authorized_centers', $centers);
                 ;
-        
+
         foreach ($this->fields as $f) {
             if (in_array($f, $data['fields'])) {
                 switch ($f) {
@@ -265,12 +266,12 @@ class ListActivity implements ListInterface
                         $qb->addSelect(sprintf('activity.%s as %s', $f, $f));
                         break;
                 }
-                
+
             }
         }
 
-        
-        
+
+
         return $qb;
     }