Skip to content

Commit bab44de

Browse files
hlecorchehlecorche
committed
[Break BC] JqueryDatePicker is renamed JqueryDatePickerType
Add Symfony 3 support
1 parent 54f3a52 commit bab44de

11 files changed

Lines changed: 41 additions & 31 deletions

‎Form/Type/JqueryAutocompleteEntityAjaxType.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
1616
use Symfony\Bundle\FrameworkBundle\Routing\Router;
1717
use Symfony\Component\Form\AbstractType;
18+
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
19+
use Symfony\Component\Form\Extension\Core\Type\TextType;
1820
use Symfony\Component\Form\FormBuilderInterface;
1921
use Symfony\Component\Form\FormInterface;
2022
use Symfony\Component\Form\FormView;
@@ -50,8 +52,8 @@ public function __construct(ManagerRegistry $registry, Router $router)
5052

5153
public function buildForm(FormBuilderInterface $builder, array $options)
5254
{
53-
$builder->add('key', 'hidden');
54-
$builder->add('text', 'text');
55+
$builder->add('key', HiddenType::class);
56+
$builder->add('text', TextType::class);
5557

5658
if ($options['input'] == 'key') {
5759
$builder->addModelTransformer(
@@ -86,7 +88,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
8688

8789
public function getParent()
8890
{
89-
return 'form';
91+
return 'Symfony\Component\Form\Extension\Core\Type\FormType';
9092
}
9193

9294
public function configureOptions(OptionsResolver $resolver)
@@ -102,7 +104,7 @@ public function configureOptions(OptionsResolver $resolver)
102104
$this->addCommonDefaultOptions($resolver, $this->registry, $this->router);
103105
}
104106

105-
public function getName()
107+
public function getBlockPrefix()
106108
{
107109
return 'ecommit_javascript_jqueryautocompleteentityajax';
108110
}

Form/Type/JqueryDatePicker.php renamed to Form/Type/JqueryDatePickerType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use Symfony\Component\Form\ReversedTransformer;
2323
use Symfony\Component\OptionsResolver\OptionsResolver;
2424

25-
class JqueryDatePicker extends AbstractType
25+
class JqueryDatePickerType extends AbstractType
2626
{
2727
public function buildForm(FormBuilderInterface $builder, array $options)
2828
{
@@ -84,7 +84,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
8484

8585
public function getParent()
8686
{
87-
return 'form';
87+
return 'Symfony\Component\Form\Extension\Core\Type\FormType';
8888
}
8989

9090
public function configureOptions(OptionsResolver $resolver)
@@ -111,7 +111,7 @@ public function configureOptions(OptionsResolver $resolver)
111111
$resolver->setAllowedValues('input', array('datetime', 'string', 'timestamp', 'array'));
112112
}
113113

114-
public function getName()
114+
public function getBlockPrefix()
115115
{
116116
return 'ecommit_javascript_jquerydatepicker';
117117
}

‎Form/Type/RecaptchaType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ public function configureOptions(OptionsResolver $resolver)
8383

8484
public function getParent()
8585
{
86-
return 'form';
86+
return 'Symfony\Component\Form\Extension\Core\Type\FormType';
8787
}
8888

89-
public function getName()
89+
public function getBlockPrefix()
9090
{
9191
return 'ecommit_javascript_recaptcha';
9292
}

‎Form/Type/Select2/Select2ChoiceType.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,22 @@
1010

1111
namespace Ecommit\JavascriptBundle\Form\Type\Select2;
1212

13+
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
14+
1315
class Select2ChoiceType extends AbstractSelect2Type
1416
{
1517
/**
1618
* {@inheritdoc}
1719
*/
1820
public function getParent()
1921
{
20-
return 'choice';
22+
return ChoiceType::class;
2123
}
2224

2325
/**
2426
* {@inheritdoc}
2527
*/
26-
public function getName()
28+
public function getBlockPrefix()
2729
{
2830
return 'ecommit_javascript_select2choice';
2931
}

‎Form/Type/Select2/Select2CountryType.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,22 @@
1010

1111
namespace Ecommit\JavascriptBundle\Form\Type\Select2;
1212

13+
use Symfony\Component\Form\Extension\Core\Type\CountryType;
14+
1315
class Select2CountryType extends AbstractSelect2Type
1416
{
1517
/**
1618
* {@inheritdoc}
1719
*/
1820
public function getParent()
1921
{
20-
return 'country';
22+
return CountryType::class;
2123
}
2224

2325
/**
2426
* {@inheritdoc}
2527
*/
26-
public function getName()
28+
public function getBlockPrefix()
2729
{
2830
return 'ecommit_javascript_select2country';
2931
}

‎Form/Type/Select2/Select2EntityAjaxType.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
1717
use Ecommit\JavascriptBundle\Form\Type\EntityNormalizerTrait;
1818
use Symfony\Bundle\FrameworkBundle\Routing\Router;
19+
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
1920
use Symfony\Component\Form\FormBuilderInterface;
2021
use Symfony\Component\Form\FormInterface;
2122
use Symfony\Component\Form\FormView;
@@ -175,13 +176,13 @@ public function configureOptions(OptionsResolver $resolver)
175176
*/
176177
public function getParent()
177178
{
178-
return 'hidden';
179+
return HiddenType::class;
179180
}
180181

181182
/**
182183
* {@inheritdoc}
183184
*/
184-
public function getName()
185+
public function getBlockPrefix()
185186
{
186187
return 'ecommit_javascript_select2entityajax';
187188
}

‎Form/Type/Select2/Select2EntityType.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,22 @@
1010

1111
namespace Ecommit\JavascriptBundle\Form\Type\Select2;
1212

13+
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
14+
1315
class Select2EntityType extends AbstractSelect2Type
1416
{
1517
/**
1618
* {@inheritdoc}
1719
*/
1820
public function getParent()
1921
{
20-
return 'entity';
22+
return EntityType::class;
2123
}
2224

2325
/**
2426
* {@inheritdoc}
2527
*/
26-
public function getName()
28+
public function getBlockPrefix()
2729
{
2830
return 'ecommit_javascript_select2entity';
2931
}

‎Form/Type/TinyMCEType.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Ecommit\JavascriptBundle\Form\Type;
1313

1414
use Symfony\Component\Form\AbstractType;
15+
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
1516
use Symfony\Component\Form\FormInterface;
1617
use Symfony\Component\Form\FormView;
1718
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -35,7 +36,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
3536

3637
public function getParent()
3738
{
38-
return 'textarea';
39+
return TextareaType::class;
3940
}
4041

4142
public function configureOptions(OptionsResolver $resolver)
@@ -56,7 +57,7 @@ public function configureOptions(OptionsResolver $resolver)
5657
);
5758
}
5859

59-
public function getName()
60+
public function getBlockPrefix()
6061
{
6162
return 'ecommit_javascript_tinymce';
6263
}

‎Form/Type/TokenInputEntitiesAjaxType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
9797

9898
public function getParent()
9999
{
100-
return 'form';
100+
return 'Symfony\Component\Form\Extension\Core\Type\FormType';
101101
}
102102

103103
public function configureOptions(OptionsResolver $resolver)
@@ -121,7 +121,7 @@ public function configureOptions(OptionsResolver $resolver)
121121
$this->addCommonDefaultOptions($resolver, $this->registry, $this->router);
122122
}
123123

124-
public function getName()
124+
public function getBlockPrefix()
125125
{
126126
return 'ecommit_javascript_tokeninputentitiesajax';
127127
}

‎Resources/config/services.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
</service>
1313

1414
<service id="ecommit_javascript.form.type.jquerydatepicker" class="Ecommit\JavascriptBundle\Form\Type\JqueryDatePicker">
15-
<tag name="form.type" alias="ecommit_javascript_jquerydatepicker" />
15+
<tag name="form.type" />
1616
</service>
1717

1818
<service id="ecommit_javascript.form.type.jqueryautocompleteentityajax" class="Ecommit\JavascriptBundle\Form\Type\JqueryAutocompleteEntityAjaxType">
1919
<argument type="service" id="doctrine" on-invalid="null" />
2020
<argument type="service" id="router" />
21-
<tag name="form.type" alias="ecommit_javascript_jqueryautocompleteentityajax" />
21+
<tag name="form.type" />
2222
</service>
2323

2424
<service id="ecommit_javascript.form.type.tokeninputentitiesajax" class="Ecommit\JavascriptBundle\Form\Type\TokenInputEntitiesAjaxType">
2525
<argument type="service" id="doctrine" on-invalid="null" />
2626
<argument type="service" id="router" />
27-
<tag name="form.type" alias="ecommit_javascript_tokeninputentitiesajax" />
27+
<tag name="form.type" />
2828
</service>
2929

3030
<service id="ecommit_javascript.form.type.tiny_mce" class="Ecommit\JavascriptBundle\Form\Type\TinyMCEType">
31-
<tag name="form.type" alias="ecommit_javascript_tinymce" />
31+
<tag name="form.type" />
3232
</service>
3333

3434
<service id="ecommit_javascript.form.type.recaptcha" class="Ecommit\JavascriptBundle\Form\Type\RecaptchaType">
3535
<argument>%ecommit_javascript.recaptcha.public_key%</argument>
3636
<argument>%ecommit_javascript.recaptcha.secure%</argument>
3737
<argument>%ecommit_javascript.recaptcha.enable%</argument>
3838
<argument>%locale%</argument>
39-
<tag name="form.type" alias="ecommit_javascript_recaptcha" />
39+
<tag name="form.type" />
4040
<deprecated>The "%service_id%" service is deprecated since version 2.2.</deprecated>
4141
</service>
4242

@@ -51,19 +51,19 @@
5151
<service id="ecommit_javascript.form.type.select2entityajax" class="Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityAjaxType">
5252
<argument type="service" id="doctrine" on-invalid="null" />
5353
<argument type="service" id="router" />
54-
<tag name="form.type" alias="ecommit_javascript_select2entityajax" />
54+
<tag name="form.type" />
5555
</service>
5656

5757
<service id="ecommit_javascript.form.type.select2entity" class="Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityType">
58-
<tag name="form.type" alias="ecommit_javascript_select2entity" />
58+
<tag name="form.type" />
5959
</service>
6060

6161
<service id="ecommit_javascript.form.type.select2choice" class="Ecommit\JavascriptBundle\Form\Type\Select2\Select2ChoiceType">
62-
<tag name="form.type" alias="ecommit_javascript_select2choice" />
62+
<tag name="form.type" />
6363
</service>
6464

6565
<service id="ecommit_javascript.form.type.select2country" class="Ecommit\JavascriptBundle\Form\Type\Select2\Select2CountryType">
66-
<tag name="form.type" alias="ecommit_javascript_select2country" />
66+
<tag name="form.type" />
6767
</service>
6868

6969
<service id="ecommit_javascript.overlay.jquery_tools_overlay" class="Ecommit\JavascriptBundle\Overlay\JQueryToolsOverlay">

0 commit comments

Comments
 (0)