Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5bf779d

Browse files
TobionTobion
committed
Merge branch '2.7'
Conflicts: src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
2 parents 5a60ba4 + 755ea09 commit 5bf779d

File tree

18 files changed

+138
-147
lines changed

18 files changed

+138
-147
lines changed

‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,10 @@ public function configureOptions(OptionsResolver $resolver)
174174

175175
$resolver->setRequired(array('class'));
176176

177-
$resolver->setNormalizers(array(
178-
'em' => $emNormalizer,
179-
));
177+
$resolver->setNormalizer('em', $emNormalizer);
180178

181-
$resolver->setAllowedTypes(array(
182-
'em' => array('null', 'string', 'Doctrine\Common\Persistence\ObjectManager'),
183-
'loader' => array('null', 'Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface'),
184-
));
179+
$resolver->setAllowedTypes('em', array('null', 'string', 'Doctrine\Common\Persistence\ObjectManager'));
180+
$resolver->setAllowedTypes('loader', array('null', 'Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface'));
185181
}
186182

187183
/**

‎src/Symfony/Component/Form/Extension/Core/Type/BaseType.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ public function configureOptions(OptionsResolver $resolver)
123123
'auto_initialize' => true,
124124
));
125125

126-
$resolver->setAllowedTypes(array(
127-
'attr' => 'array',
128-
));
126+
$resolver->setAllowedTypes('attr', 'array');
129127
}
130128
}

‎src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,9 @@ class BirthdayType extends AbstractType
2121
*/
2222
public function configureOptions(OptionsResolver $resolver)
2323
{
24-
$resolver->setDefaults(array(
25-
'years' => range(date('Y') - 120, date('Y')),
26-
));
24+
$resolver->setDefault('years', range(date('Y') - 120, date('Y')));
2725

28-
$resolver->setAllowedTypes(array(
29-
'years' => 'array',
30-
));
26+
$resolver->setAllowedTypes('years', 'array');
3127
}
3228

