Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Validator] Add TimezoneValidator #22262

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

Closed
wants to merge 14 commits into from
Closed

[Validator] Add TimezoneValidator #22262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4b87fb7
Add `TimeZoneValidator`
phansys Apr 4, 2017
6cceda0
Add support for `\DateTimeZone::PER_COUNTRY`
phansys Apr 4, 2017
6124ef6
Update constraint message
phansys Apr 4, 2017
49e4b51
Renamed "timezone" group to "zone"
phansys Apr 4, 2017
288a413
Apply CS fixes from `fabbot`
phansys Apr 4, 2017
7545275
Update method visibility at `TimezoneValidator`
phansys Apr 4, 2017
de78802
Update validation messages
phansys Apr 5, 2017
dfa4f98
Update way of handling `zone` option
phansys Apr 5, 2017
6be950a
Add specific errors to be used when `zone` or `countryCode` are provided
phansys Apr 5, 2017
6d23035
Add support for deprecated timezones
phansys Apr 9, 2017
13bc629
Remove surplus quotes in validation message
phansys Apr 19, 2017
0491875
Update validation message
phansys Feb 6, 2018
14689f7
Update `TimezoneValidator`
phansys Nov 29, 2018
c3dce5c
Add simple assertion at `TimezoneTest::testValidTimezoneConstraints()`
phansys Nov 29, 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
Prev Previous commit
Next Next commit
Update validation messages
  • Loading branch information
@phansys
phansys committed Nov 29, 2018
commit de788025e1e26f728c6177e1bdc68c593e8ca4d2
22 changes: 9 additions & 13 deletions src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,16 @@ public function getDefaultOption()
*/
private function formatExtraInfo($zone, $countryCode = null)
{
if (!$zone) {
return '';
}
$r = new \ReflectionClass('\DateTimeZone');
$consts = $r->getConstants();

if (!$value = array_search($zone, $consts, true)) {
$value = $zone;
}

$value = ' for "'.$value.'" zone';

if ($countryCode) {
$value = ' for ISO 3166-1 country code '.$countryCode;
$value = ' for ISO 3166-1 country code "'.$countryCode.'"';
} else {
$r = new \ReflectionClass('\DateTimeZone');
$consts = $r->getConstants();
if ($value = array_search($zone, $consts, true)) {
$value = ' for "'.$value.'" zone';
} else {
$value = ' for zone with identifier '.$zone;
}
}

return $this->formatValue($value);
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Validator/Tests/Constraints/TimezoneValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function getInvalidGroupedTimezones()
array('America/Barbados', \DateTimeZone::ANTARCTICA, ' for "ANTARCTICA" zone'),
array('Europe/Kiev', \DateTimeZone::ARCTIC, ' for "ARCTIC" zone'),
array('Asia/Ho_Chi_Minh', \DateTimeZone::INDIAN, ' for "INDIAN" zone'),
array('Asia/Ho_Chi_Minh', \DateTimeZone::INDIAN | \DateTimeZone::ANTARCTICA, ' for "260" zone'),
array('Asia/Ho_Chi_Minh', \DateTimeZone::INDIAN | \DateTimeZone::ANTARCTICA, ' for zone with identifier 260'),
);
}

Expand Down Expand Up @@ -214,8 +214,8 @@ public function testInvalidGroupedTimezonesByCountry($timezone, $what, $country,
public function getInvalidGroupedTimezonesByCountry()
{
return array(
array('America/Argentina/Cordoba', \DateTimeZone::PER_COUNTRY, 'FR', ' for ISO 3166-1 country code FR'),
array('America/Barbados', \DateTimeZone::PER_COUNTRY, 'PT', ' for ISO 3166-1 country code PT'),
array('America/Argentina/Cordoba', \DateTimeZone::PER_COUNTRY, 'FR', ' for ISO 3166-1 country code "FR"'),
array('America/Barbados', \DateTimeZone::PER_COUNTRY, 'PT', ' for ISO 3166-1 country code "PT"'),
);
}
}