diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-10 10:52:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-10 11:09:41 +0200 |
| commit | 9d82a01d017bafd9896d26f6291b443c9cd7f0ec (patch) | |
| tree | fd9a9e6d6926612a536c55634f60e51d3a5901e6 /ext/date/tests | |
| parent | dfe5fd2a37c066acceefd1cbaabb50843d571c37 (diff) | |
| download | php-git-9d82a01d017bafd9896d26f6291b443c9cd7f0ec.tar.gz | |
Clean up DateTimeZone::getLocation() test
And avoid invalid array access.
Diffstat (limited to 'ext/date/tests')
| -rw-r--r-- | ext/date/tests/DateTimeZone_getLocation.phpt | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/ext/date/tests/DateTimeZone_getLocation.phpt b/ext/date/tests/DateTimeZone_getLocation.phpt index 06d22820f1..0d9a43f5e7 100644 --- a/ext/date/tests/DateTimeZone_getLocation.phpt +++ b/ext/date/tests/DateTimeZone_getLocation.phpt @@ -1,20 +1,21 @@ --TEST-- -DateTimeZone::getLocation -- timezone_location_get — Returns location information for a timezone public array DateTimeZone::getLocation ( void ) ; +Test DateTimeZone::getLocation() --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br --FILE-- <?php -$arrayDate = DateTimeZone::listAbbreviations(); $countryCode = array("??"); $countryCodeTest = array("AU", "CA", "ET", "AF", "US", "KZ", "AM"); -foreach($arrayDate as $value){ - - if(NULL != $value[0]['timezone_id']){ +foreach (DateTimeZone::listAbbreviations() as $value) { + if (NULL != $value[0]['timezone_id']) { $timeZone = new DateTimeZone($value[0]['timezone_id']); $timeZoneArray = $timeZone->getLocation(); + if (false === $timeZoneArray) { + continue; + } - if((!in_array($timeZoneArray['country_code'], $countryCode)) && (NULL != $timeZoneArray['country_code']) && ("" != $timeZoneArray['country_code'])) { + if (!in_array($timeZoneArray['country_code'], $countryCode) && NULL != $timeZoneArray['country_code']) { array_push($countryCode, $timeZoneArray['country_code']); if(in_array($timeZoneArray['country_code'], $countryCodeTest)){ @@ -24,12 +25,6 @@ foreach($arrayDate as $value){ } } ?> ---CLEAN-- -<?php -unset($arrayDate); -unset($countryCode); -unset($countryCodeTest); -?> --EXPECTF-- Array ( |