Skip to content

Commit a7c8588

Browse files
Merge branch '3.4'
* 3.4: [DI] use assertStringEqualsFile when possible [VarDumper] Adapt to php 7.2 changes [DI] Fix using private services in expressions [Form][TwigBridge] Don't render _method in form_rest() for a child form [Form] Static call TimezoneType::getTimezones Removed references for non existent validator constraints Suggest using quotes instead of Yaml::PARSE_KEYS_AS_STRINGS [DI] Fix test [Cache] Handle unserialization failures for Memcached Remove unused prop + added @deprecated Remove unused mocks/vars feature #22317 [Console] Make SymfonyQuestionHelper::ask optional by default (ro0NL) [DoctrineBridge][PropertyInfo] Added support for Doctrine Embeddables [Validator] Fix IbanValidator for ukrainian IBANs Router: allow HEAD method to be defined first [WebProfilerBundle] Display trace and context in the logger profiler Fixing a bug where if a core class was autowired, autowiring tried to autowire optional args as if they were required
2 parents 15d6c03 + 6898e79 commit a7c8588

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Extension/Core/Type/TimezoneType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function loadChoiceList($value = null)
6363
return $this->choiceList;
6464
}
6565

66-
return $this->choiceList = new ArrayChoiceList($this->getTimezones(), $value);
66+
return $this->choiceList = new ArrayChoiceList(self::getTimezones(), $value);
6767
}
6868

6969
/**

Extension/Validator/ValidatorTypeGuesser.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ public function guessTypeForConstraint(Constraint $constraint)
151151
case 'Symfony\Component\Validator\Constraints\Count':
152152
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), Guess::LOW_CONFIDENCE);
153153

154-
case 'Symfony\Component\Validator\Constraints\True':
155-
case 'Symfony\Component\Validator\Constraints\False':
156154
case 'Symfony\Component\Validator\Constraints\IsTrue':
157155
case 'Symfony\Component\Validator\Constraints\IsFalse':
158156
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(), Guess::MEDIUM_CONFIDENCE);
@@ -171,7 +169,6 @@ public function guessRequiredForConstraint(Constraint $constraint)
171169
switch (get_class($constraint)) {
172170
case 'Symfony\Component\Validator\Constraints\NotNull':
173171
case 'Symfony\Component\Validator\Constraints\NotBlank':
174-
case 'Symfony\Component\Validator\Constraints\True':
175172
case 'Symfony\Component\Validator\Constraints\IsTrue':
176173
return new ValueGuess(true, Guess::HIGH_CONFIDENCE);
177174
}

0 commit comments

Comments
 (0)