Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix deprecations: use fqcn in the activity bundle

Browse Source
This commit is contained in:
nobohan 2018-04-05 10:34:41 +02:00
parent b6f9d1156e
commit 6327d25783
7 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Controller/ActivityController.php
View File

@ -24,6 +24,7 @@ namespace Chill\ActivityBundle\Controller;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Chill\ActivityBundle\Entity\Activity; use Chill\ActivityBundle\Entity\Activity;
use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\Role\Role;
use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Person;
@ -387,7 +388,7 @@ class ActivityController extends Controller
'chill_activity_activity_delete', 'chill_activity_activity_delete',
array('id' => $id, 'person_id' => $person->getId()))) array('id' => $id, 'person_id' => $person->getId())))
->setMethod('DELETE') ->setMethod('DELETE')
->add('submit', 'submit', array('label' => 'Delete')) ->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm() ->getForm()
; ;
} }

5
Controller/ActivityReasonCategoryController.php
View File

@ -4,6 +4,7 @@ namespace Chill\ActivityBundle\Controller;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Chill\ActivityBundle\Entity\ActivityReasonCategory; use Chill\ActivityBundle\Entity\ActivityReasonCategory;
use Chill\ActivityBundle\Form\ActivityReasonCategoryType; use Chill\ActivityBundle\Form\ActivityReasonCategoryType;
@ -67,7 +68,7 @@ class ActivityReasonCategoryController extends Controller
'method' => 'POST', 'method' => 'POST',
)); ));
$form->add('submit', 'submit', array('label' => 'Create')); $form->add('submit', SubmitType::class, array('label' => 'Create'));
return $form; return $form;
} }
@ -142,7 +143,7 @@ class ActivityReasonCategoryController extends Controller
'method' => 'PUT', 'method' => 'PUT',
)); ));
$form->add('submit', 'submit', array('label' => 'Update')); $form->add('submit', SubmitType::class, array('label' => 'Update'));
return $form; return $form;
} }

5
Controller/ActivityReasonController.php
View File

@ -4,6 +4,7 @@ namespace Chill\ActivityBundle\Controller;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Chill\ActivityBundle\Entity\ActivityReason; use Chill\ActivityBundle\Entity\ActivityReason;
use Chill\ActivityBundle\Form\ActivityReasonType; use Chill\ActivityBundle\Form\ActivityReasonType;
@ -67,7 +68,7 @@ class ActivityReasonController extends Controller
'method' => 'POST', 'method' => 'POST',
)); ));
$form->add('submit', 'submit', array('label' => 'Create')); $form->add('submit', SubmitType::class, array('label' => 'Create'));
return $form; return $form;
} }
@ -142,7 +143,7 @@ class ActivityReasonController extends Controller
'method' => 'PUT', 'method' => 'PUT',
)); ));
$form->add('submit', 'submit', array('label' => 'Update')); $form->add('submit', SubmitType::class, array('label' => 'Update'));
return $form; return $form;
} }

5
Controller/ActivityTypeController.php
View File

@ -4,6 +4,7 @@ namespace Chill\ActivityBundle\Controller;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Chill\ActivityBundle\Entity\ActivityType; use Chill\ActivityBundle\Entity\ActivityType;
use Chill\ActivityBundle\Form\ActivityTypeType; use Chill\ActivityBundle\Form\ActivityTypeType;
@ -67,7 +68,7 @@ class ActivityTypeController extends Controller
'method' => 'POST', 'method' => 'POST',
)); ));
$form->add('submit', 'submit', array('label' => 'Create')); $form->add('submit', SubmitType::class, array('label' => 'Create'));
return $form; return $form;
} }
@ -142,7 +143,7 @@ class ActivityTypeController extends Controller
'method' => 'PUT', 'method' => 'PUT',
)); ));
$form->add('submit', 'submit', array('label' => 'Update')); $form->add('submit', SubmitType::class, array('label' => 'Update'));
return $form; return $form;
} }

6
Form/ActivityReasonCategoryType.php
View File

@ -5,6 +5,8 @@ namespace Chill\ActivityBundle\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Chill\MainBundle\Form\Type\TranslatableStringFormType;
class ActivityReasonCategoryType extends AbstractType class ActivityReasonCategoryType extends AbstractType
{ {
@ -15,8 +17,8 @@ class ActivityReasonCategoryType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
{ {
$builder $builder
->add('name', 'translatable_string') ->add('name', TranslatableStringFormType::class)
->add('active', 'checkbox', array('required' => false)) ->add('active', CheckboxType::class, array('required' => false))
; ;
} }

6
Form/ActivityReasonType.php
View File

@ -5,6 +5,8 @@ namespace Chill\ActivityBundle\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Chill\MainBundle\Form\Type\TranslatableStringFormType;
class ActivityReasonType extends AbstractType class ActivityReasonType extends AbstractType
{ {
@ -15,8 +17,8 @@ class ActivityReasonType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
{ {
$builder $builder
->add('name', 'translatable_string') ->add('name', TranslatableStringFormType::class)
->add('active', 'checkbox', array('required' => false)) ->add('active', CheckboxType::class, array('required' => false))
->add('category', 'translatable_activity_reason_category') ->add('category', 'translatable_activity_reason_category')
; ;
} }

3
Form/ActivityTypeType.php
View File

@ -6,6 +6,7 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Chill\MainBundle\Form\Type\TranslatableStringFormType;
class ActivityTypeType extends AbstractType class ActivityTypeType extends AbstractType
{ {
@ -16,7 +17,7 @@ class ActivityTypeType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
{ {
$builder $builder
->add('name', 'translatable_string') ->add('name', TranslatableStringFormType::class)
->add('active', ChoiceType::class, array( ->add('active', ChoiceType::class, array(
'choices' => array( 'choices' => array(
'Yes' => true, 'Yes' => true,