Revert "minor #28610 [Form] Check for Intl availibility (ro0NL)"
This reverts commit15aa25a1ed
, reversing changes made to3cd411af3e
.
This commit is contained in:
parent
8943f20770
commit
3ac98a6a17
@ -15,7 +15,6 @@ use Symfony\Component\Form\AbstractType;
|
|||||||
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
||||||
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
|
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
|
||||||
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
|
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
|
||||||
use Symfony\Component\Form\Exception\LogicException;
|
|
||||||
use Symfony\Component\Intl\Intl;
|
use Symfony\Component\Intl\Intl;
|
||||||
use Symfony\Component\OptionsResolver\Options;
|
use Symfony\Component\OptionsResolver\Options;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
@ -42,10 +41,6 @@ class CountryType extends AbstractType implements ChoiceLoaderInterface
|
|||||||
{
|
{
|
||||||
$resolver->setDefaults(array(
|
$resolver->setDefaults(array(
|
||||||
'choice_loader' => function (Options $options) {
|
'choice_loader' => function (Options $options) {
|
||||||
if (!class_exists(Intl::class)) {
|
|
||||||
throw new LogicException(sprintf('The "symfony/intl" component is required to use "%s".', static::class));
|
|
||||||
}
|
|
||||||
|
|
||||||
$choiceTranslationLocale = $options['choice_translation_locale'];
|
$choiceTranslationLocale = $options['choice_translation_locale'];
|
||||||
|
|
||||||
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
|
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
|
||||||
|
@ -15,7 +15,6 @@ use Symfony\Component\Form\AbstractType;
|
|||||||
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
||||||
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
|
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
|
||||||
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
|
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
|
||||||
use Symfony\Component\Form\Exception\LogicException;
|
|
||||||
use Symfony\Component\Intl\Intl;
|
use Symfony\Component\Intl\Intl;
|
||||||
use Symfony\Component\OptionsResolver\Options;
|
use Symfony\Component\OptionsResolver\Options;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
@ -42,10 +41,6 @@ class CurrencyType extends AbstractType implements ChoiceLoaderInterface
|
|||||||
{
|
{
|
||||||
$resolver->setDefaults(array(
|
$resolver->setDefaults(array(
|
||||||
'choice_loader' => function (Options $options) {
|
'choice_loader' => function (Options $options) {
|
||||||
if (!class_exists(Intl::class)) {
|
|
||||||
throw new LogicException(sprintf('The "symfony/intl" component is required to use "%s".', static::class));
|
|
||||||
}
|
|
||||||
|
|
||||||
$choiceTranslationLocale = $options['choice_translation_locale'];
|
$choiceTranslationLocale = $options['choice_translation_locale'];
|
||||||
|
|
||||||
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
|
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
|
||||||
|
@ -15,7 +15,6 @@ use Symfony\Component\Form\AbstractType;
|
|||||||
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
||||||
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
|
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
|
||||||
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
|
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
|
||||||
use Symfony\Component\Form\Exception\LogicException;
|
|
||||||
use Symfony\Component\Intl\Intl;
|
use Symfony\Component\Intl\Intl;
|
||||||
use Symfony\Component\OptionsResolver\Options;
|
use Symfony\Component\OptionsResolver\Options;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
@ -42,10 +41,6 @@ class LanguageType extends AbstractType implements ChoiceLoaderInterface
|
|||||||
{
|
{
|
||||||
$resolver->setDefaults(array(
|
$resolver->setDefaults(array(
|
||||||
'choice_loader' => function (Options $options) {
|
'choice_loader' => function (Options $options) {
|
||||||
if (!class_exists(Intl::class)) {
|
|
||||||
throw new LogicException(sprintf('The "symfony/intl" component is required to use "%s".', static::class));
|
|
||||||
}
|
|
||||||
|
|
||||||
$choiceTranslationLocale = $options['choice_translation_locale'];
|
$choiceTranslationLocale = $options['choice_translation_locale'];
|
||||||
|
|
||||||
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
|
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
|
||||||
|
@ -15,7 +15,6 @@ use Symfony\Component\Form\AbstractType;
|
|||||||
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
||||||
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
|
use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
|
||||||
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
|
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
|
||||||
use Symfony\Component\Form\Exception\LogicException;
|
|
||||||
use Symfony\Component\Intl\Intl;
|
use Symfony\Component\Intl\Intl;
|
||||||
use Symfony\Component\OptionsResolver\Options;
|
use Symfony\Component\OptionsResolver\Options;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
@ -42,10 +41,6 @@ class LocaleType extends AbstractType implements ChoiceLoaderInterface
|
|||||||
{
|
{
|
||||||
$resolver->setDefaults(array(
|
$resolver->setDefaults(array(
|
||||||
'choice_loader' => function (Options $options) {
|
'choice_loader' => function (Options $options) {
|
||||||
if (!class_exists(Intl::class)) {
|
|
||||||
throw new LogicException(sprintf('The "symfony/intl" component is required to use "%s".', static::class));
|
|
||||||
}
|
|
||||||
|
|
||||||
$choiceTranslationLocale = $options['choice_translation_locale'];
|
$choiceTranslationLocale = $options['choice_translation_locale'];
|
||||||
|
|
||||||
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
|
return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
|
||||||
|
Reference in New Issue
Block a user