10000 [OptionsResolver] Renamed filters to normalizers · Lumbendil/symfony@3075fa6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3075fa6

Browse files
webmozartwebmozart
committed
[OptionsResolver] Renamed filters to normalizers
1 parent 9f157a1 commit 3075fa6

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
114114
return $choiceListCache[$hash];
115115
};
116116

117-
$emFilter = function (Options $options, $em) use ($registry) {
117+
$emNormalizer = function (Options $options, $em) use ($registry) {
118118
/* @var ManagerRegistry $registry */
119119
if (null !== $em) {
120120
return $registry->getManager($em);
@@ -134,8 +134,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
134134
'group_by' => null,
135135
));
136136

137-
$resolver->setFilters(array(
138-
'em' => $emFilter,
137+
$resolver->setNormalizers(array(
138+
'em' => $emNormalizer,
139139
));
140140
}
141141

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
157157
return $options['required'] ? null : '';
158158
};
159159

160-
$emptyValueFilter = function (Options $options, $emptyValue) {
160+
$emptyValueNormalizer = function (Options $options, $emptyValue) {
161161
if ($options['multiple'] || $options['expanded']) {
162162
// never use an empty value for these cases
163163
return null;
@@ -186,8 +186,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
186186
'compound' => $compound,
187187
));
188188

189-
$resolver->setFilters(array(
190-
'empty_value' => $emptyValueFilter,
189+
$resolver->setNormalizers(array(
190+
'empty_value' => $emptyValueNormalizer,
191191
));
192192

193193
$resolver->setAllowedTypes(array(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function finishView(FormViewInterface $view, FormInterface $form, array $
7474
*/
7575
public function setDefaultOptions(OptionsResolverInterface $resolver)
7676
{
77-
$optionsFilter = function (Options $options, $value) {
77+
$optionsNormalizer = function (Options $options, $value) {
7878
$value['block_name'] = 'entry';
7979

8080
return $value;
@@ -89,8 +89,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
8989
'options' => array(),
9090
));
9191

92-
$resolver->setFilters(array(
93-
'options' => $optionsFilter,
92+
$resolver->setNormalizers(array(
93+
'options' => $optionsNormalizer,
9494
));
9595
}
9696

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
164164
return $options['required'] ? null : '';
165165
};
166166

167-
$emptyValueFilter = function (Options $options, $emptyValue) use ($emptyValueDefault) {
167+
$emptyValueNormalizer = function (Options $options, $emptyValue) use ($emptyValueDefault) {
168168
if (is_array($emptyValue)) {
169169
$default = $emptyValueDefault($options);
170170

@@ -216,8 +216,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
216216
'compound' => $compound,
217217
));
218218

219-
$resolver->setFilters(array(
220-
'empty_value' => $emptyValueFilter,
219+
$resolver->setNormalizers(array(
220+
'empty_value' => $emptyValueNormalizer,
221221
));
222222

223223
$resolver->setAllowedValues(array(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
134134
return $options['required'] ? null : '';
135135
};
136136

137-
$emptyValueFilter = function (Options $options, $emptyValue) use ($emptyValueDefault) {
137+
$emptyValueNormalizer = function (Options $options, $emptyValue) use ($emptyValueDefault) {
138138
if (is_array($emptyValue)) {
139139
$default = $emptyValueDefault($options);
140140

@@ -186,8 +186,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
186186
'compound' => $compound,
187187
));
188188

189-
$resolver->setFilters(array(
190-
'empty_value' => $emptyValueFilter,
189+
$resolver->setNormalizers(array(
190+
'empty_value' => $emptyValueNormalizer,
191191
));
192192

193193
$resolver->setAllowedValues(array(

‎src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
5959
};
6060

6161
// Make sure that validation groups end up as null, closure or array
62-
$validationGroupsFilter = function (Options $options, $groups) {
62+
$validationGroupsNormalizer = function (Options $options, $groups) {
6363
if (empty($groups)) {
6464
return null;
6565
}
@@ -72,7 +72,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
7272
};
7373

7474
// Constraint should always be converted to an array
75-
$constraintsFilter = function (Options $options, $constraints) {
75+
$constraintsNormalizer = function (Options $options, $constraints) {
7676
return is_object($constraints) ? array($constraints) : (array) $constraints;
7777
};
7878

@@ -88,9 +88,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
8888
'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
8989
));
9090

91-
$resolver->setFilters(array(
92-
'validation_groups' => $validationGroupsFilter,
93-
'constraints' => $constraintsFilter,
91+
$resolver->setNormalizers(array(
92+
'validation_groups' => $validationGroupsNormalizer,
93+
'constraints' => $constraintsNormalizer,
9494
));
9595
}
9696

‎src/Symfony/Component/OptionsResolver/OptionsResolver.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ class OptionsResolver implements OptionsResolverInterface
5454
private $allowedTypes = array();
5555

5656
/**
57-
* A list of filters transforming each resolved options.
57+
* A list of normalizers transforming each resolved options.
5858
* @var array
5959
*/
60-
private $filters = array();
60+
private $normalizers = array();
6161

6262
/**
6363
* Creates a new instance.
@@ -190,11 +190,11 @@ public function addAllowedTypes(array $allowedTypes)
190190
/**
191191
* {@inheritdoc}
192192
*/
193-
public function setFilters(array $filters)
193+
public function setNormalizers(array $normalizers)
194194
{
195-
$this->validateOptionsExistence($filters);
195+
$this->validateOptionsExistence($normalizers);
196196

197-
$this->filters = array_replace($this->filters, $filters);
197+
$this->normalizers = array_replace($this->normalizers, $normalizers);
198198

199199
return $this;
200200
}
@@ -232,7 +232,7 @@ public function resolve(array $options = array())
232232
}
233233

234234
// Apply filters
235-
foreach ($this->filters as $option => $filter) {
235+
foreach ($this->normalizers as $option => $filter) {
236236
$combinedOptions->overload($option, $filter);
237237
}
238238

‎src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ public function setAllowedTypes(array $allowedTypes);
148148
public function addAllowedTypes(array $allowedTypes);
149149

150150
/**
151-
* Sets filters that are applied on resolved options.
151+
* Sets normalizers that are applied on resolved options.
152152
*
153-
* The filters should be closures with the following signature:
153+
* The normalizers should be closures with the following signature:
154154
*
155155
* <code>
156156
* function (Options $options, $value)
@@ -159,13 +159,13 @@ public function addAllowedTypes(array $allowedTypes);
159159
* The second parameter passed to the closure is the value of
160160
* the option.
161161
*
162-
* The closure should return the filtered value.
162+
* The closure should return the normalized value.
163163
*
164-
* @param array $filters An array of filter closures.
164+
* @param array $normalizers An array of closures.
165165
*
166166
* @return OptionsResolverInterface The resolver instance.
167167
*/
168-
public function setFilters(array $filters);
168+
public function setNormalizers(array $normalizers);
169169

170170
/**
171171
* Returns whether an option is known.

‎src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,13 +538,13 @@ public function testNotRequiredIfRequiredAndDefaultValue()
538538
$this->assertFalse($this->resolver->isRequired('foo'));
539539
}
540540

541-
public function testFiltersTransformFinalOptions()
541+
public function testNormalizersTransformFinalOptions()
542542
{
543543
$this->resolver->setDefaults(array(
544544
'foo' => 'bar',
545545
'bam' => 'baz',
546546
));
547-
$this->resolver->setFilters(array(
547+
$this->resolver->setNormalizers(array(
548548
'foo' => function (Options $options, $value) {
549549
return $options['bam'] . '[' . $value . ']';
550550
},

0 commit comments

Comments
 (0)
0