From 7637954a8dd1367d01fbf98f9e46f462db5020a0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 4 Apr 2018 18:39:02 +0200
Subject: [PATCH] fix deprecations: use fqcn for customfieldtype

---
 Form/ReportType.php | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/Form/ReportType.php b/Form/ReportType.php
index aa56daa80..15b0fdf10 100644
--- a/Form/ReportType.php
+++ b/Form/ReportType.php
@@ -1,20 +1,20 @@
 <?php
 
 /*
- * Chill is a software for social workers 
+ * Chill is a software for social workers
  *
  * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -29,37 +29,38 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\Common\Persistence\ObjectManager;
+use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
 
 class ReportType extends AbstractType
-{    
+{
     use AppendScopeChoiceTypeTrait;
-    
+
     /**
      *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
     /**
      *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     /**
      *
      * @var \Doctrine\Common\Persistence\ObjectManager
      */
     protected $om;
-    
+
     /**
      *
      * @var \Chill\MainBundle\Entity\User
      */
     protected $user;
-    
+
     public function __construct(AuthorizationHelper $helper,
-        TokenStorageInterface $tokenStorage, 
+        TokenStorageInterface $tokenStorage,
         TranslatableStringHelper $translatableStringHelper,
         ObjectManager $om)
     {
@@ -68,7 +69,7 @@ class ReportType extends AbstractType
         $this->translatableStringHelper = $translatableStringHelper;
         $this->om = $om;
     }
-    
+
     /**
      * @param FormBuilderInterface $builder
      * @param array $options
@@ -77,24 +78,24 @@ class ReportType extends AbstractType
     {
         $builder
             ->add('user')
-            ->add('date', 'date', 
+            ->add('date', 'date',
                 array('required' => true, 'widget' => 'single_text', 'format' => 'dd-MM-yyyy'))
-            ->add('cFData', 'custom_field', 
-                array('attr' => array('class' => 'cf-fields'), 
+            ->add('cFData', CustomFieldType::class,
+                array('attr' => array('class' => 'cf-fields'),
                    'group' => $options['cFGroup']))
         ;
-        
-        $this->appendScopeChoices($builder, $options['role'], $options['center'], 
-                $this->user, $this->authorizationHelper, 
+
+        $this->appendScopeChoices($builder, $options['role'], $options['center'],
+                $this->user, $this->authorizationHelper,
                 $this->translatableStringHelper,
                 $this->om);
     }
-    
+
     /**
-     * @param OptionsResolverInterface $resolver
+     * @param OptionsResolver $resolver
      */
     public function configureOptions(OptionsResolver $resolver)
-    {       
+    {
         $resolver->setDefaults(array(
             'data_class' => 'Chill\ReportBundle\Entity\Report'
         ));
@@ -106,7 +107,7 @@ class ReportType extends AbstractType
         $resolver->setAllowedTypes(array(
             'cFGroup' => 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup',
         ));
-        
+
         $this->appendScopeChoicesOptions($resolver);
     }