10000 minor #29720 Revert "minor #28610 [Form] Check for Intl availibility … · symfony/symfony@4f56732 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4f56732

Browse files
nicolas-grekasnicolas-grekas
committed
minor #29720 Revert "minor #28610 [Form] Check for Intl availibility (ro0NL)" (chalasr)
This PR was merged into the 4.2 branch. Discussion ---------- Revert "minor #28610 [Form] Check for Intl availibility (ro0NL)" | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Intl is an hard dependency for Form, these checks cannot be reached. Commits ------- 3ac98a6 Revert "minor #28610 [Form] Check for Intl availibility (ro0NL)"
2 parents 791d755 + 3ac98a6 commit 4f56732

File tree

4 files changed

+0
-20
lines changed

4 files changed

+0
-20
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
1616
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
1717
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
18-
use Symfony\Component\Form\Exception\LogicException;
1918
use Symfony\Component\Intl\Intl;
2019
use Symfony\Component\OptionsResolver\Options;
2120
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -42,10 +41,6 @@ public function configureOptions(OptionsResolver $resolver)
4241
{
4342
$resolver->setDefaults(array(
4443
'choice_loader' => function (Options $options) {
45-
if (!class_exists(Intl::class)) {
46-
throw new LogicException(sprintf('The "symfony/intl" component is required to use "%s".', static::class));
47-
}
48-
4944
$choiceTranslationLocale = $options['choice_translation_locale'];
5045

5146
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
1616
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
1717
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
18-
use Symfony\Component\Form\Exception\LogicException;
1918
use Symfony\Component\Intl\Intl;
2019
use Symfony\Component\OptionsResolver\Options;
2120
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -42,10 +41,6 @@ public function configureOptions(OptionsResolver $resolver)
4241
{
4342
$resolver->setDefaults(array(
4443
'choice_loader' => function (Options $options) {
45-
if (!class_exists(Intl::class)) {
46-
throw new LogicException(sprintf('The "symfony/intl" component is required to use "%s".', static::class));
47-
}
48-
4944
$choiceTranslationLocale = $options['choice_translation_locale'];
5045

5146
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
1616
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
1717
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
18-
use Symfony\Component\Form\Exception\LogicException;
1918
use Symfony\Component\Intl\Intl;
2019
use Symfony\Component\OptionsResolver\Options;
2120
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -42,10 +41,6 @@ public function configureOptions(OptionsResolver $resolver)
4241
{
4342
$resolver->setDefaults(array(
4443
'choice_loader' => function (Options $options) {
45-
if (!class_exists(Intl::class)) {
46-
throw new LogicException(sprintf('The "symfony/intl" component is required to use "%s".', static::class));
47-
}
48-
4944
$choiceTranslationLocale = $options['choice_translation_locale'];
5045

5146
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
1616
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
1717
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
18-
use Symfony\Component\Form\Exception\LogicException;
1918
use Symfony\Component\Intl\Intl;
2019
use Symfony\Component\OptionsResolver\Options;
2120
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -42,10 +41,6 @@ public function configureOptions(OptionsResolver $resolver)
4241
{
4342
$resolver->setDefaults(array(
4443
'choice_loader' => function (Options $options) {
45-
if (!class_exists(Intl::class)) {
46-
throw new LogicException(sprintf('The "symfony/intl" component is required to use "%s".', static::class));
47-
}
48-
4944
$choiceTranslationLocale = $options['choice_translation_locale'];
5045

5146
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {

0 commit comments

Comments
 (0)
0