From 5aa87ffdb4a550379cd06e2942733bc13da61d9a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 Apr 2018 15:04:47 +0200
Subject: [PATCH] fix deprecations: use fqcn + change 'property' in
 'choice_label'

---
 Form/ActivityReasonType.php                      | 3 ++-
 Form/Type/TranslatableActivityReasonCategory.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Form/ActivityReasonType.php b/Form/ActivityReasonType.php
index 7671ea2cc..a7fad4a2f 100644
--- a/Form/ActivityReasonType.php
+++ b/Form/ActivityReasonType.php
@@ -7,6 +7,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
 
 class ActivityReasonType extends AbstractType
 {
@@ -19,7 +20,7 @@ class ActivityReasonType extends AbstractType
         $builder
             ->add('name', TranslatableStringFormType::class)
             ->add('active', CheckboxType::class, array('required' => false))
-            ->add('category', 'translatable_activity_reason_category')
+            ->add('category', TranslatableActivityReasonCategory::class)
         ;
     }
 
diff --git a/Form/Type/TranslatableActivityReasonCategory.php b/Form/Type/TranslatableActivityReasonCategory.php
index cd9686b1c..c01ff2a01 100644
--- a/Form/Type/TranslatableActivityReasonCategory.php
+++ b/Form/Type/TranslatableActivityReasonCategory.php
@@ -63,7 +63,7 @@ class TranslatableActivityReasonCategory extends AbstractType
         $resolver->setDefaults(
             array(
                 'class' => 'ChillActivityBundle:ActivityReasonCategory',
-                'property' => 'name['.$locale.']',
+                'choice_label' => 'name['.$locale.']',
                 'query_builder' => function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.active = true');