Fixed Form deprecations

Opifer · Jan 29, 2016 · 21970f3 · 21970f3
1 parent 88ec657
commit 21970f3
Show file tree

Hide file tree

Showing 63 changed files with 256 additions and 276 deletions.
diff --git a/Block/BlockManager.php b/Block/BlockManager.php
@@ -3,10 +3,10 @@
 namespace Opifer\ContentBundle\Block;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\EntityManagerInterface;
 use Gedmo\SoftDeleteable\SoftDeleteableListener;
 use Opifer\CmsBundle\EventListener\LoggableListener;
 use Opifer\ContentBundle\Block\Service\BlockServiceInterface;
-use Doctrine\ORM\EntityManagerInterface;
 use Opifer\ContentBundle\Block\Tool\ContentTool;
 use Opifer\ContentBundle\Block\Tool\ToolsetMemberInterface;
 use Opifer\ContentBundle\Entity\PointerBlock;

diff --git a/Block/RevertVisitor.php b/Block/RevertVisitor.php
@@ -2,8 +2,8 @@
 
 namespace Opifer\ContentBundle\Block;
 
-use Opifer\ContentBundle\Model\BlockInterface;
 use Opifer\ContentBundle\Block\BlockManager;
+use Opifer\ContentBundle\Model\BlockInterface;
 
 /**
  * Class RevertVisitor

diff --git a/Block/Service/AbstractBlockService.php b/Block/Service/AbstractBlockService.php
@@ -4,14 +4,14 @@
 
 use Opifer\ContentBundle\Entity\Block;
 use Opifer\ContentBundle\Environment\Environment;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Opifer\ContentBundle\Model\BlockInterface;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\HttpFoundation\Response;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Class AbstractBlockService

diff --git a/Block/Service/BlockServiceInterface.php b/Block/Service/BlockServiceInterface.php
@@ -3,9 +3,9 @@
 namespace Opifer\ContentBundle\Block\Service;
 
 use Opifer\ContentBundle\Model\BlockInterface;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Interface BlockServiceInterface

diff --git a/Block/Service/ButtonBlockService.php b/Block/Service/ButtonBlockService.php
@@ -6,6 +6,9 @@
 use Opifer\ContentBundle\Block\Tool\ToolsetMemberInterface;
 use Opifer\ContentBundle\Entity\ButtonBlock;
 use Opifer\ContentBundle\Model\BlockInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -20,23 +23,19 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
     {
         parent::buildManageForm($builder, $options);
 
-        $propertiesForm = $builder->create('properties', 'form')
-            ->add('url', 'text', ['label' => 'label.url'])
-            ->add(
-                'target',
-                'choice',
-                [
-                    'label' => 'label.target',
-                    'choices' => ['_blank' => '_blank', '_self' => '_self'],
-                    'required' => false,
-                ]
-            )
-            ->add('id', 'text', ['attr' => ['help_text' => 'help.html_id']])
-            ->add('extra_classes', 'text', ['attr' => ['help_text' => 'help.extra_classes']]);
+        $propertiesForm = $builder->create('properties', FormType::class)
+            ->add('url', TextType::class, ['label' => 'label.url'])
+            ->add('target', ChoiceType::class, [
+                'label' => 'label.target',
+                'choices' => ['_blank' => '_blank', '_self' => '_self'],
+                'required' => false,
+            ])
+            ->add('id', TextType::class, ['attr' => ['help_text' => 'help.html_id']])
+            ->add('extra_classes', TextType::class, ['attr' => ['help_text' => 'help.extra_classes']]);
 
 
         if ($this->config['styles']) {
-            $propertiesForm->add('styles', 'choice', [
+            $propertiesForm->add('styles', ChoiceType::class, [
                 'label' => 'label.styling',
                 'choices'  => array_combine($this->config['styles'], $this->config['styles']),
                 'required' => false,
@@ -46,8 +45,8 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder->add(
-            $builder->create('default', 'form', ['inherit_data' => true])
-                ->add('value', 'text', ['label' => 'label.label'])
+            $builder->create('default', FormType::class, ['inherit_data' => true])
+                ->add('value', TextType::class, ['label' => 'label.label'])
         )->add(
             $propertiesForm
         );
@@ -81,6 +80,4 @@ public function getTool()
 
         return $tool;
     }
-
-
-}
+}
diff --git a/Block/Service/CarouselSlideBlockService.php b/Block/Service/CarouselSlideBlockService.php
@@ -2,11 +2,14 @@
 
 namespace Opifer\ContentBundle\Block\Service;
 
+use Opifer\CmsBundle\Form\Type\CKEditorType;
 use Opifer\ContentBundle\Block\Tool\ContentTool;
 use Opifer\ContentBundle\Block\Tool\ToolsetMemberInterface;
 use Opifer\ContentBundle\Entity\CarouselSlideBlock;
 use Opifer\ContentBundle\Model\BlockInterface;
 use Opifer\MediaBundle\Form\Type\MediaPickerType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -21,9 +24,9 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
     {
         parent::buildManageForm($builder, $options);
 
-        $propertiesForm = $builder->create('properties', 'form')
-            ->add('id', 'text', ['attr' => ['help_text' => 'help.html_id']])
-            ->add('extra_classes', 'text', ['attr' => ['help_text' => 'help.extra_classes']]);
+        $propertiesForm = $builder->create('properties', FormType::class)
+            ->add('id', TextType::class, ['attr' => ['help_text' => 'help.html_id']])
+            ->add('extra_classes', TextType::class, ['attr' => ['help_text' => 'help.extra_classes']]);
 
 
         if ($this->config['styles']) {
@@ -40,12 +43,12 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder->add(
-            $builder->create('default', 'form', ['inherit_data' => true])
+            $builder->create('default', FormType::class, ['inherit_data' => true])
                 ->add('media', MediaPickerType::class, [
                     'required'  => false,
                     'multiple' => false,
                 ])
-                ->add('value', 'ckeditor', ['label' => 'label.rich_text', 'attr' => ['label_col' => 12, 'widget_col' => 12]])
+                ->add('value', CKEditorType::class, ['label' => 'label.rich_text', 'attr' => ['label_col' => 12, 'widget_col' => 12]])
         )->add(
             $propertiesForm
         );

diff --git a/Block/Service/ColumnBlockService.php b/Block/Service/ColumnBlockService.php
@@ -4,13 +4,18 @@
 
 use Opifer\ContentBundle\Block\Tool\ColumnTool;
 use Opifer\ContentBundle\Block\Tool\ToolsetMemberInterface;
+use Opifer\ContentBundle\Entity\ColumnBlock;
+use Opifer\ContentBundle\Form\Type\GutterCollectionType;
+use Opifer\ContentBundle\Form\Type\SpanCollectionType;
 use Opifer\ContentBundle\Model\BlockInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\HttpFoundation\Response;
-use Opifer\ContentBundle\Entity\ColumnBlock;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormEvent;
 
 /**
  * Class ColumnBlockService
@@ -59,9 +64,9 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
     {
         parent::buildManageForm($builder, $options);
 
-        $propertiesForm = $builder->create('properties', 'form')
-            ->add('id', 'text', ['attr' => ['help_text' => 'help.html_id']])
-            ->add('extra_classes', 'text', ['attr' => ['help_text' => 'help.extra_classes']]);
+        $propertiesForm = $builder->create('properties', FormType::class)
+            ->add('id', TextType::class, ['attr' => ['help_text' => 'help.html_id']])
+            ->add('extra_classes', TextType::class, ['attr' => ['help_text' => 'help.extra_classes']]);
 
         $builder->add($propertiesForm);
 
@@ -82,7 +87,7 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
             }
 
             $styles = ['row-space-top-2', 'row-space-top-4', 'row-space-top-8', 'row-space-2', 'row-space-4', 'row-space-8'];
-            $form->get('properties')->add('styles', 'choice', [
+            $form->get('properties')->add('styles', ChoiceType::class, [
                 'label' => 'label.styling',
                 'choices'  => $styles,
                 'required' => false,
@@ -92,8 +97,8 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
             ]);
 
 
-            $form->get('properties')->add('spans', 'span_collection', ['column_count' => $block->getColumnCount(), 'label' => 'label.spans', 'attr' => ['help_text' => 'help.column_spans']]);
-            $form->get('properties')->add('gutters', 'gutter_collection', ['column_count' => $block->getColumnCount(), 'label' => 'label.gutters', 'attr' => ['help_text' => 'help.column_gutters']]);
+            $form->get('properties')->add('spans', SpanCollectionType::class, ['column_count' => $block->getColumnCount(), 'label' => 'label.spans', 'attr' => ['help_text' => 'help.column_spans']]);
+            $form->get('properties')->add('gutters', GutterCollectionType::class, ['column_count' => $block->getColumnCount(), 'label' => 'label.gutters', 'attr' => ['help_text' => 'help.column_gutters']]);
 
         });
     }

diff --git a/Block/Service/ContainerBlockService.php b/Block/Service/ContainerBlockService.php
@@ -5,9 +5,12 @@
 use Opifer\ContentBundle\Block\Tool\ContainerTool;
 use Opifer\ContentBundle\Block\Tool\ToolsetMemberInterface;
 use Opifer\ContentBundle\Entity\ContainerBlock;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 
 /**
  * Class ColumnBlockService
@@ -25,9 +28,9 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
         parent::buildManageForm($builder, $options);
 
 
-        $propertiesForm = $builder->create('properties', 'form')
-            ->add('id', 'text', ['attr' => ['help_text' => 'help.html_id']])
-            ->add('extra_classes', 'text', ['attr' => ['help_text' => 'help.extra_classes']]);
+        $propertiesForm = $builder->create('properties', FormType::class)
+            ->add('id', TextType::class, ['attr' => ['help_text' => 'help.html_id']])
+            ->add('extra_classes', TextType::class, ['attr' => ['help_text' => 'help.extra_classes']]);
 
         $builder->add($propertiesForm);
 
@@ -36,7 +39,7 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
 
             $form = $event->getForm();
 
-            $form->get('properties')->add('styles', 'choice', [
+            $form->get('properties')->add('styles', ChoiceType::class, [
                 'label' => 'label.styling',
                 'choices'  => $this->config['styles'],
                 'required' => false,
@@ -45,16 +48,12 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
                 'attr' => ['help_text' => 'help.html_styles'],
             ]);
 
-            $form->get('properties')->add(
-                'container_size',
-                'choice',
-                [
-                    'label' => 'label.container_sizing',
-                    'choices' => ['fluid' => 'label.container_fluid', '' => 'label.container_fixed', 'smooth' => 'label.container_smooth'],
-                    'required' => true,
-                    'attr' => ['help_text' => 'help.container_sizing'],
-                ]
-            );
+            $form->get('properties')->add('container_size', ChoiceType::class, [
+                'label' => 'label.container_sizing',
+                'choices' => ['fluid' => 'label.container_fluid', '' => 'label.container_fixed', 'smooth' => 'label.container_smooth'],
+                'required' => true,
+                'attr' => ['help_text' => 'help.container_sizing'],
+            ]);
         });
     }
 

diff --git a/Block/Service/HtmlBlockService.php b/Block/Service/HtmlBlockService.php
@@ -2,11 +2,14 @@
 
 namespace Opifer\ContentBundle\Block\Service;
 
+use Opifer\CmsBundle\Form\Type\CKEditorType;
 use Opifer\ContentBundle\Block\Tool\ContentTool;
 use Opifer\ContentBundle\Block\Tool\ToolsetMemberInterface;
 use Opifer\ContentBundle\Entity\HtmlBlock;
-use Symfony\Component\Form\FormBuilderInterface;
 use Opifer\ContentBundle\Model\BlockInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * HTML Block Service
@@ -22,12 +25,12 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
 
         // Default panel
         $builder->add(
-            $builder->create('default', 'form', ['inherit_data' => true])
-                    ->add('value', 'ckeditor', ['label' => 'label.rich_text', 'attr' => ['label_col' => 12, 'widget_col' => 12]])
+            $builder->create('default', FormType::class, ['inherit_data' => true])
+                ->add('value', CKEditorType::class, ['label' => 'label.rich_text', 'attr' => ['label_col' => 12, 'widget_col' => 12]])
         )->add(
-            $builder->create('properties', 'form')
-                ->add('id', 'text', ['attr' => ['help_text' => 'help.html_id']])
-                ->add('extra_classes', 'text', ['attr' => ['help_text' => 'help.extra_classes']])
+            $builder->create('properties', FormType::class)
+                ->add('id', TextType::class, ['attr' => ['help_text' => 'help.html_id']])
+                ->add('extra_classes', TextType::class, ['attr' => ['help_text' => 'help.extra_classes']])
         );
     }
 

diff --git a/Block/Service/ImageBlockService.php b/Block/Service/ImageBlockService.php
@@ -57,7 +57,7 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
                     'attr' => array('label_col' => 12, 'widget_col' => 12),
                 ])
         )->add(
-            $builder->create('properties', 'form')
+            $builder->create('properties', FormType::class)
                 ->add('id', TextType::class, ['attr' => ['help_text' => 'help.html_id']])
                 ->add('extra_classes', TextType::class, ['attr' => ['help_text' => 'help.extra_classes']])
                 ->add('filter', ChoiceType::class, [

diff --git a/Block/Service/JumbotronBlockService.php b/Block/Service/JumbotronBlockService.php
@@ -2,11 +2,15 @@
 
 namespace Opifer\ContentBundle\Block\Service;
 
+use Opifer\CmsBundle\Form\Type\CKEditorType;
 use Opifer\ContentBundle\Block\Tool\ContentTool;
 use Opifer\ContentBundle\Block\Tool\ToolsetMemberInterface;
 use Opifer\ContentBundle\Entity\JumbotronBlock;
 use Opifer\ContentBundle\Model\BlockInterface;
 use Opifer\MediaBundle\Form\Type\MediaPickerType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -23,15 +27,15 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
     {
         parent::buildManageForm($builder, $options);
 
-        $propertiesForm = $builder->create('properties', 'form')
-            ->add('id', 'text', ['attr' => ['help_text' => 'help.html_id']])
-            ->add('extra_classes', 'text', ['attr' => ['help_text' => 'help.extra_classes']]);
+        $propertiesForm = $builder->create('properties', FormType::class)
+            ->add('id', TextType::class, ['attr' => ['help_text' => 'help.html_id']])
+            ->add('extra_classes', TextType::class, ['attr' => ['help_text' => 'help.extra_classes']]);
 
 
         if ($this->config['styles']) {
 
             $propertiesForm
-                ->add('styles', 'choice', [
+                ->add('styles', ChoiceType::class, [
                     'label' => 'label.styling',
                     'choices'  => $this->config['styles'],
                     'required' => false,
@@ -42,13 +46,13 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder->add(
-            $builder->create('default', 'form', ['inherit_data' => true])
+            $builder->create('default', FormType::class, ['inherit_data' => true])
                 ->add('media', MediaPickerType::class, [
                     'required'  => false,
                     'multiple' => false,
                     'attr' => array('label_col' => 12, 'widget_col' => 12),
                 ])
-                ->add('value', 'ckeditor', ['label' => 'label.rich_text', 'attr' => ['label_col' => 12, 'widget_col' => 12]])
+                ->add('value', CKEditorType::class, ['label' => 'label.rich_text', 'attr' => ['label_col' => 12, 'widget_col' => 12]])
         )->add(
             $propertiesForm
         );