Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set default_region as selected country in widget country choice #119

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Set default_region as selected country in widget country choice #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1e2aff
Set default_region as selected country in widget country choice
m3doune Jan 30, 2017
bfe4df1
Added Tests
m3doune Jan 21, 2018
6b54ac0
Added data provider and fixed travis error
m3doune Jan 21, 2018
8e0b785
Added data provider and fixed travis error
m3doune Jan 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Form/Type/PhoneNumberType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
$countryOptions['required'] = true;
$countryOptions['choices'] = $countryChoices;
$countryOptions['preferred_choices'] = $options['preferred_country_choices'];
if($options['default_region']!= PhoneNumberUtil::UNKNOWN_REGION) {
$countryOptions['data'] = $options['default_region'];
}


$builder
->add('country', $choiceType, $countryOptions)
Expand Down
30 changes: 30 additions & 0 deletions Tests/Form/Type/PhoneNumberTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,22 @@ public function testCountryChoiceTranslations()
$this->assertFalse($view['country']->vars['choice_translation_domain']);
}

/**
* @dataProvider countryProvider
*/
public function testDefaultRegionAsSelectedInCountryWidget($country)
{
if (method_exists('Symfony\\Component\\Form\\FormTypeInterface', 'getName')) {
$type = new PhoneNumberType();
} else {
$type = 'Misd\\PhoneNumberBundle\\Form\\Type\\PhoneNumberType';
}
$form = $this->factory->create($type, null, array('widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE, 'default_region' => $country));

$countryViewData = $form->get('country')->getViewData();

$this->assertEquals($country, $countryViewData);
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
*/
Expand Down Expand Up @@ -219,4 +235,18 @@ private function createChoiceView($label, $code)

return new $class($code, $code, $label);
}

public function countryProvider()
{
return array(
array('AF'),
array('AO'),
array('BZ'),
array('CZ'),
array('FR'),
array('GR'),
array('KG'),
array('MQ')
);
}
}