3329
/**

‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,10 @@ public function configureOptions(OptionsResolver $resolver)
233233
'data_class' => null,
234234
));
235235

236-
$resolver->setNormalizers(array(
237-
'empty_value' => $placeholderNormalizer,
238-
'placeholder' => $placeholderNormalizer,
239-
));
236+
$resolver->setNormalizer('empty_value', $placeholderNormalizer);
237+
$resolver->setNormalizer('placeholder', $placeholderNormalizer);
240238

241-
$resolver->setAllowedTypes(array(
242-
'choice_list' => array('null', 'Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface'),
243-
));
239+
$resolver->setAllowedTypes('choice_list', array('null', 'Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface'));
244240
}
245241

246242
/**

‎src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ public function configureOptions(OptionsResolver $resolver)
9090
'delete_empty' => false,
9191
));
9292

93-
$resolver->setNormalizers(array(
94-
'options' => $optionsNormalizer,
95-
));
93+
$resolver->setNormalizer('options', $optionsNormalizer);
9694
}
9795

9896
/**

‎src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -253,32 +253,30 @@ public function configureOptions(OptionsResolver $resolver)
253253
'seconds',
254254
));
255255

256-
$resolver->setAllowedValues(array(
257-
'input' => array(
258-
'datetime',
259-
'string',
260-
'timestamp',
261-
'array',
262-
),
263-
'date_widget' => array(
264-
null, // inherit default from DateType
265-
'single_text',
266-
'text',
267-
'choice',
268-
),
269-
'time_widget' => array(
270-
null, // inherit default from TimeType
271-
'single_text',
272-
'text',
273-
'choice',
274-
),
275-
// This option will overwrite "date_widget" and "time_widget" options
276-
'widget' => array(
277-
null, // default, don't overwrite options
278-
'single_text',
279-
'text',
280-
'choice',
281-
),
256+
$resolver->setAllowedValues('input', array(
257+
'datetime',
258+
'string',
259+
'timestamp',
260+
'array',
261+
));
262+
$resolver->setAllowedValues('date_widget', array(
263+
null, // inherit default from DateType
264+
'single_text',
265+
'text',
266+
'choice',
267+
));
268+
$resolver->setAllowedValues('time_widget', array(
269+
null, // inherit default from TimeType
270+
'single_text',
271+
'text',
272+
'choice',
273+
));
274+
// This option will overwrite "date_widget" and "time_widget" options
275+
$resolver->setAllowedValues('widget', array(
276+
null, // default, don't overwrite options
277+
'single_text',
278+
'text',
279+
'choice',
282280
));
283281
}
284282

‎src/Symfony/Component/Form/Extension/Core/Type/DateType.php‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -224,31 +224,25 @@ public function configureOptions(OptionsResolver $resolver)
224224
'compound' => $compound,
225225
));
226226

227-
$resolver->setNormalizers(array(
228-
'empty_value' => $placeholderNormalizer,
229-
'placeholder' => $placeholderNormalizer,
227+
$resolver->setNormalizer('empty_value', $placeholderNormalizer);
228+
$resolver->setNormalizer('placeholder', $placeholderNormalizer);
229+
230+
$resolver->setAllowedValues('input', array(
231+
'datetime',
232+
'string',
233+
'timestamp',
234+
'array',
230235
));
231-
232-
$resolver->setAllowedValues(array(
233-
'input' => array(
234-
'datetime',
235-
'string',
236-
'timestamp',
237-
'array',
238-
),
239-
'widget' => array(
240-
'single_text',
241-
'text',
242-
'choice',
243-
),
236+
$resolver->setAllowedValues('widget', array(
237+
'single_text',
238+
'text',
239+
'choice',
244240
));
245241

246-
$resolver->setAllowedTypes(array(
247-
'format' => array('int', 'string'),
248-
'years' => 'array',
249-
'months' => 'array',
250-
'days' => 'array',
251-
));
242+
$resolver->setAllowedTypes('format', array('int', 'string'));
243+
$resolver->setAllowedTypes('years', 'array');
244+
$resolver->setAllowedTypes('months', 'array');
245+
$resolver->setAllowedTypes('days', 'array');
252246
}
253247

254248
/**

‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,7 @@ public function configureOptions(OptionsResolver $resolver)
209209
'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
210210
));
211211

212-
$resolver->setAllowedTypes(array(
213-
'label_attr' => 'array',
214-
));
212+
$resolver->setAllowedTypes('label_attr', 'array');
215213
}
216214

217215
/**

‎src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@ public function configureOptions(OptionsResolver $resolver)
4545
'compound' => false,
4646
));
4747

48-
$resolver->setAllowedValues(array(
49-
'rounding_mode' => array(
50-
IntegerToLocalizedStringTransformer::ROUND_FLOOR,
51-
IntegerToLocalizedStringTransformer::ROUND_DOWN,
52-
IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN,
53-
IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN,
54-
IntegerToLocalizedStringTransformer::ROUND_HALF_UP,
55-
IntegerToLocalizedStringTransformer::ROUND_UP,
56-
IntegerToLocalizedStringTransformer::ROUND_CEILING,
57-
),
48+
$resolver->setAllowedValues('rounding_mode', array(
49+
IntegerToLocalizedStringTransformer::ROUND_FLOOR,
50+
IntegerToLocalizedStringTransformer::ROUND_DOWN,
51+
IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN,
52+
IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN,
53+
IntegerToLocalizedStringTransformer::ROUND_HALF_UP,
54+
IntegerToLocalizedStringTransformer::ROUND_UP,
55+
IntegerToLocalizedStringTransformer::ROUND_CEILING,
5856
));
5957
}
6058

‎src/Symfony/Component/Form/Extension/Core/Type/NumberType.php‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,14 @@ public function configureOptions(OptionsResolver $resolver)
4343
'compound' => false,
4444
));
4545

46-
$resolver->setAllowedValues(array(
47-
'rounding_mode' => array(
48-
NumberToLocalizedStringTransformer::ROUND_FLOOR,
49-
NumberToLocalizedStringTransformer::ROUND_DOWN,
50-
NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
51-
NumberToLocalizedStringTransformer::ROUND_HALF_EVEN,
52-
NumberToLocalizedStringTransformer::ROUND_HALF_UP,
53-
NumberToLocalizedStringTransformer::ROUND_UP,
54-
NumberToLocalizedStringTransformer::ROUND_CEILING,
55-
),
46+
$resolver->setAllowedValues('rounding_mode', array(
47+
NumberToLocalizedStringTransformer::ROUND_FLOOR,
48+
NumberToLocalizedStringTransformer::ROUND_DOWN,
49+
NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
50+
NumberToLocalizedStringTransformer::ROUND_HALF_EVEN,
51+
NumberToLocalizedStringTransformer::ROUND_HALF_UP,
52+
NumberToLocalizedStringTransformer::ROUND_UP,
53+
NumberToLocalizedStringTransformer::ROUND_CEILING,
5654
));
5755
}
5856

0 commit comments

Comments
 (0)