diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 90d47ec8c..a267e0944 100644 --- a/METADATA-VERSION.txt +++ b/METADATA-VERSION.txt @@ -2,4 +2,4 @@ # It can be a commit, branch or tag of the https://github.com/googlei18n/libphonenumber project # # For more information, look at the phing tasks in build.xml -v8.9.16 +v8.10.0 diff --git a/build/BuildMetadataFromXml.php b/build/BuildMetadataFromXml.php index 53d11e49b..06f442c32 100644 --- a/build/BuildMetadataFromXml.php +++ b/build/BuildMetadataFromXml.php @@ -15,45 +15,45 @@ class BuildMetadataFromXml { // String constants used to fetch the XML nodes and attributes. - const CARRIER_CODE_FORMATTING_RULE = "carrierCodeFormattingRule"; - const COUNTRY_CODE = "countryCode"; - const EMERGENCY = "emergency"; - const EXAMPLE_NUMBER = "exampleNumber"; - const FIXED_LINE = "fixedLine"; - const FORMAT = "format"; - const GENERAL_DESC = "generalDesc"; - const INTERNATIONAL_PREFIX = "internationalPrefix"; - const INTL_FORMAT = "intlFormat"; - const LEADING_DIGITS = "leadingDigits"; - const MOBILE_NUMBER_PORTABLE_REGION = "mobileNumberPortableRegion"; - const MAIN_COUNTRY_FOR_CODE = "mainCountryForCode"; - const MOBILE = "mobile"; - const NATIONAL_NUMBER_PATTERN = "nationalNumberPattern"; - const NATIONAL_PREFIX = "nationalPrefix"; - const NATIONAL_PREFIX_FORMATTING_RULE = "nationalPrefixFormattingRule"; - const NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING = "nationalPrefixOptionalWhenFormatting"; - const NATIONAL_PREFIX_FOR_PARSING = "nationalPrefixForParsing"; - const NATIONAL_PREFIX_TRANSFORM_RULE = "nationalPrefixTransformRule"; - const NO_INTERNATIONAL_DIALLING = "noInternationalDialling"; - const NUMBER_FORMAT = "numberFormat"; - const PAGER = "pager"; + const CARRIER_CODE_FORMATTING_RULE = 'carrierCodeFormattingRule'; + const COUNTRY_CODE = 'countryCode'; + const EMERGENCY = 'emergency'; + const EXAMPLE_NUMBER = 'exampleNumber'; + const FIXED_LINE = 'fixedLine'; + const FORMAT = 'format'; + const GENERAL_DESC = 'generalDesc'; + const INTERNATIONAL_PREFIX = 'internationalPrefix'; + const INTL_FORMAT = 'intlFormat'; + const LEADING_DIGITS = 'leadingDigits'; + const MOBILE_NUMBER_PORTABLE_REGION = 'mobileNumberPortableRegion'; + const MAIN_COUNTRY_FOR_CODE = 'mainCountryForCode'; + const MOBILE = 'mobile'; + const NATIONAL_NUMBER_PATTERN = 'nationalNumberPattern'; + const NATIONAL_PREFIX = 'nationalPrefix'; + const NATIONAL_PREFIX_FORMATTING_RULE = 'nationalPrefixFormattingRule'; + const NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING = 'nationalPrefixOptionalWhenFormatting'; + const NATIONAL_PREFIX_FOR_PARSING = 'nationalPrefixForParsing'; + const NATIONAL_PREFIX_TRANSFORM_RULE = 'nationalPrefixTransformRule'; + const NO_INTERNATIONAL_DIALLING = 'noInternationalDialling'; + const NUMBER_FORMAT = 'numberFormat'; + const PAGER = 'pager'; const CARRIER_SPECIFIC = 'carrierSpecific'; - const PATTERN = "pattern"; - const PERSONAL_NUMBER = "personalNumber"; - const POSSIBLE_LENGTHS = "possibleLengths"; - const NATIONAL = "national"; - const LOCAL_ONLY = "localOnly"; - const PREFERRED_EXTN_PREFIX = "preferredExtnPrefix"; - const PREFERRED_INTERNATIONAL_PREFIX = "preferredInternationalPrefix"; - const PREMIUM_RATE = "premiumRate"; - const SHARED_COST = "sharedCost"; - const SHORT_CODE = "shortCode"; - const SMS_SERVICES = "smsServices"; - const STANDARD_RATE = "standardRate"; - const TOLL_FREE = "tollFree"; - const UAN = "uan"; - const VOICEMAIL = "voicemail"; - const VOIP = "voip"; + const PATTERN = 'pattern'; + const PERSONAL_NUMBER = 'personalNumber'; + const POSSIBLE_LENGTHS = 'possibleLengths'; + const NATIONAL = 'national'; + const LOCAL_ONLY = 'localOnly'; + const PREFERRED_EXTN_PREFIX = 'preferredExtnPrefix'; + const PREFERRED_INTERNATIONAL_PREFIX = 'preferredInternationalPrefix'; + const PREMIUM_RATE = 'premiumRate'; + const SHARED_COST = 'sharedCost'; + const SHORT_CODE = 'shortCode'; + const SMS_SERVICES = 'smsServices'; + const STANDARD_RATE = 'standardRate'; + const TOLL_FREE = 'tollFree'; + const UAN = 'uan'; + const VOICEMAIL = 'voicemail'; + const VOIP = 'voip'; private static $phoneNumberDescsWithoutMatchingTypes = array( self::NO_INTERNATIONAL_DIALLING @@ -70,13 +70,13 @@ public static function validateRE($regex, $removeWhitespace = false) $compressedRegex = $removeWhitespace ? preg_replace('/\\s/', '', $regex) : $regex; // Match regex against an empty string to check the regex is valid if (preg_match('/' . $compressedRegex . '/', '') === false) { - throw new \RuntimeException("Regex error: " . preg_last_error()); + throw new \RuntimeException('Regex error: ' . preg_last_error()); } // We don't ever expect to see | followed by a ) in our metadata - this would be an indication // of a bug. If one wants to make something optional, we prefer ? to using an empty group. $errorIndex = strpos($compressedRegex, '|)'); if ($errorIndex !== false) { - throw new \RuntimeException("| followed by )"); + throw new \RuntimeException('| followed by )'); } // return the regex if it is of correct syntax, i.e. compile did not fail with a return $compressedRegex; @@ -104,7 +104,7 @@ public static function buildPhoneMetadataCollection($inputXmlFile, $liteBuild, $ $isAlternateFormatsMetadata = strpos($inputXmlFile, 'PhoneNumberAlternateFormats'); } - $territories = $document->getElementsByTagName("territory"); + $territories = $document->getElementsByTagName('territory'); $metadataCollection = array(); $metadataFilter = self::getMetadataFilter($liteBuild, $specialBuild); @@ -113,10 +113,10 @@ public static function buildPhoneMetadataCollection($inputXmlFile, $liteBuild, $ /** @var $territoryElement \DOMElement */ // For the main metadata file this should always be set, but for other supplementary data // files the country calling code may be all that is needed. - if ($territoryElement->hasAttribute("id")) { - $regionCode = $territoryElement->getAttribute("id"); + if ($territoryElement->hasAttribute('id')) { + $regionCode = $territoryElement->getAttribute('id'); } else { - $regionCode = ""; + $regionCode = ''; } $metadata = self::loadCountryMetadata($regionCode, $territoryElement, $isShortNumberMetadata, $isAlternateFormatsMetadata); $metadataFilter->filterMetadata($metadata); @@ -157,7 +157,7 @@ public static function getMetadataFilter($liteBuild, $specialBuild) { if ($specialBuild) { if ($liteBuild) { - throw new \RuntimeException("liteBuild and specialBuild may not both be set"); + throw new \RuntimeException('liteBuild and specialBuild may not both be set'); } return MetadataFilter::forSpecialBuild(); } @@ -176,7 +176,7 @@ public static function getMetadataFilter($liteBuild, $specialBuild) */ public static function getNationalPrefix(\DOMElement $element) { - return $element->hasAttribute(self::NATIONAL_PREFIX) ? $element->getAttribute(self::NATIONAL_PREFIX) : ""; + return $element->hasAttribute(self::NATIONAL_PREFIX) ? $element->getAttribute(self::NATIONAL_PREFIX) : ''; } /** @@ -190,8 +190,8 @@ public static function getNationalPrefixFormattingRuleFromElement(\DOMElement $e { $nationalPrefixFormattingRule = $element->getAttribute(self::NATIONAL_PREFIX_FORMATTING_RULE); // Replace $NP with national prefix and $FG with the first group ($1). - $nationalPrefixFormattingRule = str_replace('$NP', $nationalPrefix, $nationalPrefixFormattingRule); - $nationalPrefixFormattingRule = str_replace('$FG', '$1', $nationalPrefixFormattingRule); + $nationalPrefixFormattingRule = str_replace(array('$NP', '$FG'), array($nationalPrefix, '$1'), + $nationalPrefixFormattingRule); return $nationalPrefixFormattingRule; } @@ -264,7 +264,7 @@ public static function loadAvailableFormats( $nationalPrefixFormattingRule, $nationalPrefixOptionalWhenFormatting ) { - $carrierCodeFormattingRule = ""; + $carrierCodeFormattingRule = ''; if ($element->hasAttribute(self::CARRIER_CODE_FORMATTING_RULE)) { $carrierCodeFormattingRule = self::validateRE(self::getDomesticCarrierCodeFormattingRuleFromElement($element, $nationalPrefix)); } @@ -286,7 +286,7 @@ public static function loadAvailableFormats( $format->setNationalPrefixFormattingRule($nationalPrefixFormattingRule); } if ($numberFormatElement->hasAttribute(self::NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)) { - $format->setNationalPrefixOptionalWhenFormatting($numberFormatElement->getAttribute(self::NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING) == 'true' ? true : false); + $format->setNationalPrefixOptionalWhenFormatting($numberFormatElement->getAttribute(self::NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING) === 'true' ? true : false); } else { $format->setNationalPrefixOptionalWhenFormatting($nationalPrefixOptionalWhenFormatting); } @@ -324,8 +324,8 @@ public static function getDomesticCarrierCodeFormattingRuleFromElement(\DOMEleme { $carrierCodeFormattingRule = $element->getAttribute(self::CARRIER_CODE_FORMATTING_RULE); // Replace $FG with the first group ($1) and $NP with the national prefix. - $carrierCodeFormattingRule = str_replace('$NP', $nationalPrefix, $carrierCodeFormattingRule); - $carrierCodeFormattingRule = str_replace('$FG', '$1', $carrierCodeFormattingRule); + $carrierCodeFormattingRule = str_replace(array('$NP', '$FG'), array($nationalPrefix, '$1'), + $carrierCodeFormattingRule); return $carrierCodeFormattingRule; } @@ -349,7 +349,7 @@ public static function loadNationalFormat( $formatPattern = $numberFormatElement->getElementsByTagName(self::FORMAT); if ($formatPattern->length != 1) { $countryId = strlen($metadata->getId()) > 0 ? $metadata->getId() : $metadata->getCountryCode(); - throw new \RuntimeException("Invalid number of format patterns for country: " . $countryId); + throw new \RuntimeException('Invalid number of format patterns for country: ' . $countryId); } $nationalFormat = $formatPattern->item(0)->firstChild->nodeValue; $format->setFormat($nationalFormat); @@ -393,15 +393,17 @@ public static function loadInternationalFormat( if ($intlFormatPattern->length > 1) { $countryId = strlen($metadata->getId()) > 0 ? $metadata->getId() : $metadata->getCountryCode(); - throw new \RuntimeException("Invalid number of intlFormat patterns for country: " . $countryId); - } elseif ($intlFormatPattern->length == 0) { + throw new \RuntimeException('Invalid number of intlFormat patterns for country: ' . $countryId); + } + + if ($intlFormatPattern->length == 0) { // Default to use the same as the national pattern if none is defined. $intlFormat->mergeFrom($nationalFormat); } else { $intlFormat->setPattern($numberFormatElement->getAttribute(self::PATTERN)); self::setLeadingDigitsPatterns($numberFormatElement, $intlFormat); $intlFormatPatternValue = $intlFormatPattern->item(0)->firstChild->nodeValue; - if ($intlFormatPatternValue !== "NA") { + if ($intlFormatPatternValue !== 'NA') { $intlFormat->setFormat($intlFormatPatternValue); } $hasExplicitIntlFormatDefined = true; @@ -467,10 +469,10 @@ public static function setRelevantDescPatterns(PhoneMetadata $metadata, \DOMElem private static function parsePossibleLengthStringToSet($possibleLengthString) { if (strlen($possibleLengthString) === 0) { - throw new \RuntimeException("Empty possibleLength string found."); + throw new \RuntimeException('Empty possibleLength string found.'); } - $lengths = explode(",", $possibleLengthString); + $lengths = explode(',', $possibleLengthString); $lengthSet = array(); @@ -478,9 +480,11 @@ private static function parsePossibleLengthStringToSet($possibleLengthString) for ($i = 0; $i < $lengthLength; $i++) { $lengthSubstring = $lengths[$i]; if (strlen($lengthSubstring) === 0) { - throw new \RuntimeException("Leading, trailing or adjacent commas in possible " + throw new \RuntimeException('Leading, trailing or adjacent commas in possible ' . "length string {$possibleLengthString}, these should only separate numbers or ranges."); - } elseif (substr($lengthSubstring, 0, 1) === '[') { + } + + if (substr($lengthSubstring, 0, 1) === '[') { if (substr($lengthSubstring, -1) !== ']') { throw new \RuntimeException("Missing end of range character in possible length string {$possibleLengthString}."); } @@ -501,7 +505,7 @@ private static function parsePossibleLengthStringToSet($possibleLengthString) if (in_array($j, $lengthSet)) { throw new \RuntimeException("Duplicate length element found ({$j}) in possibleLength string {$possibleLengthString}."); } - $lengthSet[] = (int)$j; + $lengthSet[] = $j; } } else { $length = $lengthSubstring; @@ -544,7 +548,7 @@ private static function populatePossibleLengthSets(\DOMElement $data, &$lengths, $thisElementLocalOnlyLengths = self::parsePossibleLengthStringToSet($localLengths); $intersection = array_intersect($thisElementLengths, $thisElementLocalOnlyLengths); if (count($intersection) > 0) { - throw new \RuntimeException("Possible length(s) found specified as a normal and local-only length: [" . implode(',', $intersection) . '].'); + throw new \RuntimeException('Possible length(s) found specified as a normal and local-only length: [' . implode(',', $intersection) . '].'); } // We check again when we set these lengths on the metadata itself in setPossibleLengths // that the elements in localOnly are not also in lengths. For e.g. the generalDesc, it @@ -613,7 +617,7 @@ public static function setPossibleLengthsGeneralDesc(PhoneNumberDesc $generalDes self::populatePossibleLengthSets($shortCodeDesc, $lengths, $localOnlyLengths); } if (count($localOnlyLengths) > 0) { - throw new \RuntimeException("Found local-only lengths in short-number metadata"); + throw new \RuntimeException('Found local-only lengths in short-number metadata'); } } self::setPossibleLengths($lengths, $localOnlyLengths, null, $generalDesc); @@ -708,10 +712,10 @@ public static function processPhoneNumberDescElement( } if ($parentDesc != null) { - if ($parentDesc->getNationalNumberPattern() !== "") { + if ($parentDesc->getNationalNumberPattern() !== '') { $numberDesc->setNationalNumberPattern($parentDesc->getNationalNumberPattern()); } - if ($parentDesc->getExampleNumber() !== "") { + if ($parentDesc->getExampleNumber() !== '') { $numberDesc->setExampleNumber($parentDesc->getExampleNumber()); } } diff --git a/build/BuildMetadataPHPFromXml.php b/build/BuildMetadataPHPFromXml.php index 29cd1f291..732f67385 100644 --- a/build/BuildMetadataPHPFromXml.php +++ b/build/BuildMetadataPHPFromXml.php @@ -69,7 +69,7 @@ private function writeMetadataToFile($metadataCollection, $filePrefix) . self::GENERATION_COMMENT . PHP_EOL . 'return ' . var_export($metadata->toArray(), true) . ';' . PHP_EOL; - file_put_contents($filePrefix . "_" . $regionCode . '.php', $data); + file_put_contents($filePrefix . '_' . $regionCode . '.php', $data); } } @@ -91,7 +91,7 @@ private function writeCountryCallingCodeMappingToFile($countryCodeToRegionCodeMa $data = ' $v) { - if ($v == "") { + if ($v == '') { unset($mappings[$k]); } } @@ -326,7 +325,7 @@ private function makeDataFallbackToEnglish($textFile, &$mappings) private function getEnglishDataPath($textFile) { - return "en" . DIRECTORY_SEPARATOR . substr($textFile, 3); + return 'en' . DIRECTORY_SEPARATOR . substr($textFile, 3); } private function compressAccordingToEnglishData($englishMap, &$nonEnglishMap) @@ -338,7 +337,7 @@ private function compressAccordingToEnglishData($englishMap, &$nonEnglishMap) if (!$this->hasOverlappingPrefix($prefix, $nonEnglishMap)) { unset($nonEnglishMap[$prefix]); } else { - $nonEnglishMap[$prefix] = ""; + $nonEnglishMap[$prefix] = ''; } } } diff --git a/build/GenerateTimeZonesMapData.php b/build/GenerateTimeZonesMapData.php index 142303971..d88fde7ba 100644 --- a/build/GenerateTimeZonesMapData.php +++ b/build/GenerateTimeZonesMapData.php @@ -33,7 +33,7 @@ public function __construct($inputFile, $outputDir) $this->inputTextFile = $inputFile; if (!is_readable($this->inputTextFile)) { - throw new \RuntimeException("The provided input text file does not exist."); + throw new \RuntimeException('The provided input text file does not exist.'); } $data = $this->parseTextFile(); @@ -52,8 +52,7 @@ private function parseTextFile() foreach ($data as $line) { // Remove \n - $line = str_replace("\n", "", $line); - $line = str_replace("\r", "", $line); + $line = str_replace(array("\n", "\r"), '', $line); $line = trim($line); if (strlen($line) == 0 || substr($line, 0, 1) == '#') { diff --git a/build/MetadataFilter.php b/build/MetadataFilter.php index 668a6f28b..5dcae7235 100644 --- a/build/MetadataFilter.php +++ b/build/MetadataFilter.php @@ -17,40 +17,40 @@ class MetadataFilter { public static $EXCLUDABLE_PARENT_FIELDS = array( - "fixedLine", - "mobile", - "tollFree", - "premiumRate", - "sharedCost", - "personalNumber", - "voip", - "pager", - "uan", - "emergency", - "voicemail", - "shortCode", - "standardRate", - "carrierSpecific", - "smsServices", - "noInternationalDialling" + 'fixedLine', + 'mobile', + 'tollFree', + 'premiumRate', + 'sharedCost', + 'personalNumber', + 'voip', + 'pager', + 'uan', + 'emergency', + 'voicemail', + 'shortCode', + 'standardRate', + 'carrierSpecific', + 'smsServices', + 'noInternationalDialling' ); public static $EXCLUDABLE_CHILD_FIELDS = array( - "nationalNumberPattern", - "possibleLength", - "possibleLengthLocalOnly", - "exampleNumber" + 'nationalNumberPattern', + 'possibleLength', + 'possibleLengthLocalOnly', + 'exampleNumber' ); public static $EXCLUDABLE_CHILDLESS_FIELDS = array( - "preferredInternationalPrefix", - "nationalPrefix", - "preferredExtnPrefix", - "nationalPrefixTransformRule", - "sameMobileAndFixedLinePattern", - "mainCountryForCode", - "leadingZeroPossible", - "mobileNumberPortableRegion" + 'preferredInternationalPrefix', + 'nationalPrefix', + 'preferredExtnPrefix', + 'nationalPrefixTransformRule', + 'sameMobileAndFixedLinePattern', + 'mainCountryForCode', + 'leadingZeroPossible', + 'mobileNumberPortableRegion' ); protected $blackList; @@ -63,7 +63,7 @@ public function __construct($blackList = array()) public static function forLiteBuild() { // "exampleNumber" is a blacklist. - return new static(self::parseFieldMapFromString("exampleNumber")); + return new static(self::parseFieldMapFromString('exampleNumber')); } /** @@ -79,13 +79,13 @@ public static function forLiteBuild() public static function parseFieldMapFromString($string) { if ($string === null) { - throw new \RuntimeException("Null string should not be passed to parseFieldMapFromString"); + throw new \RuntimeException('Null string should not be passed to parseFieldMapFromString'); } // Remove whitespace $string = str_replace(' ', '', $string); if (strlen($string) === 0) { - throw new \RuntimeException("Empty string should not be passed to parseFieldMapFromString"); + throw new \RuntimeException('Empty string should not be passed to parseFieldMapFromString'); } $fieldMap = array(); @@ -139,7 +139,7 @@ public static function parseFieldMapFromString($string) } $fieldMap[$parent] = $children; } else { - throw new \RuntimeException("Incorrect location of parentheses in " . $group); + throw new \RuntimeException('Incorrect location of parentheses in ' . $group); } } @@ -174,7 +174,7 @@ public static function parseFieldMapFromString($string) public static function forSpecialBuild() { // "mobile" is a whitelist. - return new static(self::computeComplement(self::parseFieldMapFromString("mobile"))); + return new static(self::computeComplement(self::parseFieldMapFromString('mobile'))); } /** @@ -369,13 +369,13 @@ public function shouldDrop($parent, $child = null) } return array_key_exists($parent, $this->blackList) && in_array($child, $this->blackList[$parent]); - } else { - $childlessField = $parent; - if (!in_array($childlessField, self::$EXCLUDABLE_CHILDLESS_FIELDS)) { - throw new \RuntimeException($childlessField . ' is not an excludable childless field'); - } + } - return array_key_exists($childlessField, $this->blackList); + $childlessField = $parent; + if (!in_array($childlessField, self::$EXCLUDABLE_CHILDLESS_FIELDS)) { + throw new \RuntimeException($childlessField . ' is not an excludable childless field'); } + + return array_key_exists($childlessField, $this->blackList); } } diff --git a/src/AsYouTypeFormatter.php b/src/AsYouTypeFormatter.php index 915294b7f..e95bb7eea 100644 --- a/src/AsYouTypeFormatter.php +++ b/src/AsYouTypeFormatter.php @@ -122,7 +122,7 @@ class AsYouTypeFormatter * formatting * @var string */ - private $extractedNationalPrefix = ""; + private $extractedNationalPrefix = ''; /** * @var string @@ -176,7 +176,7 @@ class AsYouTypeFormatter * to us that we should separate the national prefix from the numbers when formatting. * @var string */ - private static $nationalPrefixSeparatorsPattern = "[- ]"; + private static $nationalPrefixSeparatorsPattern = '[- ]'; /** * This is the minimum length of national number accrued that is required to trigger the @@ -200,10 +200,10 @@ private static function init() self::$initialised = true; self::$emptyMetadata = new PhoneMetadata(); - self::$emptyMetadata->setInternationalPrefix("NA"); + self::$emptyMetadata->setInternationalPrefix('NA'); - self::$eligibleFormatPattern = "[" . PhoneNumberUtil::VALID_PUNCTUATION . "]*" - . "(\\$\\d" . "[" . PhoneNumberUtil::VALID_PUNCTUATION . "]*)+"; + self::$eligibleFormatPattern = '[' . PhoneNumberUtil::VALID_PUNCTUATION . ']*' + . "(\\$\\d" . '[' . PhoneNumberUtil::VALID_PUNCTUATION . ']*)+'; } } @@ -263,10 +263,10 @@ private function maybeCreateNewTemplate() // needs to be reset. $this->lastMatchPosition = 0; return true; - } else { - // Remove the current number format from $this->possibleFormats - unset($this->possibleFormats[$key]); } + + // Remove the current number format from $this->possibleFormats + unset($this->possibleFormats[$key]); } $this->ableToFormat = false; return false; @@ -277,35 +277,45 @@ private function maybeCreateNewTemplate() */ private function getAvailableFormats($leadingDigits) { - $formatList = ($this->isCompleteNumber && $this->currentMetadata->intlNumberFormatSize() > 0) + // First decide whether we should use international or national number rules. + $isInternationalNumber = $this->isCompleteNumber && $this->extractedNationalPrefix === ''; + + $formatList = ($isInternationalNumber && $this->currentMetadata->intlNumberFormatSize() > 0) ? $this->currentMetadata->intlNumberFormats() : $this->currentMetadata->numberFormats(); - $nationalPrefixIsUsedByCountry = $this->currentMetadata->hasNationalPrefix(); - foreach ($formatList as $format) { - if (!$nationalPrefixIsUsedByCountry - || $this->isCompleteNumber - || $format->getNationalPrefixOptionalWhenFormatting() - || PhoneNumberUtil::formattingRuleHasFirstGroupOnly($format->getNationalPrefixFormattingRule()) - ) { - if ($this->isFormatEligible($format->getFormat())) { - $this->possibleFormats[] = $format; - } + // Discard a few formats that we know are not relevant based on the presence of the national + // prefix. + if ($this->extractedNationalPrefix !== '' + && PhoneNumberUtil::formattingRuleHasFirstGroupOnly( + $format->getNationalPrefixFormattingRule()) + && !$format->getNationalPrefixOptionalWhenFormatting() + && !$format->hasDomesticCarrierCodeFormattingRule()) { + // If it is a national number that had a national prefix, any rules that aren't valid with a + // national prefix should be excluded. A rule that has a carrier-code formatting rule is + // kept since the national prefix might actually be an extracted carrier code - we don't + // distinguish between these when extracting it in the AYTF. + continue; } - } - $this->narrowDownPossibleFormats($leadingDigits); - } - /** - * @param string $format - * @return bool - */ - private function isFormatEligible($format) - { - $eligibleFormatMatcher = new Matcher(self::$eligibleFormatPattern, $format); + if ($this->extractedNationalPrefix === '' + && !$this->isCompleteNumber + && !PhoneNumberUtil::formattingRuleHasFirstGroupOnly( + $format->getNationalPrefixFormattingRule()) + && !$format->getNationalPrefixOptionalWhenFormatting()) { + // This number was entered without a national prefix, and this formatting rule requires one, + // so we discard it. + continue; + } - return $eligibleFormatMatcher->matches(); + $eligibleFormatMatcher = new Matcher(self::$eligibleFormatPattern, $format->getFormat()); + + if ($eligibleFormatMatcher->matches()) { + $this->possibleFormats[] = $format; + } + } + $this->narrowDownPossibleFormats($leadingDigits); } /** @@ -350,7 +360,7 @@ private function createFormattingTemplate(NumberFormat $format) // Replace any standalone digit (not the one in d{}) with \d $standAloneDigitMatcher = new Matcher(self::$standaloneDigitPattern, $numberPattern); $numberPattern = $standAloneDigitMatcher->replaceAll("\\\\d"); - $this->formattingTemplate = ""; + $this->formattingTemplate = ''; $tempTemplate = $this->getFormattingTemplate($numberPattern, $format->getFormat()); if (mb_strlen($tempTemplate) > 0) { $this->formattingTemplate .= $tempTemplate; @@ -370,19 +380,19 @@ private function getFormattingTemplate($numberPattern, $numberFormat) { // Creates a phone number consisting only of the digit 9 that matches the // numberPattern by applying the pattern to the longestPhoneNumber string. - $longestPhoneNumber = "999999999999999"; + $longestPhoneNumber = '999999999999999'; $m = new Matcher($numberPattern, $longestPhoneNumber); $m->find(); $aPhoneNumber = $m->group(); // No formatting template can be created if the number of digits entered entered so far // is longer than the maximum the current formatting rule can accommodate. if (mb_strlen($aPhoneNumber) < mb_strlen($this->nationalNumber)) { - return ""; + return ''; } // Formats the number according to $numberFormat $template = preg_replace('/' . $numberPattern . '/' . PhoneNumberUtil::REGEX_FLAGS, $numberFormat, $aPhoneNumber); // Replaces each digit with character self::$digitPlattern - $template = preg_replace("/9/", self::$digitPattern, $template); + $template = preg_replace('/9/', self::$digitPattern, $template); return $template; } @@ -391,15 +401,15 @@ private function getFormattingTemplate($numberPattern, $numberFormat) */ public function clear() { - $this->currentOutput = ""; - $this->accruedInput = ""; - $this->accruedInputWithoutFormatting = ""; - $this->formattingTemplate = ""; + $this->currentOutput = ''; + $this->accruedInput = ''; + $this->accruedInputWithoutFormatting = ''; + $this->formattingTemplate = ''; $this->lastMatchPosition = 0; - $this->currentFormattingPattern = ""; - $this->prefixBeforeNationalNumber = ""; - $this->extractedNationalPrefix = ""; - $this->nationalNumber = ""; + $this->currentFormattingPattern = ''; + $this->prefixBeforeNationalNumber = ''; + $this->extractedNationalPrefix = ''; + $this->nationalNumber = ''; $this->ableToFormat = true; $this->inputHasFormatting = false; $this->positionToRemember = 0; @@ -467,7 +477,9 @@ private function inputDigitWithOptionToRememberPosition($nextChar, $rememberPosi // to do formatting again after extracting them. if ($this->inputHasFormatting) { return $this->accruedInput; - } elseif ($this->attemptToExtractIdd()) { + } + + if ($this->attemptToExtractIdd()) { if ($this->attemptToExtractCountryCallingCode()) { return $this->attemptToChoosePatternWithPrefixExtracted(); } @@ -522,9 +534,9 @@ private function inputDigitWithOptionToRememberPosition($nextChar, $rememberPosi return $this->ableToFormat ? $this->appendNationalNumber($tempNationalNumber) : $this->accruedInput; - } else { - return $this->attemptToChooseFormattingPattern(); } + + return $this->attemptToChooseFormattingPattern(); } } @@ -537,8 +549,8 @@ private function attemptToChoosePatternWithPrefixExtracted() $this->isExpectingCountryCallingCode = false; $this->possibleFormats = array(); $this->lastMatchPosition = 0; - $this->formattingTemplate = ""; - $this->currentFormattingPattern = ""; + $this->formattingTemplate = ''; + $this->currentFormattingPattern = ''; return $this->attemptToChooseFormattingPattern(); } @@ -599,7 +611,7 @@ public function attemptToFormatAccruedDigits() return $this->appendNationalNumber($formattedNumber); } } - return ""; + return ''; } /** @@ -643,9 +655,9 @@ private function appendNationalNumber($nationalNumber) // indicates that this would normally be done, with the exception of the case where we already // appended a space because the NDD was surprisingly long. return $this->prefixBeforeNationalNumber . self::$seperatorBeforeNationalNumber . $nationalNumber; - } else { - return $this->prefixBeforeNationalNumber . $nationalNumber; } + + return $this->prefixBeforeNationalNumber . $nationalNumber; } /** @@ -665,9 +677,9 @@ private function attemptToChooseFormattingPattern() return $formattedNumber; } return $this->maybeCreateNewTemplate() ? $this->inputAccruedNationalNumber() : $this->accruedInput; - } else { - return $this->appendNationalNumber($this->nationalNumber); } + + return $this->appendNationalNumber($this->nationalNumber); } /** @@ -679,14 +691,14 @@ private function inputAccruedNationalNumber() { $lengthOfNationalNumber = mb_strlen($this->nationalNumber); if ($lengthOfNationalNumber > 0) { - $tempNationalNumber = ""; + $tempNationalNumber = ''; for ($i = 0; $i < $lengthOfNationalNumber; $i++) { $tempNationalNumber = $this->inputDigitHelper(mb_substr($this->nationalNumber, $i, 1)); } return $this->ableToFormat ? $this->appendNationalNumber($tempNationalNumber) : $this->accruedInput; - } else { - return $this->prefixBeforeNationalNumber; } + + return $this->prefixBeforeNationalNumber; } /** @@ -713,7 +725,7 @@ private function removeNationalPrefixFromNationalNumber() $startOfNationalNumber = 0; if ($this->isNanpaNumberWithNationalPrefix()) { $startOfNationalNumber = 1; - $this->prefixBeforeNationalNumber .= "1" . self::$seperatorBeforeNationalNumber; + $this->prefixBeforeNationalNumber .= '1' . self::$seperatorBeforeNationalNumber; $this->isCompleteNumber = true; } elseif ($this->currentMetadata->hasNationalPrefixForParsing()) { $m = new Matcher($this->currentMetadata->getNationalPrefixForParsing(), $this->nationalNumber); @@ -768,7 +780,7 @@ private function attemptToExtractCountryCallingCode() if (mb_strlen($this->nationalNumber) == 0) { return false; } - $numberWithoutCountryCallingCode = ""; + $numberWithoutCountryCallingCode = ''; $countryCode = $this->phoneUtil->extractCountryCode($this->nationalNumber, $numberWithoutCountryCallingCode); if ($countryCode === 0) { return false; @@ -784,7 +796,7 @@ private function attemptToExtractCountryCallingCode() $this->prefixBeforeNationalNumber .= $countryCodeString . self::$seperatorBeforeNationalNumber; // When we have successfully extracted the IDD, the previously extracted NDD should be cleared // because it is no longer valid. - $this->extractedNationalPrefix = ""; + $this->extractedNationalPrefix = ''; return true; } @@ -825,17 +837,18 @@ private function inputDigitHelper($nextChar) $digitMatcher = new Matcher(self::$digitPattern, $this->formattingTemplate); if ($digitMatcher->find($this->lastMatchPosition)) { $tempTemplate = $digitMatcher->replaceFirst($nextChar); - $this->formattingTemplate = $tempTemplate . mb_substr($this->formattingTemplate, mb_strlen($tempTemplate, "UTF-8"), null, "UTF-8"); + $this->formattingTemplate = $tempTemplate . mb_substr($this->formattingTemplate, mb_strlen($tempTemplate, + 'UTF-8'), null, 'UTF-8'); $this->lastMatchPosition = $digitMatcher->start(); return mb_substr($this->formattingTemplate, 0, $this->lastMatchPosition + 1); - } else { - if (count($this->possibleFormats) === 1) { - // More digits are entered than we could handle, and there are no other valid patterns to - // try. - $this->ableToFormat = false; - } // else, we just reset the formatting pattern. - $this->currentFormattingPattern = ""; - return $this->accruedInput; } + + if (count($this->possibleFormats) === 1) { + // More digits are entered than we could handle, and there are no other valid patterns to + // try. + $this->ableToFormat = false; + } // else, we just reset the formatting pattern. + $this->currentFormattingPattern = ''; + return $this->accruedInput; } } diff --git a/src/Matcher.php b/src/Matcher.php index b9f6033ff..67e3553b9 100644 --- a/src/Matcher.php +++ b/src/Matcher.php @@ -116,9 +116,9 @@ public function groupCount() { if (empty($this->groups)) { return null; - } else { - return count($this->groups) - 1; } + + return count($this->groups) - 1; } /** @@ -127,10 +127,10 @@ public function groupCount() */ public function group($group = null) { - if (!isset($group) || $group === null) { + if ($group === null) { $group = 0; } - return (isset($this->groups[$group][0])) ? $this->groups[$group][0] : null; + return isset($this->groups[$group][0]) ? $this->groups[$group][0] : null; } /** @@ -139,7 +139,7 @@ public function group($group = null) */ public function end($group = null) { - if (!isset($group) || $group === null) { + if ($group === null) { $group = 0; } if (!isset($this->groups[$group])) { @@ -150,7 +150,7 @@ public function end($group = null) public function start($group = null) { - if (!isset($group) || $group === null) { + if ($group === null) { $group = 0; } if (!isset($this->groups[$group])) { @@ -182,7 +182,7 @@ public function replaceAll($replacement) * @param string $input * @return Matcher */ - public function reset($input = "") + public function reset($input = '') { $this->subject = $input; diff --git a/src/MultiFileMetadataSourceImpl.php b/src/MultiFileMetadataSourceImpl.php index f6e98657a..b12b0edae 100644 --- a/src/MultiFileMetadataSourceImpl.php +++ b/src/MultiFileMetadataSourceImpl.php @@ -93,15 +93,15 @@ public function loadMetadataFromFile($filePrefix, $regionCode, $countryCallingCo $fileName = $filePrefix . '_' . ($isNonGeoRegion ? $countryCallingCode : $regionCode) . '.php'; if (!is_readable($fileName)) { throw new \RuntimeException('missing metadata: ' . $fileName); + } + + $data = $metadataLoader->loadMetadata($fileName); + $metadata = new PhoneMetadata(); + $metadata->fromArray($data); + if ($isNonGeoRegion) { + $this->countryCodeToNonGeographicalMetadataMap[$countryCallingCode] = $metadata; } else { - $data = $metadataLoader->loadMetadata($fileName); - $metadata = new PhoneMetadata(); - $metadata->fromArray($data); - if ($isNonGeoRegion) { - $this->countryCodeToNonGeographicalMetadataMap[$countryCallingCode] = $metadata; - } else { - $this->regionToMetadataMap[$regionCode] = $metadata; - } + $this->regionToMetadataMap[$regionCode] = $metadata; } } } diff --git a/src/NumberFormat.php b/src/NumberFormat.php index 703a394f8..fe65e7e41 100644 --- a/src/NumberFormat.php +++ b/src/NumberFormat.php @@ -7,15 +7,58 @@ */ class NumberFormat { - protected $pattern = null; - protected $format = null; + /** + * @var string + */ + protected $pattern; + /** + * @var bool + */ + protected $hasPattern = false; + + /** + * @var string + */ + protected $format; + + /** + * @var bool + */ + protected $hasFormat = false; + + /** + * @var array + */ protected $leadingDigitsPattern = array(); - protected $nationalPrefixFormattingRule = null; + + /** + * @var string + */ + protected $nationalPrefixFormattingRule; + + /** + * @var bool + */ + protected $hasNationalPrefixFormattingRule = false; /** * @var bool */ protected $nationalPrefixOptionalWhenFormatting = false; - protected $domesticCarrierCodeFormattingRule = null; + + /** + * @var bool + */ + protected $hasNationalPrefixOptionalWhenFormatting = false; + + /** + * @var string + */ + protected $domesticCarrierCodeFormattingRule; + + /** + * @var bool + */ + protected $hasDomesticCarrierCodeFormattingRule = false; public function __construct() { @@ -27,12 +70,22 @@ public function __construct() */ public function clear() { - $this->pattern = ""; - $this->format = ""; + $this->hasPattern = false; + $this->pattern = null; + + $this->hasFormat = false; + $this->format = null; + $this->leadingDigitsPattern = array(); - $this->nationalPrefixFormattingRule = ""; + + $this->hasNationalPrefixFormattingRule = false; + $this->nationalPrefixFormattingRule = null; + + $this->hasNationalPrefixOptionalWhenFormatting = false; $this->nationalPrefixOptionalWhenFormatting = false; - $this->domesticCarrierCodeFormattingRule = ""; + + $this->hasDomesticCarrierCodeFormattingRule = false; + $this->domesticCarrierCodeFormattingRule = null; return $this; } @@ -42,7 +95,7 @@ public function clear() */ public function hasPattern() { - return isset($this->pattern); + return $this->hasPattern; } /** @@ -59,6 +112,7 @@ public function getPattern() */ public function setPattern($value) { + $this->hasPattern = true; $this->pattern = $value; return $this; @@ -69,7 +123,7 @@ public function setPattern($value) */ public function hasNationalPrefixOptionalWhenFormatting() { - return isset($this->nationalPrefixOptionalWhenFormatting); + return $this->hasNationalPrefixOptionalWhenFormatting; } /** @@ -85,6 +139,7 @@ public function getNationalPrefixOptionalWhenFormatting() */ public function setNationalPrefixOptionalWhenFormatting($nationalPrefixOptionalWhenFormatting) { + $this->hasNationalPrefixOptionalWhenFormatting = true; $this->nationalPrefixOptionalWhenFormatting = $nationalPrefixOptionalWhenFormatting; } @@ -93,7 +148,7 @@ public function setNationalPrefixOptionalWhenFormatting($nationalPrefixOptionalW */ public function hasFormat() { - return ($this->format); + return $this->hasFormat; } /** @@ -110,13 +165,14 @@ public function getFormat() */ public function setFormat($value) { + $this->hasFormat = true; $this->format = $value; return $this; } /** - * @return string + * @return string[] */ public function leadingDigitPatterns() { @@ -156,7 +212,7 @@ public function addLeadingDigitsPattern($value) */ public function hasNationalPrefixFormattingRule() { - return isset($this->nationalPrefixFormattingRule); + return $this->hasNationalPrefixFormattingRule; } /** @@ -173,6 +229,7 @@ public function getNationalPrefixFormattingRule() */ public function setNationalPrefixFormattingRule($value) { + $this->hasNationalPrefixFormattingRule = true; $this->nationalPrefixFormattingRule = $value; return $this; @@ -193,7 +250,7 @@ public function clearNationalPrefixFormattingRule() */ public function hasDomesticCarrierCodeFormattingRule() { - return isset($this->domesticCarrierCodeFormattingRule); + return $this->hasDomesticCarrierCodeFormattingRule; } /** @@ -210,6 +267,7 @@ public function getDomesticCarrierCodeFormattingRule() */ public function setDomesticCarrierCodeFormattingRule($value) { + $this->hasDomesticCarrierCodeFormattingRule = true; $this->domesticCarrierCodeFormattingRule = $value; return $this; @@ -281,10 +339,10 @@ public function fromArray(array $input) $this->addLeadingDigitsPattern($leadingDigitsPattern); } - if (isset($input['nationalPrefixFormattingRule'])) { + if (isset($input['nationalPrefixFormattingRule']) && $input['nationalPrefixFormattingRule'] !== '') { $this->setNationalPrefixFormattingRule($input['nationalPrefixFormattingRule']); } - if (isset($input['domesticCarrierCodeFormattingRule'])) { + if (isset($input['domesticCarrierCodeFormattingRule']) && $input['domesticCarrierCodeFormattingRule'] !== '') { $this->setDomesticCarrierCodeFormattingRule($input['domesticCarrierCodeFormattingRule']); } diff --git a/src/NumberParseException.php b/src/NumberParseException.php index 8940283cb..161811eef 100644 --- a/src/NumberParseException.php +++ b/src/NumberParseException.php @@ -42,6 +42,6 @@ public function getErrorType() public function __toString() { - return "Error type: " . $this->errorType . ". " . $this->message; + return 'Error type: ' . $this->errorType . '. ' . $this->message; } } diff --git a/src/PhoneMetadata.php b/src/PhoneMetadata.php index 2763b96ea..ddfaa3507 100644 --- a/src/PhoneMetadata.php +++ b/src/PhoneMetadata.php @@ -12,32 +12,32 @@ class PhoneMetadata /** * @var string */ - protected $id = null; + protected $id; /** * @var int */ - protected $countryCode = null; - protected $leadingDigits = null; - protected $internationalPrefix = null; - protected $preferredInternationalPrefix = null; - protected $nationalPrefixForParsing = null; - protected $nationalPrefixTransformRule = null; - protected $nationalPrefix = null; - protected $preferredExtnPrefix = null; + protected $countryCode; + protected $leadingDigits; + protected $internationalPrefix; + protected $preferredInternationalPrefix; + protected $nationalPrefixForParsing; + protected $nationalPrefixTransformRule; + protected $nationalPrefix; + protected $preferredExtnPrefix; protected $mainCountryForCode = false; protected $leadingZeroPossible = false; protected $mobileNumberPortableRegion = false; - protected $generalDesc = null; + protected $generalDesc; /** * @var PhoneNumberDesc */ - protected $mobile = null; - protected $premiumRate = null; - protected $fixedLine = null; + protected $mobile; + protected $premiumRate; + protected $fixedLine; protected $sameMobileAndFixedLinePattern = false; protected $numberFormat = array(); - protected $tollFree = null; - protected $sharedCost = null; + protected $tollFree; + protected $sharedCost; protected $personalNumber; protected $voip; protected $pager; @@ -63,7 +63,7 @@ class PhoneMetadata /** * @var PhoneNumberDesc */ - protected $noInternationalDialling = null; + protected $noInternationalDialling; /** * * @var NumberFormat[] @@ -75,7 +75,7 @@ class PhoneMetadata */ public function hasId() { - return isset($this->id); + return $this->id !== null; } /** @@ -83,17 +83,17 @@ public function hasId() */ public function hasCountryCode() { - return isset($this->countryCode); + return $this->countryCode !== null; } public function hasInternationalPrefix() { - return isset($this->internationalPrefix); + return $this->internationalPrefix !== null; } public function hasMainCountryForCode() { - return isset($this->mainCountryForCode); + return $this->mainCountryForCode !== null; } public function isMainCountryForCode() @@ -120,17 +120,17 @@ public function clearMainCountryForCode() public function hasLeadingZeroPossible() { - return isset($this->leadingZeroPossible); + return $this->leadingZeroPossible !== null; } public function hasMobileNumberPortableRegion() { - return isset($this->mobileNumberPortableRegion); + return $this->mobileNumberPortableRegion !== null; } public function hasSameMobileAndFixedLinePattern() { - return isset($this->sameMobileAndFixedLinePattern); + return $this->sameMobileAndFixedLinePattern !== null; } public function numberFormatSize() @@ -301,7 +301,7 @@ public function toArray() public function hasGeneralDesc() { - return isset($this->generalDesc); + return $this->generalDesc !== null; } /** @@ -320,7 +320,7 @@ public function setGeneralDesc(PhoneNumberDesc $value) public function hasFixedLine() { - return isset($this->fixedLine); + return $this->fixedLine !== null; } /** @@ -339,7 +339,7 @@ public function setFixedLine(PhoneNumberDesc $value) public function hasMobile() { - return isset($this->mobile); + return $this->mobile !== null; } /** @@ -358,7 +358,7 @@ public function setMobile(PhoneNumberDesc $value) public function hasTollFree() { - return isset($this->tollFree); + return $this->tollFree !== null; } /** @@ -377,7 +377,7 @@ public function setTollFree(PhoneNumberDesc $value) public function hasPremiumRate() { - return isset($this->premiumRate); + return $this->premiumRate !== null; } /** @@ -396,7 +396,7 @@ public function setPremiumRate(PhoneNumberDesc $value) public function hasSharedCost() { - return isset($this->sharedCost); + return $this->sharedCost !== null; } /** @@ -415,7 +415,7 @@ public function setSharedCost(PhoneNumberDesc $value) public function hasPersonalNumber() { - return isset($this->personalNumber); + return $this->personalNumber !== null; } /** @@ -434,7 +434,7 @@ public function setPersonalNumber(PhoneNumberDesc $value) public function hasVoip() { - return isset($this->voip); + return $this->voip !== null; } /** @@ -453,7 +453,7 @@ public function setVoip(PhoneNumberDesc $value) public function hasPager() { - return isset($this->pager); + return $this->pager !== null; } /** @@ -472,7 +472,7 @@ public function setPager(PhoneNumberDesc $value) public function hasUan() { - return isset($this->uan); + return $this->uan !== null; } /** @@ -491,7 +491,7 @@ public function setUan(PhoneNumberDesc $value) public function hasEmergency() { - return isset($this->emergency); + return $this->emergency !== null; } /** @@ -510,7 +510,7 @@ public function setEmergency(PhoneNumberDesc $value) public function hasVoicemail() { - return isset($this->voicemail); + return $this->voicemail !== null; } /** @@ -529,7 +529,7 @@ public function setVoicemail(PhoneNumberDesc $value) public function hasShortCode() { - return isset($this->short_code); + return $this->short_code !== null; } public function getShortCode() @@ -545,7 +545,7 @@ public function setShortCode(PhoneNumberDesc $value) public function hasStandardRate() { - return isset($this->standard_rate); + return $this->standard_rate !== null; } public function getStandardRate() @@ -561,7 +561,7 @@ public function setStandardRate(PhoneNumberDesc $value) public function hasCarrierSpecific() { - return isset($this->carrierSpecific); + return $this->carrierSpecific !== null; } public function getCarrierSpecific() @@ -577,7 +577,7 @@ public function setCarrierSpecific(PhoneNumberDesc $value) public function hasSmsServices() { - return isset($this->smsServices); + return $this->smsServices !== null; } public function getSmsServices() @@ -593,7 +593,7 @@ public function setSmsServices(PhoneNumberDesc $value) public function hasNoInternationalDialling() { - return isset($this->noInternationalDialling); + return $this->noInternationalDialling !== null; } public function getNoInternationalDialling() @@ -678,7 +678,7 @@ public function clearPreferredInternationalPrefix() public function hasNationalPrefix() { - return isset($this->nationalPrefix); + return $this->nationalPrefix !== null; } public function getNationalPrefix() @@ -700,7 +700,7 @@ public function clearNationalPrefix() public function hasPreferredExtnPrefix() { - return isset($this->preferredExtnPrefix); + return $this->preferredExtnPrefix !== null; } public function getPreferredExtnPrefix() @@ -722,7 +722,7 @@ public function clearPreferredExtnPrefix() public function hasNationalPrefixForParsing() { - return isset($this->nationalPrefixForParsing); + return $this->nationalPrefixForParsing !== null; } public function getNationalPrefixForParsing() @@ -738,7 +738,7 @@ public function setNationalPrefixForParsing($value) public function hasNationalPrefixTransformRule() { - return isset($this->nationalPrefixTransformRule); + return $this->nationalPrefixTransformRule !== null; } public function getNationalPrefixTransformRule() @@ -793,7 +793,7 @@ public function intlNumberFormats() */ public function hasLeadingDigits() { - return isset($this->leadingDigits); + return $this->leadingDigits !== null; } public function getLeadingDigits() @@ -909,7 +909,7 @@ public function fromArray(array $input) if (isset($input['shortCode'])) { $desc = new PhoneNumberDesc(); - $this->setShortCode(($desc->fromArray($input['shortCode']))); + $this->setShortCode($desc->fromArray($input['shortCode'])); } if (isset($input['standardRate'])) { diff --git a/src/PhoneNumber.php b/src/PhoneNumber.php index 5a0dae4db..7c20f102c 100644 --- a/src/PhoneNumber.php +++ b/src/PhoneNumber.php @@ -10,7 +10,7 @@ class PhoneNumber implements \Serializable * * @var int|null */ - protected $countryCode = null; + protected $countryCode; /** * National (significant) Number is defined in International Telecommunication Union (ITU) * Recommendation E.164. It is a language/country-neutral representation of a phone number at a @@ -22,7 +22,7 @@ class PhoneNumber implements \Serializable * * @var string|null */ - protected $nationalNumber = null; + protected $nationalNumber; /** * Extension is not standardized in ITU recommendations, except for being defined as a series of * numbers with a maximum length of 40 digits. It is defined as a string here to accommodate for the @@ -31,7 +31,7 @@ class PhoneNumber implements \Serializable * * @var string|null */ - protected $extension = null; + protected $extension; /** * In some countries, the national (significant) number starts with one or more "0"s without this * being a national prefix or trunk code of some kind. For example, the leading zero in the national @@ -49,7 +49,7 @@ class PhoneNumber implements \Serializable * * @var bool|null */ - protected $italianLeadingZero = null; + protected $italianLeadingZero; /** * This field is used to store the raw input string containing phone numbers before it was * canonicalized by the library. For example, it could be used to store alphanumerical numbers @@ -57,7 +57,7 @@ class PhoneNumber implements \Serializable * * @var string|null */ - protected $rawInput = null; + protected $rawInput; /** * The source from which the country_code is derived. This is not set in the general parsing method, * but in the method that parses and keeps raw_input. New fields could be added upon request. @@ -79,7 +79,7 @@ class PhoneNumber implements \Serializable * * @var string|null */ - protected $preferredDomesticCarrierCode = null; + protected $preferredDomesticCarrierCode; /** * Whether this phone number has a number of leading zeros set. * @@ -245,7 +245,7 @@ public function mergeFrom(PhoneNumber $other) */ public function hasCountryCode() { - return isset($this->countryCode); + return $this->countryCode !== null; } /** @@ -278,7 +278,7 @@ public function setCountryCode($value) */ public function hasNationalNumber() { - return isset($this->nationalNumber); + return $this->nationalNumber !== null; } /** @@ -311,7 +311,7 @@ public function setNationalNumber($value) */ public function hasExtension() { - return isset($this->extension); + return $this->extension !== null; } /** @@ -344,7 +344,7 @@ public function setExtension($value) */ public function hasItalianLeadingZero() { - return isset($this->italianLeadingZero); + return $this->italianLeadingZero !== null; } /** @@ -411,7 +411,7 @@ public function setNumberOfLeadingZeros($value) */ public function hasRawInput() { - return isset($this->rawInput); + return $this->rawInput !== null; } /** @@ -477,7 +477,7 @@ public function setCountryCodeSource($value) */ public function hasPreferredDomesticCarrierCode() { - return isset($this->preferredDomesticCarrierCode); + return $this->preferredDomesticCarrierCode !== null; } /** diff --git a/src/PhoneNumberDesc.php b/src/PhoneNumberDesc.php index b115a4509..13d59e709 100644 --- a/src/PhoneNumberDesc.php +++ b/src/PhoneNumberDesc.php @@ -8,9 +8,9 @@ class PhoneNumberDesc { protected $hasNationalNumberPattern = false; - protected $nationalNumberPattern = ""; + protected $nationalNumberPattern = ''; protected $hasExampleNumber = false; - protected $exampleNumber = ""; + protected $exampleNumber = ''; /** * @var array */ diff --git a/src/PhoneNumberMatch.php b/src/PhoneNumberMatch.php index a3d2f97f2..ccfe2193d 100644 --- a/src/PhoneNumberMatch.php +++ b/src/PhoneNumberMatch.php @@ -33,7 +33,7 @@ class PhoneNumberMatch public function __construct($start, $rawString, PhoneNumber $number) { if ($start < 0) { - throw new \InvalidArgumentException("Start index must be >= 0."); + throw new \InvalidArgumentException('Start index must be >= 0.'); } if ($rawString === null) { diff --git a/src/PhoneNumberMatcher.php b/src/PhoneNumberMatcher.php index 8636d4e6b..4675ab544 100644 --- a/src/PhoneNumberMatcher.php +++ b/src/PhoneNumberMatcher.php @@ -107,7 +107,7 @@ protected static function init() static::$innerMatches = array( // Breaks on the slash - e.g. "651-234-2345/332-445-1234" - "/+(.*)", + '/+(.*)', // Note that the bracket here is inside the capturing group, since we consider it part of the // phone number. Will match a pattern like "(650) 223 3345 (754) 223 3321". "(\\([^(]*)", @@ -131,7 +131,7 @@ protected static function init() $openingParens = "(\\[\xEF\xBC\x88\xEF\xBC\xBB"; $closingParens = ")\\]\xEF\xBC\x89\xEF\xBC\xBD"; - $nonParens = "[^" . $openingParens . $closingParens . "]"; + $nonParens = '[^' . $openingParens . $closingParens . ']'; // Limit on the number of pairs of brackets in a phone number. $bracketPairLimit = static::limit(0, 3); @@ -142,10 +142,10 @@ protected static function init() * closing bracket first. We limit the sets of brackets in a phone number to four. */ static::$matchingBrackets = - "(?:[" . $openingParens . "])?" . "(?:" . $nonParens . "+" . "[" . $closingParens . "])?" - . $nonParens . "+" - . "(?:[" . $openingParens . "]" . $nonParens . "+[" . $closingParens . "])" . $bracketPairLimit - . $nonParens . "*"; + '(?:[' . $openingParens . '])?' . '(?:' . $nonParens . '+' . '[' . $closingParens . '])?' + . $nonParens . '+' + . '(?:[' . $openingParens . ']' . $nonParens . '+[' . $closingParens . '])' . $bracketPairLimit + . $nonParens . '*'; // Limit on the number of leading (plus) characters. $leadLimit = static::limit(0, 2); @@ -183,9 +183,9 @@ protected static function init() // Phone number pattern allowing optional punctuation. - static::$pattern = "(?:" . $leadClass . $punctuation . ")" . $leadLimit - . $digitSequence . "(?:" . $punctuation . $digitSequence . ")" . $blockLimit - . "(?:" . PhoneNumberUtil::$EXTN_PATTERNS_FOR_MATCHING . ")?"; + static::$pattern = '(?:' . $leadClass . $punctuation . ')' . $leadLimit + . $digitSequence . '(?:' . $punctuation . $digitSequence . ')' . $blockLimit + . '(?:' . PhoneNumberUtil::$EXTN_PATTERNS_FOR_MATCHING . ')?'; static::$initialized = true; } @@ -280,7 +280,7 @@ public function __construct(PhoneNumberUtil $util, $text, $country, AbstractLeni } $this->phoneUtil = $util; - $this->text = ($text !== null) ? $text : ""; + $this->text = ($text !== null) ? $text : ''; $this->preferredRegion = $country; $this->leniency = $leniency; $this->maxTries = $maxTries; @@ -640,12 +640,12 @@ protected static function getNationalNumberGroups( // The country-code will have a '-' following it. $startIndex = mb_strpos($rfc3966Format, '-') + 1; return explode('-', mb_substr($rfc3966Format, $startIndex, $endIndex - $startIndex)); - } else { - // We format the NSN only, and split that according to the separator. - $nationalSignificantNumber = $util->getNationalSignificantNumber($number); - return explode('-', $util->formatNsnUsingPattern($nationalSignificantNumber, $formattingPattern, - PhoneNumberFormat::RFC3966)); } + + // We format the NSN only, and split that according to the separator. + $nationalSignificantNumber = $util->getNationalSignificantNumber($number); + return explode('-', $util->formatNsnUsingPattern($nationalSignificantNumber, $formattingPattern, + PhoneNumberFormat::RFC3966)); } /** diff --git a/src/PhoneNumberToCarrierMapper.php b/src/PhoneNumberToCarrierMapper.php index 3cf375ddb..2c234e2e4 100644 --- a/src/PhoneNumberToCarrierMapper.php +++ b/src/PhoneNumberToCarrierMapper.php @@ -71,7 +71,7 @@ public static function getInstance($mappingDir = self::MAPPING_DATA_DIRECTORY) public function getNameForValidNumber(PhoneNumber $number, $languageCode) { $languageStr = Locale::getPrimaryLanguage($languageCode); - $scriptStr = ""; + $scriptStr = ''; $regionStr = Locale::getRegion($languageCode); return $this->prefixFileReader->getDescriptionForNumber($number, $languageStr, $scriptStr, $regionStr); @@ -94,7 +94,7 @@ public function getNameForNumber(PhoneNumber $number, $languageCode) if ($this->isMobile($numberType)) { return $this->getNameForValidNumber($number, $languageCode); } - return ""; + return ''; } /** @@ -110,7 +110,7 @@ public function getNameForNumber(PhoneNumber $number, $languageCode) public function getSafeDisplayName(PhoneNumber $number, $languageCode) { if ($this->phoneUtil->isMobileNumberPortableRegion($this->phoneUtil->getRegionCodeForNumber($number))) { - return ""; + return ''; } return $this->getNameForNumber($number, $languageCode); diff --git a/src/PhoneNumberToTimeZonesMapper.php b/src/PhoneNumberToTimeZonesMapper.php index 84652abe9..02a150c1a 100644 --- a/src/PhoneNumberToTimeZonesMapper.php +++ b/src/PhoneNumberToTimeZonesMapper.php @@ -14,11 +14,11 @@ class PhoneNumberToTimeZonesMapper { const UNKNOWN_TIMEZONE = 'Etc/Unknown'; const MAPPING_DATA_DIRECTORY = '/timezone/data/'; - const MAPPING_DATA_FILE_NAME = "map_data.php"; + const MAPPING_DATA_FILE_NAME = 'map_data.php'; /** * @var PhoneNumberToTimeZonesMapper */ - protected static $instance = null; + protected static $instance; protected $unknownTimeZoneList = array(); /** * @var PhoneNumberUtil @@ -39,7 +39,7 @@ protected function __construct($phonePrefixDataDirectory) protected static function loadPrefixTimeZonesMapFromFile($path) { if (!is_readable($path)) { - throw new \InvalidArgumentException("Mapping file can not be found"); + throw new \InvalidArgumentException('Mapping file can not be found'); } $data = require $path; @@ -90,7 +90,9 @@ public function getTimeZonesForNumber(PhoneNumber $number) if ($numberType === PhoneNumberType::UNKNOWN) { return $this->unknownTimeZoneList; - } elseif (!PhoneNumberUtil::getInstance()->isNumberGeographical($numberType, $number->getCountryCode())) { + } + + if (!PhoneNumberUtil::getInstance()->isNumberGeographical($numberType, $number->getCountryCode())) { return $this->getCountryLevelTimeZonesforNumber($number); } diff --git a/src/PhoneNumberUtil.php b/src/PhoneNumberUtil.php index 618880f9d..cbfac347d 100644 --- a/src/PhoneNumberUtil.php +++ b/src/PhoneNumberUtil.php @@ -35,41 +35,41 @@ class PhoneNumberUtil // The maximum length of the country calling code. const MAX_LENGTH_COUNTRY_CODE = 3; - const REGION_CODE_FOR_NON_GEO_ENTITY = "001"; + const REGION_CODE_FOR_NON_GEO_ENTITY = '001'; const META_DATA_FILE_PREFIX = 'PhoneNumberMetadata'; const TEST_META_DATA_FILE_PREFIX = 'PhoneNumberMetadataForTesting'; // Region-code for the unknown region. - const UNKNOWN_REGION = "ZZ"; + const UNKNOWN_REGION = 'ZZ'; const NANPA_COUNTRY_CODE = 1; /* * The prefix that needs to be inserted in front of a Colombian landline number when dialed from * a mobile number in Colombia. */ - const COLOMBIA_MOBILE_TO_FIXED_LINE_PREFIX = "3"; + const COLOMBIA_MOBILE_TO_FIXED_LINE_PREFIX = '3'; // The PLUS_SIGN signifies the international prefix. const PLUS_SIGN = '+'; const PLUS_CHARS = '+＋'; const STAR_SIGN = '*'; - const RFC3966_EXTN_PREFIX = ";ext="; - const RFC3966_PREFIX = "tel:"; - const RFC3966_PHONE_CONTEXT = ";phone-context="; - const RFC3966_ISDN_SUBADDRESS = ";isub="; + const RFC3966_EXTN_PREFIX = ';ext='; + const RFC3966_PREFIX = 'tel:'; + const RFC3966_PHONE_CONTEXT = ';phone-context='; + const RFC3966_ISDN_SUBADDRESS = ';isub='; // We use this pattern to check if the phone number has at least three letters in it - if so, then // we treat it as a number where some phone-number digits are represented by letters. - const VALID_ALPHA_PHONE_PATTERN = "(?:.*?[A-Za-z]){3}.*"; + const VALID_ALPHA_PHONE_PATTERN = '(?:.*?[A-Za-z]){3}.*'; // We accept alpha characters in phone numbers, ASCII only, upper and lower case. - const VALID_ALPHA = "A-Za-z"; + const VALID_ALPHA = 'A-Za-z'; // Default extension prefix to use when formatting. This will be put in front of any extension // component of the number, after the main national number is formatted. For example, if you wish // the default extension formatting to be " extn: 3456", then you should specify " extn: " here // as the default extension prefix. This can be overridden by region-specific preferences. - const DEFAULT_EXTN_PREFIX = " ext. "; + const DEFAULT_EXTN_PREFIX = ' ext. '; // Regular expression of acceptable punctuation found in phone numbers, used to find numbers in // text and to decide what is a viable phone number. This excludes diallable characters. @@ -107,7 +107,7 @@ class PhoneNumberUtil public static $PLUS_CHARS_PATTERN; protected static $SEPARATOR_PATTERN; protected static $CAPTURING_DIGIT_PATTERN; - protected static $VALID_START_CHAR_PATTERN = null; + protected static $VALID_START_CHAR_PATTERN; public static $SECOND_NUMBER_START_PATTERN = '[\\\\/] *x'; public static $UNWANTED_END_CHAR_PATTERN = "[[\\P{N}&&\\P{L}]&&[^#]]+$"; protected static $DIALLABLE_CHAR_MAPPINGS = array(); @@ -116,7 +116,7 @@ class PhoneNumberUtil /** * @var PhoneNumberUtil */ - protected static $instance = null; + protected static $instance; /** * Only upper-case variants of alpha characters are stored. @@ -184,7 +184,7 @@ class PhoneNumberUtil * For performance reasons, amalgamate both into one map. * @var array */ - protected static $ALPHA_PHONE_MAPPINGS = null; + protected static $ALPHA_PHONE_MAPPINGS; /** * Separate map of all symbols that we wish to retain when formatting alpha numbers. This @@ -223,8 +223,8 @@ class PhoneNumberUtil * @internal */ public static $EXTN_PATTERNS_FOR_MATCHING; - protected static $EXTN_PATTERN = null; - protected static $VALID_PHONE_NUMBER_PATTERN = null; + protected static $EXTN_PATTERN; + protected static $VALID_PHONE_NUMBER_PATTERN; protected static $MIN_LENGTH_PHONE_NUMBER_PATTERN; /** * Regular expression of viable phone numbers. This is location independent. Checks we have at @@ -341,9 +341,9 @@ protected function __construct(MetadataSourceInterface $metadataSource, $country static::initCapturingExtnDigits(); static::initExtnPatterns(); static::initExtnPattern(); - static::$PLUS_CHARS_PATTERN = "[" . static::PLUS_CHARS . "]+"; - static::$SEPARATOR_PATTERN = "[" . static::VALID_PUNCTUATION . "]+"; - static::$CAPTURING_DIGIT_PATTERN = "(" . static::DIGITS . ")"; + static::$PLUS_CHARS_PATTERN = '[' . static::PLUS_CHARS . ']+'; + static::$SEPARATOR_PATTERN = '[' . static::VALID_PUNCTUATION . ']+'; + static::$CAPTURING_DIGIT_PATTERN = '(' . static::DIGITS . ')'; static::initValidStartCharPattern(); static::initAlphaPhoneMappings(); static::initDiallableCharMappings(); @@ -355,7 +355,7 @@ protected function __construct(MetadataSourceInterface $metadataSource, $country static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS[$c] = $c; } static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS += static::$asciiDigitMappings; - static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["-"] = '-'; + static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS['-'] = '-'; static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xEF\xBC\x8D"] = '-'; static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE2\x80\x90"] = '-'; static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE2\x80\x91"] = '-'; @@ -364,18 +364,18 @@ protected function __construct(MetadataSourceInterface $metadataSource, $country static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE2\x80\x94"] = '-'; static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE2\x80\x95"] = '-'; static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE2\x88\x92"] = '-'; - static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["/"] = "/"; - static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xEF\xBC\x8F"] = "/"; - static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS[" "] = " "; - static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE3\x80\x80"] = " "; - static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE2\x81\xA0"] = " "; - static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["."] = "."; - static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xEF\xBC\x8E"] = "."; + static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS['/'] = '/'; + static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xEF\xBC\x8F"] = '/'; + static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS[' '] = ' '; + static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE3\x80\x80"] = ' '; + static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xE2\x81\xA0"] = ' '; + static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS['.'] = '.'; + static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS["\xEF\xBC\x8E"] = '.'; static::initValidPhoneNumberPatterns(); - static::$UNWANTED_END_CHAR_PATTERN = "[^" . static::DIGITS . static::VALID_ALPHA . "#]+$"; + static::$UNWANTED_END_CHAR_PATTERN = '[^' . static::DIGITS . static::VALID_ALPHA . '#]+$'; static::initMobileTokenMappings(); @@ -459,7 +459,7 @@ protected function init() */ public static function initCapturingExtnDigits() { - static::$CAPTURING_EXTN_DIGITS = "(" . static::DIGITS . "{1,7})"; + static::$CAPTURING_EXTN_DIGITS = '(' . static::DIGITS . '{1,7})'; } /** @@ -472,7 +472,7 @@ public static function initExtnPatterns() // For parsing, we are slightly more lenient in our interpretation than for matching. Here we // allow "comma" and "semicolon" as possible extension indicators. When matching, these are // hardly ever used to indicate this. - $singleExtnSymbolsForParsing = ",;" . $singleExtnSymbolsForMatching; + $singleExtnSymbolsForParsing = ',;' . $singleExtnSymbolsForMatching; static::$EXTN_PATTERNS_FOR_PARSING = static::createExtnPattern($singleExtnSymbolsForParsing); static::$EXTN_PATTERNS_FOR_MATCHING = static::createExtnPattern($singleExtnSymbolsForMatching); @@ -496,25 +496,25 @@ protected static function createExtnPattern($singleExtnSymbols) // Canonical-equivalence doesn't seem to be an option with Android java, so we allow two options // for representing the accented o - the character itself, and one in the unicode decomposed // form with the combining acute accent. - return (static::RFC3966_EXTN_PREFIX . static::$CAPTURING_EXTN_DIGITS . "|" . "[ \xC2\xA0\\t,]*" . + return (static::RFC3966_EXTN_PREFIX . static::$CAPTURING_EXTN_DIGITS . '|' . "[ \xC2\xA0\\t,]*" . "(?:e?xt(?:ensi(?:o\xCC\x81?|\xC3\xB3))?n?|(?:\xEF\xBD\x85)?\xEF\xBD\x98\xEF\xBD\x94(?:\xEF\xBD\x8E)?|" . - "доб|" . "[" . $singleExtnSymbols . "]|int|\xEF\xBD\x89\xEF\xBD\x8E\xEF\xBD\x94|anexo)" . + 'доб|' . '[' . $singleExtnSymbols . "]|int|\xEF\xBD\x89\xEF\xBD\x8E\xEF\xBD\x94|anexo)" . "[:\\.\xEF\xBC\x8E]?[ \xC2\xA0\\t,-]*" . static::$CAPTURING_EXTN_DIGITS . "\\#?|" . - "[- ]+(" . static::DIGITS . "{1,5})\\#"); + '[- ]+(' . static::DIGITS . "{1,5})\\#"); } protected static function initExtnPattern() { - static::$EXTN_PATTERN = "/(?:" . static::$EXTN_PATTERNS_FOR_PARSING . ")$/" . static::REGEX_FLAGS; + static::$EXTN_PATTERN = '/(?:' . static::$EXTN_PATTERNS_FOR_PARSING . ')$/' . static::REGEX_FLAGS; } protected static function initValidPhoneNumberPatterns() { static::initCapturingExtnDigits(); static::initExtnPatterns(); - static::$MIN_LENGTH_PHONE_NUMBER_PATTERN = "[" . static::DIGITS . "]{" . static::MIN_LENGTH_FOR_NSN . "}"; - static::$VALID_PHONE_NUMBER = "[" . static::PLUS_CHARS . "]*(?:[" . static::VALID_PUNCTUATION . static::STAR_SIGN . "]*[" . static::DIGITS . "]){3,}[" . static::VALID_PUNCTUATION . static::STAR_SIGN . static::VALID_ALPHA . static::DIGITS . "]*"; - static::$VALID_PHONE_NUMBER_PATTERN = "%^" . static::$MIN_LENGTH_PHONE_NUMBER_PATTERN . "$|^" . static::$VALID_PHONE_NUMBER . "(?:" . static::$EXTN_PATTERNS_FOR_PARSING . ")?$%" . static::REGEX_FLAGS; + static::$MIN_LENGTH_PHONE_NUMBER_PATTERN = '[' . static::DIGITS . ']{' . static::MIN_LENGTH_FOR_NSN . '}'; + static::$VALID_PHONE_NUMBER = '[' . static::PLUS_CHARS . ']*(?:[' . static::VALID_PUNCTUATION . static::STAR_SIGN . ']*[' . static::DIGITS . ']){3,}[' . static::VALID_PUNCTUATION . static::STAR_SIGN . static::VALID_ALPHA . static::DIGITS . ']*'; + static::$VALID_PHONE_NUMBER_PATTERN = '%^' . static::$MIN_LENGTH_PHONE_NUMBER_PATTERN . '$|^' . static::$VALID_PHONE_NUMBER . '(?:' . static::$EXTN_PATTERNS_FOR_PARSING . ')?$%' . static::REGEX_FLAGS; } protected static function initAlphaPhoneMappings() @@ -524,14 +524,14 @@ protected static function initAlphaPhoneMappings() protected static function initValidStartCharPattern() { - static::$VALID_START_CHAR_PATTERN = "[" . static::PLUS_CHARS . static::DIGITS . "]"; + static::$VALID_START_CHAR_PATTERN = '[' . static::PLUS_CHARS . static::DIGITS . ']'; } protected static function initMobileTokenMappings() { static::$MOBILE_TOKEN_MAPPINGS = array(); - static::$MOBILE_TOKEN_MAPPINGS['52'] = "1"; - static::$MOBILE_TOKEN_MAPPINGS['54'] = "9"; + static::$MOBILE_TOKEN_MAPPINGS['52'] = '1'; + static::$MOBILE_TOKEN_MAPPINGS['54'] = '9'; } protected static function initDiallableCharMappings() @@ -579,16 +579,14 @@ public static function convertAlphaCharactersInNumber($number) */ protected static function normalizeHelper($number, array $normalizationReplacements, $removeNonMatches) { - $normalizedNumber = ""; + $normalizedNumber = ''; $strLength = mb_strlen($number, 'UTF-8'); for ($i = 0; $i < $strLength; $i++) { $character = mb_substr($number, $i, 1, 'UTF-8'); if (isset($normalizationReplacements[mb_strtoupper($character, 'UTF-8')])) { $normalizedNumber .= $normalizationReplacements[mb_strtoupper($character, 'UTF-8')]; - } else { - if (!$removeNonMatches) { - $normalizedNumber .= $character; - } + } elseif (!$removeNonMatches) { + $normalizedNumber .= $character; } // If neither of the above are true, we remove this character. } @@ -693,7 +691,7 @@ private function getSupportedTypesForMetadata(PhoneMetadata $metadata) continue; } - if ($this->descHasData($this->getNumberDescByType($metadata, $type))) { + if (self::descHasData($this->getNumberDescByType($metadata, $type))) { $types[] = $type; } } @@ -851,9 +849,9 @@ public function getRegionCodeForNumber(PhoneNumber $number) $regions = $this->countryCallingCodeToRegionCodeMap[$countryCode]; if (count($regions) == 1) { return $regions[0]; - } else { - return $this->getRegionCodeForNumberFromRegionList($number, $regions); } + + return $this->getRegionCodeForNumberFromRegionList($number, $regions); } /** @@ -944,7 +942,9 @@ protected function getNumberTypeHelper($nationalNumber, PhoneMetadata $metadata) if ($isFixedLine) { if ($metadata->getSameMobileAndFixedLinePattern()) { return PhoneNumberType::FIXED_LINE_OR_MOBILE; - } elseif ($this->isNumberMatchingDesc($nationalNumber, $metadata->getMobile())) { + } + + if ($this->isNumberMatchingDesc($nationalNumber, $metadata->getMobile())) { return PhoneNumberType::FIXED_LINE_OR_MOBILE; } return PhoneNumberType::FIXED_LINE; @@ -1107,7 +1107,7 @@ public function getLengthOfNationalDestinationCode(PhoneNumber $number) // separately from the rest of the phone number. $mobileToken = static::getCountryMobileToken($number->getCountryCode()); - if ($mobileToken !== "") { + if ($mobileToken !== '') { return mb_strlen($numberGroups[2]) + mb_strlen($numberGroups[3]); } } @@ -1142,7 +1142,7 @@ public function format(PhoneNumber $number, $numberFormat) } } - $formattedNumber = ""; + $formattedNumber = ''; $countryCallingCode = $number->getCountryCode(); $nationalSignificantNumber = $this->getNationalSignificantNumber($number); @@ -1185,10 +1185,10 @@ protected function prefixNumberWithCountryCallingCode($countryCallingCode, $numb $formattedNumber = static::PLUS_SIGN . $countryCallingCode . $formattedNumber; return; case PhoneNumberFormat::INTERNATIONAL: - $formattedNumber = static::PLUS_SIGN . $countryCallingCode . " " . $formattedNumber; + $formattedNumber = static::PLUS_SIGN . $countryCallingCode . ' ' . $formattedNumber; return; case PhoneNumberFormat::RFC3966: - $formattedNumber = static::RFC3966_PREFIX . static::PLUS_SIGN . $countryCallingCode . "-" . $formattedNumber; + $formattedNumber = static::RFC3966_PREFIX . static::PLUS_SIGN . $countryCallingCode . '-' . $formattedNumber; return; case PhoneNumberFormat::NATIONAL: default: @@ -1323,10 +1323,10 @@ public function formatNsnUsingPattern( // Strip any leading punctuation. $matcher = new Matcher(static::$SEPARATOR_PATTERN, $formattedNationalNumber); if ($matcher->lookingAt()) { - $formattedNationalNumber = $matcher->replaceFirst(""); + $formattedNationalNumber = $matcher->replaceFirst(''); } // Replace the rest with a dash between each number group. - $formattedNationalNumber = $matcher->reset($formattedNationalNumber)->replaceAll("-"); + $formattedNationalNumber = $matcher->reset($formattedNationalNumber)->replaceAll('-'); } return $formattedNationalNumber; } @@ -1345,12 +1345,10 @@ protected function maybeAppendFormattedExtension(PhoneNumber $number, $metadata, if ($number->hasExtension() && mb_strlen($number->getExtension()) > 0) { if ($numberFormat === PhoneNumberFormat::RFC3966) { $formattedNumber .= static::RFC3966_EXTN_PREFIX . $number->getExtension(); + } elseif (!empty($metadata) && $metadata->hasPreferredExtnPrefix()) { + $formattedNumber .= $metadata->getPreferredExtnPrefix() . $number->getExtension(); } else { - if (!empty($metadata) && $metadata->hasPreferredExtnPrefix()) { - $formattedNumber .= $metadata->getPreferredExtnPrefix() . $number->getExtension(); - } else { - $formattedNumber .= static::DEFAULT_EXTN_PREFIX . $number->getExtension(); - } + $formattedNumber .= static::DEFAULT_EXTN_PREFIX . $number->getExtension(); } } } @@ -1372,7 +1370,7 @@ public static function getCountryMobileToken($countryCallingCode) if (array_key_exists($countryCallingCode, static::$MOBILE_TOKEN_MAPPINGS)) { return static::$MOBILE_TOKEN_MAPPINGS[$countryCallingCode]; } - return ""; + return ''; } /** @@ -1448,7 +1446,7 @@ protected function maybeStripExtension(&$number) // The numbers are captured into groups in the regular expression. for ($i = 1, $length = count($matches); $i <= $length; $i++) { - if ($matches[$i][0] != "") { + if ($matches[$i][0] != '') { // We go through the capturing groups until we find one that captured some digits. If none // did, then we will return the empty string. $extension = $matches[$i][0]; @@ -1457,7 +1455,7 @@ protected function maybeStripExtension(&$number) } } } - return ""; + return ''; } /** @@ -1551,7 +1549,7 @@ public static function setItalianLeadingZerosForPhoneNumber($nationalNumber, Pho protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $checkRegion, PhoneNumber $phoneNumber) { if ($numberToParse === null) { - throw new NumberParseException(NumberParseException::NOT_A_NUMBER, "The phone number supplied was null."); + throw new NumberParseException(NumberParseException::NOT_A_NUMBER, 'The phone number supplied was null.'); } $numberToParse = trim($numberToParse); @@ -1559,7 +1557,7 @@ protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $c if (mb_strlen($numberToParse) > static::MAX_INPUT_STRING_LENGTH) { throw new NumberParseException( NumberParseException::TOO_LONG, - "The string supplied was too long to parse." + 'The string supplied was too long to parse.' ); } @@ -1569,7 +1567,7 @@ protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $c if (!static::isViablePhoneNumber($nationalNumber)) { throw new NumberParseException( NumberParseException::NOT_A_NUMBER, - "The string supplied did not seem to be a phone number." + 'The string supplied did not seem to be a phone number.' ); } @@ -1578,7 +1576,7 @@ protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $c if ($checkRegion && !$this->checkRegionForParsing($nationalNumber, $defaultRegion)) { throw new NumberParseException( NumberParseException::INVALID_COUNTRY_CODE, - "Missing or invalid default region." + 'Missing or invalid default region.' ); } @@ -1595,7 +1593,7 @@ protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $c $regionMetadata = $this->getMetadataForRegion($defaultRegion); // Check to see if the number is given in international format so we know whether this number is // from the default region or not. - $normalizedNationalNumber = ""; + $normalizedNationalNumber = ''; try { // TODO: This method should really just take in the string buffer that has already // been created, and just remove the prefix, rather than taking in a string and then @@ -1621,7 +1619,7 @@ protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $c if ($countryCode == 0) { throw new NumberParseException( NumberParseException::INVALID_COUNTRY_CODE, - "Could not interpret numbers after plus-sign." + 'Could not interpret numbers after plus-sign.' ); } } else { @@ -1649,11 +1647,11 @@ protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $c if (mb_strlen($normalizedNationalNumber) < static::MIN_LENGTH_FOR_NSN) { throw new NumberParseException( NumberParseException::TOO_SHORT_NSN, - "The string supplied is too short to be a phone number." + 'The string supplied is too short to be a phone number.' ); } if ($regionMetadata !== null) { - $carrierCode = ""; + $carrierCode = ''; $potentialNationalNumber = $normalizedNationalNumber; $this->maybeStripNationalPrefixAndCarrierCode($potentialNationalNumber, $regionMetadata, $carrierCode); // We require that the NSN remaining after stripping the national prefix and carrier code be @@ -1673,13 +1671,13 @@ protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $c if ($lengthOfNationalNumber < static::MIN_LENGTH_FOR_NSN) { throw new NumberParseException( NumberParseException::TOO_SHORT_NSN, - "The string supplied is too short to be a phone number." + 'The string supplied is too short to be a phone number.' ); } if ($lengthOfNationalNumber > static::MAX_LENGTH_FOR_NSN) { throw new NumberParseException( NumberParseException::TOO_LONG, - "The string supplied is too long to be a phone number." + 'The string supplied is too long to be a phone number.' ); } static::setItalianLeadingZerosForPhoneNumber($normalizedNationalNumber, $phoneNumber); @@ -1693,7 +1691,7 @@ protected function parseHelper($numberToParse, $defaultRegion, $keepRawInput, $c * We have to remove the leading zeroes ourself though */ if ((int)$normalizedNationalNumber == 0) { - $normalizedNationalNumber = "0"; + $normalizedNationalNumber = '0'; } else { $normalizedNationalNumber = ltrim($normalizedNationalNumber, '0'); } @@ -1758,7 +1756,8 @@ protected function buildNationalNumberForParsing($numberToParse, &$nationalNumbe $indexOfRfc3966Prefix = strpos($numberToParse, static::RFC3966_PREFIX); $indexOfNationalNumber = ($indexOfRfc3966Prefix !== false) ? $indexOfRfc3966Prefix + strlen(static::RFC3966_PREFIX) : 0; - $nationalNumber .= substr($numberToParse, $indexOfNationalNumber, ($indexOfPhoneContext - $indexOfNationalNumber)); + $nationalNumber .= substr($numberToParse, $indexOfNationalNumber, + $indexOfPhoneContext - $indexOfNationalNumber); } else { // Extract a possible number from the string passed in (this strips leading characters that // could not be the start of a phone number.) @@ -1815,9 +1814,9 @@ public static function extractPossibleNumber($number) } return $number; - } else { - return ""; } + + return ''; } /** @@ -1884,7 +1883,7 @@ public function maybeExtractCountryCode( } $fullNumber = $number; // Set the default prefix to be something that will never match. - $possibleCountryIddPrefix = "NonMatch"; + $possibleCountryIddPrefix = 'NonMatch'; if ($defaultRegionMetadata !== null) { $possibleCountryIddPrefix = $defaultRegionMetadata->getInternationalPrefix(); } @@ -1897,7 +1896,7 @@ public function maybeExtractCountryCode( if (mb_strlen($fullNumber) <= static::MIN_LENGTH_FOR_NSN) { throw new NumberParseException( NumberParseException::TOO_SHORT_AFTER_IDD, - "Phone number had an IDD, but after this was not long enough to be a viable phone number." + 'Phone number had an IDD, but after this was not long enough to be a viable phone number.' ); } $potentialCountryCode = $this->extractCountryCode($fullNumber, $nationalNumber); @@ -1911,15 +1910,17 @@ public function maybeExtractCountryCode( // or that doesn't exist. throw new NumberParseException( NumberParseException::INVALID_COUNTRY_CODE, - "Country calling code supplied was not recognised." + 'Country calling code supplied was not recognised.' ); - } elseif ($defaultRegionMetadata !== null) { + } + + if ($defaultRegionMetadata !== null) { // Check to see if the number starts with the country calling code for the default region. If // so, we remove the country calling code, and do some checks on the validity of the number // before and after. $defaultCountryCode = $defaultRegionMetadata->getCountryCode(); $defaultCountryCodeString = (string)$defaultCountryCode; - $normalizedNumber = (string)$fullNumber; + $normalizedNumber = $fullNumber; if (strpos($normalizedNumber, $defaultCountryCodeString) === 0) { $potentialNationalNumber = substr($normalizedNumber, mb_strlen($defaultCountryCodeString)); $generalDesc = $defaultRegionMetadata->getGeneralDesc(); @@ -2011,9 +2012,9 @@ public static function normalize(&$number) $m = new Matcher(static::VALID_ALPHA_PHONE_PATTERN, $number); if ($m->matches()) { return static::normalizeHelper($number, static::$ALPHA_PHONE_MAPPINGS, true); - } else { - return static::normalizeDigitsOnly($number); } + + return static::normalizeDigitsOnly($number); } /** @@ -2035,7 +2036,7 @@ public static function normalizeDigitsOnly($number) */ public static function normalizeDigits($number, $keepNonDigits) { - $normalizedDigits = ""; + $normalizedDigits = ''; $numberAsArray = preg_split('/(?find()) { $normalizedGroup = static::normalizeDigitsOnly($digitMatcher->group(1)); - if ($normalizedGroup == "0") { + if ($normalizedGroup == '0') { return false; } } @@ -2148,26 +2149,26 @@ public function maybeStripNationalPrefixAndCarrierCode(&$number, PhoneMetadata $ $number = substr($number, $prefixMatcher->end()); return true; - } else { - // Check that the resultant number is still viable. If not, return. Check this by copying - // the string and making the transformation on the copy first. - $transformedNumber = $number; - $transformedNumber = substr_replace( - $transformedNumber, - $prefixMatcher->replaceFirst($transformRule), - 0, - $numberLength - ); - if ($isViableOriginalNumber - && !$this->matcherAPI->matchNationalNumber($transformedNumber, $generalDesc, false)) { - return false; - } - if ($carrierCode !== null && $numOfGroups > 1) { - $carrierCode .= $prefixMatcher->group(1); - } - $number = substr_replace($number, $transformedNumber, 0, mb_strlen($number)); - return true; } + + // Check that the resultant number is still viable. If not, return. Check this by copying + // the string and making the transformation on the copy first. + $transformedNumber = $number; + $transformedNumber = substr_replace( + $transformedNumber, + $prefixMatcher->replaceFirst($transformRule), + 0, + $numberLength + ); + if ($isViableOriginalNumber + && !$this->matcherAPI->matchNationalNumber($transformedNumber, $generalDesc, false)) { + return false; + } + if ($carrierCode !== null && $numOfGroups > 1) { + $carrierCode .= $prefixMatcher->group(1); + } + $number = substr_replace($number, $transformedNumber, 0, mb_strlen($number)); + return true; } return false; } @@ -2219,26 +2220,26 @@ protected function testNumberLength($number, PhoneMetadata $metadata, $type = Ph // The rate case has been encountered where no fixedLine data is available (true for some // non-geographical entities), so we just check mobile. return $this->testNumberLength($number, $metadata, PhoneNumberType::MOBILE); - } else { - $mobileDesc = $this->getNumberDescByType($metadata, PhoneNumberType::MOBILE); - if (static::descHasPossibleNumberData($mobileDesc)) { - // Note that when adding the possible lengths from mobile, we have to again check they - // aren't empty since if they are this indicates they are the same as the general desc and - // should be obtained from there. - $possibleLengths = array_merge($possibleLengths, - (count($mobileDesc->getPossibleLength()) === 0) - ? $metadata->getGeneralDesc()->getPossibleLength() : $mobileDesc->getPossibleLength()); - - // The current list is sorted; we need to merge in the new list and re-sort (duplicates - // are okay). Sorting isn't so expensive because the lists are very small. - sort($possibleLengths); - - if (count($localLengths) === 0) { - $localLengths = $mobileDesc->getPossibleLengthLocalOnly(); - } else { - $localLengths = array_merge($localLengths, $mobileDesc->getPossibleLengthLocalOnly()); - sort($localLengths); - } + } + + $mobileDesc = $this->getNumberDescByType($metadata, PhoneNumberType::MOBILE); + if (static::descHasPossibleNumberData($mobileDesc)) { + // Note that when adding the possible lengths from mobile, we have to again check they + // aren't empty since if they are this indicates they are the same as the general desc and + // should be obtained from there. + $possibleLengths = array_merge($possibleLengths, + (count($mobileDesc->getPossibleLength()) === 0) + ? $metadata->getGeneralDesc()->getPossibleLength() : $mobileDesc->getPossibleLength()); + + // The current list is sorted; we need to merge in the new list and re-sort (duplicates + // are okay). Sorting isn't so expensive because the lists are very small. + sort($possibleLengths); + + if (count($localLengths) === 0) { + $localLengths = $mobileDesc->getPossibleLengthLocalOnly(); + } else { + $localLengths = array_merge($localLengths, $mobileDesc->getPossibleLengthLocalOnly()); + sort($localLengths); } } } @@ -2263,7 +2264,9 @@ protected function testNumberLength($number, PhoneMetadata $metadata, $type = Ph $minimumLength = reset($possibleLengths); if ($minimumLength == $actualLength) { return ValidationResult::IS_POSSIBLE; - } elseif ($minimumLength > $actualLength) { + } + + if ($minimumLength > $actualLength) { return ValidationResult::TOO_SHORT; } elseif (isset($possibleLengths[count($possibleLengths) - 1]) && $possibleLengths[count($possibleLengths) - 1] < $actualLength) { return ValidationResult::TOO_LONG; @@ -2314,7 +2317,7 @@ protected function getCountryCodeForValidRegion($regionCode) { $metadata = $this->getMetadataForRegion($regionCode); if ($metadata === null) { - throw new \InvalidArgumentException("Invalid region code: " . $regionCode); + throw new \InvalidArgumentException('Invalid region code: ' . $regionCode); } return $metadata->getCountryCode(); } @@ -2335,10 +2338,10 @@ public function formatNumberForMobileDialing(PhoneNumber $number, $regionCalling { $countryCallingCode = $number->getCountryCode(); if (!$this->hasValidCountryCallingCode($countryCallingCode)) { - return $number->hasRawInput() ? $number->getRawInput() : ""; + return $number->hasRawInput() ? $number->getRawInput() : ''; } - $formattedNumber = ""; + $formattedNumber = ''; // Clear the extension, as that part cannot normally be dialed together with the main number. $numberNoExt = new PhoneNumber(); $numberNoExt->mergeFrom($number)->clearExtension(); @@ -2348,22 +2351,22 @@ public function formatNumberForMobileDialing(PhoneNumber $number, $regionCalling if ($regionCallingFrom == $regionCode) { $isFixedLineOrMobile = ($numberType == PhoneNumberType::FIXED_LINE) || ($numberType == PhoneNumberType::MOBILE) || ($numberType == PhoneNumberType::FIXED_LINE_OR_MOBILE); // Carrier codes may be needed in some countries. We handle this here. - if ($regionCode == "CO" && $numberType == PhoneNumberType::FIXED_LINE) { + if ($regionCode == 'CO' && $numberType == PhoneNumberType::FIXED_LINE) { $formattedNumber = $this->formatNationalNumberWithCarrierCode( $numberNoExt, static::COLOMBIA_MOBILE_TO_FIXED_LINE_PREFIX ); - } elseif ($regionCode == "BR" && $isFixedLineOrMobile) { + } elseif ($regionCode == 'BR' && $isFixedLineOrMobile) { // Historically, we set this to an empty string when parsing with raw input if none was // found in the input string. However, this doesn't result in a number we can dial. For this // reason, we treat the empty string the same as if it isn't set at all. $formattedNumber = mb_strlen($numberNoExt->getPreferredDomesticCarrierCode()) > 0 - ? $this->formatNationalNumberWithPreferredCarrierCode($numberNoExt, "") + ? $this->formatNationalNumberWithPreferredCarrierCode($numberNoExt, '') // Brazilian fixed line and mobile numbers need to be dialed with a carrier code when // called within Brazil. Without that, most of the carriers won't connect the call. // Because of that, we return an empty string here. - : ""; - } elseif ($isValidNumber && $regionCode == "HU") { + : ''; + } elseif ($isValidNumber && $regionCode == 'HU') { // The national format for HU numbers doesn't contain the national prefix, because that is // how numbers are normally written down. However, the national prefix is obligatory when // dialing from a mobile phone, except for short numbers. As a result, we add it back here @@ -2371,7 +2374,7 @@ public function formatNumberForMobileDialing(PhoneNumber $number, $regionCalling $formattedNumber = $this->getNddPrefixForRegion( $regionCode, true /* strip non-digits */ - ) . " " . $this->format($numberNoExt, PhoneNumberFormat::NATIONAL); + ) . ' ' . $this->format($numberNoExt, PhoneNumberFormat::NATIONAL); } elseif ($countryCallingCode === static::NANPA_COUNTRY_CODE) { // For NANPA countries, we output international format for numbers that can be dialed // internationally, since that always works, except for numbers which might potentially be @@ -2385,29 +2388,24 @@ public function formatNumberForMobileDialing(PhoneNumber $number, $regionCalling } else { $formattedNumber = $this->format($numberNoExt, PhoneNumberFormat::NATIONAL); } + } elseif (($regionCode == static::REGION_CODE_FOR_NON_GEO_ENTITY || + // MX fixed line and mobile numbers should always be formatted in international format, + // even when dialed within MX. For national format to work, a carrier code needs to be + // used, and the correct carrier code depends on if the caller and callee are from the + // same local area. It is trickier to get that to work correctly than using + // international format, which is tested to work fine on all carriers. + // CL fixed line numbers need the national prefix when dialing in the national format, + // but don't have it when used for display. The reverse is true for mobile numbers. + // As a result, we output them in the international format to make it work. + ( + ($regionCode === 'MX' || $regionCode === 'CL' || $regionCode === 'UZ') + && $isFixedLineOrMobile + ) + ) && $this->canBeInternationallyDialled($numberNoExt) + ) { + $formattedNumber = $this->format($numberNoExt, PhoneNumberFormat::INTERNATIONAL); } else { - // For non-geographical countries andMexican, Chilean and Uzbek fixed line and mobile - // numbers, we output international format for numbers that can be dialed internationally as - // that always works. - if (($regionCode == static::REGION_CODE_FOR_NON_GEO_ENTITY || - // MX fixed line and mobile numbers should always be formatted in international format, - // even when dialed within MX. For national format to work, a carrier code needs to be - // used, and the correct carrier code depends on if the caller and callee are from the - // same local area. It is trickier to get that to work correctly than using - // international format, which is tested to work fine on all carriers. - // CL fixed line numbers need the national prefix when dialing in the national format, - // but don't have it when used for display. The reverse is true for mobile numbers. - // As a result, we output them in the international format to make it work. - ( - ($regionCode == 'MX' || $regionCode == 'CL' || $regionCode == 'UZ') - && $isFixedLineOrMobile - ) - ) && $this->canBeInternationallyDialled($numberNoExt) - ) { - $formattedNumber = $this->format($numberNoExt, PhoneNumberFormat::INTERNATIONAL); - } else { - $formattedNumber = $this->format($numberNoExt, PhoneNumberFormat::NATIONAL); - } + $formattedNumber = $this->format($numberNoExt, PhoneNumberFormat::NATIONAL); } } elseif ($isValidNumber && $this->canBeInternationallyDialled($numberNoExt)) { // We assume that short numbers are not diallable from outside their region, so if a number @@ -2568,7 +2566,7 @@ public function formatOutOfCountryKeepingAlphaChars(PhoneNumber $number, $region // the number in raw_input with the parsed number. // To do this, first we normalize punctuation. We retain number grouping symbols such as " " // only. - $rawInput = $this->normalizeHelper($rawInput, static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS, true); + $rawInput = self::normalizeHelper($rawInput, static::$ALL_PLUS_NUMBER_GROUPING_SYMBOLS, true); // Now we trim everything before the first three digits in the parsed number. We choose three // because all valid alpha numbers have 3 digits at the start - if it does not, then we don't // trim anything at all. Similarly, if the national number was less than three digits, we don't @@ -2583,7 +2581,7 @@ public function formatOutOfCountryKeepingAlphaChars(PhoneNumber $number, $region $metadataForRegionCallingFrom = $this->getMetadataForRegion($regionCallingFrom); if ($countryCode == static::NANPA_COUNTRY_CODE) { if ($this->isNANPACountry($regionCallingFrom)) { - return $countryCode . " " . $rawInput; + return $countryCode . ' ' . $rawInput; } } elseif ($metadataForRegionCallingFrom !== null && $countryCode == $this->getCountryCodeForValidRegion($regionCallingFrom) @@ -2602,7 +2600,7 @@ public function formatOutOfCountryKeepingAlphaChars(PhoneNumber $number, $region // The first group is the first group of digits that the user wrote together. $newFormat->setPattern("(\\d+)(.*)"); // Here we just concatenate them back together after the national prefix has been fixed. - $newFormat->setFormat("$1$2"); + $newFormat->setFormat('$1$2'); // Now we format using this pattern instead of the default pattern, but with the national // prefix prefixed if necessary. // This will not work in the cases where the pattern (and not the leading digits) decide @@ -2610,7 +2608,7 @@ public function formatOutOfCountryKeepingAlphaChars(PhoneNumber $number, $region // anything, but that is not the case in the metadata to date. return $this->formatNsnUsingPattern($rawInput, $newFormat, PhoneNumberFormat::NATIONAL); } - $internationalPrefixForFormatting = ""; + $internationalPrefixForFormatting = ''; // If an unsupported region-calling-from is entered, or a country with multiple international // prefixes, the international format of the number is returned, unless there is a preferred // international prefix. @@ -2633,7 +2631,7 @@ public function formatOutOfCountryKeepingAlphaChars(PhoneNumber $number, $region $formattedNumber ); if (mb_strlen($internationalPrefixForFormatting) > 0) { - $formattedNumber = $internationalPrefixForFormatting . " " . $countryCode . " " . $formattedNumber; + $formattedNumber = $internationalPrefixForFormatting . ' ' . $countryCode . ' ' . $formattedNumber; } else { // Invalid region entered as country-calling-from (so no metadata was found for it) or the // region chosen has multiple international dialling prefixes. @@ -2677,7 +2675,7 @@ public function formatOutOfCountryCallingNumber(PhoneNumber $number, $regionCall if ($this->isNANPACountry($regionCallingFrom)) { // For NANPA regions, return the national format for these regions but prefix it with the // country calling code. - return $countryCallingCode . " " . $this->format($number, PhoneNumberFormat::NATIONAL); + return $countryCallingCode . ' ' . $this->format($number, PhoneNumberFormat::NATIONAL); } } elseif ($countryCallingCode == $this->getCountryCodeForValidRegion($regionCallingFrom)) { // If regions share a country calling code, the country calling code need not be dialled. @@ -2695,7 +2693,7 @@ public function formatOutOfCountryCallingNumber(PhoneNumber $number, $regionCall // For regions that have multiple international prefixes, the international format of the // number is returned, unless there is a preferred international prefix. - $internationalPrefixForFormatting = ""; + $internationalPrefixForFormatting = ''; $uniqueInternationalPrefixMatcher = new Matcher(static::SINGLE_INTERNATIONAL_PREFIX, $internationalPrefix); if ($uniqueInternationalPrefixMatcher->matches()) { @@ -2720,7 +2718,7 @@ public function formatOutOfCountryCallingNumber(PhoneNumber $number, $regionCall $formattedNumber ); if (mb_strlen($internationalPrefixForFormatting) > 0) { - $formattedNumber = $internationalPrefixForFormatting . " " . $countryCallingCode . " " . $formattedNumber; + $formattedNumber = $internationalPrefixForFormatting . ' ' . $countryCallingCode . ' ' . $formattedNumber; } else { $this->prefixNumberWithCountryCallingCode( $countryCallingCode, @@ -2898,7 +2896,7 @@ public function getNddPrefixForRegion($regionCode, $stripNonDigits) if ($stripNonDigits) { // Note: if any other non-numeric symbols are ever used in national prefixes, these would have // to be removed here as well. - $nationalPrefix = str_replace("~", "", $nationalPrefix); + $nationalPrefix = str_replace('~', '', $nationalPrefix); } return $nationalPrefix; } @@ -3049,7 +3047,7 @@ public function formatByPattern(PhoneNumber $number, $numberFormat, array $userD // Metadata cannot be null because the country calling code is valid $metadata = $this->getMetadataForRegionOrCallingCode($countryCallingCode, $regionCode); - $formattedNumber = ""; + $formattedNumber = ''; $formattingPattern = $this->chooseFormattingPatternForNumber($userDefinedFormats, $nationalSignificantNumber); if ($formattingPattern === null) { @@ -3066,8 +3064,8 @@ public function formatByPattern(PhoneNumber $number, $numberFormat, array $userD $nationalPrefix = $metadata->getNationalPrefix(); if (mb_strlen($nationalPrefix) > 0) { // Replace $NP with national prefix and $FG with the first group ($1). - $nationalPrefixFormattingRule = str_replace(static::NP_STRING, $nationalPrefix, $nationalPrefixFormattingRule); - $nationalPrefixFormattingRule = str_replace(static::FG_STRING, '$1', $nationalPrefixFormattingRule); + $nationalPrefixFormattingRule = str_replace(array(static::NP_STRING, static::FG_STRING), + array($nationalPrefix, '$1'), $nationalPrefixFormattingRule); $numFormatCopy->setNationalPrefixFormattingRule($nationalPrefixFormattingRule); } else { // We don't want to have a rule for how to format the national prefix if there isn't one. @@ -3183,7 +3181,7 @@ public function getExampleNumberForType($regionCodeOrType, $type = null) $desc = $this->getNumberDescByType($this->getMetadataForNonGeographicalRegion($countryCallingCode), $regionCodeOrType); try { if ($desc->getExampleNumber() != '') { - return $this->parse("+" . $countryCallingCode . $desc->getExampleNumber(), static::UNKNOWN_REGION); + return $this->parse('+' . $countryCallingCode . $desc->getExampleNumber(), static::UNKNOWN_REGION); } } catch (NumberParseException $e) { // noop @@ -3352,13 +3350,13 @@ public function isNumberMatch($firstNumberIn, $secondNumberIn) return MatchType::NSN_MATCH; } return $match; - } else { - // If the first number didn't have a valid country calling code, then we parse the - // second number without one as well. - $secondNumberProto = new PhoneNumber(); - $this->parseHelper($secondNumberIn, null, false, false, $secondNumberProto); - return $this->isNumberMatch($firstNumberIn, $secondNumberProto); } + + // If the first number didn't have a valid country calling code, then we parse the + // second number without one as well. + $secondNumberProto = new PhoneNumber(); + $this->parseHelper($secondNumberIn, null, false, false, $secondNumberProto); + return $this->isNumberMatch($firstNumberIn, $secondNumberProto); } catch (NumberParseException $e2) { // Fall-through to return NOT_A_NUMBER. } @@ -3384,9 +3382,10 @@ public function isNumberMatch($firstNumberIn, $secondNumberIn) if ($firstNumberCountryCode != 0 && $secondNumberCountryCode != 0) { if ($firstNumber->equals($secondNumber)) { return MatchType::EXACT_MATCH; - } elseif ($firstNumberCountryCode == $secondNumberCountryCode && - $this->isNationalNumberSuffixOfTheOther($firstNumber, $secondNumber) - ) { + } + + if ($firstNumberCountryCode == $secondNumberCountryCode && + $this->isNationalNumberSuffixOfTheOther($firstNumber, $secondNumber)) { // A SHORT_NSN_MATCH occurs if there is a difference because of the presence or absence of // an 'Italian leading zero', the presence or absence of an extension, or one NSN being a // shorter variant of the other. diff --git a/src/RegexBasedMatcher.php b/src/RegexBasedMatcher.php index 06b5a026b..d6bdbc66b 100644 --- a/src/RegexBasedMatcher.php +++ b/src/RegexBasedMatcher.php @@ -49,8 +49,8 @@ private function match($number, $pattern, $allowPrefixMatch) if (!$matcher->lookingAt()) { return false; - } else { - return ($matcher->matches()) ? true : $allowPrefixMatch; } + + return $matcher->matches() ? true : $allowPrefixMatch; } } diff --git a/src/RegionCode.php b/src/RegionCode.php index 565fc48ef..01394b0de 100644 --- a/src/RegionCode.php +++ b/src/RegionCode.php @@ -23,43 +23,43 @@ class RegionCode { // Region code for global networks (e.g. +800 numbers). - const UN001 = "001"; - const AD = "AD"; - const AE = "AE"; - const AM = "AM"; - const AO = "AO"; - const AQ = "AQ"; - const AR = "AR"; - const AU = "AU"; - const BB = "BB"; - const BR = "BR"; - const BS = "BS"; - const BY = "BY"; - const CA = "CA"; - const CH = "CH"; - const CL = "CL"; - const CN = "CN"; - const CS = "CS"; - const CX = "CX"; - const DE = "DE"; - const FR = "FR"; - const GB = "GB"; - const HU = "HU"; - const IT = "IT"; - const JP = "JP"; - const KR = "KR"; - const MX = "MX"; - const NZ = "NZ"; - const PG = "PG"; - const PL = "PL"; - const RE = "RE"; - const RU = "RU"; - const SE = "SE"; - const SG = "SG"; - const US = "US"; + const UN001 = '001'; + const AD = 'AD'; + const AE = 'AE'; + const AM = 'AM'; + const AO = 'AO'; + const AQ = 'AQ'; + const AR = 'AR'; + const AU = 'AU'; + const BB = 'BB'; + const BR = 'BR'; + const BS = 'BS'; + const BY = 'BY'; + const CA = 'CA'; + const CH = 'CH'; + const CL = 'CL'; + const CN = 'CN'; + const CS = 'CS'; + const CX = 'CX'; + const DE = 'DE'; + const FR = 'FR'; + const GB = 'GB'; + const HU = 'HU'; + const IT = 'IT'; + const JP = 'JP'; + const KR = 'KR'; + const MX = 'MX'; + const NZ = 'NZ'; + const PG = 'PG'; + const PL = 'PL'; + const RE = 'RE'; + const RU = 'RU'; + const SE = 'SE'; + const SG = 'SG'; + const US = 'US'; const UZ = 'UZ'; - const YT = "YT"; - const ZW = "ZW"; + const YT = 'YT'; + const ZW = 'ZW'; // Official code for the unknown region. - const ZZ = "ZZ"; + const ZZ = 'ZZ'; } diff --git a/src/ShortNumberInfo.php b/src/ShortNumberInfo.php index 7a9b3dbed..3c2c1a26b 100644 --- a/src/ShortNumberInfo.php +++ b/src/ShortNumberInfo.php @@ -17,7 +17,7 @@ class ShortNumberInfo /** * @var ShortNumberInfo */ - protected static $instance = null; + protected static $instance; /** * @var MatcherAPIInterface */ @@ -113,7 +113,7 @@ public function getExampleShortNumber($regionCode) { $phoneMetadata = $this->getMetadataForRegion($regionCode); if ($phoneMetadata === null) { - return ""; + return ''; } /** @var PhoneNumberDesc $desc */ @@ -121,7 +121,7 @@ public function getExampleShortNumber($regionCode) if ($desc !== null && $desc->hasExampleNumber()) { return $desc->getExampleNumber(); } - return ""; + return ''; } /** @@ -175,7 +175,7 @@ public function getExampleShortNumberForCost($regionCode, $cost) { $phoneMetadata = $this->getMetadataForRegion($regionCode); if ($phoneMetadata === null) { - return ""; + return ''; } /** @var PhoneNumberDesc $desc */ @@ -199,7 +199,7 @@ public function getExampleShortNumberForCost($regionCode, $cost) return $desc->getExampleNumber(); } - return ""; + return ''; } /** @@ -271,10 +271,10 @@ public function isCarrierSpecific(PhoneNumber $number) $nationalNumber = $this->getNationalSignificantNumber($number); $phoneMetadata = $this->getMetadataForRegion($regionCode); - return ($phoneMetadata !== null) && ($this->matchesPossibleNumberAndNationalNumber( + return ($phoneMetadata !== null) && $this->matchesPossibleNumberAndNationalNumber( $nationalNumber, $phoneMetadata->getCarrierSpecific() - )); + ); } /** @@ -299,7 +299,7 @@ public function isCarrierSpecificForRegion(PhoneNumber $number, $regionDialingFr $phoneMetadata = $this->getMetadataForRegion($regionDialingFrom); return ($phoneMetadata !== null) - && ($this->matchesPossibleNumberAndNationalNumber($nationalNumber, $phoneMetadata->getCarrierSpecific())); + && $this->matchesPossibleNumberAndNationalNumber($nationalNumber, $phoneMetadata->getCarrierSpecific()); } /** @@ -343,7 +343,9 @@ protected function getRegionCodeForShortNumberFromRegionList(PhoneNumber $number { if (count($regionCodes) == 0) { return null; - } elseif (count($regionCodes) == 1) { + } + + if (count($regionCodes) == 1) { return $regionCodes[0]; } diff --git a/src/carrier/data/en/223.php b/src/carrier/data/en/223.php index 93e3c16d8..52cfc27cf 100644 --- a/src/carrier/data/en/223.php +++ b/src/carrier/data/en/223.php @@ -13,7 +13,7 @@ return array ( 2232079 => 'Sotelma', 223217 => 'Sotelma', - 22350 => 'Atel', + 2235 => 'Atel', 2236 => 'Sotelma', 2237 => 'Orange', 22382 => 'Orange', diff --git a/src/carrier/data/en/230.php b/src/carrier/data/en/230.php index 04ec32e17..e4b831969 100644 --- a/src/carrier/data/en/230.php +++ b/src/carrier/data/en/230.php @@ -14,33 +14,17 @@ 230525 => 'Cellplus', 230528 => 'MTML', 230529 => 'MTML', - 2305421 => 'Emtel', - 2305422 => 'Emtel', - 2305423 => 'Emtel', - 2305428 => 'Emtel', - 2305429 => 'Emtel', + 230542 => 'Emtel', 230544 => 'Emtel', + 230547 => 'Emtel', 2305471 => 'Cellplus', - 2305472 => 'Emtel', - 2305473 => 'Emtel', - 2305474 => 'Emtel', - 2305475 => 'Emtel', - 2305476 => 'Emtel', - 2305477 => 'Emtel', - 2305478 => 'Emtel', - 2305479 => 'Emtel', 230548 => 'Emtel', 230549 => 'Emtel', - 230570 => 'Cellplus', + 23057 => 'Cellplus', 230571 => 'Emtel', 230572 => 'Emtel', 230573 => 'Emtel', 230574 => 'Emtel', - 230575 => 'Cellplus', - 230576 => 'Cellplus', - 230577 => 'Cellplus', - 230578 => 'Cellplus', - 230579 => 'Cellplus', 230580 => 'Cellplus', 230581 => 'Cellplus', 230582 => 'Cellplus', diff --git a/src/carrier/data/en/232.php b/src/carrier/data/en/232.php index a865a7efd..cb01d2f18 100644 --- a/src/carrier/data/en/232.php +++ b/src/carrier/data/en/232.php @@ -22,13 +22,12 @@ 23244 => 'Intergroup', 23250 => 'Datatel/Cellcom', 23255 => 'AFCOM', - 23266 => 'Onlime', + 2326 => 'Onlime', 23275 => 'Orange', 23276 => 'Airtel', 23277 => 'Africell', 23278 => 'Airtel', 23279 => 'Airtel', - 23280 => 'Africell', - 23288 => 'Africell', - 23299 => 'Africell', + 2328 => 'Africell', + 2329 => 'Africell', ); diff --git a/src/carrier/data/en/233.php b/src/carrier/data/en/233.php index 081dfee9d..0876bd981 100644 --- a/src/carrier/data/en/233.php +++ b/src/carrier/data/en/233.php @@ -25,7 +25,6 @@ 233556 => 'MTN', 233557 => 'MTN', 233558 => 'MTN', - 233560 => 'Airtel', - 233561 => 'Airtel', + 23356 => 'Airtel', 23357 => 'tiGO', ); diff --git a/src/carrier/data/en/234.php b/src/carrier/data/en/234.php index 01eda834f..6a5cdc426 100644 --- a/src/carrier/data/en/234.php +++ b/src/carrier/data/en/234.php @@ -172,8 +172,7 @@ 2347782 => 'Starcomms', 2347783 => 'Starcomms', 2347784 => 'Starcomms', - 2348010 => 'Megatech', - 2348011 => 'Megatech', + 234801 => 'Megatech', 234802 => 'Airtel', 234803 => 'MTN', 234804 => 'Ntel', @@ -191,8 +190,7 @@ 234816 => 'MTN', 234817 => '9mobile', 234818 => '9mobile', - 2348190 => 'Starcomms', - 2348191 => 'Starcomms', + 234819 => 'Starcomms', 2348283 => 'Starcomms', 2348284 => 'Starcomms', 2348285 => 'Starcomms', diff --git a/src/carrier/data/en/240.php b/src/carrier/data/en/240.php index 429de2890..25edeb2b3 100644 --- a/src/carrier/data/en/240.php +++ b/src/carrier/data/en/240.php @@ -11,7 +11,7 @@ */ return array ( - 240222 => 'GETESA', + 2402 => 'GETESA', 240550 => 'Muni', 240551 => 'HiTS', ); diff --git a/src/carrier/data/en/252.php b/src/carrier/data/en/252.php index ebec53851..813edf20f 100644 --- a/src/carrier/data/en/252.php +++ b/src/carrier/data/en/252.php @@ -28,14 +28,6 @@ 25279 => 'Somtel', 25280 => 'Somali Networks', 25288 => 'Somali Networks', - 252906 => 'Golis Telecom', - 252907 => 'Golis Telecom', - 25292 => 'STG', - 25293 => 'STG', - 25294 => 'STG', - 25295 => 'STG', - 25296 => 'STG', - 25297 => 'STG', - 25298 => 'STG', - 25299 => 'STG', + 2529 => 'STG', + 25290 => 'Golis Telecom', ); diff --git a/src/carrier/data/en/254.php b/src/carrier/data/en/254.php index 1d4c5168f..57284b223 100644 --- a/src/carrier/data/en/254.php +++ b/src/carrier/data/en/254.php @@ -15,15 +15,9 @@ 25471 => 'Safaricom', 25472 => 'Safaricom', 25473 => 'Airtel', - 254740 => 'Safaricom', - 254741 => 'Safaricom', - 254742 => 'Safaricom', - 254743 => 'Safaricom', + 25474 => 'Safaricom', 254744 => 'Homeland Media', - 254745 => 'Safaricom', - 254746 => 'Safaricom', 254747 => 'JTL', - 254748 => 'Safaricom', 254749 => 'WiAfrica', 25475 => 'Airtel', 254757 => 'Safaricom', @@ -37,7 +31,7 @@ 254765 => 'Finserve', 254766 => 'Finserve', 254767 => 'Sema Mobile', - 254768 => 'Airtel', + 254768 => 'Safaricom', 254769 => 'Airtel', 25477 => 'Telkom', 25478 => 'Airtel', diff --git a/src/carrier/data/en/256.php b/src/carrier/data/en/256.php index 43e42da8c..2fbee5fdf 100644 --- a/src/carrier/data/en/256.php +++ b/src/carrier/data/en/256.php @@ -15,8 +15,8 @@ 25671 => 'UTL', 256720 => 'Smile', 256723 => 'Afrimax', - 2567260 => 'Tangerine', - 256730 => 'K2', + 256726 => 'Tangerine', + 25673 => 'K2', 25674 => 'Sure Telecom', 25675 => 'Airtel', 25677 => 'MTN', diff --git a/src/carrier/data/en/260.php b/src/carrier/data/en/260.php index 093406b01..a86567788 100644 --- a/src/carrier/data/en/260.php +++ b/src/carrier/data/en/260.php @@ -11,6 +11,7 @@ */ return array ( + 26076 => 'MTN', 26095 => 'ZAMTEL', 26096 => 'MTN', 26097 => 'Airtel', diff --git a/src/carrier/data/en/352.php b/src/carrier/data/en/352.php index 955ddb3fc..d8e1ebc84 100644 --- a/src/carrier/data/en/352.php +++ b/src/carrier/data/en/352.php @@ -11,14 +11,11 @@ */ return array ( - 352621 => 'POST', - 352628 => 'POST', + 35262 => 'POST', 352651 => 'POST', 352658 => 'POST', - 352661 => 'Orange', - 352668 => 'Orange', + 35266 => 'Orange', 352671 => 'JOIN', 352678 => 'JOIN', - 352691 => 'Tango', - 352698 => 'Tango', + 35269 => 'Tango', ); diff --git a/src/carrier/data/en/385.php b/src/carrier/data/en/385.php index b01280667..0598550b5 100644 --- a/src/carrier/data/en/385.php +++ b/src/carrier/data/en/385.php @@ -11,22 +11,12 @@ */ return array ( - 38589091 => 'Vip', - 38589098 => 'Hrvatski Telekom', - 385901 => 'Tele2', - 385902 => 'Tele2', - 385903 => 'Tele2', - 385904 => 'Tele2', - 385905 => 'Tele2', - 385906 => 'Tele2', - 385907 => 'Tele2', - 385908 => 'Tele2', - 385909 => 'Tele2', + 38590 => 'Tele2', 38591 => 'Vip', 38592 => 'Vip', 38595 => 'Tele2', 385970 => 'Hrvatski Telekom', - 3859751 => 'Telefocus', + 385975 => 'Telefocus', 385976 => 'Hrvatski Telekom', 385977 => 'Hrvatski Telekom', 385979 => 'Hrvatski Telekom', diff --git a/src/carrier/data/en/386.php b/src/carrier/data/en/386.php index 7dd363a4a..32ee15d20 100644 --- a/src/carrier/data/en/386.php +++ b/src/carrier/data/en/386.php @@ -26,8 +26,7 @@ 386681 => 'A1', 386686 => 'A1', 386689 => 'A1', - 386696 => 'HoT', - 386699 => 'HoT', + 38669 => 'HoT', 38670 => 'Telemach', 38671 => 'Telekom Slovenije', ); diff --git a/src/carrier/data/en/389.php b/src/carrier/data/en/389.php index 45b544dc2..bbf672b20 100644 --- a/src/carrier/data/en/389.php +++ b/src/carrier/data/en/389.php @@ -40,7 +40,7 @@ 389732 => 'Vip', 389733 => 'Telekom', 389734 => 'Vip', - 3897421 => 'Mobik', + 38974 => 'Mobik', 389752 => 'Vip', 389753 => 'Vip', 389754 => 'Vip', @@ -75,6 +75,5 @@ 389787 => 'Vip', 389788 => 'Vip', 389789 => 'Vip', - 389792 => 'Lycamobile', - 389793 => 'Lycamobile', + 38979 => 'Lycamobile', ); diff --git a/src/carrier/data/en/44.php b/src/carrier/data/en/44.php index ff6f38d49..a627c500d 100644 --- a/src/carrier/data/en/44.php +++ b/src/carrier/data/en/44.php @@ -118,13 +118,16 @@ 4474187 => 'Teleena', 4474189 => 'Teleena', 447419 => 'Orange', - 44742 => 'Three', 447420 => 'Orange', 447421 => 'Orange', 447422 => 'Orange', 447423 => 'Vodafone', 447424 => 'Lycamobile', 447425 => 'Vodafone', + 447426 => 'Three', + 447427 => 'Three', + 447428 => 'Three', + 447429 => 'Three', 447430 => 'O2', 447431 => 'O2', 447432 => 'EE', @@ -158,7 +161,7 @@ 447447 => 'Three', 447448 => 'Lycamobile', 447449 => 'Three', - 44745 => 'Three', + 447450 => 'Three', 447451 => 'Vectone Mobile', 4474512 => 'Tismi', 4474515 => 'Premium O', @@ -168,14 +171,22 @@ 4474527 => 'Three', 4474528 => 'Three', 4474529 => 'Three', - 447457 => 'Vectone Mobile', + 447453 => 'Three', + 447454 => 'Three', + 447455 => 'Three', + 447456 => 'Three', + 4474570 => 'Vectone Mobile', + 4474571 => 'Vectone Mobile', 4474572 => 'Marathon Telecom', + 4474573 => 'Vectone Mobile', 4474574 => 'Voicetec', + 4474575 => 'Vectone Mobile', 4474576 => 'Sure', 4474577 => 'Spacetel', 4474578 => 'CardBoardFish', 4474579 => 'CardBoardFish', - 447458 => 'Gamma Telecom', + 4474580 => 'Gamma Telecom', + 4474581 => 'Gamma Telecom', 4474582 => 'Premium Routing', 4474583 => 'Virgin Mobile', 4474584 => 'Airwave', @@ -185,9 +196,12 @@ 4474588 => 'Limitless', 4474589 => 'Three', 447459 => 'Lycamobile', - 44746 => 'Three', + 447460 => 'Three', 447461 => 'O2', + 447462 => 'Three', + 447463 => 'Three', 447464 => 'Vodafone', + 447465 => 'Three', 4474650 => 'Vectone Mobile', 4474651 => 'Vectone Mobile', 4474653 => 'Compatel', @@ -199,23 +213,34 @@ 44747 => 'Three', 447470 => 'Vodafone', 447471 => 'Vodafone', - 44748 => 'EE', 447480 => 'Three', 447481 => 'Three', 447482 => 'Three', - 447488 => 'Three', + 447483 => 'EE', + 447484 => 'EE', + 447485 => 'EE', + 447486 => 'EE', + 447487 => 'EE', 4474880 => 'Fogg', 4474881 => 'CESG', 4474882 => 'Sky', 4474883 => 'Sky', + 4474884 => 'Three', + 4474885 => 'Three', 4474886 => 'Lanonyx', + 4474887 => 'Three', 4474888 => 'Ziron', + 4474889 => 'Three', 447489 => 'O2', - 44749 => 'EE', 447490 => 'Three', 447491 => 'Three', 447492 => 'Three', 447493 => 'Vodafone', + 447494 => 'EE', + 447495 => 'EE', + 447496 => 'EE', + 447497 => 'EE', + 447498 => 'EE', 447499 => 'O2', 447500 => 'Vodafone', 447501 => 'Vodafone', @@ -252,7 +277,11 @@ 447529 => 'Orange', 447530 => 'Orange', 447531 => 'Orange', - 447532 => 'Orange', + 4475320 => 'Orange', + 4475321 => 'Orange', + 4475322 => 'Orange', + 4475323 => 'Orange', + 4475324 => 'Orange', 4475325 => 'SMSRelay AG', 4475326 => 'Three', 4475327 => 'Three', @@ -331,14 +360,8 @@ 4476020 => 'O2', 4476022 => 'Relax', 447623 => 'PageOne', - 4476240 => 'Manx Telecom', - 4476241 => 'Manx Telecom', + 447624 => 'Manx Telecom', 4476242 => 'Sure', - 4476243 => 'Manx Telecom', - 4476244 => 'Manx Telecom', - 4476246 => 'Manx Telecom', - 4476248 => 'Manx Telecom', - 4476249 => 'Manx Telecom', 447625 => 'O2', 447626 => 'O2', 4476400 => 'Core Telecom', @@ -365,8 +388,12 @@ 4476596 => 'Vodafone', 4476598 => 'Vodafone', 4476599 => 'PageOne', - 447660 => 'PageOne', 4476600 => 'Plus', + 4476601 => 'PageOne', + 4476602 => 'PageOne', + 4476603 => 'PageOne', + 4476604 => 'PageOne', + 4476605 => 'PageOne', 4476606 => '24 Seven', 4476607 => 'Premium O', 4476608 => 'Premium O', @@ -395,29 +422,24 @@ 4476818 => 'PageOne', 447693 => 'O2', 447699 => 'Vodafone', + 44770 => 'O2', 4477000 => 'Cloud9', 4477001 => 'Nationwide Telephone', 4477003 => 'Sure', 4477007 => 'Sure', 4477008 => 'Sure', - 447701 => 'O2', - 447702 => 'O2', - 447703 => 'O2', - 447704 => 'O2', - 447705 => 'O2', - 447706 => 'O2', - 447707 => 'O2', - 447708 => 'O2', - 447709 => 'O2', 44771 => 'O2', 447717 => 'Vodafone', - 44772 => 'O2', + 447720 => 'O2', 447721 => 'Vodafone', 447722 => 'EE', 447723 => 'Three', + 447724 => 'O2', + 447725 => 'O2', 447726 => 'EE', 447727 => 'Three', 447728 => 'Three', + 447729 => 'O2', 44773 => 'O2', 447733 => 'Vodafone', 447735 => 'Three', @@ -475,17 +497,19 @@ 447794 => 'Orange', 447795 => 'Vodafone', 447796 => 'Vodafone', - 4477977 => 'JT', - 4477978 => 'JT', - 4477979 => 'JT', + 447797 => 'JT', 447798 => 'Vodafone', 447799 => 'Vodafone', - 44780 => 'O2', 447800 => 'Orange', + 447801 => 'O2', + 447802 => 'O2', + 447803 => 'O2', 447804 => 'EE', 447805 => 'Orange', 447806 => 'EE', 447807 => 'Orange', + 447808 => 'O2', + 447809 => 'O2', 44781 => 'Orange', 447810 => 'Vodafone', 447818 => 'Vodafone', @@ -527,11 +551,15 @@ 447846 => 'Three', 447847 => 'EE', 447848 => 'Three', - 44785 => 'O2', + 447850 => 'O2', + 447851 => 'O2', 447852 => 'EE', 447853 => 'Three', 447854 => 'Orange', 447855 => 'Orange', + 447856 => 'O2', + 447857 => 'O2', + 447858 => 'O2', 447859 => 'Three', 447860 => 'O2', 447861 => 'Three', @@ -572,11 +600,14 @@ 447877 => 'Three', 447878 => 'Three', 447879 => 'Vodafone', - 44788 => 'Vodafone', + 447880 => 'Vodafone', + 447881 => 'Vodafone', 447882 => 'Three', 447883 => 'Three', + 447884 => 'Vodafone', 447885 => 'O2', 447886 => 'Three', + 447887 => 'Vodafone', 447888 => 'Three', 447889 => 'O2', 447890 => 'Orange', @@ -590,10 +621,14 @@ 4478927 => 'O2', 4478928 => 'O2', 4478929 => 'O2', - 447893 => 'O2', 4478930 => 'Magrathea', 4478931 => '24 Seven', + 4478932 => 'O2', 4478933 => 'Yim Siam', + 4478934 => 'O2', + 4478935 => 'O2', + 4478936 => 'O2', + 4478937 => 'O2', 4478938 => 'aql', 4478939 => 'Citrus', 447894 => 'O2', @@ -602,11 +637,15 @@ 447897 => 'Three', 447898 => 'Three', 447899 => 'Vodafone', - 44790 => 'EE', 447900 => 'Vodafone', 447901 => 'Vodafone', 447902 => 'O2', + 447903 => 'EE', + 447904 => 'EE', + 447905 => 'EE', + 447906 => 'EE', 447907 => 'O2', + 447908 => 'EE', 447909 => 'Vodafone', 447910 => 'EE', 4479110 => 'Marathon Telecom', @@ -627,11 +666,15 @@ 447924 => 'Manx Telecom', 4479245 => 'Cloud9', 447929 => 'Orange', - 44793 => 'O2', 447930 => 'EE', 447931 => 'EE', 447932 => 'EE', + 447933 => 'O2', + 447934 => 'O2', + 447935 => 'O2', + 447936 => 'O2', 447937 => 'JT', + 447938 => 'O2', 447939 => 'EE', 44794 => 'EE', 44795 => 'EE', diff --git a/src/carrier/data/en/506.php b/src/carrier/data/en/506.php index 3dd49ad95..05a7003d4 100644 --- a/src/carrier/data/en/506.php +++ b/src/carrier/data/en/506.php @@ -11,12 +11,8 @@ */ return array ( - 506500 => 'OMV', - 506501 => 'OMV', - 506570 => 'OMV', - 506571 => 'OMV', - 506572 => 'OMV', - 506573 => 'OMV', + 50650 => 'OMV', + 50657 => 'OMV', 5066 => 'Movistar', 50670010 => 'Claro', 50670011 => 'Claro', diff --git a/src/carrier/data/en/51.php b/src/carrier/data/en/51.php index 4c235784d..a39dfbb08 100644 --- a/src/carrier/data/en/51.php +++ b/src/carrier/data/en/51.php @@ -92,14 +92,7 @@ 51439434 => 'Movistar', 51439435 => 'Claro', 51439436 => 'Movistar', - 514394370 => 'Claro', - 514394371 => 'Claro', - 514394372 => 'Claro', - 514394373 => 'Claro', - 514394374 => 'Claro', - 514394375 => 'Claro', - 514394376 => 'Claro', - 514394377 => 'Claro', + 51439437 => 'Claro', 514394378 => 'Movistar', 514394379 => 'Movistar', 51439438 => 'Movistar', @@ -126,13 +119,7 @@ 51449486 => 'Movistar', 51449488 => 'Movistar', 51449489 => 'Movistar', - 514494900 => 'Movistar', - 514494901 => 'Movistar', - 514494902 => 'Movistar', - 514494903 => 'Movistar', - 514494904 => 'Movistar', - 514494905 => 'Movistar', - 514494906 => 'Movistar', + 51449490 => 'Movistar', 514494907 => 'Claro', 514494908 => 'Claro', 514494909 => 'Claro', @@ -147,14 +134,7 @@ 514494954 => 'Movistar', 514494955 => 'Movistar', 51449496 => 'Movistar', - 514494970 => 'Claro', - 514494971 => 'Claro', - 514494972 => 'Claro', - 514494973 => 'Claro', - 514494974 => 'Claro', - 514494975 => 'Claro', - 514494976 => 'Claro', - 514494977 => 'Claro', + 51449497 => 'Claro', 514494978 => 'Movistar', 514494979 => 'Movistar', 51449498 => 'Movistar', @@ -269,14 +249,7 @@ 515495898 => 'Claro', 51549590 => 'Movistar', 51549591 => 'Claro', - 515495920 => 'Claro', - 515495921 => 'Claro', - 515495922 => 'Claro', - 515495923 => 'Claro', - 515495924 => 'Claro', - 515495925 => 'Claro', - 515495926 => 'Claro', - 515495927 => 'Claro', + 51549592 => 'Claro', 515495928 => 'Movistar', 515495929 => 'Movistar', 51549593 => 'Claro', diff --git a/src/carrier/data/en/57.php b/src/carrier/data/en/57.php index 509c0eaaf..626b1480b 100644 --- a/src/carrier/data/en/57.php +++ b/src/carrier/data/en/57.php @@ -27,10 +27,6 @@ 57317 => 'Movistar', 57318 => 'Movistar', 57319 => 'Virgin Mobile', - 57320 => 'Claro', - 57321 => 'Claro', - 57322 => 'Claro', - 57323 => 'Claro', - 57350 => 'Avantel', - 57351 => 'Avantel', + 5732 => 'Claro', + 5735 => 'Avantel', ); diff --git a/src/carrier/data/en/593.php b/src/carrier/data/en/593.php index 1d3378f67..4c009ca77 100644 --- a/src/carrier/data/en/593.php +++ b/src/carrier/data/en/593.php @@ -11,7 +11,7 @@ */ return array ( - 593939 => 'Claro', + 59393 => 'Claro', 5939586 => 'Movistar', 5939587 => 'Movistar', 5939588 => 'Movistar', @@ -29,7 +29,7 @@ 5939627 => 'Movistar', 5939628 => 'Movistar', 5939629 => 'Movistar', - 5939630 => 'Movistar', + 593963 => 'Movistar', 593967 => 'Claro', 593968 => 'Claro', 593969 => 'Claro', @@ -38,36 +38,20 @@ 5939787 => 'Movistar', 5939788 => 'Movistar', 5939789 => 'Movistar', + 593979 => 'Claro', 5939790 => 'Movistar', 5939791 => 'Movistar', 5939792 => 'Movistar', 5939793 => 'Movistar', - 5939794 => 'Claro', - 5939795 => 'Claro', - 5939796 => 'Claro', - 5939797 => 'Claro', - 5939798 => 'Claro', - 5939799 => 'Claro', - 593980 => 'Claro', - 593981 => 'Claro', + 59398 => 'Claro', 5939820 => 'CNT', 5939821 => 'CNT', 5939822 => 'CNT', 5939823 => 'CNT', 5939824 => 'CNT', - 5939825 => 'Claro', - 5939826 => 'Claro', - 5939827 => 'Claro', - 5939828 => 'Claro', - 5939829 => 'Claro', 593983 => 'Movistar', - 5939836 => 'Claro', 593984 => 'Movistar', - 593985 => 'Claro', - 593986 => 'Claro', 593987 => 'Movistar', - 593988 => 'Claro', - 593989 => 'Claro', 593990 => 'Claro', 593991 => 'Claro', 5939920 => 'Claro', diff --git a/src/carrier/data/en/595.php b/src/carrier/data/en/595.php index 23e771e34..2a2ed14a6 100644 --- a/src/carrier/data/en/595.php +++ b/src/carrier/data/en/595.php @@ -11,25 +11,9 @@ */ return array ( - 595951 => 'VOX', - 595961 => 'VOX', - 595962 => 'VOX', - 595969 => 'VOX', - 595971 => 'Personal', - 595972 => 'Personal', - 595973 => 'Personal', - 595974 => 'Personal', - 595975 => 'Personal', - 595976 => 'Personal', - 595981 => 'Tigo', - 595982 => 'Tigo', - 595983 => 'Tigo', - 595984 => 'Tigo', - 595985 => 'Tigo', - 595986 => 'Tigo', - 595991 => 'Claro', - 595992 => 'Claro', - 595993 => 'Claro', - 595994 => 'Claro', - 595995 => 'Claro', + 59595 => 'VOX', + 59596 => 'VOX', + 59597 => 'Personal', + 59598 => 'Tigo', + 59599 => 'Claro', ); diff --git a/src/carrier/data/en/61.php b/src/carrier/data/en/61.php index 9302774fe..f8b8429a2 100644 --- a/src/carrier/data/en/61.php +++ b/src/carrier/data/en/61.php @@ -90,9 +90,5 @@ 61488 => 'Telstra', 614888 => 'My Number', 6148984 => 'Victorian Rail Track', - 61490 => 'Telstra', - 61491 => 'Telstra', - 61497 => 'Telstra', - 61498 => 'Telstra', - 61499 => 'Telstra', + 6149 => 'Telstra', ); diff --git a/src/carrier/data/en/63.php b/src/carrier/data/en/63.php index 55f6470d1..1f9247893 100644 --- a/src/carrier/data/en/63.php +++ b/src/carrier/data/en/63.php @@ -50,9 +50,7 @@ 63950 => 'Smart', 63955 => 'Globe', 63956 => 'Globe', - 63965 => 'Globe', - 63966 => 'Globe', - 63967 => 'Globe', + 6396 => 'Globe', 63975 => 'Globe', 63976 => 'Globe', 63995 => 'Globe', diff --git a/src/carrier/data/en/7.php b/src/carrier/data/en/7.php index d04457c35..054e05c10 100644 --- a/src/carrier/data/en/7.php +++ b/src/carrier/data/en/7.php @@ -17,7 +17,7 @@ 7705 => 'Beeline', 7707 => 'Tele2', 7708 => 'Altel', - 7747 => 'Tele2', + 774 => 'Tele2', 7760 => 'Kulan', 7762 => 'Nursat', 7763 => 'Arna', @@ -523,16 +523,9 @@ 790470 => 'Beeline', 7904708 => 'MegaFon', 7904709 => 'MegaFon', + 790471 => 'TMT', 7904710 => 'MegaFon', 7904711 => 'MegaFon', - 7904712 => 'TMT', - 7904713 => 'TMT', - 7904714 => 'TMT', - 7904715 => 'TMT', - 7904716 => 'TMT', - 7904717 => 'TMT', - 7904718 => 'TMT', - 7904719 => 'TMT', 7904726 => 'Beeline', 7904727 => 'Beeline', 7904728 => 'MegaFon', @@ -619,16 +612,9 @@ 790831 => 'Tele2', 790832 => 'Tele2', 790833 => 'TMT', - 7908340 => 'TMT', - 7908341 => 'TMT', - 7908342 => 'TMT', - 7908343 => 'TMT', + 790834 => 'TMT', 7908344 => 'MegaFon', 7908345 => 'MegaFon', - 7908346 => 'TMT', - 7908347 => 'TMT', - 7908348 => 'TMT', - 7908349 => 'TMT', 790835 => 'MTS', 7908364 => 'Beeline', 7908366 => 'MegaFon', @@ -654,7 +640,11 @@ 7908439 => 'Beeline', 790844 => 'Beeline', 790845 => 'Beeline', - 790846 => 'Beeline', + 7908460 => 'Beeline', + 7908461 => 'Beeline', + 7908462 => 'Beeline', + 7908463 => 'Beeline', + 7908464 => 'Beeline', 7908465 => 'Tele2', 7908466 => 'Tele2', 7908467 => 'Tele2', @@ -755,23 +745,10 @@ 793939 => 'TMT', 793950 => 'TMT', 79397 => 'MegaFon', - 79500 => 'Tele2', - 79501 => 'Tele2', + 7950 => 'Tele2', 795019 => 'Motiv', 795020 => 'Motiv', - 795021 => 'Tele2', - 795022 => 'Tele2', 795023 => 'MTS', - 795024 => 'Tele2', - 795025 => 'Tele2', - 795026 => 'Tele2', - 795027 => 'Tele2', - 795028 => 'Tele2', - 795029 => 'Tele2', - 79503 => 'Tele2', - 79504 => 'Tele2', - 79505 => 'Tele2', - 79506 => 'Tele2', 795063 => 'Motiv', 795064 => 'Motiv', 795065 => 'Motiv', @@ -779,12 +756,9 @@ 7950666 => 'TMT', 7950667 => 'TMT', 7950668 => 'Beeline', - 79507 => 'Tele2', - 79508 => 'Tele2', 7950880 => 'Beeline', 7950888 => 'MTS', 7950889 => 'MTS', - 79509 => 'Tele2', 795093 => 'MTS', 7950940 => 'MTS', 7950941 => 'MTS', @@ -830,18 +804,11 @@ 7952742 => 'Motiv', 7952743 => 'Motiv', 7952744 => 'Motiv', + 79530 => 'Tele2', 795300 => 'Motiv', - 795301 => 'Tele2', - 795302 => 'Tele2', - 795303 => 'Tele2', 7953039 => 'Motiv', 795304 => 'Motiv', 795305 => 'Motiv', - 7953059 => 'Tele2', - 795306 => 'Tele2', - 795307 => 'Tele2', - 795308 => 'Tele2', - 795309 => 'Tele2', 795310 => 'Tele2', 795311 => 'Tele2', 795313 => 'Tele2', @@ -1137,7 +1104,11 @@ 799612 => 'MegaFon', 799613 => 'MegaFon', 799615 => 'Tele2', - 799620 => 'Tele2', + 7996200 => 'Tele2', + 7996201 => 'Tele2', + 7996202 => 'Tele2', + 7996203 => 'Tele2', + 7996204 => 'Tele2', 7996205 => 'MegaFon', 7996206 => 'MegaFon', 7996207 => 'MegaFon', @@ -1151,25 +1122,10 @@ 7996242 => 'MegaFon', 7996243 => 'MegaFon', 7996299 => 'Tele2', + 79963 => 'MegaFon', 7996300 => 'Tele2', 7996301 => 'Tele2', 7996302 => 'Tele2', - 7996303 => 'MegaFon', - 7996304 => 'MegaFon', - 7996305 => 'MegaFon', - 7996306 => 'MegaFon', - 7996307 => 'MegaFon', - 7996308 => 'MegaFon', - 7996309 => 'MegaFon', - 799631 => 'MegaFon', - 799632 => 'MegaFon', - 799633 => 'MegaFon', - 799634 => 'MegaFon', - 799635 => 'MegaFon', - 799636 => 'MegaFon', - 799637 => 'MegaFon', - 799638 => 'MegaFon', - 799639 => 'MegaFon', 79964 => 'MegaFon', 79965 => 'MegaFon', 79966 => 'MegaFon', @@ -1201,15 +1157,7 @@ 7996852 => 'Tele2', 7996853 => 'Tele2', 7996854 => 'Tele2', + 79969 => 'MegaFon', 799690 => 'Tele2', - 799691 => 'MegaFon', - 799692 => 'MegaFon', - 799693 => 'MegaFon', - 799694 => 'MegaFon', - 799695 => 'MegaFon', - 799696 => 'MegaFon', - 799697 => 'MegaFon', - 799698 => 'MegaFon', - 799699 => 'MegaFon', 7999 => 'MegaFon', ); diff --git a/src/carrier/data/en/886.php b/src/carrier/data/en/886.php index 59379292f..d6f3c0bf0 100644 --- a/src/carrier/data/en/886.php +++ b/src/carrier/data/en/886.php @@ -76,7 +76,11 @@ 886955 => 'FarEasTone', 886956 => 'Taiwan Mobile', 886958 => 'Taiwan Mobile', - 886960 => 'Taiwan Mobile', + 8869600 => 'Taiwan Mobile', + 8869601 => 'Taiwan Mobile', + 8869602 => 'Taiwan Mobile', + 8869603 => 'Taiwan Mobile', + 8869604 => 'Taiwan Mobile', 8869605 => 'FarEasTone', 8869606 => 'FarEasTone', 8869607 => 'FarEasTone', diff --git a/src/carrier/data/en/90.php b/src/carrier/data/en/90.php index 3ad9c109c..3be70a963 100644 --- a/src/carrier/data/en/90.php +++ b/src/carrier/data/en/90.php @@ -25,5 +25,5 @@ 9054287 => 'KKTC Telsim', 9054288 => 'KKTC Telsim', 9055 => 'Turk Telekom', - 90561 => 'Turkcell', + 9056 => 'Turkcell', ); diff --git a/src/carrier/data/en/963.php b/src/carrier/data/en/963.php index 94511b40c..030b6238a 100644 --- a/src/carrier/data/en/963.php +++ b/src/carrier/data/en/963.php @@ -11,7 +11,7 @@ */ return array ( - 963922 => 'Syriatel', + 96392 => 'Syriatel', 96393 => 'Syriatel', 96394 => 'MTN', 963950 => 'MTN', diff --git a/src/carrier/data/en/972.php b/src/carrier/data/en/972.php index b56a6585b..a5029c463 100644 --- a/src/carrier/data/en/972.php +++ b/src/carrier/data/en/972.php @@ -16,35 +16,20 @@ 97252 => 'Cellcom', 97253 => 'Hot Mobile', 97254 => 'Orange', - 9725501 => 'Beezz', + 972550 => 'Beezz', 9725522 => 'Home Cellular', 9725523 => 'Home Cellular', 9725524 => 'Telzar', 9725525 => 'Telzar', - 9725532 => 'Free Telecom', - 9725533 => 'Free Telecom', + 972553 => 'Free Telecom', 9725550 => 'Annatel', - 9725551 => 'Annatel', - 9725566 => 'Rami Levy', - 9725567 => 'Rami Levy', - 9725568 => 'Rami Levy', + 972556 => 'Rami Levy', 9725570 => 'Cellact', 9725571 => 'Cellact', 9725572 => 'Cellact', - 9725587 => 'Alon', - 9725588 => 'Alon', - 9725589 => 'Alon', - 9725591 => 'Telzar', - 9725592 => 'Telzar', - 9725593 => 'Telzar', - 9725594 => 'Telzar', - 9725595 => 'Telzar', - 9725596 => 'Telzar', - 9725597 => 'Telzar', - 9725598 => 'Telzar', - 9725599 => 'Telzar', + 972558 => 'Alon', + 972559 => 'Telzar', 97256 => 'Wataniya', - 97257 => 'Hot Mobile', 97258 => 'Golan Telecom', 97259 => 'Jawwal', ); diff --git a/src/carrier/data/en/992.php b/src/carrier/data/en/992.php index c9cd4bc84..9044251aa 100644 --- a/src/carrier/data/en/992.php +++ b/src/carrier/data/en/992.php @@ -11,12 +11,11 @@ */ return array ( - 992411 => 'Megafon', - 992418 => 'Megafon', + 99241 => 'Megafon', 99250 => 'Tcell', 99255 => 'Megafon', - 99277 => 'Tcell', - 99288 => 'Megafon', + 9927 => 'Tcell', + 9928 => 'Megafon', 99290 => 'Megafon', 992917 => 'Tacom', 992918 => 'Babilon-M', diff --git a/src/carrier/data/en/995.php b/src/carrier/data/en/995.php index 600890c2f..7674f393f 100644 --- a/src/carrier/data/en/995.php +++ b/src/carrier/data/en/995.php @@ -11,17 +11,15 @@ */ return array ( - 995514 => 'Geocell', + 99551 => 'Geocell', 99554444 => 'MagtiCom', 995550 => 'MagtiCom', 995551 => 'MagtiCom', - 995554 => 'MagtiCom', 995555 => 'Geocell', 995557 => 'Geocell', 995558 => 'Geocell', 995559 => 'Globalcell', - 995562 => 'Geocell', - 995568 => 'Veon', + 99556 => 'Veon', 995570 => 'Silknet', 995571 => 'Veon', 995574 => 'Veon', @@ -35,5 +33,5 @@ 995597 => 'Veon', 995598 => 'MagtiCom', 995599 => 'MagtiCom', - 995790 => 'MagtiCom', + 99579 => 'MagtiCom', ); diff --git a/src/carrier/data/en/996.php b/src/carrier/data/en/996.php index 1f9088dd9..a8de93c87 100644 --- a/src/carrier/data/en/996.php +++ b/src/carrier/data/en/996.php @@ -20,8 +20,7 @@ 99656 => 'Winline', 99657 => 'Sotel', 99670 => 'Nur Telecom', - 996755 => 'ALFA Telecom', + 99675 => 'ALFA Telecom', 99677 => 'Sky mobile', - 996996 => 'Sky mobile', - 996999 => 'Sky mobile', + 9969 => 'Sky mobile', ); diff --git a/src/carrier/data/ru/7.php b/src/carrier/data/ru/7.php index 2d392f96f..a5488b649 100644 --- a/src/carrier/data/ru/7.php +++ b/src/carrier/data/ru/7.php @@ -147,12 +147,11 @@ 7908439 => 'Билайн', 790844 => 'Билайн', 790845 => 'Билайн', - 790846 => 'Билайн', - 7908465 => '', - 7908466 => '', - 7908467 => '', - 7908468 => '', - 7908469 => '', + 7908460 => 'Билайн', + 7908461 => 'Билайн', + 7908462 => 'Билайн', + 7908463 => 'Билайн', + 7908464 => 'Билайн', 790861 => 'МегаФон', 790862 => 'МегаФон', 790863 => 'МОТИВ', @@ -244,7 +243,6 @@ 7953039 => 'МОТИВ', 795304 => 'МОТИВ', 795305 => 'МОТИВ', - 7953059 => '', 795320 => 'Билайн', 795321 => 'Билайн', 795322 => 'Билайн', @@ -287,34 +285,15 @@ 7996241 => 'МегаФон', 7996242 => 'МегаФон', 7996243 => 'МегаФон', - 7996303 => 'МегаФон', - 7996304 => 'МегаФон', - 7996305 => 'МегаФон', - 7996306 => 'МегаФон', - 7996307 => 'МегаФон', - 7996308 => 'МегаФон', - 7996309 => 'МегаФон', - 799631 => 'МегаФон', - 799632 => 'МегаФон', - 799633 => 'МегаФон', - 799634 => 'МегаФон', - 799635 => 'МегаФон', - 799636 => 'МегаФон', - 799637 => 'МегаФон', - 799638 => 'МегаФон', - 799639 => 'МегаФон', + 79963 => 'МегаФон', + 7996300 => '', + 7996301 => '', + 7996302 => '', 79964 => 'МегаФон', 79965 => 'МегаФон', 79966 => 'МегаФон', 7996699 => '', - 799691 => 'МегаФон', - 799692 => 'МегаФон', - 799693 => 'МегаФон', - 799694 => 'МегаФон', - 799695 => 'МегаФон', - 799696 => 'МегаФон', - 799697 => 'МегаФон', - 799698 => 'МегаФон', - 799699 => 'МегаФон', + 79969 => 'МегаФон', + 799690 => '', 7999 => 'МегаФон', ); diff --git a/src/data/PhoneNumberMetadata_AR.php b/src/data/PhoneNumberMetadata_AR.php index 2752821fa..bdee6e5d2 100644 --- a/src/data/PhoneNumberMetadata_AR.php +++ b/src/data/PhoneNumberMetadata_AR.php @@ -322,9 +322,6 @@ array ( 0 => '911', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 2 => array ( @@ -337,9 +334,6 @@ 2 => '9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3[4-6]|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))', 3 => '9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|3(?:4|5[014]|6[1-39])|[58]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 3 => array ( @@ -349,9 +343,6 @@ array ( 0 => '9[23]', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 4 => array ( diff --git a/src/data/PhoneNumberMetadata_AU.php b/src/data/PhoneNumberMetadata_AU.php index 634daf489..7555f7f23 100644 --- a/src/data/PhoneNumberMetadata_AU.php +++ b/src/data/PhoneNumberMetadata_AU.php @@ -30,7 +30,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '[237]\\d{8}|8(?:51(?:0(?:0[03-9]|[1247]\\d|3[2-9]|5[0-8]|6[1-9]|8[0-6])|1(?:1[69]|[23]\\d|4[0-4]))|[6-8]\\d{4}|9(?:[02-9]\\d{3}|1(?:[0-57-9]\\d{2}|6[0135-9]\\d)))\\d{3}', + 'NationalNumberPattern' => '(?:[237]\\d{5}|8(?:51(?:0(?:0[03-9]|[1247]\\d|3[2-9]|5[0-8]|6[1-9]|8[0-6])|1(?:1[69]|[23]\\d|4[0-4]))|(?:[6-8]\\d{3}|9(?:[02-9]\\d\\d|1(?:[0-57-9]\\d|6[0135-9])))\\d))\\d{3}', 'ExampleNumber' => '212345678', 'PossibleLength' => array ( @@ -68,12 +68,11 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '19(?:0[0126]\\d|[679])\\d{5}', + 'NationalNumberPattern' => '190[0-26]\\d{6}', 'ExampleNumber' => '1900123456', 'PossibleLength' => array ( - 0 => 8, - 1 => 10, + 0 => 10, ), 'PossibleLengthLocalOnly' => array ( @@ -81,7 +80,7 @@ ), 'sharedCost' => array ( - 'NationalNumberPattern' => '13(?:00\\d{3}|45[0-4]|\\d)\\d{3}', + 'NationalNumberPattern' => '13(?:00\\d{3}|45[0-4])\\d{3}|13\\d{4}', 'ExampleNumber' => '1300123456', 'PossibleLength' => array ( @@ -153,7 +152,7 @@ ), 'noInternationalDialling' => array ( - 'NationalNumberPattern' => '1(?:3(?:00\\d{3}|45[0-4]|\\d)\\d{3}|80(?:0\\d{6}|2\\d{3}))', + 'NationalNumberPattern' => '1[38]00\\d{6}|1(?:345[0-4]|802)\\d{3}|13\\d{4}', 'PossibleLength' => array ( 0 => 6, @@ -167,7 +166,7 @@ ), 'id' => 'AU', 'countryCode' => 61, - 'internationalPrefix' => '(?:14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011)|001[14-689]', + 'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011', 'preferredInternationalPrefix' => '0011', 'nationalPrefix' => '0', 'nationalPrefixForParsing' => '0', @@ -176,31 +175,31 @@ array ( 0 => array ( - 'pattern' => '([2378])(\\d{4})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{3})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[2378]', + 0 => '19', ), - 'nationalPrefixFormattingRule' => '(0$1)', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{4})(\\d{3,4})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '14|[45]', + 0 => '19', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 2 => array ( - 'pattern' => '(16)(\\d{3,4})', + 'pattern' => '(\\d{2})(\\d{3,4})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( @@ -212,24 +211,24 @@ ), 3 => array ( - 'pattern' => '(16)(\\d{3})(\\d{2,4})', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '16', + 0 => '13', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 4 => array ( - 'pattern' => '(1[389]\\d{2})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{4})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1[389]0', - 1 => '1(?:[38]0|9)0', + 0 => '180', + 1 => '1802', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -237,48 +236,47 @@ ), 5 => array ( - 'pattern' => '(180)(2\\d{3})', - 'format' => '$1 $2', + 'pattern' => '(\\d{2})(\\d{3})(\\d{2,4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '180', - 1 => '1802', + 0 => '16', ), - 'nationalPrefixFormattingRule' => '', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 6 => array ( - 'pattern' => '(19\\d)(\\d{3})', - 'format' => '$1 $2', + 'pattern' => '(\\d)(\\d{4})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '19[13]', + 0 => '[2378]', ), - 'nationalPrefixFormattingRule' => '', + 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 7 => array ( - 'pattern' => '(19\\d{2})(\\d{4})', - 'format' => '$1 $2', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '19[679]', + 0 => '14|[45]', ), - 'nationalPrefixFormattingRule' => '', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 8 => array ( - 'pattern' => '(13)(\\d{2})(\\d{2})', + 'pattern' => '(\\d{4})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '13[1-9]', + 0 => '1(?:30|[89])', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -287,6 +285,66 @@ ), 'intlNumberFormat' => array ( + 0 => + array ( + 'pattern' => '(\\d{2})(\\d{3,4})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '16', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 1 => + array ( + 'pattern' => '(\\d{2})(\\d{3})(\\d{2,4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '16', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 2 => + array ( + 'pattern' => '(\\d)(\\d{4})(\\d{4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '[2378]', + ), + 'nationalPrefixFormattingRule' => '(0$1)', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 3 => + array ( + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '14|[45]', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 4 => + array ( + 'pattern' => '(\\d{4})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '1(?:30|[89])', + ), + 'nationalPrefixFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), ), 'mainCountryForCode' => true, 'leadingZeroPossible' => false, diff --git a/src/data/PhoneNumberMetadata_BB.php b/src/data/PhoneNumberMetadata_BB.php index 08eb0cb4b..dc18d4120 100644 --- a/src/data/PhoneNumberMetadata_BB.php +++ b/src/data/PhoneNumberMetadata_BB.php @@ -116,7 +116,7 @@ ), 'uan' => array ( - 'NationalNumberPattern' => '246(?:292|367|4(?:1[7-9]|3[01]|44|67)|736)\\d{4}', + 'NationalNumberPattern' => '246(?:292|367|4(?:1[7-9]|3[01]|44|67)|7(?:36|53))\\d{4}', 'ExampleNumber' => '2464301234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_BD.php b/src/data/PhoneNumberMetadata_BD.php index 860ea1de7..0252dc30f 100644 --- a/src/data/PhoneNumberMetadata_BD.php +++ b/src/data/PhoneNumberMetadata_BD.php @@ -29,14 +29,10 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2(?:[45]\\d{3}|7(?:1[0-267]|2[0-289]|3[0-29]|4[01]|5[1-3]|6[013]|7[0178]|91)|8(?:0[125]|[139][1-6]|2[0157-9]|41|6[1-35]|7[1-5]|8[1-8]|90)|9(?:0[0-2]|1[0-4]|2[568]|3[3-6]|5[5-7]|6[01367]|7[15]|8[0146-9]))\\d{4}|3(?:12?[5-7]\\d{2}|0(?:2(?:[025-79]\\d|[348]\\d{1,2})|3(?:[2-4]\\d|[56]\\d?))|2(?:1\\d{2}|2(?:[12]\\d|[35]\\d{1,2}|4\\d?))|3(?:1\\d{2}|2(?:[2356]\\d|4\\d{1,2}))|4(?:1\\d{2}|2(?:2\\d{1,2}|[47]|5\\d{2}))|5(?:1\\d{2}|29)|[67]1\\d{2}|8(?:1\\d{2}|2(?:2\\d{2}|3|4\\d)))\\d{3}|4(?:0(?:2(?:[09]\\d|7)|33\\d{2})|1\\d{3}|2(?:1\\d{2}|2(?:[25]\\d?|[348]\\d|[67]\\d{1,2}))|3(?:1\\d{2}(?:\\d{2})?|2(?:[045]\\d|[236-9]\\d{1,2})|32\\d{2})|4(?:[18]\\d{2}|2(?:[2-46]\\d{2}|3)|5[25]\\d{2})|5(?:1\\d{2}|2(?:3\\d|5))|6(?:[18]\\d{2}|2(?:3(?:\\d{2})?|[46]\\d{1,2}|5\\d{2}|7\\d)|5(?:3\\d?|4\\d|[57]\\d{1,2}|6\\d{2}|8)|62\\d{2})|71\\d{2}|8(?:[18]|23|54)\\d{2}|9(?:[18]\\d{2}|2[2-5]\\d{2}|53\\d{1,2}))\\d{3}|5(?:02[03489]\\d{2}|1\\d{2}|2(?:1\\d{2}|2(?:2(?:\\d{2})?|[457]\\d{2}))|3(?:1\\d{2}|2(?:[37](?:\\d{2})?|[569]\\d{2}))|4(?:1\\d{2}|2[46]\\d{2})|5(?:1\\d{2}|26\\d{1,2})|6(?:[18]\\d{2}|2|53\\d{2})|7(?:1|24)\\d{2}|8(?:1|26)\\d{2}|91\\d{2})\\d{3}|6(?:0(?:1\\d{2}|2(?:3\\d{2}|4\\d{1,2}))|2(?:2[2-5]\\d{2}|5(?:[3-5]\\d{2}|7)|8\\d{2})|3(?:1|2[3478])\\d{2}|4(?:1|2[34])\\d{2}|5(?:1|2[47])\\d{2}|6(?:[18]\\d{2}|6(?:2(?:2\\d|[34]\\d{2})|5(?:[24]\\d{2}|3\\d|5\\d{1,2})))|72[2-5]\\d{2}|8(?:1\\d{2}|2[2-5]\\d{2})|9(?:1\\d{2}|2[2-6]\\d{2}))\\d{3}|7(?:(?:02|[3-589]1|6[12]|72[24])\\d{2}|21\\d{3}|32)\\d{3}|8(?:(?:4[12]|[5-7]2|1\\d?)|(?:0|3[12]|[5-7]1|217)\\d)\\d{4}|9(?:[35]1|(?:[024]2|81)\\d|(?:1|[24]1)\\d{2})\\d{3}', + 'NationalNumberPattern' => '(?:(?:2(?:[45]\\d{3}|7(?:1[0-267]|2[0-289]|3[0-29]|4[01]|5[1-3]|6[013]|7[0178]|91)|8(?:0[125]|[13][1-6]|2[0157-9]|41|6[1-35]|7[1-5]|8[1-8]|9[0-6])|9(?:0[0-2]|1[0-4]|2[568]|3[3-6]|5[5-7]|6[01367]|7[15]|8[0146-9]))|7(?:02|21\\d|[3-589]1|6[12]|72[24])\\d|8(?:(?:[01]|217|3[12])\\d|4[12]|[5-7](?:1\\d|2)))\\d|3(?:(?:0(?:2[348]\\d|3[2-6])|(?:1(?:2[5-7]|[5-7])|3(?:1|24)|[5-7]1)\\d)\\d|2(?:1\\d\\d|2(?:[35]\\d\\d|4))|4(?:1\\d\\d|2(?:[25]\\d\\d|[47]))|8(?:1\\d\\d|2(?:(?:2\\d|4)\\d|3)))|4(?:0(?:2(?:[09]\\d|7)|33\\d\\d)|(?:1\\d|4(?:2[2-46]|5[25])|8(?:23|54))\\d\\d|2(?:1\\d\\d|2(?:[25]|[67]\\d\\d))|3(?:1\\d\\d(?:\\d{2})?|(?:2[236-9]|32)\\d\\d)|525|6(?:(?:[18]|2[3-6]|62)\\d\\d|5(?:[38]|[5-7]\\d\\d))|9(?:(?:[18]|2[2-5])\\d\\d|53\\d\\d?))|5(?:(?:02[03489]|1|22[2457]|32[35-79]|42[46]|[58]26|724)\\d\\d|6(?:(?:[18]|53)\\d\\d|2))|6(?:(?:(?:[04]2[34]|32[3478]|52[47]|[78]2[2-5]|92[2-6])\\d|6(?:[18]\\d|6(?:2(?:2|[34]\\d)|5[245]\\d)))\\d|2(?:(?:2[2-5]|8)\\d\\d|5(?:[3-5]\\d\\d|7)))|9(?:[24]1\\d\\d|[35]1))\\d{3}|(?:3(?:0(?:2[02-9]\\d|3[56])|(?:22[1-5]|32[2-6]|422)\\d|529)|(?:4(?:22[2-8]|32[02-9]|(?:[48][18]|71)\\d|5(?:1\\d|23)|6(?:2[467]|5[3-57]))|5(?:[2-47-9]1\\d|5(?:1\\d|26))|6(?:0(?:1\\d|24)|[3-589]1\\d|665[35])|81|9(?:[024]2|1\\d|81))\\d|732)\\d{3}|(?:4[46]23|5(?:222|32[37]))\\d{3}', 'ExampleNumber' => '27111234', 'PossibleLength' => array ( - 0 => 6, - 1 => 7, - 2 => 8, - 3 => 9, ), 'PossibleLengthLocalOnly' => array ( @@ -158,11 +154,11 @@ array ( 0 => array ( - 'pattern' => '(2)(\\d{7,8})', + 'pattern' => '(\\d{2})(\\d{4,6})', 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '2', + 0 => '31[5-7]|[459]1', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -170,11 +166,11 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{4,6})', + 'pattern' => '(\\d{3})(\\d{3,7})', 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '[3-79]1', + 0 => '3(?:[2-5]1|[67]|8[013-9])|4(?:[235]1|4[01346-9]|6[168]|7|[89][18])|5(?:[2-578]1|6[128]|9)|6(?:[0389]1|28|4[14]|5|6[01346-9])|7(?:[2-589]|61)|8(?:0[014-9]|[12]|[3-7]1)|9(?:[24]1|[358])', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -186,7 +182,7 @@ 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '1|3(?:0|[2-58]2)|4(?:0|[25]2|3[23]|[4689][25])|5(?:[02-578]2|6[25])|6(?:[0347-9]2|[26][25])|7[02-9]2|8(?:[023][23]|[4-7]2)|9(?:[02][23]|[458]2|6[01367])', + 0 => '[13-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -194,11 +190,11 @@ ), 3 => array ( - 'pattern' => '(\\d{3})(\\d{3,7})', + 'pattern' => '(\\d)(\\d{7,8})', 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '[3-79][2-9]|8', + 0 => '2', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_BO.php b/src/data/PhoneNumberMetadata_BO.php index f874abe4a..25d22dbcc 100644 --- a/src/data/PhoneNumberMetadata_BO.php +++ b/src/data/PhoneNumberMetadata_BO.php @@ -27,7 +27,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2(?:2\\d{2}|5(?:11|[258]\\d|9[67])|6(?:12|2\\d|9[34])|8(?:2[34]|39|62))|3(?:3\\d{2}|4(?:6\\d|8[24])|8(?:25|42|5[257]|86|9[25])|9(?:2\\d|3[234]|4[248]|5[24]|6[2-6]|7\\d))|4(?:4\\d{2}|6(?:11|[24689]\\d|72)))\\d{4}', + 'NationalNumberPattern' => '(?:2(?:2\\d\\d|5(?:11|[258]\\d|9[67])|6(?:12|2\\d|9[34])|8(?:2[34]|39|62))|3(?:3\\d\\d|4(?:6\\d|8[24])|8(?:25|42|5[257]|86|9[25])|9(?:[27]\\d|3[2-4]|4[248]|5[24]|6[2-6]))|4(?:4\\d\\d|6(?:11|[24689]\\d|72)))\\d{4}', 'ExampleNumber' => '22123456', 'PossibleLength' => array ( @@ -144,7 +144,7 @@ ), 'id' => 'BO', 'countryCode' => 591, - 'internationalPrefix' => '00(1\\d)?', + 'internationalPrefix' => '00(?:1\\d)?', 'nationalPrefix' => '0', 'nationalPrefixForParsing' => '0(1\\d)?', 'sameMobileAndFixedLinePattern' => false, @@ -152,7 +152,7 @@ array ( 0 => array ( - 'pattern' => '([234])(\\d{7})', + 'pattern' => '(\\d)(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( @@ -164,7 +164,7 @@ ), 1 => array ( - 'pattern' => '([67]\\d{7})', + 'pattern' => '(\\d{8})', 'format' => '$1', 'leadingDigitsPatterns' => array ( @@ -176,11 +176,11 @@ ), 2 => array ( - 'pattern' => '(800)(\\d{2})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{2})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '800', + 0 => '8', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '0$CC $1', diff --git a/src/data/PhoneNumberMetadata_CC.php b/src/data/PhoneNumberMetadata_CC.php index c8cb41c86..c8bf9f642 100644 --- a/src/data/PhoneNumberMetadata_CC.php +++ b/src/data/PhoneNumberMetadata_CC.php @@ -29,7 +29,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '8(?:51(?:0(?:02|31|60)|118)|91(?:0(?:1[0-2]|29)|1(?:[28]2|50|79)|2(?:10|64)|3(?:08|22|68)|4[29]8|62\\d|70[23]|959))\\d{3}', + 'NationalNumberPattern' => '8(?:51(?:0(?:02|31|60)|118)|91(?:0(?:1[0-2]|29)|1(?:[28]2|50|79)|2(?:10|64)|3(?:[06]8|22)|4[29]8|62\\d|70[23]|959))\\d{3}', 'ExampleNumber' => '891621234', 'PossibleLength' => array ( @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[6-9]|7[02-9]|8[0-2547-9]|9[017-9])\\d{6}', + 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[6-9]|7[02-9]|8[0-2457-9]|9[017-9])\\d{6}', 'ExampleNumber' => '412345678', 'PossibleLength' => array ( @@ -67,12 +67,11 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '19(?:0[0126]\\d|[679])\\d{5}', + 'NationalNumberPattern' => '190[0-26]\\d{6}', 'ExampleNumber' => '1900123456', 'PossibleLength' => array ( - 0 => 8, - 1 => 10, + 0 => 10, ), 'PossibleLengthLocalOnly' => array ( @@ -80,7 +79,7 @@ ), 'sharedCost' => array ( - 'NationalNumberPattern' => '13(?:00\\d{3}|45[0-4]|\\d)\\d{3}', + 'NationalNumberPattern' => '13(?:00\\d{3}|45[0-4])\\d{3}|13\\d{4}', 'ExampleNumber' => '1300123456', 'PossibleLength' => array ( @@ -156,7 +155,7 @@ ), 'id' => 'CC', 'countryCode' => 61, - 'internationalPrefix' => '(?:14(?:1[14]|34|4[17]|[56]6|7[47]|88))?001[14-689]', + 'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011', 'preferredInternationalPrefix' => '0011', 'nationalPrefix' => '0', 'nationalPrefixForParsing' => '0', diff --git a/src/data/PhoneNumberMetadata_CO.php b/src/data/PhoneNumberMetadata_CO.php index 1d403d781..245a01715 100644 --- a/src/data/PhoneNumberMetadata_CO.php +++ b/src/data/PhoneNumberMetadata_CO.php @@ -149,7 +149,7 @@ 'countryCode' => 57, 'internationalPrefix' => '00(?:4(?:[14]4|56)|[579])', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0([3579]|4(?:44|56))?', + 'nationalPrefixForParsing' => '0([3579]|4(?:[14]4|56))?', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( @@ -159,8 +159,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1(?:[2-7]|8[2-9]|9[0-3])|[24-8]', - 1 => '1(?:[2-7]|8[2-9]|9(?:09|[1-3]))|[24-8]', + 0 => '1(?:[2-79]|8[2-9])|[24-8]', ), 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '0$CC $1', @@ -180,12 +179,12 @@ ), 2 => array ( - 'pattern' => '(1)(\\d{3})(\\d{7})', + 'pattern' => '(\\d)(\\d{3})(\\d{7})', 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( - 0 => '1(?:80|9[04])', - 1 => '1(?:800|9(?:0[01]|4[78]))', + 0 => '1(?:80|9)', + 1 => '1(?:800|9)', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -200,8 +199,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1(?:[2-7]|8[2-9]|9[0-3])|[24-8]', - 1 => '1(?:[2-7]|8[2-9]|9(?:09|[1-3]))|[24-8]', + 0 => '1(?:[2-79]|8[2-9])|[24-8]', ), 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '0$CC $1', @@ -221,16 +219,13 @@ ), 2 => array ( - 'pattern' => '(1)(\\d{3})(\\d{7})', + 'pattern' => '(\\d)(\\d{3})(\\d{7})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1(?:80|9[04])', - 1 => '1(?:800|9(?:0[01]|4[78]))', + 0 => '1(?:80|9)', + 1 => '1(?:800|9)', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), ), 'mainCountryForCode' => false, diff --git a/src/data/PhoneNumberMetadata_CR.php b/src/data/PhoneNumberMetadata_CR.php index 4521bbb07..beed2dd47 100644 --- a/src/data/PhoneNumberMetadata_CR.php +++ b/src/data/PhoneNumberMetadata_CR.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2(?:[024-7]\\d{2}|1(?:0[7-9]|[1-9]\\d))\\d{4}', + 'NationalNumberPattern' => '2(?:[024-7]\\d\\d|1(?:0[7-9]|[1-9]\\d))\\d{4}', 'ExampleNumber' => '22123456', 'PossibleLength' => array ( @@ -38,7 +38,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '5(?:0[01]|7[0-3])\\d{5}|6(?:[0-4]\\d{3}|500[01])\\d{3}|(?:7[0-3]|8[3-9])\\d{6}', + 'NationalNumberPattern' => '(?:(?:5(?:0[01]|7[0-3])|(?:7[0-3]|8[3-9])\\d)\\d\\d|6(?:[0-4]\\d{3}|500[01]))\\d{3}', 'ExampleNumber' => '83123456', 'PossibleLength' => array ( @@ -94,7 +94,7 @@ ), 'voip' => array ( - 'NationalNumberPattern' => '210[0-6]\\d{4}|4\\d{7}|5100\\d{4}', + 'NationalNumberPattern' => '(?:210[0-6]|4\\d{3}|5100)\\d{4}', 'ExampleNumber' => '40001234', 'PossibleLength' => array ( @@ -147,7 +147,7 @@ 'id' => 'CR', 'countryCode' => 506, 'internationalPrefix' => '00', - 'nationalPrefixForParsing' => '(19(?:0[012468]|1[09]|20|66|77|99))', + 'nationalPrefixForParsing' => '(19(?:0[0-2468]|1[09]|20|66|77|99))', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( @@ -169,7 +169,7 @@ 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( - 0 => '[89]0', + 0 => '[89]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', diff --git a/src/data/PhoneNumberMetadata_CU.php b/src/data/PhoneNumberMetadata_CU.php index 3e6a4987d..4361817d2 100644 --- a/src/data/PhoneNumberMetadata_CU.php +++ b/src/data/PhoneNumberMetadata_CU.php @@ -29,7 +29,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2[1-4]\\d{5,6}|3(?:1\\d{6}|[23]\\d{4,6})|4(?:[125]\\d{5,6}|[36]\\d{6}|[78]\\d{4,6})|7\\d{6,7}', + 'NationalNumberPattern' => '(?:2[1-4]|7\\d)\\d{5,6}|(?:3[1-3]|4[1-35-8])\\d{6}|3[23]\\d{4,5}|4[12578]\\d{5}|4[78]\\d{4}', 'ExampleNumber' => '71234567', 'PossibleLength' => array ( @@ -152,11 +152,11 @@ array ( 0 => array ( - 'pattern' => '(\\d)(\\d{6,7})', + 'pattern' => '(\\d{2})(\\d{4,6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '7', + 0 => '[2-4]', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', @@ -164,11 +164,11 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{4,6})', + 'pattern' => '(\\d)(\\d{6,7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[2-4]', + 0 => '7', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_CX.php b/src/data/PhoneNumberMetadata_CX.php index 380d9eb87..5d4beb8bc 100644 --- a/src/data/PhoneNumberMetadata_CX.php +++ b/src/data/PhoneNumberMetadata_CX.php @@ -29,7 +29,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '8(?:51(?:0(?:01|30|59)|117)|91(?:00[6-9]|1(?:21|49|78|81)|2(?:09|63)|3(?:12|26|75)|4(?:56|97)|64\\d|7(?:0[01]|1[0-2])|958))\\d{3}', + 'NationalNumberPattern' => '8(?:51(?:0(?:01|30|59)|117)|91(?:00[6-9]|1(?:[28]1|49|78)|2(?:09|63)|3(?:12|26|75)|4(?:56|97)|64\\d|7(?:0[01]|1[0-2])|958))\\d{3}', 'ExampleNumber' => '891641234', 'PossibleLength' => array ( @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[6-9]|7[02-9]|8[0-2547-9]|9[017-9])\\d{6}', + 'NationalNumberPattern' => '4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[6-9]|7[02-9]|8[0-2457-9]|9[017-9])\\d{6}', 'ExampleNumber' => '412345678', 'PossibleLength' => array ( @@ -67,12 +67,11 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '19(?:0[0126]\\d|[679])\\d{5}', + 'NationalNumberPattern' => '190[0-26]\\d{6}', 'ExampleNumber' => '1900123456', 'PossibleLength' => array ( - 0 => 8, - 1 => 10, + 0 => 10, ), 'PossibleLengthLocalOnly' => array ( @@ -80,7 +79,7 @@ ), 'sharedCost' => array ( - 'NationalNumberPattern' => '13(?:00\\d{3}|45[0-4]|\\d)\\d{3}', + 'NationalNumberPattern' => '13(?:00\\d{3}|45[0-4])\\d{3}|13\\d{4}', 'ExampleNumber' => '1300123456', 'PossibleLength' => array ( @@ -156,7 +155,7 @@ ), 'id' => 'CX', 'countryCode' => 61, - 'internationalPrefix' => '(?:14(?:1[14]|34|4[17]|[56]6|7[47]|88))?001[14-689]', + 'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011', 'preferredInternationalPrefix' => '0011', 'nationalPrefix' => '0', 'nationalPrefixForParsing' => '0', diff --git a/src/data/PhoneNumberMetadata_EC.php b/src/data/PhoneNumberMetadata_EC.php index afe157ff8..fabfee207 100644 --- a/src/data/PhoneNumberMetadata_EC.php +++ b/src/data/PhoneNumberMetadata_EC.php @@ -156,18 +156,30 @@ 'numberFormat' => array ( 0 => + array ( + 'pattern' => '(\\d{3})(\\d{4})', + 'format' => '$1-$2', + 'leadingDigitsPatterns' => + array ( + 0 => '[2-7]', + ), + 'nationalPrefixFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 1 => array ( 'pattern' => '(\\d)(\\d{3})(\\d{4})', 'format' => '$1 $2-$3', 'leadingDigitsPatterns' => array ( - 0 => '[247]|[356][2-8]', + 0 => '[2-7]', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 1 => + 2 => array ( 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', @@ -179,16 +191,15 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 2 => + 3 => array ( - 'pattern' => '(1800)(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '180', - 1 => '1800', + 0 => '1', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), @@ -201,11 +212,8 @@ 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( - 0 => '[247]|[356][2-8]', + 0 => '[2-7]', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( @@ -221,14 +229,13 @@ ), 2 => array ( - 'pattern' => '(1800)(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '180', - 1 => '1800', + 0 => '1', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), diff --git a/src/data/PhoneNumberMetadata_EG.php b/src/data/PhoneNumberMetadata_EG.php index 38f0a8a1d..741e5c9a3 100644 --- a/src/data/PhoneNumberMetadata_EG.php +++ b/src/data/PhoneNumberMetadata_EG.php @@ -23,12 +23,13 @@ ), 'PossibleLengthLocalOnly' => array ( - 0 => 7, + 0 => 6, + 1 => 7, ), ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:3[23]\\d|5(?:[23]|9\\d))|2[2-4]\\d{2}|3\\d{2}|4(?:0[2-5]|[578][23]|64)\\d|5(?:0[2-7]|5\\d|7[23])\\d|6[24-689]3\\d|8(?:2[2-57]|4[26]|6[237]|8[2-4])\\d|9(?:2[27]|3[24]|52|6[2356]|7[2-4])\\d)\\d{5}', + 'NationalNumberPattern' => '(?:1(?:3[23]|5\\d?)|(?:2[2-4]|3)\\d|4(?:0[2-5]|[578][23]|64)|5(?:0[2-7]|5\\d|7[23])|6[24-689]3|8(?:2[2-57]|4[26]|6[237]|8[2-4])|9(?:2[27]|3[24]|52|6[2356]|7[2-4]))\\d{6}', 'ExampleNumber' => '234567890', 'PossibleLength' => array ( @@ -37,12 +38,13 @@ ), 'PossibleLengthLocalOnly' => array ( - 0 => 7, + 0 => 6, + 1 => 7, ), ), 'mobile' => array ( - 'NationalNumberPattern' => '1[0125]\\d{8}', + 'NationalNumberPattern' => '1[0-25]\\d{8}', 'ExampleNumber' => '1001234567', 'PossibleLength' => array ( @@ -172,7 +174,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1(?:3|5[239])|[4-6]|[89][2-9]', + 0 => '1[35]|[4-6]|8[2468]|9[235-7]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -184,7 +186,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1[0-25]|[89]00', + 0 => '[189]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_ER.php b/src/data/PhoneNumberMetadata_ER.php index fce6dca7a..fb0ca4a77 100644 --- a/src/data/PhoneNumberMetadata_ER.php +++ b/src/data/PhoneNumberMetadata_ER.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '1(?:1[12568]|20|40|55|6[146])\\d{4}|8\\d{6}', + 'NationalNumberPattern' => '(?:1(?:1[12568]|[24]0|55|6[146])|8\\d\\d)\\d{4}', 'ExampleNumber' => '8370362', 'PossibleLength' => array ( @@ -38,7 +38,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '17[1-3]\\d{4}|7\\d{6}', + 'NationalNumberPattern' => '(?:17[1-3]|7\\d\\d)\\d{4}', 'ExampleNumber' => '7123456', 'PossibleLength' => array ( @@ -151,6 +151,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( + 0 => '[178]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_ET.php b/src/data/PhoneNumberMetadata_ET.php index 1fa5bb63d..0d4c8164e 100644 --- a/src/data/PhoneNumberMetadata_ET.php +++ b/src/data/PhoneNumberMetadata_ET.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:11(?:1(?:1[124]|2[2-57]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[578]|44|5[0-4])|6(?:18|2[69]|39|4[5-7]|5[1-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|22[0-6]|33[0134689]|44[04]|55[0-6]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:11[1-9]|22[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}', + 'NationalNumberPattern' => '(?:11(?:1(?:1[124]|2[2-57]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[578]|44|5[0-4])|6(?:18|2[69]|39|4[5-7]|5[1-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|(?:22|55)[0-6]|33[0134689]|44[04]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:(?:11|22)[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}', 'ExampleNumber' => '111112345', 'PossibleLength' => array ( @@ -147,7 +147,7 @@ array ( 0 => array ( - 'pattern' => '([1-59]\\d)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_FO.php b/src/data/PhoneNumberMetadata_FO.php index 93a31234d..65d2914fe 100644 --- a/src/data/PhoneNumberMetadata_FO.php +++ b/src/data/PhoneNumberMetadata_FO.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:20|[3-4]\\d|8[19])\\d{4}', + 'NationalNumberPattern' => '(?:20|[34]\\d|8[19])\\d{4}', 'ExampleNumber' => '201234', 'PossibleLength' => array ( @@ -58,7 +58,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '90(?:[1345][15-7]|2[125-7]|99)\\d{2}', + 'NationalNumberPattern' => '90(?:[13-5][15-7]|2[125-7]|99)\\d\\d', 'ExampleNumber' => '901123', 'PossibleLength' => array ( @@ -151,6 +151,7 @@ 'format' => '$1', 'leadingDigitsPatterns' => array ( + 0 => '[2-9]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', diff --git a/src/data/PhoneNumberMetadata_GB.php b/src/data/PhoneNumberMetadata_GB.php index b8a6b1188..9de6e668b 100644 --- a/src/data/PhoneNumberMetadata_GB.php +++ b/src/data/PhoneNumberMetadata_GB.php @@ -31,7 +31,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2(?:0[01378]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{7}|1(?:1(?:3[0-58]|4[0-5]|5[0-26-9]|6[0-4]|[78][0-49])|21[0-7]|31[0-8]|[4-69]1\\d)\\d{6}|1(?:2(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)|3(?:0\\d|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[28][02-57-9]|[37]\\d|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|2[024-9]|3[015689]|4[02-9]|5[03-9]|6\\d|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0124578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|8\\d|9[2-57]))\\d{6}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[345])))|3(?:638[2-5]|647[23]|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[123]))|5(?:24(?:3[2-79]|6\\d)|276\\d|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[567]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|955[0-4])|7(?:26(?:6[13-9]|7[0-7])|442\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|84(?:3[2-58]))|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}|176888[2-46-8]\\d{2}|16977[23]\\d{3}', + 'NationalNumberPattern' => '(?:1(?:1(?:3[0-58]|4[0-5]|5[0-26-9]|6[0-4]|[78][0-49])|2(?:0[024-9]|1[0-7]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)|3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))|2(?:0[01378]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d)\\d{6}|1(?:(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d|7(?:(?:26(?:6[13-9]|7[0-7])|442\\d|50(?:2[0-3]|[3-68]2|76))\\d|6888[2-46-8]))\\d\\d', 'ExampleNumber' => '1212345678', 'PossibleLength' => array ( @@ -49,7 +49,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:[1-3]\\d{3}|4(?:[0-46-9]\\d{2}|5(?:[0-689]\\d|7[0-57-9]))|5(?:0[0-8]|[13-9]\\d|2[0-35-9])\\d|7(?:0(?:0[01]|[1-9]\\d)|[1-7]\\d{2}|8[02-9]\\d|9[0-689]\\d)|8(?:[014-9]\\d|[23][0-8])\\d|9(?:[024-9]\\d{2}|1(?:[02-9]\\d|1[028])|3[0-689]\\d))\\d{5}', + 'NationalNumberPattern' => '7(?:(?:[1-3]\\d\\d|5(?:0[0-8]|[13-9]\\d|2[0-35-9])|8(?:[014-9]\\d|[23][0-8]))\\d|4(?:[0-46-9]\\d\\d|5(?:[0-689]\\d|7[0-57-9]))|7(?:0(?:0[01]|[1-9]\\d)|(?:[1-7]\\d|8[02-9]|9[0-689])\\d)|9(?:(?:[024-9]\\d|3[0-689])\\d|1(?:[02-9]\\d|1[028])))\\d{5}', 'ExampleNumber' => '7400123456', 'PossibleLength' => array ( @@ -61,7 +61,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '80(?:0(?:1111|\\d{6,7})|8\\d{7})', + 'NationalNumberPattern' => '80[08]\\d{7}|800\\d{6}|8001111', 'ExampleNumber' => '8001234567', 'PossibleLength' => array ( @@ -72,7 +72,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '(?:87[123]|9(?:[01]\\d|8[2349]))\\d{7}', + 'NationalNumberPattern' => '(?:87[1-3]|9(?:[01]\\d|8[2-49]))\\d{7}', 'ExampleNumber' => '9012345678', 'PossibleLength' => array ( @@ -84,7 +84,7 @@ ), 'sharedCost' => array ( - 'NationalNumberPattern' => '8(?:4(?:5464\\d|[2-5]\\d{7})|70\\d{7})', + 'NationalNumberPattern' => '8(?:4[2-5]|70)\\d{7}|845464\\d', 'ExampleNumber' => '8431234567', 'PossibleLength' => array ( @@ -121,7 +121,7 @@ ), 'pager' => array ( - 'NationalNumberPattern' => '76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}', + 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}', 'ExampleNumber' => '7640123456', 'PossibleLength' => array ( @@ -174,12 +174,14 @@ array ( 0 => array ( - 'pattern' => '(7\\d{3})(\\d{6})', - 'format' => '$1 $2', + 'pattern' => '(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '7(?:[1-57-9]|62)', - 1 => '7(?:[1-57-9]|624)', + 0 => '845', + 1 => '8454', + 2 => '84546', + 3 => '845464', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -187,11 +189,15 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{4})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '2|5[56]|7[06]', + 0 => '800', + 1 => '8001', + 2 => '80011', + 3 => '800111', + 4 => '8001111', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -199,11 +205,11 @@ ), 2 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{6})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1(?:[02-9]1|1)|3|9[018]', + 0 => '800', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -211,13 +217,13 @@ ), 3 => array ( - 'pattern' => '(\\d{5})(\\d{4,5})', + 'pattern' => '(\\d{4})(\\d{5,6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1(?:38|5[23]|69|76|94)', - 1 => '1(?:(?:38|69)7|5(?:24|39)|768|946)', - 2 => '1(?:3873|5(?:242|39[4-6])|(?:697|768)[347]|9467)', + 0 => '1(?:[2-79][02-9]|8)', + 1 => '1(?:[24][02-9]|3(?:[02-79]|8[0-46-9])|5(?:[04-9]|2[024-9]|3[014-689])|6(?:[02-8]|9[0-24578])|7(?:[02-57-9]|6[013-9])|8|9(?:[0235-9]|4[2-9]))', + 2 => '1(?:[24][02-9]|3(?:[02-79]|8(?:[0-4689]|7[0-24-9]))|5(?:[04-9]|2(?:[025-9]|4[013-9])|3(?:[014-68]|9[0-37-9]))|6(?:[02-8]|9(?:[0-2458]|7[0-25689]))|7(?:[02-57-9]|6(?:[013-79]|8[0-25689]))|8|9(?:[0235-9]|4(?:[2-57-9]|6[0-689])))', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -225,11 +231,11 @@ ), 4 => array ( - 'pattern' => '(1\\d{3})(\\d{5,6})', + 'pattern' => '(\\d{5})(\\d{4,5})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1', + 0 => '1(?:38|5[23]|69|7|94)', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -237,15 +243,12 @@ ), 5 => array ( - 'pattern' => '(800)(\\d{4})', - 'format' => '$1 $2', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '800', - 1 => '8001', - 2 => '80011', - 3 => '800111', - 4 => '8001111', + 0 => '[25]|7(?:0|6[024-9])', + 1 => '[25]|7(?:0|6(?:[04-9]|2[356]))', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -253,14 +256,11 @@ ), 6 => array ( - 'pattern' => '(845)(46)(4\\d)', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '845', - 1 => '8454', - 2 => '84546', - 3 => '845464', + 0 => '[1389]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -268,35 +268,11 @@ ), 7 => array ( - 'pattern' => '(8\\d{2})(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - 0 => '8(?:4[2-5]|7[0-3])', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 8 => - array ( - 'pattern' => '(80\\d)(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - 0 => '80', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 9 => - array ( - 'pattern' => '(800)(\\d{6})', + 'pattern' => '(\\d{4})(\\d{6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '800', + 0 => '7', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_GE.php b/src/data/PhoneNumberMetadata_GE.php index 8a888cc44..cd1403fbf 100644 --- a/src/data/PhoneNumberMetadata_GE.php +++ b/src/data/PhoneNumberMetadata_GE.php @@ -165,7 +165,7 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '5|790', + 0 => '5|79', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_GG.php b/src/data/PhoneNumberMetadata_GG.php index dc6a29e75..7bf6079df 100644 --- a/src/data/PhoneNumberMetadata_GG.php +++ b/src/data/PhoneNumberMetadata_GG.php @@ -41,7 +41,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:781\\d|839\\d|911[17])\\d{5}', + 'NationalNumberPattern' => '7(?:(?:781|839)\\d|911[17])\\d{5}', 'ExampleNumber' => '7781123456', 'PossibleLength' => array ( @@ -53,7 +53,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '80(?:0(?:1111|\\d{6,7})|8\\d{7})', + 'NationalNumberPattern' => '80[08]\\d{7}|800\\d{6}|8001111', 'ExampleNumber' => '8001234567', 'PossibleLength' => array ( @@ -64,7 +64,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '(?:87[123]|9(?:[01]\\d|8[0-3]))\\d{7}', + 'NationalNumberPattern' => '(?:87[1-3]|9(?:[01]\\d|8[0-3]))\\d{7}', 'ExampleNumber' => '9012345678', 'PossibleLength' => array ( @@ -76,7 +76,7 @@ ), 'sharedCost' => array ( - 'NationalNumberPattern' => '8(?:4(?:5464\\d|[2-5]\\d{7})|70\\d{7})', + 'NationalNumberPattern' => '8(?:4[2-5]|70)\\d{7}|845464\\d', 'ExampleNumber' => '8431234567', 'PossibleLength' => array ( @@ -113,7 +113,7 @@ ), 'pager' => array ( - 'NationalNumberPattern' => '76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}', + 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}', 'ExampleNumber' => '7640123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_GH.php b/src/data/PhoneNumberMetadata_GH.php index 7a4056ece..61ee2402e 100644 --- a/src/data/PhoneNumberMetadata_GH.php +++ b/src/data/PhoneNumberMetadata_GH.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:2[034678]\\d|5(?:[0457]\\d|6[01]))\\d{6}', + 'NationalNumberPattern' => '(?:2[0346-8]\\d|5(?:[0457]\\d|6[01]))\\d{6}', 'ExampleNumber' => '231234567', 'PossibleLength' => array ( @@ -153,13 +153,13 @@ array ( 0 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{4})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[235]', + 0 => '[237]|80', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), @@ -175,9 +175,45 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), + 2 => + array ( + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '[235]', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), ), 'intlNumberFormat' => array ( + 0 => + array ( + 'pattern' => '(\\d{3})(\\d{5})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '8', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 1 => + array ( + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '[235]', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), ), 'mainCountryForCode' => false, 'leadingZeroPossible' => false, diff --git a/src/data/PhoneNumberMetadata_GQ.php b/src/data/PhoneNumberMetadata_GQ.php index d413f6b7b..b9500ec6f 100644 --- a/src/data/PhoneNumberMetadata_GQ.php +++ b/src/data/PhoneNumberMetadata_GQ.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '3(?:3(?:3\\d[7-9]|[0-24-9]\\d[46])|5\\d{2}[7-9])\\d{4}', + 'NationalNumberPattern' => '3(?:3(?:[0-24-9]\\d[46]|3\\d[7-9])|5\\d\\d[7-9])\\d{4}', 'ExampleNumber' => '333091234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_HR.php b/src/data/PhoneNumberMetadata_HR.php index ec673de5a..f57d8b5d6 100644 --- a/src/data/PhoneNumberMetadata_HR.php +++ b/src/data/PhoneNumberMetadata_HR.php @@ -43,7 +43,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '9(?:01\\d|[1259]\\d{2}|7(?:[0679]\\d|51)|8\\d{1,2})\\d{5}', + 'NationalNumberPattern' => '9(?:(?:01|[12589]\\d)\\d|7(?:[0679]\\d|51))\\d{5}|98\\d{6}', 'ExampleNumber' => '921234567', 'PossibleLength' => array ( @@ -70,7 +70,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '6(?:[01]\\d{0,2}|[459]\\d{2})\\d{4}', + 'NationalNumberPattern' => '6[01459]\\d{6}|6[01]\\d{4,5}', 'ExampleNumber' => '611234', 'PossibleLength' => array ( @@ -167,11 +167,11 @@ array ( 0 => array ( - 'pattern' => '(1)(\\d{4})(\\d{3})', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2,3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1', + 0 => '6[01]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -179,11 +179,11 @@ ), 1 => array ( - 'pattern' => '([2-5]\\d)(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{3})(\\d{2})(\\d{2,3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[2-5]', + 0 => '8', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -191,11 +191,11 @@ ), 2 => array ( - 'pattern' => '(9\\d)(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d)(\\d{4})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '9', + 0 => '1', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -203,11 +203,11 @@ ), 3 => array ( - 'pattern' => '(6[01])(\\d{2})(\\d{2,3})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '6[01]', + 0 => '[2-5]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -215,7 +215,7 @@ ), 4 => array ( - 'pattern' => '([67]\\d)(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -227,11 +227,11 @@ ), 5 => array ( - 'pattern' => '(80[01])(\\d{2})(\\d{2,3})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '80[01]', + 0 => '9', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -239,11 +239,11 @@ ), 6 => array ( - 'pattern' => '(80[01])(\\d{3})(\\d{3})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '80[01]', + 0 => '8', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_HU.php b/src/data/PhoneNumberMetadata_HU.php index 3e7eb2e4a..8d510e795 100644 --- a/src/data/PhoneNumberMetadata_HU.php +++ b/src/data/PhoneNumberMetadata_HU.php @@ -23,11 +23,12 @@ 'PossibleLengthLocalOnly' => array ( 0 => 6, + 1 => 7, ), ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1\\d|2[2-9]|3[2-7]|4[24-9]|5[2-79]|6[23689]|7[2-9]|8[2-57-9]|9[2-69])\\d{6}', + 'NationalNumberPattern' => '(?:1\\d|[27][2-9]|3[2-7]|4[24-9]|5[2-79]|6[23689]|8[2-57-9]|9[2-69])\\d{6}', 'ExampleNumber' => '12345678', 'PossibleLength' => array ( @@ -36,6 +37,7 @@ 'PossibleLengthLocalOnly' => array ( 0 => 6, + 1 => 7, ), ), 'mobile' => @@ -159,7 +161,7 @@ array ( 0 => array ( - 'pattern' => '(1)(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_IE.php b/src/data/PhoneNumberMetadata_IE.php index ae4a0b08e..f69af9bd8 100644 --- a/src/data/PhoneNumberMetadata_IE.php +++ b/src/data/PhoneNumberMetadata_IE.php @@ -30,7 +30,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '1\\d{7,8}|2(?:1\\d{6,7}|3\\d{7}|[24-9]\\d{5})|4(?:0[24]\\d{5}|[1-469]\\d{7}|5\\d{6}|7\\d{5}|8[0-46-9]\\d{7})|5(?:0[45]\\d{5}|1\\d{6}|[23679]\\d{7}|8\\d{5})|6(?:1\\d{6}|[237-9]\\d{5}|[4-6]\\d{7})|7[14]\\d{7}|9(?:1\\d{6}|[04]\\d{7}|[35-9]\\d{5})', + 'NationalNumberPattern' => '(?:1\\d{2,3}|2(?:[13]\\d\\d|[24-9])|4(?:0[24]|(?:(?:[1-469]|8[0-46-9])\\d|5)\\d|7)|5(?:0[45]|(?:1|[23679]\\d)\\d|8)|6(?:[237-9]|[4-6]\\d\\d)|7[14]\\d\\d|9(?:[04]\\d\\d|[35-9]))\\d{5}|[269]1\\d{6}', 'ExampleNumber' => '2212345', 'PossibleLength' => array ( @@ -43,7 +43,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '8(?:22\\d{6}|[35-9]\\d{7})', + 'NationalNumberPattern' => '8(?:22|[35-9]\\d)\\d{6}', 'ExampleNumber' => '850123456', 'PossibleLength' => array ( @@ -168,11 +168,11 @@ array ( 0 => array ( - 'pattern' => '(1)(\\d{3,4})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{5})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '1', + 0 => '2[24-9]|47|58|6[237-9]|9[35-9]', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', @@ -180,11 +180,11 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{5})', + 'pattern' => '(\\d{3})(\\d{5})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '2[24-9]|47|58|6[237-9]|9[35-9]', + 0 => '[45]0', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', @@ -192,11 +192,11 @@ ), 2 => array ( - 'pattern' => '(\\d{3})(\\d{5})', - 'format' => '$1 $2', + 'pattern' => '(\\d)(\\d{3,4})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '40[24]|50[45]', + 0 => '1', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', @@ -204,11 +204,11 @@ ), 3 => array ( - 'pattern' => '(48)(\\d{4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '48', + 0 => '[2569]|4[1-69]|7[14]', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', @@ -216,74 +216,73 @@ ), 4 => array ( - 'pattern' => '(818)(\\d{3})(\\d{3})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '818', + 0 => '76|8[235-9]', ), - 'nationalPrefixFormattingRule' => '(0$1)', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 5 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[24-69]|7[14]', + 0 => '7', ), - 'nationalPrefixFormattingRule' => '(0$1)', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 6 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '76|8[35-9]', + 0 => '81', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 7 => array ( - 'pattern' => '(8\\d)(\\d)(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '8[35-9]5', + 0 => '4', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 8 => array ( - 'pattern' => '(700)(\\d{3})(\\d{3})', + 'pattern' => '(\\d{4})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '700', + 0 => '1', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 9 => array ( - 'pattern' => '(\\d{4})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d)(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '1(?:5|8[059])', - 1 => '1(?:5|8[059]0)', + 0 => '8', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), diff --git a/src/data/PhoneNumberMetadata_IL.php b/src/data/PhoneNumberMetadata_IL.php index 6be26d108..dc165c610 100644 --- a/src/data/PhoneNumberMetadata_IL.php +++ b/src/data/PhoneNumberMetadata_IL.php @@ -30,7 +30,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:153\\d{1,2}|[2-489])\\d{7}', + 'NationalNumberPattern' => '(?:153\\d\\d?|[2-489])\\d{7}', 'ExampleNumber' => '21234567', 'PossibleLength' => array ( @@ -45,7 +45,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '5(?:[0-489][2-9]\\d|5(?:01|2[2-5]|3[23]|4[45]|5[05689]|6[6-8]|7[0-267]|8[7-9]|9[1-9])|6\\d{2})\\d{5}', + 'NationalNumberPattern' => '5(?:(?:[0-489][2-9]|6\\d)\\d|5(?:01|2[2-5]|3[23]|4[45]|5[05689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}', 'ExampleNumber' => '502345678', 'PossibleLength' => array ( @@ -57,7 +57,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '1(?:80[019]\\d{3}|255)\\d{3}', + 'NationalNumberPattern' => '1(?:255|80[019]\\d{3})\\d{3}', 'ExampleNumber' => '1800123456', 'PossibleLength' => array ( @@ -70,13 +70,12 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '1(?:212|(?:9(?:0[01]|19)|200)\\d{2})\\d{4}', + 'NationalNumberPattern' => '1(?:2(?:00\\d\\d|12)|9(?:0[01]|19)\\d\\d)\\d{4}', 'ExampleNumber' => '1919123456', 'PossibleLength' => array ( 0 => 8, - 1 => 9, - 2 => 10, + 1 => 10, ), 'PossibleLengthLocalOnly' => array ( @@ -106,7 +105,7 @@ ), 'voip' => array ( - 'NationalNumberPattern' => '7(?:18\\d|2[23]\\d|3[237]\\d|47\\d|6[58]\\d|7\\d{2}|8(?:2\\d|33|55|77|81)|9[2357-9]\\d)\\d{5}', + 'NationalNumberPattern' => '7(?:(?:18|2[23]|3[237]|47|6[58]|7\\d|9[2357-9])\\d|8(?:2\\d|33|55|77|81))\\d{5}', 'ExampleNumber' => '771234567', 'PossibleLength' => array ( @@ -172,23 +171,23 @@ array ( 0 => array ( - 'pattern' => '([2-489])(\\d{3})(\\d{4})', - 'format' => '$1-$2-$3', + 'pattern' => '(\\d{4})(\\d{3})', + 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '[2-489]', + 0 => '125', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( - 'pattern' => '([57]\\d)(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{4})', 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( - 0 => '[57]', + 0 => '[2-489]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -196,11 +195,11 @@ ), 2 => array ( - 'pattern' => '(153)(\\d{1,2})(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{4})(\\d{2})(\\d{2})', + 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( - 0 => '153', + 0 => '121', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -208,24 +207,23 @@ ), 3 => array ( - 'pattern' => '(1)([7-9]\\d{2})(\\d{3})(\\d{3})', - 'format' => '$1-$2-$3-$4', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', + 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( - 0 => '1[7-9]', + 0 => '[57]', ), - 'nationalPrefixFormattingRule' => '', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 4 => array ( - 'pattern' => '(1255)(\\d{3})', - 'format' => '$1-$2', + 'pattern' => '(\\d{4})(\\d{3})(\\d{3})', + 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( - 0 => '125', - 1 => '1255', + 0 => '12', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -233,12 +231,11 @@ ), 5 => array ( - 'pattern' => '(1200)(\\d{3})(\\d{3})', - 'format' => '$1-$2-$3', + 'pattern' => '(\\d{4})(\\d{6})', + 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '120', - 1 => '1200', + 0 => '159', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -246,12 +243,11 @@ ), 6 => array ( - 'pattern' => '(1212)(\\d{2})(\\d{2})', - 'format' => '$1-$2-$3', + 'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{3})', + 'format' => '$1-$2-$3-$4', 'leadingDigitsPatterns' => array ( - 0 => '121', - 1 => '1212', + 0 => '1[7-9]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -259,24 +255,11 @@ ), 7 => array ( - 'pattern' => '(1599)(\\d{6})', - 'format' => '$1-$2', - 'leadingDigitsPatterns' => - array ( - 0 => '159', - 1 => '1599', - ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 8 => - array ( - 'pattern' => '(151)(\\d{1,2})(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{1,2})(\\d{3})(\\d{4})', 'format' => '$1-$2 $3-$4', 'leadingDigitsPatterns' => array ( - 0 => '151', + 0 => '1', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_IM.php b/src/data/PhoneNumberMetadata_IM.php index f6b5853b5..6d810fecc 100644 --- a/src/data/PhoneNumberMetadata_IM.php +++ b/src/data/PhoneNumberMetadata_IM.php @@ -114,7 +114,7 @@ ), 'uan' => array ( - 'NationalNumberPattern' => '3(?:08162\\d|3\\d{5}|4(?:40[49]06|5624\\d)|7(?:0624\\d|2299\\d))\\d{3}|55\\d{8}', + 'NationalNumberPattern' => '(?:3(?:(?:08162|3\\d{4}|7(?:0624|2299))\\d|4(?:40[49]06|5624\\d))|55\\d{5})\\d{3}', 'ExampleNumber' => '5512345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_IN.php b/src/data/PhoneNumberMetadata_IN.php index 16fc88a3f..aae787e27 100644 --- a/src/data/PhoneNumberMetadata_IN.php +++ b/src/data/PhoneNumberMetadata_IN.php @@ -208,7 +208,8 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1(?:2[0-249]|3[0-25]|4[145]|[59][14]|[68][1-9]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1|9[15])|6(?:12|[2-4]1|5[17]|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)', + 0 => '1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6|7[1257]|8[1-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1|9[15])|6(?:12|[2-4]1|5[17]|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)', + 1 => '1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6(?:0[2-7]|[1-9])|7[1257]|8[1-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1|9[15])|6(?:12|[2-4]1|5[17]|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_IQ.php b/src/data/PhoneNumberMetadata_IQ.php index e37b4aee9..657c8cc9f 100644 --- a/src/data/PhoneNumberMetadata_IQ.php +++ b/src/data/PhoneNumberMetadata_IQ.php @@ -154,7 +154,7 @@ array ( 0 => array ( - 'pattern' => '(1)(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -166,7 +166,7 @@ ), 1 => array ( - 'pattern' => '([2-6]\\d)(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -178,7 +178,7 @@ ), 2 => array ( - 'pattern' => '(7\\d{2})(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_JE.php b/src/data/PhoneNumberMetadata_JE.php index 5a019a692..89e9fd066 100644 --- a/src/data/PhoneNumberMetadata_JE.php +++ b/src/data/PhoneNumberMetadata_JE.php @@ -38,7 +38,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:509\\d|7(?:00[378]|97[7-9])|829\\d|937\\d)\\d{5}', + 'NationalNumberPattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97[7-9]))\\d{5}', 'ExampleNumber' => '7797712345', 'PossibleLength' => array ( @@ -104,7 +104,7 @@ ), 'pager' => array ( - 'NationalNumberPattern' => '76(?:0[012]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}', + 'NationalNumberPattern' => '76(?:0[0-2]|2[356]|4[0134]|5[49]|6[0-369]|77|81|9[39])\\d{6}', 'ExampleNumber' => '7640123456', 'PossibleLength' => array ( @@ -115,7 +115,7 @@ ), 'uan' => array ( - 'NationalNumberPattern' => '3(?:0(?:07(?:35|81)|8901)|3\\d{4}|4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|7(?:0002|1206))\\d{4}|55\\d{8}', + 'NationalNumberPattern' => '(?:3(?:0(?:07(?:35|81)|8901)|3\\d{4}|4(?:4(?:4(?:05|42|69)|703)|5(?:041|800))|7(?:0002|1206))|55\\d{4})\\d{4}', 'ExampleNumber' => '5512345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_KE.php b/src/data/PhoneNumberMetadata_KE.php index e6e86e4d1..806c107fb 100644 --- a/src/data/PhoneNumberMetadata_KE.php +++ b/src/data/PhoneNumberMetadata_KE.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '20\\d{6,7}|4(?:0\\d{6,7}|[136]\\d{7}|[245]\\d{5,7})|5(?:[08]\\d{7}|[1-79]\\d{5,7})|6(?:[01457-9]\\d{5,7}|2\\d{7}|6\\d{6,7})', + 'NationalNumberPattern' => '20\\d{6,7}|(?:4[0-6]|5\\d|6[0-24-9])\\d{7}|(?:4[0245]|6[014-9])\\d{6}|5[1-79]\\d{5,6}|(?:4[245]|6[01457-9])\\d{5}', 'ExampleNumber' => '202012345', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_KG.php b/src/data/PhoneNumberMetadata_KG.php index 53d200f3f..789252ce8 100644 --- a/src/data/PhoneNumberMetadata_KG.php +++ b/src/data/PhoneNumberMetadata_KG.php @@ -169,7 +169,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '3(?:1[36]|[2-9])', + 0 => '3', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -177,7 +177,7 @@ ), 2 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d)(\\d{3})', + 'pattern' => '(\\d{3})(\\d{3})(\\d)(\\d{2,3})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_KH.php b/src/data/PhoneNumberMetadata_KH.php index f45a550a2..5a1dee6ce 100644 --- a/src/data/PhoneNumberMetadata_KH.php +++ b/src/data/PhoneNumberMetadata_KH.php @@ -29,7 +29,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2[3-6]|3[2-6]|4[2-4]|[5-7][2-5])(?:[237-9]|4[56]|5\\d|6\\d?)\\d{5}|23(?:4[234]|8\\d{2})\\d{4}', + 'NationalNumberPattern' => '(?:2(?:3(?:4(?:[2-4]|[56]\\d)|[568]\\d\\d)|[4-6](?:4[56]|[56]\\d)\\d)|(?:3[2-6]|4[2-4]|[5-7][2-5])(?:4[56]|[56]\\d)\\d)\\d{4}|(?:2[3-6]|3[2-6]|4[2-4]|[5-7][2-5])[236-9]\\d{5}', 'ExampleNumber' => '23756789', 'PossibleLength' => array ( @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:1(?:[013-79]\\d|[28]\\d{1,2})|2[3-6]48|3(?:[18]\\d{2}|[2-6]48)|4[2-4]48|5[2-5]48|6(?:[016-9]\\d|[2-5]48)|7(?:[07-9]\\d|[16]\\d{2}|[2-5]48)|8(?:[013-79]\\d|8\\d{2})|9(?:6\\d{2}|7\\d{1,2}|[0-589]\\d))\\d{5}', + 'NationalNumberPattern' => '(?:(?:(?:1[28]|9[67])\\d|8(?:[013-79]|8\\d))\\d|(?:2[3-6]|4[2-4]|[56][2-5])48|3(?:[18]\\d\\d|[2-6]48)|7(?:(?:[07-9]|[16]\\d)\\d|[2-5]48))\\d{5}|(?:1\\d|6[016-9]|9[0-57-9])\\d{6}', 'ExampleNumber' => '91234567', 'PossibleLength' => array ( @@ -163,7 +163,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1\\d[1-9]|[2-9]', + 0 => '[1-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -171,12 +171,11 @@ ), 1 => array ( - 'pattern' => '(1[89]00)(\\d{3})(\\d{3})', + 'pattern' => '(\\d{4})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1[89]0', - 1 => '1[89]00', + 0 => '1', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_KI.php b/src/data/PhoneNumberMetadata_KI.php index dc5954a78..57b4ad9f8 100644 --- a/src/data/PhoneNumberMetadata_KI.php +++ b/src/data/PhoneNumberMetadata_KI.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:[24]\\d|3[1-9]|50|8[0-5])\\d{3}|(?:65(?:02[12]|12[56]|22[89]|[3-5]00)|7(?:27\\d{2}|3100|5(?:02[12]|12[56]|22[89]|[34](?:00|81)|500)))\\d{3}', + 'NationalNumberPattern' => '(?:[24]\\d|3[1-9]|50|65(?:02[12]|12[56]|22[89]|[3-5]00)|7(?:27\\d\\d|3100|5(?:02[12]|12[56]|22[89]|[34](?:00|81)|500))|8[0-5])\\d{3}', 'ExampleNumber' => '31234', 'PossibleLength' => array ( @@ -89,7 +89,7 @@ ), 'voip' => array ( - 'NationalNumberPattern' => '30(?:0[01]\\d{2}|12(?:11|20))\\d{2}', + 'NationalNumberPattern' => '30(?:0[01]\\d\\d|12(?:11|20))\\d\\d', 'ExampleNumber' => '30010000', 'PossibleLength' => array ( @@ -142,6 +142,7 @@ 'id' => 'KI', 'countryCode' => 686, 'internationalPrefix' => '00', + 'nationalPrefix' => '0', 'nationalPrefixForParsing' => '0', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_KP.php b/src/data/PhoneNumberMetadata_KP.php index ba8a80b2d..4998b6a7c 100644 --- a/src/data/PhoneNumberMetadata_KP.php +++ b/src/data/PhoneNumberMetadata_KP.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2\\d{7}|85\\d{6}', + 'NationalNumberPattern' => '(?:2\\d|85)\\d{6}', 'ExampleNumber' => '21234567', 'PossibleLength' => array ( @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '19[123]\\d{7}', + 'NationalNumberPattern' => '19[1-3]\\d{7}', 'ExampleNumber' => '1921234567', 'PossibleLength' => array ( @@ -134,7 +134,7 @@ ), 'noInternationalDialling' => array ( - 'NationalNumberPattern' => '2(?:[0-24-9]\\d{2}|3(?:[0-79]\\d|8[02-9]))\\d{4}', + 'NationalNumberPattern' => '2(?:[0-24-9]\\d\\d|3(?:[0-79]\\d|8[02-9]))\\d{4}', 'PossibleLength' => array ( 0 => 8, @@ -153,11 +153,11 @@ array ( 0 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1', + 0 => '2', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -165,11 +165,11 @@ ), 1 => array ( - 'pattern' => '(\\d)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '2', + 0 => '8', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -177,11 +177,11 @@ ), 2 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '8', + 0 => '1', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_KZ.php b/src/data/PhoneNumberMetadata_KZ.php index f0ca0b127..6144f56cb 100644 --- a/src/data/PhoneNumberMetadata_KZ.php +++ b/src/data/PhoneNumberMetadata_KZ.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '33622\\d{5}|7(?:1(?:0(?:[23]\\d|4[0-3]|59|63)|1(?:[23]\\d|4[0-79]|59)|2(?:[23]\\d|59)|3(?:2\\d|3[0-79]|4[0-35-9]|59)|4(?:[24]\\d|3[013-9]|5[1-9])|5(?:2\\d|3[1-9]|4[0-7]|59)|6(?:[234]\\d|5[19]|61)|72\\d|8(?:[27]\\d|3[1-46-9]|4[0-5]))|2(?:1(?:[23]\\d|4[46-9]|5[3469])|2(?:2\\d|3[0679]|46|5[12679])|3(?:[234]\\d|5[139])|4(?:2\\d|3[1235-9]|59)|5(?:[23]\\d|4[01246-8]|59|61)|6(?:2\\d|3[1-9]|4[0-4]|59)|7(?:[2379]\\d|40|5[279])|8(?:[23]\\d|4[0-3]|59)|9(?:2\\d|3[124578]|59)))\\d{5}', + 'NationalNumberPattern' => '(?:33622|7(?:1(?:0(?:[23]\\d|4[0-3]|59|63)|1(?:[23]\\d|4[0-79]|59)|2(?:[23]\\d|59)|3(?:2\\d|3[0-79]|4[0-35-9]|59)|4(?:[24]\\d|3[013-9]|5[1-9])|5(?:2\\d|3[1-9]|4[0-7]|59)|6(?:[2-4]\\d|5[19]|61)|72\\d|8(?:[27]\\d|3[1-46-9]|4[0-5]))|2(?:1(?:[23]\\d|4[46-9]|5[3469])|2(?:2\\d|3[0679]|46|5[12679])|3(?:[2-4]\\d|5[139])|4(?:2\\d|3[1-35-9]|59)|5(?:[23]\\d|4[0-246-8]|59|61)|6(?:2\\d|3[1-9]|4[0-4]|59)|7(?:[2379]\\d|40|5[279])|8(?:[23]\\d|4[0-3]|59)|9(?:2\\d|3[124578]|59))))\\d{5}', 'ExampleNumber' => '7123456789', 'PossibleLength' => array ( @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:0[012578]|47|6[02-4]|7[15-8]|85)\\d{7}', + 'NationalNumberPattern' => '7(?:0[0-2578]|47|6[02-4]|7[15-8]|85)\\d{7}', 'ExampleNumber' => '7710009998', 'PossibleLength' => array ( @@ -153,6 +153,7 @@ array ( ), 'mainCountryForCode' => false, + 'leadingDigits' => '33|7', 'leadingZeroPossible' => false, 'mobileNumberPortableRegion' => false, ); diff --git a/src/data/PhoneNumberMetadata_LA.php b/src/data/PhoneNumberMetadata_LA.php index baee4c654..1e5e402f1 100644 --- a/src/data/PhoneNumberMetadata_LA.php +++ b/src/data/PhoneNumberMetadata_LA.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2[13]|3(?:0\\d|[14])|[5-7][14]|41|8[1468])\\d{6}', + 'NationalNumberPattern' => '(?:2[13]|3(?:0\\d|[14])|41|[5-7][14]|8[1468])\\d{6}', 'ExampleNumber' => '21212862', 'PossibleLength' => array ( @@ -152,11 +152,11 @@ array ( 0 => array ( - 'pattern' => '(20)(\\d{2})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '20', + 0 => '2[13]|3[14]|[4-8]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -164,11 +164,11 @@ ), 1 => array ( - 'pattern' => '([2-8]\\d)(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '2[13]|3[14]|[4-8]', + 0 => '3', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -176,11 +176,11 @@ ), 2 => array ( - 'pattern' => '(30)(\\d{2})(\\d{2})(\\d{3})', + 'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '30', + 0 => '2', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_LI.php b/src/data/PhoneNumberMetadata_LI.php index 583ce326b..dbbaf320a 100644 --- a/src/data/PhoneNumberMetadata_LI.php +++ b/src/data/PhoneNumberMetadata_LI.php @@ -149,7 +149,7 @@ 'countryCode' => 423, 'internationalPrefix' => '00', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|10(?:01|20|66)', + 'nationalPrefixForParsing' => '0|(10(?:01|20|66))', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( @@ -162,7 +162,7 @@ 0 => '[237-9]', ), 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '$CC $1', 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => @@ -174,7 +174,7 @@ 0 => '6[56]', ), 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '$CC $1', 'nationalPrefixOptionalWhenFormatting' => false, ), 2 => @@ -186,7 +186,7 @@ 0 => '697', ), 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '$CC $1', 'nationalPrefixOptionalWhenFormatting' => false, ), ), diff --git a/src/data/PhoneNumberMetadata_LK.php b/src/data/PhoneNumberMetadata_LK.php index cc2eb6ccd..5a28b2597 100644 --- a/src/data/PhoneNumberMetadata_LK.php +++ b/src/data/PhoneNumberMetadata_LK.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '1(?:1[2-57]\\d{6}|973\\d{5})|(?:2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7]|[89]1)[2-57]\\d{6}', + 'NationalNumberPattern' => '(?:1(?:1[2-57]\\d|973)|(?:2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7]|[89]1)[2-57]\\d)\\d{5}', 'ExampleNumber' => '112345678', 'PossibleLength' => array ( @@ -38,7 +38,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7[0125-8]\\d{7}', + 'NationalNumberPattern' => '7[0-25-8]\\d{7}', 'ExampleNumber' => '712345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_LR.php b/src/data/PhoneNumberMetadata_LR.php index fd195f451..eedbe3e3c 100644 --- a/src/data/PhoneNumberMetadata_LR.php +++ b/src/data/PhoneNumberMetadata_LR.php @@ -63,7 +63,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '332(?:02|[2-5]\\d)\\d{4}', + 'NationalNumberPattern' => '332(?:02|[34]\\d)\\d{4}', 'ExampleNumber' => '332021234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_LU.php b/src/data/PhoneNumberMetadata_LU.php index a3f79becb..91f4e5594 100644 --- a/src/data/PhoneNumberMetadata_LU.php +++ b/src/data/PhoneNumberMetadata_LU.php @@ -32,7 +32,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2[2-9]\\d{2,9}|(?:3(?:[0-46-9]\\d|5[013-9])|[457]\\d{2}|8(?:0[2-9]|[13-9]\\d)|9(?:0[89]|[2-579]\\d))\\d{1,8}', + 'NationalNumberPattern' => '(?:(?:2[2-9]|[457]\\d)\\d|3(?:[0-46-9]\\d|5[013-9])|8(?:0[2-9]|[13-9]\\d)|9(?:0[89]|[2-579]\\d))\\d{1,8}', 'ExampleNumber' => '27123456', 'PossibleLength' => array ( @@ -160,7 +160,7 @@ 'id' => 'LU', 'countryCode' => 352, 'internationalPrefix' => '00', - 'nationalPrefixForParsing' => '(15(?:0[06]|1[12]|35|4[04]|55|6[26]|77|88|99)\\d)', + 'nationalPrefixForParsing' => '(15(?:0[06]|1[12]|[35]5|4[04]|6[26]|77|88|99)\\d)', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( @@ -170,7 +170,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[2-5]|7[1-9]|[89](?:0[2-9]|[1-9])', + 0 => '2(?:0[2-689]|[2-9])|3(?:[0-46-9]|5[013-9])|[457]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', @@ -182,7 +182,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[2-5]|7[1-9]|[89](?:0[2-9]|[1-9])', + 0 => '2(?:0[2-689]|[2-9])|3(?:[0-46-9]|5[013-9])|[457]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', @@ -194,7 +194,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '20', + 0 => '20[2-689]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', @@ -206,7 +206,7 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '2(?:[0367]|4[3-8])', + 0 => '2(?:0[1-689]|[367]|4[3-8])', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', @@ -214,11 +214,11 @@ ), 4 => array ( - 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{3})(\\d{2})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '20', + 0 => '80[01]|90[015]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', @@ -226,11 +226,11 @@ ), 5 => array ( - 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})', - 'format' => '$1 $2 $3 $4 $5', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '2(?:[0367]|4[3-8])', + 0 => '20[2-689]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', @@ -238,11 +238,11 @@ ), 6 => array ( - 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{1,4})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '2(?:[12589]|4[12])|[3-5]|7[1-9]|8(?:0[2-9]|[1-9])|9(?:0[2-46-9]|[1-9])', + 0 => '6', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', @@ -250,11 +250,11 @@ ), 7 => array ( - 'pattern' => '(\\d{3})(\\d{2})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})', + 'format' => '$1 $2 $3 $4 $5', 'leadingDigitsPatterns' => array ( - 0 => '70|80[01]|90[015]', + 0 => '2(?:0[2-689]|[367]|4[3-8])', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', @@ -262,11 +262,11 @@ ), 8 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{1,5})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '6', + 0 => '2[2-9]|3(?:[0-46-9]|5[013-9])|[457]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '$CC $1', diff --git a/src/data/PhoneNumberMetadata_LY.php b/src/data/PhoneNumberMetadata_LY.php index 338c0eae9..f78e94a6c 100644 --- a/src/data/PhoneNumberMetadata_LY.php +++ b/src/data/PhoneNumberMetadata_LY.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2[1345]|5[1347]|6[123479]|71)\\d{7}', + 'NationalNumberPattern' => '(?:2[13-5]|5[1347]|6[1-479]|71)\\d{7}', 'ExampleNumber' => '212345678', 'PossibleLength' => array ( @@ -147,7 +147,7 @@ array ( 0 => array ( - 'pattern' => '([25-79]\\d)(\\d{7})', + 'pattern' => '(\\d{2})(\\d{7})', 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_MC.php b/src/data/PhoneNumberMetadata_MC.php index e46222b12..91a442aaa 100644 --- a/src/data/PhoneNumberMetadata_MC.php +++ b/src/data/PhoneNumberMetadata_MC.php @@ -149,6 +149,18 @@ 'numberFormat' => array ( 0 => + array ( + 'pattern' => '(\\d{3})(\\d{3})(\\d{2})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '8', + ), + 'nationalPrefixFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 1 => array ( 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})', 'format' => '$1 $2 $3 $4', @@ -160,7 +172,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 1 => + 2 => array ( 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', @@ -172,19 +184,46 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 2 => + 3 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{2})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4 $5', 'leadingDigitsPatterns' => array ( - 0 => '8', + 0 => '6', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + ), + 'intlNumberFormat' => + array ( + 0 => + array ( + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', + 'leadingDigitsPatterns' => + array ( + 0 => '[39]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 3 => + 1 => + array ( + 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '4', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 2 => array ( 'pattern' => '(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})', 'format' => '$1 $2 $3 $4 $5', @@ -197,9 +236,6 @@ 'nationalPrefixOptionalWhenFormatting' => false, ), ), - 'intlNumberFormat' => - array ( - ), 'mainCountryForCode' => false, 'leadingZeroPossible' => false, 'mobileNumberPortableRegion' => false, diff --git a/src/data/PhoneNumberMetadata_ME.php b/src/data/PhoneNumberMetadata_ME.php index ebc9550d7..17caf4933 100644 --- a/src/data/PhoneNumberMetadata_ME.php +++ b/src/data/PhoneNumberMetadata_ME.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '6(?:00\\d|3[024]\\d|6[0-25]\\d|[7-9]\\d{2})\\d{4}', + 'NationalNumberPattern' => '6(?:00|3[024]|6[0-25]|[7-9]\\d)\\d{5}', 'ExampleNumber' => '67622901', 'PossibleLength' => array ( @@ -63,7 +63,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '(?:9(?:4[1568]|5[178]))\\d{5}', + 'NationalNumberPattern' => '9(?:4[1568]|5[178])\\d{5}', 'ExampleNumber' => '94515151', 'PossibleLength' => array ( @@ -161,7 +161,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[2-57-9]|6[036-9]', + 0 => '[2-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_MK.php b/src/data/PhoneNumberMetadata_MK.php index 889dc0bf0..64acea955 100644 --- a/src/data/PhoneNumberMetadata_MK.php +++ b/src/data/PhoneNumberMetadata_MK.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:[0-25-8]\\d{2}|3[2-4]\\d|421|9[23]\\d)\\d{4}', + 'NationalNumberPattern' => '7(?:(?:[0-25-8]\\d|3[2-4]|9[23])\\d|421)\\d{4}', 'ExampleNumber' => '72345678', 'PossibleLength' => array ( @@ -152,7 +152,7 @@ array ( 0 => array ( - 'pattern' => '(2)(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -164,7 +164,7 @@ ), 1 => array ( - 'pattern' => '([347]\\d)(\\d{3})(\\d{3})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -176,7 +176,7 @@ ), 2 => array ( - 'pattern' => '([58]\\d{2})(\\d)(\\d{2})(\\d{2})', + 'pattern' => '(\\d{3})(\\d)(\\d{2})(\\d{2})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_ML.php b/src/data/PhoneNumberMetadata_ML.php index c856db487..726733eb1 100644 --- a/src/data/PhoneNumberMetadata_ML.php +++ b/src/data/PhoneNumberMetadata_ML.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:2(?:079|17\\d)|50\\d{2}|[679]\\d{3}|8[239]\\d{2})\\d{4}', + 'NationalNumberPattern' => '(?:2(?:079|17\\d)|(?:50|[679]\\d|8[239])\\d\\d)\\d{4}', 'ExampleNumber' => '65012345', 'PossibleLength' => array ( @@ -144,11 +144,12 @@ array ( 0 => array ( - 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{4})', + 'format' => '$1', 'leadingDigitsPatterns' => array ( - 0 => '[24-9]', + 0 => '67[057-9]|74[045]', + 1 => '67(?:0[09]|[59]9|77|8[89])|74(?:0[02]|44|55)', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -156,11 +157,11 @@ ), 1 => array ( - 'pattern' => '(\\d{4})', - 'format' => '$1', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '67|74', + 0 => '[24-79]|8[0239]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -175,7 +176,7 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '[24-9]', + 0 => '[24-79]|8[0239]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_MM.php b/src/data/PhoneNumberMetadata_MM.php index caeb3b35a..f73ad22a3 100644 --- a/src/data/PhoneNumberMetadata_MM.php +++ b/src/data/PhoneNumberMetadata_MM.php @@ -30,7 +30,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '1(?:2\\d{1,2}|[35]\\d|4(?:\\d|2[2-469]|39|6[25]|70)|6\\d?|[89][0-6]\\d)\\d{4}|2(?:2(?:000\\d{3}|\\d{4})|3\\d{4}|4(?:0\\d{5}|2[246]\\d{4}|39\\d{4}|62\\d{4}|70\\d{4}|\\d{4})|5(?:1\\d{3,6}|[02-9]\\d{3,5})|[6-9]\\d{4})|4(?:2(?:[25-8]|4(?:80)?)|3(?:2(?:02)?|[36]|4(?:70)?|56?)|[46][2-6]|5(?:[35]|4(?:70)?))\\d{4}|5(?:2(?:2(?:\\d{1,2})?|[35-8]|4(?:70)?)|3[2-68]|4(?:21?|4(?:70)?|[5-8])|5[23]|6[2-4]|7(?:[235-8]|4(?:80)?)|8(?:[25-7]|4(?:70)?)|9(?:[235-7]|4(?:70)?))\\d{4}|6(?:0[23]|1(?:2(?:0|4\\d)?|[356])|2[2-6]|3(?:[25-6]|4(?:70)?)|4(?:2(?:4\\d)?|[3-6])|5[2-4]|6[2-8]|7(?:[2367]|4(?:\\d|39|[67]0)|5\\d?|8[145]\\d)|8[245]|9(?:20?|4))\\d{4}|7(?:[04](?:[25-8]|4(?:70)?)|1(?:20?|[35-7]|4(?:70)?)|22|3[2-4]|5(?:[235-7]|4(?:70)?))\\d{4}|8(?:1(?:2\\d{1,2}|[35689]\\d|4(?:70)?\\d)|2(?:2\\d|3(?:\\d|20)|[4-8]\\d)|3(?:2|4(?:70)?)\\d|4[24-7]\\d|5[245]\\d|6[23]\\d)\\d{3}', + 'NationalNumberPattern' => '1(?:2\\d{1,2}|3(?:[56]\\d|\\d)|5\\d|4(?:\\d|2[2-469]|39|6[25]|7[01])|6\\d?|[89][0-6]\\d)\\d{4}|2(?:2(?:00\\d|8[34]\\d|\\d)\\d{3}|3\\d{4}|4(?:0\\d{5}|2[246]\\d{4}|39\\d{4}|62\\d{4}|7[01]\\d{4}|\\d{4})|5(?:1\\d{3,6}|[02-9]\\d{3,5})|[6-9]\\d{4})|4(?:2(?:2(?:\\d{2})?|4(?:80)?|[5-8])|3(?:2(?:0\\d)?|[367]|4(?:70)?|56?)|4(?:2(?:0\\d)?|[3-6])|6[2-6]|5(?:[35]|4(?:70)?))\\d{4}|5(?:2(?:2(?:\\d{1,2})?|[35-8]|4(?:70)?)|3[2-68]|4(?:2(?:1|86)?|4(?:70)?|[5-8])|5(?:2(?:2\\d)?|3)|6[2-4]|7(?:2(?:0\\d)?|[35-8]|4(?:80)?)|8(?:2(?:0\\d)?|[5-7]|4(?:70)?)|9(?:2(?:0\\d)?|[35-7]|4(?:70)?))\\d{4}|6(?:0(?:[23]|88\\d)|1(?:2(?:0|4\\d)?|[356])|2[2-6]|3(?:2(?:0\\d)?|[5-6]|4(?:70)?)|4(?:2(?:[04]\\d?|[356])?|[3-6])|5(?:2(?:\\d{1,2})?|[34])|6(?:2(?:\\d{2})?|[3-8])|7(?:[267]|3(?:\\d{2})?|4(?:\\d|39|[67]0)|5\\d?|8[01459]\\d)|8[245]|9(?:20?|4))\\d{4}|7(?:0(?:[25-8]|4(?:70)?)|1(?:2(?:0\\d?)?|[35-7]|4(?:70)?)|22|3[2-4]|4(?:2(?:5\\d)?|[5-8]|4(?:70)?)|5(?:2(?:02)?|[35-7]|4(?:70)?|96\\d))\\d{4}|8(?:1(?:2\\d{1,3}|[35689]\\d|4(?:70)?\\d)|2(?:2\\d{1,3}|3(?:\\d|20)|[4-8]\\d)|3(?:2\\d{0,3}|4(?:70)?)\\d|4[24-7]\\d|5(?:2\\d{0,2}|[45])\\d|6[23]\\d)\\d{3}', 'ExampleNumber' => '1234567', 'PossibleLength' => array ( @@ -61,7 +61,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '80080[01][1-9]\\d{3}', + 'NationalNumberPattern' => '80080(?:[01][1-9]|2\\d)\\d{3}', 'ExampleNumber' => '8008001234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_MU.php b/src/data/PhoneNumberMetadata_MU.php index 109fb70ec..1e8f3e517 100644 --- a/src/data/PhoneNumberMetadata_MU.php +++ b/src/data/PhoneNumberMetadata_MU.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2(?:[03478]\\d|1[0-7]|6[1-79])|4(?:[013568]\\d|2[4-7])|5(?:44\\d|471)|6\\d{2}|8(?:14|3[129]))\\d{4}', + 'NationalNumberPattern' => '(?:2(?:[03478]\\d|1[0-7]|6[1-79])|4(?:[013568]\\d|2[4-7])|54(?:4\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}', 'ExampleNumber' => '54480123', 'PossibleLength' => array ( @@ -37,7 +37,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '5(?:2[589]\\d|4(?:2[1-389]|[489]\\d|7[1-9])|7\\d{2}|8(?:[0-689]\\d|7[15-8])|9[0-8]\\d)\\d{4}', + 'NationalNumberPattern' => '5(?:(?:2[589]|7\\d|9[0-8])\\d|4(?:2[1-389]|[489]\\d|7[1-9])|8(?:[0-689]\\d|7[15-8]))\\d{4}', 'ExampleNumber' => '52512345', 'PossibleLength' => array ( @@ -49,7 +49,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '80[012]\\d{4}', + 'NationalNumberPattern' => '80[0-2]\\d{4}', 'ExampleNumber' => '8001234', 'PossibleLength' => array ( @@ -145,18 +145,18 @@ ), 'id' => 'MU', 'countryCode' => 230, - 'internationalPrefix' => '0(?:0|[2-7]0|33)', + 'internationalPrefix' => '0(?:0|[24-7]0|3[03])', 'preferredInternationalPrefix' => '020', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( 0 => array ( - 'pattern' => '([2-46-9]\\d{2})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{4})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[2-46-9]', + 0 => '[2-46]|8(?:0[0-2]|14|3[129])', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -164,7 +164,7 @@ ), 1 => array ( - 'pattern' => '(5\\d{3})(\\d{4})', + 'pattern' => '(\\d{4})(\\d{4})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_MX.php b/src/data/PhoneNumberMetadata_MX.php index 83b49306a..75264e918 100644 --- a/src/data/PhoneNumberMetadata_MX.php +++ b/src/data/PhoneNumberMetadata_MX.php @@ -242,9 +242,6 @@ array ( 0 => '1(?:33|55|81)', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 3 => array ( @@ -254,9 +251,6 @@ array ( 0 => '1(?:[2467]|3[0-2457-9]|5[089]|8[2-9]|9[1-35-9])', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), ), 'mainCountryForCode' => false, diff --git a/src/data/PhoneNumberMetadata_NE.php b/src/data/PhoneNumberMetadata_NE.php index d75e9c4ac..f3dfb728b 100644 --- a/src/data/PhoneNumberMetadata_NE.php +++ b/src/data/PhoneNumberMetadata_NE.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2(?:0(?:20|3[1-7]|4[134]|5[14]|6[14578]|7[1-578])|1(?:4[145]|5[14]|6[14-68]|7[169]|88))\\d{4}', + 'NationalNumberPattern' => '2(?:0(?:20|3[1-7]|4[13-5]|5[14]|6[14578]|7[1-578])|1(?:4[145]|5[14]|6[14-68]|7[169]|88))\\d{4}', 'ExampleNumber' => '20201234', 'PossibleLength' => array ( @@ -149,7 +149,7 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '09|[289]', + 0 => '09|2[01]|8[04589]|9', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -157,11 +157,11 @@ ), 1 => array ( - 'pattern' => '(08)(\\d{3})(\\d{3})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '08', + 0 => '0', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_NF.php b/src/data/PhoneNumberMetadata_NF.php index 2c423c953..8f108ef01 100644 --- a/src/data/PhoneNumberMetadata_NF.php +++ b/src/data/PhoneNumberMetadata_NF.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:06|17|28|39)|3[012]\\d)\\d{3}', + 'NationalNumberPattern' => '(?:1(?:06|17|28|39)|3[0-2]\\d)\\d{3}', 'ExampleNumber' => '106609', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_NG.php b/src/data/PhoneNumberMetadata_NG.php index c0f39e73f..647f82de5 100644 --- a/src/data/PhoneNumberMetadata_NG.php +++ b/src/data/PhoneNumberMetadata_NG.php @@ -33,7 +33,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '[12]\\d{6,7}|9(?:0[3-9]|[1-9]\\d)\\d{5}|(?:3\\d|4[023568]|5[02368]|6[02-469]|7[4-69]|8[2-9])\\d{6}|(?:4[47]|5[14579]|6[1578]|7[0-357])\\d{5,6}|(?:78|41)\\d{5}', + 'NationalNumberPattern' => '(?:(?:[1-356]\\d|4[02-8]|7[0-79]|8[2-9])\\d|9(?:0[3-9]|[1-9]\\d))\\d{5}|(?:[12]\\d|4[147]|5[14579]|6[1578]|7[0-3578])\\d{5}', 'ExampleNumber' => '18040123', 'PossibleLength' => array ( @@ -48,7 +48,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[1-689]\\d|7[0-3])|8(?:0(?:1[01]|[2-9]\\d)|1(?:[0-8]\\d|9[01]))|90[235-9]\\d)\\d{6}', + 'NationalNumberPattern' => '(?:1(?:(?:7[34]|95)\\d|8(?:04|[124579]\\d|8[0-3]))|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:6[1-5]|8[5-9]))|4(?:[28]8[0-2]|6(?:7[1-9]|8[02-47]))|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:0(?:[1-689]\\d|7[0-3])\\d\\d|38[0-7]|69[1-8]|78[2-4])|8(?:(?:0(?:1[01]|[2-9]\\d)|1(?:[0-8]\\d|9[01]))\\d\\d|28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|9(?:0[235-9]\\d\\d|8[07])\\d)\\d{4}', 'ExampleNumber' => '8021234567', 'PossibleLength' => array ( @@ -57,6 +57,8 @@ ), 'PossibleLengthLocalOnly' => array ( + 0 => 6, + 1 => 7, ), ), 'tollFree' => @@ -171,11 +173,11 @@ array ( 0 => array ( - 'pattern' => '(\\d)(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{2})(\\d{2})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[12]|9(?:0[3-9]|[1-9])', + 0 => '78', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -183,11 +185,11 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})', + 'pattern' => '(\\d)(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[3-6]|7(?:0[1-9]|[1-79])|8[2-9]', + 0 => '[12]|9(?:0[3-9]|[1-9])', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -195,11 +197,11 @@ ), 2 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '70|8[01]|90[235-9]', + 0 => '[3-7]|8[2-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -207,11 +209,11 @@ ), 3 => array ( - 'pattern' => '([78]00)(\\d{4})(\\d{4,5})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[78]00', + 0 => '[7-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -219,11 +221,11 @@ ), 4 => array ( - 'pattern' => '([78]00)(\\d{5})(\\d{5,6})', + 'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[78]00', + 0 => '[78]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -231,11 +233,11 @@ ), 5 => array ( - 'pattern' => '(78)(\\d{2})(\\d{3})', + 'pattern' => '(\\d{3})(\\d{5})(\\d{5,6})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '78', + 0 => '[78]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_NO.php b/src/data/PhoneNumberMetadata_NO.php index 28ea58e6e..8f6ed3079 100644 --- a/src/data/PhoneNumberMetadata_NO.php +++ b/src/data/PhoneNumberMetadata_NO.php @@ -120,7 +120,7 @@ ), 'uan' => array ( - 'NationalNumberPattern' => '0\\d{4}|81(?:0(?:0[7-9]|1\\d)|5\\d{2})\\d{3}', + 'NationalNumberPattern' => '(?:0\\d|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', 'ExampleNumber' => '01234', 'PossibleLength' => array ( @@ -159,11 +159,11 @@ array ( 0 => array ( - 'pattern' => '([489]\\d{2})(\\d{2})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '[489]', + 0 => '[235-7]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -171,11 +171,11 @@ ), 1 => array ( - 'pattern' => '([235-7]\\d)(\\d{2})(\\d{2})(\\d{2})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{3})(\\d{2})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[235-7]', + 0 => '[489]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -186,6 +186,7 @@ array ( ), 'mainCountryForCode' => true, + 'leadingDigits' => '[02-689]|7[0-8]', 'leadingZeroPossible' => false, 'mobileNumberPortableRegion' => true, ); diff --git a/src/data/PhoneNumberMetadata_NP.php b/src/data/PhoneNumberMetadata_NP.php index 8f8e82b73..2af3a9058 100644 --- a/src/data/PhoneNumberMetadata_NP.php +++ b/src/data/PhoneNumberMetadata_NP.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1[0-6]\\d|2[13-79][2-6]|3[135-8][2-6]|4[146-9][2-6]|5[135-7][2-6]|6[13-9][2-6]|7[15-9][2-6]|8[1-46-9][2-6]|9[1-79][2-6])\\d{5}', + 'NationalNumberPattern' => '(?:1[0-6]\\d|(?:2[13-79]|3[135-8]|4[146-9]|5[135-7]|6[13-9]|7[15-9]|8[1-46-9]|9[1-79])[2-6])\\d{5}', 'ExampleNumber' => '14567890', 'PossibleLength' => array ( @@ -152,7 +152,7 @@ array ( 0 => array ( - 'pattern' => '(1)(\\d{7})', + 'pattern' => '(\\d)(\\d{7})', 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( @@ -168,7 +168,7 @@ 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '1[01]|[2-8]|9(?:[1-69]|7[15-9])', + 0 => '[1-8]|9(?:[1-579]|6[2-6])', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -176,13 +176,13 @@ ), 2 => array ( - 'pattern' => '(9\\d{2})(\\d{7})', + 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '9(?:6[013]|7[245]|8)', + 0 => '9', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), diff --git a/src/data/PhoneNumberMetadata_PE.php b/src/data/PhoneNumberMetadata_PE.php index ddf38a608..b9a09a6b7 100644 --- a/src/data/PhoneNumberMetadata_PE.php +++ b/src/data/PhoneNumberMetadata_PE.php @@ -161,7 +161,7 @@ array ( 0 => array ( - 'pattern' => '(1)(\\d{7})', + 'pattern' => '(\\d)(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( @@ -173,7 +173,7 @@ ), 1 => array ( - 'pattern' => '([4-8]\\d)(\\d{6})', + 'pattern' => '(\\d{2})(\\d{6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( @@ -189,7 +189,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '80', + 0 => '8', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', @@ -197,13 +197,13 @@ ), 3 => array ( - 'pattern' => '(9\\d{2})(\\d{3})(\\d{3})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( 0 => '9', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), diff --git a/src/data/PhoneNumberMetadata_PF.php b/src/data/PhoneNumberMetadata_PF.php index 5ea15b9a4..fb6333a0e 100644 --- a/src/data/PhoneNumberMetadata_PF.php +++ b/src/data/PhoneNumberMetadata_PF.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '4(?:[09][45689]\\d|4)\\d{4}', + 'NationalNumberPattern' => '4(?:[09][4-689]\\d|4)\\d{4}', 'ExampleNumber' => '40412345', 'PossibleLength' => array ( @@ -146,11 +146,11 @@ array ( 0 => array ( - 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '4[09]|8[79]', + 0 => '44', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -158,11 +158,11 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{2})(\\d{2})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '44', + 0 => '[48]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_PG.php b/src/data/PhoneNumberMetadata_PG.php index d260b920c..f548fed86 100644 --- a/src/data/PhoneNumberMetadata_PG.php +++ b/src/data/PhoneNumberMetadata_PG.php @@ -26,11 +26,10 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:3[0-2]\\d|4[257]\\d|5[34]\\d|64[1-9]|77(?:[0-24]\\d|30)|85[02-46-9]|9[78]\\d)\\d{4}', + 'NationalNumberPattern' => '(?:(?:3[0-2]|4[257]|5[34]|9[78])\\d|64[1-9]|77(?:[0-24]\\d|30)|85[02-46-9])\\d{4}', 'ExampleNumber' => '3123456', 'PossibleLength' => array ( - 0 => 7, ), 'PossibleLengthLocalOnly' => array ( @@ -144,7 +143,7 @@ ), 'id' => 'PG', 'countryCode' => 675, - 'internationalPrefix' => '140[1-3]|00', + 'internationalPrefix' => '00|140[1-3]', 'preferredInternationalPrefix' => '00', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => @@ -155,7 +154,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[13-689]|27', + 0 => '18|[2-69]|85', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -167,7 +166,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '20|[78]', + 0 => '[78]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_PH.php b/src/data/PhoneNumberMetadata_PH.php index 2c7404f4e..78523fc9a 100644 --- a/src/data/PhoneNumberMetadata_PH.php +++ b/src/data/PhoneNumberMetadata_PH.php @@ -27,13 +27,14 @@ ), 'PossibleLengthLocalOnly' => array ( - 0 => 5, - 1 => 7, + 0 => 4, + 1 => 5, + 2 => 7, ), ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2\\d{5}(?:\\d{2})?|(?:3[2-68]|4[2-9]|5[2-6]|6[2-58]|7[24578]|8[2-8])\\d{7}|88(?:22\\d{6}|42\\d{4})', + 'NationalNumberPattern' => '(?:2\\d(?:\\d{2})?|(?:3[2-68]|4[2-9]|5[2-6]|6[2-58]|7[24578])\\d{3}|88(?:22\\d\\d|42))\\d{4}|8[2-8]\\d{7}', 'ExampleNumber' => '21234567', 'PossibleLength' => array ( @@ -44,13 +45,14 @@ ), 'PossibleLengthLocalOnly' => array ( - 0 => 5, - 1 => 7, + 0 => 4, + 1 => 5, + 2 => 7, ), ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:81[37]|9(?:0[5-9]|1[024-9]|2[0-35-9]|3[02-9]|4[235-9]|5[056]|6[5-7]|7[34-79]|89|9[4-9]))\\d{7}', + 'NationalNumberPattern' => '(?:81[37]|9(?:0[5-9]|1[024-9]|2[0-35-9]|3[02-9]|4[235-9]|5[056]|6[5-7]|7[3-79]|89|9[4-9]))\\d{7}', 'ExampleNumber' => '9051234567', 'PossibleLength' => array ( @@ -164,8 +166,8 @@ array ( 0 => array ( - 'pattern' => '(2)(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d)(\\d{5})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( 0 => '2', @@ -176,8 +178,8 @@ ), 1 => array ( - 'pattern' => '(2)(\\d{5})', - 'format' => '$1 $2', + 'pattern' => '(\\d)(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( 0 => '2', @@ -201,12 +203,12 @@ ), 3 => array ( - 'pattern' => '(\\d{5})(\\d{4})', - 'format' => '$1 $2', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '346|4(?:27|9[35])|883', - 1 => '3469|4(?:279|9(?:30|56))|8834', + 0 => '3[2-68]|4[2-9]|[5-7]|8[2-8]', + 1 => '3(?:[23568]|4(?:[0-57-9]|6[02-8]))|4(?:2(?:[0-689]|7[0-8])|[3-8]|9(?:[0-246-9]|3[1-9]|5[0-57-9]))|[5-7]|8(?:[2-7]|8(?:[0-24-9]|3[0-35-9]))', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', @@ -214,11 +216,11 @@ ), 4 => array ( - 'pattern' => '([3-8]\\d)(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{5})(\\d{4})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[3-8]', + 0 => '[34]|88', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', @@ -230,7 +232,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '81|9', + 0 => '[89]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -238,12 +240,11 @@ ), 6 => array ( - 'pattern' => '(1800)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{4})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '180', - 1 => '1800', + 0 => '1', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -251,12 +252,11 @@ ), 7 => array ( - 'pattern' => '(1800)(\\d{1,2})(\\d{3})(\\d{4})', + 'pattern' => '(\\d{4})(\\d{1,2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '180', - 1 => '1800', + 0 => '1', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_PL.php b/src/data/PhoneNumberMetadata_PL.php index 6993c88c3..4c84dc3a1 100644 --- a/src/data/PhoneNumberMetadata_PL.php +++ b/src/data/PhoneNumberMetadata_PL.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:\\d{7}|19\\d{3})', + 'NationalNumberPattern' => '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])\\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])19\\d{3}', 'ExampleNumber' => '123456789', 'PossibleLength' => array ( @@ -160,11 +160,11 @@ array ( 0 => array ( - 'pattern' => '(\\d{3})(\\d{3})', - 'format' => '$1 $2', + 'pattern' => '(\\d{5})', + 'format' => '$1', 'leadingDigitsPatterns' => array ( - 0 => '11[68]|64', + 0 => '19', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -172,11 +172,11 @@ ), 1 => array ( - 'pattern' => '(\\d{5})', - 'format' => '$1', + 'pattern' => '(\\d{3})(\\d{3})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '19', + 0 => '11|64', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -188,7 +188,8 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145]', + 0 => '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])1', + 1 => '(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])19', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -208,11 +209,11 @@ ), 4 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '26|39|45|5[0137]|6[0469]|7[02389]|8[08]', + 0 => '1[2-8]|2|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -220,11 +221,11 @@ ), 5 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[14]|2[0-57-9]|3[2-4]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145]', + 0 => '[3-8]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_PS.php b/src/data/PhoneNumberMetadata_PS.php index b94a00951..7b9435435 100644 --- a/src/data/PhoneNumberMetadata_PS.php +++ b/src/data/PhoneNumberMetadata_PS.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:22[234789]|42[45]|82[01458]|92[369])\\d{5}', + 'NationalNumberPattern' => '(?:22[2-47-9]|42[45]|82[01458]|92[369])\\d{5}', 'ExampleNumber' => '22234567', 'PossibleLength' => array ( @@ -155,11 +155,11 @@ array ( 0 => array ( - 'pattern' => '([2489])(2\\d{2})(\\d{4})', + 'pattern' => '(\\d)(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[2489]2', + 0 => '[2489]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -167,11 +167,11 @@ ), 1 => array ( - 'pattern' => '(5[69]\\d)(\\d{3})(\\d{3})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '5[69]', + 0 => '5', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -179,14 +179,13 @@ ), 2 => array ( - 'pattern' => '(1[78]00)(\\d{3})(\\d{3})', + 'pattern' => '(\\d{4})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1[78]0', - 1 => '1[78]00', + 0 => '1', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), diff --git a/src/data/PhoneNumberMetadata_PY.php b/src/data/PhoneNumberMetadata_PY.php index efab5a4f7..2839a4f8b 100644 --- a/src/data/PhoneNumberMetadata_PY.php +++ b/src/data/PhoneNumberMetadata_PY.php @@ -29,7 +29,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:[26]1|3[289]|4[124678]|7[123]|8[1236])\\d{5,7}|(?:2(?:2[4568]|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51)|4(?:18|2[45]|3[12]|5[13]|64|71|9[1-47])|5(?:[1-4]\\d|5[0234])|6(?:3[1-3]|44|7[1-4678])|7(?:17|4[0-4]|6[1-578]|75|8[0-8])|858)\\d{5,6}', + 'NationalNumberPattern' => '(?:2(?:1\\d|2[4-68]|7[15]|9[1-5])|5(?:[1-4]\\d|5[02-4])|6(?:1\\d|3[1-3]|44|7[1-46-8]))\\d{5,6}|3(?:(?:18|3[167]|4[2357]|51)\\d{5,6}|[289]\\d{5,7})|4(?:[1246-8]\\d{5,7}|(?:3[12]|5[13]|9[1-47])\\d{5,6})|7(?:[1-3]\\d{5,7}|(?:4[0-4]|6[1-578]|75|8[0-8])\\d{5,6})|8(?:[1-36]\\d{5,7}|58\\d{5,6})|[26]1\\d{5}', 'ExampleNumber' => '212345678', 'PossibleLength' => array ( @@ -158,20 +158,20 @@ array ( 0 => array ( - 'pattern' => '(\\d{2})(\\d{5})', + 'pattern' => '(\\d{3})(\\d{3,6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]', + 0 => '[2-9]0', ), - 'nationalPrefixFormattingRule' => '(0$1)', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{5})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( 0 => '[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]', @@ -182,62 +182,61 @@ ), 2 => array ( - 'pattern' => '(\\d{3})(\\d{3,6})', + 'pattern' => '(\\d{3})(\\d{4,5})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[2-9]0', + 0 => '2[279]|3[13-5]|4[359]|5|6[347]|7[46-8]|85', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 3 => array ( - 'pattern' => '(\\d{3})(\\d{6})', - 'format' => '$1 $2', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '9[1-9]', + 0 => '[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 4 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '870', - 1 => '8700', + 0 => '[2-7]|85', ), - 'nationalPrefixFormattingRule' => '', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 5 => array ( - 'pattern' => '(\\d{3})(\\d{4,5})', + 'pattern' => '(\\d{3})(\\d{6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[2-8][1-9]', + 0 => '9', ), - 'nationalPrefixFormattingRule' => '(0$1)', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 6 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[2-8][1-9]', + 0 => '8', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), diff --git a/src/data/PhoneNumberMetadata_RS.php b/src/data/PhoneNumberMetadata_RS.php index 8fb4c736d..c281370f8 100644 --- a/src/data/PhoneNumberMetadata_RS.php +++ b/src/data/PhoneNumberMetadata_RS.php @@ -27,12 +27,13 @@ ), 'PossibleLengthLocalOnly' => array ( - 0 => 5, + 0 => 4, + 1 => 5, ), ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:[02-9][2-9]|1[1-9])\\d|2(?:[0-24-7][2-9]\\d|[389](?:0[2-9]|[2-9]\\d))|3(?:[0-8][2-9]\\d|9(?:[2-9]\\d|0[2-9])))\\d{3,8}', + 'NationalNumberPattern' => '(?:1(?:[02-9][2-9]|1[1-9])\\d|2(?:[0-24-7][2-9]\\d|[389](?:0[2-9]|[2-9]\\d))|3(?:[0-8][2-9]\\d|9(?:0[2-9]|[2-9]\\d)))\\d{3,8}', 'ExampleNumber' => '10234567', 'PossibleLength' => array ( @@ -45,8 +46,9 @@ ), 'PossibleLengthLocalOnly' => array ( - 0 => 5, - 1 => 6, + 0 => 4, + 1 => 5, + 2 => 6, ), ), 'mobile' => @@ -76,10 +78,15 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '(?:90[0169]|78\\d)\\d{3,7}', + 'NationalNumberPattern' => '(?:78\\d|90[0169])\\d{3,7}', 'ExampleNumber' => '90012345', 'PossibleLength' => array ( + 0 => 6, + 1 => 7, + 2 => 8, + 3 => 9, + 4 => 10, ), 'PossibleLengthLocalOnly' => array ( @@ -166,11 +173,11 @@ array ( 0 => array ( - 'pattern' => '([23]\\d{2})(\\d{4,9})', + 'pattern' => '(\\d{3})(\\d{3,9})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '(?:2[389]|39)0', + 0 => '(?:2[389]|39)0|[7-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -178,59 +185,11 @@ ), 1 => array ( - 'pattern' => '([1-3]\\d)(\\d{5,10})', - 'format' => '$1 $2', - 'leadingDigitsPatterns' => - array ( - 0 => '1|2(?:[0-24-7]|[389][1-9])|3(?:[0-8]|9[1-9])', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 2 => - array ( - 'pattern' => '(6\\d)(\\d{6,8})', - 'format' => '$1 $2', - 'leadingDigitsPatterns' => - array ( - 0 => '6', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 3 => - array ( - 'pattern' => '([89]\\d{2})(\\d{3,9})', - 'format' => '$1 $2', - 'leadingDigitsPatterns' => - array ( - 0 => '[89]', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 4 => - array ( - 'pattern' => '(7[26])(\\d{4,9})', - 'format' => '$1 $2', - 'leadingDigitsPatterns' => - array ( - 0 => '7[26]', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 5 => - array ( - 'pattern' => '(7[08]\\d)(\\d{4,9})', + 'pattern' => '(\\d{2})(\\d{5,10})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '7[08]', + 0 => '[1-36]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_RU.php b/src/data/PhoneNumberMetadata_RU.php index 35a1cdfd5..f3a9d5ae2 100644 --- a/src/data/PhoneNumberMetadata_RU.php +++ b/src/data/PhoneNumberMetadata_RU.php @@ -21,6 +21,7 @@ ), 'PossibleLengthLocalOnly' => array ( + 0 => 7, ), ), 'fixedLine' => @@ -32,6 +33,7 @@ ), 'PossibleLengthLocalOnly' => array ( + 0 => 7, ), ), 'mobile' => @@ -153,19 +155,18 @@ 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => array ( - 0 => '[1-79]', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => true, + 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( - 'pattern' => '([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})', - 'format' => '$1 $2-$3-$4', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[3489]', + 0 => '7', ), 'nationalPrefixFormattingRule' => '8 ($1)', 'domesticCarrierCodeFormattingRule' => '', @@ -173,11 +174,11 @@ ), 2 => array ( - 'pattern' => '(7\\d{2})(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2-$3-$4', 'leadingDigitsPatterns' => array ( - 0 => '7', + 0 => '[3489]', ), 'nationalPrefixFormattingRule' => '8 ($1)', 'domesticCarrierCodeFormattingRule' => '', @@ -188,11 +189,11 @@ array ( 0 => array ( - 'pattern' => '([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})', - 'format' => '$1 $2-$3-$4', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[3489]', + 0 => '7', ), 'nationalPrefixFormattingRule' => '8 ($1)', 'domesticCarrierCodeFormattingRule' => '', @@ -200,11 +201,11 @@ ), 1 => array ( - 'pattern' => '(7\\d{2})(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2-$3-$4', 'leadingDigitsPatterns' => array ( - 0 => '7', + 0 => '[3489]', ), 'nationalPrefixFormattingRule' => '8 ($1)', 'domesticCarrierCodeFormattingRule' => '', @@ -212,6 +213,7 @@ ), ), 'mainCountryForCode' => true, + 'leadingDigits' => '3[04-689]|[489]', 'leadingZeroPossible' => false, 'mobileNumberPortableRegion' => false, ); diff --git a/src/data/PhoneNumberMetadata_SA.php b/src/data/PhoneNumberMetadata_SA.php index d3779f848..c87f7fc89 100644 --- a/src/data/PhoneNumberMetadata_SA.php +++ b/src/data/PhoneNumberMetadata_SA.php @@ -122,6 +122,7 @@ 'ExampleNumber' => '8110123456', 'PossibleLength' => array ( + 0 => 10, ), 'PossibleLengthLocalOnly' => array ( @@ -157,11 +158,11 @@ array ( 0 => array ( - 'pattern' => '(1\\d)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1[1-467]', + 0 => '1', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -169,7 +170,7 @@ ), 1 => array ( - 'pattern' => '(5\\d)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -181,37 +182,37 @@ ), 2 => array ( - 'pattern' => '(92\\d{2})(\\d{5})', + 'pattern' => '(\\d{4})(\\d{5})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '92', + 0 => '9', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 3 => array ( - 'pattern' => '(800)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '800', + 0 => '81', ), - 'nationalPrefixFormattingRule' => '$1', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 4 => array ( - 'pattern' => '(811)(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '811', + 0 => '8', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), diff --git a/src/data/PhoneNumberMetadata_SD.php b/src/data/PhoneNumberMetadata_SD.php index 65c33b719..9173edf36 100644 --- a/src/data/PhoneNumberMetadata_SD.php +++ b/src/data/PhoneNumberMetadata_SD.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '1(?:5\\d|8[3567])\\d{6}', + 'NationalNumberPattern' => '1(?:5\\d|8[35-7])\\d{6}', 'ExampleNumber' => '151231234', 'PossibleLength' => array ( @@ -149,6 +149,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( + 0 => '[19]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_SE.php b/src/data/PhoneNumberMetadata_SE.php index ec55cb51c..dc70898a4 100644 --- a/src/data/PhoneNumberMetadata_SE.php +++ b/src/data/PhoneNumberMetadata_SE.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:[26]\\d\\d|9)\\d{9}|[1-9]\\d{8}|[1-689]\\d{7}|[1-4689]\\d{6}|[27]\\d{5}', + 'NationalNumberPattern' => '(?:[26]\\d\\d|9)\\d{9}|[1-9]\\d{8}|[1-689]\\d{7}|[1-4689]\\d{6}|2\\d{5}', 'PossibleLength' => array ( 0 => 6, @@ -86,12 +86,11 @@ ), 'sharedCost' => array ( - 'NationalNumberPattern' => '77(?:0\\d{3}(?:\\d{3})?|[1-7]\\d{6})', + 'NationalNumberPattern' => '77[0-7]\\d{6}', 'ExampleNumber' => '771234567', 'PossibleLength' => array ( - 0 => 6, - 1 => 9, + 0 => 9, ), 'PossibleLengthLocalOnly' => array ( @@ -256,18 +255,6 @@ 'nationalPrefixOptionalWhenFormatting' => false, ), 7 => - array ( - 'pattern' => '(77)(\\d{2})(\\d{2})', - 'format' => '$1-$2$3', - 'leadingDigitsPatterns' => - array ( - 0 => '77', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 8 => array ( 'pattern' => '(20)(\\d{2,3})(\\d{2})', 'format' => '$1-$2 $3', @@ -279,7 +266,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 9 => + 8 => array ( 'pattern' => '(9[034]\\d)(\\d{2})(\\d{2})(\\d{3})', 'format' => '$1-$2 $3 $4', @@ -291,7 +278,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 10 => + 9 => array ( 'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})', 'format' => '$1-$2 $3 $4 $5', @@ -314,9 +301,6 @@ array ( 0 => '[12][136]|3[356]|4[0246]|6[03]|90[1-9]', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( @@ -326,9 +310,6 @@ array ( 0 => '9(?:00|39|44)', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 2 => array ( @@ -338,9 +319,6 @@ array ( 0 => '8', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 3 => array ( @@ -350,9 +328,6 @@ array ( 0 => '1[013689]|2[0136]|3[1356]|4[0246]|54|6[03]|90', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 4 => array ( @@ -362,9 +337,6 @@ array ( 0 => '1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[0-5]|4[0-3])', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 5 => array ( @@ -374,9 +346,6 @@ array ( 0 => '1[2457]|2(?:[247-9]|5[0138])|3[0247-9]|4[1357-9]|5[0-35-9]|6(?:[124-689]|7[0-2])|9(?:[125-8]|3[0-5]|4[0-3])', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 6 => array ( @@ -386,23 +355,8 @@ array ( 0 => '7', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 7 => - array ( - 'pattern' => '(77)(\\d{2})(\\d{2})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - 0 => '77', - ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 8 => array ( 'pattern' => '(20)(\\d{2,3})(\\d{2})', 'format' => '$1 $2 $3', @@ -410,11 +364,8 @@ array ( 0 => '20', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), - 9 => + 8 => array ( 'pattern' => '(9[034]\\d)(\\d{2})(\\d{2})(\\d{3})', 'format' => '$1 $2 $3 $4', @@ -422,11 +373,8 @@ array ( 0 => '9[034]', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), - 10 => + 9 => array ( 'pattern' => '(\\d{3})(\\d{2})(\\d{3})(\\d{2})(\\d{2})', 'format' => '$1 $2 $3 $4 $5', @@ -434,9 +382,6 @@ array ( 0 => '25[245]|67[3-68]', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), ), 'mainCountryForCode' => false, diff --git a/src/data/PhoneNumberMetadata_SI.php b/src/data/PhoneNumberMetadata_SI.php index 4e6dc6970..c79247f26 100644 --- a/src/data/PhoneNumberMetadata_SI.php +++ b/src/data/PhoneNumberMetadata_SI.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1\\d|[25][2-8]|3[24-8]|4[24-8]|7[3-8])\\d{6}', + 'NationalNumberPattern' => '(?:1\\d|[25][2-8]|[34][24-8]|7[3-8])\\d{6}', 'ExampleNumber' => '11234567', 'PossibleLength' => array ( @@ -41,7 +41,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:[37][01]\\d|4[0139]\\d|51\\d|6(?:[48]\\d|5[15-7]|9[69]))\\d{5}', + 'NationalNumberPattern' => '(?:(?:[37][01]|4[0139]|51)\\d|6(?:[48]\\d|5[15-7]|9[69]))\\d{5}', 'ExampleNumber' => '31234567', 'PossibleLength' => array ( @@ -67,7 +67,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '90\\d{4,6}|89[1-3]\\d{2,5}', + 'NationalNumberPattern' => '89[1-3]\\d{2,5}|90\\d{4,6}', 'ExampleNumber' => '90123456', 'PossibleLength' => array ( @@ -158,35 +158,35 @@ array ( 0 => array ( - 'pattern' => '(\\d)(\\d{3})(\\d{2})(\\d{2})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{2})(\\d{3,6})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[12]|[34][24-8]|5[2-8]|7[3-8]', + 0 => '8[09]|9', ), - 'nationalPrefixFormattingRule' => '(0$1)', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( - 'pattern' => '([3-7]\\d)(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d)(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '[37][01]|4[0139]|51|6', + 0 => '[12]|[34][24-8]|5[2-8]|7[3-8]', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 2 => array ( - 'pattern' => '([89][09])(\\d{3,6})', - 'format' => '$1 $2', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[89][09]', + 0 => '[3467]|51', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -194,11 +194,11 @@ ), 3 => array ( - 'pattern' => '([58]\\d{2})(\\d{5})', + 'pattern' => '(\\d{3})(\\d{5})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '59|8[1-3]', + 0 => '[58]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_SJ.php b/src/data/PhoneNumberMetadata_SJ.php index 01427561d..1efa26aed 100644 --- a/src/data/PhoneNumberMetadata_SJ.php +++ b/src/data/PhoneNumberMetadata_SJ.php @@ -120,7 +120,7 @@ ), 'uan' => array ( - 'NationalNumberPattern' => '0\\d{4}|81(?:0(?:0[7-9]|1\\d)|5\\d{2})\\d{3}', + 'NationalNumberPattern' => '(?:0\\d|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', 'ExampleNumber' => '01234', 'PossibleLength' => array ( @@ -162,6 +162,7 @@ array ( ), 'mainCountryForCode' => false, + 'leadingDigits' => '79', 'leadingZeroPossible' => false, 'mobileNumberPortableRegion' => false, ); diff --git a/src/data/PhoneNumberMetadata_SL.php b/src/data/PhoneNumberMetadata_SL.php index a23759067..bfc44cf02 100644 --- a/src/data/PhoneNumberMetadata_SL.php +++ b/src/data/PhoneNumberMetadata_SL.php @@ -151,6 +151,7 @@ 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( + 0 => '[2-9]', ), 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_SM.php b/src/data/PhoneNumberMetadata_SM.php index 257189cef..41bc85ae4 100644 --- a/src/data/PhoneNumberMetadata_SM.php +++ b/src/data/PhoneNumberMetadata_SM.php @@ -213,9 +213,6 @@ 0 => '054', 1 => '0549', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 2 => array ( @@ -225,9 +222,6 @@ array ( 0 => '[89]', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), ), 'mainCountryForCode' => false, diff --git a/src/data/PhoneNumberMetadata_SO.php b/src/data/PhoneNumberMetadata_SO.php index bd9cd3ffa..63503f42e 100644 --- a/src/data/PhoneNumberMetadata_SO.php +++ b/src/data/PhoneNumberMetadata_SO.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1\\d{1,2}|2[0-79]\\d|3[0-46-8]?\\d|4[0-7]?\\d|59\\d|8[125])\\d{4}', + 'NationalNumberPattern' => '(?:1\\d|2[0-79]|3[0-46-8]|4[0-7]|59)\\d{5}|(?:[134]\\d|8[125])\\d{4}', 'ExampleNumber' => '4012345', 'PossibleLength' => array ( @@ -41,7 +41,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:15\\d|2(?:4\\d|8)|3[59]\\d{2}|4[89]\\d{2}|6[1-9]?\\d{2}|7(?:[1-8]\\d|9\\d{1,2})|8[08]\\d{2}|9(?:0[67]|[2-9])\\d)\\d{5}', + 'NationalNumberPattern' => '(?:(?:15|(?:3[59]|4[89]|6[1-9]|79|8[08])\\d|9(?:0[67]|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:6\\d|7[1-9])\\d{6}', 'ExampleNumber' => '71123456', 'PossibleLength' => array ( @@ -153,11 +153,11 @@ array ( 0 => array ( - 'pattern' => '(\\d{6})', - 'format' => '$1', + 'pattern' => '(\\d{2})(\\d{4})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[134]', + 0 => '8[125]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -165,11 +165,11 @@ ), 1 => array ( - 'pattern' => '(\\d)(\\d{6})', - 'format' => '$1 $2', + 'pattern' => '(\\d{6})', + 'format' => '$1', 'leadingDigitsPatterns' => array ( - 0 => '[13-5]|2[0-79]', + 0 => '[134]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -177,11 +177,11 @@ ), 2 => array ( - 'pattern' => '(\\d)(\\d{7})', + 'pattern' => '(\\d)(\\d{6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '24|[67]', + 0 => '[15]|2[0-79]|3[0-46-8]|4[0-7]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -189,11 +189,11 @@ ), 3 => array ( - 'pattern' => '(\\d{2})(\\d{4})', + 'pattern' => '(\\d)(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '8[125]', + 0 => '24|[67]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -201,11 +201,11 @@ ), 4 => array ( - 'pattern' => '(\\d{2})(\\d{5,7})', - 'format' => '$1 $2', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '15|28|6[1-35-9]|799|9[2-9]', + 0 => '[348]|64|79[0-8]|90', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -213,11 +213,11 @@ ), 5 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{2})(\\d{5,7})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '3[59]|4[89]|6[24-6]|79|8[08]|90', + 0 => '[12679]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_SY.php b/src/data/PhoneNumberMetadata_SY.php index 2e8b44103..ea7259e4c 100644 --- a/src/data/PhoneNumberMetadata_SY.php +++ b/src/data/PhoneNumberMetadata_SY.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:1\\d?|4\\d|[2356])|2(?:1\\d?|[235])|3(?:[13]\\d|4)|4[13]|5[1-3])\\d{6}', + 'NationalNumberPattern' => '(?:1[14]\\d|2(?:1\\d?|[235])|3(?:[13]\\d|4)|4[13]|5[1-3])\\d{6}|1[1-356]\\d{6}', 'ExampleNumber' => '112345678', 'PossibleLength' => array ( @@ -163,7 +163,7 @@ ), 1 => array ( - 'pattern' => '(9\\d{2})(\\d{3})(\\d{3})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php index 4fe5992d1..cccaaddb1 100644 --- a/src/data/PhoneNumberMetadata_TJ.php +++ b/src/data/PhoneNumberMetadata_TJ.php @@ -23,7 +23,8 @@ array ( 0 => 3, 1 => 5, - 2 => 7, + 2 => 6, + 3 => 7, ), ), 'fixedLine' => @@ -37,7 +38,8 @@ array ( 0 => 3, 1 => 5, - 2 => 7, + 2 => 6, + 3 => 7, ), ), 'mobile' => @@ -152,11 +154,12 @@ array ( 0 => array ( - 'pattern' => '([349]\\d{2})(\\d{2})(\\d{4})', + 'pattern' => '(\\d{4})(\\d)(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[34]7|91[78]', + 0 => '3(?:[1245]|3[12])', + 1 => '3(?:[1245]|3(?:1[0-689]|2))', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -164,11 +167,11 @@ ), 1 => array ( - 'pattern' => '([457-9]\\d)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{6})(\\d)(\\d{2})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '4[148]|[578]|9(?:[0235-9]|1[59])', + 0 => '33', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -176,14 +179,11 @@ ), 2 => array ( - 'pattern' => '(331700)(\\d)(\\d{2})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '331', - 1 => '3317', - 2 => '33170', - 3 => '331700', + 0 => '4[148]|[578]|9(?:[0235-9]|1[0-69])', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', @@ -191,12 +191,11 @@ ), 3 => array ( - 'pattern' => '(\\d{4})(\\d)(\\d{4})', + 'pattern' => '(\\d{3})(\\d{2})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '3[1-5]', - 1 => '3(?:[1245]|3(?:[02-9]|1[0-589]))', + 0 => '[349]', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_TM.php b/src/data/PhoneNumberMetadata_TM.php index 5dd94809f..af2f8a5ff 100644 --- a/src/data/PhoneNumberMetadata_TM.php +++ b/src/data/PhoneNumberMetadata_TM.php @@ -138,6 +138,7 @@ 'id' => 'TM', 'countryCode' => 993, 'internationalPrefix' => '810', + 'preferredInternationalPrefix' => '8~10', 'nationalPrefix' => '8', 'nationalPrefixForParsing' => '8', 'sameMobileAndFixedLinePattern' => false, diff --git a/src/data/PhoneNumberMetadata_TR.php b/src/data/PhoneNumberMetadata_TR.php index 06b1213f5..b255b03a6 100644 --- a/src/data/PhoneNumberMetadata_TR.php +++ b/src/data/PhoneNumberMetadata_TR.php @@ -38,7 +38,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '5(?:(?:0[15-7]|1[06]|24|[34]\\d|5[1-59]|9[46])\\d{2}|6161)\\d{5}', + 'NationalNumberPattern' => '5(?:(?:0[15-7]|1[06]|24|[34]\\d|5[1-59]|9[46])\\d\\d|6161)\\d{5}', 'ExampleNumber' => '5012345678', 'PossibleLength' => array ( @@ -118,7 +118,7 @@ ), 'uan' => array ( - 'NationalNumberPattern' => '444\\d{4}|850\\d{7}', + 'NationalNumberPattern' => '(?:444|850\\d{3})\\d{4}', 'ExampleNumber' => '4441444', 'PossibleLength' => array ( @@ -158,13 +158,13 @@ array ( 0 => array ( - 'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})', - 'format' => '$1 $2 $3 $4', + 'pattern' => '(\\d{3})(\\d)(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[23]|4(?:[0-35-9]|4[0-35-9])', + 0 => '444', ), - 'nationalPrefixFormattingRule' => '(0$1)', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => true, ), @@ -174,9 +174,9 @@ 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '5(?:[02-69]|1[06])', + 0 => '[2-4]', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '(0$1)', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => true, ), @@ -186,7 +186,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '51|[89]', + 0 => '512|[89]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -194,19 +194,55 @@ ), 3 => array ( - 'pattern' => '(444)(\\d{1})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => array ( - 0 => '444', + 0 => '5', ), - 'nationalPrefixFormattingRule' => '', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => true, ), ), 'intlNumberFormat' => array ( + 0 => + array ( + 'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', + 'leadingDigitsPatterns' => + array ( + 0 => '[2-4]', + ), + 'nationalPrefixFormattingRule' => '(0$1)', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), + 1 => + array ( + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '512|[89]', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), + 2 => + array ( + 'pattern' => '(\\d{3})(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', + 'leadingDigitsPatterns' => + array ( + 0 => '5', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), ), 'mainCountryForCode' => false, 'leadingZeroPossible' => false, diff --git a/src/data/PhoneNumberMetadata_TW.php b/src/data/PhoneNumberMetadata_TW.php index c00d52cf8..374d95967 100644 --- a/src/data/PhoneNumberMetadata_TW.php +++ b/src/data/PhoneNumberMetadata_TW.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2(?:[235-8]\\d{3}|4\\d{2,3})|3[2-9]\\d{2}|4(?:[239]\\d|[78])\\d{2}|5[2-8]\\d{2}|6[235-79]\\d{2}|7[1-9]\\d{2}|8(?:2(?:3\\d|66)|[7-9]\\d{2}))\\d{4}', + 'NationalNumberPattern' => '(?:(?:2[2-8]\\d|3[2-9]|4(?:[239]\\d|[78])|5[2-8]|6[235-79]|7[1-9])\\d\\d|8(?:2(?:3\\d|66)|[7-9]\\d\\d))\\d{4}|24\\d{6}', 'ExampleNumber' => '221234567', 'PossibleLength' => array ( @@ -65,7 +65,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '20(?:2|[013-9]\\d{2})\\d{4}', + 'NationalNumberPattern' => '20(?:[013-9]\\d\\d|2)\\d{4}', 'ExampleNumber' => '203123456', 'PossibleLength' => array ( @@ -154,7 +154,7 @@ ), 'id' => 'TW', 'countryCode' => 886, - 'internationalPrefix' => '0(?:0[25679]|19)', + 'internationalPrefix' => '0(?:0[25-79]|19)', 'nationalPrefix' => '0', 'preferredExtnPrefix' => '#', 'nationalPrefixForParsing' => '0', @@ -163,7 +163,7 @@ array ( 0 => array ( - 'pattern' => '(20)(\\d)(\\d{4})', + 'pattern' => '(\\d{2})(\\d)(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -175,11 +175,11 @@ ), 1 => array ( - 'pattern' => '([258]0)(\\d{3})(\\d{4})', + 'pattern' => '(\\d)(\\d{3,4})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '20[013-9]|50[0-46-9]|80[0-79]', + 0 => '[25][2-8]|[346]|7[1-9]|8[27-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -187,11 +187,11 @@ ), 2 => array ( - 'pattern' => '([2-8])(\\d{3,4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[25][2-8]|[346]|[78][1-9]', + 0 => '[258]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -199,7 +199,7 @@ ), 3 => array ( - 'pattern' => '(9\\d{2})(\\d{3})(\\d{3})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -211,11 +211,11 @@ ), 4 => array ( - 'pattern' => '(70)(\\d{4})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '70', + 0 => '7', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_UA.php b/src/data/PhoneNumberMetadata_UA.php index 07aacc50e..553d233bc 100644 --- a/src/data/PhoneNumberMetadata_UA.php +++ b/src/data/PhoneNumberMetadata_UA.php @@ -155,12 +155,12 @@ array ( 0 => array ( - 'pattern' => '([3-9]\\d)(\\d{3})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[38]9|4(?:[45][0-5]|87)|5(?:0|[67][37])|6[36-8]|7|9[1-9]', - 1 => '[38]9|4(?:[45][0-5]|87)|5(?:0|6(?:3[14-7]|7)|7[37])|6[36-8]|7|9[1-9]', + 0 => '(?:3[1-8]|4[136-8])2|5(?:[12457]2|6[24])|6(?:[12][29]|[49]2|5[24])|[89]0', + 1 => '3(?:[1-46-8]2[013-9]|52)|4(?:[1378]2|62[013-9])|5(?:[12457]2|6[24])|6(?:[12][29]|[49]2|5[24])|[89]0', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -168,12 +168,12 @@ ), 1 => array ( - 'pattern' => '([3-689]\\d{2})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{4})(\\d{5})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '(?:3[1-8]|4[136-8])2|5(?:[12457]2|6[24])|6(?:[12][29]|[49]2|5[24])|8[0-8]|90', - 1 => '3(?:[1-46-8]2[013-9]|52)|4(?:[1378]2|62[013-9])|5(?:[12457]2|6[24])|6(?:[12][29]|[49]2|5[24])|8[0-8]|90', + 0 => '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6[0135689]|7[4-6])|6[12459]', + 1 => '3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6(?:[015689]|3[02389])|7[4-6])|6[12459]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -181,12 +181,11 @@ ), 2 => array ( - 'pattern' => '([3-6]\\d{3})(\\d{5})', - 'format' => '$1 $2', + 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '3(?:[1-46-8]|5[013-9])|4(?:[137][013-9]|[45][6-9]|6|8[4-6])|5(?:[1245][013-9]|3|6[0135689]|7[4-6])|6(?:[12][13-8]|[49][013-9]|5[0135-9])', - 1 => '3(?:[1-46-8](?:[013-9]|22)|5[013-9])|4(?:[137][013-9]|[45][6-9]|6(?:[013-9]|22)|8[4-6])|5(?:[1245][013-9]|3|6(?:[015689]|3[02389])|7[4-6])|6(?:[12][13-8]|[49][013-9]|5[0135-9])', + 0 => '[35-9]|4(?:[45]|87)', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_UG.php b/src/data/PhoneNumberMetadata_UG.php index c7018685e..709f139fe 100644 --- a/src/data/PhoneNumberMetadata_UG.php +++ b/src/data/PhoneNumberMetadata_UG.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '20(?:[0147]\\d{3}|2(?:40|[5-9]\\d)\\d|3(?:0[0-4]|[2367]\\d)\\d|5[0-4]\\d{2}|6(?:00[0-2]|30[0-4]|[5-9]\\d{2})|8[0-2]\\d{2})\\d{3}|[34]\\d{8}', + 'NationalNumberPattern' => '(?:20(?:(?:(?:[0147]\\d|5[0-4]|8[0-2])\\d|2(?:40|[5-9]\\d)|3(?:0[0-4]|[2367]\\d))\\d|6(?:00[0-2]|30[0-4]|[5-9]\\d\\d))|[34]\\d{5})\\d{3}', 'ExampleNumber' => '312345678', 'PossibleLength' => array ( @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:[0157-9]\\d{2}|2(?:[03]\\d|60)|30\\d|4[0-4]\\d)\\d{5}', + 'NationalNumberPattern' => '7(?:(?:[0157-9]\\d|30|4[0-4])\\d|2(?:[03]\\d|60))\\d{5}', 'ExampleNumber' => '712345678', 'PossibleLength' => array ( @@ -53,7 +53,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '800[123]\\d{5}', + 'NationalNumberPattern' => '800[1-3]\\d{5}', 'ExampleNumber' => '800123456', 'PossibleLength' => array ( @@ -64,7 +64,7 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '90[123]\\d{6}', + 'NationalNumberPattern' => '90[1-3]\\d{6}', 'ExampleNumber' => '901123456', 'PossibleLength' => array ( @@ -153,12 +153,11 @@ array ( 0 => array ( - 'pattern' => '(\\d{3})(\\d{6})', + 'pattern' => '(\\d{2})(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '20[0-8]|4(?:6[45]|[7-9])|[7-9]', - 1 => '20(?:[013-8]|2[5-9])|4(?:6[45]|[7-9])|[7-9]', + 0 => '3|4(?:[0-5]|6[0-36-9])', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -166,11 +165,12 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{7})', + 'pattern' => '(\\d{4})(\\d{5})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '3|4(?:[1-5]|6[0-36-9])', + 0 => '202', + 1 => '2024', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -178,12 +178,11 @@ ), 2 => array ( - 'pattern' => '(2024)(\\d{5})', + 'pattern' => '(\\d{3})(\\d{6})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '202', - 1 => '2024', + 0 => '[247-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php index fc269ca63..3dbcc3b6c 100644 --- a/src/data/PhoneNumberMetadata_US.php +++ b/src/data/PhoneNumberMetadata_US.php @@ -185,9 +185,6 @@ array ( 0 => '[2-9]', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), ), 'mainCountryForCode' => true, diff --git a/src/data/PhoneNumberMetadata_UY.php b/src/data/PhoneNumberMetadata_UY.php index 8969653e9..406e69925 100644 --- a/src/data/PhoneNumberMetadata_UY.php +++ b/src/data/PhoneNumberMetadata_UY.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '2\\d{7}|4[2-7]\\d{6}', + 'NationalNumberPattern' => '(?:2\\d|4[2-7])\\d{6}', 'ExampleNumber' => '21231234', 'PossibleLength' => array ( @@ -145,7 +145,7 @@ ), 'id' => 'UY', 'countryCode' => 598, - 'internationalPrefix' => '0(?:1[3-9]\\d|0)', + 'internationalPrefix' => '0(?:0|1[3-9]\\d)', 'preferredInternationalPrefix' => '00', 'nationalPrefix' => '0', 'preferredExtnPrefix' => ' int. ', @@ -155,35 +155,35 @@ array ( 0 => array ( - 'pattern' => '(\\d{4})(\\d{4})', + 'pattern' => '(\\d{3})(\\d{4})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[24]', + 0 => '8|90', ), - 'nationalPrefixFormattingRule' => '', + 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', - 'format' => '$1 $2 $3', + 'pattern' => '(\\d{4})(\\d{4})', + 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '9[1-9]', + 0 => '[24]', ), - 'nationalPrefixFormattingRule' => '0$1', + 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), 2 => array ( - 'pattern' => '(\\d{3})(\\d{4})', - 'format' => '$1 $2', + 'pattern' => '(\\d{2})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[89]0', + 0 => '9', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_VA.php b/src/data/PhoneNumberMetadata_VA.php index 9481a4d32..c7acee94a 100644 --- a/src/data/PhoneNumberMetadata_VA.php +++ b/src/data/PhoneNumberMetadata_VA.php @@ -151,10 +151,9 @@ ), 'noInternationalDialling' => array ( - 'NationalNumberPattern' => '848\\d{6}', 'PossibleLength' => array ( - 0 => 9, + 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/PhoneNumberMetadata_VE.php b/src/data/PhoneNumberMetadata_VE.php index b91889b3c..bfff1e23b 100644 --- a/src/data/PhoneNumberMetadata_VE.php +++ b/src/data/PhoneNumberMetadata_VE.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:2(?:12|3[457-9]|[58][1-9]|[467]\\d|9[1-6])|50[01])\\d{7}', + 'NationalNumberPattern' => '(?:2(?:12|3[457-9]|[467]\\d|[58][1-9]|9[1-6])|50[01])\\d{7}', 'ExampleNumber' => '2121234567', 'PossibleLength' => array ( @@ -153,6 +153,7 @@ 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( + 0 => '[24589]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '$CC $1', diff --git a/src/data/PhoneNumberMetadata_VN.php b/src/data/PhoneNumberMetadata_VN.php index 4020fc5a7..83afaf22d 100644 --- a/src/data/PhoneNumberMetadata_VN.php +++ b/src/data/PhoneNumberMetadata_VN.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:(?:1(?:2\\d|6[2-9]|8[68]|99)|3\\d|7[06-9])\\d|5(?:2[23]|[689]\\d)|8(?:[1-58]\\d|6[5689]|9[689])|9(?:[0-8]\\d|9[013-9]))\\d{6}', + 'NationalNumberPattern' => '(?:(?:1(?:2\\d|6[2-9]|8[68]|99)|3\\d|7[06-9])\\d|5(?:2[238]|[689]\\d)|8(?:[1-58]\\d|6[5689]|9[689])|9(?:[0-8]\\d|9[013-9]))\\d{6}', 'ExampleNumber' => '912345678', 'PossibleLength' => array ( @@ -166,11 +166,11 @@ array ( 0 => array ( - 'pattern' => '(\\d{3})(\\d{4})', + 'pattern' => '(\\d{2})(\\d{5})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[17]99', + 0 => '80', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -178,11 +178,11 @@ ), 1 => array ( - 'pattern' => '(\\d{2})(\\d{5})', + 'pattern' => '(\\d{3})(\\d{4})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '80', + 0 => '[17]99', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -275,6 +275,90 @@ ), 'intlNumberFormat' => array ( + 0 => + array ( + 'pattern' => '(\\d{2})(\\d{5})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '80', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), + 1 => + array ( + 'pattern' => '(\\d{4})(\\d{4,6})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '1[89]0', + ), + 'nationalPrefixFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), + 2 => + array ( + 'pattern' => '(\\d{2})(\\d{3})(\\d{2})(\\d{2})', + 'format' => '$1 $2 $3 $4', + 'leadingDigitsPatterns' => + array ( + 0 => '[69]', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), + 3 => + array ( + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '[3578]', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), + 4 => + array ( + 'pattern' => '(\\d{2})(\\d{4})(\\d{4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '2[48]', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), + 5 => + array ( + 'pattern' => '(\\d{3})(\\d{4})(\\d{3})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '2', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), + 6 => + array ( + 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '1', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => true, + ), ), 'mainCountryForCode' => false, 'leadingZeroPossible' => false, diff --git a/src/data/PhoneNumberMetadata_VU.php b/src/data/PhoneNumberMetadata_VU.php index 794beb672..f9b2494ab 100644 --- a/src/data/PhoneNumberMetadata_VU.php +++ b/src/data/PhoneNumberMetadata_VU.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:(?:[23]|[57]\\d\\d|900)\\d|[48]8)\\d{3}', + 'NationalNumberPattern' => '(?:(?:[23]|(?:[57]\\d|90)\\d)\\d|[48]8)\\d{3}', 'PossibleLength' => array ( 0 => 5, @@ -90,9 +90,11 @@ ), 'voip' => array ( + 'NationalNumberPattern' => '90[1-9]\\d{4}', + 'ExampleNumber' => '9010123', 'PossibleLength' => array ( - 0 => -1, + 0 => 7, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/PhoneNumberMetadata_YE.php b/src/data/PhoneNumberMetadata_YE.php index d1c665bd3..64814c4a7 100644 --- a/src/data/PhoneNumberMetadata_YE.php +++ b/src/data/PhoneNumberMetadata_YE.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:7\\d|[2-68])|2[2-68]|3[2358]|4[2-58]|5[2-6]|6[3-58]|7[24-68])\\d{5}', + 'NationalNumberPattern' => '17\\d{6}|(?:[12][2-68]|3[2358]|4[2-58]|5[2-6]|6[3-58]|7[24-68])\\d{5}', 'ExampleNumber' => '1234567', 'PossibleLength' => array ( @@ -152,7 +152,7 @@ array ( 0 => array ( - 'pattern' => '([1-7])(\\d{3})(\\d{3,4})', + 'pattern' => '(\\d)(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -164,11 +164,11 @@ ), 1 => array ( - 'pattern' => '(7\\d{2})(\\d{3})(\\d{3})', + 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '7[0137]', + 0 => '7', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_ZM.php b/src/data/PhoneNumberMetadata_ZM.php index e4327ae94..8d9905d33 100644 --- a/src/data/PhoneNumberMetadata_ZM.php +++ b/src/data/PhoneNumberMetadata_ZM.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:(?:21|9\\d)\\d|800)\\d{6}', + 'NationalNumberPattern' => '(?:(?:21|76|9\\d)\\d|800)\\d{6}', 'PossibleLength' => array ( 0 => 9, @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '9[4-9]\\d{7}', + 'NationalNumberPattern' => '(?:76|9[5-8])\\d{7}', 'ExampleNumber' => '955123456', 'PossibleLength' => array ( @@ -173,11 +173,11 @@ ), 2 => array ( - 'pattern' => '([29]\\d)(\\d{7})', + 'pattern' => '([279]\\d)(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => array ( - 0 => '[29]', + 0 => '[279]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/ShortNumberMetadata_AU.php b/src/data/ShortNumberMetadata_AU.php index 09fd98af0..3c4eb9124 100644 --- a/src/data/ShortNumberMetadata_AU.php +++ b/src/data/ShortNumberMetadata_AU.php @@ -30,8 +30,8 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '1(?:258885|555)|733', - 'ExampleNumber' => '733', + 'NationalNumberPattern' => '000|1(?:06|12|258885|55\\d)|733', + 'ExampleNumber' => '000', 'PossibleLength' => array ( 0 => 3, @@ -44,13 +44,15 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '1(?:2(?:34|456)|9\\d{4})', - 'ExampleNumber' => '191123', + 'NationalNumberPattern' => '1(?:2(?:34|456)|9\\d{4,6})', + 'ExampleNumber' => '1234', 'PossibleLength' => array ( 0 => 4, 1 => 5, 2 => 6, + 3 => 7, + 4 => 8, ), 'PossibleLengthLocalOnly' => array ( @@ -59,7 +61,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '000|1(?:06|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '000', 'PossibleLength' => array ( 0 => 3, @@ -70,8 +72,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '000|1(?:06|1(?:00|2|9[46])|2(?:[23]\\d|4\\d{2,3}|5\\d{3,4}|8(?:2|[013-9]\\d))|555|9\\d{4,6})|225|7(?:33|67)', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '000|1(?:06|1(?:00|2|9[46])|2(?:[23]\\d|(?:4|5\\d)\\d{2,3}|8(?:[013-9]\\d|2))|555|9\\d{4,6})|225|7(?:33|67)', + 'ExampleNumber' => '000', 'PossibleLength' => array ( ), @@ -81,7 +83,7 @@ ), 'standardRate' => array ( - 'NationalNumberPattern' => '1(?:1\\d{2}|24733)|225|767', + 'NationalNumberPattern' => '1(?:1[09]\\d|24733)|225|767', 'ExampleNumber' => '225', 'PossibleLength' => array ( @@ -95,8 +97,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '1(?:258885|555)', - 'ExampleNumber' => '1555', + 'NationalNumberPattern' => '1(?:258885|55\\d)', + 'ExampleNumber' => '1550', 'PossibleLength' => array ( 0 => 4, @@ -109,7 +111,7 @@ 'smsServices' => array ( 'NationalNumberPattern' => '19\\d{4,6}', - 'ExampleNumber' => '191123', + 'ExampleNumber' => '190000', 'PossibleLength' => array ( 0 => 6, diff --git a/src/data/ShortNumberMetadata_BB.php b/src/data/ShortNumberMetadata_BB.php index 276d18538..b110966f6 100644 --- a/src/data/ShortNumberMetadata_BB.php +++ b/src/data/ShortNumberMetadata_BB.php @@ -78,9 +78,10 @@ ), 'carrierSpecific' => array ( + 'NationalNumberPattern' => '[468]11', + 'ExampleNumber' => '411', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_BD.php b/src/data/ShortNumberMetadata_BD.php index 7116c585d..6d05828ed 100644 --- a/src/data/ShortNumberMetadata_BD.php +++ b/src/data/ShortNumberMetadata_BD.php @@ -27,8 +27,8 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '106', - 'ExampleNumber' => '106', + 'NationalNumberPattern' => '1(?:0[0-26]|99)|999', + 'ExampleNumber' => '100', 'PossibleLength' => array ( 0 => 3, @@ -50,7 +50,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:0[0-2]|99)|999', - 'ExampleNumber' => '999', + 'ExampleNumber' => '100', 'PossibleLength' => array ( 0 => 3, @@ -61,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0(?:[0-39]|5(?:0\\d|[1-4])|6(\\d{2})?|7[0-4]|8[0-29])|1[16-9]|2(?:[134]|2[0-5])|3(?:1\\d?|3\\d|6[3-6])|4(?:0\\d|1\\d{2})|5[2-9]|99)|786|5012|9(?:594|99)', - 'ExampleNumber' => '103', + 'NationalNumberPattern' => '1(?:0(?:[0-39]|5(?:0\\d|[1-4])|6(?:\\d{2})?|7[0-4]|8[0-29])|1[16-9]|2(?:[134]|2[0-5])|3(?:[13]\\d|6[3-6])|4(?:0|1\\d)\\d|5[2-9]|99)|5012|786|9(?:594|99)|131', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), @@ -82,8 +82,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '1(?:11|2[13])|786|5012|9594', - 'ExampleNumber' => '9594', + 'NationalNumberPattern' => '1(?:11|2[13])|(?:501|959)\\d|786', + 'ExampleNumber' => '111', 'PossibleLength' => array ( 0 => 3, @@ -95,8 +95,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '9594', - 'ExampleNumber' => '9594', + 'NationalNumberPattern' => '959\\d', + 'ExampleNumber' => '9590', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_BO.php b/src/data/ShortNumberMetadata_BO.php index c5348a9e5..5df5e9903 100644 --- a/src/data/ShortNumberMetadata_BO.php +++ b/src/data/ShortNumberMetadata_BO.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[089]', + 'ExampleNumber' => '110', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -89,8 +91,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '40404', - 'ExampleNumber' => '40404', + 'NationalNumberPattern' => '404\\d\\d', + 'ExampleNumber' => '40400', 'PossibleLength' => array ( 0 => 5, diff --git a/src/data/ShortNumberMetadata_CC.php b/src/data/ShortNumberMetadata_CC.php index f16e168c6..381f5b759 100644 --- a/src/data/ShortNumberMetadata_CC.php +++ b/src/data/ShortNumberMetadata_CC.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '000|112', + 'ExampleNumber' => '000', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '000|112', - 'ExampleNumber' => '112', + 'ExampleNumber' => '000', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '000|112', - 'ExampleNumber' => '112', + 'ExampleNumber' => '000', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_CO.php b/src/data/ShortNumberMetadata_CO.php index d2bc66ddd..6250c0bc3 100644 --- a/src/data/ShortNumberMetadata_CO.php +++ b/src/data/ShortNumberMetadata_CO.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:1[29]|23|32|56)', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -59,7 +61,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:06|1[2569]|2[357]|3[27]|4[467]|5[36]|6[45]|95)|40404|85432', - 'ExampleNumber' => '112', + 'ExampleNumber' => '106', 'PossibleLength' => array ( ), @@ -79,8 +81,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '40404|85432', - 'ExampleNumber' => '40404', + 'NationalNumberPattern' => '(?:40|85)4\\d\\d', + 'ExampleNumber' => '40400', 'PossibleLength' => array ( 0 => 5, @@ -91,8 +93,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '40404|85432', - 'ExampleNumber' => '40404', + 'NationalNumberPattern' => '(?:40|85)4\\d\\d', + 'ExampleNumber' => '40400', 'PossibleLength' => array ( 0 => 5, diff --git a/src/data/ShortNumberMetadata_CR.php b/src/data/ShortNumberMetadata_CR.php index b35053b6d..7a3806b30 100644 --- a/src/data/ShortNumberMetadata_CR.php +++ b/src/data/ShortNumberMetadata_CR.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '112|911', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -47,7 +49,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '112|911', - 'ExampleNumber' => '911', + 'ExampleNumber' => '112', 'PossibleLength' => array ( 0 => 3, @@ -58,8 +60,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0(?:00|15|2[2-4679])|1(?:1[0-35-9]|2|37|[46]6|7[57]|8[79]|9[0-379])|2(?:00|[12]2|34|55)|3(?:21|33)|4(?:0[06]|1[4-6])|5(?:15|5[15])|693|7(?:00|1[789]|2[02]|[67]7)|975)|3855|5(?:0(?:30|49)|510)|911', - 'ExampleNumber' => '1022', + 'NationalNumberPattern' => '1(?:0(?:00|15|2[2-4679])|1(?:1[0-35-9]|2|37|[46]6|7[57]|8[79]|9[0-379])|2(?:00|[12]2|34|55)|3(?:21|33)|4(?:0[06]|1[4-6])|5(?:15|5[15])|693|7(?:00|1[7-9]|2[02]|[67]7)|975)|3855|5(?:0(?:30|49)|510)|911', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), @@ -89,8 +91,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '3855|5(?:0(?:30|49)|510)', - 'ExampleNumber' => '3855', + 'NationalNumberPattern' => '(?:385|5(?:0[34]|51))\\d', + 'ExampleNumber' => '3850', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_CU.php b/src/data/ShortNumberMetadata_CU.php index de71bfbef..4b21bb4f2 100644 --- a/src/data/ShortNumberMetadata_CU.php +++ b/src/data/ShortNumberMetadata_CU.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '10[4-6]', + 'ExampleNumber' => '104', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -46,8 +48,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '10[456]', - 'ExampleNumber' => '106', + 'NationalNumberPattern' => '10[4-6]', + 'ExampleNumber' => '104', 'PossibleLength' => array ( 0 => 3, @@ -58,8 +60,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0[456]|1(?:6111|8)|40)', - 'ExampleNumber' => '140', + 'NationalNumberPattern' => '1(?:0[4-6]|1(?:6111|8)|40)', + 'ExampleNumber' => '104', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_CX.php b/src/data/ShortNumberMetadata_CX.php index 9a5f2bc3b..d2fd71765 100644 --- a/src/data/ShortNumberMetadata_CX.php +++ b/src/data/ShortNumberMetadata_CX.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '000|112', + 'ExampleNumber' => '000', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '000|112', - 'ExampleNumber' => '112', + 'ExampleNumber' => '000', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '000|112', - 'ExampleNumber' => '112', + 'ExampleNumber' => '000', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_EC.php b/src/data/ShortNumberMetadata_EC.php index 98994c5c9..e1cc90e72 100644 --- a/src/data/ShortNumberMetadata_EC.php +++ b/src/data/ShortNumberMetadata_EC.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:0[12]|12)|911', + 'ExampleNumber' => '101', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:0[12]|12)|911', - 'ExampleNumber' => '911', + 'ExampleNumber' => '101', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:0[12]|12)|911', - 'ExampleNumber' => '911', + 'ExampleNumber' => '101', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_EG.php b/src/data/ShortNumberMetadata_EG.php index f88624250..00c7cec61 100644 --- a/src/data/ShortNumberMetadata_EG.php +++ b/src/data/ShortNumberMetadata_EG.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:2[23]|80)', + 'ExampleNumber' => '122', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -79,7 +81,7 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '34400', + 'NationalNumberPattern' => '344\\d\\d', 'ExampleNumber' => '34400', 'PossibleLength' => array ( @@ -91,7 +93,7 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '34400', + 'NationalNumberPattern' => '344\\d\\d', 'ExampleNumber' => '34400', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_ER.php b/src/data/ShortNumberMetadata_ER.php index 0b8570bc3..c6ad9f1ff 100644 --- a/src/data/ShortNumberMetadata_ER.php +++ b/src/data/ShortNumberMetadata_ER.php @@ -26,9 +26,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:1[2-46]|2[47]\\d{3})|20[12]\\d{3}', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,8 +47,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '1(?:1[2-46]|2(?:4422|7799))|2(?:0(?:1(?:606|917)|2(?:099|914)))', - 'ExampleNumber' => '113', + 'NationalNumberPattern' => '1(?:1[2-46]|2[47]\\d{3})|20[12]\\d{3}', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), @@ -57,8 +58,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:1[2-6]|2(?:4422|7799))|2(?:0(?:1(?:606|917)|2(?:099|914)))', - 'ExampleNumber' => '114', + 'NationalNumberPattern' => '1(?:1[2-6]|2(?:4422|7799))|20(?:1(?:606|917)|2(?:099|914))', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_ET.php b/src/data/ShortNumberMetadata_ET.php index acda485d1..d0aa7e262 100644 --- a/src/data/ShortNumberMetadata_ET.php +++ b/src/data/ShortNumberMetadata_ET.php @@ -26,9 +26,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '9(?:11?|[23]|9[17])', + 'ExampleNumber' => '91', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -47,7 +48,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '9(?:11?|[23]|9[17])', - 'ExampleNumber' => '991', + 'ExampleNumber' => '91', 'PossibleLength' => array ( ), @@ -58,7 +59,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '9(?:11?|[23]|9[17])', - 'ExampleNumber' => '991', + 'ExampleNumber' => '91', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_FO.php b/src/data/ShortNumberMetadata_FO.php index 5d34ec1a1..5f72375ce 100644 --- a/src/data/ShortNumberMetadata_FO.php +++ b/src/data/ShortNumberMetadata_FO.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[24]', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -58,8 +60,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:1[248]|4[124]\\d|71\\d|8[7-9]\\d)', - 'ExampleNumber' => '114', + 'NationalNumberPattern' => '1(?:1[248]|(?:4[124]|71|8[7-9])\\d)', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_GB.php b/src/data/ShortNumberMetadata_GB.php index 4676f01cf..9c794fe7f 100644 --- a/src/data/ShortNumberMetadata_GB.php +++ b/src/data/ShortNumberMetadata_GB.php @@ -28,8 +28,8 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '1(?:05|16\\d{3}|7[56]0|8000)|2(?:202|48)|4444', - 'ExampleNumber' => '116000', + 'NationalNumberPattern' => '1(?:05|1(?:2|6\\d{3})|7[56]\\d|8000)|2(?:20\\d|48)|4444|999', + 'ExampleNumber' => '105', 'PossibleLength' => array ( ), @@ -61,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0[015]|1(?:[12]|6(?:000|1(?:11|23))|8\\d{3})|2(?:[123]|50)|33|4(?:1|7\\d)|5(?:\\d|71)|7(?:0\\d|[56]0)|800\\d|9[15])|2(?:02(?:02)?|1300|2(?:02|11|2)|3(?:02|336|45)|4(?:25|8))|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|6(?:50|\\d{4})|7(?:0\\d{3}|8(?:9|\\d{3})|9\\d{3})|8\\d{4}|9(?:01|99)', - 'ExampleNumber' => '150', + 'NationalNumberPattern' => '1(?:0[015]|1(?:[12]|6(?:000|1(?:11|23))|8\\d{3})|2(?:[1-3]|50)|33|4(?:1|7\\d)|571|7(?:0\\d|[56]0)|800\\d|9[15])|2(?:0202|1300|2(?:02|11)|3(?:02|336|45)|4(?:25|8))|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|(?:[68]\\d|7[089])\\d{3}|15\\d|2[02]2|650|789|9(?:01|99)', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), @@ -82,8 +82,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '1(?:250|571|7[56]0)|2(?:02(?:02)?|1300|3336|48)|4444|901', - 'ExampleNumber' => '1571', + 'NationalNumberPattern' => '1(?:(?:25|7[56])\\d|571)|2(?:02(?:\\d{2})?|[13]3\\d\\d|48)|4444|901', + 'ExampleNumber' => '202', 'PossibleLength' => array ( 0 => 3, @@ -96,8 +96,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '1250|2(?:0202|1300)|7\\d{4}|8[01]\\d{3}', - 'ExampleNumber' => '20202', + 'NationalNumberPattern' => '(?:125|2(?:020|13\\d)|(?:7[089]|8[01])\\d\\d)\\d', + 'ExampleNumber' => '1250', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_GE.php b/src/data/ShortNumberMetadata_GE.php index 6242ba1fb..cc152ae82 100644 --- a/src/data/ShortNumberMetadata_GE.php +++ b/src/data/ShortNumberMetadata_GE.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '0(?:11|22|33)|1(?:1[1-3]|22)', + 'ExampleNumber' => '011', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -46,8 +48,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '0(?:11|22|33)|1(?:1[123]|22)', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '0(?:11|22|33)|1(?:1[1-3]|22)', + 'ExampleNumber' => '011', 'PossibleLength' => array ( 0 => 3, @@ -58,8 +60,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '0(?:11|22|33)|1(?:1[123]|22)|40404', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '0(?:11|22|33)|1(?:1[1-3]|22)|40404', + 'ExampleNumber' => '011', 'PossibleLength' => array ( ), @@ -79,8 +81,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '40404', - 'ExampleNumber' => '40404', + 'NationalNumberPattern' => '404\\d\\d', + 'ExampleNumber' => '40400', 'PossibleLength' => array ( 0 => 5, @@ -91,8 +93,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '40404', - 'ExampleNumber' => '40404', + 'NationalNumberPattern' => '404\\d\\d', + 'ExampleNumber' => '40400', 'PossibleLength' => array ( 0 => 5, diff --git a/src/data/ShortNumberMetadata_GG.php b/src/data/ShortNumberMetadata_GG.php index aad835a6d..2b496c4af 100644 --- a/src/data/ShortNumberMetadata_GG.php +++ b/src/data/ShortNumberMetadata_GG.php @@ -28,9 +28,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '112|999', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -49,7 +51,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '112|999', - 'ExampleNumber' => '999', + 'ExampleNumber' => '112', 'PossibleLength' => array ( 0 => 3, @@ -61,7 +63,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:0[01]|1(?:[12]|[68]\\d{3})|23|4(?:1|7\\d)|55|800\\d|9[05])|999', - 'ExampleNumber' => '155', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_GH.php b/src/data/ShortNumberMetadata_GH.php index 044c8f098..70d16684a 100644 --- a/src/data/ShortNumberMetadata_GH.php +++ b/src/data/ShortNumberMetadata_GH.php @@ -27,9 +27,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '19[1-3]|999', + 'ExampleNumber' => '191', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -47,8 +49,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '19[123]|999', - 'ExampleNumber' => '999', + 'NationalNumberPattern' => '19[1-3]|999', + 'ExampleNumber' => '191', 'PossibleLength' => array ( 0 => 3, @@ -59,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '19[123]|40404|(?:54|83)00|999', - 'ExampleNumber' => '999', + 'NationalNumberPattern' => '19[1-3]|40404|(?:54|83)00|999', + 'ExampleNumber' => '191', 'PossibleLength' => array ( ), @@ -80,7 +82,7 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '40404|(?:54|83)00', + 'NationalNumberPattern' => '(?:404\\d|(?:54|83)0)\\d', 'ExampleNumber' => '5400', 'PossibleLength' => array ( @@ -93,7 +95,7 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '40404|(?:54|83)00', + 'NationalNumberPattern' => '(?:404\\d|(?:54|83)0)\\d', 'ExampleNumber' => '5400', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_HR.php b/src/data/ShortNumberMetadata_HR.php index cdd81dfeb..6e1a77088 100644 --- a/src/data/ShortNumberMetadata_HR.php +++ b/src/data/ShortNumberMetadata_HR.php @@ -29,12 +29,14 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '1(?:16\\d{3}|3977)', - 'ExampleNumber' => '116000', + 'NationalNumberPattern' => '1(?:1(?:2|6\\d{3})|39\\d\\d|9[2-4])|9[34]', + 'ExampleNumber' => '93', 'PossibleLength' => array ( - 0 => 5, - 1 => 6, + 0 => 2, + 1 => 3, + 2 => 5, + 3 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -42,8 +44,8 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '118\\d{2}', - 'ExampleNumber' => '11812', + 'NationalNumberPattern' => '118\\d\\d', + 'ExampleNumber' => '11800', 'PossibleLength' => array ( 0 => 5, @@ -55,7 +57,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:12|9[2-4])|9[34]', - 'ExampleNumber' => '112', + 'ExampleNumber' => '93', 'PossibleLength' => array ( 0 => 2, @@ -67,8 +69,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:1[17]|23))|8\\d{2})|3977|9(?:[2-5]|87))|9[34]', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:1[17]|23))|8\\d\\d)|3977|9(?:[2-5]|87))|9[34]', + 'ExampleNumber' => '93', 'PossibleLength' => array ( ), @@ -88,8 +90,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '13977', - 'ExampleNumber' => '13977', + 'NationalNumberPattern' => '139\\d\\d', + 'ExampleNumber' => '13900', 'PossibleLength' => array ( 0 => 5, @@ -100,8 +102,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '13977', - 'ExampleNumber' => '13977', + 'NationalNumberPattern' => '139\\d\\d', + 'ExampleNumber' => '13900', 'PossibleLength' => array ( 0 => 5, diff --git a/src/data/ShortNumberMetadata_HU.php b/src/data/ShortNumberMetadata_HU.php index 219ede475..b48f1b52c 100644 --- a/src/data/ShortNumberMetadata_HU.php +++ b/src/data/ShortNumberMetadata_HU.php @@ -26,11 +26,10 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '116(?:000|1(?:11|23))', - 'ExampleNumber' => '116000', + 'NationalNumberPattern' => '1(?:0[457]|1(?:2|6\\d{3}))', + 'ExampleNumber' => '104', 'PossibleLength' => array ( - 0 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -49,7 +48,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:0[457]|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '104', 'PossibleLength' => array ( 0 => 3, @@ -61,7 +60,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:0[457]|1(?:2|6(?:000|1(?:11|23))))', - 'ExampleNumber' => '112', + 'ExampleNumber' => '104', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_IE.php b/src/data/ShortNumberMetadata_IE.php index 6aeceb32e..de8c331e8 100644 --- a/src/data/ShortNumberMetadata_IE.php +++ b/src/data/ShortNumberMetadata_IE.php @@ -28,11 +28,12 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '116\\d{3}', - 'ExampleNumber' => '116000', + 'NationalNumberPattern' => '11(?:2|6\\d{3})|999', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => 6, + 0 => 3, + 1 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -41,7 +42,7 @@ 'premiumRate' => array ( 'NationalNumberPattern' => '5[37]\\d{3}', - 'ExampleNumber' => '53012', + 'ExampleNumber' => '53000', 'PossibleLength' => array ( 0 => 5, @@ -64,7 +65,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:1[17]|23))|8\\d{2})|9\\d{2})|5[0137]\\d{3}|999', + 'NationalNumberPattern' => '1(?:1(?:2|6(?:00[06]|1(?:1[17]|23))|8\\d\\d)|9\\d\\d)|5[0137]\\d{3}|999', 'ExampleNumber' => '112', 'PossibleLength' => array ( @@ -76,7 +77,7 @@ 'standardRate' => array ( 'NationalNumberPattern' => '51\\d{3}', - 'ExampleNumber' => '51012', + 'ExampleNumber' => '51000', 'PossibleLength' => array ( 0 => 5, @@ -99,8 +100,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '118\\d{2}|5(?:[037]\\d{3}|1210)', - 'ExampleNumber' => '51210', + 'NationalNumberPattern' => '118\\d\\d|5(?:[037]\\d{3}|1210)', + 'ExampleNumber' => '11800', 'PossibleLength' => array ( 0 => 5, diff --git a/src/data/ShortNumberMetadata_IL.php b/src/data/ShortNumberMetadata_IL.php index 81811f895..aa0fa8140 100644 --- a/src/data/ShortNumberMetadata_IL.php +++ b/src/data/ShortNumberMetadata_IL.php @@ -27,9 +27,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:0[0-2]|12)', + 'ExampleNumber' => '100', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -47,8 +49,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '1(?:0[012]|12)', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '1(?:0[0-2]|12)', + 'ExampleNumber' => '100', 'PossibleLength' => array ( 0 => 3, @@ -59,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0(?:[012]|400)|1(?:[013-9]\\d|2)|[2-9]\\d{2})', - 'ExampleNumber' => '1455', + 'NationalNumberPattern' => '1(?:0(?:[0-2]|400)|1(?:[013-9]\\d|2)|[2-9]\\d\\d)', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), @@ -80,7 +82,7 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '10400', + 'NationalNumberPattern' => '104\\d\\d', 'ExampleNumber' => '10400', 'PossibleLength' => array ( @@ -92,7 +94,7 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '10400', + 'NationalNumberPattern' => '104\\d\\d', 'ExampleNumber' => '10400', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_IM.php b/src/data/ShortNumberMetadata_IM.php index 74777b9c5..62a3dfa29 100644 --- a/src/data/ShortNumberMetadata_IM.php +++ b/src/data/ShortNumberMetadata_IM.php @@ -27,9 +27,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '999', + 'ExampleNumber' => '999', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -59,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1\\d{2}(?:\\d{3})?|8(?:6444|9887)|999', - 'ExampleNumber' => '150', + 'NationalNumberPattern' => '1\\d\\d(?:\\d{3})?|8(?:6444|9887)|999', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), @@ -90,8 +92,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '8(?:6444|9887)', - 'ExampleNumber' => '86444', + 'NationalNumberPattern' => '8(?:64|98)\\d\\d', + 'ExampleNumber' => '86400', 'PossibleLength' => array ( 0 => 5, diff --git a/src/data/ShortNumberMetadata_IQ.php b/src/data/ShortNumberMetadata_IQ.php index afd90dcb4..29d3cb2e3 100644 --- a/src/data/ShortNumberMetadata_IQ.php +++ b/src/data/ShortNumberMetadata_IQ.php @@ -27,9 +27,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:0[04]|15|22)', + 'ExampleNumber' => '100', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -48,7 +50,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:0[04]|15|22)', - 'ExampleNumber' => '122', + 'ExampleNumber' => '100', 'PossibleLength' => array ( 0 => 3, @@ -60,7 +62,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:0[04]|15|22)|4432|71117|9988', - 'ExampleNumber' => '4432', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), @@ -80,8 +82,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '4432|71117|9988', - 'ExampleNumber' => '4432', + 'NationalNumberPattern' => '(?:443|711\\d|998)\\d', + 'ExampleNumber' => '4430', 'PossibleLength' => array ( 0 => 4, @@ -93,8 +95,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '4432|71117|9988', - 'ExampleNumber' => '4432', + 'NationalNumberPattern' => '(?:443|711\\d|998)\\d', + 'ExampleNumber' => '4430', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_JE.php b/src/data/ShortNumberMetadata_JE.php index 546b9a70d..061569abb 100644 --- a/src/data/ShortNumberMetadata_JE.php +++ b/src/data/ShortNumberMetadata_JE.php @@ -27,9 +27,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '112|999', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -48,7 +50,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '112|999', - 'ExampleNumber' => '999', + 'ExampleNumber' => '112', 'PossibleLength' => array ( 0 => 3, @@ -59,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:00|1(?:2|8\\d{3})|23|4(?:[14]|28|7\\d)|5\\d|7(?:0[12]|[128]|35?)|808|9[0135])|23[234]|999', - 'ExampleNumber' => '150', + 'NationalNumberPattern' => '1(?:00|1(?:2|8\\d{3})|23|4(?:[14]|28|7\\d)|5\\d|7(?:0[12]|[128]|35?)|808|9[0135])|23[2-4]|999', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_KE.php b/src/data/ShortNumberMetadata_KE.php index e9815279d..3eb68f3fb 100644 --- a/src/data/ShortNumberMetadata_KE.php +++ b/src/data/ShortNumberMetadata_KE.php @@ -27,8 +27,8 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '1(?:1(?:6|9\\d)|5(?:01|2[127]|6(?:29|6[67])))', - 'ExampleNumber' => '1501', + 'NationalNumberPattern' => '1(?:1(?:[246]|9\\d)|5(?:01|2[127]|6[26]\\d))|999', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), @@ -38,8 +38,8 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '909\\d{2}', - 'ExampleNumber' => '90912', + 'NationalNumberPattern' => '909\\d\\d', + 'ExampleNumber' => '90900', 'PossibleLength' => array ( 0 => 5, @@ -50,8 +50,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '112|114|999', - 'ExampleNumber' => '999', + 'NationalNumberPattern' => '11[24]|999', + 'ExampleNumber' => '112', 'PossibleLength' => array ( 0 => 3, @@ -62,8 +62,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0(?:[07-9]|1[0-25]|400)|1(?:[02456]|9[0-579])|2[123]|3[01]|4[14]|5(?:[01][01]|2[0-24-79]|33|4[05]|5[59]|6(?:00|29|6[67]))|6[035]\\d{2}|[78]\\d|9(?:[02-9]\\d{2}|19))|(?:2[0-79]|3[0-29]|4[0-4])\\d{3}|5(?:[0-7]\\d|99)\\d{2}|(?:6[2357]|7[0-29])\\d{3}|8(?:[0-9]\\d{3}|988)|9(?:09\\d{2}|99)', - 'ExampleNumber' => '116', + 'NationalNumberPattern' => '1(?:0(?:[07-9]|1[0-25]|400)|1(?:[024-6]|9[0-579])|2[1-3]|3[01]|4[14]|5(?:[01][01]|2[0-24-79]|33|4[05]|5[59]|6(?:00|29|6[67]))|(?:6[035]\\d|[78])\\d|9(?:[02-9]\\d\\d|19))|(?:(?:2[0-79]|[37][0-29]|4[0-4]|6[2357]|8\\d)\\d|5(?:[0-7]\\d|99))\\d\\d|9(?:09\\d\\d|99)|8988', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), @@ -83,8 +83,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '1(?:0400|3[01]|4[14]|5(?:1[01]|2[25])|6[35]\\d{2})|(?:2[0-79]|3[0-29]|4[0-4])\\d{3}|5(?:[0-7]\\d|99)\\d{2}|(?:6[2357]|7[0-29])\\d{3}|8(?:988|[0-9]\\d{3})|909\\d{2}', - 'ExampleNumber' => '90912', + 'NationalNumberPattern' => '1(?:(?:04|6[35])\\d\\d|3[01]|4[14]|5(?:1\\d|2[25]))|(?:(?:2[0-79]|[37][0-29]|4[0-4]|6[2357]|8\\d)\\d|5(?:[0-7]\\d|99)|909)\\d\\d|898\\d', + 'ExampleNumber' => '130', 'PossibleLength' => array ( ), @@ -94,8 +94,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '1(?:0400|4[14]|5(?:01|55|6(?:29|6[67]))|6[035]\\d{2})|40404|8988|909\\d{2}', - 'ExampleNumber' => '8988', + 'NationalNumberPattern' => '1(?:(?:04|6[035])\\d\\d|4[14]|5(?:01|55|6[26]\\d))|40404|8988|909\\d\\d', + 'ExampleNumber' => '141', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_KG.php b/src/data/ShortNumberMetadata_KG.php index 78ccebd0c..9080f4cc4 100644 --- a/src/data/ShortNumberMetadata_KG.php +++ b/src/data/ShortNumberMetadata_KG.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '10[1-3]', + 'ExampleNumber' => '101', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +48,7 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '10[123]', + 'NationalNumberPattern' => '10[1-3]', 'ExampleNumber' => '101', 'PossibleLength' => array ( @@ -58,7 +60,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '10[123]|4040', + 'NationalNumberPattern' => '10[1-3]|4040', 'ExampleNumber' => '101', 'PossibleLength' => array ( @@ -79,7 +81,7 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '4040', + 'NationalNumberPattern' => '404\\d', 'ExampleNumber' => '4040', 'PossibleLength' => array ( @@ -91,7 +93,7 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '4040', + 'NationalNumberPattern' => '404\\d', 'ExampleNumber' => '4040', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_KH.php b/src/data/ShortNumberMetadata_KH.php index 0b09e8d56..2a1cf253e 100644 --- a/src/data/ShortNumberMetadata_KH.php +++ b/src/data/ShortNumberMetadata_KH.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[7-9]|666', + 'ExampleNumber' => '117', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +48,7 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '11[789]|666', + 'NationalNumberPattern' => '11[7-9]|666', 'ExampleNumber' => '117', 'PossibleLength' => array ( @@ -58,7 +60,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '11[789]|40404|666', + 'NationalNumberPattern' => '11[7-9]|40404|666', 'ExampleNumber' => '117', 'PossibleLength' => array ( @@ -79,8 +81,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '40404', - 'ExampleNumber' => '40404', + 'NationalNumberPattern' => '404\\d\\d', + 'ExampleNumber' => '40400', 'PossibleLength' => array ( 0 => 5, @@ -91,8 +93,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '40404', - 'ExampleNumber' => '40404', + 'NationalNumberPattern' => '404\\d\\d', + 'ExampleNumber' => '40400', 'PossibleLength' => array ( 0 => 5, diff --git a/src/data/ShortNumberMetadata_KI.php b/src/data/ShortNumberMetadata_KI.php index b29caf28c..aee139590 100644 --- a/src/data/ShortNumberMetadata_KI.php +++ b/src/data/ShortNumberMetadata_KI.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '19[2-5]|99[2-49]', + 'ExampleNumber' => '192', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +48,7 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '19[2-5]|99[2349]', + 'NationalNumberPattern' => '19[2-5]|99[2-49]', 'ExampleNumber' => '192', 'PossibleLength' => array ( @@ -58,7 +60,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0(?:[0-8]|5[01259])|88|9[2-5])|777|99[2349]', + 'NationalNumberPattern' => '1(?:05[0-259]|88|9[2-5])|777|99[2-49]|10[0-8]', 'ExampleNumber' => '100', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_KP.php b/src/data/ShortNumberMetadata_KP.php index 0adbd1c34..9d7ce6153 100644 --- a/src/data/ShortNumberMetadata_KP.php +++ b/src/data/ShortNumberMetadata_KP.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[29]|819', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -45,7 +46,7 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '1(?:12|19)|819', + 'NationalNumberPattern' => '11[29]|819', 'ExampleNumber' => '112', 'PossibleLength' => array ( @@ -56,7 +57,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:12|19)|819', + 'NationalNumberPattern' => '11[29]|819', 'ExampleNumber' => '112', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_KZ.php b/src/data/ShortNumberMetadata_KZ.php index 881c28ac9..9ca9ee341 100644 --- a/src/data/ShortNumberMetadata_KZ.php +++ b/src/data/ShortNumberMetadata_KZ.php @@ -27,9 +27,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:0[1-3]|12)', + 'ExampleNumber' => '101', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -47,8 +49,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '1(?:0[123]|12)', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '1(?:0[1-3]|12)', + 'ExampleNumber' => '101', 'PossibleLength' => array ( 0 => 3, @@ -59,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0[1-4]|12)|30400|4040', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '1(?:0[1-4]|12)|(?:3040|404)0', + 'ExampleNumber' => '101', 'PossibleLength' => array ( ), @@ -80,8 +82,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '30400|4040', - 'ExampleNumber' => '30400', + 'NationalNumberPattern' => '(?:304\\d|404)\\d', + 'ExampleNumber' => '4040', 'PossibleLength' => array ( 0 => 4, @@ -93,8 +95,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '30400|4040', - 'ExampleNumber' => '30400', + 'NationalNumberPattern' => '(?:304\\d|404)\\d', + 'ExampleNumber' => '4040', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_LA.php b/src/data/ShortNumberMetadata_LA.php index 642142139..e1a90ad60 100644 --- a/src/data/ShortNumberMetadata_LA.php +++ b/src/data/ShortNumberMetadata_LA.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '19[015]', + 'ExampleNumber' => '190', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_LK.php b/src/data/ShortNumberMetadata_LK.php index 019b94b46..0969c9b75 100644 --- a/src/data/ShortNumberMetadata_LK.php +++ b/src/data/ShortNumberMetadata_LK.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[02689]', + 'ExampleNumber' => '110', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '11[02689]', - 'ExampleNumber' => '119', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '11[024-9]', - 'ExampleNumber' => '119', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_LU.php b/src/data/ShortNumberMetadata_LU.php index f2e0b2e23..aca137ad4 100644 --- a/src/data/ShortNumberMetadata_LU.php +++ b/src/data/ShortNumberMetadata_LU.php @@ -28,11 +28,12 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '116\\d{3}', - 'ExampleNumber' => '116000', + 'NationalNumberPattern' => '11(?:[23]|6\\d{3})', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => 6, + 0 => 3, + 1 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -62,8 +63,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:1(?:[23]|6(?:000|111)|8\\d{2})|[25]\\d{3}|3\\d{2})', - 'ExampleNumber' => '12123', + 'NationalNumberPattern' => '1(?:1(?:[23]|6(?:000|111)|8\\d\\d)|(?:[25]\\d|3)\\d\\d)', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_LY.php b/src/data/ShortNumberMetadata_LY.php index 3b409d981..96f8f6837 100644 --- a/src/data/ShortNumberMetadata_LY.php +++ b/src/data/ShortNumberMetadata_LY.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '19[013]', + 'ExampleNumber' => '190', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '19[013]', - 'ExampleNumber' => '193', + 'ExampleNumber' => '190', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '19[013]', - 'ExampleNumber' => '193', + 'ExampleNumber' => '190', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_ME.php b/src/data/ShortNumberMetadata_ME.php index 975cd9709..fcfa7d689 100644 --- a/src/data/ShortNumberMetadata_ME.php +++ b/src/data/ShortNumberMetadata_ME.php @@ -28,9 +28,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:12|2[2-4])', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -48,7 +50,7 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '1(?:12|2[234])', + 'NationalNumberPattern' => '1(?:12|2[2-4])', 'ExampleNumber' => '112', 'PossibleLength' => array ( @@ -60,8 +62,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:[03]\\d{2}|1(?:[013-57-9]\\d|2|6\\d{3})|2\\d{1,3}|4\\d{2,3}|5(?:\\d{2}|999)|60[06]|700|8(?:0[089]|1[0-8]|888)|9\\d{3})', - 'ExampleNumber' => '1011', + 'NationalNumberPattern' => '1(?:1(?:(?:[013-57-9]|6\\d\\d)\\d|2)|[249]\\d{3}|5999|8(?:0[089]|1[0-8]|888))|1(?:[02-5]\\d\\d|60[06]|700)|12\\d', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_MK.php b/src/data/ShortNumberMetadata_MK.php index 6560da36d..ff1566a59 100644 --- a/src/data/ShortNumberMetadata_MK.php +++ b/src/data/ShortNumberMetadata_MK.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:12|9[2-4])', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -45,7 +46,7 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '1(?:12|9[234])', + 'NationalNumberPattern' => '1(?:12|9[2-4])', 'ExampleNumber' => '112', 'PossibleLength' => array ( @@ -56,7 +57,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:12|9[234])', + 'NationalNumberPattern' => '1(?:12|9[2-4])', 'ExampleNumber' => '112', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_ML.php b/src/data/ShortNumberMetadata_ML.php index ba1555698..89a0376a9 100644 --- a/src/data/ShortNumberMetadata_ML.php +++ b/src/data/ShortNumberMetadata_ML.php @@ -28,12 +28,13 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '35200|67(?:00|77)|74(?:02|44)|8000[12]', - 'ExampleNumber' => '35200', + 'NationalNumberPattern' => '1[578]|35200|67(?:00|7\\d)|74(?:02|4\\d)|8000\\d', + 'ExampleNumber' => '15', 'PossibleLength' => array ( - 0 => 4, - 1 => 5, + 0 => 2, + 1 => 4, + 2 => 5, ), 'PossibleLengthLocalOnly' => array ( @@ -41,8 +42,8 @@ ), 'premiumRate' => array ( - 'NationalNumberPattern' => '122[13]|3(?:52(?:11|2[02]|3[04-6]|99)|7574)|8002[12]', - 'ExampleNumber' => '35211', + 'NationalNumberPattern' => '(?:12|800)2\\d|3(?:52(?:11|2[02]|3[04-6]|99)|7574)', + 'ExampleNumber' => '1220', 'PossibleLength' => array ( 0 => 4, @@ -55,7 +56,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1[578]', - 'ExampleNumber' => '17', + 'ExampleNumber' => '15', 'PossibleLength' => array ( 0 => 2, @@ -66,8 +67,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:1(?:2|[013-9]\\d)|2(?:1[02-469]|2[13])|[578])|3(?:5(?:0(?:35|57)|2\\d{2})|[67]\\d{3})|67(?:0[09]|59|77|8[89]|99)|74(?:0[02]|44|55)|800[012][12]', - 'ExampleNumber' => '1210', + 'NationalNumberPattern' => '1(?:1(?:[013-9]\\d|2)|2(?:1[02-469]|2[13])|[578])|3(?:5(?:0(?:35|57)|2\\d\\d)|[67]\\d{3})|67(?:0[09]|[59]9|77|8[89])|74(?:0[02]|44|55)|800[0-2][12]', + 'ExampleNumber' => '15', 'PossibleLength' => array ( ), @@ -77,7 +78,7 @@ ), 'standardRate' => array ( - 'NationalNumberPattern' => '37(?:433|575)|7400|8001[12]', + 'NationalNumberPattern' => '37(?:433|575)|7400|8001\\d', 'ExampleNumber' => '7400', 'PossibleLength' => array ( @@ -90,8 +91,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '3(?:5035|[67]\\d{3})|800[012][12]', - 'ExampleNumber' => '35035', + 'NationalNumberPattern' => '(?:3(?:503|[67]\\d\\d)|800\\d)\\d', + 'ExampleNumber' => '35030', 'PossibleLength' => array ( 0 => 5, @@ -102,8 +103,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '3(?:6\\d{3}|7(?:4(?:0[24-9]|[1-9]\\d)|5\\d{2}))|7400', - 'ExampleNumber' => '37575', + 'NationalNumberPattern' => '3(?:6\\d{3}|7(?:4(?:0[24-9]|[1-9]\\d)|5\\d\\d))|7400', + 'ExampleNumber' => '7400', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_MU.php b/src/data/ShortNumberMetadata_MU.php index 8cdc996b3..7978ed0e4 100644 --- a/src/data/ShortNumberMetadata_MU.php +++ b/src/data/ShortNumberMetadata_MU.php @@ -27,9 +27,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[45]|99[59]', + 'ExampleNumber' => '114', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -48,7 +50,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '11[45]|99[59]', - 'ExampleNumber' => '999', + 'ExampleNumber' => '114', 'PossibleLength' => array ( 0 => 3, @@ -59,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1\\d{2,4}|8\\d{3}|99\\d', - 'ExampleNumber' => '995', + 'NationalNumberPattern' => '(?:1\\d{1,3}|8\\d\\d|99)\\d', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_NE.php b/src/data/ShortNumberMetadata_NE.php index d80546951..5bd6fd025 100644 --- a/src/data/ShortNumberMetadata_NE.php +++ b/src/data/ShortNumberMetadata_NE.php @@ -27,9 +27,12 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1[578]|723\\d{3}', + 'ExampleNumber' => '15', 'PossibleLength' => array ( - 0 => -1, + 0 => 2, + 1 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -47,8 +50,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '1[578]|723141', - 'ExampleNumber' => '17', + 'NationalNumberPattern' => '1[578]|723\\d{3}', + 'ExampleNumber' => '15', 'PossibleLength' => array ( 0 => 2, @@ -60,8 +63,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0[01]|1[12]|2[034]|3[013]|40|55?|60|7|8)|222|333|555|723141|888', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '1(?:0[01]|1[12]|2[034]|3[013]|[46]0|55?|[78])|222|333|555|723141|888', + 'ExampleNumber' => '15', 'PossibleLength' => array ( ), @@ -81,7 +84,7 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '1(?:0[01]|1[12]|2[034]|3[013]|40|55|60)|222|333|555|888', + 'NationalNumberPattern' => '1(?:0[01]|1[12]|2[034]|3[013]|[46]0|55)|222|333|555|888', 'ExampleNumber' => '100', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_NF.php b/src/data/ShortNumberMetadata_NF.php index 0511c4a75..98c9e017f 100644 --- a/src/data/ShortNumberMetadata_NF.php +++ b/src/data/ShortNumberMetadata_NF.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '9(?:11|55|77)', + 'ExampleNumber' => '911', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_NG.php b/src/data/ShortNumberMetadata_NG.php index 1e8440a98..fb5433b13 100644 --- a/src/data/ShortNumberMetadata_NG.php +++ b/src/data/ShortNumberMetadata_NG.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '199', + 'ExampleNumber' => '199', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -79,7 +81,7 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '40700', + 'NationalNumberPattern' => '407\\d\\d', 'ExampleNumber' => '40700', 'PossibleLength' => array ( @@ -91,7 +93,7 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '40700', + 'NationalNumberPattern' => '407\\d\\d', 'ExampleNumber' => '40700', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_NO.php b/src/data/ShortNumberMetadata_NO.php index 3af42b2b2..7eff4abce 100644 --- a/src/data/ShortNumberMetadata_NO.php +++ b/src/data/ShortNumberMetadata_NO.php @@ -27,11 +27,12 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '1161(?:1[17]|23)', - 'ExampleNumber' => '116117', + 'NationalNumberPattern' => '11(?:[023]|6\\d{3})', + 'ExampleNumber' => '110', 'PossibleLength' => array ( - 0 => 6, + 0 => 3, + 1 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -50,7 +51,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '11[023]', - 'ExampleNumber' => '112', + 'ExampleNumber' => '110', 'PossibleLength' => array ( 0 => 3, @@ -62,7 +63,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|90)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_NP.php b/src/data/ShortNumberMetadata_NP.php index 9cd363b8b..d2c205d07 100644 --- a/src/data/ShortNumberMetadata_NP.php +++ b/src/data/ShortNumberMetadata_NP.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:0[0-3]|12)', + 'ExampleNumber' => '100', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:0[0-3]|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:0[0-3]|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_PE.php b/src/data/ShortNumberMetadata_PE.php index 9c2ac1a56..a57a8e625 100644 --- a/src/data/ShortNumberMetadata_PE.php +++ b/src/data/ShortNumberMetadata_PE.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:05|1[67])', + 'ExampleNumber' => '105', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_PF.php b/src/data/ShortNumberMetadata_PF.php index 318483ae0..dc9c808e4 100644 --- a/src/data/ShortNumberMetadata_PF.php +++ b/src/data/ShortNumberMetadata_PF.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1[578]', + 'ExampleNumber' => '15', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_PG.php b/src/data/ShortNumberMetadata_PG.php index 739a45f16..ddb22f61b 100644 --- a/src/data/ShortNumberMetadata_PG.php +++ b/src/data/ShortNumberMetadata_PG.php @@ -29,9 +29,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '000|11[01]', + 'ExampleNumber' => '000', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -61,7 +63,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '000|1(?:1[01]|5\\d{2}|6\\d{2,5})', + 'NationalNumberPattern' => '000|1(?:1[01]|5\\d\\d|6\\d{2,5})', 'ExampleNumber' => '000', 'PossibleLength' => array ( @@ -93,7 +95,7 @@ 'smsServices' => array ( 'NationalNumberPattern' => '16\\d{2,5}', - 'ExampleNumber' => '1612', + 'ExampleNumber' => '1600', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_PH.php b/src/data/ShortNumberMetadata_PH.php index cd431490d..326486d81 100644 --- a/src/data/ShortNumberMetadata_PH.php +++ b/src/data/ShortNumberMetadata_PH.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[27]|911', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '11[27]|911', - 'ExampleNumber' => '117', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_PL.php b/src/data/ShortNumberMetadata_PL.php index 054ca98b3..691b943c2 100644 --- a/src/data/ShortNumberMetadata_PL.php +++ b/src/data/ShortNumberMetadata_PL.php @@ -27,11 +27,12 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '116\\d{3}', - 'ExampleNumber' => '116000', + 'NationalNumberPattern' => '11(?:2|6\\d{3})|99[7-9]', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => 6, + 0 => 3, + 1 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -49,7 +50,7 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '112|99[789]', + 'NationalNumberPattern' => '112|99[7-9]', 'ExampleNumber' => '112', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_PS.php b/src/data/ShortNumberMetadata_PS.php index 347083877..5d4af53be 100644 --- a/src/data/ShortNumberMetadata_PS.php +++ b/src/data/ShortNumberMetadata_PS.php @@ -25,8 +25,8 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '166', - 'ExampleNumber' => '166', + 'NationalNumberPattern' => '1(?:0[0-2]|66)', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), @@ -58,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:0[0-2]|44|66|99)', - 'ExampleNumber' => '199', + 'ExampleNumber' => '100', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_PY.php b/src/data/ShortNumberMetadata_PY.php index b918e058f..752bacbc0 100644 --- a/src/data/ShortNumberMetadata_PY.php +++ b/src/data/ShortNumberMetadata_PY.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '128|911', + 'ExampleNumber' => '128', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '128|911', - 'ExampleNumber' => '911', + 'ExampleNumber' => '128', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1[1-4]\\d|911', - 'ExampleNumber' => '123', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_RS.php b/src/data/ShortNumberMetadata_RS.php index 59c2dcf91..5c233ccde 100644 --- a/src/data/ShortNumberMetadata_RS.php +++ b/src/data/ShortNumberMetadata_RS.php @@ -29,9 +29,12 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '112|9[2-4]', + 'ExampleNumber' => '92', 'PossibleLength' => array ( - 0 => -1, + 0 => 2, + 1 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -49,8 +52,8 @@ ), 'emergency' => array ( - 'NationalNumberPattern' => '112|9[234]', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '112|9[2-4]', + 'ExampleNumber' => '92', 'PossibleLength' => array ( 0 => 2, @@ -62,8 +65,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1[189]\\d{1,4}|9[234]', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '1[189]\\d{1,4}|9[2-4]', + 'ExampleNumber' => '92', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_RU.php b/src/data/ShortNumberMetadata_RU.php index 88e26bcc4..1248d3242 100644 --- a/src/data/ShortNumberMetadata_RU.php +++ b/src/data/ShortNumberMetadata_RU.php @@ -26,9 +26,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '0[1-3]|1(?:0[1-3]|12)', + 'ExampleNumber' => '01', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -47,7 +48,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '0[1-3]|1(?:0[1-3]|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '01', 'PossibleLength' => array ( ), @@ -58,7 +59,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '0[1-4]|1(?:0[1-4]|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '01', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_SA.php b/src/data/ShortNumberMetadata_SA.php index f5d84eedc..485783dc2 100644 --- a/src/data/ShortNumberMetadata_SA.php +++ b/src/data/ShortNumberMetadata_SA.php @@ -28,8 +28,8 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '116111|937|998', - 'ExampleNumber' => '116111', + 'NationalNumberPattern' => '11(?:2|6\\d{3})|9(?:11|37|9[7-9])', + 'ExampleNumber' => '112', 'PossibleLength' => array ( 0 => 3, @@ -52,7 +52,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '112|9(?:11|9[79])', - 'ExampleNumber' => '999', + 'ExampleNumber' => '112', 'PossibleLength' => array ( 0 => 3, @@ -64,7 +64,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:1(?:00|2|6111)|410|9(?:00|1[89]|9(?:099|22|91)))|9(?:0[24-79]|11|3[379]|40|66|8[5-9]|9[02-9])', - 'ExampleNumber' => '937', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), @@ -74,7 +74,7 @@ ), 'standardRate' => array ( - 'NationalNumberPattern' => '1410', + 'NationalNumberPattern' => '141\\d', 'ExampleNumber' => '1410', 'PossibleLength' => array ( @@ -86,7 +86,7 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '1(?:100|410)|90[24679]', + 'NationalNumberPattern' => '1(?:10|41)\\d|90[24679]', 'ExampleNumber' => '902', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_SD.php b/src/data/ShortNumberMetadata_SD.php index 08ccee4f5..23030627c 100644 --- a/src/data/ShortNumberMetadata_SD.php +++ b/src/data/ShortNumberMetadata_SD.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '999', + 'ExampleNumber' => '999', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_SI.php b/src/data/ShortNumberMetadata_SI.php index 8eb448379..24f2ddaa1 100644 --- a/src/data/ShortNumberMetadata_SI.php +++ b/src/data/ShortNumberMetadata_SI.php @@ -26,11 +26,10 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '116(?:000|1(?:11|23))', - 'ExampleNumber' => '116000', + 'NationalNumberPattern' => '11(?:[23]|6\\d{3})', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => 6, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_SJ.php b/src/data/ShortNumberMetadata_SJ.php index a47d38c8f..ad76b6a94 100644 --- a/src/data/ShortNumberMetadata_SJ.php +++ b/src/data/ShortNumberMetadata_SJ.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[023]', + 'ExampleNumber' => '110', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '11[023]', - 'ExampleNumber' => '112', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '11[023]', - 'ExampleNumber' => '112', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_SL.php b/src/data/ShortNumberMetadata_SL.php index 13394d591..e9712f7a8 100644 --- a/src/data/ShortNumberMetadata_SL.php +++ b/src/data/ShortNumberMetadata_SL.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '(?:01|99)9', + 'ExampleNumber' => '019', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -47,7 +49,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '(?:01|99)9', - 'ExampleNumber' => '999', + 'ExampleNumber' => '019', 'PossibleLength' => array ( 0 => 3, @@ -59,7 +61,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '(?:01|99)9|60400', - 'ExampleNumber' => '999', + 'ExampleNumber' => '019', 'PossibleLength' => array ( ), @@ -79,7 +81,7 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '60400', + 'NationalNumberPattern' => '604\\d\\d', 'ExampleNumber' => '60400', 'PossibleLength' => array ( @@ -91,7 +93,7 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '60400', + 'NationalNumberPattern' => '604\\d\\d', 'ExampleNumber' => '60400', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_SO.php b/src/data/ShortNumberMetadata_SO.php index efcd148f6..821032470 100644 --- a/src/data/ShortNumberMetadata_SO.php +++ b/src/data/ShortNumberMetadata_SO.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '555|888|999', + 'ExampleNumber' => '555', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '555|777|888|999', - 'ExampleNumber' => '777', + 'ExampleNumber' => '555', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_SY.php b/src/data/ShortNumberMetadata_SY.php index 8558310cc..db38cc3ce 100644 --- a/src/data/ShortNumberMetadata_SY.php +++ b/src/data/ShortNumberMetadata_SY.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[023]', + 'ExampleNumber' => '110', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '11[023]', - 'ExampleNumber' => '112', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '11[023]', - 'ExampleNumber' => '112', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_TJ.php b/src/data/ShortNumberMetadata_TJ.php index a4c1ee850..eeb6164d5 100644 --- a/src/data/ShortNumberMetadata_TJ.php +++ b/src/data/ShortNumberMetadata_TJ.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:0[1-3]|12)', + 'ExampleNumber' => '101', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:0[1-3]|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '101', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:0[1-3]|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '101', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_TR.php b/src/data/ShortNumberMetadata_TR.php index 61f19e15a..4466991ca 100644 --- a/src/data/ShortNumberMetadata_TR.php +++ b/src/data/ShortNumberMetadata_TR.php @@ -27,8 +27,8 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '1(?:22|3[126]|4[04]|5[16-9]|6[18]|77|83)', - 'ExampleNumber' => '183', + 'NationalNumberPattern' => '1(?:1[02]|22|3[126]|4[04]|5[15-9]|6[18]|77|83)', + 'ExampleNumber' => '110', 'PossibleLength' => array ( 0 => 3, @@ -50,7 +50,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:1[02]|55)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '110', 'PossibleLength' => array ( 0 => 3, @@ -61,8 +61,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:1(?:[0239]|811)|2[126]|3(?:[126]|37?|[58]6|65)|4(?:[014]|71)|5(?:[135-9]|07|78)|6(?:[02]6|[1389]|99)|7[0-79]|8(?:\\d|63|95))|2(?:077|268|4(?:17|23)|5(?:7[26]|82)|6[14]4|8\\d{2}|9(?:30|89))|3(?:0(?:05|72)|353|4(?:06|30|64)|502|674|747|851|9(?:1[29]|60))|4(?:0(?:25|3[12]|[47]2)|3(?:3[13]|[89]1)|439|5(?:43|55)|717|832)|5(?:145|290|[4-6]\\d{2}|772|833|9(?:[06]1|92))|6(?:236|6(?:12|39|8[59])|769)|7890|8(?:688|7(?:28|65)|85[06])|9(?:159|290)', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '1(?:1(?:[0239]|811)|2[126]|3(?:[12]|37?|[58]6|65?)|4(?:[014]|71)|5(?:07|[135689]|78?)|6(?:[02]6|[138]|99?)|7[0-79]|8(?:[0-578]|63?|95?))|2(?:077|268|4(?:17|23)|5(?:7[26]|82)|6[14]4|8\\d\\d|9(?:30|89))|3(?:0(?:05|72)|353|4(?:06|30|64)|502|674|747|851|9(?:1[29]|60))|4(?:0(?:25|3[12]|[47]2)|3(?:3[13]|[89]1)|439|5(?:43|55)|717|832)|5(?:145|290|[4-6]\\d\\d|772|833|9(?:[06]1|92))|6(?:236|6(?:12|39|8[59])|769)|7890|8(?:688|7(?:28|65)|85[06])|9(?:159|290)', + 'ExampleNumber' => '110', 'PossibleLength' => array ( ), @@ -72,8 +72,8 @@ ), 'standardRate' => array ( - 'NationalNumberPattern' => '2850|5420', - 'ExampleNumber' => '5420', + 'NationalNumberPattern' => '(?:285|542)0', + 'ExampleNumber' => '2850', 'PossibleLength' => array ( 0 => 4, @@ -94,8 +94,8 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '1(?:3(?:37|[58]6|65)|4(?:4|71)|5(?:07|78)|6(?:[02]6|99)|8(?:3|63|95))|2(?:077|268|4(?:17|23)|5(?:7[26]|82)|6[14]4|8\\d{2}|9(?:30|89))|3(?:0(?:05|72)|353|4(?:06|30|64)|502|674|747|851|9(?:1[29]|60))|4(?:0(?:25|3[12]|[47]2)|3(?:3[13]|[89]1)|439|5(?:43|55)|717|832)|5(?:145|290|[4-6]\\d{2}|772|833|9(?:[06]1|92))|6(?:236|6(?:12|39|8[59])|769)|7890|8(?:688|7(?:28|65)|85[06])|9(?:159|290)', - 'ExampleNumber' => '5420', + 'NationalNumberPattern' => '1(?:3(?:37|[58]\\d|65)|4(?:4|7\\d)|5(?:0\\d|78)|6(?:[02]\\d|99)|8(?:3|63|95))|(?:2(?:07|26|4[12]|5[78]|6[14]|8\\d|9[38])|3(?:0[07]|[38]5|4[036]|50|67|74|9[16])|4(?:0[2-47]|3[389]|[48]3|5[45]|71)|5(?:14|29|[4-6]\\d|77|83|9[069])|6(?:23|6[138]|76)|789|8(?:68|7[26]|85)|9(?:15|29))\\d', + 'ExampleNumber' => '144', 'PossibleLength' => array ( 0 => 3, diff --git a/src/data/ShortNumberMetadata_TW.php b/src/data/ShortNumberMetadata_TW.php index 90a0cb48e..27c3800d6 100644 --- a/src/data/ShortNumberMetadata_TW.php +++ b/src/data/ShortNumberMetadata_TW.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '11[029]', + 'ExampleNumber' => '110', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_UA.php b/src/data/ShortNumberMetadata_UA.php index 8fa5604b6..cc77ae5f4 100644 --- a/src/data/ShortNumberMetadata_UA.php +++ b/src/data/ShortNumberMetadata_UA.php @@ -28,11 +28,12 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '116(?:000|1(?:11|23))', - 'ExampleNumber' => '116000', + 'NationalNumberPattern' => '1(?:0[1-3]|1(?:2|6\\d{3}))', + 'ExampleNumber' => '101', 'PossibleLength' => array ( - 0 => 6, + 0 => 3, + 1 => 6, ), 'PossibleLengthLocalOnly' => array ( @@ -51,7 +52,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:0[1-3]|12)', - 'ExampleNumber' => '112', + 'ExampleNumber' => '101', 'PossibleLength' => array ( 0 => 3, @@ -62,8 +63,8 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '1(?:0(?:[1-49]|6\\d{2})|1(?:2|6(?:000|1(?:11|23))|8\\d{1,2})|[278]\\d|4\\d{3}|5(?:1|\\d{2})|6\\d{2})|[89]00\\d{1,2}', - 'ExampleNumber' => '112', + 'NationalNumberPattern' => '1(?:0(?:[1-49]|6\\d\\d)|1(?:2|6(?:000|1(?:11|23))|8\\d\\d?)|(?:[278]|(?:4\\d|[56])\\d)\\d)|[89]00\\d\\d?|151', + 'ExampleNumber' => '101', 'PossibleLength' => array ( ), @@ -83,8 +84,8 @@ ), 'carrierSpecific' => array ( - 'NationalNumberPattern' => '(?:118|[89]00)\\d{1,2}', - 'ExampleNumber' => '11812', + 'NationalNumberPattern' => '(?:118|[89]00)\\d\\d?', + 'ExampleNumber' => '1180', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_UG.php b/src/data/ShortNumberMetadata_UG.php index cae3552df..ed9ee9f88 100644 --- a/src/data/ShortNumberMetadata_UG.php +++ b/src/data/ShortNumberMetadata_UG.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '999', + 'ExampleNumber' => '999', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/ShortNumberMetadata_UY.php b/src/data/ShortNumberMetadata_UY.php index 1e4f4392a..e92716767 100644 --- a/src/data/ShortNumberMetadata_UY.php +++ b/src/data/ShortNumberMetadata_UY.php @@ -26,9 +26,11 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '128|911', + 'ExampleNumber' => '128', 'PossibleLength' => array ( - 0 => -1, + 0 => 3, ), 'PossibleLengthLocalOnly' => array ( @@ -47,7 +49,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '128|911', - 'ExampleNumber' => '911', + 'ExampleNumber' => '128', 'PossibleLength' => array ( 0 => 3, @@ -69,8 +71,8 @@ ), 'standardRate' => array ( - 'NationalNumberPattern' => '1787', - 'ExampleNumber' => '1787', + 'NationalNumberPattern' => '178\\d', + 'ExampleNumber' => '1780', 'PossibleLength' => array ( 0 => 4, diff --git a/src/data/ShortNumberMetadata_VE.php b/src/data/ShortNumberMetadata_VE.php index ba4389b7a..ac675ec3f 100644 --- a/src/data/ShortNumberMetadata_VE.php +++ b/src/data/ShortNumberMetadata_VE.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '1(?:12|71)|911', + 'ExampleNumber' => '112', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( @@ -46,7 +47,7 @@ 'emergency' => array ( 'NationalNumberPattern' => '1(?:12|71)|911', - 'ExampleNumber' => '171', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), @@ -57,7 +58,7 @@ 'shortCode' => array ( 'NationalNumberPattern' => '1(?:12|71)|911', - 'ExampleNumber' => '171', + 'ExampleNumber' => '112', 'PossibleLength' => array ( ), diff --git a/src/data/ShortNumberMetadata_YE.php b/src/data/ShortNumberMetadata_YE.php index c425a2e14..88022b802 100644 --- a/src/data/ShortNumberMetadata_YE.php +++ b/src/data/ShortNumberMetadata_YE.php @@ -25,9 +25,10 @@ ), 'tollFree' => array ( + 'NationalNumberPattern' => '19[1459]', + 'ExampleNumber' => '191', 'PossibleLength' => array ( - 0 => -1, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/geocoding/PhoneNumberOfflineGeocoder.php b/src/geocoding/PhoneNumberOfflineGeocoder.php index 31e750e92..d1a4e460d 100644 --- a/src/geocoding/PhoneNumberOfflineGeocoder.php +++ b/src/geocoding/PhoneNumberOfflineGeocoder.php @@ -23,7 +23,7 @@ class PhoneNumberOfflineGeocoder /** * @var PrefixFileReader */ - protected $prefixFileReader = null; + protected $prefixFileReader; /** * PhoneNumberOfflineGeocoder constructor. @@ -78,8 +78,10 @@ public function getDescriptionForNumber(PhoneNumber $number, $locale, $userRegio $numberType = $this->phoneUtil->getNumberType($number); if ($numberType === PhoneNumberType::UNKNOWN) { - return ""; - } elseif (!$this->phoneUtil->isNumberGeographical($numberType, $number->getCountryCode())) { + return ''; + } + + if (!$this->phoneUtil->isNumberGeographical($numberType, $number->getCountryCode())) { return $this->getCountryNameForNumber($number, $locale); } @@ -100,21 +102,21 @@ protected function getCountryNameForNumber(PhoneNumber $number, $locale) if (count($regionCodes) === 1) { return $this->getRegionDisplayName($regionCodes[0], $locale); - } else { - $regionWhereNumberIsValid = 'ZZ'; - foreach ($regionCodes as $regionCode) { - if ($this->phoneUtil->isValidNumberForRegion($number, $regionCode)) { - // If the number has already been found valid for one region, then we don't know which - // region it belongs to so we return nothing. - if ($regionWhereNumberIsValid !== 'ZZ') { - return ""; - } - $regionWhereNumberIsValid = $regionCode; + } + + $regionWhereNumberIsValid = 'ZZ'; + foreach ($regionCodes as $regionCode) { + if ($this->phoneUtil->isValidNumberForRegion($number, $regionCode)) { + // If the number has already been found valid for one region, then we don't know which + // region it belongs to so we return nothing. + if ($regionWhereNumberIsValid !== 'ZZ') { + return ''; } + $regionWhereNumberIsValid = $regionCode; } - - return $this->getRegionDisplayName($regionWhereNumberIsValid, $locale); } + + return $this->getRegionDisplayName($regionWhereNumberIsValid, $locale); } /** @@ -127,7 +129,7 @@ protected function getCountryNameForNumber(PhoneNumber $number, $locale) protected function getRegionDisplayName($regionCode, $locale) { if ($regionCode === null || $regionCode == 'ZZ' || $regionCode === PhoneNumberUtil::REGION_CODE_FOR_NON_GEO_ENTITY) { - return ""; + return ''; } return Locale::getDisplayRegion( @@ -173,12 +175,12 @@ public function getDescriptionForValidNumber(PhoneNumber $number, $locale, $user $regionCode = $this->phoneUtil->getRegionCodeForNumber($number); if ($userRegion == null || $userRegion == $regionCode) { $languageStr = Locale::getPrimaryLanguage($locale); - $scriptStr = ""; + $scriptStr = ''; $regionStr = Locale::getRegion($locale); $mobileToken = PhoneNumberUtil::getCountryMobileToken($number->getCountryCode()); $nationalNumber = $this->phoneUtil->getNationalSignificantNumber($number); - if ($mobileToken !== "" && (!strncmp($nationalNumber, $mobileToken, strlen($mobileToken)))) { + if ($mobileToken !== '' && (!strncmp($nationalNumber, $mobileToken, strlen($mobileToken)))) { // In some countries, eg. Argentina, mobile numbers have a mobile token before the national // destination code, this should be removed before geocoding. $nationalNumber = substr($nationalNumber, strlen($mobileToken)); diff --git a/src/geocoding/data/de/352.php b/src/geocoding/data/de/352.php index 2e598d08f..3f8725d9d 100644 --- a/src/geocoding/data/de/352.php +++ b/src/geocoding/data/de/352.php @@ -11,16 +11,14 @@ */ return array ( - 35221 => 'Weicherdingen', 35222 => 'Luxemburg', 35223 => 'Bad Mondorf', - 35224 => 'Luxemburg', + 352240 => 'Luxemburg', + 352241 => 'Luxemburg', + 352242 => 'Luxemburg', 3522421 => 'Weicherdingen', - 3522422 => 'Luxemburg', 3522423 => 'Bad Mondorf', - 3522425 => 'Luxemburg', 3522427 => 'Belair, Luxemburg', - 3522428 => 'Luxemburg', 3522429 => 'Luxemburg/Kockelscheuer', 3522430 => 'Kanton Capellen/Kehlen', 3522431 => 'Bartringen', @@ -30,11 +28,15 @@ 3522435 => 'Sandweiler/Mutfort/Roodt-sur-Syre', 3522436 => 'Hesperingen/Kockelscheuer/Roeser', 3522437 => 'Leudelingen/Ehlingen/Monnerich', + 3522438 => 'Luxemburg', 3522439 => 'Windhof/Steinfort', 3522440 => 'Howald', + 3522441 => 'Luxemburg', 3522442 => 'Plateau de Kirchberg', 3522443 => 'Findel/Kirchberg', + 3522444 => 'Luxemburg', 3522445 => 'Diedrich', + 3522446 => 'Luxemburg', 3522447 => 'Lintgen', 3522448 => 'Contern/Foetz', 3522449 => 'Howald', @@ -48,22 +50,29 @@ 3522457 => 'Esch-sur-Alzette/Schifflingen', 3522458 => 'Soleuvre/Differdingen', 3522459 => 'Soleuvre', + 352246 => 'Luxemburg', 3522467 => 'Düdelingen', + 3522470 => 'Luxemburg', 3522471 => 'Betzdorf', 3522472 => 'Echternach', 3522473 => 'Rosport', 3522474 => 'Wasserbillig', 3522475 => 'Distrikt Grevenmacher-sur-Moselle', 3522476 => 'Wormeldingen', + 3522477 => 'Luxemburg', 3522478 => 'Junglinster', 3522479 => 'Berdorf/Consdorf', 3522480 => 'Diekirch', 3522481 => 'Ettelbrück/Reckange-sur-Mess', + 3522482 => 'Luxemburg', 3522483 => 'Vianden', 3522484 => 'Han/Lesse', 3522485 => 'Bissen/Roost', + 3522486 => 'Luxemburg', 3522487 => 'Fels', 3522488 => 'Mertzig/Wahl', + 3522489 => 'Luxemburg', + 352249 => 'Luxemburg', 3522492 => 'Kanton Clerf/Fischbach/Hosingen', 3522495 => 'Wiltz', 3522497 => 'Huldingen', @@ -186,11 +195,13 @@ 35236 => 'Hesperingen/Kockelscheuer/Roeser', 35237 => 'Leudelingen/Ehlingen/Monnerich', 35239 => 'Windhof/Steinfort', - 3524 => 'Luxemburg', 35240 => 'Howald', + 35241 => 'Luxemburg', 35242 => 'Plateau de Kirchberg', 35243 => 'Findel/Kirchberg', + 35244 => 'Luxemburg', 35245 => 'Diedrich', + 35246 => 'Luxemburg', 35247 => 'Lintgen', 35248 => 'Contern/Foetz', 35249 => 'Howald', diff --git a/src/geocoding/data/en/218.php b/src/geocoding/data/en/218.php index 0efb59c4f..54c78fa06 100644 --- a/src/geocoding/data/en/218.php +++ b/src/geocoding/data/en/218.php @@ -29,5 +29,5 @@ 218629 => 'Elmagrun', 21863 => 'Benina', 21867 => 'Elmareg', - 21871 => 'Sebha', + 2187 => 'Sebha', ); diff --git a/src/geocoding/data/en/223.php b/src/geocoding/data/en/223.php index a1bb34ca2..e7aa0c8a9 100644 --- a/src/geocoding/data/en/223.php +++ b/src/geocoding/data/en/223.php @@ -21,8 +21,7 @@ 2232076 => 'Bamako', 2232077 => 'Bamako', 2232078 => 'Bamako', - 2232126 => 'Koulikoro', - 2232127 => 'Koulikoro', + 223212 => 'Koulikoro', 223214 => 'Mopti', 223215 => 'Kayes', 223216 => 'Sikasso', diff --git a/src/geocoding/data/en/227.php b/src/geocoding/data/en/227.php index 1757101b0..d00caa532 100644 --- a/src/geocoding/data/en/227.php +++ b/src/geocoding/data/en/227.php @@ -11,14 +11,8 @@ */ return array ( - 2272020 => 'Niamey', - 2272031 => 'Niamey', - 2272032 => 'Niamey', - 2272033 => 'Niamey', - 2272034 => 'Niamey', - 2272035 => 'Niamey', - 2272036 => 'Niamey', - 2272037 => 'Niamey', + 227202 => 'Niamey', + 227203 => 'Niamey', 2272041 => 'Maradi', 2272044 => 'Agadez', 2272045 => 'Arlit', diff --git a/src/geocoding/data/en/230.php b/src/geocoding/data/en/230.php index 3af8dbc75..3da3f26e4 100644 --- a/src/geocoding/data/en/230.php +++ b/src/geocoding/data/en/230.php @@ -14,7 +14,6 @@ 2302 => 'North Region', 2304 => 'Central Region', 2306 => 'South Region', - 230814 => 'Agalega', + 23081 => 'Agalega', 23083 => 'Rodrigues', - 23087 => 'Rodrigues', ); diff --git a/src/geocoding/data/en/233.php b/src/geocoding/data/en/233.php index f0c7c2e5a..6dd46f449 100644 --- a/src/geocoding/data/en/233.php +++ b/src/geocoding/data/en/233.php @@ -68,7 +68,6 @@ 2333624 => 'Kete-Krachi', 2333625 => 'Denu/Aflao', 2333626 => 'Keta/Akatsi', - 2333627 => 'Hohoe', 233367 => 'Volta Region', 233368 => 'Volta Region', 2333720 => 'Tamale', @@ -85,7 +84,7 @@ 2333822 => 'Bawku', 233387 => 'Upper East Region', 233388 => 'Upper East Region', - 2333920 => 'Wa', + 233392 => 'Wa', 233397 => 'Upper West Region', 233398 => 'Upper West Region', ); diff --git a/src/geocoding/data/en/240.php b/src/geocoding/data/en/240.php index 2ab298121..b52c0a17f 100644 --- a/src/geocoding/data/en/240.php +++ b/src/geocoding/data/en/240.php @@ -71,53 +71,33 @@ 24033286 => 'Continental Region', 24033294 => 'Bioko', 24033296 => 'Continental Region', - 24033304 => 'Bioko', - 24033306 => 'Continental Region', 24033307 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033308 => 'Litoral/Annobón', 24033309 => 'Bioko', - 24033314 => 'Bioko', - 24033316 => 'Continental Region', 24033317 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033318 => 'Litoral/Annobón', 24033319 => 'Bioko', - 24033324 => 'Bioko', - 24033326 => 'Continental Region', 24033327 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033328 => 'Litoral/Annobón', 24033329 => 'Bioko', - 24033334 => 'Bioko', - 24033336 => 'Continental Region', 24033337 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033338 => 'Litoral/Annobón', 24033339 => 'Bioko', - 24033344 => 'Bioko', - 24033346 => 'Continental Region', 24033347 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033348 => 'Litoral/Annobón', 24033349 => 'Bioko', - 24033354 => 'Bioko', - 24033356 => 'Continental Region', 24033357 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033358 => 'Litoral/Annobón', 24033359 => 'Bioko', - 24033364 => 'Bioko', - 24033366 => 'Continental Region', 24033367 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033368 => 'Litoral/Annobón', 24033369 => 'Bioko', - 24033374 => 'Bioko', - 24033376 => 'Continental Region', 24033377 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033378 => 'Litoral/Annobón', 24033379 => 'Bioko', - 24033384 => 'Bioko', - 24033386 => 'Continental Region', 24033387 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033388 => 'Litoral/Annobón', 24033389 => 'Bioko', - 24033394 => 'Bioko', - 24033396 => 'Continental Region', 24033397 => 'Centro-Sur/Kié-Ntem/Wele-Nzás', 24033398 => 'Litoral/Annobón', 24033399 => 'Bioko', diff --git a/src/geocoding/data/en/249.php b/src/geocoding/data/en/249.php index ef13c93c4..b7d76a8dc 100644 --- a/src/geocoding/data/en/249.php +++ b/src/geocoding/data/en/249.php @@ -11,15 +11,5 @@ */ return array ( - 24911 => 'Omdurman', - 24921 => 'Atbara', 249183 => 'Khartoum', - 24931 => 'Port Sudan', - 24941 => 'Kassala', - 249441 => 'Jedaraf', - 24951 => 'Wadmedai', - 24961 => 'Sennar', - 249616 => 'Shetnzi', - 24971 => 'Kosti', - 24981 => 'Al-Ubayyid', ); diff --git a/src/geocoding/data/en/251.php b/src/geocoding/data/en/251.php index ff6b1822d..963f0273f 100644 --- a/src/geocoding/data/en/251.php +++ b/src/geocoding/data/en/251.php @@ -31,7 +31,7 @@ 251111860 => 'Sululta, Addis Ababa', 25111187 => 'Goha Tsion, Addis Ababa', 25111188 => 'Chancho, Addis Ababa', - 25111213 => 'Addis Ketema I, Addis Ababa', + 2511121 => 'Addis Ketema I, Addis Ababa', 25111236 => 'Hagere Hiwot, Addis Ababa', 25111237 => 'Holeta Gent, Addis Ababa', 25111238 => 'Jeldu, Addis Ababa', @@ -80,13 +80,13 @@ 25111515 => 'Filwoha II, Addis Ababa', 25111517 => 'Sheraton/DID, Addis Ababa', 25111518 => 'Addis Ababa Region', - 25111544 => 'ECA, Addis Ababa', + 2511154 => 'ECA, Addis Ababa', 25111550 => 'Filwoha IV, Addis Ababa', 25111551 => 'Filwoha III, Addis Ababa', 25111552 => 'Filwha VI, Addis Ababa', 25111553 => 'Filwha V, Addis Ababa', 25111554 => 'Filwha VII, Addis Ababa', - 25111618 => 'Bole I, Addis Ababa', + 2511161 => 'Bole I, Addis Ababa', 25111626 => 'Bole Michael, Addis Ababa', 25111629 => 'Gerji, Addis Ababa', 25111645 => 'Yeka I, Addis Ababa', @@ -146,6 +146,37 @@ 25122665 => 'Robe, South-East Region', 25122666 => 'Dodolla, South-East Region', 25122668 => 'Dolomena, South-East Region', + 25125111 => 'Dire Dawa I, East Region', + 25125112 => 'Dire Dawa II, East Region', + 25125114 => 'Shinile, East Region', + 25125115 => 'Artshek, East Region', + 25125116 => 'Melka Jeldu, East Region', + 25125332 => 'Bedeno, East Region', + 25125333 => 'Deder, East Region', + 25125334 => 'Grawa, East Region', + 25125335 => 'Chelenko, East Region', + 25125336 => 'Kersa, East Region', + 25125337 => 'Kobo, East Region', + 25125338 => 'Kombolocha, East Region', + 25125441 => 'Hirna, East Region', + 25125444 => 'Miesso, East Region', + 25125446 => 'Erer, East Region', + 25125447 => 'Hurso, East Region', + 25125551 => 'Asebe Teferi, East Region', + 25125554 => 'Assebot, East Region', + 25125661 => 'Alemaya, East Region', + 25125662 => 'Aweday, East Region', + 25125666 => 'Harar I, East Region', + 25125667 => 'Harar II, East Region', + 25125669 => 'Kebribeyah, East Region', + 25125771 => 'Degahabur, East Region', + 25125772 => 'Gursum, East Region', + 25125774 => 'Kabri Dehar, East Region', + 25125775 => 'Jigiga, East Region', + 25125776 => 'Godie, East Region', + 25125777 => 'Teferi Ber, East Region', + 25125779 => 'Chinagson, East Region', + 251258 => 'Kelafo, East Region', 25133110 => 'Kabe, North-East Region', 25133111 => 'Dessie I, North-East Region', 25133112 => 'Dessie II, North-East Region', @@ -207,47 +238,6 @@ 25134773 => 'Edaga-Hamus, North Region', 25134774 => 'Alemata, North Region', 25134775 => 'Axum, North Region', - 25125111 => 'Dire Dawa I, East Region', - 25125112 => 'Dire Dawa II, East Region', - 25125114 => 'Shinile, East Region', - 25125115 => 'Artshek, East Region', - 25125116 => 'Melka Jeldu, East Region', - 25125332 => 'Bedeno, East Region', - 25125333 => 'Deder, East Region', - 25125334 => 'Grawa, East Region', - 25125335 => 'Chelenko, East Region', - 25125336 => 'Kersa, East Region', - 25125337 => 'Kobo, East Region', - 25125338 => 'Kombolocha, East Region', - 25125441 => 'Hirna, East Region', - 25125444 => 'Miesso, East Region', - 25125446 => 'Erer, East Region', - 25125447 => 'Hurso, East Region', - 25125551 => 'Asebe Teferi, East Region', - 25125554 => 'Assebot, East Region', - 25125661 => 'Alemaya, East Region', - 25125662 => 'Aweday, East Region', - 25125665 => 'Babile, East Region', - 25125666 => 'Harar I, East Region', - 25125667 => 'Harar II, East Region', - 25125669 => 'Kebribeyah, East Region', - 25125771 => 'Degahabur, East Region', - 25125772 => 'Gursum, East Region', - 25125774 => 'Kabri Dehar, East Region', - 25125775 => 'Jigiga, East Region', - 25125776 => 'Godie, East Region', - 25125777 => 'Teferi Ber, East Region', - 25125779 => 'Chinagson, East Region', - 25125880 => 'Kelafo, East Region', - 25146110 => 'Shashamane I, South Region', - 25146111 => 'Shashamane II, South Region', - 25146112 => 'Kofele, South Region', - 25146114 => 'Wondo Kela, South Region', - 25146115 => 'Butajira, South Region', - 25146116 => 'Arsi Negele, South Region', - 25146117 => 'Adame Tulu, South Region', - 25146118 => 'Kuyera, South Region', - 25146119 => 'Shasemene, South Region', 25146220 => 'Awassa I, South Region', 25146221 => 'Awassa II, South Region', 25146222 => 'Wonda Basha, South Region', @@ -272,10 +262,7 @@ 25146556 => 'Alaba Kulito, South Region', 25146558 => 'Enseno, South Region', 25146559 => 'Boditi, South Region', - 25146660 => 'Kebado, South Region', - 25146771 => 'Werabe, South Region', - 25146774 => 'Gidole, South Region', - 25146777 => 'Sawla, South Region', + 251466 => 'Kebado, South Region', 25146881 => 'Arba Minch, South Region', 25146882 => 'Kibet, South Region', 25146883 => 'Buii, South Region', @@ -315,7 +302,7 @@ 25147556 => 'Tepi, South-West Region', 25147558 => 'Macha, South-West Region', 25147559 => 'Abebo, South-West Region', - 25157227 => 'Ghedo, West Region', + 251572 => 'Ghedo, West Region', 25157550 => 'Ejaji, West Region', 25157555 => 'Dembidolo, West Region', 25157661 => 'Nekemte, West Region', @@ -357,7 +344,7 @@ 25158446 => 'Worota, North-West Region', 25158447 => 'Mekane-Eyesus, North-West Region', 25158448 => 'Teda, North-West Region', - 25158550 => 'Pawe, North-West Region', + 251585 => 'Pawe, North-West Region', 25158661 => 'Motta, North-West Region', 25158662 => 'Keraniyo, North-West Region', 25158663 => 'Debre-work, North-West Region', diff --git a/src/geocoding/data/en/252.php b/src/geocoding/data/en/252.php index 8b4dd4f02..494df3866 100644 --- a/src/geocoding/data/en/252.php +++ b/src/geocoding/data/en/252.php @@ -14,6 +14,5 @@ 2521 => 'Mogadishu', 2523 => 'Hargeisa', 2524 => 'Garowe', - 25251 => 'Mangauno', 25261 => 'Mogadishu', ); diff --git a/src/geocoding/data/en/254.php b/src/geocoding/data/en/254.php index 194ce83dd..e9c38e690 100644 --- a/src/geocoding/data/en/254.php +++ b/src/geocoding/data/en/254.php @@ -11,7 +11,7 @@ */ return array ( - 25420 => 'Nairobi', + 2542 => 'Nairobi', 25440 => 'Kwale/Ukunda/Msambweni/Lungalunga', 25441 => 'Mombasa/Mariakani/Kilifi', 25442 => 'Malindi/Lamu/Garsen', diff --git a/src/geocoding/data/en/352.php b/src/geocoding/data/en/352.php index 64af9f8af..70120ed21 100644 --- a/src/geocoding/data/en/352.php +++ b/src/geocoding/data/en/352.php @@ -11,14 +11,17 @@ */ return array ( - 35221 => 'Weicherdange', 35222 => 'Luxembourg City', 35223 => 'Mondorf-les-Bains/Bascharage/Noerdange/Remich', - 35224 => 'Luxembourg', + 352240 => 'Luxembourg', + 352241 => 'Luxembourg', + 3522420 => 'Luxembourg', 3522421 => 'Weicherdange', 3522422 => 'Luxembourg City', 3522423 => 'Mondorf-les-Bains/Bascharage/Noerdange/Remich', + 3522424 => 'Luxembourg', 3522425 => 'Luxembourg', + 3522426 => 'Luxembourg', 3522427 => 'Belair, Luxembourg', 3522428 => 'Luxembourg City', 3522429 => 'Luxembourg/Kockelscheuer', @@ -30,11 +33,15 @@ 3522435 => 'Sandweiler/Moutfort/Roodt-sur-Syre', 3522436 => 'Hesperange/Kockelscheuer/Roeser', 3522437 => 'Leudelange/Ehlange/Mondercange', + 3522438 => 'Luxembourg', 3522439 => 'Windhof/Steinfort', 3522440 => 'Howald', + 3522441 => 'Luxembourg', 3522442 => 'Plateau de Kirchberg', 3522443 => 'Findel/Kirchberg', + 3522444 => 'Luxembourg', 3522445 => 'Diedrich', + 3522446 => 'Luxembourg', 3522447 => 'Lintgen', 3522448 => 'Contern/Foetz', 3522449 => 'Howald', @@ -48,22 +55,29 @@ 3522457 => 'Esch-sur-Alzette/Schifflange', 3522458 => 'Soleuvre/Differdange', 3522459 => 'Soleuvre', + 352246 => 'Luxembourg', 3522467 => 'Dudelange', + 3522470 => 'Luxembourg', 3522471 => 'Betzdorf', 3522472 => 'Echternach', 3522473 => 'Rosport', 3522474 => 'Wasserbillig', 3522475 => 'Grevenmacher-sur-Moselle', 3522476 => 'Wormeldange', + 3522477 => 'Luxembourg', 3522478 => 'Junglinster', 3522479 => 'Berdorf/Consdorf', 3522480 => 'Diekirch', 3522481 => 'Ettelbruck/Reckange-sur-Mess', + 3522482 => 'Luxembourg', 3522483 => 'Vianden', 3522484 => 'Han/Lesse', 3522485 => 'Bissen/Roost', + 3522486 => 'Luxembourg', 3522487 => 'Larochette', 3522488 => 'Mertzig/Wahl', + 3522489 => 'Luxembourg', + 352249 => 'Luxembourg', 3522492 => 'Clervaux/Fischbach/Hosingen', 3522495 => 'Wiltz', 3522497 => 'Huldange', @@ -186,11 +200,13 @@ 35236 => 'Hesperange/Kockelscheuer/Roeser', 35237 => 'Leudelange/Ehlange/Mondercange', 35239 => 'Windhof/Steinfort', - 3524 => 'Luxembourg City', 35240 => 'Howald', + 35241 => 'Luxembourg City', 35242 => 'Plateau de Kirchberg', 35243 => 'Findel/Kirchberg', + 35244 => 'Luxembourg City', 35245 => 'Diedrich', + 35246 => 'Luxembourg City', 35247 => 'Lintgen', 35248 => 'Contern/Foetz', 35249 => 'Howald', diff --git a/src/geocoding/data/en/380.php b/src/geocoding/data/en/380.php index d17531cf0..ed62b3a30 100644 --- a/src/geocoding/data/en/380.php +++ b/src/geocoding/data/en/380.php @@ -26,34 +26,52 @@ 3803144 => 'Irshava, Zakarpattia', 3803145 => 'Perechyn, Zakarpattia', 3803146 => 'Mizhhirya, Zakarpattia', - 38032 => 'Lviv', + 380320 => 'Lviv', + 380321 => 'Lviv', 380322 => 'Bryukhovichi/Lviv, Lviv', 3803230 => 'Pustomyty, Lviv', 3803231 => 'Gorodok, Lviv', + 3803232 => 'Lviv', + 3803233 => 'Lviv', 3803234 => 'Mostyska, Lviv', + 3803235 => 'Lviv', 3803236 => 'Sambir, Lviv', + 3803237 => 'Lviv', 3803238 => 'Old Sambir, Lviv', 3803239 => 'Zhidachiv, Lviv', + 3803240 => 'Lviv', 3803241 => 'Nikolaev, Lviv', + 3803242 => 'Lviv', + 3803243 => 'Lviv', 3803244 => 'Drogobych, Lviv', 3803245 => 'Stryi, Lviv', + 3803246 => 'Lviv', 3803247 => 'Truskavets, Lviv', 3803248 => 'Boryslav/Skhidnytsya, Lviv', 3803249 => 'Chervonograd, Lviv', + 3803250 => 'Lviv', 3803251 => 'Skole/Slavske, Lviv', 3803252 => 'Zhovkva, Lviv', + 3803253 => 'Lviv', 3803254 => 'Kamyanka-Buzka, Lviv', 3803255 => 'Radehiv, Lviv', 3803256 => 'Novoyavorivsk, Lviv', 3803257 => 'Sokal, Lviv', + 3803258 => 'Lviv', 3803259 => 'Yavoriv, Lviv', 3803260 => 'Morshin, Lviv', 3803261 => 'Novy Rozdol, Lviv', + 3803262 => 'Lviv', 3803263 => 'Peremyshlyany, Lviv', 3803264 => 'Busk, Lviv', 3803265 => 'Zolochiv, Lviv', 3803266 => 'Brody, Lviv', + 3803267 => 'Lviv', + 3803268 => 'Lviv', 3803269 => 'Turka, Lviv', + 380327 => 'Lviv', + 380328 => 'Lviv', + 380329 => 'Lviv', 38033 => 'Volyn', 380332 => 'Lutsk, Volyn', 3803342 => 'Volodymyr-Volynsky, Volyn', @@ -367,13 +385,16 @@ 3805357 => 'Orzhitsa, Poltava', 3805358 => 'Pyriatyn, Poltava', 3805359 => 'Hrebinka, Poltava', - 380536 => 'Kremenchug, Poltava', + 3805360 => 'Kremenchug, Poltava', 3805361 => 'Lubny, Poltava', 3805362 => 'Khorol, Poltava', 3805363 => 'Reshetilivka, Poltava', 3805364 => 'Mashivka, Poltava', 3805365 => 'Globin, Poltava', 3805366 => 'Kremenchug, Poltava', + 3805367 => 'Kremenchug, Poltava', + 3805368 => 'Kremenchug, Poltava', + 3805369 => 'Kremenchug, Poltava', 38054 => 'Sumy', 3805442 => 'Putivl, Sumy', 3805443 => 'Belopoly, Sumy', @@ -412,8 +433,9 @@ 3805547 => 'Belozerka, Kherson', 3805548 => 'Novotroitsk, Kherson', 3805549 => 'New Kakhovka, Kherson', - 38056 => 'Dnipropetrovsk/Dnipro', - 380563 => 'Pavlograd, Dnipro', + 380560 => 'Dnipropetrovsk/Dnipro', + 380561 => 'Dnipropetrovsk/Dnipro', + 380562 => 'Dnipropetrovsk/Dnipro', 3805630 => 'Mezhova, Dnipro', 3805631 => 'Petropavlovka, Dnipro', 3805632 => 'Pavlograd, Dnipro', @@ -421,23 +443,32 @@ 3805634 => 'Petrykivka, Dnipro', 3805635 => 'Yurievka, Dnipro', 3805636 => 'Ternivka, Dnipro', + 3805637 => 'Pavlograd, Dnipro', 3805638 => 'Pokrovskoe, Dnipro', 3805639 => 'Vasylkivka, Dnipro', 380564 => 'Krivoy Rog, Dnipro', 3805650 => 'Sofiyivka, Dnipro', + 3805651 => 'Dnipropetrovsk/Dnipro', 3805652 => 'Yellow Waters, Dnipro', 3805653 => 'Volnogirsk, Dnipro', 3805654 => 'Krynychky, Dnipro', + 3805655 => 'Dnipropetrovsk/Dnipro', 3805656 => 'Apostolove, Dnipro', 3805657 => 'Broad, Dnipro', 3805658 => 'Verhnedneprovsk, Dnipro', - 380566 => 'Nikopol, Dnipro', + 3805659 => 'Dnipropetrovsk/Dnipro', + 3805660 => 'Nikopol, Dnipro', + 3805661 => 'Nikopol, Dnipro', 3805662 => 'Nikopol, Dnipro', 3805663 => 'Sinelnikovo, Dnipro', + 3805664 => 'Nikopol, Dnipro', 3805665 => 'Manganese, Dnipro', + 3805666 => 'Nikopol, Dnipro', 3805667 => 'Ordzhonikidze, Dnipro', 3805668 => 'Tomakivka, Dnipro', 3805669 => 'Salt, Dnipro', + 380567 => 'Dnipropetrovsk/Dnipro', + 380568 => 'Dnipropetrovsk/Dnipro', 380569 => 'Dneprodzerzhinsk/Novomoskovsk, Dnipro', 3805690 => 'Tsarichanka, Dnipro', 3805691 => 'Magdalenivka, Dnipro', @@ -493,75 +524,108 @@ 3806175 => 'Vasilivka/Dneprorudne, Zaporizhzhia', 3806178 => 'Tokmak, Zaporizhzhia', 380619 => 'Melitopol, Zaporizhzhia', - 3806192 => 'Melitopol, Zaporizhzhia', - 38062 => 'Donetsk', + 380620 => 'Donetsk', + 380621 => 'Donetsk', + 380622 => 'Donetsk', 380623 => 'Krasnoarmeysk/Makeyevka, Donetsk', 3806232 => 'Makeevka, Donetsk', 3806236 => 'Yasinovata, Donetsk', 3806237 => 'Selidus, Donetsk', 3806239 => 'Krasnoarmeysk, Donetsk', - 380624 => 'Gorlovka, Donetsk', + 3806240 => 'Gorlovka, Donetsk', + 3806241 => 'Gorlovka, Donetsk', 3806242 => 'Gorlovka, Donetsk', 3806243 => 'Great Novosilka, Donetsk', 3806244 => 'Volnovaha, Donetsk', + 3806245 => 'Gorlovka, Donetsk', 3806246 => 'Volodarske, Donetsk', 3806247 => 'Dzerzhinsk, Donetsk', + 3806248 => 'Gorlovka, Donetsk', 3806249 => 'Debaltsevo, Donetsk', 3806250 => 'Kirovske, Donetsk', + 3806251 => 'Donetsk', 3806252 => 'Yenakievo, Donetsk', 3806253 => 'Starobesheve, Donetsk', 3806254 => 'Torez, Donetsk', 3806255 => 'Shakhtarsk, Donetsk', 3806256 => 'Snizhne, Donetsk', 3806257 => 'Ilovajsk/Khartsyzsk, Donetsk', + 3806258 => 'Donetsk', 3806259 => 'Amvrosievka, Donetsk', - 380626 => 'Kramatorsk/Slavyansk, Donetsk', + 3806260 => 'Kramatorsk/Slavyansk, Donetsk', 3806261 => 'Krasny Liman, Donetsk', 3806262 => 'Svyatogorsk/Slavyansk, Donetsk', + 3806263 => 'Kramatorsk/Slavyansk, Donetsk', 3806264 => 'Kramatorsk, Donetsk', + 3806265 => 'Kramatorsk/Slavyansk, Donetsk', + 3806266 => 'Kramatorsk/Slavyansk, Donetsk', 3806267 => 'Druzhkovka, Donetsk', + 3806268 => 'Kramatorsk/Slavyansk, Donetsk', 3806269 => 'Aleksandrovka, Donetsk', - 380627 => 'Artemivsk, Donetsk', + 3806270 => 'Artemivsk, Donetsk', + 3806271 => 'Artemivsk, Donetsk', 3806272 => 'Kostiantynivka, Donetsk', 3806273 => 'Vugledar, Donetsk', 3806274 => 'Artemivsk/Siversk, Donetsk', 3806275 => 'Dokuchaevsk, Donetsk', + 3806276 => 'Artemivsk, Donetsk', 3806277 => 'Dobropolia, Donetsk', 3806278 => 'Marinka, Donetsk', 3806279 => 'Telmanov, Donetsk', + 380628 => 'Donetsk', 380629 => 'Mariupol, Donetsk', 3806296 => 'Novoazovsk, Donetsk', 3806297 => 'Mangosh/Yalta, Donetsk', - 38064 => 'Luhansk', + 380640 => 'Luhansk', + 380641 => 'Luhansk', 380642 => 'Luhansk/Oleksandrivsk, Luhansk', + 3806430 => 'Luhansk', 3806431 => 'Anthracite, Luhansk', 3806432 => 'Krasnyi Luch, Luhansk', 3806433 => 'Rovenky, Luhansk', 3806434 => 'Sverdlovsk, Luhansk', 3806435 => 'Krasnodon, Luhansk', 3806436 => 'Lutugin, Luhansk', + 3806437 => 'Luhansk', + 3806438 => 'Luhansk', + 3806439 => 'Luhansk', + 3806440 => 'Luhansk', 3806441 => 'Perevalsk, Luhansk', 3806442 => 'Alchevsk, Luhansk', 3806443 => 'Bryanka, Luhansk', 3806444 => 'Stakhanov, Luhansk', 3806445 => 'Novoyadar, Luhansk', 3806446 => 'Kirovsk, Luhansk', + 3806447 => 'Luhansk', + 3806448 => 'Luhansk', + 3806449 => 'Luhansk', + 3806450 => 'Luhansk', 3806451 => 'Lisichansk, Luhansk', 3806452 => 'Severodonetsk, Luhansk', 3806453 => 'Rubizhne, Luhansk', 3806454 => 'Kremenna, Luhansk', 3806455 => 'Pervomaisk, Luhansk', 3806456 => 'Trinity Church, Luhansk', + 3806457 => 'Luhansk', + 3806458 => 'Luhansk', + 3806459 => 'Luhansk', + 3806460 => 'Luhansk', 3806461 => 'Starobilsk, Luhansk', 3806462 => 'Belokurakine, Luhansk', 3806463 => 'Novopskov, Luhansk', 3806464 => 'Markovka, Luhansk', 3806465 => 'Milow, Luhansk', 3806466 => 'Belovodsk, Luhansk', + 3806467 => 'Luhansk', + 3806468 => 'Luhansk', + 3806469 => 'Luhansk', + 380647 => 'Luhansk', 3806471 => 'Swatov, Luhansk', 3806472 => 'Stanitsa Luhansk, Luhansk', 3806473 => 'Slavyanoserbsk, Luhansk', 3806474 => 'Popasna, Luhansk', + 380648 => 'Luhansk', + 380649 => 'Luhansk', 38065 => 'Crimea', 38069 => 'Sevastopol city', ); diff --git a/src/geocoding/data/en/382.php b/src/geocoding/data/en/382.php index 748037bf5..b3a9ee576 100644 --- a/src/geocoding/data/en/382.php +++ b/src/geocoding/data/en/382.php @@ -11,7 +11,7 @@ */ return array ( - 38220 => 'Danilovgad/Kolasin/Podgorica', + 3822 => 'Danilovgad/Kolasin/Podgorica', 38230 => 'Bar/Ulcinj', 38231 => 'Herceg Novi', 38232 => 'Kotor/Tivat', diff --git a/src/geocoding/data/en/44.php b/src/geocoding/data/en/44.php index a2d07eaa0..a804c9bf2 100644 --- a/src/geocoding/data/en/44.php +++ b/src/geocoding/data/en/44.php @@ -177,26 +177,13 @@ 441383 => 'Dunfermline', 441384 => 'Dudley', 441386 => 'Evesham', - 4413870 => 'Dumfries', - 4413871 => 'Dumfries', - 4413872 => 'Dumfries', + 441387 => 'Dumfries', 4413873 => 'Langholm', - 4413874 => 'Dumfries', - 4413875 => 'Dumfries', - 4413876 => 'Dumfries', - 4413877 => 'Dumfries', - 4413878 => 'Dumfries', - 4413879 => 'Dumfries', + 441388 => 'Bishop Auckland', 4413880 => 'Bishop Auckland/Stanhope (Eastgate)', 4413881 => 'Bishop Auckland/Stanhope (Eastgate)', 4413882 => 'Stanhope (Eastgate)', - 4413883 => 'Bishop Auckland', - 4413884 => 'Bishop Auckland', 4413885 => 'Stanhope (Eastgate)', - 4413886 => 'Bishop Auckland', - 4413887 => 'Bishop Auckland', - 4413888 => 'Bishop Auckland', - 4413889 => 'Bishop Auckland', 441389 => 'Dumbarton', 441392 => 'Exeter', 441394 => 'Felixstowe', @@ -300,25 +287,13 @@ 441476 => 'Grantham', 441477 => 'Holmes Chapel', 441478 => 'Isle of Skye - Portree', - 4414790 => 'Grantown-on-Spey', - 4414791 => 'Grantown-on-Spey', - 4414792 => 'Grantown-on-Spey', - 4414793 => 'Grantown-on-Spey', - 4414794 => 'Grantown-on-Spey', - 4414795 => 'Grantown-on-Spey', - 4414796 => 'Grantown-on-Spey', - 4414797 => 'Grantown-on-Spey', - 44147980 => 'Grantown-on-Spey', + 441479 => 'Grantown-on-Spey', 44147981 => 'Aviemore', 44147982 => 'Nethy Bridge', 44147983 => 'Boat of Garten', 44147984 => 'Carrbridge', 44147985 => 'Dulnain Bridge', 44147986 => 'Cairngorm', - 44147987 => 'Grantown-on-Spey', - 44147988 => 'Grantown-on-Spey', - 44147989 => 'Grantown-on-Spey', - 4414799 => 'Grantown-on-Spey', 441480 => 'Huntingdon', 441481 => 'Guernsey', 441482 => 'Kingston-upon-Hull', @@ -357,16 +332,8 @@ 44151 => 'Liverpool', 441520 => 'Lochcarron', 441522 => 'Lincoln', - 4415240 => 'Lancaster', - 4415241 => 'Lancaster', + 441524 => 'Lancaster', 4415242 => 'Hornby', - 4415243 => 'Lancaster', - 4415244 => 'Lancaster', - 4415245 => 'Lancaster', - 4415246 => 'Lancaster', - 4415247 => 'Lancaster', - 4415248 => 'Lancaster', - 4415249 => 'Lancaster', 441525 => 'Leighton Buzzard', 441526 => 'Martin', 441527 => 'Redditch', @@ -378,16 +345,10 @@ 441535 => 'Keighley', 441536 => 'Kettering', 441538 => 'Ipstones', - 4415390 => 'Kendal', - 4415391 => 'Kendal', - 4415392 => 'Kendal', - 4415393 => 'Kendal', + 441539 => 'Kendal', 4415394 => 'Hawkshead', 4415395 => 'Grange-over-Sands', 4415396 => 'Sedbergh', - 4415397 => 'Kendal', - 4415398 => 'Kendal', - 4415399 => 'Kendal', 441540 => 'Kingussie', 441542 => 'Keith', 441543 => 'Cannock', @@ -519,16 +480,9 @@ 441692 => 'North Walsham', 441694 => 'Church Stretton', 441695 => 'Skelmersdale', - 4416970 => 'Brampton', - 4416971 => 'Brampton', - 4416972 => 'Brampton', + 441697 => 'Brampton', 4416973 => 'Wigton', 4416974 => 'Raughton Head', - 4416975 => 'Brampton', - 4416976 => 'Brampton', - 4416977 => 'Brampton', - 4416978 => 'Brampton', - 4416979 => 'Brampton', 441698 => 'Motherwell', 441700 => 'Rothesay', 441702 => 'Southend-on-Sea', @@ -577,16 +531,10 @@ 441765 => 'Ripon', 441766 => 'Porthmadog', 441767 => 'Sandy', - 4417680 => 'Penrith', - 4417681 => 'Penrith', - 4417682 => 'Penrith', + 441768 => 'Penrith', 4417683 => 'Appleby', 4417684 => 'Pooley Bridge', - 4417685 => 'Penrith', - 4417686 => 'Penrith', 4417687 => 'Keswick', - 4417688 => 'Penrith', - 4417689 => 'Penrith', 441769 => 'South Molton', 441770 => 'Isle of Arran', 441771 => 'Maud', @@ -745,16 +693,8 @@ 441943 => 'Guiseley', 441944 => 'West Heslerton', 441945 => 'Wisbech', - 4419460 => 'Whitehaven', - 4419461 => 'Whitehaven', - 4419462 => 'Whitehaven', - 4419463 => 'Whitehaven', - 4419464 => 'Whitehaven', - 4419465 => 'Whitehaven', - 4419466 => 'Whitehaven', + 441946 => 'Whitehaven', 4419467 => 'Gosforth', - 4419468 => 'Whitehaven', - 4419469 => 'Whitehaven', 441947 => 'Whitby', 441948 => 'Whitchurch', 441949 => 'Whatton', @@ -812,11 +752,7 @@ 441994 => 'St Clears', 441995 => 'Garstang', 441997 => 'Strathpeffer', - 44200 => 'London', - 44201 => 'London', - 44203 => 'London', - 44207 => 'London', - 44208 => 'London', + 4420 => 'London', 442310 => 'Portsmouth', 442311 => 'Southampton', 44238 => 'Southampton', diff --git a/src/geocoding/data/en/47.php b/src/geocoding/data/en/47.php index 65236894c..703888ca8 100644 --- a/src/geocoding/data/en/47.php +++ b/src/geocoding/data/en/47.php @@ -15,7 +15,6 @@ 4731 => 'Buskerud', 4732 => 'Buskerud', 4733 => 'Vestfold', - 4734 => 'Vestfold', 4735 => 'Telemark', 4737 => 'Aust-Agder', 4738 => 'Vest-Agder', @@ -25,7 +24,6 @@ 4755 => 'Hordaland', 4756 => 'Hordaland', 4757 => 'Sogn og Fjordane', - 4760 => 'Oppland', 4761 => 'Oppland', 4762 => 'Hedmark', 4763 => 'Akershus', diff --git a/src/geocoding/data/en/58.php b/src/geocoding/data/en/58.php index 740fdfc08..df1c81681 100644 --- a/src/geocoding/data/en/58.php +++ b/src/geocoding/data/en/58.php @@ -11,7 +11,7 @@ */ return array ( - 58212 => 'Caracas/Miranda/Vargas', + 5821 => 'Caracas/Miranda/Vargas', 58234 => 'Miranda', 58235 => 'Anzoátegui/Bolívar/Guárico', 58237 => 'Federal Dependencies', @@ -35,14 +35,8 @@ 58257 => 'Portuguesa', 58258 => 'Cojedes', 58259 => 'Falcón', + 5826 => 'Zulia', 58260 => 'Colombia', - 58261 => 'Zulia', - 58262 => 'Zulia', - 58263 => 'Zulia', - 58264 => 'Zulia', - 58265 => 'Zulia', - 58266 => 'Zulia', - 58267 => 'Zulia', 58268 => 'Falcón', 58269 => 'Falcón', 58270 => 'Colombia', diff --git a/src/geocoding/data/en/61.php b/src/geocoding/data/en/61.php index ee24cb7d9..64953896b 100644 --- a/src/geocoding/data/en/61.php +++ b/src/geocoding/data/en/61.php @@ -362,16 +362,11 @@ 6124030 => 'Maitland', 6124031 => 'Newcastle', 6124032 => 'Newcastle', + 6124033 => 'Newcastle', 61240330 => 'Maitland', 61240331 => 'Maitland', 61240332 => 'Nelson Bay', 61240333 => 'Nelson Bay', - 61240334 => 'Newcastle', - 61240335 => 'Newcastle', - 61240336 => 'Newcastle', - 61240337 => 'Newcastle', - 61240338 => 'Newcastle', - 61240339 => 'Newcastle', 6124034 => 'Newcastle', 61240350 => 'Nelson Bay', 61240351 => 'Nelson Bay', @@ -445,12 +440,7 @@ 61240437 => 'Nelson Bay', 61240438 => 'Stroud', 61240439 => 'Swansea', - 61240440 => 'Newcastle', - 61240441 => 'Newcastle', - 61240442 => 'Newcastle', - 61240443 => 'Newcastle', - 61240444 => 'Newcastle', - 61240445 => 'Newcastle', + 6124044 => 'Newcastle', 61240446 => 'Bandon Grove', 61240447 => 'Swansea', 61240448 => 'Cessnock', @@ -601,16 +591,9 @@ 61240667 => 'Stroud', 61240668 => 'Swansea', 61240669 => 'Tea Gardens', + 6124067 => 'Newcastle', 61240670 => 'Wards River', 61240671 => 'Wootton', - 61240672 => 'Newcastle', - 61240673 => 'Newcastle', - 61240674 => 'Newcastle', - 61240675 => 'Newcastle', - 61240676 => 'Newcastle', - 61240677 => 'Newcastle', - 61240678 => 'Newcastle', - 61240679 => 'Newcastle', 61240680 => 'Maitland', 61240681 => 'Maitland', 61240682 => 'Clarence Town', @@ -640,16 +623,11 @@ 61242027 => 'Helensburgh', 61242028 => 'Kiama', 61242029 => 'Wollongong', + 6124203 => 'Kiama', 61242030 => 'Helensburgh', - 61242031 => 'Kiama', 61242032 => 'Wollongong', - 61242033 => 'Kiama', - 61242034 => 'Kiama', 61242035 => 'Wollongong', 61242036 => 'Helensburgh', - 61242037 => 'Kiama', - 61242038 => 'Kiama', - 61242039 => 'Kiama', 61242040 => 'Helensburgh', 61242041 => 'Wollongong', 61242042 => 'Wollongong', @@ -694,32 +672,17 @@ 61242107 => 'Wollongong', 61242108 => 'Wollongong', 61242109 => 'Wollongong', - 61242110 => 'Wollongong', + 6124211 => 'Wollongong', 61242111 => 'Kiama', 61242112 => 'Kiama', 61242113 => 'Kiama', - 61242114 => 'Wollongong', - 61242115 => 'Wollongong', - 61242116 => 'Wollongong', - 61242117 => 'Wollongong', - 61242118 => 'Wollongong', - 61242119 => 'Wollongong', 6124212 => 'Wollongong', 6124213 => 'Wollongong', 61242140 => 'Wollongong', 61242141 => 'Wollongong', 61242142 => 'Wollongong', 61242143 => 'Wollongong', - 6124220 => 'Wollongong', - 6124221 => 'Wollongong', - 6124222 => 'Wollongong', - 6124223 => 'Wollongong', - 6124224 => 'Wollongong', - 6124225 => 'Wollongong', - 6124226 => 'Wollongong', - 6124227 => 'Wollongong', - 6124228 => 'Wollongong', - 6124229 => 'Wollongong', + 612422 => 'Wollongong', 6124230 => 'Kiama', 6124231 => 'Wollongong', 6124232 => 'Kiama', @@ -728,31 +691,14 @@ 6124235 => 'Kiama', 6124236 => 'Kiama', 6124237 => 'Kiama', + 6124238 => 'Wollongong', 61242380 => 'Helensburgh', 61242381 => 'Kiama', - 61242382 => 'Wollongong', - 61242383 => 'Wollongong', - 61242384 => 'Wollongong', - 61242385 => 'Wollongong', - 61242386 => 'Wollongong', - 61242387 => 'Wollongong', - 61242388 => 'Wollongong', 61242389 => 'Kiama', 6124240 => 'Wollongong', - 61242403 => 'Wollongong', - 61242404 => 'Wollongong', - 61242405 => 'Wollongong', 6124242 => 'Wollongong', - 61242430 => 'Wollongong', - 61242431 => 'Wollongong', + 6124243 => 'Wollongong', 61242432 => 'Helensburgh', - 61242433 => 'Wollongong', - 61242434 => 'Wollongong', - 61242435 => 'Wollongong', - 61242436 => 'Wollongong', - 61242437 => 'Wollongong', - 61242438 => 'Wollongong', - 61242439 => 'Wollongong', 6124244 => 'Wollongong', 6124245 => 'Wollongong', 6124246 => 'Wollongong', @@ -762,25 +708,10 @@ 61242492 => 'Wollongong', 61242493 => 'Wollongong', 61242494 => 'Wollongong', - 6124250 => 'Wollongong', - 6124251 => 'Wollongong', - 6124252 => 'Wollongong', - 6124253 => 'Wollongong', - 6124254 => 'Wollongong', + 612425 => 'Wollongong', 61242550 => 'Helensburgh', - 61242551 => 'Wollongong', - 61242552 => 'Wollongong', - 61242553 => 'Wollongong', - 61242554 => 'Wollongong', - 61242555 => 'Wollongong', - 61242556 => 'Wollongong', - 61242557 => 'Wollongong', - 61242558 => 'Wollongong', - 61242559 => 'Wollongong', 6124256 => 'Kiama', 6124257 => 'Kiama', - 6124258 => 'Wollongong', - 6124259 => 'Wollongong', 6124260 => 'Wollongong', 6124261 => 'Wollongong', 6124262 => 'Wollongong', @@ -869,16 +800,10 @@ 61243089 => 'Gosford', 6124309 => 'Gosford', 6124310 => 'Wyong', + 6124311 => 'Gosford', 61243110 => 'Wyong', 61243111 => 'Wyong', - 61243112 => 'Gosford', - 61243113 => 'Gosford', - 61243114 => 'Gosford', - 61243115 => 'Gosford', - 61243116 => 'Gosford', - 61243117 => 'Gosford', 61243118 => 'Mangrove Mountain', - 61243119 => 'Gosford', 61243120 => 'Gosford', 61243121 => 'Wyong', 61243122 => 'Mangrove Mountain', @@ -889,26 +814,14 @@ 61243127 => 'Gosford', 61243128 => 'Gosford', 61243129 => 'Mangrove Mountain', + 6124313 => 'Gosford', 61243130 => 'Wyong', - 61243131 => 'Gosford', - 61243132 => 'Gosford', - 61243133 => 'Gosford', - 61243134 => 'Gosford', - 61243135 => 'Gosford', - 61243136 => 'Gosford', 61243137 => 'Mangrove Mountain', 61243138 => 'Wyong', - 61243139 => 'Gosford', - 61243140 => 'Gosford', - 61243141 => 'Gosford', - 61243142 => 'Gosford', - 61243143 => 'Gosford', - 61243144 => 'Gosford', + 6124314 => 'Gosford', 61243145 => 'Wyong', - 61243146 => 'Gosford', 61243147 => 'Mangrove Mountain', 61243148 => 'Wyong', - 61243149 => 'Gosford', 61243150 => 'Gosford', 61243151 => 'Gosford', 61243152 => 'Gosford', @@ -916,40 +829,18 @@ 61243157 => 'Gosford', 61243158 => 'Mangrove Mountain', 61243159 => 'Wyong', - 6124320 => 'Gosford', - 6124321 => 'Gosford', - 6124322 => 'Gosford', - 6124323 => 'Gosford', - 6124324 => 'Gosford', - 6124325 => 'Gosford', - 61243260 => 'Gosford', - 61243261 => 'Gosford', + 612432 => 'Gosford', 61243262 => 'Wyong', 61243263 => 'Wyong', 61243264 => 'Wyong', - 61243265 => 'Gosford', - 61243266 => 'Gosford', - 61243267 => 'Gosford', - 61243268 => 'Gosford', - 61243269 => 'Gosford', - 6124327 => 'Gosford', - 6124328 => 'Gosford', - 6124329 => 'Gosford', 6124330 => 'Wyong', 6124331 => 'Gosford', 6124332 => 'Gosford', 6124333 => 'Gosford', 6124334 => 'Gosford', + 6124335 => 'Gosford', 61243350 => 'Mangrove Mountain', 61243351 => 'Wyong', - 61243352 => 'Gosford', - 61243353 => 'Gosford', - 61243354 => 'Gosford', - 61243355 => 'Gosford', - 61243356 => 'Gosford', - 61243357 => 'Gosford', - 61243358 => 'Gosford', - 61243359 => 'Gosford', 6124336 => 'Gosford', 6124337 => 'Gosford', 61243380 => 'Wyong', @@ -971,36 +862,14 @@ 61243474 => 'Gosford', 6124348 => 'Gosford', 6124349 => 'Gosford', - 6124350 => 'Wyong', - 6124351 => 'Wyong', - 6124352 => 'Wyong', - 6124353 => 'Wyong', - 6124354 => 'Wyong', - 6124355 => 'Wyong', - 6124356 => 'Wyong', - 6124357 => 'Wyong', - 6124358 => 'Wyong', - 6124359 => 'Wyong', - 6124360 => 'Gosford', - 6124361 => 'Gosford', - 6124362 => 'Gosford', - 6124363 => 'Gosford', - 6124364 => 'Gosford', - 6124365 => 'Gosford', + 612435 => 'Wyong', + 612436 => 'Gosford', 6124366 => 'Wyong', - 6124367 => 'Gosford', - 6124368 => 'Gosford', - 6124369 => 'Gosford', - 6124370 => 'Gosford', + 612437 => 'Gosford', 6124371 => 'Mangrove Mountain', - 6124372 => 'Gosford', 6124373 => 'Mangrove Mountain', 6124374 => 'Mangrove Mountain', - 6124375 => 'Gosford', 6124376 => 'Mangrove Mountain', - 6124377 => 'Gosford', - 6124378 => 'Gosford', - 6124379 => 'Gosford', 61243800 => 'Gosford', 61243808 => 'Gosford', 61243809 => 'Gosford', @@ -1207,16 +1076,11 @@ 61244272 => 'Nowra', 61244273 => 'Nowra', 61244274 => 'Nowra', + 6124428 => 'Nowra', 61244280 => 'Huskisson', 61244281 => 'Huskisson', 61244282 => 'Huskisson', 61244283 => 'Huskisson', - 61244284 => 'Nowra', - 61244285 => 'Nowra', - 61244286 => 'Nowra', - 61244287 => 'Nowra', - 61244288 => 'Nowra', - 61244289 => 'Nowra', 61244290 => 'Bawley Point', 61244291 => 'Nowra', 61244292 => 'Nowra', @@ -1240,15 +1104,10 @@ 61244447 => 'Huskisson', 61244448 => 'Milton-ulladulla', 61244449 => 'Milton-ulladulla', - 61244450 => 'Nowra', - 61244451 => 'Nowra', + 6124445 => 'Nowra', 61244452 => 'Batemans Bay', - 61244453 => 'Nowra', - 61244454 => 'Nowra', 61244455 => 'Batemans Bay', 61244456 => 'Batemans Bay', - 61244457 => 'Nowra', - 61244458 => 'Nowra', 61244459 => 'Milton-ulladulla', 6124446 => 'Nowra', 6124447 => 'Nowra', @@ -1262,16 +1121,8 @@ 6124465 => 'Berry', 6124471 => 'Moruya', 6124472 => 'Batemans Bay', + 6124473 => 'Narooma', 61244730 => 'Batemans Bay', - 61244731 => 'Narooma', - 61244732 => 'Narooma', - 61244733 => 'Narooma', - 61244734 => 'Narooma', - 61244735 => 'Narooma', - 61244736 => 'Narooma', - 61244737 => 'Narooma', - 61244738 => 'Narooma', - 61244739 => 'Narooma', 6124474 => 'Moruya', 61244750 => 'Moruya', 61244751 => 'Batemans Bay', @@ -1360,12 +1211,7 @@ 61245047 => 'Windsor', 61245048 => 'Windsor', 61245049 => 'Windsor', - 61245050 => 'Windsor', - 61245051 => 'Windsor', - 61245052 => 'Windsor', - 61245053 => 'Windsor', - 61245054 => 'Windsor', - 61245055 => 'Windsor', + 6124505 => 'Windsor', 61245056 => 'Colo Heights', 61245057 => 'St Albans', 61245058 => 'Kurrajong Heights', @@ -1409,13 +1255,8 @@ 6124556 => 'Windsor', 6124557 => 'Windsor', 61245582 => 'Windsor', + 6124560 => 'Windsor', 61245600 => 'Wisemans Ferry', - 61245601 => 'Windsor', - 61245602 => 'Windsor', - 61245603 => 'Windsor', - 61245604 => 'Windsor', - 61245605 => 'Windsor', - 61245606 => 'Windsor', 61245607 => 'Kurrajong Heights', 61245608 => 'Colo Heights', 61245609 => 'St Albans', @@ -1433,16 +1274,7 @@ 6124566 => 'Wisemans Ferry', 6124567 => 'Kurrajong Heights', 6124568 => 'St Albans', - 6124570 => 'Windsor', - 6124571 => 'Windsor', - 6124572 => 'Windsor', - 6124573 => 'Windsor', - 6124574 => 'Windsor', - 6124575 => 'Windsor', - 6124576 => 'Windsor', - 6124577 => 'Windsor', - 6124578 => 'Windsor', - 6124579 => 'Windsor', + 612457 => 'Windsor', 6124580 => 'Windsor', 6124581 => 'Wisemans Ferry', 6124582 => 'Windsor', @@ -1521,39 +1353,19 @@ 61246079 => 'Campbelltown', 6124608 => 'Campbelltown', 6124609 => 'Campbelltown', - 61246100 => 'Campbelltown', - 61246101 => 'Campbelltown', - 61246102 => 'Campbelltown', + 6124610 => 'Campbelltown', 61246103 => 'Picton', 61246104 => 'Camden', - 61246105 => 'Campbelltown', 61246106 => 'Picton', - 61246107 => 'Campbelltown', - 61246108 => 'Campbelltown', - 61246109 => 'Campbelltown', 61246110 => 'Campbelltown', 61246113 => 'Camden', 61246114 => 'Campbelltown', 61246115 => 'Picton', - 6124620 => 'Campbelltown', - 6124621 => 'Campbelltown', - 6124622 => 'Campbelltown', - 61246230 => 'Campbelltown', - 61246231 => 'Campbelltown', + 612462 => 'Campbelltown', 61246232 => 'Camden', - 61246233 => 'Campbelltown', 61246234 => 'Picton', - 61246235 => 'Campbelltown', 61246236 => 'Camden', 61246237 => 'Camden', - 61246238 => 'Campbelltown', - 61246239 => 'Campbelltown', - 6124624 => 'Campbelltown', - 6124625 => 'Campbelltown', - 6124626 => 'Campbelltown', - 6124627 => 'Campbelltown', - 6124628 => 'Campbelltown', - 6124629 => 'Campbelltown', 6124630 => 'Campbelltown', 6124631 => 'Campbelltown', 6124632 => 'Campbelltown', @@ -1569,15 +1381,8 @@ 61246375 => 'Campbelltown', 61246376 => 'Campbelltown', 61246377 => 'Campbelltown', + 6124640 => 'Campbelltown', 61246400 => 'Picton', - 61246401 => 'Campbelltown', - 61246402 => 'Campbelltown', - 61246403 => 'Campbelltown', - 61246404 => 'Campbelltown', - 61246405 => 'Campbelltown', - 61246406 => 'Campbelltown', - 61246407 => 'Campbelltown', - 61246408 => 'Campbelltown', 61246409 => 'Camden', 61246410 => 'Picton', 61246411 => 'Campbelltown', @@ -1673,16 +1478,11 @@ 61247068 => 'Penrith', 61247069 => 'Penrith', 6124707 => 'Penrith', - 61247080 => 'Penrith', - 61247081 => 'Penrith', - 61247082 => 'Penrith', - 61247083 => 'Penrith', + 6124708 => 'Penrith', 61247084 => 'Mulgoa', 61247085 => 'Lawson', 61247086 => 'Mount Wilson', 61247087 => 'Katoomba', - 61247088 => 'Penrith', - 61247089 => 'Penrith', 61247090 => 'Penrith', 61247091 => 'Mulgoa', 61247092 => 'Lawson', @@ -1712,35 +1512,9 @@ 61247121 => 'Mount Wilson', 61247122 => 'Mulgoa', 61247123 => 'Penrith', + 612472 => 'Penrith', 61247200 => 'Mulgoa', - 61247201 => 'Penrith', - 61247202 => 'Penrith', - 61247203 => 'Penrith', - 61247204 => 'Penrith', - 61247205 => 'Penrith', - 61247206 => 'Penrith', - 61247207 => 'Penrith', - 61247208 => 'Penrith', - 61247209 => 'Penrith', - 6124721 => 'Penrith', - 6124722 => 'Penrith', - 6124723 => 'Penrith', - 6124724 => 'Penrith', - 6124725 => 'Penrith', - 6124726 => 'Penrith', - 6124727 => 'Penrith', - 6124728 => 'Penrith', - 6124729 => 'Penrith', - 6124730 => 'Penrith', - 6124731 => 'Penrith', - 6124732 => 'Penrith', - 6124733 => 'Penrith', - 6124734 => 'Penrith', - 6124735 => 'Penrith', - 6124736 => 'Penrith', - 6124737 => 'Penrith', - 6124738 => 'Penrith', - 6124739 => 'Penrith', + 612473 => 'Penrith', 6124740 => 'Penrith', 6124741 => 'Mulgoa', 61247420 => 'Katoomba', @@ -1754,16 +1528,8 @@ 61247428 => 'Katoomba', 61247429 => 'Katoomba', 6124743 => 'Penrith', - 61247440 => 'Penrith', - 61247441 => 'Penrith', - 61247442 => 'Penrith', - 61247443 => 'Penrith', + 6124744 => 'Penrith', 61247444 => 'Mulgoa', - 61247445 => 'Penrith', - 61247446 => 'Penrith', - 61247447 => 'Penrith', - 61247448 => 'Penrith', - 61247449 => 'Penrith', 6124747 => 'Penrith', 61247480 => 'Penrith', 61247489 => 'Penrith', @@ -1804,15 +1570,9 @@ 61247780 => 'Katoomba', 61247781 => 'Lawson', 61247782 => 'Mount Wilson', - 61247800 => 'Katoomba', - 61247801 => 'Katoomba', - 61247802 => 'Katoomba', + 6124780 => 'Katoomba', 61247803 => 'Lawson', 61247804 => 'Lawson', - 61247805 => 'Katoomba', - 61247806 => 'Katoomba', - 61247807 => 'Katoomba', - 61247808 => 'Katoomba', 61247809 => 'Mount Wilson', 6124781 => 'Katoomba', 6124782 => 'Katoomba', @@ -2016,80 +1776,38 @@ 61248197 => 'Reidsdale', 61248198 => 'Tarago', 61248199 => 'Woodhouselee', - 61248200 => 'Marulan', + 612482 => 'Goulburn', + 6124820 => 'Marulan', 61248201 => 'Golspie', 61248202 => 'Taralga', - 61248203 => 'Marulan', 61248204 => 'Wombeyan Caves', - 61248205 => 'Marulan', - 61248206 => 'Marulan', - 61248207 => 'Marulan', - 61248208 => 'Marulan', - 61248209 => 'Marulan', - 6124821 => 'Goulburn', - 6124822 => 'Goulburn', - 61248230 => 'Goulburn', - 61248231 => 'Goulburn', - 61248232 => 'Goulburn', 61248233 => 'Crookwell', - 61248234 => 'Goulburn', - 61248235 => 'Goulburn', - 61248236 => 'Goulburn', - 61248237 => 'Goulburn', - 61248238 => 'Goulburn', - 61248239 => 'Goulburn', - 6124824 => 'Goulburn', 61248250 => 'Bevendale', 61248251 => 'Bungonia', 61248252 => 'Bungonia', - 61248253 => 'Goulburn', - 61248254 => 'Goulburn', - 61248255 => 'Goulburn', - 61248256 => 'Goulburn', 61248257 => 'Gunning', 61248258 => 'Nerriga', 61248259 => 'Woodhouselee', - 61248260 => 'Goulburn', - 61248261 => 'Goulburn', - 61248262 => 'Goulburn', 61248263 => 'Woodhouselee', 61248264 => 'Breadalbane', 61248265 => 'Bungonia', 61248266 => 'Tarago', 61248267 => 'Gunning', 61248268 => 'Bevendale', - 61248269 => 'Goulburn', - 61248270 => 'Goulburn', - 61248271 => 'Goulburn', - 61248272 => 'Goulburn', - 61248273 => 'Goulburn', 61248274 => 'Bungonia', 61248275 => 'Woodhouselee', 61248276 => 'Gunning', 61248277 => 'Breadalbane', 61248278 => 'Tarago', 61248279 => 'Braidwood', - 61248280 => 'Goulburn', 61248281 => 'Gundillion', 61248282 => 'Reidsdale', 61248283 => 'Nerriga', - 61248284 => 'Goulburn', - 61248285 => 'Goulburn', - 61248286 => 'Goulburn', - 61248287 => 'Goulburn', - 61248288 => 'Goulburn', - 61248289 => 'Goulburn', - 6124829 => 'Goulburn', - 61248300 => 'Crookwell', - 61248301 => 'Crookwell', + 6124830 => 'Crookwell', 61248302 => 'Binda', 61248303 => 'Tuena', 61248304 => 'Lost River', 61248305 => 'Rugby', - 61248306 => 'Crookwell', - 61248307 => 'Crookwell', - 61248308 => 'Crookwell', - 61248309 => 'Crookwell', 61248310 => 'Golspie', 61248311 => 'Marulan', 61248312 => 'Taralga', @@ -2112,13 +1830,7 @@ 61248338 => 'Gundillion', 61248339 => 'Gunning', 6124834 => 'Tuena', - 61248350 => 'Binda', - 61248351 => 'Binda', - 61248352 => 'Binda', - 61248353 => 'Binda', - 61248354 => 'Binda', - 61248355 => 'Binda', - 61248356 => 'Binda', + 6124835 => 'Binda', 61248357 => 'Rugby', 61248358 => 'Rugby', 61248359 => 'Rugby', @@ -2147,16 +1859,9 @@ 6124840 => 'Taralga', 6124841 => 'Marulan', 6124842 => 'Braidwood', - 61248430 => 'Golspie', - 61248431 => 'Golspie', + 6124843 => 'Golspie', 61248432 => 'Woodhouselee', - 61248433 => 'Golspie', - 61248434 => 'Golspie', 61248435 => 'Wombeyan Caves', - 61248436 => 'Golspie', - 61248437 => 'Golspie', - 61248438 => 'Golspie', - 61248439 => 'Golspie', 61248440 => 'Breadalbane', 61248441 => 'Woodhouselee', 61248442 => 'Breadalbane', @@ -2167,28 +1872,17 @@ 61248447 => 'Bungonia', 61248448 => 'Breadalbane', 61248449 => 'Breadalbane', + 6124845 => 'Gunning', 61248450 => 'Bevendale', - 61248451 => 'Gunning', - 61248452 => 'Gunning', - 61248453 => 'Gunning', - 61248454 => 'Gunning', 61248455 => 'Bevendale', - 61248456 => 'Gunning', - 61248457 => 'Gunning', - 61248458 => 'Gunning', 61248459 => 'Nerriga', 6124846 => 'Reidsdale', 6124847 => 'Gundillion', + 6124848 => 'Bungonia', 61248480 => 'Breadalbane', 61248481 => 'Woodhouselee', 61248482 => 'Woodhouselee', 61248483 => 'Woodhouselee', - 61248484 => 'Bungonia', - 61248485 => 'Bungonia', - 61248486 => 'Bungonia', - 61248487 => 'Bungonia', - 61248488 => 'Bungonia', - 61248489 => 'Bungonia', 6124849 => 'Tarago', 61248500 => 'Braidwood', 61248501 => 'Breadalbane', @@ -2409,38 +2103,17 @@ 61248807 => 'Tuena', 61248808 => 'Rugby', 61248809 => 'Braidwood', - 61248830 => 'Bundanoon', - 61248831 => 'Bundanoon', - 61248832 => 'Bundanoon', - 61248833 => 'Bundanoon', - 61248834 => 'Bundanoon', - 61248835 => 'Bundanoon', - 61248836 => 'Bundanoon', - 61248837 => 'Bundanoon', - 61248838 => 'Bundanoon', + 6124883 => 'Bundanoon', 61248839 => 'Yerrinbool', + 6124884 => 'Bundanoon', 61248840 => 'Paddys River', 61248841 => 'Paddys River', 61248842 => 'Paddys River', 61248843 => 'Paddys River', - 61248844 => 'Bundanoon', - 61248845 => 'Bundanoon', - 61248846 => 'Bundanoon', - 61248847 => 'Bundanoon', - 61248848 => 'Bundanoon', - 61248849 => 'Bundanoon', 6124885 => 'Robertson', 6124886 => 'Robertson', 6124887 => 'Robertson', - 61248880 => 'Robertson', - 61248881 => 'Robertson', - 61248882 => 'Robertson', - 61248883 => 'Robertson', - 61248884 => 'Robertson', - 61248885 => 'Robertson', - 61248886 => 'Robertson', - 61248887 => 'Robertson', - 61248888 => 'Robertson', + 6124888 => 'Robertson', 61248889 => 'Barrallier', 6124889 => 'Yerrinbool', 61248900 => 'Tuena', @@ -2448,12 +2121,8 @@ 61248997 => 'Bowral', 61248998 => 'Goulburn', 61248999 => 'Goulburn', - 6124900 => 'Newcastle', + 612490 => 'Newcastle', 6124901 => 'Nelson Bay', - 6124902 => 'Newcastle', - 6124903 => 'Newcastle', - 6124904 => 'Newcastle', - 61249050 => 'Newcastle', 61249051 => 'Maitland', 61249052 => 'Maitland', 61249053 => 'Maitland', @@ -2463,9 +2132,6 @@ 61249057 => 'Bandon Grove', 61249058 => 'Branxton', 61249059 => 'Bulahdelah', - 6124906 => 'Newcastle', - 6124907 => 'Newcastle', - 6124908 => 'Newcastle', 61249090 => 'East Gresford', 61249091 => 'East Gresford', 61249092 => 'East Gresford', @@ -2498,15 +2164,7 @@ 61249137 => 'Newcastle', 61249138 => 'Newcastle', 61249139 => 'Newcastle', - 61249140 => 'Newcastle', - 61249141 => 'Newcastle', - 61249142 => 'Newcastle', - 61249143 => 'Newcastle', - 61249144 => 'Newcastle', - 61249145 => 'Newcastle', - 61249146 => 'Newcastle', - 61249147 => 'Newcastle', - 61249148 => 'Newcastle', + 6124914 => 'Newcastle', 61249149 => 'Maitland', 6124915 => 'Newcastle', 61249160 => 'Nelson Bay', @@ -2530,43 +2188,15 @@ 61249178 => 'Wards River', 61249179 => 'Wootton', 6124918 => 'Newcastle', - 61249190 => 'Nelson Bay', - 61249191 => 'Nelson Bay', - 61249192 => 'Nelson Bay', - 61249193 => 'Nelson Bay', - 61249194 => 'Nelson Bay', - 61249195 => 'Nelson Bay', - 61249196 => 'Nelson Bay', + 6124919 => 'Nelson Bay', 61249197 => 'Tea Gardens', 61249198 => 'Tea Gardens', 61249199 => 'Tea Gardens', - 6124920 => 'Newcastle', - 6124921 => 'Newcastle', - 6124922 => 'Newcastle', - 6124923 => 'Newcastle', - 6124924 => 'Newcastle', - 6124925 => 'Newcastle', - 6124926 => 'Newcastle', - 6124927 => 'Newcastle', - 6124928 => 'Newcastle', - 6124929 => 'Newcastle', - 6124930 => 'Maitland', - 61249310 => 'Maitland', - 61249311 => 'Maitland', - 61249312 => 'Maitland', - 61249313 => 'Maitland', - 61249314 => 'Maitland', + 612492 => 'Newcastle', + 612493 => 'Maitland', 61249315 => 'Eccleston', - 61249316 => 'Maitland', 61249317 => 'Eccleston', - 61249318 => 'Maitland', - 61249319 => 'Maitland', - 6124932 => 'Maitland', - 6124933 => 'Maitland', - 6124934 => 'Maitland', 6124935 => 'Newcastle', - 6124936 => 'Maitland', - 6124937 => 'Maitland', 61249380 => 'Mulbring', 61249381 => 'Branxton', 61249382 => 'Branxton', @@ -2578,11 +2208,6 @@ 61249388 => 'East Gresford', 61249389 => 'East Gresford', 61249390 => 'Branxton', - 61249391 => 'Maitland', - 61249392 => 'Maitland', - 61249393 => 'Maitland', - 61249394 => 'Maitland', - 61249395 => 'Maitland', 61249396 => 'Laguna', 61249397 => 'Mulbring', 61249398 => 'East Gresford', @@ -2590,24 +2215,9 @@ 612494 => 'Newcastle', 612495 => 'Newcastle', 612496 => 'Newcastle', - 6124970 => 'Swansea', - 6124971 => 'Swansea', - 6124972 => 'Swansea', - 6124973 => 'Swansea', + 612497 => 'Swansea', 6124974 => 'Newcastle', - 6124975 => 'Swansea', - 6124976 => 'Swansea', - 6124977 => 'Swansea', - 61249780 => 'Swansea', - 61249781 => 'Swansea', - 61249782 => 'Swansea', - 61249783 => 'Newcastle', - 61249784 => 'Newcastle', - 61249785 => 'Newcastle', - 61249786 => 'Newcastle', - 61249787 => 'Newcastle', - 61249788 => 'Newcastle', - 61249789 => 'Newcastle', + 6124978 => 'Newcastle', 6124979 => 'Newcastle', 61249800 => 'Raymond Terrace', 61249801 => 'Swansea', @@ -2625,15 +2235,8 @@ 6124984 => 'Nelson Bay', 6124985 => 'Newcastle', 6124986 => 'Swansea', + 6124987 => 'Raymond Terrace', 61249870 => 'Karuah', - 61249871 => 'Raymond Terrace', - 61249872 => 'Raymond Terrace', - 61249873 => 'Raymond Terrace', - 61249874 => 'Raymond Terrace', - 61249875 => 'Raymond Terrace', - 61249876 => 'Raymond Terrace', - 61249877 => 'Raymond Terrace', - 61249878 => 'Raymond Terrace', 61249879 => 'Bulahdelah', 6124988 => 'Raymond Terrace', 6124989 => 'Newcastle', @@ -2641,26 +2244,13 @@ 6124991 => 'Cessnock', 6124992 => 'Dungog', 6124993 => 'Cessnock', - 61249940 => 'Stroud', - 61249941 => 'Stroud', - 61249942 => 'Stroud', - 61249943 => 'Stroud', - 61249944 => 'Stroud', - 61249945 => 'Stroud', + 6124994 => 'Stroud', 61249946 => 'Wards River', 61249947 => 'Wards River', 61249948 => 'Wards River', - 61249949 => 'Stroud', - 61249950 => 'Bandon Grove', - 61249951 => 'Bandon Grove', - 61249952 => 'Bandon Grove', - 61249953 => 'Bandon Grove', - 61249954 => 'Bandon Grove', - 61249955 => 'Bandon Grove', + 6124995 => 'Bandon Grove', 61249956 => 'Dungog', 61249957 => 'Dungog', - 61249958 => 'Bandon Grove', - 61249959 => 'Bandon Grove', 6124996 => 'Clarence Town', 61249970 => 'Tea Gardens', 61249971 => 'Tea Gardens', @@ -2672,14 +2262,7 @@ 61249977 => 'Wootton', 61249978 => 'Wootton', 61249979 => 'Tea Gardens', - 61249980 => 'Cessnock', - 61249981 => 'Cessnock', - 61249982 => 'Cessnock', - 61249983 => 'Cessnock', - 61249984 => 'Cessnock', - 61249985 => 'Cessnock', - 61249986 => 'Cessnock', - 61249987 => 'Cessnock', + 6124998 => 'Cessnock', 61249988 => 'Laguna', 61249989 => 'Laguna', 61249990 => 'Clarence Town', @@ -2805,12 +2388,11 @@ 61250138 => 'Walla Walla', 61250139 => 'Walwa', 61250140 => 'Yackandandah', - 6125100 => 'Canberra', + 612510 => 'Canberra', 61251010 => 'Anembo', 61251011 => 'Binalong', 61251012 => 'Bungendore', 61251013 => 'Burrinjuck', - 61251014 => 'Canberra', 61251015 => 'Captains Flat', 61251016 => 'Cavan', 61251017 => 'Gearys Gap', @@ -2824,12 +2406,7 @@ 61251025 => 'Binalong', 61251026 => 'Bungendore', 61251027 => 'Burrinjuck', - 61251028 => 'Canberra', 61251029 => 'Captains Flat', - 6125103 => 'Canberra', - 6125104 => 'Canberra', - 6125105 => 'Canberra', - 6125106 => 'Canberra', 61251070 => 'Cavan', 61251071 => 'Gearys Gap', 61251072 => 'Gundaroo', @@ -2840,18 +2417,9 @@ 61251077 => 'Yass', 61251078 => 'Anembo', 61251079 => 'Binalong', - 6125108 => 'Canberra', - 6125109 => 'Canberra', + 6125110 => 'Canberra', 61251100 => 'Bungendore', 61251101 => 'Burrinjuck', - 61251102 => 'Canberra', - 61251103 => 'Canberra', - 61251104 => 'Canberra', - 61251105 => 'Canberra', - 61251106 => 'Canberra', - 61251107 => 'Canberra', - 61251108 => 'Canberra', - 61251109 => 'Canberra', 6125111 => 'Canberra', 61251120 => 'Canberra', 61251121 => 'Canberra', @@ -2996,13 +2564,8 @@ 61253097 => 'Milvale', 61253098 => 'Monteagle', 61253099 => 'Murringo', + 6125310 => 'Orange', 61253100 => 'Young', - 61253101 => 'Orange', - 61253102 => 'Orange', - 61253103 => 'Orange', - 61253104 => 'Orange', - 61253105 => 'Orange', - 61253106 => 'Orange', 61253107 => 'Millthorpe', 61253108 => 'Millthorpe', 61253109 => 'Lyndhurst', @@ -3462,12 +3025,7 @@ 61255247 => 'Port Macquarie', 61255248 => 'Rawdon Vale', 61255249 => 'Rawdon Vale', - 61255250 => 'Port Macquarie', - 61255251 => 'Port Macquarie', - 61255252 => 'Port Macquarie', - 61255253 => 'Port Macquarie', - 61255254 => 'Port Macquarie', - 61255255 => 'Port Macquarie', + 6125525 => 'Port Macquarie', 61255256 => 'Taree', 61255257 => 'Jerrys Plains', 61255258 => 'Comboyne', @@ -3973,16 +3531,11 @@ 61256197 => 'Wooli', 61256198 => 'Wooli', 61256199 => 'Grafton', - 61256200 => 'Casino', - 61256201 => 'Casino', - 61256202 => 'Casino', - 61256203 => 'Casino', - 61256204 => 'Casino', + 6125620 => 'Casino', 61256205 => 'Lismore', 61256206 => 'Coffs Harbour', 61256207 => 'Bonalbo', 61256208 => 'Lawrence', - 61256209 => 'Casino', 61256210 => 'Dyraaba', 61256211 => 'Grafton', 61256212 => 'Leeville', @@ -4223,13 +3776,8 @@ 61256447 => 'Ulong', 61256448 => 'Urbenville', 61256449 => 'Whiporie', + 6125645 => 'Coffs Harbour', 61256450 => 'Grafton', - 61256451 => 'Coffs Harbour', - 61256452 => 'Coffs Harbour', - 61256453 => 'Coffs Harbour', - 61256454 => 'Coffs Harbour', - 61256455 => 'Coffs Harbour', - 61256456 => 'Coffs Harbour', 61256457 => 'Lismore', 61256458 => 'Lismore', 61256459 => 'Grafton', @@ -4424,16 +3972,9 @@ 61257117 => 'Ogunbil', 61257118 => 'Limbri', 61257119 => 'Limbri', - 61257120 => 'Tamworth', - 61257121 => 'Tamworth', - 61257122 => 'Tamworth', - 61257123 => 'Tamworth', - 61257124 => 'Tamworth', - 61257125 => 'Tamworth', - 61257126 => 'Tamworth', + 6125712 => 'Tamworth', 61257127 => 'Nundle', 61257128 => 'Nundle', - 61257129 => 'Tamworth', 61257130 => 'Armidale', 61257131 => 'Uralla', 61257132 => 'Gunnedah', @@ -4771,16 +4312,11 @@ 61257757 => 'Nowendoc', 61257758 => 'Armidale', 61257759 => 'Armidale', + 6125776 => 'Tamworth', 61257760 => 'Armidale', - 61257761 => 'Tamworth', 61257762 => 'Armidale', 61257763 => 'Armidale', 61257764 => 'Armidale', - 61257765 => 'Tamworth', - 61257766 => 'Tamworth', - 61257767 => 'Tamworth', - 61257768 => 'Tamworth', - 61257769 => 'Tamworth', 61257770 => 'Tamworth', 61257771 => 'Tamworth', 61257772 => 'Tamworth', @@ -5255,15 +4791,9 @@ 61259077 => 'West Wyalong', 61259078 => 'Coolamon', 61259079 => 'Coolamon', - 61259080 => 'Wagga Wagga', - 61259081 => 'Wagga Wagga', - 61259082 => 'Wagga Wagga', - 61259083 => 'Wagga Wagga', - 61259084 => 'Wagga Wagga', + 6125908 => 'Wagga Wagga', 61259085 => 'Barmedman', 61259086 => 'Barmedman', - 61259087 => 'Wagga Wagga', - 61259088 => 'Wagga Wagga', 61259089 => 'Henty', 61259090 => 'Gundagai', 61259091 => 'Griffith', @@ -5836,12 +5366,7 @@ 61260197 => 'Culcairn', 61260198 => 'Gerogery', 61260199 => 'Holbrook', - 61260200 => 'Talgarno', - 61260201 => 'Talgarno', - 61260202 => 'Talgarno', - 61260203 => 'Talgarno', - 61260204 => 'Talgarno', - 61260205 => 'Talgarno', + 6126020 => 'Talgarno', 61260206 => 'Albury', 61260207 => 'Albury', 61260208 => 'Albury', @@ -5893,13 +5418,7 @@ 61260317 => 'Talgarno', 61260318 => 'Talmalmo', 61260319 => 'Walla Walla', - 61260320 => 'Rennie', - 61260321 => 'Rennie', - 61260322 => 'Rennie', - 61260323 => 'Rennie', - 61260324 => 'Rennie', - 61260325 => 'Rennie', - 61260326 => 'Rennie', + 6126032 => 'Rennie', 61260327 => 'Corowa', 61260328 => 'Corowa', 61260329 => 'Corowa', @@ -5924,26 +5443,15 @@ 61260357 => 'Corowa', 61260358 => 'Balldale', 61260359 => 'Rennie', - 61260360 => 'Holbrook', - 61260361 => 'Holbrook', - 61260362 => 'Holbrook', - 61260363 => 'Holbrook', - 61260364 => 'Holbrook', - 61260365 => 'Holbrook', - 61260366 => 'Holbrook', + 6126036 => 'Holbrook', 61260367 => 'Little Billabong', 61260368 => 'Coppabella', 61260369 => 'Coppabella', - 61260370 => 'Walwa', - 61260371 => 'Walwa', + 6126037 => 'Walwa', 61260372 => 'Talmalmo', 61260373 => 'Talmalmo', 61260374 => 'Ournie', 61260375 => 'Ournie', - 61260376 => 'Walwa', - 61260377 => 'Walwa', - 61260378 => 'Walwa', - 61260379 => 'Walwa', 61260380 => 'Albury', 61260381 => 'Balldale', 61260382 => 'Barnawartha', @@ -6040,15 +5548,7 @@ 6126055 => 'Albury', 6126056 => 'Albury', 6126057 => 'Albury', - 61260580 => 'Albury', - 61260581 => 'Albury', - 61260582 => 'Albury', - 61260583 => 'Albury', - 61260584 => 'Albury', - 61260585 => 'Albury', - 61260586 => 'Albury', - 61260587 => 'Albury', - 61260588 => 'Albury', + 6126058 => 'Albury', 61260589 => 'Talmalmo', 6126059 => 'Albury', 6126060 => 'Albury', @@ -6147,15 +5647,8 @@ 61260707 => 'Cudgewa', 61260708 => 'Nariel', 61260709 => 'Corryong', + 6126071 => 'Tallangatta', 61260710 => 'Tallangatta Valley', - 61260711 => 'Tallangatta', - 61260712 => 'Tallangatta', - 61260713 => 'Tallangatta', - 61260714 => 'Tallangatta', - 61260715 => 'Tallangatta', - 61260716 => 'Tallangatta', - 61260717 => 'Tallangatta', - 61260718 => 'Tallangatta', 61260719 => 'Tallangatta Valley', 61260720 => 'Eskdale', 61260721 => 'Eskdale', @@ -6197,15 +5690,10 @@ 61260757 => 'Oaklands', 61260758 => 'Oaklands', 61260759 => 'Albury', + 6126076 => 'Corryong', 61260760 => 'Nariel', - 61260761 => 'Corryong', - 61260762 => 'Corryong', - 61260763 => 'Corryong', - 61260764 => 'Corryong', 61260765 => 'Nariel', 61260766 => 'Nariel', - 61260767 => 'Corryong', - 61260768 => 'Corryong', 61260769 => 'Nariel', 61260770 => 'Nariel', 61260771 => 'Nariel', @@ -6327,10 +5815,7 @@ 61260924 => 'Albury', 61260925 => 'Albury', 61260926 => 'Albury', - 6126100 => 'Canberra', - 6126101 => 'Canberra', - 6126102 => 'Canberra', - 6126103 => 'Canberra', + 61261 => 'Canberra', 61261040 => 'Anembo', 61261041 => 'Anembo', 61261042 => 'Anembo', @@ -6340,7 +5825,6 @@ 61261046 => 'Bungendore', 61261047 => 'Bungendore', 61261048 => 'Bungendore', - 61261049 => 'Canberra', 61261050 => 'Burrinjuck', 61261051 => 'Burrinjuck', 61261052 => 'Burrinjuck', @@ -6374,18 +5858,12 @@ 61261080 => 'Yass', 61261081 => 'Yass', 61261082 => 'Yass', - 61261083 => 'Canberra', - 61261084 => 'Canberra', 61261085 => 'The Mullion', 61261086 => 'Uriarra Forest', 61261087 => 'Yass', 61261088 => 'Anembo', 61261089 => 'Binalong', - 6126109 => 'Canberra', - 6126110 => 'Canberra', 61261110 => 'Bungendore', - 61261111 => 'Canberra', - 61261112 => 'Canberra', 61261113 => 'Bungendore', 61261114 => 'Burrinjuck', 61261115 => 'Captains Flat', @@ -6393,14 +5871,7 @@ 61261117 => 'Gearys Gap', 61261118 => 'Gundaroo', 61261119 => 'Michelago', - 6126112 => 'Canberra', - 6126113 => 'Canberra', 61261140 => 'Burrinjuck', - 61261141 => 'Canberra', - 61261142 => 'Canberra', - 61261143 => 'Canberra', - 61261144 => 'Canberra', - 61261145 => 'Canberra', 61261146 => 'Captains Flat', 61261147 => 'Cavan', 61261148 => 'Gearys Gap', @@ -6423,7 +5894,6 @@ 61261165 => 'Gundaroo', 61261166 => 'Michelago', 61261167 => 'Rye Park', - 61261168 => 'Canberra', 61261169 => 'Anembo', 61261170 => 'Binalong', 61261171 => 'Bungendore', @@ -6455,18 +5925,6 @@ 61261197 => 'Bungendore', 61261198 => 'Yass', 61261199 => 'Rye Park', - 6126120 => 'Canberra', - 6126121 => 'Canberra', - 6126122 => 'Canberra', - 6126123 => 'Canberra', - 6126124 => 'Canberra', - 6126125 => 'Canberra', - 6126126 => 'Canberra', - 6126127 => 'Canberra', - 6126128 => 'Canberra', - 6126129 => 'Canberra', - 61261300 => 'Canberra', - 61261301 => 'Canberra', 61261302 => 'Uriarra Forest', 61261303 => 'Yass', 61261304 => 'Anembo', @@ -6475,22 +5933,16 @@ 61261307 => 'Burrinjuck', 61261308 => 'Captains Flat', 61261309 => 'Cavan', - 6126131 => 'Canberra', - 6126132 => 'Canberra', - 6126133 => 'Canberra', 61261340 => 'Gearys Gap', 61261341 => 'Gundaroo', 61261342 => 'Michelago', 61261343 => 'The Mullion', 61261344 => 'Uriarra Forest', 61261345 => 'Yass', - 61261346 => 'Canberra', 61261347 => 'Anembo', 61261348 => 'Binalong', 61261349 => 'Bungendore', - 6126135 => 'Canberra', 61261360 => 'Burrinjuck', - 61261361 => 'Canberra', 61261362 => 'Captains Flat', 61261363 => 'Cavan', 61261364 => 'Gearys Gap', @@ -6520,7 +5972,6 @@ 61261388 => 'Binalong', 61261389 => 'Bungendore', 61261390 => 'Burrinjuck', - 61261391 => 'Canberra', 61261392 => 'Captains Flat', 61261393 => 'Cavan', 61261394 => 'Gearys Gap', @@ -6530,31 +5981,9 @@ 61261398 => 'The Mullion', 61261399 => 'Uriarra Forest', 61261400 => 'Yass', - 61261401 => 'Canberra', - 61261402 => 'Canberra', - 61261403 => 'Canberra', - 61261404 => 'Canberra', - 61261405 => 'Canberra', - 61261406 => 'Canberra', - 61261407 => 'Canberra', - 61261408 => 'Canberra', 61261409 => 'Anembo', 61261410 => 'Binalong', - 61261411 => 'Canberra', - 61261412 => 'Canberra', - 61261413 => 'Canberra', - 61261414 => 'Canberra', - 61261415 => 'Canberra', - 61261416 => 'Canberra', - 61261417 => 'Canberra', - 61261418 => 'Canberra', - 61261419 => 'Canberra', - 6126142 => 'Canberra', - 6126143 => 'Canberra', - 6126144 => 'Canberra', - 61261450 => 'Canberra', 61261451 => 'Michelago', - 61261452 => 'Canberra', 61261453 => 'Yass', 61261454 => 'Captains Flat', 61261455 => 'Cavan', @@ -6562,8 +5991,6 @@ 61261457 => 'Gundaroo', 61261458 => 'Gearys Gap', 61261459 => 'Bungendore', - 6126146 => 'Canberra', - 6126147 => 'Canberra', 61261480 => 'Burrinjuck', 61261481 => 'The Mullion', 61261482 => 'Uriarra Forest', @@ -6573,7 +6000,6 @@ 61261486 => 'Burrinjuck', 61261487 => 'Michelago', 61261488 => 'Yass', - 61261489 => 'Canberra', 61261490 => 'Captains Flat', 61261491 => 'Captains Flat', 61261492 => 'Cavan', @@ -6589,41 +6015,16 @@ 61261502 => 'Bungendore', 61261503 => 'Rye Park', 61261504 => 'Burrinjuck', - 61261505 => 'Canberra', - 61261506 => 'Canberra', - 61261507 => 'Canberra', - 61261508 => 'Canberra', - 61261509 => 'Canberra', - 6126151 => 'Canberra', - 61261520 => 'Canberra', - 61261521 => 'Canberra', - 61261522 => 'Canberra', - 61261523 => 'Canberra', - 61261524 => 'Canberra', - 61261525 => 'Canberra', 61261526 => 'Yass', 61261527 => 'Yass', - 61261528 => 'Canberra', - 61261529 => 'Canberra', - 61261530 => 'Canberra', - 61261531 => 'Canberra', - 61261532 => 'Canberra', - 61261533 => 'Canberra', - 61261534 => 'Canberra', - 61261535 => 'Canberra', - 61261536 => 'Canberra', 61261537 => 'The Mullion', 61261538 => 'Bungendore', 61261539 => 'Michelago', - 6126154 => 'Canberra', - 6126155 => 'Canberra', - 6126156 => 'Canberra', 61261570 => 'Anembo', 61261571 => 'Binalong', 61261572 => 'Yass', 61261573 => 'Bungendore', 61261574 => 'Burrinjuck', - 61261575 => 'Canberra', 61261576 => 'Captains Flat', 61261577 => 'Cavan', 61261578 => 'Uriarra Forest', @@ -6641,17 +6042,7 @@ 61261590 => 'The Mullion', 61261591 => 'Gearys Gap', 61261592 => 'Rye Park', - 61261593 => 'Canberra', - 61261594 => 'Canberra', - 61261595 => 'Canberra', - 61261596 => 'Canberra', - 61261597 => 'Canberra', - 61261598 => 'Canberra', 61261599 => 'Uriarra Forest', - 6126160 => 'Canberra', - 6126161 => 'Canberra', - 6126162 => 'Canberra', - 6126163 => 'Canberra', 61261640 => 'Anembo', 61261641 => 'Binalong', 61261642 => 'Bungendore', @@ -6662,9 +6053,6 @@ 61261647 => 'Gundaroo', 61261648 => 'Michelago', 61261649 => 'Rye Park', - 6126165 => 'Canberra', - 6126166 => 'Canberra', - 6126167 => 'Canberra', 61261680 => 'Burrinjuck', 61261681 => 'Binalong', 61261682 => 'Bungendore', @@ -6678,73 +6066,16 @@ 61261690 => 'Rye Park', 61261691 => 'Yass', 61261692 => 'Uriarra Forest', - 61261693 => 'Canberra', - 61261694 => 'Canberra', - 61261695 => 'Canberra', - 61261696 => 'Canberra', - 61261697 => 'Canberra', 61261698 => 'Bungendore', 61261699 => 'Bungendore', - 6126170 => 'Canberra', - 6126171 => 'Canberra', - 6126172 => 'Canberra', - 6126173 => 'Canberra', - 6126174 => 'Canberra', - 6126175 => 'Canberra', - 6126176 => 'Canberra', - 6126177 => 'Canberra', - 6126178 => 'Canberra', 61261790 => 'Yass', 61261791 => 'Michelago', 61261792 => 'Gundaroo', - 61261793 => 'Canberra', - 61261794 => 'Canberra', - 61261795 => 'Canberra', - 61261796 => 'Canberra', - 61261797 => 'Canberra', - 61261798 => 'Canberra', - 61261799 => 'Canberra', - 6126180 => 'Canberra', - 6126181 => 'Canberra', - 6126182 => 'Canberra', - 6126183 => 'Canberra', - 6126184 => 'Canberra', - 6126185 => 'Canberra', - 6126186 => 'Canberra', - 6126187 => 'Canberra', - 61261880 => 'Canberra', 61261881 => 'Captains Flat', - 61261882 => 'Canberra', - 61261883 => 'Canberra', - 61261884 => 'Canberra', - 61261885 => 'Canberra', - 61261886 => 'Canberra', - 61261887 => 'Canberra', - 61261888 => 'Canberra', - 61261889 => 'Canberra', - 6126189 => 'Canberra', - 6126190 => 'Canberra', - 6126191 => 'Canberra', - 6126192 => 'Canberra', - 6126193 => 'Canberra', - 61261940 => 'Canberra', - 61261941 => 'Canberra', - 61261942 => 'Canberra', - 61261943 => 'Canberra', - 61261944 => 'Canberra', - 61261945 => 'Canberra', 61261946 => 'Rye Park', 61261947 => 'Gearys Gap', 61261948 => 'Gundaroo', - 61261949 => 'Canberra', - 6126195 => 'Canberra', - 6126196 => 'Canberra', - 6126197 => 'Canberra', - 6126198 => 'Canberra', - 6126199 => 'Canberra', - 612620 => 'Canberra', - 612621 => 'Canberra', - 61262200 => 'Canberra', + 61262 => 'Canberra', 61262201 => 'Yass', 61262202 => 'Yass', 61262203 => 'Binalong', @@ -6752,23 +6083,8 @@ 61262205 => 'Cavan', 61262206 => 'Rye Park', 61262207 => 'The Mullion', - 61262208 => 'Canberra', - 61262209 => 'Canberra', - 6126221 => 'Canberra', - 6126222 => 'Canberra', - 6126223 => 'Canberra', - 6126224 => 'Canberra', - 6126225 => 'Canberra', - 61262260 => 'Yass', - 61262261 => 'Yass', - 61262262 => 'Yass', - 61262263 => 'Yass', - 61262264 => 'Yass', - 61262265 => 'Yass', - 61262266 => 'Yass', - 61262267 => 'Yass', + 6126226 => 'Yass', 61262268 => 'The Mullion', - 61262269 => 'Yass', 61262270 => 'The Mullion', 61262271 => 'Yass', 61262272 => 'Rye Park', @@ -6779,21 +6095,7 @@ 61262277 => 'Binalong', 61262278 => 'Burrinjuck', 61262279 => 'Cavan', - 6126228 => 'Canberra', - 6126229 => 'Canberra', - 61262300 => 'Canberra', - 61262301 => 'Canberra', - 61262302 => 'Canberra', - 61262303 => 'Canberra', - 61262304 => 'Canberra', - 61262305 => 'Canberra', - 61262306 => 'Canberra', - 61262307 => 'Canberra', 61262308 => 'Anembo', - 61262309 => 'Canberra', - 6126231 => 'Canberra', - 6126232 => 'Canberra', - 61262330 => 'Canberra', 61262331 => 'Bungendore', 61262332 => 'Gearys Gap', 61262333 => 'Gundaroo', @@ -6801,9 +6103,6 @@ 61262335 => 'Michelago', 61262336 => 'Captains Flat', 61262337 => 'Anembo', - 61262338 => 'Canberra', - 61262339 => 'Canberra', - 6126234 => 'Canberra', 6126235 => 'Michelago', 61262360 => 'Uriarra Forest', 61262361 => 'Uriarra Forest', @@ -6817,13 +6116,6 @@ 61262369 => 'Gearys Gap', 6126237 => 'Michelago', 6126238 => 'Bungendore', - 6126239 => 'Canberra', - 612624 => 'Canberra', - 612625 => 'Canberra', - 612626 => 'Canberra', - 612627 => 'Canberra', - 612628 => 'Canberra', - 612629 => 'Canberra', 61263000 => 'Bathurst', 61263001 => 'Burraga', 61263002 => 'Gingkin', @@ -7115,11 +6407,7 @@ 61263297 => 'Rockley', 61263298 => 'Oberon', 61263299 => 'Burraga', - 6126330 => 'Bathurst', - 6126331 => 'Bathurst', - 6126332 => 'Bathurst', - 6126333 => 'Bathurst', - 6126334 => 'Bathurst', + 612633 => 'Bathurst', 61263350 => 'Hill End', 61263351 => 'Hill End', 61263352 => 'Limekilns', @@ -7130,33 +6418,14 @@ 61263357 => 'Gingkin', 61263358 => 'Burraga', 61263359 => 'Gingkin', - 61263360 => 'Oberon', - 61263361 => 'Oberon', - 61263362 => 'Oberon', - 61263363 => 'Oberon', - 61263364 => 'Oberon', - 61263365 => 'Oberon', - 61263366 => 'Oberon', - 61263367 => 'Oberon', - 61263368 => 'Bathurst', - 61263369 => 'Bathurst', + 6126336 => 'Oberon', 61263370 => 'Burraga', - 61263371 => 'Bathurst', - 61263372 => 'Bathurst', - 61263373 => 'Bathurst', 61263374 => 'Killongbutta', 61263375 => 'Yetholme', - 61263376 => 'Bathurst', 61263377 => 'Limekilns', 61263378 => 'Hill End', 61263379 => 'Rockley', 61263380 => 'Limekilns', - 61263381 => 'Bathurst', - 61263382 => 'Bathurst', - 61263383 => 'Bathurst', - 61263384 => 'Bathurst', - 61263385 => 'Bathurst', - 61263386 => 'Bathurst', 61263387 => 'Gingkin', 61263388 => 'Hill End', 61263389 => 'Killongbutta', @@ -7164,12 +6433,7 @@ 61263391 => 'Oberon', 61263392 => 'Rockley', 61263393 => 'Yetholme', - 61263394 => 'Bathurst', - 61263395 => 'Bathurst', 61263396 => 'Oberon', - 61263397 => 'Bathurst', - 61263398 => 'Bathurst', - 61263399 => 'Bathurst', 61263400 => 'Cowra', 61263401 => 'Cowra', 61263402 => 'Cowra', @@ -7182,16 +6446,9 @@ 61263409 => 'Cowra', 6126341 => 'Cowra', 6126342 => 'Cowra', - 61263430 => 'Grenfell', - 61263431 => 'Grenfell', - 61263432 => 'Grenfell', - 61263433 => 'Grenfell', - 61263434 => 'Grenfell', - 61263435 => 'Grenfell', + 6126343 => 'Grenfell', 61263436 => 'Greenethorpe', - 61263437 => 'Grenfell', 61263438 => 'Tyagong', - 61263439 => 'Grenfell', 6126344 => 'Canowindra', 61263450 => 'Woodstock', 61263451 => 'Woodstock', @@ -7243,47 +6500,17 @@ 61263497 => 'Tyagong', 61263498 => 'Cowra', 61263499 => 'Cowra', - 61263500 => 'Lithgow', - 61263501 => 'Lithgow', - 61263502 => 'Lithgow', - 61263503 => 'Lithgow', + 612635 => 'Lithgow', 61263504 => 'Hampton', 61263505 => 'Meadow Flat', 61263506 => 'Portland', - 61263507 => 'Lithgow', - 61263508 => 'Lithgow', - 61263509 => 'Lithgow', - 6126351 => 'Lithgow', - 6126352 => 'Lithgow', - 6126353 => 'Lithgow', - 6126354 => 'Lithgow', - 61263550 => 'Lithgow', - 61263551 => 'Lithgow', - 61263552 => 'Lithgow', - 61263553 => 'Lithgow', 61263554 => 'Portland', 61263555 => 'Portland', - 61263556 => 'Lithgow', - 61263557 => 'Lithgow', - 61263558 => 'Lithgow', - 61263559 => 'Lithgow', - 6126356 => 'Lithgow', - 61263570 => 'Kandos', + 6126357 => 'Kandos', 61263571 => 'Running Stream', 61263572 => 'Bylong', - 61263573 => 'Kandos', 61263574 => 'Glen Davis', - 61263575 => 'Kandos', - 61263576 => 'Kandos', - 61263577 => 'Kandos', - 61263578 => 'Kandos', - 61263579 => 'Kandos', - 61263580 => 'Bathurst', - 61263581 => 'Bathurst', - 61263582 => 'Bathurst', - 61263583 => 'Bathurst', - 61263584 => 'Bathurst', - 61263585 => 'Bathurst', + 6126358 => 'Bathurst', 61263586 => 'Running Stream', 61263587 => 'Running Stream', 61263588 => 'Running Stream', @@ -7298,10 +6525,7 @@ 61263597 => 'Meadow Flat', 61263598 => 'Meadow Flat', 61263599 => 'Meadow Flat', - 6126360 => 'Orange', - 6126361 => 'Orange', - 6126362 => 'Orange', - 6126363 => 'Orange', + 612636 => 'Orange', 61263640 => 'Cudal', 61263641 => 'Euchareena', 61263642 => 'Cudal', @@ -7312,15 +6536,9 @@ 61263647 => 'Manildra', 61263648 => 'Euchareena', 61263649 => 'Manildra', - 6126365 => 'Orange', + 6126366 => 'Millthorpe', 61263660 => 'Euchareena', 61263661 => 'Molong', - 61263662 => 'Millthorpe', - 61263663 => 'Millthorpe', - 61263664 => 'Millthorpe', - 61263665 => 'Millthorpe', - 61263666 => 'Millthorpe', - 61263667 => 'Millthorpe', 61263668 => 'Molong', 61263669 => 'Molong', 61263670 => 'Millthorpe', @@ -7333,36 +6551,17 @@ 61263677 => 'Cumnock', 61263678 => 'Cumnock', 61263679 => 'Baldry', + 6126368 => 'Blayney', 61263680 => 'Neville', - 61263681 => 'Blayney', - 61263682 => 'Blayney', - 61263683 => 'Blayney', - 61263684 => 'Blayney', - 61263685 => 'Blayney', - 61263686 => 'Blayney', - 61263687 => 'Blayney', 61263688 => 'Neville', - 61263689 => 'Blayney', - 61263690 => 'Orange', - 61263691 => 'Orange', - 61263692 => 'Orange', - 61263693 => 'Orange', 61263694 => 'Molong', 61263695 => 'Molong', 61263696 => 'Molong', - 61263697 => 'Orange', - 61263698 => 'Orange', - 61263699 => 'Orange', - 61263700 => 'Mudgee', + 6126370 => 'Mudgee', 61263701 => 'Twelve Mile', 61263702 => 'Wollar', 61263703 => 'Dunedoo', 61263704 => 'Windeyer', - 61263705 => 'Mudgee', - 61263706 => 'Mudgee', - 61263707 => 'Mudgee', - 61263708 => 'Mudgee', - 61263709 => 'Mudgee', 61263710 => 'Wollar', 61263711 => 'Wollar', 61263712 => 'Wollar', @@ -7394,14 +6593,8 @@ 61263747 => 'Laheys Creek', 61263748 => 'Laheys Creek', 61263749 => 'Laheys Creek', + 6126375 => 'Dunedoo', 61263750 => 'Leadville', - 61263751 => 'Dunedoo', - 61263752 => 'Dunedoo', - 61263753 => 'Dunedoo', - 61263754 => 'Dunedoo', - 61263755 => 'Dunedoo', - 61263756 => 'Dunedoo', - 61263757 => 'Dunedoo', 61263758 => 'Birriwa', 61263759 => 'Birriwa', 61263760 => 'Cassilis', @@ -7425,13 +6618,7 @@ 61263787 => 'Gulgong', 61263788 => 'Laheys Creek', 61263789 => 'Leadville', - 61263790 => 'Kandos', - 61263791 => 'Kandos', - 61263792 => 'Kandos', - 61263793 => 'Kandos', - 61263794 => 'Kandos', - 61263795 => 'Kandos', - 61263796 => 'Kandos', + 6126379 => 'Kandos', 61263797 => 'Glen Davis', 61263798 => 'Bylong', 61263799 => 'Bylong', @@ -7466,36 +6653,19 @@ 61263837 => 'Monteagle', 61263838 => 'Monteagle', 61263839 => 'Monteagle', - 61263840 => 'Young', - 61263841 => 'Young', - 61263842 => 'Young', - 61263843 => 'Young', - 61263844 => 'Young', + 6126384 => 'Young', 61263845 => 'Murringo', 61263846 => 'Murringo', 61263847 => 'Milvale', 61263848 => 'Milvale', - 61263849 => 'Young', - 61263850 => 'Boorowa', - 61263851 => 'Boorowa', - 61263852 => 'Boorowa', - 61263853 => 'Boorowa', - 61263854 => 'Boorowa', - 61263855 => 'Boorowa', + 6126385 => 'Boorowa', 61263856 => 'Frogmore', 61263857 => 'Frogmore', 61263858 => 'Frogmore', 61263859 => 'Frogmore', - 61263860 => 'Harden', - 61263861 => 'Harden', - 61263862 => 'Harden', - 61263863 => 'Harden', - 61263864 => 'Harden', - 61263865 => 'Harden', - 61263866 => 'Harden', + 6126386 => 'Harden', 61263867 => 'Galong', 61263868 => 'Galong', - 61263869 => 'Harden', 61263870 => 'Blayney', 61263871 => 'Cudal', 61263872 => 'Cumnock', @@ -8129,16 +7299,10 @@ 61264518 => 'Bombala', 61264519 => 'Bombala', 6126452 => 'Cooma', - 61264530 => 'Cooma', - 61264531 => 'Cooma', - 61264532 => 'Cooma', + 6126453 => 'Cooma', 61264533 => 'Numeralla', - 61264534 => 'Cooma', 61264535 => 'Bobundara', 61264536 => 'Bobundara', - 61264537 => 'Cooma', - 61264538 => 'Cooma', - 61264539 => 'Cooma', 61264540 => 'Adaminaby', 61264541 => 'Adaminaby', 61264542 => 'Adaminaby', @@ -8150,24 +7314,14 @@ 61264548 => 'Cabramurra', 61264549 => 'Cabramurra', 6126455 => 'Cooma', - 61264560 => 'Berridale', - 61264561 => 'Berridale', - 61264562 => 'Berridale', - 61264563 => 'Berridale', - 61264564 => 'Berridale', + 6126456 => 'Berridale', 61264565 => 'Dalgety', 61264566 => 'Dalgety', - 61264567 => 'Berridale', 61264568 => 'Eucumbene', 61264569 => 'Eucumbene', - 61264570 => 'Thredbo Village', + 6126457 => 'Thredbo Village', 61264571 => 'Berridale', 61264572 => 'Berridale', - 61264573 => 'Thredbo Village', - 61264574 => 'Thredbo Village', - 61264575 => 'Thredbo Village', - 61264576 => 'Thredbo Village', - 61264577 => 'Thredbo Village', 61264578 => 'Jindabyne South', 61264579 => 'Jindabyne South', 61264580 => 'Bonang', @@ -8272,16 +7426,10 @@ 61264909 => 'Dalgety', 6126491 => 'Bega', 6126492 => 'Bega', + 6126493 => 'Cobargo', 61264930 => 'Bemboka', 61264931 => 'Candelo', 61264932 => 'Candelo', - 61264933 => 'Cobargo', - 61264934 => 'Cobargo', - 61264935 => 'Cobargo', - 61264936 => 'Cobargo', - 61264937 => 'Cobargo', - 61264938 => 'Cobargo', - 61264939 => 'Cobargo', 61264940 => 'Tathra', 61264941 => 'Tathra', 61264942 => 'Candelo', @@ -8293,15 +7441,7 @@ 61264948 => 'Bega', 61264949 => 'Merimbula', 6126495 => 'Merimbula', - 61264960 => 'Eden', - 61264961 => 'Eden', - 61264962 => 'Eden', - 61264963 => 'Eden', - 61264964 => 'Eden', - 61264965 => 'Eden', - 61264966 => 'Eden', - 61264967 => 'Eden', - 61264968 => 'Eden', + 6126496 => 'Eden', 61264969 => 'Wonboyn Lake', 61264970 => 'Bemboka', 61264971 => 'Candelo', @@ -8723,12 +7863,7 @@ 61265387 => 'Krambach', 61265388 => 'Pacific Palms', 61265389 => 'Rawdon Vale', - 61265390 => 'Taree', - 61265391 => 'Taree', - 61265392 => 'Taree', - 61265393 => 'Taree', - 61265394 => 'Taree', - 61265395 => 'Taree', + 6126539 => 'Taree', 61265396 => 'Forster', 61265397 => 'Forster', 61265398 => 'Forster', @@ -8756,16 +7891,11 @@ 61265447 => 'Muswellbrook', 61265448 => 'Muswellbrook', 61265449 => 'Muswellbrook', - 61265450 => 'Scone', - 61265451 => 'Scone', - 61265452 => 'Scone', - 61265453 => 'Scone', + 6126545 => 'Scone', 61265454 => 'Bunnan', 61265455 => 'Bunnan', 61265456 => 'Bunnan', 61265457 => 'Bunnan', - 61265458 => 'Scone', - 61265459 => 'Scone', 61265460 => 'Murrurundi', 61265461 => 'Moonan Flat', 61265462 => 'Moonan Flat', @@ -8786,13 +7916,7 @@ 61265477 => 'Baerami', 61265478 => 'Castle Rock', 61265479 => 'Castle Rock', - 61265480 => 'Merriwa', - 61265481 => 'Merriwa', - 61265482 => 'Merriwa', - 61265483 => 'Merriwa', - 61265484 => 'Merriwa', - 61265485 => 'Merriwa', - 61265486 => 'Merriwa', + 6126548 => 'Merriwa', 61265487 => 'Idaville', 61265488 => 'Idaville', 61265489 => 'Idaville', @@ -8817,59 +7941,27 @@ 61265508 => 'Mount George', 61265509 => 'Pacific Palms', 6126551 => 'Taree', - 61265520 => 'Taree', - 61265521 => 'Taree', - 61265522 => 'Taree', - 61265523 => 'Taree', - 61265524 => 'Taree', - 61265525 => 'Taree', - 61265526 => 'Taree', - 61265527 => 'Taree', - 61265528 => 'Taree', + 6126552 => 'Taree', 61265529 => 'Pacific Palms', 6126553 => 'Taree', + 6126554 => 'Forster', 61265540 => 'Pacific Palms', - 61265541 => 'Forster', - 61265542 => 'Forster', - 61265543 => 'Forster', 61265544 => 'Pacific Palms', - 61265545 => 'Forster', - 61265546 => 'Forster', - 61265547 => 'Forster', - 61265548 => 'Forster', - 61265549 => 'Forster', 6126555 => 'Forster', 6126556 => 'Coopernook', - 61265570 => 'Taree', - 61265571 => 'Taree', + 6126557 => 'Taree', 61265572 => 'Forster', - 61265573 => 'Taree', - 61265574 => 'Taree', 61265575 => 'Forster', 61265576 => 'Forster', - 61265577 => 'Taree', - 61265578 => 'Taree', - 61265579 => 'Taree', - 61265580 => 'Gloucester', - 61265581 => 'Gloucester', - 61265582 => 'Gloucester', + 6126558 => 'Gloucester', 61265583 => 'Rawdon Vale', - 61265584 => 'Gloucester', 61265585 => 'Rawdon Vale', 61265586 => 'Rookhurst', 61265587 => 'Rookhurst', - 61265588 => 'Gloucester', - 61265589 => 'Gloucester', - 61265590 => 'Coopernook', + 6126559 => 'Coopernook', 61265591 => 'Krambach', 61265592 => 'Taree', 61265593 => 'Taree', - 61265594 => 'Coopernook', - 61265595 => 'Coopernook', - 61265596 => 'Coopernook', - 61265597 => 'Coopernook', - 61265598 => 'Coopernook', - 61265599 => 'Coopernook', 61265600 => 'Taylors Arm', 61265601 => 'Kempsey', 61265602 => 'Kempsey', @@ -8882,37 +7974,17 @@ 61265609 => 'Bowraville', 6126561 => 'Kempsey', 6126562 => 'Kempsey', - 61265630 => 'Kempsey', - 61265631 => 'Kempsey', + 6126563 => 'Kempsey', 61265632 => 'Lord Howe Island', - 61265633 => 'Kempsey', - 61265634 => 'Kempsey', - 61265635 => 'Kempsey', - 61265636 => 'Kempsey', - 61265637 => 'Kempsey', - 61265638 => 'Kempsey', - 61265639 => 'Kempsey', + 6126564 => 'Bowraville', 61265640 => 'Taylors Arm', 61265641 => 'Rawdon Vale', 61265642 => 'Taylors Arm', - 61265643 => 'Bowraville', - 61265644 => 'Bowraville', - 61265645 => 'Bowraville', - 61265646 => 'Bowraville', - 61265647 => 'Bowraville', - 61265648 => 'Bowraville', - 61265649 => 'Bowraville', 6126565 => 'Smithtown', - 61265660 => 'Kempsey', - 61265661 => 'Kempsey', - 61265662 => 'Kempsey', - 61265663 => 'Kempsey', - 61265664 => 'Kempsey', + 6126566 => 'Kempsey', 61265665 => 'Smithtown', 61265666 => 'Smithtown', 61265667 => 'Smithtown', - 61265668 => 'Kempsey', - 61265669 => 'Kempsey', 61265670 => 'Smithtown', 61265671 => 'Toorooka', 61265672 => 'Toorooka', @@ -8924,41 +7996,23 @@ 61265678 => 'Comara', 61265679 => 'Toorooka', 6126568 => 'Macksville', + 6126569 => 'Macksville', 61265690 => 'Stuarts Point', 61265691 => 'Stuarts Point', - 61265692 => 'Macksville', - 61265693 => 'Macksville', - 61265694 => 'Macksville', - 61265695 => 'Macksville', - 61265696 => 'Macksville', - 61265697 => 'Macksville', - 61265698 => 'Macksville', 61265699 => 'Stuarts Point', + 612657 => 'Singleton', 61265700 => 'Ravensworth', - 61265701 => 'Singleton', - 61265702 => 'Singleton', - 61265703 => 'Singleton', 61265704 => 'Broke', 61265705 => 'Mount Olive', 61265706 => 'Glendonbrook', 61265707 => 'Howes Valley', 61265708 => 'Jerrys Plains', 61265709 => 'Ravensworth', - 6126571 => 'Singleton', - 6126572 => 'Singleton', - 6126573 => 'Singleton', - 6126574 => 'Singleton', - 6126575 => 'Singleton', + 6126576 => 'Jerrys Plains', 61265760 => 'Ravensworth', 61265761 => 'Ravensworth', 61265762 => 'Ravensworth', 61265763 => 'Ravensworth', - 61265764 => 'Jerrys Plains', - 61265765 => 'Jerrys Plains', - 61265766 => 'Jerrys Plains', - 61265767 => 'Jerrys Plains', - 61265768 => 'Jerrys Plains', - 61265769 => 'Jerrys Plains', 61265770 => 'Mount Olive', 61265771 => 'Mount Olive', 61265772 => 'Mount Olive', @@ -8969,7 +8023,6 @@ 61265777 => 'Glendonbrook', 61265778 => 'Glendonbrook', 61265779 => 'Glendonbrook', - 6126578 => 'Singleton', 61265790 => 'Broke', 61265791 => 'Broke', 61265792 => 'Broke', @@ -8980,52 +8033,20 @@ 61265797 => 'Putty', 61265798 => 'Broke', 61265799 => 'Broke', - 61265800 => 'Port Macquarie', - 61265801 => 'Port Macquarie', - 61265802 => 'Port Macquarie', - 61265803 => 'Port Macquarie', + 612658 => 'Port Macquarie', 61265804 => 'Ellenborough', 61265805 => 'Telegraph Point', 61265806 => 'Byabarra', - 61265807 => 'Port Macquarie', - 61265808 => 'Port Macquarie', - 61265809 => 'Port Macquarie', - 6126581 => 'Port Macquarie', - 6126582 => 'Port Macquarie', - 6126583 => 'Port Macquarie', - 6126584 => 'Port Macquarie', 61265850 => 'Telegraph Point', - 61265851 => 'Port Macquarie', - 61265852 => 'Port Macquarie', - 61265853 => 'Port Macquarie', - 61265854 => 'Port Macquarie', - 61265855 => 'Port Macquarie', - 61265856 => 'Port Macquarie', - 61265857 => 'Port Macquarie', 61265858 => 'Telegraph Point', 61265859 => 'Telegraph Point', - 6126586 => 'Port Macquarie', + 6126587 => 'Ellenborough', 61265870 => 'Byabarra', 61265871 => 'Byabarra', 61265872 => 'Byabarra', 61265873 => 'Byabarra', - 61265874 => 'Ellenborough', - 61265875 => 'Ellenborough', - 61265876 => 'Ellenborough', - 61265877 => 'Ellenborough', - 61265878 => 'Ellenborough', - 61265879 => 'Ellenborough', - 6126588 => 'Port Macquarie', 61265890 => 'Telegraph Point', 61265891 => 'Telegraph Point', - 61265892 => 'Port Macquarie', - 61265893 => 'Port Macquarie', - 61265894 => 'Port Macquarie', - 61265895 => 'Port Macquarie', - 61265896 => 'Port Macquarie', - 61265897 => 'Port Macquarie', - 61265898 => 'Port Macquarie', - 61265899 => 'Port Macquarie', 6126590 => 'Port Macquarie', 61265910 => 'Pacific Palms', 61265911 => 'Taree', @@ -9037,16 +8058,10 @@ 61265917 => 'Forster', 61265918 => 'Krambach', 61265919 => 'Mount George', - 61265920 => 'Taree', + 6126592 => 'Taree', 61265921 => 'Rawdon Vale', 61265922 => 'Rookhurst', 61265923 => 'Gloucester', - 61265924 => 'Taree', - 61265925 => 'Taree', - 61265926 => 'Taree', - 61265927 => 'Taree', - 61265928 => 'Taree', - 61265929 => 'Taree', 61265930 => 'Pacific Palms', 61265931 => 'Rawdon Vale', 61265932 => 'Rookhurst', @@ -9138,12 +8153,7 @@ 61266027 => 'Dorrigo', 61266028 => 'Dorrigo', 61266029 => 'Bonalbo', - 61266030 => 'Maclean', - 61266031 => 'Maclean', - 61266032 => 'Maclean', - 61266033 => 'Maclean', - 61266034 => 'Maclean', - 61266035 => 'Maclean', + 6126603 => 'Maclean', 61266036 => 'Coutts Crossing', 61266037 => 'Coutts Crossing', 61266038 => 'Glenreagh', @@ -9290,44 +8300,18 @@ 61266197 => 'Thora', 61266198 => 'Tyringham', 61266199 => 'Ulong', - 61266200 => 'Lismore', - 61266201 => 'Lismore', - 61266202 => 'Lismore', - 61266203 => 'Lismore', - 61266204 => 'Lismore', + 612662 => 'Lismore', 61266205 => 'Ballina', 61266206 => 'Ballina', - 61266207 => 'Lismore', 61266208 => 'Woodburn', 61266209 => 'Mullumbimby', - 6126621 => 'Lismore', - 6126622 => 'Lismore', - 6126623 => 'Lismore', - 6126624 => 'Lismore', - 6126625 => 'Lismore', - 61266260 => 'Lismore', - 61266261 => 'Lismore', - 61266262 => 'Lismore', - 61266263 => 'Lismore', - 61266264 => 'Lismore', - 61266265 => 'Lismore', - 61266266 => 'Lismore', 61266267 => 'Mullumbimby', 61266268 => 'Ballina', - 61266269 => 'Lismore', - 6126627 => 'Lismore', - 6126628 => 'Lismore', - 6126629 => 'Lismore', - 61266300 => 'Kyogle', - 61266301 => 'Kyogle', + 6126630 => 'Kyogle', 61266302 => 'Ettrick', 61266303 => 'Urbenville', 61266304 => 'Wiangaree', 61266305 => 'Woodenbong', - 61266306 => 'Kyogle', - 61266307 => 'Kyogle', - 61266308 => 'Kyogle', - 61266309 => 'Kyogle', 61266310 => 'Copmanhurst', 61266311 => 'Coutts Crossing', 61266312 => 'Glenreagh', @@ -9339,15 +8323,7 @@ 61266318 => 'Kyogle', 61266319 => 'Urbenville', 6126632 => 'Kyogle', - 61266330 => 'Kyogle', - 61266331 => 'Kyogle', - 61266332 => 'Kyogle', - 61266333 => 'Kyogle', - 61266334 => 'Kyogle', - 61266335 => 'Kyogle', - 61266336 => 'Kyogle', - 61266337 => 'Kyogle', - 61266338 => 'Kyogle', + 6126633 => 'Kyogle', 61266339 => 'Ettrick', 6126634 => 'Urbenville', 6126635 => 'Woodenbong', @@ -9389,24 +8365,14 @@ 6126644 => 'Grafton', 6126645 => 'Maclean', 6126646 => 'Maclean', - 61266470 => 'Copmanhurst', - 61266471 => 'Copmanhurst', - 61266472 => 'Copmanhurst', - 61266473 => 'Copmanhurst', - 61266474 => 'Copmanhurst', - 61266475 => 'Copmanhurst', + 6126647 => 'Copmanhurst', 61266476 => 'Maclean', 61266477 => 'Lawrence', 61266478 => 'Lawrence', 61266479 => 'Lawrence', + 6126648 => 'Coffs Harbour', 61266480 => 'Thora', 61266481 => 'Ulong', - 61266482 => 'Coffs Harbour', - 61266483 => 'Coffs Harbour', - 61266484 => 'Coffs Harbour', - 61266485 => 'Coffs Harbour', - 61266486 => 'Coffs Harbour', - 61266487 => 'Coffs Harbour', 61266488 => 'Hernani', 61266489 => 'Tyringham', 61266490 => 'Glenreagh', @@ -9419,52 +8385,18 @@ 61266497 => 'Wooli', 61266498 => 'Wooli', 61266499 => 'Wooli', - 6126650 => 'Coffs Harbour', - 6126651 => 'Coffs Harbour', - 6126652 => 'Coffs Harbour', - 6126653 => 'Coffs Harbour', - 61266540 => 'Coffs Harbour', - 61266541 => 'Coffs Harbour', - 61266542 => 'Coffs Harbour', - 61266543 => 'Coffs Harbour', - 61266544 => 'Coffs Harbour', + 612665 => 'Coffs Harbour', 61266545 => 'Ulong', 61266546 => 'Ulong', - 61266547 => 'Coffs Harbour', - 61266548 => 'Coffs Harbour', - 61266549 => 'Coffs Harbour', - 61266550 => 'Bellingen', - 61266551 => 'Bellingen', - 61266552 => 'Bellingen', - 61266553 => 'Bellingen', - 61266554 => 'Bellingen', - 61266555 => 'Bellingen', - 61266556 => 'Bellingen', - 61266557 => 'Bellingen', + 6126655 => 'Bellingen', 61266558 => 'Thora', - 61266559 => 'Bellingen', - 6126656 => 'Coffs Harbour', - 61266570 => 'Dorrigo', - 61266571 => 'Dorrigo', - 61266572 => 'Dorrigo', - 61266573 => 'Dorrigo', - 61266574 => 'Dorrigo', - 61266575 => 'Dorrigo', + 6126657 => 'Dorrigo', 61266576 => 'Hernani', 61266577 => 'Hernani', 61266578 => 'Tyringham', 61266579 => 'Tyringham', - 6126658 => 'Coffs Harbour', 61266590 => 'Dorrigo', - 61266591 => 'Coffs Harbour', - 61266592 => 'Coffs Harbour', - 61266593 => 'Coffs Harbour', - 61266594 => 'Coffs Harbour', 61266595 => 'Bellingen', - 61266596 => 'Coffs Harbour', - 61266597 => 'Coffs Harbour', - 61266598 => 'Coffs Harbour', - 61266599 => 'Coffs Harbour', 61266600 => 'Casino', 61266601 => 'Casino', 61266602 => 'Casino', @@ -9475,15 +8407,10 @@ 61266607 => 'Mallanganee', 61266608 => 'Tabulam', 61266609 => 'Bonalbo', - 61266610 => 'Casino', + 6126661 => 'Casino', 61266611 => 'Tabulam', - 61266612 => 'Casino', 61266613 => 'Tabulam', - 61266614 => 'Casino', - 61266615 => 'Casino', - 61266616 => 'Casino', 61266617 => 'Rappville', - 61266618 => 'Casino', 61266619 => 'Whiporie', 6126662 => 'Casino', 6126663 => 'Casino', @@ -9497,16 +8424,8 @@ 61266647 => 'Mallanganee', 61266648 => 'Mallanganee', 61266649 => 'Mallanganee', + 6126665 => 'Bonalbo', 61266650 => 'Hernani', - 61266651 => 'Bonalbo', - 61266652 => 'Bonalbo', - 61266653 => 'Bonalbo', - 61266654 => 'Bonalbo', - 61266655 => 'Bonalbo', - 61266656 => 'Bonalbo', - 61266657 => 'Bonalbo', - 61266658 => 'Bonalbo', - 61266659 => 'Bonalbo', 6126666 => 'Tabulam', 6126667 => 'Dyraaba', 61266680 => 'Thora', @@ -9520,20 +8439,8 @@ 61266688 => 'Rappville', 61266689 => 'Rappville', 6126669 => 'Grafton', - 61266700 => 'Murwillumbah', - 61266701 => 'Murwillumbah', - 61266702 => 'Murwillumbah', + 612667 => 'Murwillumbah', 61266703 => 'Tyalgum', - 61266704 => 'Murwillumbah', - 61266705 => 'Murwillumbah', - 61266706 => 'Murwillumbah', - 61266707 => 'Murwillumbah', - 61266708 => 'Murwillumbah', - 61266709 => 'Murwillumbah', - 6126671 => 'Murwillumbah', - 6126672 => 'Murwillumbah', - 6126673 => 'Murwillumbah', - 6126674 => 'Murwillumbah', 61266750 => 'Grafton', 61266751 => 'Lawrence', 61266752 => 'Ettrick', @@ -9544,11 +8451,8 @@ 61266757 => 'Nimbin', 61266758 => 'Woodburn', 61266759 => 'Ballina', - 6126676 => 'Murwillumbah', - 6126677 => 'Murwillumbah', 61266780 => 'Lismore', 61266781 => 'Mullumbimby', - 61266782 => 'Murwillumbah', 61266783 => 'Tyalgum', 61266784 => 'Bonalbo', 61266785 => 'Casino', @@ -9560,16 +8464,9 @@ 6126680 => 'Mullumbimby', 6126681 => 'Ballina', 6126682 => 'Woodburn', - 61266830 => 'Woodburn', - 61266831 => 'Woodburn', - 61266832 => 'Woodburn', - 61266833 => 'Woodburn', + 6126683 => 'Woodburn', 61266834 => 'Ballina', 61266835 => 'Ballina', - 61266836 => 'Woodburn', - 61266837 => 'Woodburn', - 61266838 => 'Woodburn', - 61266839 => 'Woodburn', 6126684 => 'Mullumbimby', 6126685 => 'Mullumbimby', 6126686 => 'Ballina', @@ -10023,16 +8920,10 @@ 61267407 => 'Kelvin', 61267408 => 'Mullaley', 61267409 => 'Tambar Springs', - 61267410 => 'Gunnedah', + 6126741 => 'Gunnedah', 61267411 => 'Pine Ridge', 61267412 => 'Quirindi', 61267413 => 'Willow Tree', - 61267414 => 'Gunnedah', - 61267415 => 'Gunnedah', - 61267416 => 'Gunnedah', - 61267417 => 'Gunnedah', - 61267418 => 'Gunnedah', - 61267419 => 'Gunnedah', 6126742 => 'Gunnedah', 61267430 => 'Gunnedah', 61267431 => 'Gunnedah', @@ -10044,16 +8935,11 @@ 61267437 => 'Mullaley', 61267438 => 'Mullaley', 61267439 => 'Mullaley', - 61267440 => 'Curlewis', - 61267441 => 'Curlewis', + 6126744 => 'Curlewis', 61267442 => 'Tambar Springs', 61267443 => 'Tambar Springs', 61267444 => 'Tambar Springs', 61267445 => 'Breeza', - 61267446 => 'Curlewis', - 61267447 => 'Curlewis', - 61267448 => 'Curlewis', - 61267449 => 'Curlewis', 61267450 => 'Drake', 61267451 => 'Emmaville', 61267452 => 'Glen Elgin', @@ -10075,12 +8961,7 @@ 61267477 => 'Bundella', 61267478 => 'Bundella', 61267479 => 'Bundella', - 61267480 => 'Gunnedah', - 61267481 => 'Gunnedah', - 61267482 => 'Gunnedah', - 61267483 => 'Gunnedah', - 61267484 => 'Gunnedah', - 61267485 => 'Gunnedah', + 6126748 => 'Gunnedah', 61267486 => 'Ben Lomond', 61267487 => 'Deepwater', 61267488 => 'Drake', @@ -10137,16 +9018,8 @@ 61267557 => 'Limbri', 61267558 => 'Nundle', 61267559 => 'Ogunbil', - 61267560 => 'Collarenebri', - 61267561 => 'Collarenebri', - 61267562 => 'Collarenebri', - 61267563 => 'Collarenebri', - 61267564 => 'Collarenebri', + 6126756 => 'Collarenebri', 61267565 => 'Gundabloui', - 61267566 => 'Collarenebri', - 61267567 => 'Collarenebri', - 61267568 => 'Collarenebri', - 61267569 => 'Collarenebri', 6126757 => 'Moree', 61267580 => 'Glen Elgin', 61267581 => 'Glen Innes', @@ -10168,56 +9041,14 @@ 61267597 => 'Croppa Creek', 61267598 => 'Garah', 61267599 => 'Gurley', - 61267600 => 'Tamworth', - 61267601 => 'Tamworth', - 61267602 => 'Tamworth', - 61267603 => 'Tamworth', - 61267604 => 'Tamworth', - 61267605 => 'Tamworth', + 612676 => 'Tamworth', 61267606 => 'Somerton', - 61267607 => 'Tamworth', - 61267608 => 'Tamworth', - 61267609 => 'Tamworth', - 6126761 => 'Tamworth', - 6126762 => 'Tamworth', - 61267630 => 'Tamworth', - 61267631 => 'Tamworth', - 61267632 => 'Tamworth', - 61267633 => 'Tamworth', - 61267634 => 'Tamworth', - 61267635 => 'Tamworth', 61267636 => 'Currabubula', - 61267637 => 'Tamworth', - 61267638 => 'Tamworth', - 61267639 => 'Tamworth', 61267640 => 'Bendemeer', - 61267641 => 'Tamworth', 61267642 => 'Nundle', 61267643 => 'Limbri', 61267644 => 'Limbri', - 61267645 => 'Tamworth', - 61267646 => 'Tamworth', - 61267647 => 'Tamworth', - 61267648 => 'Tamworth', - 61267649 => 'Tamworth', - 6126765 => 'Tamworth', - 6126766 => 'Tamworth', - 61267670 => 'Tamworth', - 61267671 => 'Tamworth', - 61267672 => 'Tamworth', - 61267673 => 'Tamworth', - 61267674 => 'Tamworth', - 61267675 => 'Tamworth', 61267676 => 'Somerton', - 61267677 => 'Tamworth', - 61267678 => 'Tamworth', - 61267679 => 'Tamworth', - 61267680 => 'Tamworth', - 61267681 => 'Tamworth', - 61267682 => 'Tamworth', - 61267683 => 'Tamworth', - 61267684 => 'Tamworth', - 61267685 => 'Tamworth', 61267686 => 'Currabubula', 61267687 => 'Currabubula', 61267688 => 'Currabubula', @@ -10227,7 +9058,6 @@ 61267692 => 'Ogunbil', 61267693 => 'Nundle', 61267694 => 'Nundle', - 61267695 => 'Tamworth', 61267696 => 'Bendemeer', 61267697 => 'Somerton', 61267698 => 'Currabubula', @@ -10265,16 +9095,10 @@ 61267757 => 'Ebor', 61267758 => 'Aberfoyle', 61267759 => 'Ebor', - 61267760 => 'Armidale', + 6126776 => 'Armidale', 61267761 => 'Uralla', 61267762 => 'Oban', 61267763 => 'Wollomombi', - 61267764 => 'Armidale', - 61267765 => 'Armidale', - 61267766 => 'Armidale', - 61267767 => 'Armidale', - 61267768 => 'Armidale', - 61267769 => 'Armidale', 61267770 => 'Nowendoc', 61267771 => 'Walcha', 61267772 => 'Walcha', @@ -10285,15 +9109,10 @@ 61267777 => 'Yarrowitch', 61267778 => 'Moona Plains', 61267779 => 'Moona Plains', + 6126778 => 'Uralla', 61267780 => 'Walcha', 61267781 => 'Wollomombi', 61267782 => 'Marple', - 61267783 => 'Uralla', - 61267784 => 'Uralla', - 61267785 => 'Uralla', - 61267786 => 'Uralla', - 61267787 => 'Uralla', - 61267788 => 'Uralla', 61267789 => 'Kingstown', 61267790 => 'Guyra', 61267791 => 'Guyra', @@ -10335,16 +9154,11 @@ 61267827 => 'Upper Horton', 61267828 => 'Upper Horton', 61267829 => 'Upper Horton', + 6126783 => 'Caroda', 61267830 => 'Banoon', 61267831 => 'Plumthorpe', 61267832 => 'Upper Horton', 61267833 => 'Upper Horton', - 61267834 => 'Caroda', - 61267835 => 'Caroda', - 61267836 => 'Caroda', - 61267837 => 'Caroda', - 61267838 => 'Caroda', - 61267839 => 'Caroda', 61267840 => 'Copeton Dam', 61267841 => 'Craigleigh', 61267842 => 'Delungra', @@ -10396,16 +9210,11 @@ 61267897 => 'Tambar Springs', 61267898 => 'Willow Tree', 61267899 => 'Pine Ridge', - 61267900 => 'Narrabri', + 6126790 => 'Narrabri', 61267901 => 'Rowena', 61267902 => 'Spring Plains', 61267903 => 'Wee Waa', 61267904 => 'Yarrie Lake', - 61267905 => 'Narrabri', - 61267906 => 'Narrabri', - 61267907 => 'Narrabri', - 61267908 => 'Narrabri', - 61267909 => 'Narrabri', 61267910 => 'Curlewis', 61267911 => 'Goolhi', 61267912 => 'Gunnedah', @@ -10437,15 +9246,8 @@ 61267947 => 'Weemelah', 61267948 => 'Wenna', 61267949 => 'Baan Baa', - 61267950 => 'Wee Waa', - 61267951 => 'Wee Waa', - 61267952 => 'Wee Waa', - 61267953 => 'Wee Waa', - 61267954 => 'Wee Waa', - 61267955 => 'Wee Waa', + 6126795 => 'Wee Waa', 61267956 => 'Yarrie Lake', - 61267957 => 'Wee Waa', - 61267958 => 'Wee Waa', 61267959 => 'Yarrie Lake', 61267960 => 'Burren Junction', 61267961 => 'Burren Junction', @@ -10768,16 +9570,11 @@ 61268287 => 'Borah Tank', 61268288 => 'Cumborah', 61268289 => 'Boorooma', - 61268290 => 'Lightning Ridge', - 61268291 => 'Lightning Ridge', - 61268292 => 'Lightning Ridge', + 6126829 => 'Lightning Ridge', 61268293 => 'Grawin', - 61268294 => 'Lightning Ridge', 61268295 => 'Goodooga', 61268296 => 'Goodooga', 61268297 => 'Goodooga', - 61268298 => 'Lightning Ridge', - 61268299 => 'Lightning Ridge', 61268300 => 'Bourke', 61268301 => 'Bourke', 61268302 => 'Cobar', @@ -10829,14 +9626,8 @@ 61268357 => 'Colane', 61268358 => 'Mullengudgery', 61268359 => 'Nyngan', + 6126836 => 'Cobar', 61268360 => 'Collie', - 61268361 => 'Cobar', - 61268362 => 'Cobar', - 61268363 => 'Cobar', - 61268364 => 'Cobar', - 61268365 => 'Cobar', - 61268366 => 'Cobar', - 61268367 => 'Cobar', 61268368 => 'Coonabarabran', 61268369 => 'Curban', 61268370 => 'Dandaloo', @@ -10869,25 +9660,12 @@ 61268397 => 'Narran', 61268398 => 'Narran', 61268399 => 'Narran', - 61268400 => 'Wellington', - 61268401 => 'Wellington', - 61268402 => 'Wellington', + 6126840 => 'Wellington', 61268403 => 'Gollan', 61268404 => 'Stuart Town', 61268405 => 'Yeoval', - 61268406 => 'Wellington', - 61268407 => 'Wellington', - 61268408 => 'Wellington', - 61268409 => 'Wellington', 6126841 => 'Dubbo', - 61268420 => 'Coonabarabran', - 61268421 => 'Coonabarabran', - 61268422 => 'Coonabarabran', - 61268423 => 'Coonabarabran', - 61268424 => 'Coonabarabran', - 61268425 => 'Coonabarabran', - 61268426 => 'Coonabarabran', - 61268427 => 'Coonabarabran', + 6126842 => 'Coonabarabran', 61268428 => 'Purlewaugh', 61268429 => 'Rocky Glen', 61268430 => 'Baradine', @@ -10900,26 +9678,15 @@ 61268437 => 'Goorianawa', 61268438 => 'Goorianawa', 61268439 => 'Goorianawa', - 61268440 => 'Binnaway', - 61268441 => 'Binnaway', - 61268442 => 'Binnaway', - 61268443 => 'Binnaway', - 61268444 => 'Binnaway', - 61268445 => 'Binnaway', + 6126844 => 'Binnaway', 61268446 => 'Weetaliba', 61268447 => 'Weetaliba', 61268448 => 'Weetaliba', 61268449 => 'Weetaliba', - 61268450 => 'Wellington', - 61268451 => 'Wellington', - 61268452 => 'Wellington', - 61268453 => 'Wellington', - 61268454 => 'Wellington', - 61268455 => 'Wellington', + 6126845 => 'Wellington', 61268456 => 'Tyrie', 61268457 => 'Warren', 61268458 => 'Weetaliba', - 61268459 => 'Wellington', 61268460 => 'Wellington', 61268461 => 'Wellington', 61268462 => 'Wellington', @@ -10960,16 +9727,11 @@ 61268497 => 'Purlewaugh', 61268498 => 'Rocky Glen', 61268499 => 'Weetaliba', - 61268500 => 'Forbes', - 61268501 => 'Forbes', - 61268502 => 'Forbes', + 6126850 => 'Forbes', 61268503 => 'Bedgerebong', 61268504 => 'Eugowra', 61268505 => 'Weelong', 61268506 => 'Wirrinya', - 61268507 => 'Forbes', - 61268508 => 'Forbes', - 61268509 => 'Forbes', 6126851 => 'Forbes', 6126852 => 'Forbes', 6126853 => 'Forbes', @@ -11003,13 +9765,7 @@ 61268567 => 'Cumborah', 61268568 => 'Goodooga', 61268569 => 'Grawin', - 61268570 => 'Bedgerebong', - 61268571 => 'Bedgerebong', - 61268572 => 'Bedgerebong', - 61268573 => 'Bedgerebong', - 61268574 => 'Bedgerebong', - 61268575 => 'Bedgerebong', - 61268576 => 'Bedgerebong', + 6126857 => 'Bedgerebong', 61268577 => 'Lightning Ridge', 61268578 => 'Walgett', 61268579 => 'Colane', @@ -11046,16 +9802,8 @@ 61268619 => 'Mungery', 6126862 => 'Parkes', 6126863 => 'Parkes', - 61268640 => 'Bogan Gate', - 61268641 => 'Bogan Gate', + 6126864 => 'Bogan Gate', 61268642 => 'Yarrabandai', - 61268643 => 'Bogan Gate', - 61268644 => 'Bogan Gate', - 61268645 => 'Bogan Gate', - 61268646 => 'Bogan Gate', - 61268647 => 'Bogan Gate', - 61268648 => 'Bogan Gate', - 61268649 => 'Bogan Gate', 61268650 => 'Bruie Plains', 61268651 => 'Mandagery', 61268652 => 'Alectown', @@ -11096,13 +9844,7 @@ 61268687 => 'Stuart Town', 61268688 => 'Gilgandra', 61268689 => 'Gilgandra', - 61268690 => 'Peak Hill', - 61268691 => 'Peak Hill', - 61268692 => 'Peak Hill', - 61268693 => 'Peak Hill', - 61268694 => 'Peak Hill', - 61268695 => 'Peak Hill', - 61268696 => 'Peak Hill', + 6126869 => 'Peak Hill', 61268697 => 'Mungery', 61268698 => 'Mungery', 61268699 => 'Bruie Plains', @@ -11137,16 +9879,9 @@ 61268737 => 'Myamley', 61268738 => 'Naradhan', 61268739 => 'Tottenham', - 61268740 => 'Cuttaburra', - 61268741 => 'Cuttaburra', - 61268742 => 'Cuttaburra', - 61268743 => 'Cuttaburra', + 6126874 => 'Cuttaburra', 61268744 => 'Narran', 61268745 => 'Trundle', - 61268746 => 'Cuttaburra', - 61268747 => 'Cuttaburra', - 61268748 => 'Cuttaburra', - 61268749 => 'Cuttaburra', 61268750 => 'Binnaway', 61268751 => 'Coalbaggie', 61268752 => 'Collie', @@ -11209,13 +9944,8 @@ 61268809 => 'Tyrie', 6126881 => 'Dubbo', 6126882 => 'Dubbo', + 6126883 => 'Dubbo', 61268830 => 'Dandaloo', - 61268831 => 'Dubbo', - 61268832 => 'Dubbo', - 61268833 => 'Dubbo', - 61268834 => 'Dubbo', - 61268835 => 'Dubbo', - 61268836 => 'Dubbo', 61268837 => 'Warren', 61268838 => 'Coalbaggie', 61268839 => 'Collie', @@ -11251,16 +9981,9 @@ 61268887 => 'Trangie', 61268888 => 'Trangie', 61268889 => 'Trangie', + 6126889 => 'Narromine', 61268890 => 'Farrendale', - 61268891 => 'Narromine', - 61268892 => 'Narromine', - 61268893 => 'Narromine', - 61268894 => 'Narromine', - 61268895 => 'Narromine', - 61268896 => 'Narromine', - 61268897 => 'Narromine', 61268898 => 'Wyanga', - 61268899 => 'Narromine', 61268900 => 'Naradhan', 61268901 => 'Condobolin', 61268902 => 'Baradine', @@ -11311,13 +10034,7 @@ 61268947 => 'Gilgandra', 61268948 => 'Goorianawa', 61268949 => 'Gwabegar', - 61268950 => 'Condobolin', - 61268951 => 'Condobolin', - 61268952 => 'Condobolin', - 61268953 => 'Condobolin', - 61268954 => 'Condobolin', - 61268955 => 'Condobolin', - 61268956 => 'Condobolin', + 6126895 => 'Condobolin', 61268957 => 'Banar', 61268958 => 'Mendooran', 61268959 => 'Narromine', @@ -11341,13 +10058,7 @@ 61268977 => 'Double Peaks', 61268978 => 'Double Peaks', 61268979 => 'Double Peaks', - 61268980 => 'Lake Cargelligo', - 61268981 => 'Lake Cargelligo', - 61268982 => 'Lake Cargelligo', - 61268983 => 'Lake Cargelligo', - 61268984 => 'Lake Cargelligo', - 61268985 => 'Lake Cargelligo', - 61268986 => 'Lake Cargelligo', + 6126898 => 'Lake Cargelligo', 61268987 => 'Naradhan', 61268988 => 'Naradhan', 61268989 => 'Naradhan', @@ -11565,16 +10276,8 @@ 6126921 => 'Wagga Wagga', 6126922 => 'Wagga Wagga', 6126923 => 'Wagga Wagga', - 61269240 => 'Junee', - 61269241 => 'Junee', - 61269242 => 'Junee', - 61269243 => 'Junee', - 61269244 => 'Junee', - 61269245 => 'Junee', - 61269246 => 'Junee', + 6126924 => 'Junee', 61269247 => 'Junee Reefs', - 61269248 => 'Junee', - 61269249 => 'Junee', 6126925 => 'Wagga Wagga', 6126926 => 'Wagga Wagga', 61269270 => 'Wagga Wagga', @@ -11597,16 +10300,11 @@ 61269287 => 'Tarcutta', 61269288 => 'Tarcutta', 61269289 => 'Humula', + 6126929 => 'Henty', 61269290 => 'Currawarna', 61269291 => 'Currawarna', - 61269292 => 'Henty', - 61269293 => 'Henty', - 61269294 => 'Henty', 61269295 => 'Lockhart', - 61269296 => 'Henty', - 61269297 => 'Henty', - 61269298 => 'Henty', - 61269299 => 'Henty', + 612693 => 'Wagga Wagga', 61269300 => 'Winchendon Vale', 61269301 => 'Coolamon', 61269302 => 'Cowabbie', @@ -11617,9 +10315,6 @@ 61269307 => 'Lockhart', 61269308 => 'Rannock', 61269309 => 'Urana', - 6126931 => 'Wagga Wagga', - 6126932 => 'Wagga Wagga', - 6126933 => 'Wagga Wagga', 61269340 => 'Adelong', 61269341 => 'Batlow', 61269342 => 'Springdale', @@ -11640,15 +10335,7 @@ 61269357 => 'Nangus', 61269358 => 'Stockinbingal', 61269359 => 'Talbingo', - 6126936 => 'Wagga Wagga', - 6126937 => 'Wagga Wagga', 61269380 => 'Kyeamba', - 61269381 => 'Wagga Wagga', - 61269382 => 'Wagga Wagga', - 61269383 => 'Wagga Wagga', - 61269384 => 'Wagga Wagga', - 61269385 => 'Wagga Wagga', - 61269386 => 'Wagga Wagga', 61269387 => 'Henty', 61269388 => 'Humula', 61269389 => 'Junee Reefs', @@ -11657,9 +10344,7 @@ 61269392 => 'Milbrulong', 61269393 => 'Tarcutta', 61269394 => 'The Rock', - 61269395 => 'Wagga Wagga', 61269396 => 'Wantabadgery', - 61269397 => 'Wagga Wagga', 61269398 => 'Bidgeemia', 61269399 => 'Boree Creek', 61269400 => 'Tooma', @@ -11693,47 +10378,24 @@ 61269437 => 'Coolac', 61269438 => 'Coolac', 61269439 => 'Coolac', - 61269440 => 'Gundagai', - 61269441 => 'Gundagai', - 61269442 => 'Gundagai', - 61269443 => 'Gundagai', - 61269444 => 'Gundagai', - 61269445 => 'Gundagai', - 61269446 => 'Gundagai', + 6126944 => 'Gundagai', 61269447 => 'Nangus', 61269448 => 'Burra', - 61269449 => 'Gundagai', - 61269450 => 'Coolac', - 61269451 => 'Coolac', - 61269452 => 'Coolac', - 61269453 => 'Coolac', - 61269454 => 'Coolac', - 61269455 => 'Coolac', + 6126945 => 'Coolac', 61269456 => 'Tooma', 61269457 => 'Tumbarumba', 61269458 => 'Tumorrama', 61269459 => 'Tumut', + 6126946 => 'Adelong', 61269460 => 'Wallendbeen', - 61269461 => 'Adelong', - 61269462 => 'Adelong', 61269463 => 'Yaven Creek', - 61269464 => 'Adelong', 61269465 => 'Yaven Creek', 61269466 => 'Tumorrama', - 61269467 => 'Adelong', - 61269468 => 'Adelong', - 61269469 => 'Adelong', 6126947 => 'Tumut', - 61269480 => 'Tumbarumba', - 61269481 => 'Tumbarumba', - 61269482 => 'Tumbarumba', - 61269483 => 'Tumbarumba', + 6126948 => 'Tumbarumba', 61269484 => 'Tooma', 61269485 => 'Mannus', 61269486 => 'Carabost', - 61269487 => 'Tumbarumba', - 61269488 => 'Tumbarumba', - 61269489 => 'Tumbarumba', 61269490 => 'Batlow', 61269491 => 'Batlow', 61269492 => 'Batlow', @@ -11744,26 +10406,15 @@ 61269497 => 'Black Stump', 61269498 => 'Bunda', 61269499 => 'Darlington Point', - 61269500 => 'Narrandera', + 6126950 => 'Narrandera', 61269501 => 'Egansford', 61269502 => 'Coleambally', 61269503 => 'Gala Vale', - 61269504 => 'Narrandera', - 61269505 => 'Narrandera', - 61269506 => 'Narrandera', - 61269507 => 'Narrandera', - 61269508 => 'Narrandera', - 61269509 => 'Narrandera', - 61269510 => 'Narrandera', + 6126951 => 'Narrandera', 61269511 => 'Leeton', 61269512 => 'Leeton', 61269513 => 'Leeton', 61269514 => 'Stanbridge', - 61269515 => 'Narrandera', - 61269516 => 'Narrandera', - 61269517 => 'Narrandera', - 61269518 => 'Narrandera', - 61269519 => 'Narrandera', 61269520 => 'Goolgowi', 61269521 => 'Griffith', 61269522 => 'Gunbar', @@ -11785,26 +10436,15 @@ 61269547 => 'Coleambally', 61269548 => 'Gala Vale', 61269549 => 'Coleambally', + 6126955 => 'Leeton', 61269550 => 'Stanbridge', 61269551 => 'Stanbridge', 61269552 => 'Stanbridge', 61269553 => 'Landervale', - 61269554 => 'Leeton', - 61269555 => 'Leeton', - 61269556 => 'Leeton', - 61269557 => 'Leeton', - 61269558 => 'Leeton', - 61269559 => 'Leeton', + 6126956 => 'Landervale', 61269560 => 'Bundure', 61269561 => 'Bundure', 61269562 => 'Grong Grong', - 61269563 => 'Landervale', - 61269564 => 'Landervale', - 61269565 => 'Landervale', - 61269566 => 'Landervale', - 61269567 => 'Landervale', - 61269568 => 'Landervale', - 61269569 => 'Landervale', 61269570 => 'The Rock', 61269571 => 'Urana', 61269572 => 'Wagga Wagga', @@ -11825,16 +10465,9 @@ 61269587 => 'Morundah', 61269588 => 'Sandigo', 61269589 => 'Narrandera', - 61269590 => 'Narrandera', - 61269591 => 'Narrandera', - 61269592 => 'Narrandera', - 61269593 => 'Narrandera', - 61269594 => 'Narrandera', - 61269595 => 'Narrandera', - 61269596 => 'Narrandera', + 6126959 => 'Narrandera', 61269597 => 'Morundah', 61269598 => 'Sandigo', - 61269599 => 'Narrandera', 61269600 => 'Rankins Springs', 61269601 => 'Griffith', 61269602 => 'Griffith', @@ -11856,27 +10489,13 @@ 61269618 => 'Griffith', 61269619 => 'Griffith', 6126962 => 'Griffith', - 61269630 => 'Griffith', - 61269631 => 'Griffith', - 61269632 => 'Griffith', - 61269633 => 'Griffith', - 61269634 => 'Griffith', - 61269635 => 'Griffith', - 61269636 => 'Griffith', - 61269637 => 'Griffith', - 61269638 => 'Griffith', + 6126963 => 'Griffith', 61269639 => 'Barellan', 6126964 => 'Griffith', - 61269650 => 'Goolgowi', - 61269651 => 'Goolgowi', + 6126965 => 'Goolgowi', 61269652 => 'Gunbar', 61269653 => 'Melbergen', 61269654 => 'Merriwagga', - 61269655 => 'Goolgowi', - 61269656 => 'Goolgowi', - 61269657 => 'Goolgowi', - 61269658 => 'Goolgowi', - 61269659 => 'Goolgowi', 61269660 => 'Griffith', 61269661 => 'Rankins Springs', 61269662 => 'Griffith', @@ -11980,16 +10599,8 @@ 61269787 => 'Springdale', 61269788 => 'Temora', 61269789 => 'Bidgeemia', - 61269790 => 'West Wyalong', + 6126979 => 'West Wyalong', 61269791 => 'Weethalle', - 61269792 => 'West Wyalong', - 61269793 => 'West Wyalong', - 61269794 => 'West Wyalong', - 61269795 => 'West Wyalong', - 61269796 => 'West Wyalong', - 61269797 => 'West Wyalong', - 61269798 => 'West Wyalong', - 61269799 => 'West Wyalong', 61269800 => 'Temora', 61269801 => 'Temora', 61269802 => 'Temora', @@ -12261,16 +10872,11 @@ 6128100 => 'Bankstown', 6128101 => 'Liverpool', 6128102 => 'Bankstown', + 6128103 => 'Liverpool', 61281030 => 'Bankstown', 61281031 => 'Bankstown', 61281032 => 'Bankstown', - 61281033 => 'Liverpool', 61281034 => 'Sydney', - 61281035 => 'Liverpool', - 61281036 => 'Liverpool', - 61281037 => 'Liverpool', - 61281038 => 'Liverpool', - 61281039 => 'Liverpool', 61281040 => 'Liverpool', 61281041 => 'Liverpool', 61281042 => 'Sydney', @@ -12403,15 +11009,7 @@ 61284038 => 'Avalon Beach', 61284039 => 'Terrey Hills', 6128404 => 'Sydney', - 61284050 => 'Sydney', - 61284051 => 'Sydney', - 61284052 => 'Sydney', - 61284053 => 'Sydney', - 61284054 => 'Sydney', - 61284055 => 'Sydney', - 61284056 => 'Sydney', - 61284057 => 'Sydney', - 61284058 => 'Sydney', + 6128405 => 'Sydney', 61284059 => 'Avalon Beach', 6128406 => 'Terrey Hills', 61284070 => 'Terrey Hills', @@ -12441,12 +11039,7 @@ 61284157 => 'Sydney', 61284158 => 'Sydney', 61284159 => 'Sydney', - 61284160 => 'Sydney', - 61284161 => 'Sydney', - 61284162 => 'Sydney', - 61284163 => 'Sydney', - 61284164 => 'Sydney', - 61284165 => 'Sydney', + 6128416 => 'Sydney', 61284166 => 'Dural', 61284167 => 'Avalon Beach', 61284168 => 'Avalon Beach', @@ -12517,16 +11110,10 @@ 6128515 => 'Sutherland', 6128516 => 'Engadine', 6128517 => 'Sutherland', - 61285180 => 'Engadine', + 6128518 => 'Engadine', 61285181 => 'Sutherland', - 61285182 => 'Engadine', 61285183 => 'Sutherland', - 61285184 => 'Engadine', - 61285185 => 'Engadine', - 61285186 => 'Engadine', 61285187 => 'Sutherland', - 61285188 => 'Engadine', - 61285189 => 'Engadine', 6128519 => 'Sutherland', 61285200 => 'Sutherland', 61285201 => 'Engadine', @@ -12564,16 +11151,8 @@ 6128542 => 'Sydney', 6128543 => 'Sutherland', 6128544 => 'Sutherland', - 61285450 => 'Engadine', - 61285451 => 'Engadine', - 61285452 => 'Engadine', - 61285453 => 'Engadine', - 61285454 => 'Engadine', - 61285455 => 'Engadine', - 61285456 => 'Engadine', - 61285457 => 'Engadine', + 6128545 => 'Engadine', 61285458 => 'Sutherland', - 61285459 => 'Engadine', 6128548 => 'Engadine', 6128555 => 'Engadine', 6128556 => 'Sutherland', @@ -12585,16 +11164,8 @@ 6128567 => 'Sydney', 6128568 => 'Sydney', 6128569 => 'Sydney', - 6128570 => 'Sydney', - 6128571 => 'Sydney', - 6128572 => 'Sydney', - 6128573 => 'Sydney', - 6128574 => 'Sydney', - 6128575 => 'Sydney', - 6128576 => 'Sydney', - 6128577 => 'Sydney', + 612857 => 'Sydney', 6128578 => 'Sutherland', - 6128579 => 'Sydney', 6128580 => 'Sydney', 61285810 => 'Sutherland', 61285811 => 'Engadine', @@ -12615,38 +11186,18 @@ 6128601 => 'Parramatta', 6128602 => 'Blacktown', 6128603 => 'Blacktown', - 61286040 => 'Parramatta', - 61286041 => 'Parramatta', - 61286042 => 'Parramatta', - 61286043 => 'Parramatta', - 61286044 => 'Parramatta', - 61286045 => 'Parramatta', - 61286046 => 'Parramatta', + 6128604 => 'Parramatta', 61286047 => 'Blacktown', 61286048 => 'Blacktown', 61286049 => 'Blacktown', 6128605 => 'Blacktown', 6128606 => 'Parramatta', - 61286070 => 'Blacktown', - 61286071 => 'Blacktown', - 61286072 => 'Blacktown', - 61286073 => 'Blacktown', - 61286074 => 'Blacktown', - 61286075 => 'Blacktown', + 6128607 => 'Blacktown', 61286076 => 'Sydney', 61286077 => 'Parramatta', 61286078 => 'Sydney', - 61286079 => 'Blacktown', - 61286080 => 'Blacktown', + 6128608 => 'Blacktown', 61286081 => 'Parramatta', - 61286082 => 'Blacktown', - 61286083 => 'Blacktown', - 61286084 => 'Blacktown', - 61286085 => 'Blacktown', - 61286086 => 'Blacktown', - 61286087 => 'Blacktown', - 61286088 => 'Blacktown', - 61286089 => 'Blacktown', 61286090 => 'Blacktown', 61286092 => 'Blacktown', 6128622 => 'Sydney', @@ -12721,15 +11272,10 @@ 6128717 => 'Bankstown', 6128718 => 'Bankstown', 6128719 => 'Sydney', - 6128720 => 'Bankstown', + 612872 => 'Bankstown', 6128721 => 'Sydney', - 6128722 => 'Bankstown', - 6128723 => 'Bankstown', - 6128724 => 'Bankstown', - 6128725 => 'Bankstown', 6128726 => 'Sydney', 6128727 => 'Liverpool', - 6128728 => 'Bankstown', 6128729 => 'Liverpool', 61287300 => 'Liverpool', 61287301 => 'Liverpool', @@ -12791,16 +11337,9 @@ 61287497 => 'Liverpool', 61287498 => 'Liverpool', 61287499 => 'Liverpool', + 612875 => 'Sydney', 6128750 => 'Liverpool', 6128751 => 'Liverpool', - 6128752 => 'Sydney', - 6128753 => 'Sydney', - 6128754 => 'Sydney', - 6128755 => 'Sydney', - 6128756 => 'Sydney', - 6128757 => 'Sydney', - 6128758 => 'Sydney', - 6128759 => 'Sydney', 6128760 => 'Bankstown', 6128761 => 'Bankstown', 6128762 => 'Sydney', @@ -12817,16 +11356,8 @@ 6128774 => 'Bankstown', 6128775 => 'Sydney', 6128776 => 'Liverpool', - 61287770 => 'Liverpool', - 61287771 => 'Liverpool', - 61287772 => 'Liverpool', - 61287773 => 'Liverpool', - 61287774 => 'Liverpool', - 61287775 => 'Liverpool', - 61287776 => 'Liverpool', + 6128777 => 'Liverpool', 61287777 => 'Sydney', - 61287778 => 'Liverpool', - 61287779 => 'Liverpool', 6128778 => 'Liverpool', 6128781 => 'Liverpool', 6128782 => 'Liverpool', @@ -12843,16 +11374,9 @@ 6128797 => 'Liverpool', 6128798 => 'Liverpool', 6128799 => 'Sydney', + 612880 => 'Blacktown', 6128800 => 'Sydney', - 6128801 => 'Blacktown', 6128802 => 'Parramatta', - 6128803 => 'Blacktown', - 6128804 => 'Blacktown', - 6128805 => 'Blacktown', - 6128806 => 'Blacktown', - 6128807 => 'Blacktown', - 6128808 => 'Blacktown', - 6128809 => 'Blacktown', 6128810 => 'Parramatta', 6128811 => 'Blacktown', 6128812 => 'Parramatta', @@ -12873,103 +11397,27 @@ 6128827 => 'Blacktown', 6128828 => 'Sydney', 6128829 => 'Parramatta', - 6128830 => 'Parramatta', - 6128831 => 'Parramatta', - 6128832 => 'Parramatta', - 6128833 => 'Parramatta', + 612883 => 'Parramatta', 6128834 => 'Blacktown', - 6128835 => 'Parramatta', - 6128836 => 'Parramatta', - 6128837 => 'Parramatta', - 6128838 => 'Parramatta', - 6128839 => 'Parramatta', - 61288400 => 'Blacktown', - 61288401 => 'Blacktown', - 61288402 => 'Parramatta', - 61288403 => 'Blacktown', - 61288404 => 'Parramatta', - 61288405 => 'Blacktown', - 61288406 => 'Parramatta', - 61288407 => 'Blacktown', - 61288408 => 'Blacktown', - 61288409 => 'Parramatta', - 6128841 => 'Parramatta', - 6128842 => 'Parramatta', - 6128843 => 'Parramatta', - 6128844 => 'Parramatta', - 6128845 => 'Parramatta', - 6128846 => 'Parramatta', + 612884 => 'Parramatta', + 6128840 => 'Blacktown', 6128847 => 'Blacktown', - 6128848 => 'Parramatta', - 6128849 => 'Parramatta', - 6128850 => 'Parramatta', - 6128851 => 'Parramatta', - 6128852 => 'Parramatta', - 6128853 => 'Parramatta', - 6128854 => 'Parramatta', - 6128855 => 'Parramatta', - 61288560 => 'Parramatta', - 61288561 => 'Blacktown', - 61288562 => 'Blacktown', - 61288563 => 'Parramatta', - 61288564 => 'Parramatta', - 61288565 => 'Blacktown', - 61288566 => 'Blacktown', - 61288567 => 'Blacktown', - 61288568 => 'Blacktown', - 61288569 => 'Blacktown', + 612885 => 'Parramatta', + 6128856 => 'Blacktown', 6128857 => 'Blacktown', - 6128858 => 'Parramatta', - 6128859 => 'Parramatta', - 6128860 => 'Parramatta', - 6128861 => 'Parramatta', - 6128862 => 'Parramatta', - 6128863 => 'Parramatta', + 612886 => 'Parramatta', 6128864 => 'Sydney', - 6128865 => 'Parramatta', 6128866 => 'Sydney', 6128867 => 'Blacktown', - 6128868 => 'Parramatta', 6128869 => 'Blacktown', - 6128870 => 'Sydney', - 6128871 => 'Sydney', + 612887 => 'Sydney', 6128872 => 'Parramatta', - 6128873 => 'Sydney', - 6128874 => 'Sydney', - 6128875 => 'Sydney', - 6128876 => 'Sydney', - 6128877 => 'Sydney', - 6128878 => 'Sydney', - 6128879 => 'Sydney', + 612888 => 'Blacktown', 6128880 => 'Sydney', - 6128881 => 'Blacktown', - 6128882 => 'Blacktown', - 6128883 => 'Blacktown', - 6128884 => 'Blacktown', - 6128885 => 'Blacktown', - 6128886 => 'Blacktown', - 6128887 => 'Blacktown', - 6128888 => 'Blacktown', - 6128889 => 'Blacktown', - 6128890 => 'Parramatta', - 6128891 => 'Parramatta', - 6128892 => 'Parramatta', - 6128893 => 'Parramatta', - 6128894 => 'Parramatta', - 6128895 => 'Parramatta', - 6128896 => 'Parramatta', - 6128897 => 'Parramatta', - 6128898 => 'Parramatta', + 612889 => 'Parramatta', 6128899 => 'Sydney', - 6128900 => 'Sydney', - 6128901 => 'Sydney', - 6128902 => 'Sydney', - 6128903 => 'Sydney', - 6128904 => 'Sydney', - 6128905 => 'Sydney', + 612890 => 'Sydney', 6128906 => 'Dural', - 6128907 => 'Sydney', - 6128908 => 'Sydney', 6128909 => 'Avalon Beach', 6128910 => 'Dural', 6128911 => 'Terrey Hills', @@ -12993,16 +11441,8 @@ 6128921 => 'Terrey Hills', 6128922 => 'Sydney', 6128923 => 'Sydney', + 6128924 => 'Terrey Hills', 61289240 => 'Dural', - 61289241 => 'Terrey Hills', - 61289242 => 'Terrey Hills', - 61289243 => 'Terrey Hills', - 61289244 => 'Terrey Hills', - 61289245 => 'Terrey Hills', - 61289246 => 'Terrey Hills', - 61289247 => 'Terrey Hills', - 61289248 => 'Terrey Hills', - 61289249 => 'Terrey Hills', 6128925 => 'Sydney', 61289260 => 'Avalon Beach', 61289261 => 'Avalon Beach', @@ -13031,39 +11471,14 @@ 6128987 => 'Sydney', 6128988 => 'Sydney', 6128989 => 'Dural', - 61289980 => 'Terrey Hills', - 61289981 => 'Terrey Hills', - 61289982 => 'Terrey Hills', - 61289983 => 'Terrey Hills', - 61289984 => 'Terrey Hills', - 61289985 => 'Terrey Hills', - 61289986 => 'Terrey Hills', - 61289987 => 'Terrey Hills', + 6128998 => 'Terrey Hills', 61289988 => 'Sydney', - 61289989 => 'Terrey Hills', 6128999 => 'Sydney', 612900 => 'Sydney', 612901 => 'Sydney', 612902 => 'Sydney', - 6129030 => 'Sydney', - 6129031 => 'Sydney', - 6129032 => 'Sydney', - 6129033 => 'Sydney', - 61290340 => 'Sydney', - 61290341 => 'Sydney', - 61290342 => 'Sydney', - 61290343 => 'Sydney', - 61290344 => 'Sydney', + 612903 => 'Sydney', 61290345 => 'Sydney/Liverpool/Sydney', - 61290346 => 'Sydney', - 61290347 => 'Sydney', - 61290348 => 'Sydney', - 61290349 => 'Sydney', - 6129035 => 'Sydney', - 6129036 => 'Sydney', - 6129037 => 'Sydney', - 6129038 => 'Sydney', - 6129039 => 'Sydney', 612904 => 'Sydney', 612905 => 'Sydney', 612906 => 'Sydney', @@ -13109,25 +11524,8 @@ 6129141 => 'Sydney', 6129144 => 'Sydney', 6129146 => 'Sydney', - 6129150 => 'Sydney', - 6129151 => 'Sydney', - 6129152 => 'Sydney', - 61291530 => 'Sutherland', - 61291531 => 'Sutherland', - 61291532 => 'Sydney', - 61291533 => 'Sydney', - 61291534 => 'Sydney', - 61291535 => 'Sutherland', - 61291536 => 'Sutherland', - 61291537 => 'Sutherland', - 61291538 => 'Sutherland', - 61291539 => 'Sutherland', - 6129154 => 'Sydney', - 6129155 => 'Sydney', - 6129156 => 'Sydney', - 6129157 => 'Sydney', - 6129158 => 'Sydney', - 6129159 => 'Sydney', + 612915 => 'Sydney', + 6129153 => 'Sutherland', 6129160 => 'Sydney', 6129161 => 'Sydney', 6129162 => 'Sydney', @@ -13137,183 +11535,36 @@ 6129181 => 'Sydney', 6129186 => 'Sydney', 6129188 => 'Sydney', - 6129190 => 'Sydney', - 6129191 => 'Sydney', - 6129192 => 'Sydney', - 6129193 => 'Sydney', - 6129194 => 'Sydney', - 6129195 => 'Sydney', - 6129196 => 'Sydney', - 6129197 => 'Sydney', - 6129198 => 'Sydney', - 6129199 => 'Sydney', - 6129200 => 'Sydney', - 6129201 => 'Sydney', - 6129202 => 'Sydney', + 612919 => 'Sydney', + 61292 => 'Sydney', 6129203 => 'Liverpool', 6129204 => 'Parramatta', - 61292050 => 'Bankstown', - 61292051 => 'Bankstown', - 61292052 => 'Bankstown', - 61292053 => 'Bankstown', - 61292054 => 'Bankstown', - 61292055 => 'Bankstown', - 61292056 => 'Bankstown', - 61292057 => 'Bankstown', - 61292058 => 'Bankstown', - 61292059 => 'Sydney', - 6129206 => 'Sydney', - 6129207 => 'Sydney', + 6129205 => 'Bankstown', 6129208 => 'Blacktown', - 6129209 => 'Sydney', - 612921 => 'Sydney', - 612922 => 'Sydney', - 612923 => 'Sydney', - 612924 => 'Sydney', - 612925 => 'Sydney', - 612926 => 'Sydney', - 612927 => 'Sydney', - 612928 => 'Sydney', - 612929 => 'Sydney', - 612930 => 'Sydney', - 612931 => 'Sydney', - 612932 => 'Sydney', - 612933 => 'Sydney', - 612934 => 'Sydney', - 6129350 => 'Sydney', - 6129351 => 'Sydney', - 6129352 => 'Sydney', - 6129353 => 'Sydney', + 61293 => 'Sydney', 6129354 => 'Parramatta', - 6129355 => 'Sydney', - 6129356 => 'Sydney', - 6129357 => 'Sydney', - 6129358 => 'Sydney', - 6129359 => 'Sydney', - 612936 => 'Sydney', - 6129370 => 'Sydney', - 6129371 => 'Sydney', - 61293720 => 'Sydney', - 61293721 => 'Sydney', - 61293722 => 'Sydney', 61293723 => 'Terrey Hills', - 61293724 => 'Sydney', - 61293725 => 'Sydney', - 61293726 => 'Sydney', - 61293727 => 'Sydney', - 61293728 => 'Sydney', - 61293729 => 'Sydney', - 6129373 => 'Sydney', - 6129374 => 'Sydney', - 6129375 => 'Sydney', - 6129376 => 'Sydney', - 6129377 => 'Sydney', - 6129378 => 'Sydney', - 6129379 => 'Sydney', - 612938 => 'Sydney', - 612939 => 'Sydney', - 6129400 => 'Sydney', - 6129401 => 'Sydney', - 6129402 => 'Sydney', - 6129403 => 'Sydney', - 6129404 => 'Sydney', - 6129405 => 'Sydney', - 6129406 => 'Sydney', + 61294 => 'Sydney', 6129407 => 'Parramatta', 6129408 => 'Sutherland', - 6129409 => 'Sydney', - 612941 => 'Sydney', - 6129420 => 'Sydney', 6129421 => 'Blacktown', - 6129422 => 'Sydney', - 6129423 => 'Sydney', - 6129424 => 'Sydney', - 6129425 => 'Sydney', 6129426 => 'Liverpool', - 6129427 => 'Sydney', - 6129428 => 'Sydney', - 6129429 => 'Sydney', - 612943 => 'Sydney', - 6129440 => 'Sydney', 6129441 => 'Terrey Hills', - 6129442 => 'Sydney', 6129443 => 'Avalon Beach', 6129444 => 'Dural', 6129445 => 'Dural', 6129446 => 'Terrey Hills', 6129447 => 'Terrey Hills', - 6129448 => 'Sydney', - 6129449 => 'Sydney', 6129450 => 'Terrey Hills', - 6129451 => 'Sydney', - 6129452 => 'Sydney', - 6129453 => 'Sydney', - 6129454 => 'Sydney', - 6129455 => 'Sydney', 6129456 => 'Avalon Beach', 6129457 => 'Terrey Hills', - 6129458 => 'Sydney', - 6129459 => 'Sydney', - 612946 => 'Sydney', - 6129470 => 'Sydney', - 6129471 => 'Terrey Hills', - 6129472 => 'Terrey Hills', - 6129473 => 'Terrey Hills', - 6129474 => 'Sydney', - 6129475 => 'Sydney', - 6129476 => 'Terrey Hills', - 6129477 => 'Terrey Hills', - 6129478 => 'Sydney', - 6129479 => 'Terrey Hills', - 6129480 => 'Terrey Hills', - 6129481 => 'Terrey Hills', - 6129482 => 'Terrey Hills', - 6129483 => 'Terrey Hills', - 6129484 => 'Terrey Hills', - 6129485 => 'Terrey Hills', - 6129486 => 'Terrey Hills', - 6129487 => 'Terrey Hills', - 61294880 => 'Sydney', - 61294881 => 'Sydney', - 61294882 => 'Terrey Hills', - 61294883 => 'Sydney', - 61294884 => 'Sydney', - 61294885 => 'Sydney', - 61294886 => 'Sydney', - 61294887 => 'Sydney', - 61294888 => 'Sydney', - 61294889 => 'Sydney', - 6129489 => 'Terrey Hills', - 612949 => 'Sydney', - 6129500 => 'Sydney', + 612947 => 'Terrey Hills', + 612948 => 'Terrey Hills', + 612950 => 'Sydney', 6129501 => 'Sutherland', - 6129502 => 'Sydney', - 6129503 => 'Sydney', - 6129504 => 'Sydney', - 6129505 => 'Sydney', - 6129506 => 'Sydney', - 6129507 => 'Sydney', - 6129508 => 'Sydney', - 6129509 => 'Sydney', - 6129510 => 'Sydney', - 6129511 => 'Sydney', - 6129512 => 'Sydney', - 6129513 => 'Sydney', - 6129514 => 'Sydney', - 6129515 => 'Sydney', - 6129516 => 'Sydney', - 6129517 => 'Sydney', - 6129518 => 'Sydney', - 6129519 => 'Sydney', + 612951 => 'Sydney', + 612952 => 'Sutherland', 6129520 => 'Engadine', - 6129521 => 'Sutherland', - 6129522 => 'Sutherland', - 6129523 => 'Sutherland', - 6129524 => 'Sutherland', - 6129525 => 'Sutherland', - 6129526 => 'Sutherland', - 6129527 => 'Sutherland', - 6129528 => 'Sutherland', 6129529 => 'Sydney', 6129530 => 'Sutherland', 6129531 => 'Sutherland', @@ -13335,48 +11586,21 @@ 61295397 => 'Sydney', 61295398 => 'Sydney', 61295399 => 'Sydney', - 6129540 => 'Sutherland', - 6129541 => 'Sutherland', - 6129542 => 'Sutherland', - 6129543 => 'Sutherland', - 6129544 => 'Sutherland', - 6129545 => 'Sutherland', + 612954 => 'Sutherland', 6129546 => 'Sydney', 6129547 => 'Sydney', 6129548 => 'Engadine', 6129549 => 'Sydney', 612955 => 'Sydney', 612956 => 'Sydney', - 6129570 => 'Sydney', - 6129571 => 'Sydney', - 6129572 => 'Sydney', - 6129573 => 'Sydney', + 612957 => 'Sydney', 6129574 => 'Sutherland', 6129575 => 'Sutherland', 6129576 => 'Sutherland', - 6129577 => 'Sydney', - 6129578 => 'Sydney', - 6129579 => 'Sydney', - 6129580 => 'Sydney', - 6129581 => 'Sydney', - 6129582 => 'Sydney', - 6129583 => 'Sydney', + 612958 => 'Sydney', 6129584 => 'Sutherland', - 6129585 => 'Sydney', - 6129586 => 'Sydney', - 6129587 => 'Sydney', - 6129588 => 'Sydney', 6129589 => 'Sutherland', - 6129590 => 'Sydney', - 6129591 => 'Sydney', - 6129592 => 'Sydney', - 6129593 => 'Sydney', - 6129594 => 'Sydney', - 6129595 => 'Sydney', - 6129596 => 'Sydney', - 6129597 => 'Sydney', - 6129598 => 'Sydney', - 6129599 => 'Sydney', + 612959 => 'Sydney', 612960 => 'Liverpool', 6129610 => 'Liverpool', 6129611 => 'Sydney', @@ -13389,87 +11613,31 @@ 6129618 => 'Liverpool', 6129619 => 'Sydney', 612962 => 'Blacktown', - 6129630 => 'Parramatta', - 6129631 => 'Parramatta', + 612963 => 'Parramatta', 6129632 => 'Bankstown', - 6129633 => 'Parramatta', - 6129634 => 'Parramatta', - 6129635 => 'Parramatta', - 6129636 => 'Parramatta', - 6129637 => 'Parramatta', - 6129638 => 'Parramatta', - 6129639 => 'Parramatta', - 6129640 => 'Sydney', - 6129641 => 'Sydney', - 6129642 => 'Sydney', - 6129643 => 'Sydney', + 612964 => 'Sydney', 6129644 => 'Bankstown', 6129645 => 'Bankstown', - 6129646 => 'Sydney', - 6129647 => 'Sydney', - 6129648 => 'Sydney', - 6129649 => 'Sydney', + 612965 => 'Dural', 6129650 => 'Sydney', - 6129651 => 'Dural', - 6129652 => 'Dural', - 6129653 => 'Dural', - 6129654 => 'Dural', - 6129655 => 'Dural', - 6129656 => 'Dural', 6129657 => 'Sydney', - 6129658 => 'Dural', 6129659 => 'Parramatta', - 6129660 => 'Sydney', - 6129661 => 'Sydney', - 6129662 => 'Sydney', - 6129663 => 'Sydney', - 6129664 => 'Sydney', - 6129665 => 'Sydney', - 6129666 => 'Sydney', - 6129667 => 'Sydney', + 612966 => 'Sydney', 6129668 => 'Sutherland', - 6129669 => 'Sydney', 612967 => 'Blacktown', - 6129680 => 'Parramatta', + 612968 => 'Parramatta', 6129681 => 'Bankstown', - 6129682 => 'Parramatta', - 6129683 => 'Parramatta', - 6129684 => 'Parramatta', - 6129685 => 'Parramatta', - 6129686 => 'Parramatta', - 6129687 => 'Parramatta', - 6129688 => 'Parramatta', - 6129689 => 'Parramatta', 612969 => 'Sydney', - 6129700 => 'Sydney', - 6129701 => 'Sydney', - 6129702 => 'Sydney', - 6129703 => 'Sydney', - 6129704 => 'Sydney', - 6129705 => 'Sydney', - 6129706 => 'Sydney', + 612970 => 'Sydney', 6129707 => 'Bankstown', 6129708 => 'Bankstown', 6129709 => 'Bankstown', + 612971 => 'Sydney', 6129710 => 'Sutherland', 6129711 => 'Liverpool', - 6129712 => 'Sydney', - 6129713 => 'Sydney', - 6129714 => 'Sydney', - 6129715 => 'Sydney', - 6129716 => 'Sydney', 6129717 => 'Sutherland', - 6129718 => 'Sydney', - 6129719 => 'Sydney', + 612972 => 'Bankstown', 6129720 => 'Liverpool', - 6129721 => 'Bankstown', - 6129722 => 'Bankstown', - 6129723 => 'Bankstown', - 6129724 => 'Bankstown', - 6129725 => 'Bankstown', - 6129726 => 'Bankstown', - 6129727 => 'Bankstown', - 6129728 => 'Bankstown', 6129729 => 'Liverpool', 6129730 => 'Liverpool', 6129731 => 'Liverpool', @@ -13481,37 +11649,14 @@ 6129737 => 'Sydney', 6129738 => 'Bankstown', 6129739 => 'Sydney', - 6129740 => 'Sydney', - 6129741 => 'Sydney', - 6129742 => 'Sydney', - 61297430 => 'Sydney', - 61297431 => 'Sydney', - 61297432 => 'Sydney', - 61297433 => 'Sydney', - 61297434 => 'Sydney', - 61297435 => 'Sydney', - 61297436 => 'Sydney', + 612974 => 'Sydney', 61297437 => 'Bankstown', 61297438 => 'Bankstown', 61297439 => 'Bankstown', - 6129744 => 'Sydney', - 6129745 => 'Sydney', - 6129746 => 'Sydney', - 6129747 => 'Sydney', - 6129748 => 'Sydney', - 6129749 => 'Sydney', 6129750 => 'Sydney', 6129751 => 'Sydney', - 61297520 => 'Sydney', + 6129752 => 'Sydney', 61297521 => 'Bankstown', - 61297522 => 'Sydney', - 61297523 => 'Sydney', - 61297524 => 'Sydney', - 61297525 => 'Sydney', - 61297526 => 'Sydney', - 61297527 => 'Sydney', - 61297528 => 'Sydney', - 61297529 => 'Sydney', 6129753 => 'Liverpool', 6129754 => 'Bankstown', 6129755 => 'Bankstown', @@ -13529,87 +11674,34 @@ 6129767 => 'Sydney', 6129768 => 'Parramatta', 6129769 => 'Parramatta', - 6129770 => 'Sydney', + 612977 => 'Sydney', 6129771 => 'Bankstown', 6129772 => 'Bankstown', 6129773 => 'Bankstown', 6129774 => 'Bankstown', - 6129775 => 'Sydney', - 6129776 => 'Sydney', - 6129777 => 'Sydney', - 6129778 => 'Sydney', - 6129779 => 'Sydney', - 6129780 => 'Bankstown', - 6129781 => 'Bankstown', - 6129782 => 'Bankstown', - 6129783 => 'Bankstown', + 612978 => 'Bankstown', 6129784 => 'Sydney', - 6129785 => 'Bankstown', - 6129786 => 'Bankstown', 6129787 => 'Sydney', - 6129788 => 'Bankstown', 6129789 => 'Sydney', - 6129790 => 'Bankstown', - 6129791 => 'Bankstown', - 6129792 => 'Bankstown', - 6129793 => 'Bankstown', - 6129794 => 'Bankstown', - 6129795 => 'Bankstown', - 6129796 => 'Bankstown', + 612979 => 'Bankstown', 6129797 => 'Sydney', 6129798 => 'Sydney', 6129799 => 'Sydney', - 6129800 => 'Sydney', - 6129801 => 'Sydney', - 6129802 => 'Sydney', - 6129803 => 'Sydney', - 6129804 => 'Sydney', - 6129805 => 'Sydney', + 612980 => 'Sydney', 6129806 => 'Parramatta', - 6129807 => 'Sydney', - 6129808 => 'Sydney', - 6129809 => 'Sydney', 612981 => 'Sydney', 612982 => 'Liverpool', 612983 => 'Blacktown', - 6129840 => 'Parramatta', - 6129841 => 'Parramatta', - 6129842 => 'Parramatta', - 6129843 => 'Parramatta', - 61298440 => 'Sydney', - 61298441 => 'Sydney', - 61298442 => 'Sydney', - 61298443 => 'Sydney', - 61298444 => 'Sydney', - 61298445 => 'Sydney', - 61298446 => 'Sydney', + 612984 => 'Parramatta', + 6129844 => 'Sydney', 61298447 => 'Liverpool', - 61298448 => 'Sydney', - 61298449 => 'Sydney', - 6129845 => 'Parramatta', - 61298460 => 'Parramatta', - 61298461 => 'Parramatta', - 61298462 => 'Parramatta', 61298463 => 'Sydney', - 61298464 => 'Parramatta', - 61298465 => 'Parramatta', - 61298466 => 'Parramatta', - 61298467 => 'Parramatta', - 61298468 => 'Parramatta', - 61298469 => 'Parramatta', 6129847 => 'Terrey Hills', - 6129848 => 'Parramatta', - 6129849 => 'Parramatta', - 6129850 => 'Sydney', + 612985 => 'Sydney', 6129851 => 'Blacktown', 6129852 => 'Blacktown', 6129853 => 'Blacktown', 6129854 => 'Blacktown', - 6129855 => 'Sydney', - 6129856 => 'Sydney', - 6129857 => 'Sydney', - 6129858 => 'Sydney', - 6129859 => 'Sydney', 6129860 => 'Parramatta', 6129861 => 'Sydney', 6129862 => 'Blacktown', @@ -13620,66 +11712,22 @@ 6129867 => 'Sydney', 6129868 => 'Sydney', 6129869 => 'Sydney', - 6129870 => 'Sydney', + 612987 => 'Sydney', 6129871 => 'Parramatta', 6129872 => 'Parramatta', - 61298730 => 'Parramatta', - 61298731 => 'Parramatta', - 61298732 => 'Parramatta', - 61298733 => 'Parramatta', - 61298734 => 'Parramatta', - 61298735 => 'Parramatta', - 61298736 => 'Parramatta', - 61298737 => 'Parramatta', - 61298738 => 'Parramatta', - 61298739 => 'Sydney', - 6129874 => 'Sydney', + 6129873 => 'Parramatta', 6129875 => 'Terrey Hills', - 6129876 => 'Sydney', - 6129877 => 'Sydney', - 6129878 => 'Sydney', - 6129879 => 'Sydney', - 6129880 => 'Sydney', + 612988 => 'Sydney', 6129881 => 'Blacktown', - 6129882 => 'Sydney', 6129883 => 'Avalon Beach', - 6129884 => 'Sydney', 6129885 => 'Blacktown', - 6129886 => 'Sydney', - 6129887 => 'Sydney', - 6129888 => 'Sydney', - 6129889 => 'Sydney', - 6129890 => 'Parramatta', - 6129891 => 'Parramatta', + 612989 => 'Parramatta', 6129892 => 'Bankstown', - 6129893 => 'Parramatta', - 6129894 => 'Parramatta', - 6129895 => 'Parramatta', - 6129896 => 'Parramatta', - 6129897 => 'Parramatta', - 6129898 => 'Parramatta', - 6129899 => 'Parramatta', - 6129900 => 'Sydney', - 6129901 => 'Sydney', - 6129902 => 'Sydney', - 6129903 => 'Sydney', - 6129904 => 'Sydney', - 6129905 => 'Sydney', - 6129906 => 'Sydney', - 6129907 => 'Sydney', - 6129908 => 'Sydney', - 6129909 => 'Sydney', - 61299100 => 'Sydney', - 61299101 => 'Sydney', - 61299102 => 'Sydney', - 61299103 => 'Sydney', - 61299104 => 'Sydney', + 61299 => 'Sydney', 61299105 => 'Terrey Hills', - 61299106 => 'Sydney', 61299107 => 'Terrey Hills', 61299108 => 'Terrey Hills', 61299109 => 'Terrey Hills', - 6129911 => 'Sydney', 61299120 => 'Parramatta', 61299121 => 'Parramatta', 61299122 => 'Parramatta', @@ -13701,33 +11749,9 @@ 61299147 => 'Sutherland', 61299148 => 'Bankstown', 61299149 => 'Engadine', - 61299150 => 'Sydney', - 61299151 => 'Sydney', - 61299152 => 'Sydney', - 61299153 => 'Sydney', - 61299154 => 'Sydney', - 61299155 => 'Sydney', - 61299156 => 'Sydney', - 61299157 => 'Sydney', - 61299158 => 'Sydney', 61299159 => 'Sutherland', - 6129916 => 'Sydney', - 6129917 => 'Sydney', 6129918 => 'Avalon Beach', - 6129919 => 'Sydney', 6129920 => 'Blacktown', - 6129921 => 'Sydney', - 6129922 => 'Sydney', - 6129923 => 'Sydney', - 6129924 => 'Sydney', - 6129925 => 'Sydney', - 6129926 => 'Sydney', - 6129927 => 'Sydney', - 6129928 => 'Sydney', - 6129929 => 'Sydney', - 6129930 => 'Sydney', - 6129931 => 'Sydney', - 6129932 => 'Sydney', 61299330 => 'Parramatta', 61299331 => 'Parramatta', 61299332 => 'Parramatta', @@ -13738,87 +11762,29 @@ 61299337 => 'Blacktown', 61299338 => 'Parramatta', 61299339 => 'Sutherland', - 6129934 => 'Sydney', - 6129935 => 'Sydney', - 6129936 => 'Sydney', - 6129937 => 'Sydney', - 6129938 => 'Sydney', - 6129939 => 'Sydney', 6129940 => 'Terrey Hills', - 6129941 => 'Sydney', - 6129942 => 'Sydney', 61299430 => 'Terrey Hills', 61299431 => 'Terrey Hills', 61299432 => 'Terrey Hills', 61299433 => 'Terrey Hills', 61299434 => 'Terrey Hills', - 61299435 => 'Sydney', - 61299436 => 'Sydney', - 61299437 => 'Sydney', - 61299438 => 'Sydney', - 61299439 => 'Sydney', - 61299440 => 'Sydney', - 61299441 => 'Sydney', - 61299442 => 'Sydney', - 61299443 => 'Terrey Hills', - 61299444 => 'Terrey Hills', - 61299445 => 'Terrey Hills', - 61299446 => 'Terrey Hills', - 61299447 => 'Terrey Hills', - 61299448 => 'Terrey Hills', - 61299449 => 'Terrey Hills', + 6129944 => 'Terrey Hills', 6129945 => 'Terrey Hills', 6129946 => 'Avalon Beach', - 61299470 => 'Sydney', - 61299471 => 'Sydney', - 61299472 => 'Sydney', - 61299473 => 'Sydney', - 61299474 => 'Sydney', - 61299475 => 'Sydney', - 61299476 => 'Sydney', 61299477 => 'Parramatta', - 61299478 => 'Sydney', - 61299479 => 'Sydney', - 6129948 => 'Sydney', - 6129949 => 'Sydney', - 612995 => 'Sydney', - 612996 => 'Sydney', 6129970 => 'Terrey Hills', - 6129971 => 'Sydney', - 6129972 => 'Sydney', 6129973 => 'Avalon Beach', 6129974 => 'Avalon Beach', - 6129975 => 'Sydney', - 6129976 => 'Sydney', - 6129977 => 'Sydney', - 6129978 => 'Sydney', 6129979 => 'Terrey Hills', 6129980 => 'Terrey Hills', - 6129981 => 'Sydney', - 6129982 => 'Sydney', - 6129983 => 'Sydney', - 6129984 => 'Sydney', 6129985 => 'Avalon Beach', 6129986 => 'Terrey Hills', 6129987 => 'Terrey Hills', - 6129988 => 'Sydney', 6129989 => 'Terrey Hills', - 6129990 => 'Sydney', 6129991 => 'Avalon Beach', 6129992 => 'Dural', - 6129993 => 'Sydney', - 6129994 => 'Sydney', - 6129995 => 'Sydney', - 61299960 => 'Sydney', - 61299961 => 'Sydney', - 61299962 => 'Sydney', - 61299963 => 'Sydney', - 61299964 => 'Sydney', - 61299965 => 'Sydney', 61299966 => 'Parramatta', 61299967 => 'Parramatta', - 61299968 => 'Sydney', - 61299969 => 'Sydney', 6129997 => 'Terrey Hills', 6129998 => 'Terrey Hills', 6129999 => 'Terrey Hills', @@ -15072,16 +13038,9 @@ 61343127 => 'Buangor', 61343128 => 'Buninyong', 61343129 => 'Clear Lake', + 6134313 => 'Ballarat', 61343130 => 'Creswick', 61343131 => 'Crymelon', - 61343132 => 'Ballarat', - 61343133 => 'Ballarat', - 61343134 => 'Ballarat', - 61343135 => 'Ballarat', - 61343136 => 'Ballarat', - 61343137 => 'Ballarat', - 61343138 => 'Ballarat', - 61343139 => 'Ballarat', 61343140 => 'Dimboola', 61343141 => 'Elmhurst', 61343142 => 'Gerang Gerung', @@ -15452,16 +13411,11 @@ 61345037 => 'Harrow', 61345038 => 'Woodhouse', 61345039 => 'Woodhouse', + 6134504 => 'Warrnambool', 61345040 => 'Lake Mundi', 61345041 => 'Lake Mundi', - 61345042 => 'Warrnambool', 61345043 => 'Portland', - 61345044 => 'Warrnambool', - 61345045 => 'Warrnambool', - 61345046 => 'Warrnambool', - 61345047 => 'Warrnambool', 61345048 => 'Nirranda', - 61345049 => 'Warrnambool', 61345050 => 'Warrnambool', 61345051 => 'Hamilton', 61345052 => 'Warrnambool', @@ -15608,15 +13562,10 @@ 61347070 => 'Myrtleford/Nagambie/Puckapunyal/Pyalong/Seymour/St James/Strathbogie/Swanpool/Taggerty/Tatong', 61347071 => 'Thoona/Tungamah/Violet Town/Wangaratta/Whorouly/Winton/Woods Point/Yarck/Yarrawonga/Yea', 61347072 => 'Falls Creek', - 61348000 => 'Shepparton', - 61348001 => 'Shepparton', - 61348002 => 'Shepparton', - 61348003 => 'Shepparton', + 6134800 => 'Shepparton', 61348004 => 'Cobram', - 61348005 => 'Shepparton', 61348006 => 'Tocumwal', 61348007 => 'Cobram', - 61348008 => 'Shepparton', 61348009 => 'Berrigan', 61348010 => 'Blighty', 61348011 => 'Brassi', @@ -15648,16 +13597,9 @@ 61348037 => 'Tongala', 61348038 => 'Undera', 61348039 => 'Wakool', + 6134804 => 'Shepparton', 61348040 => 'Wanganella', 61348041 => 'Yalca', - 61348042 => 'Shepparton', - 61348043 => 'Shepparton', - 61348044 => 'Shepparton', - 61348045 => 'Shepparton', - 61348046 => 'Shepparton', - 61348047 => 'Shepparton', - 61348048 => 'Shepparton', - 61348049 => 'Shepparton', 61348050 => 'Tatura', 61348051 => 'Shepparton', 61348052 => 'Kialla East', @@ -15728,16 +13670,8 @@ 61348117 => 'Tocumwal', 61348118 => 'Tongala', 61348119 => 'Undera', + 6134812 => 'Shepparton', 61348120 => 'Wakool', - 61348121 => 'Shepparton', - 61348122 => 'Shepparton', - 61348123 => 'Shepparton', - 61348124 => 'Shepparton', - 61348125 => 'Shepparton', - 61348126 => 'Shepparton', - 61348127 => 'Shepparton', - 61348128 => 'Shepparton', - 61348129 => 'Shepparton', 61348130 => 'Shepparton', 61348131 => 'Wanganella', 61348132 => 'Yalca', @@ -15962,48 +13896,23 @@ 61350197 => 'Nyah', 61350198 => 'Wentworth', 61350199 => 'Sea Lake', - 61350200 => 'Balranald', - 61350201 => 'Balranald', - 61350202 => 'Balranald', - 61350203 => 'Balranald', + 6135020 => 'Balranald', 61350204 => 'Box Creek', 61350205 => 'Curyo', 61350206 => 'Box Creek', - 61350207 => 'Balranald', - 61350208 => 'Balranald', - 61350209 => 'Balranald', 6135021 => 'Mildura', - 61350220 => 'Mildura', - 61350221 => 'Mildura', - 61350222 => 'Mildura', - 61350223 => 'Mildura', - 61350224 => 'Mildura', - 61350225 => 'Mildura', + 6135022 => 'Mildura', 61350226 => 'Wentworth', - 61350227 => 'Mildura', - 61350228 => 'Mildura', - 61350229 => 'Mildura', 6135023 => 'Mildura', 6135024 => 'Mildura', 6135025 => 'Mildura', + 6135026 => 'Robinvale', 61350260 => 'Wemen', - 61350261 => 'Robinvale', - 61350262 => 'Robinvale', - 61350263 => 'Robinvale', - 61350264 => 'Robinvale', - 61350265 => 'Robinvale', - 61350266 => 'Robinvale', 61350267 => 'Boundary Bend', 61350268 => 'Boundary Bend', - 61350269 => 'Robinvale', + 6135027 => 'Wentworth', 61350270 => 'Anabranch', 61350271 => 'Scotia', - 61350272 => 'Wentworth', - 61350273 => 'Wentworth', - 61350274 => 'Wentworth', - 61350275 => 'Wentworth', - 61350276 => 'Wentworth', - 61350277 => 'Wentworth', 61350278 => 'Rufus River', 61350279 => 'Palinyewah', 61350280 => 'Werrimull', @@ -16026,13 +13935,8 @@ 61350297 => 'Arumpo', 61350298 => 'Arumpo', 61350299 => 'Arumpo', + 6135030 => 'Nyah', 61350300 => 'Boundary Bend', - 61350301 => 'Nyah', - 61350302 => 'Nyah', - 61350303 => 'Nyah', - 61350304 => 'Nyah', - 61350305 => 'Nyah', - 61350306 => 'Nyah', 61350307 => 'Karawinna', 61350308 => 'Mildura', 61350309 => 'Nangiloc', @@ -16198,16 +14102,8 @@ 61350497 => 'Boundary Bend', 61350498 => 'Karawinna', 61350499 => 'Nangiloc', - 61350510 => 'Mildura', - 61350511 => 'Mildura', - 61350512 => 'Mildura', - 61350513 => 'Mildura', - 61350514 => 'Mildura', - 61350515 => 'Mildura', - 61350516 => 'Mildura', - 61350517 => 'Mildura', + 6135051 => 'Mildura', 61350518 => 'Robinvale', - 61350519 => 'Mildura', 61350520 => 'Wemen', 61350521 => 'Scotia', 61350522 => 'Wentworth', @@ -16618,13 +14514,7 @@ 61351197 => 'Mallacoota', 61351198 => 'Meerlieu', 61351199 => 'Mount Taylor', - 61351200 => 'Morwell', - 61351201 => 'Morwell', - 61351202 => 'Morwell', - 61351203 => 'Morwell', - 61351204 => 'Morwell', - 61351205 => 'Morwell', - 61351206 => 'Morwell', + 6135120 => 'Morwell', 61351207 => 'Bairnsdale', 61351208 => 'Baw Baw', 61351209 => 'Bruthen', @@ -16662,9 +14552,9 @@ 61351297 => 'Orbost', 61351298 => 'Swifts Creek', 61351299 => 'Baw Baw', + 613513 => 'Morwell', 61351300 => 'Erica', 61351301 => 'Gormandale', - 61351302 => 'Morwell', 61351303 => 'Rosedale', 61351304 => 'Traralgon', 61351305 => 'Woodside', @@ -16672,12 +14562,6 @@ 61351307 => 'Yinnar', 61351308 => 'Clydebank', 61351309 => 'Dargo', - 6135131 => 'Morwell', - 6135132 => 'Morwell', - 6135133 => 'Morwell', - 6135134 => 'Morwell', - 6135135 => 'Morwell', - 6135136 => 'Morwell', 61351370 => 'Golden Beach', 61351371 => 'Heyfield', 61351372 => 'Licola', @@ -16698,13 +14582,7 @@ 61351387 => 'Golden Beach', 61351388 => 'Heyfield', 61351389 => 'Licola', - 61351390 => 'Maffra', - 61351391 => 'Maffra', - 61351392 => 'Maffra', - 61351393 => 'Maffra', - 61351394 => 'Maffra', - 61351395 => 'Maffra', - 61351396 => 'Maffra', + 6135139 => 'Maffra', 61351397 => 'Heyfield', 61351398 => 'Licola', 61351399 => 'Loch Sport', @@ -16740,16 +14618,9 @@ 61351429 => 'Morwell', 6135143 => 'Sale', 6135144 => 'Sale', + 6135145 => 'Maffra', 61351450 => 'Clydebank', - 61351451 => 'Maffra', - 61351452 => 'Maffra', - 61351453 => 'Maffra', - 61351454 => 'Maffra', - 61351455 => 'Maffra', - 61351456 => 'Maffra', - 61351457 => 'Maffra', 61351458 => 'Munro', - 61351459 => 'Maffra', 61351460 => 'Loch Sport', 61351461 => 'Loch Sport', 61351462 => 'Woodside', @@ -16760,44 +14631,21 @@ 61351467 => 'Sale', 61351468 => 'Seaspray', 61351469 => 'Loch Sport', - 61351470 => 'Maffra', - 61351471 => 'Maffra', - 61351472 => 'Maffra', - 61351473 => 'Maffra', - 61351474 => 'Maffra', - 61351475 => 'Maffra', + 6135147 => 'Maffra', 61351476 => 'Dinner Plain', 61351477 => 'Dinner Plain', 61351478 => 'Genoa', 61351479 => 'Genoa', - 61351480 => 'Heyfield', - 61351481 => 'Heyfield', - 61351482 => 'Heyfield', - 61351483 => 'Heyfield', + 6135148 => 'Heyfield', 61351484 => 'Yarram', 61351485 => 'Yinnar', - 61351486 => 'Heyfield', 61351487 => 'Clydebank', 61351488 => 'Licola', - 61351489 => 'Heyfield', - 61351490 => 'Sale', - 61351491 => 'Sale', - 61351492 => 'Sale', - 61351493 => 'Sale', - 61351494 => 'Sale', - 61351495 => 'Sale', - 61351496 => 'Sale', - 61351497 => 'Sale', + 6135149 => 'Sale', 61351498 => 'Clydebank', - 61351499 => 'Sale', - 61351500 => 'Bairnsdale', - 61351501 => 'Bairnsdale', - 61351502 => 'Bairnsdale', - 61351503 => 'Bairnsdale', - 61351504 => 'Bairnsdale', + 6135150 => 'Bairnsdale', 61351505 => 'Loch Sport', 61351506 => 'Maffra', - 61351507 => 'Bairnsdale', 61351508 => 'Dinner Plain', 61351509 => 'Lakes Entrance', 61351510 => 'Dargo', @@ -16811,46 +14659,22 @@ 61351518 => 'Seaspray', 61351519 => 'Dargo', 6135152 => 'Bairnsdale', - 61351530 => 'Bairnsdale', - 61351531 => 'Bairnsdale', - 61351532 => 'Bairnsdale', - 61351533 => 'Bairnsdale', + 6135153 => 'Bairnsdale', 61351534 => 'Bruthen', 61351535 => 'Bruthen', - 61351536 => 'Bairnsdale', - 61351537 => 'Bairnsdale', - 61351538 => 'Bairnsdale', - 61351539 => 'Bairnsdale', + 6135154 => 'Orbost', 61351540 => 'Goongerah', - 61351541 => 'Orbost', - 61351542 => 'Orbost', - 61351543 => 'Orbost', 61351544 => 'Cabbage Tree Creek', 61351545 => 'Cabbage Tree Creek', - 61351546 => 'Orbost', - 61351547 => 'Orbost', - 61351548 => 'Orbost', - 61351549 => 'Orbost', + 6135155 => 'Lakes Entrance', 61351550 => 'Gelantipy', - 61351551 => 'Lakes Entrance', - 61351552 => 'Lakes Entrance', - 61351553 => 'Lakes Entrance', - 61351554 => 'Lakes Entrance', - 61351555 => 'Lakes Entrance', - 61351556 => 'Lakes Entrance', 61351557 => 'Nowa Nowa', - 61351558 => 'Lakes Entrance', 61351559 => 'Buchan', - 61351560 => 'Bairnsdale', - 61351561 => 'Bairnsdale', + 6135156 => 'Bairnsdale', 61351562 => 'Lakes Entrance', 61351563 => 'Lakes Entrance', 61351564 => 'Lakes Entrance', 61351565 => 'Lakes Entrance', - 61351566 => 'Bairnsdale', - 61351567 => 'Bairnsdale', - 61351568 => 'Bairnsdale', - 61351569 => 'Bairnsdale', 61351570 => 'Ensay', 61351571 => 'Lindenow', 61351572 => 'Lindenow', @@ -16990,15 +14814,7 @@ 6135174 => 'Traralgon', 6135175 => 'Traralgon', 6135176 => 'Traralgon', - 61351770 => 'Traralgon', - 61351771 => 'Traralgon', - 61351772 => 'Traralgon', - 61351773 => 'Traralgon', - 61351774 => 'Traralgon', - 61351775 => 'Traralgon', - 61351776 => 'Traralgon', - 61351777 => 'Traralgon', - 61351778 => 'Traralgon', + 6135177 => 'Traralgon', 61351779 => 'Rosedale', 61351780 => 'Gelantipy', 61351781 => 'Swifts Creek', @@ -17050,28 +14866,18 @@ 61351827 => 'Yarram', 61351828 => 'Sale', 61351829 => 'Sale', - 61351830 => 'Yarram', - 61351831 => 'Yarram', - 61351832 => 'Yarram', - 61351833 => 'Yarram', + 6135183 => 'Yarram', 61351834 => 'Rosedale', 61351835 => 'Rosedale', 61351836 => 'Traralgon', 61351837 => 'Traralgon', - 61351838 => 'Yarram', - 61351839 => 'Yarram', 61351840 => 'Yarram', 61351841 => 'Yarram', 61351850 => 'Yarram', 61351851 => 'Yarram', 61351860 => 'Yarram', 61351861 => 'Yarram', - 61351870 => 'Woodside', - 61351871 => 'Woodside', - 61351872 => 'Woodside', - 61351873 => 'Woodside', - 61351874 => 'Woodside', - 61351875 => 'Woodside', + 6135187 => 'Woodside', 61351876 => 'Yarram', 61351877 => 'Yarram', 61351878 => 'Yinnar', @@ -17135,16 +14941,8 @@ 61351994 => 'Rosedale', 6135200 => 'Geelong', 6135201 => 'Geelong', - 61352020 => 'Geelong', - 61352021 => 'Geelong', - 61352022 => 'Geelong', - 61352023 => 'Geelong', - 61352024 => 'Geelong', - 61352025 => 'Geelong', + 6135202 => 'Geelong', 61352026 => 'Geelong/Lara/Geelong', - 61352027 => 'Geelong', - 61352028 => 'Geelong', - 61352029 => 'Geelong', 61352030 => 'Aireys Inlet', 61352031 => 'Aireys Inlet', 61352032 => 'Aireys Inlet', @@ -17306,6 +15104,7 @@ 61352197 => 'Swan Marsh', 61352198 => 'Aireys Inlet', 61352199 => 'Anglesea', + 613522 => 'Geelong', 61352200 => 'Aireys Inlet', 61352201 => 'Wingeel', 61352202 => 'Anglesea', @@ -17316,33 +15115,8 @@ 61352207 => 'Bannockburn', 61352208 => 'Lara', 61352209 => 'Meredith', - 6135221 => 'Geelong', - 6135222 => 'Geelong', - 6135223 => 'Geelong', - 6135224 => 'Geelong', - 6135225 => 'Geelong', - 6135226 => 'Geelong', - 61352270 => 'Geelong', - 61352271 => 'Geelong', - 61352272 => 'Geelong', - 61352273 => 'Geelong', - 61352274 => 'Geelong', - 61352275 => 'Geelong', - 61352276 => 'Geelong', - 61352277 => 'Geelong', - 61352278 => 'Geelong', 61352279 => 'Lara', - 61352280 => 'Geelong', - 61352281 => 'Geelong', - 61352282 => 'Geelong', - 61352283 => 'Geelong', - 61352284 => 'Geelong', - 61352285 => 'Geelong', - 61352286 => 'Geelong', - 61352287 => 'Geelong', - 61352288 => 'Geelong', 61352289 => 'Lorne', - 6135229 => 'Geelong', 61352300 => 'Colac', 61352301 => 'Beeac', 61352302 => 'Swan Marsh', @@ -17366,13 +15140,8 @@ 61352347 => 'Beeac', 61352348 => 'Beeac', 61352349 => 'Beeac', + 6135235 => 'Swan Marsh', 61352350 => 'Beech Forest', - 61352351 => 'Swan Marsh', - 61352352 => 'Swan Marsh', - 61352353 => 'Swan Marsh', - 61352354 => 'Swan Marsh', - 61352355 => 'Swan Marsh', - 61352356 => 'Swan Marsh', 61352357 => 'Beech Forest', 61352358 => 'Beech Forest', 61352359 => 'Beech Forest', @@ -17386,26 +15155,12 @@ 61352367 => 'Barwon Downs', 61352368 => 'Barwon Downs', 61352369 => 'Lavers Hill', - 61352370 => 'Apollo Bay', - 61352371 => 'Apollo Bay', - 61352372 => 'Apollo Bay', + 6135237 => 'Apollo Bay', 61352373 => 'Lavers Hill', 61352374 => 'Lavers Hill', 61352375 => 'Lavers Hill', - 61352376 => 'Apollo Bay', - 61352377 => 'Apollo Bay', - 61352378 => 'Apollo Bay', - 61352379 => 'Apollo Bay', - 61352380 => 'Cressy', - 61352381 => 'Cressy', - 61352382 => 'Cressy', + 6135238 => 'Cressy', 61352383 => 'Kennedys Creek', - 61352384 => 'Cressy', - 61352385 => 'Cressy', - 61352386 => 'Cressy', - 61352387 => 'Cressy', - 61352388 => 'Cressy', - 61352389 => 'Cressy', 61352390 => 'Beeac', 61352391 => 'Beeac', 61352392 => 'Birregurra', @@ -17416,8 +15171,7 @@ 61352397 => 'Barwon Downs', 61352398 => 'Beech Forest', 61352399 => 'Beech Forest', - 6135240 => 'Geelong', - 6135241 => 'Geelong', + 613524 => 'Geelong', 61352420 => 'Inverleigh', 61352421 => 'Lara', 61352422 => 'Lorne', @@ -17426,25 +15180,8 @@ 61352425 => 'Torquay', 61352426 => 'Winchelsea South', 61352427 => 'Wingeel', - 61352428 => 'Geelong', 61352429 => 'Queenscliff', - 6135243 => 'Geelong', - 6135244 => 'Geelong', - 6135245 => 'Geelong', - 6135246 => 'Geelong', - 6135247 => 'Geelong', - 6135248 => 'Geelong', - 6135249 => 'Geelong', - 6135250 => 'Queenscliff', - 6135251 => 'Queenscliff', - 6135252 => 'Queenscliff', - 6135253 => 'Queenscliff', - 6135254 => 'Queenscliff', - 6135255 => 'Queenscliff', - 6135256 => 'Queenscliff', - 6135257 => 'Queenscliff', - 6135258 => 'Queenscliff', - 6135259 => 'Queenscliff', + 613525 => 'Queenscliff', 6135260 => 'Geelong', 6135261 => 'Torquay', 6135262 => 'Torquay', @@ -17464,6 +15201,7 @@ 61352697 => 'Barwon Downs', 61352698 => 'Beeac', 61352699 => 'Beech Forest', + 613527 => 'Geelong', 61352700 => 'Birregurra', 61352701 => 'Colac', 61352702 => 'Cressy', @@ -17473,16 +15211,6 @@ 61352706 => 'Aireys Inlet', 61352707 => 'Anglesea', 61352708 => 'Bannockburn', - 61352709 => 'Geelong', - 6135271 => 'Geelong', - 6135272 => 'Geelong', - 6135273 => 'Geelong', - 6135274 => 'Geelong', - 6135275 => 'Geelong', - 6135276 => 'Geelong', - 6135277 => 'Geelong', - 6135278 => 'Geelong', - 6135279 => 'Geelong', 61352800 => 'Inverleigh', 61352801 => 'Lara', 61352802 => 'Lorne', @@ -17501,16 +15229,10 @@ 6135286 => 'Meredith', 6135287 => 'Wingeel', 6135288 => 'Winchelsea South', - 61352890 => 'Lorne', - 61352891 => 'Lorne', - 61352892 => 'Lorne', - 61352893 => 'Lorne', - 61352894 => 'Lorne', - 61352895 => 'Lorne', + 6135289 => 'Lorne', 61352896 => 'Aireys Inlet', 61352897 => 'Aireys Inlet', 61352898 => 'Aireys Inlet', - 61352899 => 'Lorne', 61352900 => 'Apollo Bay', 61352901 => 'Barwon Downs', 61352902 => 'Beeac', @@ -17821,16 +15543,7 @@ 61353288 => 'Murtoa', 61353289 => 'Natimuk', 6135329 => 'Ballarat', - 6135330 => 'Ballarat', - 6135331 => 'Ballarat', - 6135332 => 'Ballarat', - 6135333 => 'Ballarat', - 6135334 => 'Ballarat', - 6135335 => 'Ballarat', - 6135336 => 'Ballarat', - 6135337 => 'Ballarat', - 6135338 => 'Ballarat', - 6135339 => 'Ballarat', + 613533 => 'Ballarat', 61353400 => 'Ballarat', 61353401 => 'Skipton', 61353402 => 'Skipton', @@ -17842,15 +15555,8 @@ 61353408 => 'Skipton', 61353409 => 'Rainbow', 6135341 => 'Buninyong', - 61353420 => 'Scarsdale', - 61353421 => 'Scarsdale', - 61353422 => 'Scarsdale', - 61353423 => 'Scarsdale', - 61353424 => 'Scarsdale', - 61353425 => 'Scarsdale', + 6135342 => 'Scarsdale', 61353426 => 'Ballarat', - 61353427 => 'Scarsdale', - 61353428 => 'Scarsdale', 61353429 => 'Ballarat', 6135343 => 'Learmonth', 6135344 => 'Linton', @@ -17910,15 +15616,10 @@ 61353557 => 'Maroona', 61353558 => 'Lake Bolac', 61353559 => 'Streatham', + 6135356 => 'Halls Gap', 61353560 => 'Telopea Downs', 61353561 => 'Buninyong', 61353562 => 'Stawell', - 61353563 => 'Halls Gap', - 61353564 => 'Halls Gap', - 61353565 => 'Halls Gap', - 61353566 => 'Halls Gap', - 61353567 => 'Halls Gap', - 61353568 => 'Halls Gap', 61353569 => 'Landsborough', 6135357 => 'Navarre', 6135358 => 'Stawell', @@ -17943,13 +15644,7 @@ 61353617 => 'Marnoo', 61353618 => 'Dadswells Bridge', 61353619 => 'Glenorchy', - 61353620 => 'Horsham', - 61353621 => 'Horsham', - 61353622 => 'Horsham', - 61353623 => 'Horsham', - 61353624 => 'Horsham', - 61353625 => 'Horsham', - 61353626 => 'Horsham', + 6135362 => 'Horsham', 61353627 => 'Kalkee', 61353628 => 'Laharum', 61353629 => 'Banyena', @@ -17983,13 +15678,7 @@ 61353657 => 'Broughton', 61353658 => 'Serviceton', 61353659 => 'Telopea Downs', - 61353660 => 'Bacchus Marsh', - 61353661 => 'Bacchus Marsh', - 61353662 => 'Bacchus Marsh', - 61353663 => 'Bacchus Marsh', - 61353664 => 'Bacchus Marsh', - 61353665 => 'Bacchus Marsh', - 61353666 => 'Bacchus Marsh', + 6135366 => 'Bacchus Marsh', 61353667 => 'Ballan', 61353668 => 'Balliang', 61353669 => 'Mount Wallace', @@ -18096,14 +15785,7 @@ 61353797 => 'Laharum', 61353798 => 'Laharum', 61353799 => 'Ballarat', - 61353800 => 'Glenisla', - 61353801 => 'Glenisla', - 61353802 => 'Glenisla', - 61353803 => 'Glenisla', - 61353804 => 'Glenisla', - 61353805 => 'Glenisla', - 61353806 => 'Glenisla', - 61353807 => 'Glenisla', + 6135380 => 'Glenisla', 61353808 => 'Banyena', 61353809 => 'Banyena', 6135381 => 'Horsham', @@ -18118,32 +15800,16 @@ 61353837 => 'Laharum', 61353838 => 'Laharum', 61353839 => 'Laharum', - 61353840 => 'Horsham', + 6135384 => 'Horsham', 61353841 => 'Ararat', - 61353842 => 'Horsham', - 61353843 => 'Horsham', - 61353844 => 'Horsham', 61353845 => 'Ballarat', - 61353846 => 'Horsham', - 61353847 => 'Horsham', - 61353848 => 'Horsham', 61353849 => 'Ararat', - 61353850 => 'Murtoa', - 61353851 => 'Murtoa', - 61353852 => 'Murtoa', - 61353853 => 'Murtoa', - 61353854 => 'Murtoa', - 61353855 => 'Murtoa', + 6135385 => 'Murtoa', 61353856 => 'Minyip', 61353857 => 'Minyip', 61353858 => 'Minyip', 61353859 => 'Minyip', - 61353860 => 'Goroke', - 61353861 => 'Goroke', - 61353862 => 'Goroke', - 61353863 => 'Goroke', - 61353864 => 'Goroke', - 61353865 => 'Goroke', + 6135386 => 'Goroke', 61353866 => 'Minimay', 61353867 => 'Minimay', 61353868 => 'Minimay', @@ -18444,26 +16110,14 @@ 61354217 => 'Trentham', 61354218 => 'Llanelly', 61354219 => 'Gisborne', - 61354220 => 'Kyneton', - 61354221 => 'Kyneton', - 61354222 => 'Kyneton', - 61354223 => 'Kyneton', + 6135422 => 'Kyneton', 61354224 => 'Marong', 61354225 => 'Mitiamo', - 61354226 => 'Kyneton', - 61354227 => 'Kyneton', - 61354228 => 'Kyneton', - 61354229 => 'Kyneton', + 6135423 => 'Kyneton', 61354230 => 'Raywood', 61354231 => 'Strathfieldsaye', - 61354232 => 'Kyneton', - 61354233 => 'Kyneton', - 61354234 => 'Kyneton', - 61354235 => 'Kyneton', 61354236 => 'Beazleys Bridge', - 61354237 => 'Kyneton', 61354238 => 'Birchip', - 61354239 => 'Kyneton', 6135424 => 'Trentham', 61354250 => 'Buckrabanyule', 61354251 => 'Charlton', @@ -18485,25 +16139,13 @@ 61354267 => 'Traynors Lagoon', 61354268 => 'Watchem', 61354269 => 'Wedderburn', - 61354270 => 'Woodend', - 61354271 => 'Woodend', - 61354272 => 'Woodend', - 61354273 => 'Woodend', - 61354274 => 'Woodend', + 6135427 => 'Woodend', 61354275 => 'Romsey', 61354276 => 'Wycheproof', 61354277 => 'Echuca', - 61354278 => 'Woodend', - 61354279 => 'Woodend', 6135428 => 'Gisborne', 6135429 => 'Romsey', - 61354300 => 'Bendigo', - 61354301 => 'Bendigo', - 61354302 => 'Bendigo', - 61354303 => 'Bendigo', - 61354304 => 'Bendigo', - 61354305 => 'Bendigo', - 61354306 => 'Bendigo', + 6135430 => 'Bendigo', 61354307 => 'Goornong', 61354308 => 'Elmore', 61354309 => 'Colbinabbin', @@ -18527,12 +16169,7 @@ 61354327 => 'Elmore', 61354328 => 'Colbinabbin', 61354329 => 'Colbinabbin', - 61354330 => 'Heathcote', - 61354331 => 'Heathcote', - 61354332 => 'Heathcote', - 61354333 => 'Heathcote', - 61354334 => 'Heathcote', - 61354335 => 'Heathcote', + 6135433 => 'Heathcote', 61354336 => 'Goornong', 61354337 => 'Bendigo', 61354338 => 'Bendigo', @@ -18570,26 +16207,11 @@ 61354388 => 'Llanelly', 61354389 => 'Llanelly', 6135439 => 'Strathfieldsaye', - 6135440 => 'Bendigo', - 6135441 => 'Bendigo', - 6135442 => 'Bendigo', - 6135443 => 'Bendigo', - 6135444 => 'Bendigo', - 6135445 => 'Bendigo', - 6135446 => 'Bendigo', - 6135447 => 'Bendigo', - 6135448 => 'Bendigo', - 6135449 => 'Bendigo', + 613544 => 'Bendigo', + 6135450 => 'Kerang', 61354500 => 'Gunbower', 61354501 => 'Lockington', 61354502 => 'Rochester', - 61354503 => 'Kerang', - 61354504 => 'Kerang', - 61354505 => 'Kerang', - 61354506 => 'Kerang', - 61354507 => 'Kerang', - 61354508 => 'Kerang', - 61354509 => 'Kerang', 61354510 => 'Kerang', 61354511 => 'Barham', 61354512 => 'Tullakool', @@ -18610,15 +16232,8 @@ 61354527 => 'Cohuna', 61354528 => 'Kerang', 61354529 => 'Lake Meran', + 6135453 => 'Barham', 61354530 => 'Tullakool', - 61354531 => 'Barham', - 61354532 => 'Barham', - 61354533 => 'Barham', - 61354534 => 'Barham', - 61354535 => 'Barham', - 61354536 => 'Barham', - 61354537 => 'Barham', - 61354538 => 'Barham', 61354539 => 'Tullakool', 6135454 => 'Bendigo', 61354550 => 'St Arnaud', @@ -18754,23 +16369,9 @@ 61354707 => 'Colbinabbin', 61354708 => 'Colbinabbin', 61354709 => 'Dingee', + 6135471 => 'Castlemaine', 61354710 => 'Dingee', - 61354711 => 'Castlemaine', - 61354712 => 'Castlemaine', - 61354713 => 'Castlemaine', - 61354714 => 'Castlemaine', - 61354715 => 'Castlemaine', - 61354716 => 'Castlemaine', - 61354717 => 'Castlemaine', - 61354718 => 'Castlemaine', - 61354719 => 'Castlemaine', - 61354720 => 'Castlemaine', - 61354721 => 'Castlemaine', - 61354722 => 'Castlemaine', - 61354723 => 'Castlemaine', - 61354724 => 'Castlemaine', - 61354725 => 'Castlemaine', - 61354726 => 'Castlemaine', + 6135472 => 'Castlemaine', 61354727 => 'Barham', 61354728 => 'Boort', 61354729 => 'Cohuna', @@ -18796,12 +16397,7 @@ 61354749 => 'Carisbrook', 6135475 => 'Maldon', 6135476 => 'Newstead', - 61354770 => 'St Arnaud', - 61354771 => 'St Arnaud', - 61354772 => 'St Arnaud', - 61354773 => 'St Arnaud', - 61354774 => 'St Arnaud', - 61354775 => 'St Arnaud', + 6135477 => 'St Arnaud', 61354776 => 'Charlton', 61354777 => 'Birchip', 61354778 => 'Buckrabanyule', @@ -18816,12 +16412,7 @@ 61354787 => 'Watchem', 61354788 => 'Laen', 61354789 => 'Dunolly', - 61354790 => 'Castlemaine', - 61354791 => 'Castlemaine', - 61354792 => 'Castlemaine', - 61354793 => 'Castlemaine', - 61354794 => 'Castlemaine', - 61354795 => 'Castlemaine', + 6135479 => 'Castlemaine', 61354796 => 'Bealiba', 61354797 => 'Traynors Lagoon', 61354798 => 'Maldon', @@ -18837,26 +16428,13 @@ 61354817 => 'Maldon', 61354818 => 'Talbot', 61354819 => 'Rochester', - 61354820 => 'Echuca', - 61354821 => 'Echuca', - 61354822 => 'Echuca', - 61354823 => 'Echuca', - 61354824 => 'Echuca', - 61354825 => 'Echuca', - 61354826 => 'Echuca', + 6135482 => 'Echuca', 61354827 => 'Elmore', 61354828 => 'Elmore', 61354829 => 'Rochester', - 61354830 => 'Echuca', - 61354831 => 'Echuca', - 61354832 => 'Echuca', + 6135483 => 'Echuca', 61354833 => 'Gisborne', 61354834 => 'Gisborne', - 61354835 => 'Echuca', - 61354836 => 'Echuca', - 61354837 => 'Echuca', - 61354838 => 'Echuca', - 61354839 => 'Echuca', 6135484 => 'Rochester', 61354850 => 'Inglewood', 61354851 => 'Jarklin', @@ -18910,43 +16488,20 @@ 61354899 => 'Jarklin', 6135490 => 'Echuca', 6135491 => 'Charlton', - 61354920 => 'Birchip', - 61354921 => 'Birchip', - 61354922 => 'Birchip', - 61354923 => 'Birchip', - 61354924 => 'Birchip', - 61354925 => 'Birchip', - 61354926 => 'Birchip', + 6135492 => 'Birchip', 61354927 => 'Buckrabanyule', 61354928 => 'Buckrabanyule', 61354929 => 'Buckrabanyule', - 61354930 => 'Nullawil', - 61354931 => 'Nullawil', - 61354932 => 'Nullawil', - 61354933 => 'Nullawil', - 61354934 => 'Nullawil', - 61354935 => 'Nullawil', + 6135493 => 'Nullawil', 61354936 => 'Wycheproof', 61354937 => 'Wycheproof', 61354938 => 'Wycheproof', 61354939 => 'Wycheproof', - 61354940 => 'Wedderburn', - 61354941 => 'Wedderburn', - 61354942 => 'Wedderburn', - 61354943 => 'Wedderburn', - 61354944 => 'Wedderburn', - 61354945 => 'Wedderburn', - 61354946 => 'Wedderburn', + 6135494 => 'Wedderburn', 61354947 => 'Korong Vale', 61354948 => 'Korong Vale', 61354949 => 'Korong Vale', - 61354950 => 'St Arnaud', - 61354951 => 'St Arnaud', - 61354952 => 'St Arnaud', - 61354953 => 'St Arnaud', - 61354954 => 'St Arnaud', - 61354955 => 'St Arnaud', - 61354956 => 'St Arnaud', + 6135495 => 'St Arnaud', 61354957 => 'Charlton', 61354958 => 'Charlton', 61354959 => 'Gunbower', @@ -18960,15 +16515,8 @@ 61354967 => 'Traynors Lagoon', 61354968 => 'Traynors Lagoon', 61354969 => 'Dingee', - 61354970 => 'Donald', - 61354971 => 'Donald', - 61354972 => 'Donald', - 61354973 => 'Donald', - 61354974 => 'Donald', + 6135497 => 'Donald', 61354975 => 'Bendigo', - 61354976 => 'Donald', - 61354977 => 'Donald', - 61354978 => 'Donald', 61354979 => 'Bendigo', 61354980 => 'Watchem', 61354981 => 'Watchem', @@ -18990,13 +16538,8 @@ 61354997 => 'Beazleys Bridge', 61354998 => 'Beazleys Bridge', 61354999 => 'Beazleys Bridge', - 61355000 => 'Warrnambool', - 61355001 => 'Warrnambool', - 61355002 => 'Warrnambool', - 61355003 => 'Warrnambool', + 6135500 => 'Warrnambool', 61355004 => 'Cavendish', - 61355005 => 'Warrnambool', - 61355006 => 'Warrnambool', 61355007 => 'Hamilton', 61355008 => 'Heywood', 61355009 => 'Portland', @@ -19201,12 +16744,7 @@ 61355208 => 'Mount Richmond', 61355209 => 'Mount Richmond', 6135521 => 'Portland', - 61355220 => 'Portland', - 61355221 => 'Portland', - 61355222 => 'Portland', - 61355223 => 'Portland', - 61355224 => 'Portland', - 61355225 => 'Portland', + 6135522 => 'Portland', 61355226 => 'Heywood', 61355227 => 'Dartmoor', 61355228 => 'Tyrendarra', @@ -19438,22 +16976,11 @@ 61355527 => 'Woodhouse', 61355528 => 'Wallacedale', 61355529 => 'Balmoral', - 61355530 => 'Coleraine', - 61355531 => 'Coleraine', - 61355532 => 'Coleraine', - 61355533 => 'Coleraine', - 61355534 => 'Coleraine', - 61355535 => 'Coleraine', - 61355536 => 'Coleraine', + 6135553 => 'Coleraine', 61355537 => 'Tahara', 61355538 => 'Coojar', 61355539 => 'Merino', - 61355540 => 'Casterton', - 61355541 => 'Casterton', - 61355542 => 'Casterton', - 61355543 => 'Casterton', - 61355544 => 'Casterton', - 61355545 => 'Casterton', + 6135554 => 'Casterton', 61355546 => 'Chetwynd', 61355547 => 'Dorodong', 61355548 => 'Lake Mundi', @@ -19469,14 +16996,7 @@ 61355567 => 'Dorodong', 61355568 => 'Dorodong', 61355569 => 'Warrnambool', - 61355570 => 'Camperdown', - 61355571 => 'Camperdown', - 61355572 => 'Camperdown', - 61355573 => 'Camperdown', - 61355574 => 'Camperdown', - 61355575 => 'Camperdown', - 61355576 => 'Camperdown', - 61355577 => 'Camperdown', + 6135557 => 'Camperdown', 61355578 => 'Terang', 61355579 => 'Ecklin', 61355580 => 'South Purrumbete', @@ -19575,43 +17095,19 @@ 61355799 => 'Portland', 6135581 => 'Casterton', 6135582 => 'Casterton', - 61355830 => 'Chetwynd', - 61355831 => 'Chetwynd', - 61355832 => 'Chetwynd', - 61355833 => 'Chetwynd', - 61355834 => 'Chetwynd', - 61355835 => 'Chetwynd', - 61355836 => 'Chetwynd', - 61355837 => 'Chetwynd', + 6135583 => 'Chetwynd', 61355838 => 'Dorodong', 61355839 => 'Dorodong', - 61355840 => 'Lake Mundi', - 61355841 => 'Lake Mundi', - 61355842 => 'Lake Mundi', - 61355843 => 'Lake Mundi', - 61355844 => 'Lake Mundi', - 61355845 => 'Lake Mundi', - 61355846 => 'Lake Mundi', + 6135584 => 'Lake Mundi', 61355847 => 'Strathdownie', 61355848 => 'Strathdownie', 61355849 => 'Strathdownie', 6135585 => 'Edenhope', - 61355860 => 'Apsley', - 61355861 => 'Apsley', - 61355862 => 'Apsley', - 61355863 => 'Apsley', - 61355864 => 'Apsley', - 61355865 => 'Apsley', - 61355866 => 'Apsley', + 6135586 => 'Apsley', 61355867 => 'Poolaijelo', 61355868 => 'Poolaijelo', 61355869 => 'Poolaijelo', - 61355870 => 'Ozenkadnook', - 61355871 => 'Ozenkadnook', - 61355872 => 'Ozenkadnook', - 61355873 => 'Ozenkadnook', - 61355874 => 'Ozenkadnook', - 61355875 => 'Ozenkadnook', + 6135587 => 'Ozenkadnook', 61355876 => 'Benayeo', 61355877 => 'Benayeo', 61355878 => 'Benayeo', @@ -19627,16 +17123,10 @@ 61355888 => 'Wombelano', 61355889 => 'Wombelano', 6135590 => 'Dundonnell', + 6135591 => 'Terang', 61355910 => 'Ecklin', - 61355911 => 'Terang', - 61355912 => 'Terang', - 61355913 => 'Terang', - 61355914 => 'Terang', - 61355915 => 'Terang', - 61355916 => 'Terang', 61355917 => 'Ecklin', 61355918 => 'Ecklin', - 61355919 => 'Terang', 6135592 => 'Terang', 6135593 => 'Camperdown', 61355940 => 'Merino', @@ -19871,6 +17361,7 @@ 61356197 => 'Warragul', 61356198 => 'San Remo', 61356199 => 'Mirboo North', + 613562 => 'Warragul', 61356200 => 'Neerim South', 61356201 => 'Hill End', 61356202 => 'Mirboo North', @@ -19882,31 +17373,10 @@ 61356208 => 'Icy Creek', 61356209 => 'Poowong', 6135621 => 'Icy Creek', - 6135622 => 'Warragul', - 6135623 => 'Warragul', - 61356240 => 'Warragul', - 61356241 => 'Warragul', - 61356242 => 'Warragul', - 61356243 => 'Warragul', - 61356244 => 'Warragul', - 61356245 => 'Warragul', - 61356246 => 'Warragul', 61356247 => 'Icy Creek', 61356248 => 'Neerim South', 61356249 => 'Bunyip', - 6135625 => 'Warragul', - 6135626 => 'Warragul', - 6135627 => 'Warragul', - 61356280 => 'Neerim South', - 61356281 => 'Neerim South', - 61356282 => 'Neerim South', - 61356283 => 'Neerim South', - 61356284 => 'Neerim South', - 61356285 => 'Neerim South', - 61356286 => 'Warragul', - 61356287 => 'Neerim South', - 61356288 => 'Neerim South', - 61356289 => 'Neerim South', + 6135628 => 'Neerim South', 6135629 => 'Bunyip', 61356300 => 'San Remo', 61356301 => 'Warragul', @@ -20037,15 +17507,7 @@ 61356475 => 'Trafalgar', 61356476 => 'Warragul', 61356477 => 'Wonthaggi', - 61356540 => 'Korumburra', - 61356541 => 'Korumburra', - 61356542 => 'Korumburra', - 61356543 => 'Korumburra', - 61356544 => 'Korumburra', - 61356545 => 'Korumburra', - 61356546 => 'Korumburra', - 61356547 => 'Korumburra', - 61356548 => 'Korumburra', + 6135654 => 'Korumburra', 61356549 => 'Poowong', 6135655 => 'Korumburra', 6135656 => 'Warragul', @@ -20055,38 +17517,16 @@ 6135662 => 'Leongatha', 6135663 => 'Buffalo', 6135664 => 'Leongatha', - 61356670 => 'Leongatha', - 61356671 => 'Leongatha', - 61356672 => 'Leongatha', - 61356673 => 'Leongatha', - 61356674 => 'Leongatha', - 61356675 => 'Leongatha', - 61356676 => 'Leongatha', - 61356677 => 'Leongatha', + 6135667 => 'Leongatha', 61356678 => 'Buffalo', 61356679 => 'Mirboo North', 6135668 => 'Mirboo North', - 61356710 => 'Wonthaggi', - 61356711 => 'Wonthaggi', - 61356712 => 'Wonthaggi', - 61356713 => 'Wonthaggi', - 61356714 => 'Wonthaggi', - 61356715 => 'Wonthaggi', - 61356716 => 'Wonthaggi', - 61356717 => 'Wonthaggi', - 61356718 => 'Wonthaggi', + 6135671 => 'Wonthaggi', 61356719 => 'San Remo', 6135672 => 'Wonthaggi', + 6135673 => 'Warragul', 61356730 => 'Bunyip', 61356731 => 'Hill End', - 61356732 => 'Warragul', - 61356733 => 'Warragul', - 61356734 => 'Warragul', - 61356735 => 'Warragul', - 61356736 => 'Warragul', - 61356737 => 'Warragul', - 61356738 => 'Warragul', - 61356739 => 'Warragul', 6135674 => 'Wonthaggi', 6135678 => 'San Remo', 6135680 => 'Tidal River', @@ -20094,14 +17534,7 @@ 6135682 => 'Foster', 6135683 => 'Foster', 6135684 => 'Foster', - 61356850 => 'Foster', - 61356851 => 'Foster', - 61356852 => 'Foster', - 61356853 => 'Foster', - 61356854 => 'Foster', - 61356855 => 'Foster', - 61356856 => 'Foster', - 61356857 => 'Foster', + 6135685 => 'Foster', 61356858 => 'Toora', 61356859 => 'Tidal River', 61356860 => 'Toora', @@ -20314,15 +17747,8 @@ 61357209 => 'Cheshunt', 6135721 => 'Wangaratta', 6135722 => 'Wangaratta', - 61357230 => 'Wangaratta', - 61357231 => 'Wangaratta', - 61357232 => 'Wangaratta', - 61357233 => 'Wangaratta', - 61357234 => 'Wangaratta', + 6135723 => 'Wangaratta', 61357235 => 'Falls Creek', - 61357236 => 'Wangaratta', - 61357237 => 'Wangaratta', - 61357238 => 'Wangaratta', 61357239 => 'Kilmore', 61357240 => 'Moyhu', 61357241 => 'St James', @@ -20425,15 +17851,9 @@ 61357347 => 'Broadford', 61357348 => 'Kinglake', 61357349 => 'Flowerdale', - 61357350 => 'Seymour', - 61357351 => 'Seymour', - 61357352 => 'Seymour', - 61357353 => 'Seymour', - 61357354 => 'Seymour', - 61357355 => 'Seymour', + 6135735 => 'Seymour', 61357356 => 'Puckapunyal', 61357357 => 'Puckapunyal', - 61357358 => 'Seymour', 61357359 => 'Devlins Bridge', 61357360 => 'Yea', 61357361 => 'Puckapunyal', @@ -20606,16 +18026,8 @@ 61357537 => 'Mansfield', 61357538 => 'Taggerty', 61357539 => 'Taggerty', - 61357540 => 'Mount Beauty', - 61357541 => 'Mount Beauty', + 6135754 => 'Mount Beauty', 61357542 => 'Buffalo River', - 61357543 => 'Mount Beauty', - 61357544 => 'Mount Beauty', - 61357545 => 'Mount Beauty', - 61357546 => 'Mount Beauty', - 61357547 => 'Mount Beauty', - 61357548 => 'Mount Beauty', - 61357549 => 'Mount Beauty', 61357550 => 'Bright', 61357551 => 'Bright', 61357552 => 'Bright', @@ -20729,13 +18141,7 @@ 61357737 => 'Yarck', 61357738 => 'Yarck', 61357739 => 'Yarck', - 61357740 => 'Eildon', - 61357741 => 'Eildon', - 61357742 => 'Eildon', - 61357743 => 'Eildon', - 61357744 => 'Eildon', - 61357745 => 'Eildon', - 61357746 => 'Eildon', + 6135774 => 'Eildon', 61357747 => 'Taggerty', 61357748 => 'Taggerty', 61357749 => 'Taggerty', @@ -20752,12 +18158,7 @@ 61357763 => 'Mansfield', 61357764 => 'Mansfield', 61357769 => 'Mansfield', - 61357770 => 'Jamieson', - 61357771 => 'Jamieson', - 61357772 => 'Jamieson', - 61357773 => 'Jamieson', - 61357774 => 'Jamieson', - 61357775 => 'Jamieson', + 6135777 => 'Jamieson', 61357776 => 'Mount Buller', 61357777 => 'Mount Buller', 61357778 => 'Woods Point', @@ -20776,7 +18177,6 @@ 6135783 => 'Kilmore', 61357836 => 'Whorouly', 61357837 => 'Whorouly', - 61357838 => 'Kilmore', 6135784 => 'Broadford', 61357851 => 'Pyalong', 61357852 => 'Pyalong', @@ -20805,12 +18205,7 @@ 61357906 => 'Strathbogie', 61357908 => 'Strathbogie', 6135791 => 'Wangaratta', - 61357920 => 'Seymour', - 61357921 => 'Seymour', - 61357922 => 'Seymour', - 61357923 => 'Seymour', - 61357924 => 'Seymour', - 61357925 => 'Seymour', + 6135792 => 'Seymour', 61357926 => 'Thoona', 61357927 => 'Thoona', 61357928 => 'Tungamah', @@ -20824,15 +18219,9 @@ 61357937 => 'Puckapunyal', 61357938 => 'Puckapunyal', 61357939 => 'Puckapunyal', - 61357940 => 'Nagambie', - 61357941 => 'Nagambie', - 61357942 => 'Nagambie', + 6135794 => 'Nagambie', 61357943 => 'Graytown', 61357944 => 'Graytown', - 61357945 => 'Nagambie', - 61357946 => 'Nagambie', - 61357947 => 'Nagambie', - 61357948 => 'Nagambie', 61357949 => 'Graytown', 6135795 => 'Euroa', 61357961 => 'Seymour', @@ -20842,13 +18231,7 @@ 61357967 => 'Swanpool', 61357968 => 'Swanpool', 61357969 => 'Kobyboyn', - 61357970 => 'Yea', - 61357971 => 'Yea', - 61357972 => 'Yea', - 61357973 => 'Yea', - 61357974 => 'Yea', - 61357975 => 'Yea', - 61357976 => 'Yea', + 6135797 => 'Yea', 61357977 => 'Devlins Bridge', 61357978 => 'Devlins Bridge', 61357979 => 'Devlins Bridge', @@ -21059,20 +18442,11 @@ 61358197 => 'Shepparton', 61358198 => 'Tatura', 61358199 => 'Tongala', - 6135820 => 'Shepparton', - 6135821 => 'Shepparton', - 6135822 => 'Shepparton', - 6135823 => 'Shepparton', + 613582 => 'Shepparton', 6135824 => 'Tatura', - 6135825 => 'Shepparton', + 6135826 => 'Tatura', 61358260 => 'Undera', - 61358261 => 'Tatura', - 61358262 => 'Tatura', - 61358263 => 'Tatura', 61358264 => 'Undera', - 61358265 => 'Tatura', - 61358266 => 'Tatura', - 61358267 => 'Tatura', 61358268 => 'Undera', 61358269 => 'Undera', 6135827 => 'Kialla East', @@ -21086,7 +18460,6 @@ 61358287 => 'Dookie', 61358288 => 'Dookie', 61358289 => 'Dookie', - 6135829 => 'Shepparton', 61358300 => 'Caldwell', 61358301 => 'Conargo', 61358302 => 'Cornalla', @@ -21269,6 +18642,7 @@ 61358497 => 'Wanganella', 61358498 => 'Jimaringle', 61358499 => 'Conargo', + 613585 => 'Kyabram', 61358500 => 'Jerilderie', 61358501 => 'Moulamein', 61358502 => 'Blighty', @@ -21279,22 +18653,9 @@ 61358507 => 'Conargo', 61358508 => 'Berrigan', 61358509 => 'Kialla East', - 61358510 => 'Kyabram', - 61358511 => 'Kyabram', - 61358512 => 'Kyabram', - 61358513 => 'Kyabram', - 61358514 => 'Kyabram', - 61358515 => 'Kyabram', - 61358516 => 'Kyabram', - 61358517 => 'Kyabram', 61358518 => 'Rushworth', 61358519 => 'Tongala', - 6135852 => 'Kyabram', - 6135853 => 'Kyabram', - 6135854 => 'Kyabram', - 6135855 => 'Kyabram', 6135856 => 'Rushworth', - 6135857 => 'Kyabram', 6135858 => 'Shepparton', 6135859 => 'Tongala', 61358600 => 'Picola', @@ -21307,12 +18668,7 @@ 61358607 => 'Kyabram', 61358608 => 'Rushworth', 61358609 => 'Rushworth', - 61358610 => 'Numurkah', - 61358611 => 'Numurkah', - 61358612 => 'Numurkah', - 61358613 => 'Numurkah', - 61358614 => 'Numurkah', - 61358615 => 'Numurkah', + 6135861 => 'Numurkah', 61358616 => 'Katamatite', 61358617 => 'Nathalia', 61358618 => 'Yalca', @@ -21348,14 +18704,7 @@ 6135872 => 'Cobram', 6135873 => 'Cobram', 6135874 => 'Tocumwal', - 61358750 => 'Cobram', - 61358751 => 'Cobram', - 61358752 => 'Cobram', - 61358753 => 'Cobram', - 61358754 => 'Cobram', - 61358755 => 'Cobram', - 61358756 => 'Cobram', - 61358757 => 'Cobram', + 6135875 => 'Cobram', 61358758 => 'Tocumwal', 61358759 => 'Lalalty', 6135876 => 'Lalalty', @@ -21400,16 +18749,11 @@ 61358808 => 'Brassi', 61358809 => 'Caldwell', 6135881 => 'Deniliquin', + 6135882 => 'Blighty', 61358820 => 'Cornalla', 61358821 => 'Cornalla', 61358822 => 'Deniliquin', 61358823 => 'Deniliquin', - 61358824 => 'Blighty', - 61358825 => 'Blighty', - 61358826 => 'Blighty', - 61358827 => 'Blighty', - 61358828 => 'Blighty', - 61358829 => 'Blighty', 6135883 => 'Finley', 61358840 => 'Brassi', 61358841 => 'Brassi', @@ -21421,36 +18765,17 @@ 61358847 => 'Wanganella', 61358848 => 'Wanganella', 61358849 => 'Wanganella', - 61358850 => 'Berrigan', - 61358851 => 'Berrigan', - 61358852 => 'Berrigan', - 61358853 => 'Berrigan', - 61358854 => 'Berrigan', - 61358855 => 'Berrigan', + 6135885 => 'Berrigan', 61358856 => 'Jerilderie', 61358857 => 'Jerilderie', - 61358858 => 'Berrigan', 61358859 => 'Logie Brae', - 61358860 => 'Jerilderie', - 61358861 => 'Jerilderie', - 61358862 => 'Jerilderie', - 61358863 => 'Jerilderie', - 61358864 => 'Jerilderie', - 61358865 => 'Jerilderie', - 61358866 => 'Jerilderie', + 6135886 => 'Jerilderie', 61358867 => 'Mabins Well', - 61358868 => 'Jerilderie', - 61358869 => 'Jerilderie', + 6135887 => 'Moulamein', 61358870 => 'Wakool', 61358871 => 'Wakool', 61358872 => 'Wakool', 61358873 => 'Jimaringle', - 61358874 => 'Moulamein', - 61358875 => 'Moulamein', - 61358876 => 'Moulamein', - 61358877 => 'Moulamein', - 61358878 => 'Moulamein', - 61358879 => 'Moulamein', 61358880 => 'Berrigan', 61358881 => 'Jimaringle', 61358882 => 'Finley', @@ -21850,14 +19175,7 @@ 6135942 => 'Pakenham', 6135943 => 'Pakenham', 6135944 => 'Emerald', - 61359450 => 'Pakenham', - 61359451 => 'Pakenham', - 61359452 => 'Pakenham', - 61359453 => 'Pakenham', - 61359454 => 'Pakenham', - 61359455 => 'Pakenham', - 61359456 => 'Pakenham', - 61359457 => 'Pakenham', + 6135945 => 'Pakenham', 61359458 => 'Koo Wee Rup', 61359459 => 'Emerald', 61359460 => 'Rosebud', @@ -21881,16 +19199,11 @@ 61359533 => 'Cranbourne', 61359534 => 'Cranbourne', 61359535 => 'Cranbourne', - 61359540 => 'Emerald', - 61359541 => 'Emerald', - 61359542 => 'Emerald', - 61359543 => 'Emerald', - 61359544 => 'Emerald', + 6135954 => 'Emerald', 61359545 => 'Warburton', 61359546 => 'Warburton', 61359547 => 'Warburton', 61359548 => 'Warburton', - 61359549 => 'Emerald', 61359550 => 'Emerald', 61359551 => 'Cranbourne', 61359552 => 'Mornington', @@ -21935,34 +19248,10 @@ 6135967 => 'Emerald', 6135968 => 'Emerald', 6135969 => 'Healesville', - 6135970 => 'Mornington', - 6135971 => 'Mornington', - 6135972 => 'Mornington', - 6135973 => 'Mornington', - 6135974 => 'Mornington', - 6135975 => 'Mornington', - 6135976 => 'Mornington', - 6135977 => 'Mornington', - 6135978 => 'Mornington', - 6135979 => 'Mornington', + 613597 => 'Mornington', + 613598 => 'Rosebud', 6135980 => 'Tankerton', - 6135981 => 'Rosebud', - 6135982 => 'Rosebud', - 61359830 => 'Red Hill', - 61359831 => 'Red Hill', - 61359832 => 'Red Hill', - 61359833 => 'Red Hill', - 61359834 => 'Rosebud', - 61359835 => 'Red Hill', - 61359836 => 'Red Hill', - 61359837 => 'Red Hill', - 61359838 => 'Red Hill', - 61359839 => 'Red Hill', - 6135984 => 'Rosebud', - 6135985 => 'Rosebud', - 6135986 => 'Rosebud', - 6135987 => 'Rosebud', - 6135988 => 'Rosebud', + 6135983 => 'Red Hill', 6135989 => 'Red Hill', 6135990 => 'Cranbourne', 6135991 => 'Cranbourne', @@ -22117,16 +19406,9 @@ 61361167 => 'Ouse', 61361168 => 'Tarraleah', 61361169 => 'Tarraleah', + 6136117 => 'Margate', 61361170 => 'Swansea', 61361171 => 'Swansea', - 61361172 => 'Margate', - 61361173 => 'Margate', - 61361174 => 'Margate', - 61361175 => 'Margate', - 61361176 => 'Margate', - 61361177 => 'Margate', - 61361178 => 'Margate', - 61361179 => 'Margate', 61361180 => 'Margate', 61361181 => 'Margate', 61361182 => 'Hobart', @@ -22378,16 +19660,10 @@ 61361437 => 'South Bruny', 61361438 => 'Southwest', 61361439 => 'Strathgordon', + 6136144 => 'Hobart', 61361440 => 'Swansea', 61361441 => 'Tarraleah', 61361442 => 'Woodbury', - 61361443 => 'Hobart', - 61361444 => 'Hobart', - 61361445 => 'Hobart', - 61361446 => 'Hobart', - 61361447 => 'Hobart', - 61361448 => 'Hobart', - 61361449 => 'Hobart', 6136145 => 'Hobart', 61361460 => 'Hobart', 61361461 => 'Hobart', @@ -22515,13 +19791,7 @@ 61362097 => 'Swansea', 61362098 => 'Woodbury', 61362099 => 'Baden', - 6136210 => 'Hobart', - 6136211 => 'Hobart', - 6136212 => 'Hobart', - 6136213 => 'Hobart', - 6136214 => 'Hobart', - 6136215 => 'Hobart', - 6136216 => 'Hobart', + 613621 => 'Hobart', 61362170 => 'Sorell', 61362171 => 'Sorell', 61362172 => 'Sorell', @@ -22531,8 +19801,6 @@ 61362176 => 'Strathgordon', 61362177 => 'Strathgordon', 61362178 => 'Strathgordon', - 61362179 => 'Hobart', - 6136218 => 'Hobart', 61362190 => 'Swansea', 61362191 => 'Swansea', 61362192 => 'Swansea', @@ -22543,73 +19811,27 @@ 61362197 => 'Woodbury', 61362198 => 'Woodbury', 61362199 => 'Geeveston', - 6136220 => 'Hobart', - 6136221 => 'Hobart', - 6136222 => 'Hobart', - 6136223 => 'Hobart', - 6136224 => 'Hobart', - 6136225 => 'Hobart', - 6136226 => 'Hobart', - 6136227 => 'Hobart', - 6136228 => 'Hobart', - 6136229 => 'Hobart', - 6136230 => 'Hobart', - 6136231 => 'Hobart', - 6136232 => 'Hobart', - 6136233 => 'Hobart', - 6136234 => 'Hobart', - 6136235 => 'Hobart', - 6136236 => 'Hobart', - 6136237 => 'Hobart', - 6136238 => 'Hobart', - 6136239 => 'Hobart', - 6136240 => 'Hobart', + 613622 => 'Hobart', + 613623 => 'Hobart', + 613624 => 'Hobart', 61362410 => 'Dover', - 61362411 => 'Hobart', 61362412 => 'Geeveston', 61362413 => 'South Bruny', 61362414 => 'Southwest', 61362415 => 'Brighton', - 61362416 => 'Hobart', 61362417 => 'Huonville', 61362418 => 'Margate', - 61362419 => 'Hobart', 61362420 => 'Southwest', 61362421 => 'Dover', - 61362422 => 'Hobart', - 61362423 => 'Hobart', - 61362424 => 'Hobart', - 61362425 => 'Hobart', - 61362426 => 'Hobart', - 61362427 => 'Hobart', - 61362428 => 'Hobart', - 61362429 => 'Hobart', - 6136243 => 'Hobart', - 6136244 => 'Hobart', - 6136245 => 'Hobart', 61362460 => 'New Norfolk', 61362461 => 'Richmond', 61362462 => 'Sorell', 61362463 => 'Baden', - 61362464 => 'Hobart', - 61362465 => 'Hobart', - 61362466 => 'Hobart', - 61362467 => 'Hobart', - 61362468 => 'Hobart', - 61362469 => 'Hobart', - 6136247 => 'Hobart', - 6136248 => 'Hobart', - 6136249 => 'Hobart', - 61362500 => 'Nubeena', - 61362501 => 'Nubeena', - 61362502 => 'Nubeena', - 61362503 => 'Nubeena', - 61362504 => 'Nubeena', + 6136250 => 'Nubeena', 61362505 => 'Bothwell', 61362506 => 'Colebrook', 61362507 => 'Dunalley', 61362508 => 'Hermitage', - 61362509 => 'Nubeena', 61362510 => 'South Bruny', 61362511 => 'Hobart', 61362512 => 'Nubeena', @@ -22700,16 +19922,10 @@ 61362597 => 'Colebrook', 61362598 => 'Miena', 61362599 => 'Colebrook', - 61362600 => 'Richmond', - 61362601 => 'Richmond', - 61362602 => 'Richmond', - 61362603 => 'Richmond', - 61362604 => 'Richmond', + 6136260 => 'Richmond', 61362605 => 'Baden', 61362606 => 'Margate', 61362607 => 'Margate', - 61362608 => 'Richmond', - 61362609 => 'Richmond', 6136261 => 'New Norfolk', 61362620 => 'New Norfolk', 61362621 => 'New Norfolk', @@ -22722,54 +19938,22 @@ 61362628 => 'Brighton', 61362629 => 'Brighton', 6136263 => 'Brighton', - 61362640 => 'Huonville', - 61362641 => 'Huonville', - 61362642 => 'Huonville', - 61362643 => 'Huonville', - 61362644 => 'Huonville', + 6136264 => 'Huonville', 61362645 => 'Colebrook', 61362646 => 'Dunalley', - 61362647 => 'Huonville', - 61362648 => 'Huonville', - 61362649 => 'Huonville', 6136265 => 'Sorell', - 61362660 => 'Huonville', - 61362661 => 'Huonville', - 61362662 => 'Huonville', - 61362663 => 'Huonville', - 61362664 => 'Huonville', - 61362665 => 'Huonville', - 61362666 => 'Huonville', - 61362667 => 'Huonville', + 6136266 => 'Huonville', 61362668 => 'Hermitage', 61362669 => 'Kempton', 6136267 => 'Margate', - 61362680 => 'Brighton', - 61362681 => 'Brighton', + 6136268 => 'Brighton', 61362682 => 'Little Swanport', 61362683 => 'Miena', - 61362684 => 'Brighton', - 61362685 => 'Brighton', - 61362686 => 'Brighton', - 61362687 => 'Brighton', - 61362688 => 'Brighton', - 61362689 => 'Brighton', - 61362690 => 'Sorell', - 61362691 => 'Sorell', - 61362692 => 'Sorell', - 61362693 => 'Sorell', - 61362694 => 'Sorell', - 61362695 => 'Sorell', - 61362696 => 'Sorell', + 6136269 => 'Sorell', 61362697 => 'Nubeena', 61362698 => 'Oatlands', 61362699 => 'Orford', - 6136270 => 'Hobart', - 6136271 => 'Hobart', - 6136272 => 'Hobart', - 6136273 => 'Hobart', - 6136274 => 'Hobart', - 6136275 => 'Hobart', + 613627 => 'Hobart', 61362760 => 'Margate', 61362761 => 'New Norfolk', 61362762 => 'Richmond', @@ -22780,9 +19964,6 @@ 61362767 => 'Dunalley', 61362768 => 'Hermitage', 61362769 => 'Kempton', - 6136277 => 'Hobart', - 6136278 => 'Hobart', - 6136279 => 'Hobart', 61362800 => 'Strathgordon', 61362801 => 'Strathgordon', 61362802 => 'Strathgordon', @@ -22795,16 +19976,8 @@ 61362809 => 'Strathgordon', 6136281 => 'Hobart', 6136282 => 'Hobart', - 61362830 => 'Hobart', - 61362831 => 'Hobart', - 61362832 => 'Hobart', - 61362833 => 'Hobart', - 61362834 => 'Hobart', - 61362835 => 'Hobart', + 6136283 => 'Hobart', 61362836 => 'Tarraleah', - 61362837 => 'Hobart', - 61362838 => 'Hobart', - 61362839 => 'Hobart', 61362840 => 'Little Swanport', 61362841 => 'Miena', 61362842 => 'Nubeena', @@ -22815,56 +19988,27 @@ 61362847 => 'Gretna', 61362848 => 'Maydena', 61362849 => 'Ouse', + 6136285 => 'Hobart', 61362850 => 'Strathgordon', 61362851 => 'Tarraleah', - 61362852 => 'Hobart', - 61362853 => 'Hobart', - 61362854 => 'Hobart', - 61362855 => 'Hobart', - 61362856 => 'Hobart', - 61362857 => 'Hobart', - 61362858 => 'Hobart', - 61362859 => 'Hobart', + 6136286 => 'Gretna', 61362860 => 'Hobart', - 61362861 => 'Gretna', - 61362862 => 'Gretna', - 61362863 => 'Gretna', - 61362864 => 'Gretna', - 61362865 => 'Gretna', - 61362866 => 'Gretna', 61362867 => 'Hobart', 61362868 => 'Hobart', - 61362869 => 'Gretna', - 61362870 => 'Ouse', - 61362871 => 'Ouse', - 61362872 => 'Ouse', - 61362873 => 'Ouse', - 61362874 => 'Ouse', - 61362875 => 'Ouse', + 6136287 => 'Ouse', 61362876 => 'Hobart', 61362877 => 'Hobart', 61362878 => 'Hobart', - 61362879 => 'Ouse', - 61362880 => 'Maydena', - 61362881 => 'Maydena', - 61362882 => 'Maydena', - 61362883 => 'Maydena', - 61362884 => 'Maydena', + 6136288 => 'Maydena', 61362885 => 'Hobart', 61362886 => 'Hobart', 61362887 => 'Hobart', 61362888 => 'Hobart', - 61362889 => 'Maydena', - 61362890 => 'Tarraleah', - 61362891 => 'Tarraleah', - 61362892 => 'Tarraleah', - 61362893 => 'Tarraleah', - 61362894 => 'Tarraleah', + 6136289 => 'Tarraleah', 61362895 => 'Hobart', 61362896 => 'Hobart', 61362897 => 'Hobart', 61362898 => 'Hobart', - 61362899 => 'Tarraleah', 61362900 => 'Nubeena', 61362901 => 'Oatlands', 61362902 => 'Orford', @@ -22885,16 +20029,10 @@ 61362917 => 'Kempton', 61362918 => 'Little Swanport', 61362919 => 'Miena', - 61362920 => 'Hobart', + 6136292 => 'Hobart', 61362921 => 'Geeveston', 61362922 => 'Geeveston', 61362923 => 'Nubeena', - 61362924 => 'Hobart', - 61362925 => 'Hobart', - 61362926 => 'Hobart', - 61362927 => 'Hobart', - 61362928 => 'Hobart', - 61362929 => 'Hobart', 61362930 => 'South Bruny', 61362931 => 'South Bruny', 61362932 => 'South Bruny', @@ -22912,29 +20050,18 @@ 61362947 => 'Huonville', 61362948 => 'Margate', 61362949 => 'New Norfolk', - 61362950 => 'Geeveston', - 61362951 => 'Geeveston', - 61362952 => 'Geeveston', + 6136295 => 'Geeveston', 61362953 => 'Hobart', 61362954 => 'Hobart', 61362955 => 'Hobart', 61362956 => 'Hobart', - 61362957 => 'Geeveston', - 61362958 => 'Geeveston', - 61362959 => 'Geeveston', 61362960 => 'Southwest', 61362961 => 'Southwest', 61362962 => 'Southwest', - 61362970 => 'Geeveston', - 61362971 => 'Geeveston', - 61362972 => 'Geeveston', + 6136297 => 'Geeveston', 61362973 => 'Hobart', 61362974 => 'Hobart', 61362975 => 'Hobart', - 61362976 => 'Geeveston', - 61362977 => 'Geeveston', - 61362978 => 'Geeveston', - 61362979 => 'Geeveston', 61362980 => 'Dover', 61362981 => 'Dover', 61362982 => 'Dover', @@ -23145,6 +20272,7 @@ 61363197 => 'Exeter', 61363198 => 'George Town', 61363199 => 'Glengarry', + 613632 => 'Launceston', 61363200 => 'Lilydale', 61363201 => 'Avoca', 61363202 => 'Beaconsfield', @@ -23175,12 +20303,6 @@ 61363227 => 'Blessington', 61363228 => 'Campbell Town', 61363229 => 'Evandale', - 6136323 => 'Launceston', - 6136324 => 'Launceston', - 6136325 => 'Launceston', - 6136326 => 'Launceston', - 6136327 => 'Launceston', - 6136328 => 'Launceston', 61363290 => 'Exeter', 61363291 => 'George Town', 61363292 => 'Glengarry', @@ -23191,18 +20313,8 @@ 61363297 => 'Westbury', 61363298 => 'Bridport', 61363299 => 'Gladstone', - 6136330 => 'Launceston', - 6136331 => 'Launceston', - 6136332 => 'Launceston', - 6136333 => 'Launceston', - 6136334 => 'Launceston', - 6136335 => 'Launceston', - 6136336 => 'Launceston', - 6136337 => 'Launceston', - 6136338 => 'Launceston', - 6136339 => 'Launceston', - 6136340 => 'Launceston', - 6136341 => 'Launceston', + 613633 => 'Launceston', + 613634 => 'Launceston', 61363420 => 'Ringarooma', 61363421 => 'Scottsdale', 61363422 => 'Waterhouse', @@ -23213,9 +20325,6 @@ 61363427 => 'Pyengana', 61363428 => 'St Helens', 61363429 => 'St Marys', - 6136343 => 'Launceston', - 6136344 => 'Launceston', - 6136345 => 'Launceston', 61363460 => 'Deloraine', 61363461 => 'Mole Creek', 61363462 => 'Moltema', @@ -23236,9 +20345,6 @@ 61363477 => 'Westbury', 61363478 => 'Bridport', 61363479 => 'Gladstone', - 6136348 => 'Launceston', - 61363490 => 'Launceston', - 61363491 => 'Launceston', 61363492 => 'Ringarooma', 61363493 => 'Scottsdale', 61363494 => 'Waterhouse', @@ -23274,12 +20380,7 @@ 61363587 => 'Longford', 61363588 => 'Rossarden', 61363589 => 'Targa', - 61363590 => 'Whitemark', - 61363591 => 'Whitemark', - 61363592 => 'Whitemark', - 61363593 => 'Whitemark', - 61363594 => 'Whitemark', - 61363595 => 'Whitemark', + 6136359 => 'Whitemark', 61363596 => 'Emita', 61363597 => 'Emita', 61363598 => 'Emita', @@ -23385,12 +20486,7 @@ 61363797 => 'Lilydale', 61363798 => 'Targa', 61363799 => 'Targa', - 61363800 => 'George Town', - 61363801 => 'George Town', - 61363802 => 'George Town', - 61363803 => 'George Town', - 61363804 => 'George Town', - 61363805 => 'George Town', + 6136380 => 'George Town', 61363806 => 'Launceston', 61363807 => 'Launceston', 61363808 => 'Launceston', @@ -23441,16 +20537,11 @@ 61363898 => 'Bicheno', 61363899 => 'Bicheno', 6136390 => 'Blessington', - 61363910 => 'Evandale', + 6136391 => 'Evandale', 61363911 => 'Longford', 61363912 => 'Longford', 61363913 => 'Longford', 61363914 => 'Longford', - 61363915 => 'Evandale', - 61363916 => 'Evandale', - 61363917 => 'Evandale', - 61363918 => 'Evandale', - 61363919 => 'Evandale', 6136392 => 'Westbury', 6136393 => 'Westbury', 6136394 => 'Exeter', @@ -23659,24 +20750,10 @@ 61364197 => 'Burnie', 61364198 => 'Gordon', 61364199 => 'Devonport', - 6136420 => 'Devonport', - 6136421 => 'Devonport', - 6136422 => 'Devonport', - 6136423 => 'Devonport', - 6136424 => 'Devonport', + 613642 => 'Devonport', 6136425 => 'Ulverstone', - 6136426 => 'Devonport', - 6136427 => 'Devonport', - 6136428 => 'Devonport', 6136429 => 'Ulverstone', - 6136430 => 'Burnie', - 6136431 => 'Burnie', - 6136432 => 'Burnie', - 6136433 => 'Burnie', - 6136434 => 'Burnie', - 6136435 => 'Burnie', - 6136436 => 'Burnie', - 6136437 => 'Burnie', + 613643 => 'Burnie', 6136438 => 'Yolla', 6136439 => 'Waratah', 6136440 => 'Burnie', @@ -23840,15 +20917,7 @@ 61364682 => 'Yambacoona', 61364683 => 'Yolla', 6136471 => 'Queenstown', - 61364720 => 'Queenstown', - 61364721 => 'Queenstown', - 61364722 => 'Queenstown', - 61364723 => 'Queenstown', - 61364724 => 'Queenstown', - 61364725 => 'Queenstown', - 61364726 => 'Queenstown', - 61364727 => 'Queenstown', - 61364728 => 'Queenstown', + 6136472 => 'Queenstown', 61364729 => 'Gordon', 6136473 => 'Rosebery', 61364740 => 'Devonport', @@ -24123,16 +21192,9 @@ 61367237 => 'Targa', 61367238 => 'Waterhouse', 61367239 => 'Westbury', + 6136724 => 'Launceston', 61367240 => 'Whitemark', 61367241 => 'Winnaleah', - 61367242 => 'Launceston', - 61367243 => 'Launceston', - 61367244 => 'Launceston', - 61367245 => 'Launceston', - 61367246 => 'Launceston', - 61367247 => 'Launceston', - 61367248 => 'Launceston', - 61367249 => 'Launceston', 6136725 => 'Launceston', 61367260 => 'Launceston', 61367261 => 'Launceston', @@ -24186,31 +21248,14 @@ 61367767 => 'Launceston', 61367768 => 'Launceston', 6136777 => 'Launceston', - 61367780 => 'Launceston', - 61367781 => 'Launceston', - 61367782 => 'Launceston', - 61367783 => 'Launceston', - 61367784 => 'Launceston', - 61367785 => 'Launceston', - 61367786 => 'Launceston', - 61367787 => 'Launceston', + 6136778 => 'Launceston', 61367788 => 'Scottsdale', - 61367789 => 'Launceston', 6136779 => 'Launceston', 6137000 => 'Melbourne', 6137001 => 'Melbourne', 6137002 => 'Melbourne', 61370031 => 'Melbourne', - 6137010 => 'Melbourne', - 6137011 => 'Melbourne', - 6137012 => 'Melbourne', - 6137013 => 'Melbourne', - 6137014 => 'Melbourne', - 6137015 => 'Melbourne', - 6137016 => 'Melbourne', - 6137017 => 'Melbourne', - 6137018 => 'Melbourne', - 6137019 => 'Melbourne', + 613701 => 'Melbourne', 6137020 => 'Melbourne', 6137022 => 'Melbourne', 61373000 => 'Craigieburn', @@ -24295,15 +21340,10 @@ 6138100 => 'Kalkallo', 6138101 => 'Whittlesea', 6138102 => 'Melbourne', - 61381030 => 'Whittlesea', - 61381031 => 'Whittlesea', - 61381032 => 'Whittlesea', + 6138103 => 'Whittlesea', 61381033 => 'Kalkallo', 61381034 => 'Kalkallo', - 61381035 => 'Whittlesea', - 61381036 => 'Whittlesea', 61381037 => 'Kalkallo', - 61381038 => 'Whittlesea', 61381039 => 'Kalkallo', 61381040 => 'Whittlesea', 61381041 => 'Kalkallo', @@ -24335,56 +21375,25 @@ 61382157 => 'Croydon', 61382158 => 'Croydon', 61382159 => 'Croydon', - 61382560 => 'Melbourne', - 61382561 => 'Melbourne', - 61382562 => 'Melbourne', + 6138256 => 'Melbourne', 61382563 => 'Melbourne/Point Cook/Melbourne', - 61382564 => 'Melbourne', - 61382565 => 'Melbourne', - 61382566 => 'Melbourne', - 61382567 => 'Melbourne', - 61382568 => 'Melbourne', - 61382569 => 'Melbourne', 61382605 => 'Croydon', 6138288 => 'Croydon', 6138290 => 'Melbourne', - 6138300 => 'Melbourne', - 6138301 => 'Melbourne', - 6138302 => 'Melbourne', + 61383 => 'Melbourne', 6138303 => 'Point Cook', 6138304 => 'Sydenham', 6138305 => 'Craigieburn', - 6138306 => 'Melbourne', - 6138307 => 'Melbourne', 6138308 => 'Sydenham', - 6138309 => 'Melbourne', - 6138310 => 'Melbourne', - 6138311 => 'Melbourne', - 6138312 => 'Melbourne', 6138313 => 'Craigieburn', 6138314 => 'Craigieburn', 6138315 => 'Sydenham', 6138316 => 'Point Cook', - 6138317 => 'Melbourne', - 6138318 => 'Melbourne', - 6138319 => 'Melbourne', - 6138320 => 'Melbourne', - 6138321 => 'Melbourne', 6138322 => 'Sydenham', 6138323 => 'Point Cook', 6138324 => 'Craigieburn', - 6138325 => 'Melbourne', - 6138326 => 'Melbourne', - 6138327 => 'Melbourne', - 6138328 => 'Melbourne', - 6138329 => 'Melbourne', - 6138330 => 'Melbourne', - 6138331 => 'Melbourne', - 6138332 => 'Melbourne', 6138333 => 'Craigieburn', 6138334 => 'Point Cook', - 6138335 => 'Melbourne', - 6138336 => 'Melbourne', 6138337 => 'Sydenham', 61383380 => 'Craigieburn', 61383381 => 'Craigieburn', @@ -24397,14 +21406,7 @@ 61383388 => 'Sydenham', 61383389 => 'Point Cook', 6138339 => 'Craigieburn', - 6138340 => 'Melbourne', - 6138341 => 'Melbourne', - 6138342 => 'Melbourne', 6138343 => 'Point Cook', - 6138344 => 'Melbourne', - 6138345 => 'Melbourne', - 6138346 => 'Melbourne', - 6138347 => 'Melbourne', 61383480 => 'Craigieburn', 61383481 => 'Point Cook', 61383482 => 'Sydenham', @@ -24428,46 +21430,19 @@ 61383518 => 'Craigieburn', 61383519 => 'Craigieburn', 61383520 => 'Sydenham', - 61383521 => 'Melbourne', - 61383522 => 'Melbourne', - 61383523 => 'Melbourne', - 61383524 => 'Melbourne', - 61383525 => 'Melbourne', - 61383526 => 'Melbourne', - 61383527 => 'Melbourne', - 61383528 => 'Melbourne', - 61383529 => 'Melbourne', - 61383530 => 'Melbourne', - 61383531 => 'Point Cook', - 61383532 => 'Point Cook', - 61383533 => 'Point Cook', - 61383534 => 'Point Cook', - 61383535 => 'Point Cook', - 61383536 => 'Point Cook', - 61383537 => 'Point Cook', - 61383538 => 'Point Cook', - 61383539 => 'Point Cook', - 6138354 => 'Melbourne', + 6138353 => 'Point Cook', 6138355 => 'Craigieburn', 6138356 => 'Sydenham', 6138357 => 'Sydenham', - 61383580 => 'Sydenham', - 61383581 => 'Sydenham', - 61383582 => 'Sydenham', - 61383583 => 'Sydenham', - 61383584 => 'Sydenham', - 61383585 => 'Sydenham', + 6138358 => 'Sydenham', 61383586 => 'Craigieburn', 61383587 => 'Craigieburn', 61383588 => 'Craigieburn', 61383589 => 'Craigieburn', - 6138359 => 'Melbourne', - 6138360 => 'Melbourne', 6138361 => 'Sydenham', 61383620 => 'Craigieburn', 61383621 => 'Craigieburn', 61383622 => 'Point Cook', - 61383623 => 'Melbourne', 61383624 => 'Point Cook', 61383625 => 'Sydenham', 61383626 => 'Sydenham', @@ -24479,84 +21454,34 @@ 6138365 => 'Craigieburn', 6138366 => 'Point Cook', 6138367 => 'Point Cook', - 6138368 => 'Melbourne', - 6138369 => 'Melbourne', - 6138370 => 'Melbourne', - 6138371 => 'Melbourne', - 61383720 => 'Melbourne', - 61383721 => 'Melbourne', + 6138372 => 'Sydenham', 61383722 => 'Point Cook', 61383723 => 'Craigieburn', - 61383724 => 'Sydenham', - 61383725 => 'Sydenham', - 61383726 => 'Sydenham', - 61383727 => 'Sydenham', - 61383728 => 'Sydenham', - 61383729 => 'Sydenham', - 6138373 => 'Melbourne', 61383740 => 'Point Cook', 61383741 => 'Sydenham', 61383742 => 'Craigieburn', - 61383743 => 'Melbourne', 61383744 => 'Point Cook', 61383745 => 'Sydenham', - 61383746 => 'Melbourne', - 61383747 => 'Melbourne', - 61383748 => 'Melbourne', 61383749 => 'Craigieburn', 61383750 => 'Point Cook', 61383751 => 'Point Cook', 61383752 => 'Point Cook', 61383753 => 'Point Cook', - 61383754 => 'Melbourne', - 61383755 => 'Melbourne', - 61383756 => 'Melbourne', - 61383757 => 'Melbourne', - 61383758 => 'Melbourne', - 61383759 => 'Melbourne', - 61383760 => 'Melbourne', - 61383761 => 'Melbourne', - 61383762 => 'Melbourne', 61383763 => 'Point Cook', 61383764 => 'Point Cook', 61383765 => 'Point Cook', - 61383766 => 'Melbourne', - 61383767 => 'Melbourne', - 61383768 => 'Melbourne', - 61383769 => 'Melbourne', 6138377 => 'Craigieburn', - 6138378 => 'Melbourne', - 6138379 => 'Melbourne', 6138380 => 'Point Cook', 6138381 => 'Point Cook', 6138382 => 'Sydenham', - 6138383 => 'Melbourne', 6138384 => 'Craigieburn', 6138385 => 'Sydenham', 6138386 => 'Point Cook', - 6138387 => 'Melbourne', - 6138388 => 'Melbourne', 6138389 => 'Craigieburn', 6138390 => 'Sydenham', - 6138391 => 'Melbourne', - 6138392 => 'Melbourne', - 6138393 => 'Melbourne', - 6138394 => 'Melbourne', - 6138395 => 'Melbourne', - 6138396 => 'Melbourne', - 6138397 => 'Melbourne', - 6138398 => 'Melbourne', - 6138399 => 'Melbourne', - 61384000 => 'Eltham', - 61384001 => 'Eltham', - 61384002 => 'Eltham', - 61384003 => 'Eltham', + 6138400 => 'Eltham', 61384004 => 'Melbourne', - 61384005 => 'Eltham', - 61384006 => 'Eltham', 61384007 => 'Melbourne', - 61384008 => 'Eltham', - 61384009 => 'Eltham', 6138401 => 'Eltham', 6138402 => 'Eltham', 6138403 => 'Melbourne', @@ -24594,34 +21519,14 @@ 61384887 => 'Melbourne', 61384888 => 'Melbourne', 61384889 => 'Melbourne', - 6138500 => 'Melbourne', + 613850 => 'Melbourne', 6138501 => 'Clayton', - 6138502 => 'Melbourne', - 6138503 => 'Melbourne', - 6138504 => 'Melbourne', 6138505 => 'Clayton', - 6138506 => 'Melbourne', - 6138507 => 'Melbourne', - 6138508 => 'Melbourne', - 6138509 => 'Melbourne', - 6138510 => 'Clayton', - 6138511 => 'Clayton', - 6138512 => 'Clayton', - 6138513 => 'Clayton', - 6138514 => 'Clayton', + 613851 => 'Clayton', 6138515 => 'Melbourne', - 6138516 => 'Clayton', 6138517 => 'Melbourne', - 61385180 => 'Clayton', - 61385181 => 'Clayton', - 61385182 => 'Clayton', - 61385183 => 'Clayton', 61385184 => 'Melbourne', - 61385185 => 'Clayton', - 61385186 => 'Clayton', 61385187 => 'Melbourne', - 61385188 => 'Clayton', - 61385189 => 'Clayton', 6138519 => 'Melbourne', 6138520 => 'Melbourne', 6138521 => 'Clayton', @@ -24633,26 +21538,10 @@ 6138527 => 'Melbourne', 6138528 => 'Melbourne', 6138529 => 'Melbourne', - 6138530 => 'Melbourne', - 6138531 => 'Melbourne', - 6138532 => 'Melbourne', - 6138533 => 'Melbourne', - 6138534 => 'Melbourne', - 6138535 => 'Melbourne', - 6138536 => 'Melbourne', - 6138537 => 'Melbourne', - 6138538 => 'Melbourne', - 6138539 => 'Melbourne', - 6138540 => 'Clayton', - 6138541 => 'Clayton', - 6138542 => 'Clayton', - 6138543 => 'Clayton', - 6138544 => 'Clayton', - 6138545 => 'Clayton', - 6138546 => 'Clayton', + 613853 => 'Melbourne', + 613854 => 'Clayton', 6138547 => 'Melbourne', 6138548 => 'Melbourne', - 6138549 => 'Clayton', 6138550 => 'Clayton', 6138551 => 'Clayton', 6138552 => 'Melbourne', @@ -24669,12 +21558,7 @@ 6138563 => 'Melbourne', 6138564 => 'Melbourne', 6138565 => 'Clayton', - 61385660 => 'Clayton', - 61385661 => 'Clayton', - 61385662 => 'Clayton', - 61385663 => 'Clayton', - 61385664 => 'Clayton', - 61385665 => 'Clayton', + 6138566 => 'Clayton', 61385666 => 'Melbourne', 61385667 => 'Melbourne', 61385668 => 'Melbourne', @@ -24688,14 +21572,7 @@ 6138574 => 'Melbourne', 6138575 => 'Melbourne', 6138576 => 'Melbourne', - 61385770 => 'Clayton', - 61385771 => 'Clayton', - 61385772 => 'Clayton', - 61385773 => 'Clayton', - 61385774 => 'Clayton', - 61385775 => 'Clayton', - 61385776 => 'Clayton', - 61385777 => 'Clayton', + 6138577 => 'Clayton', 61385778 => 'Melbourne', 61385779 => 'Melbourne', 6138578 => 'Melbourne', @@ -24716,66 +21593,12 @@ 6138587 => 'Clayton', 6138588 => 'Clayton', 6138589 => 'Melbourne', - 6138590 => 'Melbourne', - 6138591 => 'Melbourne', - 6138592 => 'Melbourne', - 6138593 => 'Melbourne', - 6138594 => 'Melbourne', - 6138595 => 'Melbourne', - 6138596 => 'Melbourne', - 6138597 => 'Melbourne', - 6138598 => 'Melbourne', - 6138599 => 'Melbourne', - 6138600 => 'Melbourne', - 6138601 => 'Melbourne', - 6138602 => 'Melbourne', - 6138603 => 'Melbourne', - 6138604 => 'Melbourne', - 6138605 => 'Melbourne', - 6138606 => 'Melbourne', - 6138607 => 'Melbourne', - 6138608 => 'Melbourne', - 6138609 => 'Melbourne', - 6138610 => 'Melbourne', - 6138611 => 'Melbourne', - 6138612 => 'Melbourne', - 6138613 => 'Melbourne', - 6138614 => 'Melbourne', - 6138615 => 'Melbourne', - 6138616 => 'Melbourne', - 6138617 => 'Melbourne', - 6138618 => 'Melbourne', - 6138619 => 'Melbourne', - 6138620 => 'Melbourne', - 6138621 => 'Melbourne', - 6138622 => 'Melbourne', - 6138623 => 'Melbourne', - 6138624 => 'Melbourne', - 6138625 => 'Melbourne', - 6138626 => 'Melbourne', - 6138627 => 'Melbourne', - 6138628 => 'Melbourne', - 6138629 => 'Melbourne', - 6138630 => 'Melbourne', - 6138631 => 'Melbourne', - 6138632 => 'Melbourne', - 6138633 => 'Melbourne', - 6138634 => 'Melbourne', - 6138635 => 'Melbourne', - 6138636 => 'Melbourne', - 6138637 => 'Melbourne', - 6138638 => 'Melbourne', - 6138639 => 'Melbourne', - 6138640 => 'Melbourne', - 6138641 => 'Melbourne', - 6138642 => 'Melbourne', - 6138643 => 'Melbourne', - 6138644 => 'Melbourne', - 6138645 => 'Melbourne', - 6138646 => 'Melbourne', - 6138647 => 'Melbourne', - 6138648 => 'Melbourne', - 6138649 => 'Melbourne', + 613859 => 'Melbourne', + 613860 => 'Melbourne', + 613861 => 'Melbourne', + 613862 => 'Melbourne', + 613863 => 'Melbourne', + 613864 => 'Melbourne', 6138650 => 'Melbourne', 6138651 => 'Melbourne', 61386521 => 'Melbourne', @@ -24789,46 +21612,10 @@ 6138656 => 'Melbourne', 6138657 => 'Melbourne', 6138658 => 'Melbourne', - 6138660 => 'Melbourne', - 6138661 => 'Melbourne', - 6138662 => 'Melbourne', - 6138663 => 'Melbourne', - 6138664 => 'Melbourne', - 6138665 => 'Melbourne', - 6138666 => 'Melbourne', - 6138667 => 'Melbourne', - 6138668 => 'Melbourne', - 6138669 => 'Melbourne', - 6138670 => 'Melbourne', - 6138671 => 'Melbourne', - 6138672 => 'Melbourne', - 6138673 => 'Melbourne', - 6138674 => 'Melbourne', - 6138675 => 'Melbourne', - 6138676 => 'Melbourne', - 6138677 => 'Melbourne', - 6138678 => 'Melbourne', - 6138679 => 'Melbourne', - 6138680 => 'Melbourne', - 6138681 => 'Melbourne', - 6138682 => 'Melbourne', - 6138683 => 'Melbourne', - 6138684 => 'Melbourne', - 6138685 => 'Melbourne', - 6138686 => 'Melbourne', - 6138687 => 'Melbourne', - 6138688 => 'Melbourne', - 6138689 => 'Melbourne', - 6138690 => 'Melbourne', - 6138691 => 'Melbourne', - 6138692 => 'Melbourne', - 6138693 => 'Melbourne', - 6138694 => 'Melbourne', - 6138695 => 'Melbourne', - 6138696 => 'Melbourne', - 6138697 => 'Melbourne', - 6138698 => 'Melbourne', - 6138699 => 'Melbourne', + 613866 => 'Melbourne', + 613867 => 'Melbourne', + 613868 => 'Melbourne', + 613869 => 'Melbourne', 6138700 => 'Werribee', 6138701 => 'Sunbury', 6138702 => 'Kalkallo', @@ -24837,15 +21624,7 @@ 6138705 => 'Dandenong', 6138706 => 'Croydon', 6138707 => 'Dandenong', - 61387080 => 'Kalkallo', - 61387081 => 'Kalkallo', - 61387082 => 'Kalkallo', - 61387083 => 'Kalkallo', - 61387084 => 'Kalkallo', - 61387085 => 'Kalkallo', - 61387086 => 'Kalkallo', - 61387087 => 'Kalkallo', - 61387088 => 'Kalkallo', + 6138708 => 'Kalkallo', 61387089 => 'Melbourne', 6138709 => 'Croydon', 6138710 => 'Dandenong', @@ -24891,16 +21670,8 @@ 6138741 => 'Croydon', 6138742 => 'Werribee', 6138743 => 'Dandenong', - 61387440 => 'Werribee', - 61387441 => 'Werribee', - 61387442 => 'Werribee', + 6138744 => 'Werribee', 61387443 => 'Werribee/Point Cook', - 61387444 => 'Werribee', - 61387445 => 'Werribee', - 61387446 => 'Werribee', - 61387447 => 'Werribee', - 61387448 => 'Werribee', - 61387449 => 'Werribee', 6138745 => 'Sunbury', 6138746 => 'Sunbury', 6138747 => 'Sunbury', @@ -24916,26 +21687,10 @@ 61387507 => 'Kalkallo', 61387508 => 'Sunbury', 61387509 => 'Werribee', + 6138751 => 'Dandenong', 61387510 => 'Whittlesea', - 61387511 => 'Dandenong', - 61387512 => 'Dandenong', - 61387513 => 'Dandenong', - 61387514 => 'Dandenong', - 61387515 => 'Dandenong', - 61387516 => 'Dandenong', - 61387517 => 'Dandenong', - 61387518 => 'Dandenong', - 61387519 => 'Dandenong', - 61387520 => 'Dandenong', - 61387521 => 'Dandenong', - 61387522 => 'Dandenong', - 61387523 => 'Dandenong', - 61387524 => 'Dandenong', + 6138752 => 'Dandenong', 61387525 => 'Whittlesea', - 61387526 => 'Dandenong', - 61387527 => 'Dandenong', - 61387528 => 'Dandenong', - 61387529 => 'Dandenong', 6138753 => 'Dandenong', 6138754 => 'Werribee', 6138755 => 'Werribee', @@ -24943,43 +21698,23 @@ 6138757 => 'Kalkallo', 6138758 => 'Dandenong', 6138759 => 'Dandenong', - 61387600 => 'Dandenong', - 61387601 => 'Dandenong', + 613876 => 'Dandenong', 61387602 => 'Kalkallo', 61387603 => 'Sunbury', 61387604 => 'Werribee', 61387605 => 'Whittlesea', - 61387606 => 'Dandenong', 61387607 => 'Kalkallo', 61387608 => 'Sunbury', 61387609 => 'Werribee', 6138761 => 'Croydon', - 6138762 => 'Dandenong', 61387630 => 'Werribee', 61387631 => 'Werribee', 61387632 => 'Werribee', - 61387633 => 'Dandenong', - 61387634 => 'Dandenong', - 61387635 => 'Dandenong', - 61387636 => 'Dandenong', - 61387637 => 'Dandenong', - 61387638 => 'Dandenong', - 61387639 => 'Dandenong', - 61387640 => 'Dandenong', 61387641 => 'Kalkallo', 61387642 => 'Sunbury', 61387643 => 'Werribee', 61387644 => 'Whittlesea', - 61387645 => 'Dandenong', - 61387646 => 'Dandenong', - 61387647 => 'Dandenong', - 61387648 => 'Dandenong', - 61387649 => 'Dandenong', - 6138765 => 'Dandenong', - 6138766 => 'Dandenong', 6138767 => 'Whittlesea', - 6138768 => 'Dandenong', - 6138769 => 'Dandenong', 6138770 => 'Dandenong', 61387710 => 'Werribee', 61387711 => 'Sunbury', @@ -24991,32 +21726,18 @@ 61387717 => 'Sunbury', 61387718 => 'Kalkallo', 61387719 => 'Whittlesea', + 6138772 => 'Dandenong', 61387720 => 'Croydon', - 61387721 => 'Dandenong', - 61387722 => 'Dandenong', 61387723 => 'Whittlesea', 61387724 => 'Werribee', - 61387725 => 'Dandenong', - 61387726 => 'Dandenong', - 61387727 => 'Dandenong', - 61387728 => 'Dandenong', - 61387729 => 'Dandenong', 6138773 => 'Dandenong', 6138774 => 'Dandenong', 6138775 => 'Whittlesea', 6138776 => 'Whittlesea', 6138777 => 'Croydon', 6138778 => 'Kalkallo', - 61387790 => 'Dandenong', - 61387791 => 'Dandenong', - 61387792 => 'Dandenong', - 61387793 => 'Dandenong', - 61387794 => 'Dandenong', + 6138779 => 'Dandenong', 61387795 => 'Dandenong/Melbourne/Dandenong', - 61387796 => 'Dandenong', - 61387797 => 'Dandenong', - 61387798 => 'Dandenong', - 61387799 => 'Dandenong', 61387803 => 'Dandenong', 61387804 => 'Dandenong', 61387805 => 'Dandenong', @@ -25025,16 +21746,10 @@ 61387808 => 'Dandenong', 61387809 => 'Werribee', 6138781 => 'Dandenong', - 61387820 => 'Dandenong', - 61387821 => 'Dandenong', - 61387822 => 'Dandenong', - 61387823 => 'Dandenong', + 6138782 => 'Dandenong', 61387824 => 'Croydon', 61387825 => 'Croydon', 61387826 => 'Croydon', - 61387827 => 'Dandenong', - 61387828 => 'Dandenong', - 61387829 => 'Dandenong', 6138783 => 'Dandenong', 61387840 => 'Dandenong', 61387841 => 'Dandenong', @@ -25049,55 +21764,22 @@ 6138787 => 'Dandenong', 6138788 => 'Dandenong', 6138789 => 'Dandenong', - 6138790 => 'Dandenong', - 6138791 => 'Dandenong', - 6138792 => 'Dandenong', - 6138793 => 'Dandenong', - 6138794 => 'Dandenong', - 6138795 => 'Dandenong', - 6138796 => 'Dandenong', - 6138797 => 'Dandenong', + 613879 => 'Dandenong', 6138798 => 'Sunbury', 6138799 => 'Croydon', - 6138800 => 'Melbourne', + 613880 => 'Melbourne', 6138801 => 'Ringwood', - 6138802 => 'Melbourne', - 61388030 => 'Melbourne', - 61388031 => 'Melbourne', - 61388032 => 'Melbourne', - 61388033 => 'Melbourne', - 61388034 => 'Melbourne', 61388035 => 'Melbourne/Croydon/Melbourne', - 61388036 => 'Melbourne', - 61388037 => 'Melbourne', - 61388038 => 'Melbourne', - 61388039 => 'Melbourne', - 6138804 => 'Melbourne', 6138805 => 'Ringwood', 6138806 => 'Ringwood', - 6138807 => 'Melbourne', - 6138808 => 'Melbourne', - 6138809 => 'Melbourne', + 613881 => 'Ringwood', 6138810 => 'Melbourne', - 6138811 => 'Ringwood', - 6138812 => 'Ringwood', - 6138813 => 'Ringwood', - 6138814 => 'Ringwood', 6138815 => 'Melbourne', 6138816 => 'Melbourne', 6138817 => 'Melbourne', - 6138818 => 'Ringwood', - 6138819 => 'Ringwood', - 61388200 => 'Ringwood', - 61388201 => 'Ringwood', - 61388202 => 'Ringwood', - 61388203 => 'Ringwood', - 61388204 => 'Ringwood', + 6138820 => 'Ringwood', 61388205 => 'Melbourne', - 61388206 => 'Ringwood', 61388207 => 'Melbourne', - 61388208 => 'Ringwood', - 61388209 => 'Ringwood', 6138821 => 'Ringwood', 6138822 => 'Ringwood', 6138823 => 'Melbourne', @@ -25118,16 +21800,11 @@ 61388395 => 'Ringwood', 61388396 => 'Ringwood', 61388397 => 'Ringwood', - 6138840 => 'Melbourne', + 613884 => 'Melbourne', 6138841 => 'Ringwood', - 6138842 => 'Melbourne', - 6138843 => 'Melbourne', - 6138844 => 'Melbourne', 6138845 => 'Ringwood', 6138846 => 'Ringwood', 6138847 => 'Ringwood', - 6138848 => 'Melbourne', - 6138849 => 'Melbourne', 6138850 => 'Melbourne', 6138851 => 'Melbourne', 6138855 => 'Melbourne', @@ -25168,56 +21845,14 @@ 61390072 => 'Melbourne', 61390073 => 'Melbourne', 6139008 => 'Melbourne', + 6139009 => 'Melbourne', 61390090 => 'Eltham', 61390091 => 'Eltham', 61390092 => 'Eltham', - 61390093 => 'Melbourne', - 61390094 => 'Melbourne', - 61390095 => 'Melbourne', - 61390096 => 'Melbourne', - 61390097 => 'Melbourne', - 61390098 => 'Melbourne', - 61390099 => 'Melbourne', - 6139010 => 'Melbourne', - 6139011 => 'Melbourne', - 6139012 => 'Melbourne', - 6139013 => 'Melbourne', - 6139014 => 'Melbourne', - 6139015 => 'Melbourne', - 6139016 => 'Melbourne', - 6139017 => 'Melbourne', - 6139018 => 'Melbourne', - 6139019 => 'Melbourne', - 6139020 => 'Melbourne', - 6139021 => 'Melbourne', - 6139022 => 'Melbourne', - 6139023 => 'Melbourne', - 6139024 => 'Melbourne', - 6139025 => 'Melbourne', - 6139026 => 'Melbourne', - 6139027 => 'Melbourne', - 6139028 => 'Melbourne', - 6139029 => 'Melbourne', - 6139030 => 'Melbourne', - 6139031 => 'Melbourne', - 6139032 => 'Melbourne', - 6139033 => 'Melbourne', - 6139034 => 'Melbourne', - 6139035 => 'Melbourne', - 6139036 => 'Melbourne', - 6139037 => 'Melbourne', - 6139038 => 'Melbourne', - 6139039 => 'Melbourne', - 6139040 => 'Melbourne', - 6139041 => 'Melbourne', - 6139042 => 'Melbourne', - 6139043 => 'Melbourne', - 6139044 => 'Melbourne', - 6139045 => 'Melbourne', - 6139046 => 'Melbourne', - 6139047 => 'Melbourne', - 6139048 => 'Melbourne', - 6139049 => 'Melbourne', + 613901 => 'Melbourne', + 613902 => 'Melbourne', + 613903 => 'Melbourne', + 613904 => 'Melbourne', 6139050 => 'Melbourne', 6139051 => 'Melbourne', 6139052 => 'Melbourne', @@ -25251,16 +21886,7 @@ 6139085 => 'Melbourne', 6139088 => 'Melbourne', 6139089 => 'Melbourne', - 6139090 => 'Melbourne', - 6139091 => 'Melbourne', - 6139092 => 'Melbourne', - 6139093 => 'Melbourne', - 6139094 => 'Melbourne', - 6139095 => 'Melbourne', - 6139096 => 'Melbourne', - 6139097 => 'Melbourne', - 6139098 => 'Melbourne', - 6139099 => 'Melbourne', + 613909 => 'Melbourne', 6139100 => 'Melbourne', 61391011 => 'Melbourne', 61391012 => 'Melbourne', @@ -25281,26 +21907,8 @@ 6139107 => 'Melbourne', 6139108 => 'Melbourne', 6139109 => 'Melbourne', - 6139110 => 'Melbourne', - 6139111 => 'Melbourne', - 6139112 => 'Melbourne', - 6139113 => 'Melbourne', - 6139114 => 'Melbourne', - 6139115 => 'Melbourne', - 6139116 => 'Melbourne', - 6139117 => 'Melbourne', - 6139118 => 'Melbourne', - 6139119 => 'Melbourne', - 6139120 => 'Melbourne', - 6139121 => 'Melbourne', - 6139122 => 'Melbourne', - 6139123 => 'Melbourne', - 6139124 => 'Melbourne', - 6139125 => 'Melbourne', - 6139126 => 'Melbourne', - 6139127 => 'Melbourne', - 6139128 => 'Melbourne', - 6139129 => 'Melbourne', + 613911 => 'Melbourne', + 613912 => 'Melbourne', 6139130 => 'Melbourne', 6139131 => 'Melbourne', 6139132 => 'Melbourne', @@ -25313,46 +21921,11 @@ 61391738 => 'Melbourne', 6139188 => 'Melbourne', 6139189 => 'Melbourne', - 6139190 => 'Melbourne', - 6139191 => 'Melbourne', - 6139192 => 'Melbourne', - 6139193 => 'Melbourne', - 6139194 => 'Melbourne', - 6139195 => 'Melbourne', - 6139196 => 'Melbourne', - 6139197 => 'Melbourne', - 6139198 => 'Melbourne', - 6139199 => 'Melbourne', - 6139200 => 'Melbourne', - 6139201 => 'Melbourne', + 613919 => 'Melbourne', + 61392 => 'Melbourne', 6139202 => 'Werribee', - 6139203 => 'Melbourne', - 6139204 => 'Melbourne', - 6139205 => 'Melbourne', - 6139206 => 'Melbourne', - 6139207 => 'Melbourne', - 6139208 => 'Melbourne', - 6139209 => 'Melbourne', - 61392100 => 'Ringwood', - 61392101 => 'Ringwood', - 61392102 => 'Melbourne', - 61392103 => 'Ringwood', - 61392104 => 'Ringwood', - 61392105 => 'Ringwood', - 61392106 => 'Ringwood', - 61392107 => 'Ringwood', - 61392108 => 'Ringwood', - 61392109 => 'Ringwood', - 61392110 => 'Melbourne', - 61392111 => 'Melbourne', - 61392112 => 'Melbourne', - 61392113 => 'Melbourne', - 61392114 => 'Melbourne', - 61392115 => 'Melbourne', - 61392116 => 'Melbourne', + 6139210 => 'Ringwood', 61392117 => 'Clayton', - 61392118 => 'Melbourne', - 61392119 => 'Melbourne', 61392120 => 'Croydon', 61392121 => 'Dandenong', 61392122 => 'Dandenong', @@ -25373,7 +21946,6 @@ 61392137 => 'Croydon', 61392138 => 'Croydon', 61392139 => 'Croydon', - 6139214 => 'Melbourne', 61392150 => 'Croydon', 61392151 => 'Dandenong', 61392152 => 'Dandenong', @@ -25399,7 +21971,6 @@ 61392172 => 'Eltham', 61392173 => 'Craigieburn', 61392174 => 'Craigieburn', - 61392175 => 'Melbourne', 61392176 => 'Sydenham', 61392177 => 'Point Cook', 61392178 => 'Sydenham', @@ -25424,346 +21995,69 @@ 61392197 => 'Sydenham', 61392198 => 'Eltham', 61392199 => 'Eltham', - 6139220 => 'Melbourne', - 6139221 => 'Melbourne', - 6139222 => 'Melbourne', - 6139223 => 'Melbourne', - 6139224 => 'Melbourne', - 6139225 => 'Melbourne', - 6139226 => 'Melbourne', - 6139227 => 'Melbourne', - 6139228 => 'Melbourne', - 6139229 => 'Melbourne', - 6139230 => 'Melbourne', - 6139231 => 'Melbourne', - 6139232 => 'Melbourne', - 6139233 => 'Melbourne', - 6139234 => 'Melbourne', - 6139235 => 'Melbourne', - 6139236 => 'Melbourne', 6139237 => 'Croydon', 6139238 => 'Dandenong', 6139239 => 'Clayton', - 6139240 => 'Melbourne', - 6139241 => 'Melbourne', - 6139242 => 'Melbourne', - 6139243 => 'Melbourne', - 61392440 => 'Melbourne', - 61392441 => 'Melbourne', - 61392442 => 'Melbourne', - 61392443 => 'Melbourne', - 61392444 => 'Melbourne', - 61392445 => 'Melbourne', - 61392446 => 'Melbourne', 61392447 => 'Clayton', - 61392448 => 'Melbourne', - 61392449 => 'Melbourne', - 6139245 => 'Melbourne', - 6139246 => 'Melbourne', - 6139247 => 'Melbourne', - 6139248 => 'Melbourne', - 6139249 => 'Melbourne', - 6139250 => 'Melbourne', - 6139251 => 'Melbourne', - 6139252 => 'Melbourne', 6139253 => 'Clayton', - 6139254 => 'Melbourne', - 6139255 => 'Melbourne', - 6139256 => 'Melbourne', - 6139257 => 'Melbourne', - 6139258 => 'Melbourne', 6139259 => 'Ringwood', - 6139260 => 'Melbourne', - 6139261 => 'Melbourne', 61392620 => 'Ringwood', 61392621 => 'Clayton', 61392622 => 'Clayton', 61392623 => 'Clayton', - 61392624 => 'Melbourne', 61392625 => 'Clayton', 61392626 => 'Ringwood', 61392627 => 'Ringwood', 61392628 => 'Ringwood', - 61392629 => 'Melbourne', - 61392630 => 'Clayton', - 61392631 => 'Clayton', - 61392632 => 'Clayton', - 61392633 => 'Clayton', - 61392634 => 'Clayton', - 61392635 => 'Clayton', - 61392636 => 'Melbourne', - 61392637 => 'Clayton', - 61392638 => 'Clayton', - 61392639 => 'Clayton', + 6139263 => 'Clayton', 61392640 => 'Clayton', - 61392641 => 'Melbourne', - 61392642 => 'Melbourne', 61392643 => 'Clayton', - 61392644 => 'Melbourne', - 61392645 => 'Melbourne', 61392646 => 'Ringwood', 61392647 => 'Ringwood', 61392648 => 'Ringwood', 61392649 => 'Clayton', - 61392650 => 'Clayton', - 61392651 => 'Clayton', - 61392652 => 'Clayton', - 61392653 => 'Clayton', - 61392654 => 'Clayton', - 61392655 => 'Clayton', - 61392656 => 'Clayton', - 61392657 => 'Clayton', - 61392658 => 'Melbourne', - 61392659 => 'Clayton', + 6139265 => 'Clayton', 6139266 => 'Sydenham', - 6139267 => 'Melbourne', - 6139268 => 'Melbourne', - 6139269 => 'Melbourne', - 6139270 => 'Melbourne', 6139271 => 'Clayton', - 6139272 => 'Melbourne', - 6139273 => 'Melbourne', - 6139274 => 'Melbourne', - 6139275 => 'Melbourne', - 6139276 => 'Melbourne', - 6139277 => 'Melbourne', - 6139278 => 'Melbourne', - 6139279 => 'Melbourne', - 6139280 => 'Melbourne', - 6139281 => 'Melbourne', - 6139282 => 'Melbourne', - 6139283 => 'Melbourne', - 6139284 => 'Melbourne', - 6139285 => 'Melbourne', - 6139286 => 'Melbourne', - 6139287 => 'Melbourne', - 6139288 => 'Melbourne', - 6139289 => 'Melbourne', - 6139290 => 'Melbourne', - 6139291 => 'Melbourne', - 6139292 => 'Melbourne', 6139293 => 'Dandenong', 6139294 => 'Croydon', - 6139295 => 'Melbourne', - 6139296 => 'Melbourne', - 6139297 => 'Melbourne', 6139298 => 'Ringwood', - 6139299 => 'Melbourne', - 6139300 => 'Melbourne', - 6139301 => 'Melbourne', - 6139302 => 'Melbourne', + 61393 => 'Melbourne', 6139303 => 'Craigieburn', - 6139304 => 'Melbourne', - 61393050 => 'Craigieburn', - 61393051 => 'Craigieburn', - 61393052 => 'Craigieburn', - 61393053 => 'Craigieburn', - 61393054 => 'Craigieburn', - 61393055 => 'Craigieburn', - 61393056 => 'Craigieburn', - 61393057 => 'Craigieburn', - 61393058 => 'Melbourne', - 61393059 => 'Craigieburn', - 6139306 => 'Melbourne', - 61393070 => 'Sydenham', - 61393071 => 'Sydenham', - 61393072 => 'Sydenham', - 61393073 => 'Melbourne', - 61393074 => 'Sydenham', - 61393075 => 'Sydenham', - 61393076 => 'Sydenham', - 61393077 => 'Sydenham', - 61393078 => 'Sydenham', - 61393079 => 'Sydenham', + 6139305 => 'Craigieburn', + 6139307 => 'Sydenham', 6139308 => 'Craigieburn', - 6139309 => 'Melbourne', - 6139310 => 'Melbourne', - 6139311 => 'Melbourne', - 6139312 => 'Melbourne', - 6139313 => 'Melbourne', - 6139314 => 'Melbourne', - 6139315 => 'Melbourne', - 6139316 => 'Melbourne', - 6139317 => 'Melbourne', - 6139318 => 'Melbourne', - 6139319 => 'Melbourne', - 6139320 => 'Melbourne', - 6139321 => 'Melbourne', - 6139322 => 'Melbourne', 6139323 => 'Craigieburn', 6139324 => 'Sydenham', - 6139325 => 'Melbourne', - 6139326 => 'Melbourne', - 6139327 => 'Melbourne', - 6139328 => 'Melbourne', - 6139329 => 'Melbourne', - 6139330 => 'Melbourne', - 6139331 => 'Melbourne', - 6139332 => 'Melbourne', 6139333 => 'Craigieburn', - 6139334 => 'Melbourne', - 6139335 => 'Melbourne', - 6139336 => 'Melbourne', - 6139337 => 'Melbourne', - 6139338 => 'Melbourne', - 6139339 => 'Melbourne', - 6139340 => 'Melbourne', - 6139341 => 'Melbourne', - 6139342 => 'Melbourne', - 6139343 => 'Melbourne', - 6139344 => 'Melbourne', - 6139345 => 'Melbourne', - 6139346 => 'Melbourne', - 6139347 => 'Melbourne', - 6139348 => 'Melbourne', - 6139349 => 'Melbourne', - 6139350 => 'Melbourne', - 6139351 => 'Melbourne', - 6139352 => 'Melbourne', - 6139353 => 'Melbourne', - 6139354 => 'Melbourne', - 6139355 => 'Melbourne', - 6139356 => 'Melbourne', - 6139357 => 'Melbourne', - 6139358 => 'Melbourne', - 6139359 => 'Melbourne', - 61393600 => 'Melbourne', - 61393601 => 'Melbourne', - 61393602 => 'Melbourne', - 61393603 => 'Melbourne', 61393604 => 'Sydenham', 61393605 => 'Sydenham', - 61393606 => 'Melbourne', - 61393607 => 'Melbourne', - 61393608 => 'Melbourne', - 61393609 => 'Melbourne', 6139361 => 'Sydenham', - 6139362 => 'Melbourne', 6139363 => 'Sydenham', - 6139364 => 'Melbourne', - 6139365 => 'Melbourne', - 6139366 => 'Melbourne', - 6139367 => 'Melbourne', - 6139368 => 'Melbourne', - 6139369 => 'Melbourne', - 6139370 => 'Melbourne', - 6139371 => 'Melbourne', - 6139372 => 'Melbourne', - 6139373 => 'Melbourne', - 6139374 => 'Melbourne', - 6139375 => 'Melbourne', - 6139376 => 'Melbourne', - 6139377 => 'Melbourne', - 6139378 => 'Melbourne', - 6139379 => 'Melbourne', - 6139380 => 'Melbourne', - 6139381 => 'Melbourne', - 6139382 => 'Melbourne', - 6139383 => 'Melbourne', - 6139384 => 'Melbourne', - 6139385 => 'Melbourne', - 6139386 => 'Melbourne', - 6139387 => 'Melbourne', - 6139388 => 'Melbourne', - 6139389 => 'Melbourne', 6139390 => 'Sydenham', - 6139391 => 'Melbourne', - 6139392 => 'Melbourne', - 6139393 => 'Melbourne', 6139394 => 'Point Cook', 6139395 => 'Point Cook', - 6139396 => 'Melbourne', - 6139397 => 'Melbourne', - 6139398 => 'Melbourne', - 6139399 => 'Melbourne', + 613940 => 'Eltham', 6139400 => 'Dandenong', - 6139401 => 'Eltham', - 6139402 => 'Eltham', 6139403 => 'Melbourne', - 6139404 => 'Eltham', 6139405 => 'Melbourne', 6139406 => 'Melbourne', - 61394070 => 'Eltham', - 61394071 => 'Eltham', - 61394072 => 'Eltham', - 61394073 => 'Eltham', 61394074 => 'Melbourne', - 61394075 => 'Eltham', - 61394076 => 'Eltham', - 61394077 => 'Eltham', - 61394078 => 'Eltham', - 61394079 => 'Eltham', 61394080 => 'Melbourne', - 61394081 => 'Eltham', 61394082 => 'Melbourne', - 61394083 => 'Eltham', - 61394084 => 'Eltham', - 61394085 => 'Eltham', - 61394086 => 'Eltham', - 61394087 => 'Eltham', - 61394088 => 'Eltham', - 61394089 => 'Eltham', - 6139409 => 'Eltham', - 6139410 => 'Melbourne', - 6139411 => 'Melbourne', - 6139412 => 'Melbourne', - 6139413 => 'Melbourne', - 6139414 => 'Melbourne', - 6139415 => 'Melbourne', - 6139416 => 'Melbourne', - 6139417 => 'Melbourne', - 6139418 => 'Melbourne', - 6139419 => 'Melbourne', - 6139420 => 'Melbourne', - 6139421 => 'Melbourne', + 613941 => 'Melbourne', + 613942 => 'Melbourne', 6139422 => 'Eltham', 6139423 => 'Eltham', 6139424 => 'Eltham', - 6139425 => 'Melbourne', - 6139426 => 'Melbourne', - 6139427 => 'Melbourne', - 6139428 => 'Melbourne', - 6139429 => 'Melbourne', - 6139430 => 'Eltham', - 6139431 => 'Eltham', - 6139432 => 'Eltham', - 6139433 => 'Eltham', - 6139434 => 'Eltham', - 6139435 => 'Eltham', - 6139436 => 'Eltham', - 6139437 => 'Eltham', - 6139438 => 'Eltham', - 6139439 => 'Eltham', - 6139440 => 'Melbourne', - 6139441 => 'Melbourne', - 6139442 => 'Melbourne', - 6139443 => 'Melbourne', + 613943 => 'Eltham', + 613944 => 'Melbourne', 6139444 => 'Eltham', - 6139445 => 'Melbourne', - 6139446 => 'Melbourne', - 6139447 => 'Melbourne', - 6139448 => 'Melbourne', 6139449 => 'Sydenham', - 6139450 => 'Melbourne', + 613945 => 'Melbourne', 6139451 => 'Eltham', - 6139452 => 'Melbourne', - 6139453 => 'Melbourne', - 6139454 => 'Melbourne', - 6139455 => 'Melbourne', - 6139456 => 'Melbourne', - 6139457 => 'Melbourne', - 6139458 => 'Melbourne', - 6139459 => 'Melbourne', - 6139460 => 'Melbourne', + 613946 => 'Melbourne', 6139461 => 'Eltham', - 6139462 => 'Melbourne', - 6139463 => 'Melbourne', - 6139464 => 'Melbourne', - 6139465 => 'Melbourne', - 6139466 => 'Melbourne', - 6139467 => 'Melbourne', - 6139468 => 'Melbourne', - 6139469 => 'Melbourne', 6139470 => 'Melbourne', 6139471 => 'Melbourne', 6139472 => 'Melbourne', @@ -25775,16 +22069,7 @@ 61394753 => 'Eltham', 6139478 => 'Melbourne', 6139479 => 'Melbourne', - 6139480 => 'Melbourne', - 6139481 => 'Melbourne', - 6139482 => 'Melbourne', - 6139483 => 'Melbourne', - 6139484 => 'Melbourne', - 6139485 => 'Melbourne', - 6139486 => 'Melbourne', - 6139487 => 'Melbourne', - 6139488 => 'Melbourne', - 6139489 => 'Melbourne', + 613948 => 'Melbourne', 6139490 => 'Melbourne', 6139494 => 'Eltham', 6139495 => 'Melbourne', @@ -25792,255 +22077,39 @@ 6139497 => 'Melbourne', 6139498 => 'Melbourne', 6139499 => 'Melbourne', - 6139500 => 'Melbourne', + 61395 => 'Melbourne', 6139501 => 'Clayton', - 6139502 => 'Melbourne', - 6139503 => 'Melbourne', - 6139504 => 'Melbourne', - 6139505 => 'Melbourne', - 6139506 => 'Melbourne', - 6139507 => 'Melbourne', - 6139508 => 'Melbourne', - 6139509 => 'Melbourne', - 6139510 => 'Melbourne', 6139511 => 'Clayton', 6139512 => 'Clayton', - 6139513 => 'Melbourne', - 6139514 => 'Melbourne', 6139515 => 'Clayton', - 6139516 => 'Melbourne', - 6139517 => 'Melbourne', - 61395180 => 'Clayton', - 61395181 => 'Clayton', - 61395182 => 'Melbourne', - 61395183 => 'Clayton', - 61395184 => 'Clayton', - 61395185 => 'Clayton', - 61395186 => 'Clayton', - 61395187 => 'Clayton', - 61395188 => 'Clayton', - 61395189 => 'Clayton', - 6139519 => 'Melbourne', - 6139520 => 'Melbourne', - 6139521 => 'Melbourne', - 6139522 => 'Melbourne', - 6139523 => 'Melbourne', - 6139524 => 'Melbourne', - 6139525 => 'Melbourne', - 6139526 => 'Melbourne', - 6139527 => 'Melbourne', - 6139528 => 'Melbourne', - 6139529 => 'Melbourne', - 6139530 => 'Melbourne', - 6139531 => 'Melbourne', - 6139532 => 'Melbourne', - 6139533 => 'Melbourne', - 6139534 => 'Melbourne', + 6139518 => 'Clayton', 6139535 => 'Clayton', - 6139536 => 'Melbourne', - 6139537 => 'Melbourne', 6139538 => 'Clayton', - 6139539 => 'Melbourne', - 6139540 => 'Clayton', - 6139541 => 'Clayton', - 6139542 => 'Clayton', - 6139543 => 'Clayton', - 6139544 => 'Clayton', - 6139545 => 'Clayton', - 6139546 => 'Clayton', - 6139547 => 'Clayton', - 6139548 => 'Clayton', - 6139549 => 'Clayton', + 613954 => 'Clayton', 6139550 => 'Clayton', 6139551 => 'Clayton', 6139552 => 'Clayton', - 6139553 => 'Melbourne', 6139554 => 'Dandenong', - 6139555 => 'Melbourne', - 6139556 => 'Melbourne', - 6139557 => 'Melbourne', 6139558 => 'Clayton', - 6139559 => 'Melbourne', 6139560 => 'Clayton', 6139561 => 'Clayton', 6139562 => 'Clayton', - 6139563 => 'Melbourne', - 6139564 => 'Melbourne', 6139565 => 'Clayton', 6139566 => 'Clayton', - 6139567 => 'Melbourne', - 6139568 => 'Melbourne', - 6139569 => 'Melbourne', - 6139570 => 'Melbourne', - 6139571 => 'Melbourne', - 6139572 => 'Melbourne', - 6139573 => 'Melbourne', 6139574 => 'Clayton', - 6139575 => 'Melbourne', - 6139576 => 'Melbourne', - 6139577 => 'Melbourne', - 6139578 => 'Melbourne', - 6139579 => 'Melbourne', - 6139580 => 'Clayton', - 6139581 => 'Clayton', - 6139582 => 'Clayton', - 6139583 => 'Clayton', - 6139584 => 'Clayton', - 6139585 => 'Clayton', - 6139586 => 'Clayton', - 6139587 => 'Clayton', - 6139588 => 'Clayton', - 6139589 => 'Clayton', + 613958 => 'Clayton', 6139590 => 'Clayton', - 6139591 => 'Melbourne', - 6139592 => 'Melbourne', - 6139593 => 'Melbourne', 6139594 => 'Clayton', - 6139595 => 'Melbourne', - 6139596 => 'Melbourne', - 6139597 => 'Melbourne', - 6139598 => 'Melbourne', - 6139599 => 'Melbourne', - 6139600 => 'Melbourne', - 6139601 => 'Melbourne', - 6139602 => 'Melbourne', - 6139603 => 'Melbourne', - 6139604 => 'Melbourne', - 6139605 => 'Melbourne', - 6139606 => 'Melbourne', - 6139607 => 'Melbourne', - 6139608 => 'Melbourne', - 6139609 => 'Melbourne', - 6139610 => 'Melbourne', - 6139611 => 'Melbourne', - 6139612 => 'Melbourne', - 6139613 => 'Melbourne', - 6139614 => 'Melbourne', - 6139615 => 'Melbourne', - 6139616 => 'Melbourne', - 6139617 => 'Melbourne', - 6139618 => 'Melbourne', - 6139619 => 'Melbourne', - 6139620 => 'Melbourne', - 6139621 => 'Melbourne', - 6139622 => 'Melbourne', - 6139623 => 'Melbourne', - 6139624 => 'Melbourne', - 6139625 => 'Melbourne', - 6139626 => 'Melbourne', - 6139627 => 'Melbourne', - 6139628 => 'Melbourne', - 6139629 => 'Melbourne', - 6139630 => 'Melbourne', - 6139631 => 'Melbourne', - 6139632 => 'Melbourne', - 6139633 => 'Melbourne', - 6139634 => 'Melbourne', - 6139635 => 'Melbourne', - 6139636 => 'Melbourne', - 6139637 => 'Melbourne', - 6139638 => 'Melbourne', - 6139639 => 'Melbourne', - 6139640 => 'Melbourne', - 6139641 => 'Melbourne', - 6139642 => 'Melbourne', - 6139643 => 'Melbourne', - 6139644 => 'Melbourne', - 6139645 => 'Melbourne', - 6139646 => 'Melbourne', - 6139647 => 'Melbourne', - 6139648 => 'Melbourne', - 6139649 => 'Melbourne', - 6139650 => 'Melbourne', - 6139651 => 'Melbourne', - 6139652 => 'Melbourne', - 6139653 => 'Melbourne', - 6139654 => 'Melbourne', - 6139655 => 'Melbourne', - 6139656 => 'Melbourne', - 6139657 => 'Melbourne', - 6139658 => 'Melbourne', - 6139659 => 'Melbourne', - 6139660 => 'Melbourne', - 6139661 => 'Melbourne', - 6139662 => 'Melbourne', - 6139663 => 'Melbourne', - 6139664 => 'Melbourne', - 6139665 => 'Melbourne', - 6139666 => 'Melbourne', - 6139667 => 'Melbourne', - 6139668 => 'Melbourne', - 6139669 => 'Melbourne', - 6139670 => 'Melbourne', - 6139671 => 'Melbourne', - 6139672 => 'Melbourne', - 6139673 => 'Melbourne', - 6139674 => 'Melbourne', - 6139675 => 'Melbourne', - 6139676 => 'Melbourne', - 6139677 => 'Melbourne', - 6139678 => 'Melbourne', - 6139679 => 'Melbourne', - 6139680 => 'Melbourne', - 6139681 => 'Melbourne', - 6139682 => 'Melbourne', - 6139683 => 'Melbourne', - 6139684 => 'Melbourne', - 6139685 => 'Melbourne', - 6139686 => 'Melbourne', - 6139687 => 'Melbourne', - 6139688 => 'Melbourne', - 6139689 => 'Melbourne', - 6139690 => 'Melbourne', - 6139691 => 'Melbourne', - 6139692 => 'Melbourne', - 6139693 => 'Melbourne', - 6139694 => 'Melbourne', - 6139695 => 'Melbourne', - 6139696 => 'Melbourne', - 6139697 => 'Melbourne', - 6139698 => 'Melbourne', - 6139699 => 'Melbourne', - 6139700 => 'Dandenong', - 6139701 => 'Dandenong', - 6139702 => 'Dandenong', - 6139703 => 'Dandenong', - 6139704 => 'Dandenong', - 6139705 => 'Dandenong', - 6139706 => 'Dandenong', - 6139707 => 'Dandenong', - 6139708 => 'Dandenong', - 6139709 => 'Dandenong', - 6139710 => 'Whittlesea', + 61396 => 'Melbourne', + 613970 => 'Dandenong', + 613971 => 'Whittlesea', 6139711 => 'Dandenong', - 6139712 => 'Whittlesea', 6139713 => 'Dandenong', - 6139714 => 'Whittlesea', - 6139715 => 'Whittlesea', - 6139716 => 'Whittlesea', - 6139717 => 'Whittlesea', - 6139718 => 'Whittlesea', - 6139719 => 'Whittlesea', - 6139720 => 'Croydon', - 6139721 => 'Croydon', - 6139722 => 'Croydon', - 6139723 => 'Croydon', - 6139724 => 'Croydon', - 6139725 => 'Croydon', - 6139726 => 'Croydon', - 6139727 => 'Croydon', - 6139728 => 'Croydon', - 6139729 => 'Croydon', - 6139730 => 'Croydon', + 613972 => 'Croydon', + 613973 => 'Croydon', 6139731 => 'Werribee', 6139732 => 'Sunbury', - 6139733 => 'Croydon', 6139734 => 'Werribee', - 6139735 => 'Croydon', - 6139736 => 'Croydon', - 6139737 => 'Croydon', - 6139738 => 'Croydon', - 6139739 => 'Croydon', 6139740 => 'Sunbury', 6139741 => 'Werribee', 6139742 => 'Werribee', @@ -26051,253 +22120,63 @@ 6139747 => 'Sunbury', 6139748 => 'Werribee', 6139749 => 'Werribee', + 613975 => 'Croydon', 6139750 => 'Dandenong', - 6139751 => 'Croydon', - 6139752 => 'Croydon', - 6139753 => 'Croydon', - 6139754 => 'Croydon', - 6139755 => 'Croydon', - 6139756 => 'Croydon', - 6139757 => 'Croydon', - 6139758 => 'Croydon', - 6139759 => 'Croydon', - 6139760 => 'Croydon', - 6139761 => 'Croydon', - 6139762 => 'Croydon', - 6139763 => 'Croydon', - 6139764 => 'Croydon', - 6139765 => 'Croydon', + 613976 => 'Croydon', 6139766 => 'Dandenong', 6139767 => 'Dandenong', 6139768 => 'Dandenong', 6139769 => 'Dandenong', - 6139770 => 'Dandenong', - 6139771 => 'Dandenong', - 6139772 => 'Dandenong', - 6139773 => 'Dandenong', - 6139774 => 'Dandenong', - 6139775 => 'Dandenong', - 6139776 => 'Dandenong', + 613977 => 'Dandenong', 6139777 => 'Croydon', 6139778 => 'Croydon', 6139779 => 'Croydon', + 613978 => 'Dandenong', 6139780 => 'Croydon', - 6139781 => 'Dandenong', - 6139782 => 'Dandenong', - 6139783 => 'Dandenong', - 6139784 => 'Dandenong', - 6139785 => 'Dandenong', - 6139786 => 'Dandenong', - 6139787 => 'Dandenong', - 6139788 => 'Dandenong', - 6139789 => 'Dandenong', - 6139790 => 'Dandenong', - 6139791 => 'Dandenong', - 6139792 => 'Dandenong', - 6139793 => 'Dandenong', - 6139794 => 'Dandenong', - 6139795 => 'Dandenong', - 6139796 => 'Dandenong', - 6139797 => 'Dandenong', - 6139798 => 'Dandenong', - 6139799 => 'Dandenong', + 613979 => 'Dandenong', + 61398 => 'Melbourne', 6139800 => 'Ringwood', 6139801 => 'Ringwood', 6139802 => 'Ringwood', 6139803 => 'Ringwood', - 6139804 => 'Melbourne', - 6139805 => 'Melbourne', - 6139806 => 'Melbourne', - 6139807 => 'Melbourne', - 6139808 => 'Melbourne', - 6139809 => 'Melbourne', - 6139810 => 'Melbourne', - 6139811 => 'Melbourne', 6139812 => 'Ringwood', - 6139813 => 'Melbourne', 6139814 => 'Ringwood', - 6139815 => 'Melbourne', - 6139816 => 'Melbourne', - 6139817 => 'Melbourne', - 6139818 => 'Melbourne', - 6139819 => 'Melbourne', - 6139820 => 'Melbourne', - 6139821 => 'Melbourne', - 6139822 => 'Melbourne', - 6139823 => 'Melbourne', - 6139824 => 'Melbourne', - 6139825 => 'Melbourne', - 6139826 => 'Melbourne', - 6139827 => 'Melbourne', - 6139828 => 'Melbourne', - 6139829 => 'Melbourne', - 6139830 => 'Melbourne', - 6139831 => 'Melbourne', - 6139832 => 'Melbourne', - 6139833 => 'Melbourne', - 6139834 => 'Melbourne', - 6139835 => 'Melbourne', - 6139836 => 'Melbourne', 6139837 => 'Ringwood', - 6139838 => 'Melbourne', 6139839 => 'Croydon', - 6139840 => 'Melbourne', - 61398410 => 'Ringwood', - 61398411 => 'Melbourne', - 61398412 => 'Ringwood', - 61398413 => 'Ringwood', - 61398414 => 'Ringwood', - 61398415 => 'Ringwood', - 61398416 => 'Ringwood', - 61398417 => 'Ringwood', - 61398418 => 'Ringwood', - 61398419 => 'Ringwood', - 6139842 => 'Ringwood', - 6139843 => 'Melbourne', - 6139844 => 'Ringwood', - 6139845 => 'Ringwood', - 61398460 => 'Melbourne', - 61398461 => 'Ringwood', - 61398462 => 'Ringwood', - 61398463 => 'Ringwood', - 61398464 => 'Ringwood', - 61398465 => 'Ringwood', - 61398466 => 'Ringwood', - 61398467 => 'Ringwood', - 61398468 => 'Ringwood', - 61398469 => 'Ringwood', - 6139847 => 'Ringwood', - 6139848 => 'Melbourne', - 6139849 => 'Melbourne', - 6139850 => 'Melbourne', - 6139851 => 'Melbourne', - 6139852 => 'Melbourne', - 6139853 => 'Melbourne', - 6139854 => 'Melbourne', - 6139855 => 'Melbourne', - 6139856 => 'Melbourne', - 6139857 => 'Melbourne', - 6139858 => 'Melbourne', - 6139859 => 'Melbourne', - 6139860 => 'Melbourne', - 6139861 => 'Melbourne', - 6139862 => 'Melbourne', - 6139863 => 'Melbourne', - 6139864 => 'Melbourne', - 6139865 => 'Melbourne', - 6139866 => 'Melbourne', - 6139867 => 'Melbourne', - 6139868 => 'Melbourne', - 6139869 => 'Melbourne', - 6139870 => 'Ringwood', - 6139871 => 'Ringwood', - 6139872 => 'Ringwood', - 6139873 => 'Ringwood', - 6139874 => 'Ringwood', - 6139875 => 'Melbourne', - 6139876 => 'Ringwood', - 6139877 => 'Ringwood', - 6139878 => 'Ringwood', - 6139879 => 'Ringwood', - 6139880 => 'Melbourne', + 613984 => 'Ringwood', + 613987 => 'Ringwood', 61398810 => 'Ringwood', - 61398811 => 'Melbourne', - 61398812 => 'Melbourne', - 61398813 => 'Melbourne', - 61398814 => 'Melbourne', - 61398815 => 'Melbourne', - 61398816 => 'Melbourne', 61398817 => 'Ringwood', - 61398818 => 'Melbourne', 61398819 => 'Ringwood', - 6139882 => 'Melbourne', - 6139883 => 'Melbourne', 6139884 => 'Ringwood', - 6139885 => 'Melbourne', - 61398860 => 'Melbourne', - 61398861 => 'Ringwood', - 61398862 => 'Ringwood', - 61398863 => 'Ringwood', - 61398864 => 'Ringwood', - 61398865 => 'Ringwood', - 61398866 => 'Ringwood', - 61398867 => 'Ringwood', - 61398868 => 'Ringwood', - 61398869 => 'Melbourne', + 6139886 => 'Ringwood', 6139887 => 'Ringwood', - 6139888 => 'Melbourne', - 6139889 => 'Melbourne', - 6139890 => 'Melbourne', - 6139891 => 'Melbourne', - 6139892 => 'Melbourne', 6139893 => 'Ringwood', 6139894 => 'Ringwood', - 6139895 => 'Melbourne', - 6139896 => 'Melbourne', - 6139897 => 'Melbourne', - 6139898 => 'Melbourne', - 6139899 => 'Melbourne', - 6139900 => 'Melbourne', - 6139901 => 'Melbourne', + 613990 => 'Melbourne', 6139902 => 'Clayton', - 6139903 => 'Melbourne', 6139904 => 'Dandenong', 6139905 => 'Clayton', - 6139906 => 'Melbourne', - 6139907 => 'Melbourne', - 6139908 => 'Melbourne', - 6139909 => 'Melbourne', 6139910 => 'Melbourne', 6139911 => 'Melbourne', 6139912 => 'Melbourne', 6139913 => 'Melbourne', 6139914 => 'Melbourne', + 6139915 => 'Melbourne', 61399150 => 'Melbourne/Clayton/Melbourne', 61399151 => 'Melbourne/Croydon/Melbourne', - 61399152 => 'Melbourne', - 61399153 => 'Melbourne', - 61399154 => 'Melbourne', 61399155 => 'Melbourne/Clayton/Melbourne', 61399156 => 'Melbourne/Ringwood/Melbourne', - 61399157 => 'Melbourne', - 61399158 => 'Melbourne', - 61399159 => 'Melbourne', 6139916 => 'Melbourne', 61399170 => 'Melbourne', 61399171 => 'Melbourne', 61399172 => 'Melbourne', 6139918 => 'Melbourne', 6139919 => 'Melbourne', - 6139920 => 'Melbourne', - 6139921 => 'Melbourne', - 6139922 => 'Melbourne', - 6139923 => 'Melbourne', - 6139924 => 'Melbourne', - 6139925 => 'Melbourne', - 6139926 => 'Melbourne', - 6139927 => 'Melbourne', - 6139928 => 'Melbourne', - 6139929 => 'Melbourne', + 613992 => 'Melbourne', + 613993 => 'Melbourne', 6139930 => 'Craigieburn', - 6139931 => 'Melbourne', - 6139932 => 'Melbourne', - 6139933 => 'Melbourne', - 6139934 => 'Melbourne', - 6139935 => 'Melbourne', - 6139936 => 'Melbourne', - 6139937 => 'Melbourne', - 6139938 => 'Melbourne', - 6139939 => 'Melbourne', - 6139940 => 'Melbourne', - 6139941 => 'Melbourne', - 6139942 => 'Melbourne', - 6139943 => 'Melbourne', - 6139944 => 'Melbourne', - 6139945 => 'Melbourne', - 6139946 => 'Melbourne', - 6139947 => 'Melbourne', - 6139948 => 'Melbourne', - 6139949 => 'Melbourne', + 613994 => 'Melbourne', 6139950 => 'Melbourne', 6139951 => 'Melbourne', 6139952 => 'Melbourne', @@ -26307,16 +22186,8 @@ 6139956 => 'Melbourne', 6139963 => 'Melbourne', 6139971 => 'Sunbury', + 6139972 => 'Melbourne', 61399720 => 'Sydenham', - 61399721 => 'Melbourne', - 61399722 => 'Melbourne', - 61399723 => 'Melbourne', - 61399724 => 'Melbourne', - 61399725 => 'Melbourne', - 61399726 => 'Melbourne', - 61399727 => 'Melbourne', - 61399728 => 'Melbourne', - 61399729 => 'Melbourne', 6139973 => 'Melbourne', 6139974 => 'Werribee', 6139975 => 'Melbourne', @@ -26333,16 +22204,9 @@ 6139988 => 'Melbourne', 6139989 => 'Melbourne', 6139993 => 'Melbourne', + 6139994 => 'Melbourne', 61399940 => 'Point Cook', 61399941 => 'Craigieburn', - 61399942 => 'Melbourne', - 61399943 => 'Melbourne', - 61399944 => 'Melbourne', - 61399945 => 'Melbourne', - 61399946 => 'Melbourne', - 61399947 => 'Melbourne', - 61399948 => 'Melbourne', - 61399949 => 'Melbourne', 6139995 => 'Melbourne', 61399960 => 'Melbourne', 61399961 => 'Melbourne', @@ -26373,60 +22237,18 @@ 61728014 => 'Ipswich', 6172889 => 'Beenleigh', 6172891 => 'Beenleigh', - 6173000 => 'Brisbane', - 6173001 => 'Brisbane', - 6173002 => 'Brisbane', - 6173003 => 'Brisbane', - 6173004 => 'Brisbane', - 6173005 => 'Brisbane', - 6173006 => 'Brisbane', - 6173007 => 'Brisbane', - 6173008 => 'Brisbane', - 6173009 => 'Brisbane', - 6173010 => 'Brisbane', - 6173011 => 'Brisbane', - 6173012 => 'Brisbane', - 6173013 => 'Brisbane', - 6173014 => 'Brisbane', - 6173015 => 'Brisbane', - 6173016 => 'Brisbane', - 6173017 => 'Brisbane', - 6173018 => 'Brisbane', - 6173019 => 'Brisbane', - 6173020 => 'Brisbane', - 6173021 => 'Brisbane', - 6173022 => 'Brisbane', - 6173023 => 'Brisbane', - 6173024 => 'Brisbane', - 6173025 => 'Brisbane', - 6173026 => 'Brisbane', - 6173027 => 'Brisbane', - 6173028 => 'Brisbane', - 6173029 => 'Brisbane', - 6173030 => 'Brisbane', - 6173031 => 'Brisbane', - 6173032 => 'Brisbane', - 6173033 => 'Brisbane', - 6173034 => 'Brisbane', - 6173035 => 'Brisbane', - 6173036 => 'Brisbane', - 6173037 => 'Brisbane', + 617300 => 'Brisbane', + 617301 => 'Brisbane', + 617302 => 'Brisbane', + 617303 => 'Brisbane', 61730380 => 'Samford', 61730381 => 'Cleveland', 61730382 => 'Beenleigh', - 61730383 => 'Brisbane', - 61730384 => 'Brisbane', 61730385 => 'Beenleigh', 61730386 => 'Cleveland', 61730387 => 'Ipswich', 61730388 => 'Redcliffe', 61730389 => 'Samford', - 61730390 => 'Brisbane', - 61730391 => 'Brisbane', - 61730392 => 'Brisbane', - 61730393 => 'Brisbane', - 61730394 => 'Brisbane', - 61730395 => 'Brisbane', 61730396 => 'Ipswich', 61730397 => 'Ipswich', 61730398 => 'Redcliffe', @@ -26441,6 +22263,7 @@ 6173047 => 'Cleveland', 6173048 => 'Redcliffe', 6173049 => 'Redcliffe', + 617305 => 'Brisbane', 61730500 => 'Beenleigh', 61730501 => 'Redcliffe', 61730502 => 'Ipswich', @@ -26451,34 +22274,22 @@ 61730507 => 'Ipswich', 61730508 => 'Cleveland', 61730509 => 'Cleveland', - 6173051 => 'Brisbane', - 6173052 => 'Brisbane', 61730530 => 'Cleveland', 61730531 => 'Cleveland', 61730532 => 'Cleveland', 61730533 => 'Redcliffe', 61730534 => 'Beenleigh', - 61730535 => 'Brisbane', 61730536 => 'Ipswich', 61730537 => 'Cleveland', - 61730538 => 'Brisbane', 61730539 => 'Beenleigh', - 6173054 => 'Brisbane', - 6173055 => 'Brisbane', - 6173056 => 'Brisbane', - 6173057 => 'Brisbane', - 6173058 => 'Brisbane', 61730590 => 'Beenleigh', 61730591 => 'Beenleigh', 61730592 => 'Beenleigh', 61730593 => 'Redcliffe', 61730594 => 'Samford', 61730595 => 'Beenleigh', - 61730596 => 'Brisbane', 61730597 => 'Ipswich', - 61730598 => 'Brisbane', - 61730599 => 'Brisbane', - 61730600 => 'Brisbane', + 617306 => 'Brisbane', 61730601 => 'Samford', 61730602 => 'Redcliffe', 61730603 => 'Cleveland', @@ -26490,20 +22301,7 @@ 61730609 => 'Ipswich', 61730610 => 'Redcliffe', 61730611 => 'Samford', - 61730612 => 'Brisbane', - 61730613 => 'Brisbane', - 61730614 => 'Brisbane', - 61730615 => 'Brisbane', - 61730616 => 'Brisbane', - 61730617 => 'Brisbane', - 61730618 => 'Brisbane', - 61730619 => 'Brisbane', - 6173062 => 'Brisbane', - 6173063 => 'Brisbane', - 61730640 => 'Brisbane', - 61730641 => 'Brisbane', 61730642 => 'Bribie Island', - 61730643 => 'Brisbane', 61730644 => 'Dayboro', 61730645 => 'Dunwich', 61730646 => 'Kooringal', @@ -26511,7 +22309,6 @@ 61730648 => 'Russell Island', 61730649 => 'Samford', 61730650 => 'Bribie Island', - 61730651 => 'Brisbane', 61730652 => 'Dayboro', 61730653 => 'Dunwich', 61730654 => 'Kooringal', @@ -26519,75 +22316,21 @@ 61730656 => 'Russell Island', 61730657 => 'Samford', 61730658 => 'Bribie Island', - 61730659 => 'Brisbane', - 6173066 => 'Brisbane', - 6173067 => 'Brisbane', - 6173068 => 'Brisbane', - 6173069 => 'Brisbane', - 6173070 => 'Brisbane', - 6173071 => 'Brisbane', - 6173072 => 'Brisbane', - 6173073 => 'Brisbane', - 6173074 => 'Brisbane', - 6173075 => 'Brisbane', - 6173076 => 'Brisbane', - 61730770 => 'Brisbane', - 61730771 => 'Brisbane', - 61730772 => 'Brisbane', - 61730773 => 'Brisbane', - 61730774 => 'Brisbane', + 617307 => 'Brisbane', 61730775 => 'Dayboro', - 61730776 => 'Brisbane', - 61730777 => 'Brisbane', - 61730778 => 'Brisbane', - 61730779 => 'Brisbane', 6173078 => 'Beenleigh', - 6173079 => 'Brisbane', + 617308 => 'Brisbane', + 6173080 => 'Beenleigh', 61730800 => 'Dunwich', 61730801 => 'Kooringal', - 61730802 => 'Beenleigh', - 61730803 => 'Beenleigh', - 61730804 => 'Beenleigh', - 61730805 => 'Beenleigh', - 61730806 => 'Beenleigh', - 61730807 => 'Beenleigh', - 61730808 => 'Beenleigh', - 61730809 => 'Beenleigh', + 6173081 => 'Beenleigh', 61730810 => 'Russell Island', 61730811 => 'Bribie Island', - 61730812 => 'Beenleigh', - 61730813 => 'Beenleigh', - 61730814 => 'Beenleigh', - 61730815 => 'Beenleigh', - 61730816 => 'Beenleigh', - 61730817 => 'Beenleigh', - 61730818 => 'Beenleigh', 61730819 => 'Bribie Island', - 6173082 => 'Brisbane', - 6173083 => 'Brisbane', - 6173084 => 'Brisbane', - 6173085 => 'Brisbane', + 6173086 => 'Beenleigh', 61730860 => 'Cleveland', 61730861 => 'Cleveland', - 61730862 => 'Brisbane', - 61730863 => 'Beenleigh', - 61730864 => 'Beenleigh', - 61730865 => 'Beenleigh', - 61730866 => 'Beenleigh', - 61730867 => 'Beenleigh', - 61730868 => 'Beenleigh', - 61730869 => 'Beenleigh', - 6173087 => 'Brisbane', 61730880 => 'Dayboro', - 61730881 => 'Brisbane', - 61730882 => 'Brisbane', - 61730883 => 'Brisbane', - 61730884 => 'Brisbane', - 61730885 => 'Brisbane', - 61730886 => 'Brisbane', - 61730887 => 'Brisbane', - 61730888 => 'Brisbane', - 61730889 => 'Brisbane', 6173089 => 'Beenleigh', 6173090 => 'Beenleigh', 6173091 => 'Ipswich', @@ -26620,65 +22363,19 @@ 6173097 => 'Brisbane', 6173098 => 'Ipswich', 6173099 => 'Brisbane', - 6173100 => 'Brisbane', - 6173101 => 'Brisbane', - 6173102 => 'Brisbane', - 6173103 => 'Brisbane', - 6173104 => 'Brisbane', - 6173105 => 'Brisbane', - 6173106 => 'Brisbane', - 6173107 => 'Brisbane', - 6173108 => 'Brisbane', - 6173109 => 'Brisbane', - 6173110 => 'Brisbane', - 6173111 => 'Brisbane', - 6173112 => 'Brisbane', - 61731130 => 'Brisbane', + 617310 => 'Brisbane', + 617311 => 'Brisbane', 61731131 => 'Sandgate', 61731132 => 'Sandgate', - 61731133 => 'Brisbane', - 61731134 => 'Brisbane', - 61731135 => 'Brisbane', - 61731136 => 'Brisbane', - 61731137 => 'Brisbane', - 61731138 => 'Brisbane', - 61731139 => 'Brisbane', - 6173114 => 'Brisbane', - 6173115 => 'Brisbane', - 6173116 => 'Brisbane', - 6173117 => 'Brisbane', - 6173118 => 'Brisbane', - 6173119 => 'Brisbane', - 6173120 => 'Brisbane', - 6173121 => 'Brisbane', - 6173122 => 'Brisbane', - 6173123 => 'Brisbane', - 6173124 => 'Brisbane', - 6173125 => 'Brisbane', - 6173126 => 'Brisbane', - 6173127 => 'Brisbane', - 6173128 => 'Brisbane', - 6173129 => 'Brisbane', - 6173130 => 'Brisbane', - 6173131 => 'Brisbane', - 6173132 => 'Brisbane', + 617312 => 'Brisbane', + 617313 => 'Brisbane', 6173133 => 'Beenleigh', 6173134 => 'Cleveland', - 6173135 => 'Brisbane', - 6173136 => 'Brisbane', - 6173137 => 'Brisbane', - 6173138 => 'Brisbane', - 6173139 => 'Brisbane', + 617314 => 'Brisbane', 6173140 => 'Sandgate', 6173141 => 'Samford', 6173142 => 'Redcliffe', 6173143 => 'Ipswich', - 6173144 => 'Brisbane', - 6173145 => 'Brisbane', - 6173146 => 'Brisbane', - 6173147 => 'Brisbane', - 6173148 => 'Brisbane', - 6173149 => 'Brisbane', 61731500 => 'Brisbane', 61731501 => 'Brisbane', 61731502 => 'Sandgate', @@ -26689,16 +22386,8 @@ 61731508 => 'Brisbane', 61731509 => 'Brisbane', 6173151 => 'Brisbane', - 61731520 => 'Brisbane', - 61731521 => 'Brisbane', + 6173152 => 'Brisbane', 61731522 => 'Ipswich', - 61731523 => 'Brisbane', - 61731524 => 'Brisbane', - 61731525 => 'Brisbane', - 61731526 => 'Brisbane', - 61731527 => 'Brisbane', - 61731528 => 'Brisbane', - 61731529 => 'Brisbane', 6173153 => 'Brisbane', 6173154 => 'Brisbane', 61731550 => 'Brisbane', @@ -26714,16 +22403,7 @@ 61731597 => 'Brisbane', 61731598 => 'Brisbane', 61731599 => 'Brisbane', - 6173160 => 'Brisbane', - 6173161 => 'Brisbane', - 6173162 => 'Brisbane', - 6173163 => 'Brisbane', - 6173164 => 'Brisbane', - 6173165 => 'Brisbane', - 6173166 => 'Brisbane', - 6173167 => 'Brisbane', - 6173168 => 'Brisbane', - 6173169 => 'Brisbane', + 617316 => 'Brisbane', 6173170 => 'Brisbane', 6173171 => 'Brisbane', 6173172 => 'Brisbane', @@ -26748,16 +22428,8 @@ 61731879 => 'Brisbane', 6173188 => 'Brisbane', 6173189 => 'Brisbane', - 6173190 => 'Brisbane', - 6173191 => 'Brisbane', - 6173192 => 'Brisbane', - 6173193 => 'Brisbane', - 6173194 => 'Brisbane', - 6173195 => 'Brisbane', - 6173196 => 'Brisbane', - 6173197 => 'Brisbane', - 6173198 => 'Brisbane', - 6173199 => 'Brisbane', + 617319 => 'Brisbane', + 61732 => 'Brisbane', 6173200 => 'Beenleigh', 6173201 => 'Ipswich', 6173202 => 'Ipswich', @@ -26768,76 +22440,8 @@ 6173207 => 'Cleveland', 6173208 => 'Beenleigh', 6173209 => 'Beenleigh', - 6173210 => 'Brisbane', - 6173211 => 'Brisbane', - 6173212 => 'Brisbane', - 6173213 => 'Brisbane', - 6173214 => 'Brisbane', - 6173215 => 'Brisbane', - 6173216 => 'Brisbane', - 6173217 => 'Brisbane', - 6173218 => 'Brisbane', - 6173219 => 'Brisbane', - 6173220 => 'Brisbane', - 6173221 => 'Brisbane', - 6173222 => 'Brisbane', - 6173223 => 'Brisbane', - 6173224 => 'Brisbane', - 6173225 => 'Brisbane', - 6173226 => 'Brisbane', - 6173227 => 'Brisbane', - 6173228 => 'Brisbane', - 6173229 => 'Brisbane', - 6173230 => 'Brisbane', - 6173231 => 'Brisbane', - 6173232 => 'Brisbane', - 6173233 => 'Brisbane', - 6173234 => 'Brisbane', - 6173235 => 'Brisbane', - 6173236 => 'Brisbane', - 6173237 => 'Brisbane', - 6173238 => 'Brisbane', - 6173239 => 'Brisbane', - 6173240 => 'Brisbane', - 6173241 => 'Brisbane', - 6173242 => 'Brisbane', - 6173243 => 'Brisbane', - 6173244 => 'Brisbane', - 6173245 => 'Brisbane', - 6173246 => 'Brisbane', - 6173247 => 'Brisbane', - 6173248 => 'Brisbane', - 6173249 => 'Brisbane', - 6173250 => 'Brisbane', - 6173251 => 'Brisbane', - 6173252 => 'Brisbane', - 6173253 => 'Brisbane', - 6173254 => 'Brisbane', - 6173255 => 'Brisbane', - 6173256 => 'Brisbane', - 6173257 => 'Brisbane', - 6173258 => 'Brisbane', - 6173259 => 'Brisbane', - 6173260 => 'Brisbane', 6173261 => 'Sandgate', - 6173262 => 'Brisbane', - 6173263 => 'Brisbane', - 6173264 => 'Brisbane', - 6173265 => 'Brisbane', - 6173266 => 'Brisbane', - 6173267 => 'Brisbane', - 6173268 => 'Brisbane', 6173269 => 'Sandgate', - 6173270 => 'Brisbane', - 6173271 => 'Brisbane', - 6173272 => 'Brisbane', - 6173273 => 'Brisbane', - 6173274 => 'Brisbane', - 6173275 => 'Brisbane', - 6173276 => 'Brisbane', - 6173277 => 'Brisbane', - 6173278 => 'Brisbane', - 6173279 => 'Brisbane', 6173280 => 'Ipswich', 6173281 => 'Ipswich', 6173282 => 'Ipswich', @@ -26849,23 +22453,12 @@ 6173288 => 'Ipswich', 6173289 => 'Samford', 6173290 => 'Beenleigh', - 6173291 => 'Brisbane', - 6173292 => 'Brisbane', 6173293 => 'Redcliffe', 6173294 => 'Ipswich', - 6173295 => 'Brisbane', - 6173296 => 'Brisbane', 6173297 => 'Beenleigh', 6173298 => 'Samford', 6173299 => 'Beenleigh', - 617330 => 'Brisbane', - 617331 => 'Brisbane', - 617332 => 'Brisbane', - 617333 => 'Brisbane', - 617334 => 'Brisbane', - 617335 => 'Brisbane', - 617336 => 'Brisbane', - 617337 => 'Brisbane', + 61733 => 'Brisbane', 6173380 => 'Beenleigh', 6173381 => 'Ipswich', 6173382 => 'Beenleigh', @@ -26875,17 +22468,9 @@ 6173386 => 'Beenleigh', 6173387 => 'Beenleigh', 6173388 => 'Beenleigh', - 61733890 => 'Ipswich', - 61733891 => 'Ipswich', - 61733892 => 'Ipswich', - 61733893 => 'Ipswich', - 61733894 => 'Ipswich', - 61733895 => 'Ipswich', - 61733896 => 'Ipswich', - 61733897 => 'Ipswich', + 6173389 => 'Ipswich', 61733898 => 'Beenleigh', 61733899 => 'Beenleigh', - 617339 => 'Brisbane', 61734000 => 'Kooringal', 61734001 => 'Kooringal', 61734002 => 'Kooringal', @@ -26933,16 +22518,11 @@ 6173417 => 'Cleveland', 6173418 => 'Ipswich', 6173419 => 'Redcliffe', - 6173420 => 'Brisbane', - 6173421 => 'Brisbane', - 6173422 => 'Brisbane', - 6173423 => 'Brisbane', + 617342 => 'Brisbane', 6173424 => 'Ipswich', 6173425 => 'Dayboro', - 6173426 => 'Brisbane', 6173427 => 'Beenleigh', 6173428 => 'Ipswich', - 6173429 => 'Brisbane', 6173430 => 'Samford', 6173431 => 'Samford', 6173432 => 'Ipswich', @@ -27241,15 +22821,8 @@ 6173623 => 'Brisbane', 6173624 => 'Brisbane', 6173625 => 'Brisbane', - 6173630 => 'Brisbane', + 617363 => 'Brisbane', 6173631 => 'Sandgate', - 6173632 => 'Brisbane', - 6173633 => 'Brisbane', - 6173634 => 'Brisbane', - 6173635 => 'Brisbane', - 6173636 => 'Brisbane', - 6173637 => 'Brisbane', - 6173638 => 'Brisbane', 6173639 => 'Sandgate', 61736404 => 'Brisbane', 61736405 => 'Brisbane', @@ -27314,65 +22887,23 @@ 6173738 => 'Brisbane', 6173777 => 'Brisbane', 61737788 => 'Brisbane', + 61738 => 'Brisbane', 617380 => 'Beenleigh', - 6173810 => 'Ipswich', - 6173811 => 'Brisbane', - 6173812 => 'Ipswich', - 6173813 => 'Ipswich', - 6173814 => 'Ipswich', - 6173815 => 'Brisbane', - 6173816 => 'Ipswich', - 61738170 => 'Ipswich', - 61738171 => 'Ipswich', - 61738172 => 'Ipswich', - 61738173 => 'Ipswich', - 61738174 => 'Ipswich', + 617381 => 'Ipswich', 61738175 => 'Redcliffe', 61738176 => 'Redcliffe', 61738177 => 'Redcliffe', 61738178 => 'Redcliffe', 61738179 => 'Redcliffe', - 6173818 => 'Ipswich', - 6173819 => 'Ipswich', - 6173820 => 'Cleveland', - 6173821 => 'Cleveland', - 6173822 => 'Cleveland', - 6173823 => 'Brisbane', - 6173824 => 'Cleveland', - 6173825 => 'Cleveland', - 61738260 => 'Beenleigh', - 61738261 => 'Beenleigh', - 61738262 => 'Beenleigh', - 61738263 => 'Beenleigh', - 61738264 => 'Beenleigh', - 61738265 => 'Beenleigh', - 61738266 => 'Cleveland', - 61738267 => 'Cleveland', - 61738268 => 'Cleveland', - 61738269 => 'Cleveland', - 61738270 => 'Cleveland', - 61738271 => 'Cleveland', - 61738272 => 'Cleveland', - 61738273 => 'Cleveland', - 61738274 => 'Cleveland', + 617382 => 'Cleveland', + 6173826 => 'Beenleigh', 61738275 => 'Beenleigh', 61738276 => 'Beenleigh', 61738277 => 'Beenleigh', 61738278 => 'Beenleigh', 61738279 => 'Beenleigh', - 6173828 => 'Brisbane', - 6173829 => 'Cleveland', - 617383 => 'Brisbane', - 617384 => 'Brisbane', - 617385 => 'Brisbane', - 617386 => 'Brisbane', - 617387 => 'Brisbane', - 6173880 => 'Redcliffe', - 6173881 => 'Redcliffe', - 6173882 => 'Redcliffe', - 6173883 => 'Redcliffe', + 617388 => 'Redcliffe', 61738840 => 'Samford', - 61738841 => 'Redcliffe', 61738842 => 'Beenleigh', 61738843 => 'Cleveland', 61738844 => 'Cleveland', @@ -27381,30 +22912,9 @@ 61738847 => 'Beenleigh', 61738848 => 'Beenleigh', 61738849 => 'Beenleigh', - 6173885 => 'Redcliffe', - 6173886 => 'Redcliffe', - 6173887 => 'Brisbane', - 6173888 => 'Redcliffe', - 6173889 => 'Redcliffe', - 6173890 => 'Brisbane', - 6173891 => 'Brisbane', - 6173892 => 'Brisbane', - 6173893 => 'Brisbane', 6173894 => 'Ipswich', - 6173895 => 'Brisbane', - 6173896 => 'Brisbane', - 61738970 => 'Redcliffe', - 61738971 => 'Redcliffe', - 61738972 => 'Redcliffe', - 61738973 => 'Redcliffe', - 61738974 => 'Redcliffe', - 61738975 => 'Redcliffe', - 61738976 => 'Redcliffe', - 61738977 => 'Redcliffe', - 61738978 => 'Redcliffe', + 6173897 => 'Redcliffe', 61738979 => 'Samford', - 6173898 => 'Brisbane', - 6173899 => 'Brisbane', 617390 => 'Brisbane', 6173910 => 'Brisbane', 61739110 => 'Brisbane', @@ -27713,37 +23223,16 @@ 61740297 => 'Georgetown', 61740298 => 'Gordonvale', 61740299 => 'Herberton', - 61740300 => 'Cairns', - 61740301 => 'Cairns', + 617403 => 'Cairns', 61740302 => 'Innisfail', 61740303 => 'Mareeba', 61740304 => 'Mossman', 61740305 => 'Atherton', 61740306 => 'Thursday Island', - 61740307 => 'Cairns', - 61740308 => 'Cairns', 61740309 => 'Weipa', - 6174031 => 'Cairns', - 6174032 => 'Cairns', - 6174033 => 'Cairns', - 6174034 => 'Cairns', - 6174035 => 'Cairns', - 6174036 => 'Cairns', - 6174037 => 'Cairns', - 6174038 => 'Cairns', - 61740390 => 'Cairns', - 61740391 => 'Cairns', - 61740392 => 'Cairns', - 61740393 => 'Cairns', - 61740394 => 'Cairns', - 61740395 => 'Cairns', 61740396 => 'Aurukun', 61740397 => 'Babinda', - 61740398 => 'Cairns', - 61740399 => 'Cairns', - 6174040 => 'Cairns', - 6174041 => 'Cairns', - 6174042 => 'Cairns', + 617404 => 'Cairns', 61740430 => 'Cooktown', 61740431 => 'Peninsula', 61740432 => 'Babinda', @@ -27754,76 +23243,26 @@ 61740437 => 'Bloomfield', 61740438 => 'Innisfail', 61740439 => 'Tully', - 6174044 => 'Cairns', - 6174045 => 'Cairns', - 6174046 => 'Cairns', - 61740470 => 'Cairns', 61740471 => 'Chillagoe', 61740472 => 'Coen', 61740473 => 'Cooktown', - 61740474 => 'Cairns', - 61740475 => 'Cairns', - 61740476 => 'Cairns', - 61740477 => 'Cairns', - 61740478 => 'Cairns', - 61740479 => 'Cairns', - 61740480 => 'Cairns', - 61740481 => 'Cairns', - 61740482 => 'Cairns', 61740483 => 'Innisfail', 61740484 => 'Mareeba', 61740485 => 'Tully', 61740486 => 'Thursday Island', - 61740487 => 'Cairns', - 61740488 => 'Cairns', - 61740489 => 'Cairns', - 61740490 => 'Cairns', - 61740491 => 'Cairns', - 61740492 => 'Cairns', - 61740493 => 'Cairns', 61740494 => 'Thursday Island', 61740495 => 'Torres', 61740496 => 'Tully', 61740497 => 'Walsh River', 61740498 => 'Weipa', 61740499 => 'Weipa', - 6174050 => 'Cairns', - 6174051 => 'Cairns', - 6174052 => 'Cairns', - 6174053 => 'Cairns', - 6174054 => 'Cairns', - 6174055 => 'Cairns', - 61740560 => 'Cairns', - 61740561 => 'Gordonvale', - 61740562 => 'Gordonvale', - 61740563 => 'Gordonvale', - 61740564 => 'Gordonvale', - 61740565 => 'Gordonvale', - 61740566 => 'Gordonvale', - 61740567 => 'Cairns', - 61740568 => 'Cairns', - 61740569 => 'Cairns', - 6174057 => 'Cairns', - 61740580 => 'Cairns', - 61740581 => 'Cairns', - 61740582 => 'Cairns', - 61740583 => 'Cairns', - 61740584 => 'Cairns', - 61740585 => 'Cairns', + 617405 => 'Cairns', + 6174056 => 'Gordonvale', 61740586 => 'Daintree', 61740587 => 'Dimbulah', 61740588 => 'Edward River', - 61740589 => 'Cairns', - 61740590 => 'Cairns', - 61740591 => 'Cairns', - 61740592 => 'Cairns', - 61740593 => 'Cairns', - 61740594 => 'Cairns', - 61740595 => 'Cairns', 61740596 => 'Etheridge', 61740597 => 'Euramo', - 61740598 => 'Cairns', - 61740599 => 'Cairns', 61740600 => 'Lakeland', 61740601 => 'Coen', 61740602 => 'Peninsula', @@ -27845,36 +23284,15 @@ 61740627 => 'Etheridge', 61740628 => 'Kidston', 61740629 => 'Mount Surprise', - 61740630 => 'Innisfail', - 61740631 => 'Innisfail', - 61740632 => 'Innisfail', - 61740633 => 'Innisfail', - 61740634 => 'Innisfail', - 61740635 => 'Innisfail', + 6174063 => 'Innisfail', 61740636 => 'Euramo', 61740637 => 'Euramo', 61740638 => 'Georgetown', 61740639 => 'Gordonvale', - 61740640 => 'South Johnstone', - 61740641 => 'South Johnstone', - 61740642 => 'South Johnstone', - 61740643 => 'South Johnstone', - 61740644 => 'South Johnstone', - 61740645 => 'South Johnstone', - 61740646 => 'South Johnstone', - 61740647 => 'South Johnstone', - 61740648 => 'South Johnstone', + 6174064 => 'South Johnstone', 61740649 => 'Herberton', - 61740650 => 'Silkwood', - 61740651 => 'Silkwood', - 61740652 => 'Silkwood', - 61740653 => 'Silkwood', - 61740654 => 'Silkwood', - 61740655 => 'Silkwood', - 61740656 => 'Silkwood', - 61740657 => 'Silkwood', + 6174065 => 'Silkwood', 61740658 => 'Hopevale', - 61740659 => 'Silkwood', 6174066 => 'Euramo', 6174067 => 'Babinda', 6174068 => 'Tully', @@ -28020,26 +23438,12 @@ 61740847 => 'Millaa Millaa', 61740848 => 'Weipa', 61740849 => 'Daintree', - 61740850 => 'Kuranda', - 61740851 => 'Kuranda', - 61740852 => 'Kuranda', - 61740853 => 'Kuranda', - 61740854 => 'Kuranda', - 61740855 => 'Kuranda', - 61740856 => 'Kuranda', - 61740857 => 'Kuranda', + 6174085 => 'Kuranda', 61740858 => 'Coen', 61740859 => 'Cooktown', + 6174086 => 'Mareeba', 61740860 => 'Daintree', 61740861 => 'Gordonvale', - 61740862 => 'Mareeba', - 61740863 => 'Mareeba', - 61740864 => 'Mareeba', - 61740865 => 'Mareeba', - 61740866 => 'Mareeba', - 61740867 => 'Mareeba', - 61740868 => 'Mareeba', - 61740869 => 'Mareeba', 61740870 => 'Mossman', 61740871 => 'Mossman', 61740872 => 'Mossman', @@ -28050,24 +23454,13 @@ 61740877 => 'Mutchilba', 61740878 => 'Dimbulah', 61740879 => 'Edward River', - 61740880 => 'Tully', + 6174088 => 'Tully', 61740881 => 'Cairns', 61740882 => 'Innisfail', 61740883 => 'Etheridge', - 61740884 => 'Tully', - 61740885 => 'Tully', - 61740886 => 'Tully', - 61740887 => 'Tully', - 61740888 => 'Tully', - 61740889 => 'Tully', + 6174089 => 'Atherton', 61740890 => 'Euramo', 61740891 => 'Georgetown', - 61740892 => 'Atherton', - 61740893 => 'Atherton', - 61740894 => 'Atherton', - 61740895 => 'Atherton', - 61740896 => 'Atherton', - 61740897 => 'Atherton', 61740898 => 'Malanda', 61740899 => 'Malanda', 61740900 => 'Torres', @@ -28102,16 +23495,9 @@ 61740947 => 'Chillagoe', 61740948 => 'Walsh River', 61740949 => 'Walsh River', + 6174095 => 'Atherton', 61740950 => 'Malanda', 61740951 => 'Malanda', - 61740952 => 'Atherton', - 61740953 => 'Atherton', - 61740954 => 'Atherton', - 61740955 => 'Atherton', - 61740956 => 'Atherton', - 61740957 => 'Atherton', - 61740958 => 'Atherton', - 61740959 => 'Atherton', 61740960 => 'Herberton', 61740961 => 'Herberton', 61740962 => 'Herberton', @@ -28132,15 +23518,9 @@ 61740977 => 'Ravenshoe', 61740978 => 'Ravenshoe', 61740979 => 'Mount Garnet', + 6174098 => 'Mossman', 61740980 => 'Daintree', - 61740981 => 'Mossman', - 61740982 => 'Mossman', - 61740983 => 'Mossman', - 61740984 => 'Mossman', - 61740985 => 'Mossman', 61740986 => 'Daintree', - 61740987 => 'Mossman', - 61740988 => 'Mossman', 61740989 => 'Daintree', 6174099 => 'Mossman', 61741000 => 'Bundaberg', @@ -28334,16 +23714,11 @@ 61741197 => 'Tandora', 61741198 => 'Blackbutt', 61741199 => 'Brooklands', - 61741200 => 'Maryborough', + 6174120 => 'Maryborough', 61741201 => 'Pialba', - 61741202 => 'Maryborough', 61741203 => 'Fraser Island', - 61741204 => 'Maryborough', - 61741205 => 'Maryborough', 61741206 => 'Pialba', 61741207 => 'Bundaberg', - 61741208 => 'Maryborough', - 61741209 => 'Maryborough', 6174121 => 'Maryborough', 6174122 => 'Maryborough', 6174123 => 'Maryborough', @@ -28562,21 +23937,8 @@ 61741497 => 'Tansey', 61741498 => 'Windera', 61741499 => 'Wondai', - 61741500 => 'Bundaberg', - 61741501 => 'Bundaberg', - 61741502 => 'Bundaberg', - 61741503 => 'Bundaberg', - 61741504 => 'Bundaberg', - 61741505 => 'Bundaberg', - 61741506 => 'Bundaberg', - 61741507 => 'Bundaberg', - 61741508 => 'Bundaberg', + 617415 => 'Bundaberg', 61741509 => 'Gin Gin', - 6174151 => 'Bundaberg', - 6174152 => 'Bundaberg', - 6174153 => 'Bundaberg', - 6174154 => 'Bundaberg', - 6174155 => 'Bundaberg', 61741560 => 'Yandaran', 61741561 => 'Yandaran', 61741562 => 'Mount Perry', @@ -28597,8 +23959,6 @@ 61741586 => 'Windera', 61741587 => 'Wondai', 61741588 => 'Blackbutt', - 61741589 => 'Bundaberg', - 6174159 => 'Bundaberg', 61741600 => 'Kingaroy', 61741601 => 'Monto', 61741602 => 'Mundubbera', @@ -28609,12 +23969,7 @@ 61741607 => 'Nanango', 61741608 => 'Bundaberg', 61741609 => 'Nanango', - 61741610 => 'Gayndah', - 61741611 => 'Gayndah', - 61741612 => 'Gayndah', - 61741613 => 'Gayndah', - 61741614 => 'Gayndah', - 61741615 => 'Gayndah', + 6174161 => 'Gayndah', 61741616 => 'Gooroolba', 61741617 => 'Burnett', 61741618 => 'Burnett', @@ -28650,16 +24005,8 @@ 61741657 => 'Eidsvold', 61741658 => 'Monogorilby', 61741659 => 'Mundubbera', + 6174166 => 'Monto', 61741660 => 'Monogorilby', - 61741661 => 'Monto', - 61741662 => 'Monto', - 61741663 => 'Monto', - 61741664 => 'Monto', - 61741665 => 'Monto', - 61741666 => 'Monto', - 61741667 => 'Monto', - 61741668 => 'Monto', - 61741669 => 'Monto', 61741670 => 'Bundaberg', 61741671 => 'Gin Gin', 61741672 => 'Mulgildie', @@ -28890,12 +24237,7 @@ 61741897 => 'Biggenden', 61741898 => 'Biggenden', 61741899 => 'Kingaroy', - 61741900 => 'Maryborough', - 61741901 => 'Maryborough', - 61741902 => 'Maryborough', - 61741903 => 'Maryborough', - 61741904 => 'Maryborough', - 61741905 => 'Maryborough', + 6174190 => 'Maryborough', 61741906 => 'Booyal', 61741907 => 'Kingaroy', 61741908 => 'Brooweena', @@ -29329,26 +24671,15 @@ 61742408 => 'Silkwood', 61742409 => 'South Johnstone', 6174241 => 'Cairns', + 6174242 => 'Cairns', 61742420 => 'Thursday Island', - 61742421 => 'Cairns', - 61742422 => 'Cairns', - 61742423 => 'Cairns', - 61742424 => 'Cairns', - 61742425 => 'Cairns', 61742426 => 'Torres', 61742427 => 'Torres', - 61742428 => 'Cairns', 61742429 => 'Torres', + 6174243 => 'Cairns', 61742430 => 'Tully', 61742431 => 'Walsh River', 61742432 => 'Weipa', - 61742433 => 'Cairns', - 61742434 => 'Cairns', - 61742435 => 'Cairns', - 61742436 => 'Cairns', - 61742437 => 'Cairns', - 61742438 => 'Cairns', - 61742439 => 'Cairns', 61742440 => 'Cairns', 61742441 => 'Cairns', 61742442 => 'Cairns', @@ -29429,32 +24760,14 @@ 61742517 => 'Minnamoolka', 61742518 => 'Molloy', 61742519 => 'Mossman', + 6174252 => 'Cairns', 61742520 => 'Mount Garnet', 61742521 => 'Georgetown', - 61742522 => 'Cairns', - 61742523 => 'Cairns', - 61742524 => 'Cairns', - 61742525 => 'Cairns', - 61742526 => 'Cairns', - 61742527 => 'Cairns', - 61742528 => 'Cairns', - 61742529 => 'Cairns', + 6174253 => 'Cairns', 61742530 => 'Mount Surprise', 61742531 => 'Mutchilba', 61742532 => 'Peninsula', - 61742533 => 'Cairns', - 61742534 => 'Cairns', - 61742535 => 'Cairns', - 61742536 => 'Cairns', - 61742537 => 'Cairns', - 61742538 => 'Cairns', - 61742539 => 'Cairns', - 61742540 => 'Cairns', - 61742541 => 'Cairns', - 61742542 => 'Cairns', - 61742543 => 'Cairns', - 61742544 => 'Cairns', - 61742545 => 'Cairns', + 6174254 => 'Cairns', 61742546 => 'Herberton', 61742547 => 'Herberton', 61742548 => 'Mareeba', @@ -29469,15 +24782,7 @@ 61742557 => 'Cairns', 61742558 => 'Cairns', 61742559 => 'Cairns', - 61742560 => 'Cairns', - 61742561 => 'Cairns', - 61742562 => 'Cairns', - 61742563 => 'Cairns', - 61742564 => 'Cairns', - 61742565 => 'Cairns', - 61742566 => 'Cairns', - 61742567 => 'Cairns', - 61742568 => 'Cairns', + 6174256 => 'Cairns', 61742569 => 'Tully', 61742570 => 'Walsh River', 61742571 => 'Weipa', @@ -29797,13 +25102,8 @@ 61743257 => 'Brooweena', 61743258 => 'Booyal', 61743259 => 'Biggenden', + 6174326 => 'Bundaberg', 61743260 => 'Gaeta', - 61743261 => 'Bundaberg', - 61743262 => 'Bundaberg', - 61743263 => 'Bundaberg', - 61743264 => 'Bundaberg', - 61743265 => 'Bundaberg', - 61743266 => 'Bundaberg', 61743267 => 'Gayndah', 61743268 => 'Gin Gin', 61743269 => 'Gooroolba', @@ -29847,15 +25147,10 @@ 61743307 => 'Childers', 61743308 => 'Eidsvold', 61743309 => 'Farnsfield', - 61743310 => 'Bundaberg', - 61743311 => 'Bundaberg', + 6174331 => 'Bundaberg', 61743312 => 'Bunker', 61743313 => 'Gaeta', 61743314 => 'Mount Perry', - 61743315 => 'Bundaberg', - 61743316 => 'Bundaberg', - 61743317 => 'Bundaberg', - 61743318 => 'Bundaberg', 61743319 => 'Fraser Island', 61743320 => 'Gaeta', 61743321 => 'Gayndah', @@ -29887,13 +25182,8 @@ 61743347 => 'Windera', 61743348 => 'Wondai', 61743349 => 'Yandaran', + 6174335 => 'Bundaberg', 61743350 => 'Yarraman', - 61743351 => 'Bundaberg', - 61743352 => 'Bundaberg', - 61743353 => 'Bundaberg', - 61743354 => 'Bundaberg', - 61743355 => 'Bundaberg', - 61743356 => 'Bundaberg', 61743357 => 'Pialba', 61743358 => 'Maryborough', 61743359 => 'Maryborough', @@ -30101,16 +25391,8 @@ 61744167 => 'Mutarnee', 61744168 => 'Pentland', 61744169 => 'Prairie', + 6174417 => 'Townsville', 61744170 => 'Bowen', - 61744171 => 'Townsville', - 61744172 => 'Townsville', - 61744173 => 'Townsville', - 61744174 => 'Townsville', - 61744175 => 'Townsville', - 61744176 => 'Townsville', - 61744177 => 'Townsville', - 61744178 => 'Townsville', - 61744179 => 'Townsville', 61744180 => 'Ravenswood', 61744181 => 'Richmond', 61744182 => 'Rollingstone', @@ -30132,16 +25414,9 @@ 61744198 => 'Ayr', 61744199 => 'Bowen', 6174420 => 'Townsville', + 6174421 => 'Townsville', 61744210 => 'Rollingstone', 61744211 => 'Rollingstone', - 61744212 => 'Townsville', - 61744213 => 'Townsville', - 61744214 => 'Townsville', - 61744215 => 'Townsville', - 61744216 => 'Townsville', - 61744217 => 'Townsville', - 61744218 => 'Townsville', - 61744219 => 'Townsville', 61744220 => 'Townsville', 61744221 => 'Clarke', 61744222 => 'Clarke', @@ -30187,13 +25462,7 @@ 61744267 => 'Townsville', 61744268 => 'Townsville', 61744269 => 'Townsville', - 61744270 => 'Townsville', - 61744271 => 'Townsville', - 61744272 => 'Townsville', - 61744273 => 'Townsville', - 61744274 => 'Townsville', - 61744275 => 'Townsville', - 61744276 => 'Townsville', + 6174427 => 'Townsville', 61744277 => 'Bowen', 61744278 => 'Bowen', 61744279 => 'Bowen', @@ -31133,16 +26402,11 @@ 61745877 => 'Brigalow/Bringalily/Brookstead/Brymaroo/Bunya Mountains/Cambooya/Cecil Plains/Charleville/Chinchilla/Clifton', 61745878 => 'Cockatoo/Condamine/Coondarra/Cooyar/Cottonvale/Crows Nest/Culgoa/Cunnamulla/Cunningham/Dalby', 61745879 => 'Darr Creek/Diamantina/Diamondy/Dirranbandi/Dulacca/Dunmore/Durham Downs/Elbow Valley/Eschol/Freestone', + 6174588 => 'Toowoomba', 61745880 => 'Galilee/Glenhope/Goombi/Goombungee/Goondiwindi/Greenmount/Guluguba/Haddon/Haden/Helidon', 61745881 => 'Inglewood/Injune/Isisford/Jandowae/Jericho/Jimbour/Jondaryan/Jundah/Kilbeggan/Killarney', 61745882 => 'Kumbarilla/Kupunn/Legume/Leyburn/Liston/Longreach/Lynd Range/Macalister/Maranoa/Meandarra', 61745883 => 'Miamba/Miles/Millmerran/Mitchell/Moonie/Morven/Mount Tyson/Muttaburra/Nobby/North Star', - 61745884 => 'Toowoomba', - 61745885 => 'Toowoomba', - 61745886 => 'Toowoomba', - 61745887 => 'Toowoomba', - 61745888 => 'Toowoomba', - 61745889 => 'Toowoomba', 61745890 => 'Toowoomba', 61745891 => 'Toowoomba', 61745892 => 'Oakey/Omanama/Paroo/Pikedale/Pittsworth/Quilpie/Ravensbourne/Robinson Gorge/Roma/Southwood', @@ -31321,12 +26585,7 @@ 61746129 => 'Helidon', 6174613 => 'Toowoomba', 6174614 => 'Toowoomba', - 61746150 => 'Toowoomba', - 61746151 => 'Toowoomba', - 61746152 => 'Toowoomba', - 61746153 => 'Toowoomba', - 61746154 => 'Toowoomba', - 61746155 => 'Toowoomba', + 6174615 => 'Toowoomba', 61746156 => 'Wallumbilla', 61746157 => 'Wallumbilla', 61746158 => 'Yuleba', @@ -31393,12 +26652,7 @@ 61746237 => 'Mitchell', 61746238 => 'Mitchell', 61746239 => 'Maranoa', - 61746240 => 'Roma', - 61746241 => 'Roma', - 61746242 => 'Roma', - 61746243 => 'Roma', - 61746244 => 'Roma', - 61746245 => 'Roma', + 6174624 => 'Roma', 61746246 => 'Mitchell', 61746247 => 'Mitchell', 61746248 => 'Injune', @@ -31453,16 +26707,7 @@ 61746297 => 'Tabers', 61746298 => 'Wallumbilla', 61746299 => 'Yuleba', - 6174630 => 'Toowoomba', - 6174631 => 'Toowoomba', - 6174632 => 'Toowoomba', - 6174633 => 'Toowoomba', - 6174634 => 'Toowoomba', - 6174635 => 'Toowoomba', - 6174636 => 'Toowoomba', - 6174637 => 'Toowoomba', - 6174638 => 'Toowoomba', - 6174639 => 'Toowoomba', + 617463 => 'Toowoomba', 61746400 => 'The Gums', 61746401 => 'Thomson', 61746402 => 'Tipton', @@ -31665,13 +26910,7 @@ 61746608 => 'Dalby', 61746609 => 'Cecil Plains', 6174661 => 'Warwick', - 61746620 => 'Dalby', - 61746621 => 'Dalby', - 61746622 => 'Dalby', - 61746623 => 'Dalby', - 61746624 => 'Dalby', - 61746625 => 'Dalby', - 61746626 => 'Dalby', + 6174662 => 'Dalby', 61746627 => 'Chinchilla', 61746628 => 'Chinchilla', 61746629 => 'Southwood', @@ -31685,15 +26924,8 @@ 61746637 => 'Bowenville', 61746638 => 'Kupunn', 61746639 => 'Dalby', + 6174664 => 'Killarney', 61746640 => 'Legume', - 61746641 => 'Killarney', - 61746642 => 'Killarney', - 61746643 => 'Killarney', - 61746644 => 'Killarney', - 61746645 => 'Killarney', - 61746646 => 'Killarney', - 61746647 => 'Killarney', - 61746648 => 'Killarney', 61746649 => 'Elbow Valley', 61746650 => 'Moonie', 61746651 => 'Coondarra', @@ -31715,15 +26947,8 @@ 61746667 => 'Allora', 61746668 => 'Cunningham', 61746669 => 'Warwick', - 61746670 => 'Warwick', - 61746671 => 'Warwick', - 61746672 => 'Warwick', - 61746673 => 'Warwick', + 6174667 => 'Warwick', 61746674 => 'Cunningham', - 61746675 => 'Warwick', - 61746676 => 'Warwick', - 61746677 => 'Warwick', - 61746678 => 'Warwick', 61746679 => 'Elbow Valley', 61746680 => 'Cecil Plains', 61746681 => 'Warra', @@ -31756,12 +26981,7 @@ 61746708 => 'Leyburn', 61746709 => 'Toowoomba', 6174671 => 'Goondiwindi', - 61746720 => 'Dalby', - 61746721 => 'Dalby', - 61746722 => 'Dalby', - 61746723 => 'Dalby', - 61746724 => 'Dalby', - 61746725 => 'Dalby', + 6174672 => 'Dalby', 61746726 => 'Chinchilla', 61746727 => 'Chinchilla', 61746728 => 'Chinchilla', @@ -31857,24 +27077,12 @@ 61746827 => 'Balonne', 61746828 => 'Diamondy', 61746829 => 'Dunmore', + 6174683 => 'Stanthorpe', 61746830 => 'Roma/Warwick', - 61746831 => 'Stanthorpe', - 61746832 => 'Stanthorpe', - 61746833 => 'Stanthorpe', - 61746834 => 'Stanthorpe', - 61746835 => 'Stanthorpe', - 61746836 => 'Stanthorpe', - 61746837 => 'Stanthorpe', 61746838 => 'Wandoan', 61746839 => 'Wandoan', + 6174684 => 'Ballandean', 61746840 => 'Stanthorpe', - 61746841 => 'Ballandean', - 61746842 => 'Ballandean', - 61746843 => 'Ballandean', - 61746844 => 'Ballandean', - 61746845 => 'Ballandean', - 61746846 => 'Ballandean', - 61746847 => 'Ballandean', 61746848 => 'Stanthorpe', 61746849 => 'Stanthorpe', 61746850 => 'Cottonvale', @@ -31909,26 +27117,10 @@ 61746897 => 'Macalister', 61746898 => 'Auburn', 61746899 => 'Bell', - 61746900 => 'Toowoomba', - 61746901 => 'Toowoomba', - 61746902 => 'Toowoomba', - 61746903 => 'Toowoomba', - 61746904 => 'Toowoomba', - 61746905 => 'Toowoomba', - 61746906 => 'Toowoomba', - 61746907 => 'Toowoomba', + 6174690 => 'Toowoomba', 61746908 => 'Helidon', - 61746909 => 'Toowoomba', + 6174691 => 'Oakey', 61746910 => 'Cambooya', - 61746911 => 'Oakey', - 61746912 => 'Oakey', - 61746913 => 'Oakey', - 61746914 => 'Oakey', - 61746915 => 'Oakey', - 61746916 => 'Oakey', - 61746917 => 'Oakey', - 61746918 => 'Oakey', - 61746919 => 'Oakey', 61746920 => 'Oakey', 61746921 => 'Brymaroo', 61746922 => 'Jondaryan', @@ -31939,13 +27131,8 @@ 61746927 => 'Brymaroo', 61746928 => 'Brymaroo', 61746929 => 'Brymaroo', + 6174693 => 'Pittsworth', 61746930 => 'Brookstead', - 61746931 => 'Pittsworth', - 61746932 => 'Pittsworth', - 61746933 => 'Pittsworth', - 61746934 => 'Pittsworth', - 61746935 => 'Pittsworth', - 61746936 => 'Pittsworth', 61746937 => 'Mount Tyson', 61746938 => 'Mount Tyson', 61746939 => 'Brookstead', @@ -32191,25 +27378,13 @@ 61747197 => 'Mount Fox', 61747198 => 'Mutarnee', 61747199 => 'Palm Island', - 61747200 => 'Townsville', - 61747201 => 'Townsville', + 617472 => 'Townsville', 61747202 => 'Giru', 61747203 => 'Ingham', 61747204 => 'Bowen', 61747205 => 'Ayr', 61747206 => 'Yabulu', - 61747207 => 'Townsville', - 61747208 => 'Townsville', 61747209 => 'Collinsville', - 6174721 => 'Townsville', - 6174722 => 'Townsville', - 6174723 => 'Townsville', - 6174724 => 'Townsville', - 6174725 => 'Townsville', - 6174726 => 'Townsville', - 6174727 => 'Townsville', - 6174728 => 'Townsville', - 6174729 => 'Townsville', 61747300 => 'Mount Isa', 61747301 => 'Mount Isa', 61747302 => 'Mount Isa', @@ -32330,27 +27505,14 @@ 61747417 => 'Walker', 61747418 => 'Flinders', 61747419 => 'Hughenden', - 61747420 => 'Cloncurry', - 61747421 => 'Cloncurry', - 61747422 => 'Cloncurry', - 61747423 => 'Cloncurry', - 61747424 => 'Cloncurry', + 6174742 => 'Cloncurry', 61747425 => 'Kalkadoon', 61747426 => 'Kalkadoon', 61747427 => 'Kalkadoon', - 61747428 => 'Cloncurry', 61747429 => 'Doomadgee', 6174743 => 'Mount Isa', - 61747440 => 'Mount Isa', - 61747441 => 'Mount Isa', - 61747442 => 'Mount Isa', - 61747443 => 'Mount Isa', - 61747444 => 'Mount Isa', - 61747445 => 'Mount Isa', - 61747446 => 'Mount Isa', + 6174744 => 'Mount Isa', 61747447 => 'Barkly/Mount Isa', - 61747448 => 'Mount Isa', - 61747449 => 'Mount Isa', 61747450 => 'Mount Isa', 61747451 => 'Normanton', 61747452 => 'Normanton', @@ -32520,6 +27682,7 @@ 61747697 => 'Normanton', 61747698 => 'Gulf', 61747699 => 'Barkly', + 617477 => 'Townsville', 61747700 => 'Palm Island', 61747701 => 'Palm Island', 61747702 => 'Ravenswood', @@ -32530,11 +27693,6 @@ 61747707 => 'Rollingstone', 61747708 => 'Mutarnee', 61747709 => 'Mutarnee', - 6174771 => 'Townsville', - 6174772 => 'Townsville', - 6174773 => 'Townsville', - 6174774 => 'Townsville', - 6174775 => 'Townsville', 6174776 => 'Ingham', 61747770 => 'Halifax', 61747771 => 'Ingham', @@ -32547,36 +27705,17 @@ 61747778 => 'Halifax', 61747779 => 'Halifax', 61747780 => 'Yabulu', - 61747781 => 'Townsville', - 61747782 => 'Townsville', - 61747783 => 'Townsville', - 61747784 => 'Townsville', - 61747785 => 'Townsville', 61747786 => 'Yabulu', 61747787 => 'Yabulu', 61747788 => 'Woodstock', - 61747789 => 'Townsville', - 6174779 => 'Townsville', - 61747800 => 'Woodstock', - 61747801 => 'Woodstock', - 61747802 => 'Woodstock', - 61747803 => 'Woodstock', - 61747804 => 'Woodstock', - 61747805 => 'Woodstock', - 61747806 => 'Woodstock', + 6174780 => 'Woodstock', 61747807 => 'Collinsville', 61747808 => 'Long Pocket', 61747809 => 'Long Pocket', 6174781 => 'Townsville', - 61747820 => 'Home Hill', - 61747821 => 'Home Hill', - 61747822 => 'Home Hill', - 61747823 => 'Home Hill', + 6174782 => 'Home Hill', 61747824 => 'Ayr', 61747825 => 'Ayr', - 61747826 => 'Home Hill', - 61747827 => 'Home Hill', - 61747828 => 'Home Hill', 61747829 => 'Giru', 6174783 => 'Ayr', 61747840 => 'Dalbeg', @@ -32600,16 +27739,8 @@ 61747858 => 'Collinsville', 61747859 => 'Leichhardt Range', 6174786 => 'Bowen', - 61747870 => 'Charters Towers', - 61747871 => 'Charters Towers', - 61747872 => 'Charters Towers', - 61747873 => 'Charters Towers', - 61747874 => 'Charters Towers', - 61747875 => 'Charters Towers', + 6174787 => 'Charters Towers', 61747876 => 'Cape River', - 61747877 => 'Charters Towers', - 61747878 => 'Charters Towers', - 61747879 => 'Charters Towers', 61747880 => 'Yabulu', 61747881 => 'Pentland', 61747882 => 'Charters Towers', @@ -33220,16 +28351,11 @@ 61748587 => 'Koumala/Lethebrook/Mackay/Mardale/Marlborough/Miclere/Middlemount/Miriam Vale/Moranbah/Mount Coolon', 61748588 => 'Mount Gardiner/Mount Larcom/Mount Morgan/Moura/Nathan Gorge/Nebo/Nogoa/Oombabeer/Orion/Pegunny', 61748589 => 'Proserpine/Rockhampton/Rolleston/Sarina/Spier/Springsure/St Lawrence/The Caves/Theodore/Tieri', + 6174859 => 'Yeppoon', 61748590 => 'Tungamull/Turkey Beach/Ubobo/Wagoora/Walkerston/Westwood/Willows/Woorabinda/Wowan/Yakapari', 61748591 => 'Yeppoon/Zamia Creek/Agnes Water/Alpha/Bajool/Banana/Baralaba/Bauhinia/Benaraby/Biloela', 61748592 => 'Sarina', 61748593 => 'Sarina', - 61748594 => 'Yeppoon', - 61748595 => 'Yeppoon', - 61748596 => 'Yeppoon', - 61748597 => 'Yeppoon', - 61748598 => 'Yeppoon', - 61748599 => 'Yeppoon', 61748600 => 'Belyando', 61748601 => 'Bingegang/Blackwater/Broadsound/Buckland/Byfield/Calen/Calliope/Cannon Valley/Capella/Carbine Creek', 61748602 => 'Carmila/Clermont/Colston Park/Comet/Connors Range/Cracow/Dingo/Dingo Beach/Duaringa/Dysart', @@ -33250,16 +28376,9 @@ 61748617 => 'Belyando', 61748618 => 'Calliope/Cannon Valley/Capella/Carbine Creek/Carmila/Clermont/Colston Park/Comet/Connors Range/Cracow', 61748619 => 'Dingo/Duaringa/Dysart/Emerald/Finch Hatton/Fitzroy West/Gargett/Garnant/Gayfield', + 6174862 => 'Mackay', 61748620 => 'Gemfields/Gladstone/Glenden/Goovigen/Hodgson Range/Isaac River/Koumala/Lethebrook/Mackay/Mardale', 61748621 => 'Gladstone', - 61748622 => 'Mackay', - 61748623 => 'Mackay', - 61748624 => 'Mackay', - 61748625 => 'Mackay', - 61748626 => 'Mackay', - 61748627 => 'Mackay', - 61748628 => 'Mackay', - 61748629 => 'Mackay', 61748630 => 'Mackay', 61748631 => 'Mackay', 61748632 => 'Mackay', @@ -33270,33 +28389,17 @@ 61748637 => 'Rockhampton', 61748638 => 'Rockhampton', 61748639 => 'Rockhampton', + 6174864 => 'Mackay', 61748640 => 'Moranbah', - 61748641 => 'Mackay', - 61748642 => 'Mackay', - 61748643 => 'Mackay', 61748644 => 'Emerald', 61748645 => 'Emerald', 61748646 => 'Emerald', - 61748647 => 'Mackay', - 61748648 => 'Mackay', - 61748649 => 'Mackay', - 61748650 => 'Mackay', - 61748651 => 'Mackay', - 61748652 => 'Mackay', - 61748653 => 'Mackay', - 61748654 => 'Mackay', + 6174865 => 'Mackay', 61748655 => 'Marlborough/Miclere/Middlemount/Miriam Vale/Moranbah/Mount Coolon/Mount Gardiner/Mount Larcom/Mount Morgan/Moura', 61748656 => 'Nathan Gorge/Nebo/Nogoa/Oombabeer/Orion/Pegunny/Proserpine/Rockhampton/Rolleston/Sarina', 61748657 => 'Spier/Springsure/St Lawrence/The Caves/Theodore/Tieri/Tungamull/Turkey Beach/Ubobo/Wagoora', 61748658 => 'Walkerston/Westwood/Willows/Woorabinda/Wowan/Yakapari/Yeppoon/Zamia Creek/Gemfields/Gladstone', - 61748659 => 'Mackay', - 61748660 => 'Mackay', - 61748661 => 'Mackay', - 61748662 => 'Mackay', - 61748663 => 'Mackay', - 61748664 => 'Mackay', - 61748665 => 'Mackay', - 61748666 => 'Mackay', + 6174866 => 'Mackay', 61748667 => 'Clermont', 61748668 => 'Agnes Water', 61748669 => 'Glenden/Goovigen/Hodgson Range/Isaac River/Koumala/Lethebrook/Mackay/Mardale/Marlborough/Miclere', @@ -33357,24 +28460,14 @@ 61748977 => 'Rockhampton', 61748978 => 'Rockhampton', 61748979 => 'Rockhampton', - 61748980 => 'Mackay', - 61748981 => 'Mackay', - 61748982 => 'Mackay', + 6174898 => 'Mackay', 61748983 => 'Connors Range', 61748984 => 'St Lawrence', - 61748985 => 'Mackay', - 61748986 => 'Mackay', - 61748987 => 'Mackay', 61748988 => 'Theodore', 61748989 => 'Nebo', - 61748990 => 'Gladstone', - 61748991 => 'Gladstone', - 61748992 => 'Gladstone', - 61748993 => 'Gladstone', - 61748994 => 'Gladstone', + 6174899 => 'Gladstone', 61748995 => 'Mackay', 61748996 => 'Mackay', - 61748997 => 'Gladstone', 61748998 => 'Calliope', 61748999 => 'Alpha', 61749000 => 'Rockhampton', @@ -33498,16 +28591,10 @@ 61749127 => 'The Caves', 61749128 => 'Marlborough', 61749129 => 'Garnant', + 6174913 => 'Yeppoon', 61749130 => 'Rockhampton', 61749131 => 'Emerald/Yeppoon', 61749132 => 'Woorabinda', - 61749133 => 'Yeppoon', - 61749134 => 'Yeppoon', - 61749135 => 'Yeppoon', - 61749136 => 'Yeppoon', - 61749137 => 'Yeppoon', - 61749138 => 'Yeppoon', - 61749139 => 'Yeppoon', 61749140 => 'Rockhampton', 61749141 => 'Woorabinda', 61749142 => 'Mackay', @@ -33568,33 +28655,14 @@ 61749197 => 'Cannon Valley', 61749198 => 'Carmila', 61749199 => 'Colston Park', - 61749200 => 'Rockhampton', - 61749201 => 'Rockhampton', - 61749202 => 'Rockhampton', - 61749203 => 'Rockhampton', - 61749204 => 'Rockhampton', - 61749205 => 'Rockhampton', - 61749206 => 'Rockhampton', - 61749207 => 'Rockhampton', + 617492 => 'Rockhampton', 61749208 => 'Marlborough', 61749209 => 'Tungamull', - 6174921 => 'Rockhampton', - 6174922 => 'Rockhampton', - 6174923 => 'Rockhampton', - 6174924 => 'Rockhampton', - 61749250 => 'Yeppoon', - 61749251 => 'Yeppoon', - 61749252 => 'Yeppoon', - 61749253 => 'Yeppoon', - 61749254 => 'Yeppoon', - 61749255 => 'Yeppoon', + 6174925 => 'Yeppoon', 61749256 => 'Duaringa', 61749257 => 'Dingo', 61749258 => 'Byfield', 61749259 => 'Woorabinda', - 6174926 => 'Rockhampton', - 6174927 => 'Rockhampton', - 6174928 => 'Rockhampton', 61749290 => 'Westwood', 61749291 => 'Westwood', 61749292 => 'Connors Range', @@ -33605,16 +28673,9 @@ 61749297 => 'Glenden', 61749298 => 'Koumala', 61749299 => 'Calen', - 61749300 => 'Rockhampton', - 61749301 => 'Rockhampton', + 6174930 => 'Rockhampton', 61749302 => 'Yeppoon', 61749303 => 'Westwood', - 61749304 => 'Rockhampton', - 61749305 => 'Rockhampton', - 61749306 => 'Rockhampton', - 61749307 => 'Rockhampton', - 61749308 => 'Rockhampton', - 61749309 => 'Rockhampton', 6174931 => 'Rockhampton', 6174932 => 'Rockhampton', 61749330 => 'Yeppoon', @@ -33679,29 +28740,15 @@ 61749407 => 'Mackay', 61749408 => 'Lethebrook', 61749409 => 'Sarina', - 61749410 => 'Moranbah', + 6174941 => 'Moranbah', 61749411 => 'Dysart', 61749412 => 'Dysart', - 61749413 => 'Moranbah', - 61749414 => 'Moranbah', - 61749415 => 'Moranbah', - 61749416 => 'Moranbah', - 61749417 => 'Moranbah', - 61749418 => 'Moranbah', - 61749419 => 'Moranbah', 6174942 => 'Mackay', 6174943 => 'Sarina', 6174944 => 'Mackay', - 61749450 => 'Proserpine', - 61749451 => 'Proserpine', - 61749452 => 'Proserpine', - 61749453 => 'Proserpine', - 61749454 => 'Proserpine', - 61749455 => 'Proserpine', - 61749456 => 'Proserpine', + 6174945 => 'Proserpine', 61749457 => 'Dingo Beach', 61749458 => 'Dingo Beach', - 61749459 => 'Proserpine', 6174946 => 'Cannon Valley', 61749470 => 'Proserpine', 61749471 => 'Proserpine', @@ -33748,14 +28795,8 @@ 61749548 => 'Mackay', 61749549 => 'Mackay', 6174955 => 'Mackay', + 6174956 => 'Sarina', 61749560 => 'St Lawrence', - 61749561 => 'Sarina', - 61749562 => 'Sarina', - 61749563 => 'Sarina', - 61749564 => 'Sarina', - 61749565 => 'Sarina', - 61749566 => 'Sarina', - 61749567 => 'Sarina', 61749568 => 'Connors Range', 61749569 => 'St Lawrence', 6174957 => 'Mackay', @@ -33811,16 +28852,11 @@ 61749647 => 'Proserpine', 61749648 => 'Sarina', 61749649 => 'Sarina', + 6174965 => 'Mackay', 61749650 => 'Gladstone', 61749651 => 'Gladstone', 61749652 => 'Gladstone', 61749653 => 'Cannon Valley', - 61749654 => 'Mackay', - 61749655 => 'Mackay', - 61749656 => 'Mackay', - 61749657 => 'Mackay', - 61749658 => 'Mackay', - 61749659 => 'Mackay', 61749660 => 'Yakapari', 61749661 => 'Yakapari', 61749662 => 'Yakapari', @@ -33841,39 +28877,17 @@ 61749677 => 'Cannon Valley', 61749678 => 'Sarina', 61749679 => 'Moranbah', - 61749680 => 'Mackay', - 61749681 => 'Mackay', - 61749682 => 'Mackay', - 61749683 => 'Mackay', - 61749684 => 'Mackay', - 61749685 => 'Mackay', - 61749686 => 'Mackay', + 6174968 => 'Mackay', 61749687 => 'Walkerston', 61749688 => 'Moranbah', 61749689 => 'Dysart', - 61749690 => 'Mackay', - 61749691 => 'Mackay', - 61749692 => 'Mackay', - 61749693 => 'Mackay', - 61749694 => 'Mackay', - 61749695 => 'Mackay', - 61749696 => 'Mackay', - 61749697 => 'Mackay', + 6174969 => 'Mackay', 61749698 => 'Cannon Valley', 61749699 => 'Cannon Valley', - 61749700 => 'Gladstone', - 61749701 => 'Gladstone', + 617497 => 'Gladstone', 61749702 => 'Mount Larcom', - 61749703 => 'Gladstone', 61749704 => 'Benaraby', 61749705 => 'Miriam Vale', - 61749706 => 'Gladstone', - 61749707 => 'Gladstone', - 61749708 => 'Gladstone', - 61749709 => 'Gladstone', - 6174971 => 'Gladstone', - 6174972 => 'Gladstone', - 6174973 => 'Gladstone', 61749740 => 'Ubobo', 61749741 => 'Ubobo', 61749742 => 'Turkey Beach', @@ -33884,39 +28898,20 @@ 61749747 => 'Agnes Water', 61749748 => 'Gayfield', 61749749 => 'Agnes Water', + 6174975 => 'Calliope', 61749750 => 'Benaraby', 61749751 => 'Mount Larcom', - 61749752 => 'Gladstone', 61749753 => 'Mount Larcom', - 61749754 => 'Calliope', - 61749755 => 'Calliope', - 61749756 => 'Calliope', - 61749757 => 'Calliope', - 61749758 => 'Calliope', - 61749759 => 'Calliope', - 6174976 => 'Gladstone', 61749770 => 'Cannon Valley', 61749771 => 'Yeppoon', 61749772 => 'Byfield', 61749773 => 'Byfield', 61749774 => 'Rockhampton', 61749775 => 'Mackay', - 61749776 => 'Gladstone', - 61749777 => 'Gladstone', - 61749778 => 'Gladstone', - 61749779 => 'Gladstone', - 6174978 => 'Gladstone', - 6174979 => 'Gladstone', - 61749800 => 'Emerald', + 6174980 => 'Emerald', 61749801 => 'Blackwater', 61749802 => 'Clermont', - 61749803 => 'Emerald', - 61749804 => 'Emerald', 61749805 => 'Blackwater', - 61749806 => 'Emerald', - 61749807 => 'Emerald', - 61749808 => 'Emerald', - 61749809 => 'Emerald', 61749810 => 'Gemfields', 61749811 => 'Gemfields', 61749812 => 'Middlemount', @@ -33927,15 +28922,10 @@ 61749817 => 'Tieri', 61749818 => 'Willows', 61749819 => 'Alpha', - 61749820 => 'Emerald', - 61749821 => 'Emerald', - 61749822 => 'Emerald', - 61749823 => 'Emerald', - 61749824 => 'Emerald', + 6174982 => 'Emerald', 61749825 => 'Blackwater', 61749826 => 'Blackwater', 61749827 => 'Blackwater', - 61749828 => 'Emerald', 61749829 => 'Blackwater', 61749830 => 'Clermont', 61749831 => 'Clermont', @@ -33967,26 +28957,16 @@ 61749857 => 'Middlemount', 61749858 => 'Middlemount', 61749859 => 'Middlemount', - 61749860 => 'Blackwater', - 61749861 => 'Blackwater', - 61749862 => 'Blackwater', - 61749863 => 'Blackwater', + 6174986 => 'Blackwater', 61749864 => 'Capella', - 61749865 => 'Blackwater', 61749866 => 'Mackay', 61749867 => 'Emerald', 61749868 => 'Emerald', - 61749869 => 'Blackwater', + 6174987 => 'Emerald', 61749870 => 'Alpha', 61749871 => 'Blackwater', 61749872 => 'Bingegang', 61749873 => 'Bingegang/Nogoa', - 61749874 => 'Emerald', - 61749875 => 'Emerald', - 61749876 => 'Emerald', - 61749877 => 'Emerald', - 61749878 => 'Emerald', - 61749879 => 'Emerald', 61749880 => 'Emerald', 61749881 => 'Emerald', 61749882 => 'Emerald', @@ -34028,12 +29008,7 @@ 61749918 => 'Mount Morgan', 61749919 => 'Gemfields', 6174992 => 'Biloela', - 61749930 => 'Theodore', - 61749931 => 'Theodore', - 61749932 => 'Theodore', - 61749933 => 'Theodore', - 61749934 => 'Theodore', - 61749935 => 'Theodore', + 6174993 => 'Theodore', 61749936 => 'Nathan Gorge', 61749937 => 'Cracow', 61749938 => 'Biloela', @@ -34059,14 +29034,7 @@ 61749967 => 'Zamia Creek', 61749968 => 'Zamia Creek', 61749969 => 'Zamia Creek', - 61749970 => 'Moura', - 61749971 => 'Moura', - 61749972 => 'Moura', - 61749973 => 'Moura', - 61749974 => 'Moura', - 61749975 => 'Moura', - 61749976 => 'Moura', - 61749977 => 'Moura', + 6174997 => 'Moura', 61749978 => 'Gemfields', 61749979 => 'Gemfields', 61749980 => 'Baralaba', @@ -34200,16 +29168,11 @@ 61752117 => 'Upper Widgee', 61752118 => 'Wolvi', 61752119 => 'Woodbine', + 6175212 => 'Caloundra', 61752120 => 'Woolooga', 61752121 => 'Caboolture', 61752122 => 'Caboolture', 61752123 => 'Caboolture', - 61752124 => 'Caloundra', - 61752125 => 'Caloundra', - 61752126 => 'Caloundra', - 61752127 => 'Caloundra', - 61752128 => 'Caloundra', - 61752129 => 'Caloundra', 61752130 => 'Caloundra', 61752131 => 'Gympie', 61752132 => 'Gympie', @@ -34269,13 +29232,7 @@ 61752937 => 'Nambour', 61752938 => 'Nambour', 61752939 => 'Nambour', - 61752940 => 'Nambour', - 61752941 => 'Nambour', - 61752942 => 'Nambour', - 61752943 => 'Nambour', - 61752944 => 'Nambour', - 61752945 => 'Nambour', - 61752946 => 'Nambour', + 6175294 => 'Nambour', 61752947 => 'Caboolture', 61752948 => 'Caboolture', 61752949 => 'Caboolture', @@ -34409,15 +29366,9 @@ 61753127 => 'Wolvi', 61753128 => 'Woolooga', 61753129 => 'Cooroy', + 6175313 => 'Nambour', 61753130 => 'Kenilworth', - 61753131 => 'Nambour', 61753132 => 'Noosaville', - 61753133 => 'Nambour', - 61753134 => 'Nambour', - 61753135 => 'Nambour', - 61753136 => 'Nambour', - 61753137 => 'Nambour', - 61753138 => 'Nambour', 61753139 => 'Woodford', 61753140 => 'Coominya', 61753141 => 'Caloundra', @@ -34835,14 +29786,7 @@ 61753727 => 'Noosaville', 61753728 => 'Noosaville', 61753729 => 'Noosaville', - 61753730 => 'Nambour', - 61753731 => 'Nambour', - 61753732 => 'Nambour', - 61753733 => 'Nambour', - 61753734 => 'Nambour', - 61753735 => 'Nambour', - 61753736 => 'Nambour', - 61753737 => 'Nambour', + 6175373 => 'Nambour', 61753738 => 'Noosaville', 61753739 => 'Noosaville', 61753740 => 'Nambour', @@ -34864,7 +29808,8 @@ 61753772 => 'Noosaville', 61753811 => 'Nambour', 6175390 => 'Caloundra', - 6175400 => 'Nambour', + 61754000 => 'Nambour', + 61754001 => 'Nambour', 61754002 => 'Nambour', 61754003 => 'Ballugan', 61754004 => 'Boonah', @@ -34873,16 +29818,11 @@ 61754007 => 'Coominya', 61754008 => 'Cooroy', 61754009 => 'Crossdale', + 6175401 => 'Kia Ora', 61754010 => 'Imbil', 61754011 => 'Imbil', 61754012 => 'Imbil', 61754013 => 'Imbil', - 61754014 => 'Kia Ora', - 61754015 => 'Kia Ora', - 61754016 => 'Kia Ora', - 61754017 => 'Kia Ora', - 61754018 => 'Kia Ora', - 61754019 => 'Kia Ora', 61754020 => 'Esk', 61754021 => 'Gatton', 61754022 => 'Gunalda', @@ -34936,26 +29876,13 @@ 61754088 => 'Caloundra', 61754089 => 'Esk', 6175409 => 'Nambour', - 61754100 => 'Harrisville', - 61754101 => 'Harrisville', - 61754102 => 'Harrisville', - 61754103 => 'Harrisville', - 61754104 => 'Harrisville', - 61754105 => 'Harrisville', - 61754106 => 'Harrisville', + 6175410 => 'Harrisville', 61754107 => 'Kalbar', 61754108 => 'Kalbar', - 61754109 => 'Harrisville', - 61754110 => 'Laidley', - 61754111 => 'Laidley', - 61754112 => 'Laidley', - 61754113 => 'Laidley', - 61754114 => 'Laidley', - 61754115 => 'Laidley', + 6175411 => 'Laidley', 61754116 => 'Rosevale', 61754117 => 'Thornton', 61754118 => 'Woodbine', - 61754119 => 'Laidley', 61754120 => 'Caloundra', 61754121 => 'Nambour', 61754122 => 'Noosaville', @@ -35078,38 +30005,18 @@ 61754257 => 'Lowood', 61754258 => 'Lowood', 61754259 => 'Lowood', + 6175426 => 'Lowood', 61754260 => 'Crossdale', - 61754261 => 'Lowood', - 61754262 => 'Lowood', - 61754263 => 'Lowood', 61754264 => 'Coominya', 61754265 => 'Coominya', - 61754266 => 'Lowood', - 61754267 => 'Lowood', - 61754268 => 'Lowood', - 61754269 => 'Lowood', 6175427 => 'Lowood', 6175428 => 'Caboolture', - 61754290 => 'Caboolture', - 61754291 => 'Caboolture', - 61754292 => 'Caboolture', - 61754293 => 'Caboolture', - 61754294 => 'Caboolture', - 61754295 => 'Caboolture', + 6175429 => 'Caboolture', 61754296 => 'Maleny', - 61754297 => 'Caboolture', - 61754298 => 'Caboolture', - 61754299 => 'Caboolture', - 61754300 => 'Nambour', - 61754301 => 'Nambour', - 61754302 => 'Nambour', - 61754303 => 'Nambour', - 61754304 => 'Nambour', + 6175430 => 'Nambour', 61754305 => 'Noosaville', 61754306 => 'Noosaville', 61754307 => 'Noosaville', - 61754308 => 'Nambour', - 61754309 => 'Nambour', 6175431 => 'Caboolture', 6175432 => 'Caboolture', 6175433 => 'Caboolture', @@ -35128,16 +30035,9 @@ 6175437 => 'Caloundra', 6175438 => 'Caloundra', 6175439 => 'Caloundra', + 6175440 => 'Noosaville', 61754400 => 'Kenilworth', 61754401 => 'Cooroy', - 61754402 => 'Noosaville', - 61754403 => 'Noosaville', - 61754404 => 'Noosaville', - 61754405 => 'Noosaville', - 61754406 => 'Noosaville', - 61754407 => 'Noosaville', - 61754408 => 'Noosaville', - 61754409 => 'Noosaville', 6175441 => 'Nambour', 61754420 => 'Nambour', 61754421 => 'Nambour', @@ -35152,13 +30052,8 @@ 6175443 => 'Nambour', 6175444 => 'Nambour', 6175445 => 'Nambour', + 6175446 => 'Noosaville', 61754460 => 'Kenilworth', - 61754461 => 'Noosaville', - 61754462 => 'Noosaville', - 61754463 => 'Noosaville', - 61754464 => 'Noosaville', - 61754465 => 'Noosaville', - 61754466 => 'Noosaville', 61754467 => 'Cooroy', 61754468 => 'Cooroy', 61754469 => 'Kenilworth', @@ -35172,36 +30067,19 @@ 61754477 => 'Cooroy', 61754478 => 'Cooroy', 61754479 => 'Cooroy', + 6175448 => 'Nambour', 61754480 => 'Noosaville', 61754481 => 'Noosaville', 61754482 => 'Noosaville', 61754483 => 'Noosaville', - 61754484 => 'Nambour', - 61754485 => 'Nambour', - 61754486 => 'Nambour', - 61754487 => 'Nambour', - 61754488 => 'Nambour', - 61754489 => 'Nambour', 6175449 => 'Noosaville', - 6175450 => 'Nambour', - 6175451 => 'Nambour', - 6175452 => 'Nambour', - 6175453 => 'Nambour', + 617545 => 'Nambour', + 6175454 => 'Cooroy', 61754540 => 'Kenilworth', 61754541 => 'Kenilworth', 61754542 => 'Kenilworth', 61754543 => 'Kenilworth', - 61754544 => 'Cooroy', - 61754545 => 'Cooroy', - 61754546 => 'Cooroy', - 61754547 => 'Cooroy', - 61754548 => 'Cooroy', - 61754549 => 'Cooroy', 6175455 => 'Noosaville', - 6175456 => 'Nambour', - 6175457 => 'Nambour', - 6175458 => 'Nambour', - 6175459 => 'Nambour', 61754600 => 'Gatton', 61754601 => 'Gatton', 61754602 => 'Gatton', @@ -35213,22 +30091,9 @@ 61754608 => 'Rosewood', 61754609 => 'Rosewood', 6175461 => 'Rosewood', - 61754620 => 'Gatton', - 61754621 => 'Gatton', - 61754622 => 'Gatton', - 61754623 => 'Gatton', - 61754624 => 'Gatton', - 61754625 => 'Gatton', - 61754626 => 'Gatton', - 61754627 => 'Gatton', - 61754628 => 'Gatton', + 6175462 => 'Gatton', 61754629 => 'Woodbine', - 61754630 => 'Boonah', - 61754631 => 'Boonah', - 61754632 => 'Boonah', - 61754633 => 'Boonah', - 61754634 => 'Boonah', - 61754635 => 'Boonah', + 6175463 => 'Boonah', 61754636 => 'Maroon', 61754637 => 'Kalbar', 61754638 => 'Kalbar', @@ -35243,15 +30108,7 @@ 61754647 => 'Harrisville', 61754648 => 'Harrisville', 61754649 => 'Rosevale', - 61754650 => 'Laidley', - 61754651 => 'Laidley', - 61754652 => 'Laidley', - 61754653 => 'Laidley', - 61754654 => 'Laidley', - 61754655 => 'Laidley', - 61754656 => 'Laidley', - 61754657 => 'Laidley', - 61754658 => 'Laidley', + 6175465 => 'Laidley', 61754659 => 'Thornton', 61754660 => 'Gatton', 61754661 => 'Gatton', @@ -35263,23 +30120,11 @@ 61754667 => 'Thornton', 61754668 => 'Laidley', 61754669 => 'Laidley', - 61754670 => 'Rosewood', + 6175467 => 'Rosewood', 61754671 => 'Harrisville', 61754672 => 'Harrisville', - 61754673 => 'Rosewood', - 61754674 => 'Rosewood', - 61754675 => 'Rosewood', - 61754676 => 'Rosewood', - 61754677 => 'Rosewood', - 61754678 => 'Rosewood', - 61754679 => 'Rosewood', 6175468 => 'Gatton', - 61754690 => 'Boonah', - 61754691 => 'Boonah', - 61754692 => 'Boonah', - 61754693 => 'Boonah', - 61754694 => 'Boonah', - 61754695 => 'Boonah', + 6175469 => 'Boonah', 61754696 => 'Maroon', 61754697 => 'Maroon', 61754698 => 'Kalbar', @@ -35295,16 +30140,9 @@ 61754708 => 'Nambour', 61754709 => 'Nambour', 6175471 => 'Noosaville', - 61754720 => 'Cooroy', - 61754721 => 'Cooroy', - 61754722 => 'Cooroy', + 6175472 => 'Cooroy', 61754723 => 'Kenilworth', 61754724 => 'Kenilworth', - 61754725 => 'Cooroy', - 61754726 => 'Cooroy', - 61754727 => 'Cooroy', - 61754728 => 'Cooroy', - 61754729 => 'Cooroy', 6175473 => 'Noosaville', 6175474 => 'Noosaville', 6175475 => 'Nambour', @@ -35312,14 +30150,8 @@ 6175477 => 'Nambour', 6175478 => 'Nambour', 6175479 => 'Nambour', + 6175480 => 'Gympie', 61754800 => 'Kia Ora', - 61754801 => 'Gympie', - 61754802 => 'Gympie', - 61754803 => 'Gympie', - 61754804 => 'Gympie', - 61754805 => 'Gympie', - 61754806 => 'Gympie', - 61754807 => 'Gympie', 61754808 => 'Pomona', 61754809 => 'Imbil', 6175481 => 'Gympie', @@ -35335,26 +30167,12 @@ 61754847 => 'Woolooga', 61754848 => 'Woolooga', 61754849 => 'Upper Widgee', - 61754850 => 'Pomona', - 61754851 => 'Pomona', - 61754852 => 'Pomona', - 61754853 => 'Pomona', - 61754854 => 'Pomona', - 61754855 => 'Pomona', - 61754856 => 'Pomona', + 6175485 => 'Pomona', 61754857 => 'Gunalda', - 61754858 => 'Pomona', - 61754859 => 'Pomona', - 61754860 => 'Kia Ora', + 6175486 => 'Kia Ora', 61754861 => 'Woolooga', - 61754862 => 'Kia Ora', - 61754863 => 'Kia Ora', - 61754864 => 'Kia Ora', - 61754865 => 'Kia Ora', 61754866 => 'Wolvi', 61754867 => 'Wolvi', - 61754868 => 'Kia Ora', - 61754869 => 'Kia Ora', 61754870 => 'Pomona', 61754871 => 'Pomona', 61754872 => 'Kilkivan', @@ -35376,29 +30194,16 @@ 61754888 => 'Gunalda', 61754889 => 'Gunalda', 6175489 => 'Gympie', - 61754900 => 'Caboolture', - 61754901 => 'Caboolture', + 6175490 => 'Caboolture', 61754902 => 'Caloundra', - 61754903 => 'Caboolture', - 61754904 => 'Caboolture', 61754905 => 'Caloundra', - 61754906 => 'Caboolture', - 61754907 => 'Caboolture', - 61754908 => 'Caboolture', - 61754909 => 'Caboolture', 6175491 => 'Caloundra', 6175492 => 'Caloundra', 6175493 => 'Caloundra', - 61754940 => 'Caloundra', - 61754941 => 'Caloundra', + 6175494 => 'Caloundra', 61754942 => 'Maleny', 61754943 => 'Maleny', 61754944 => 'Maleny', - 61754945 => 'Caloundra', - 61754946 => 'Caloundra', - 61754947 => 'Caloundra', - 61754948 => 'Caloundra', - 61754949 => 'Caloundra', 6175495 => 'Caboolture', 61754960 => 'Caloundra', 61754961 => 'Woodford', @@ -35410,26 +30215,13 @@ 61754967 => 'Caboolture', 61754968 => 'Caboolture', 61754969 => 'Caloundra', - 61754970 => 'Caboolture', + 6175497 => 'Caboolture', 61754971 => 'Kilcoy', 61754972 => 'Kilcoy', 61754973 => 'Jimna', - 61754974 => 'Caboolture', - 61754975 => 'Caboolture', - 61754976 => 'Caboolture', - 61754977 => 'Caboolture', - 61754978 => 'Caboolture', - 61754979 => 'Caboolture', - 61754980 => 'Caboolture', + 6175498 => 'Caboolture', 61754981 => 'Kilcoy', - 61754982 => 'Caboolture', - 61754983 => 'Caboolture', 61754984 => 'Kilcoy', - 61754985 => 'Caboolture', - 61754986 => 'Caboolture', - 61754987 => 'Caboolture', - 61754988 => 'Caboolture', - 61754989 => 'Caboolture', 61754990 => 'Caboolture', 61754991 => 'Caboolture', 61754992 => 'Caboolture', @@ -35440,16 +30232,11 @@ 61754997 => 'Caloundra', 61754998 => 'Maleny', 61754999 => 'Maleny', - 6175500 => 'Southport', - 6175501 => 'Southport', - 6175502 => 'Southport', - 6175503 => 'Southport', - 6175504 => 'Southport', + 617550 => 'Southport', 6175505 => 'Tamborine Mountain', 6175506 => 'Tweed Heads', 6175507 => 'Tweed Heads', 6175508 => 'Tweed Heads', - 6175509 => 'Southport', 6175510 => 'Southport', 6175511 => 'Southport', 6175512 => 'Southport', @@ -35496,24 +30283,14 @@ 61755188 => 'Beaudesert', 61755189 => 'Beaudesert', 6175519 => 'Southport', - 6175520 => 'Tweed Heads', - 6175521 => 'Tweed Heads', - 6175522 => 'Tweed Heads', - 6175523 => 'Tweed Heads', - 6175524 => 'Tweed Heads', - 6175525 => 'Tweed Heads', + 617552 => 'Tweed Heads', 6175526 => 'Southport', 6175527 => 'Southport', 6175528 => 'Southport', 6175529 => 'Southport', + 6175530 => 'Tweed Heads', 61755300 => 'Southport', 61755301 => 'Southport', - 61755302 => 'Tweed Heads', - 61755303 => 'Tweed Heads', - 61755304 => 'Tweed Heads', - 61755305 => 'Tweed Heads', - 61755306 => 'Tweed Heads', - 61755307 => 'Tweed Heads', 61755308 => 'Southport', 61755309 => 'Southport', 6175531 => 'Southport', @@ -35544,73 +30321,31 @@ 61755407 => 'Ormeau', 61755408 => 'Ormeau', 61755409 => 'Ormeau', - 61755410 => 'Beaudesert', - 61755411 => 'Beaudesert', - 61755412 => 'Beaudesert', - 61755413 => 'Beaudesert', - 61755414 => 'Beaudesert', - 61755415 => 'Beaudesert', + 6175541 => 'Beaudesert', 61755416 => 'Tamborine Mountain', 61755417 => 'Tamborine Mountain', 61755418 => 'Tamborine Mountain', - 61755419 => 'Beaudesert', 6175542 => 'Beaudesert', - 61755430 => 'Tamborine Mountain', + 6175543 => 'Tamborine Mountain', 61755431 => 'Jimboomba', 61755432 => 'Jimboomba', 61755433 => 'Jimboomba', - 61755434 => 'Tamborine Mountain', - 61755435 => 'Tamborine Mountain', - 61755436 => 'Tamborine Mountain', - 61755437 => 'Tamborine Mountain', - 61755438 => 'Tamborine Mountain', - 61755439 => 'Tamborine Mountain', + 6175544 => 'Rathdowney', 61755440 => 'Kerry', - 61755441 => 'Rathdowney', - 61755442 => 'Rathdowney', - 61755443 => 'Rathdowney', - 61755444 => 'Rathdowney', - 61755445 => 'Rathdowney', - 61755446 => 'Rathdowney', 61755447 => 'Kerry', 61755448 => 'Kerry', 61755449 => 'Kerry', - 61755450 => 'Tamborine Mountain', - 61755451 => 'Tamborine Mountain', - 61755452 => 'Tamborine Mountain', - 61755453 => 'Tamborine Mountain', - 61755454 => 'Tamborine Mountain', - 61755455 => 'Tamborine Mountain', - 61755456 => 'Tamborine Mountain', - 61755457 => 'Tamborine Mountain', + 6175545 => 'Tamborine Mountain', 61755458 => 'Beechmont', 61755459 => 'Beechmont', + 6175546 => 'Ormeau', 61755460 => 'Jimboomba', - 61755461 => 'Ormeau', - 61755462 => 'Ormeau', - 61755463 => 'Ormeau', - 61755464 => 'Ormeau', - 61755465 => 'Ormeau', - 61755466 => 'Ormeau', - 61755467 => 'Ormeau', - 61755468 => 'Ormeau', 61755469 => 'Jimboomba', - 61755470 => 'Ormeau', - 61755471 => 'Ormeau', - 61755472 => 'Ormeau', - 61755473 => 'Ormeau', - 61755474 => 'Ormeau', - 61755475 => 'Ormeau', - 61755476 => 'Ormeau', + 6175547 => 'Ormeau', 61755477 => 'Jimboomba', 61755478 => 'Jimboomba', 61755479 => 'Jimboomba', - 61755480 => 'Beechmont', - 61755481 => 'Beechmont', - 61755482 => 'Beechmont', - 61755483 => 'Beechmont', - 61755484 => 'Beechmont', - 61755485 => 'Beechmont', + 6175548 => 'Beechmont', 61755486 => 'Jimboomba', 61755487 => 'Jimboomba', 61755488 => 'Jimboomba', @@ -35653,43 +30388,15 @@ 61755679 => 'Rathdowney', 6175568 => 'Tweed Heads', 6175569 => 'Tweed Heads', - 6175570 => 'Southport', - 6175571 => 'Southport', - 6175572 => 'Southport', - 6175573 => 'Southport', - 6175574 => 'Southport', - 6175575 => 'Southport', + 617557 => 'Southport', 6175576 => 'Tweed Heads', - 6175577 => 'Southport', - 6175578 => 'Southport', - 6175579 => 'Southport', - 6175580 => 'Southport', - 6175581 => 'Southport', - 6175582 => 'Southport', - 6175583 => 'Southport', - 6175584 => 'Southport', - 6175585 => 'Southport', + 617558 => 'Southport', 6175586 => 'Tweed Heads', 6175587 => 'Tweed Heads', - 6175588 => 'Southport', 6175589 => 'Tweed Heads', + 617559 => 'Southport', 6175590 => 'Tweed Heads', - 6175591 => 'Southport', - 6175592 => 'Southport', - 61755930 => 'Southport', - 61755931 => 'Southport', - 61755932 => 'Southport', - 61755933 => 'Southport', - 61755934 => 'Tweed Heads', - 61755935 => 'Tweed Heads', - 61755936 => 'Tweed Heads', - 61755937 => 'Tweed Heads', - 61755938 => 'Tweed Heads', - 61755939 => 'Tweed Heads', - 6175594 => 'Southport', - 6175595 => 'Southport', - 6175596 => 'Southport', - 6175597 => 'Southport', + 6175593 => 'Tweed Heads', 6175598 => 'Tweed Heads', 6175599 => 'Tweed Heads', 6175600 => 'Southport', @@ -35836,26 +30543,12 @@ 61756168 => 'Southport', 61756169 => 'Tamborine Mountain', 6175617 => 'Southport', - 61756180 => 'Southport', - 61756181 => 'Southport', - 61756182 => 'Southport', - 61756183 => 'Southport', - 61756184 => 'Southport', - 61756185 => 'Southport', + 6175618 => 'Southport', 61756186 => 'Tamborine Mountain', 61756187 => 'Tamborine Mountain', - 61756188 => 'Southport', - 61756189 => 'Southport', - 61756190 => 'Southport', - 61756191 => 'Southport', - 61756192 => 'Southport', + 6175619 => 'Southport', 61756193 => 'Tweed Heads', 61756194 => 'Beaudesert', - 61756195 => 'Southport', - 61756196 => 'Southport', - 61756197 => 'Southport', - 61756198 => 'Southport', - 61756199 => 'Southport', 61756200 => 'Southport', 61756201 => 'Southport', 61756202 => 'Southport', @@ -35879,25 +30572,11 @@ 6175627 => 'Southport', 6175628 => 'Southport', 6175629 => 'Southport', - 6175630 => 'Southport', + 617563 => 'Southport', 61756310 => 'Ormeau', 61756311 => 'Tweed Heads', - 61756312 => 'Southport', - 61756313 => 'Southport', - 61756314 => 'Southport', - 61756315 => 'Southport', - 61756316 => 'Southport', - 61756317 => 'Southport', - 61756318 => 'Southport', - 61756319 => 'Southport', - 6175632 => 'Southport', 6175633 => 'Tweed Heads', - 6175634 => 'Southport', - 6175635 => 'Southport', - 6175636 => 'Southport', 6175637 => 'Beaudesert', - 6175638 => 'Southport', - 6175639 => 'Southport', 6175640 => 'Beaudesert', 6175641 => 'Southport', 6175642 => 'Southport', @@ -35913,24 +30592,11 @@ 61756457 => 'Tweed Heads', 61756458 => 'Southport', 61756459 => 'Southport', + 6175646 => 'Southport', 61756460 => 'Jimboomba', 61756461 => 'Jimboomba', 61756462 => 'Jimboomba', - 61756463 => 'Southport', - 61756464 => 'Southport', - 61756465 => 'Southport', - 61756466 => 'Southport', - 61756467 => 'Southport', - 61756468 => 'Southport', - 61756469 => 'Southport', - 61756470 => 'Southport', - 61756471 => 'Southport', - 61756472 => 'Southport', - 61756473 => 'Southport', - 61756474 => 'Southport', - 61756475 => 'Southport', - 61756476 => 'Southport', - 61756477 => 'Southport', + 6175647 => 'Southport', 61756478 => 'Beaudesert', 61756479 => 'Beaudesert', 61756480 => 'Tweed Heads', @@ -35960,15 +30626,7 @@ 61756608 => 'Beaudesert', 61756609 => 'Southport', 6175661 => 'Southport', - 61756620 => 'Southport', - 61756621 => 'Southport', - 61756622 => 'Southport', - 61756623 => 'Southport', - 61756624 => 'Southport', - 61756625 => 'Southport', - 61756626 => 'Southport', - 61756627 => 'Southport', - 61756628 => 'Southport', + 6175662 => 'Southport', 61756629 => 'Tweed Heads', 61756630 => 'Tweed Heads', 61756631 => 'Tweed Heads', @@ -36009,16 +30667,11 @@ 6175679 => 'Southport', 6175680 => 'Southport', 6175687 => 'Southport', + 6175688 => 'Beaudesert', 61756880 => 'Southport', 61756881 => 'Southport', - 61756882 => 'Beaudesert', - 61756883 => 'Beaudesert', - 61756884 => 'Beaudesert', 61756885 => 'Tweed Heads', 61756886 => 'Tweed Heads', - 61756887 => 'Beaudesert', - 61756888 => 'Beaudesert', - 61756889 => 'Beaudesert', 61756890 => 'Southport', 61756891 => 'Southport', 61756892 => 'Southport', @@ -36298,16 +30951,7 @@ 61861534 => 'Perth', 61861535 => 'Perth', 61861536 => 'Perth', - 6186160 => 'Perth', - 6186161 => 'Perth', - 6186162 => 'Perth', - 6186163 => 'Perth', - 6186164 => 'Perth', - 6186165 => 'Perth', - 6186166 => 'Perth', - 6186167 => 'Perth', - 6186168 => 'Perth', - 6186169 => 'Perth', + 618616 => 'Perth', 61861700 => 'Rottnest', 61861701 => 'Rottnest', 61861702 => 'Spearwood', @@ -36364,28 +31008,13 @@ 6186199 => 'Herne Hill', 6186200 => 'Wanneroo', 6186201 => 'Wanneroo', - 61862020 => 'Wanneroo', - 61862021 => 'Wanneroo', - 61862022 => 'Wanneroo', - 61862023 => 'Wanneroo', + 6186202 => 'Wanneroo', 61862024 => 'Perth', 61862025 => 'Perth', - 61862026 => 'Wanneroo', - 61862027 => 'Wanneroo', - 61862028 => 'Wanneroo', - 61862029 => 'Wanneroo', 6186203 => 'Wanneroo', 6186204 => 'Wanneroo', - 61862050 => 'Wanneroo', - 61862051 => 'Wanneroo', - 61862052 => 'Wanneroo', + 6186205 => 'Wanneroo', 61862053 => 'Perth', - 61862054 => 'Wanneroo', - 61862055 => 'Wanneroo', - 61862056 => 'Wanneroo', - 61862057 => 'Wanneroo', - 61862058 => 'Wanneroo', - 61862059 => 'Wanneroo', 61862061 => 'Wanneroo', 61862062 => 'Wanneroo', 61862063 => 'Wanneroo', @@ -36395,30 +31024,16 @@ 61862067 => 'Wanneroo', 6186208 => 'Perth', 6186209 => 'Wanneroo', - 6186210 => 'Perth', - 6186211 => 'Perth', - 6186212 => 'Perth', - 6186213 => 'Perth', - 6186214 => 'Perth', + 618621 => 'Perth', 6186215 => 'Fremantle', - 6186216 => 'Perth', - 6186217 => 'Perth', - 6186218 => 'Perth', 6186219 => 'Fremantle', 6186220 => 'Perth', 6186221 => 'Fremantle', 6186222 => 'Perth', 6186223 => 'Fremantle', 6186224 => 'Perth', - 61862250 => 'Fremantle', - 61862251 => 'Fremantle', + 6186225 => 'Fremantle', 61862252 => 'Perth', - 61862253 => 'Fremantle', - 61862254 => 'Fremantle', - 61862255 => 'Fremantle', - 61862256 => 'Fremantle', - 61862257 => 'Fremantle', - 61862258 => 'Fremantle', 61862259 => 'Perth', 6186226 => 'Fremantle', 6186227 => 'Fremantle', @@ -36461,16 +31076,7 @@ 61862555 => 'Perth', 6186258 => 'Perth', 6186259 => 'Perth', - 6186260 => 'Perth', - 6186261 => 'Perth', - 6186262 => 'Perth', - 6186263 => 'Perth', - 6186264 => 'Perth', - 6186265 => 'Perth', - 6186266 => 'Perth', - 6186267 => 'Perth', - 6186268 => 'Perth', - 6186269 => 'Perth', + 618626 => 'Perth', 6186270 => 'Perth', 61862710 => 'Perth', 61862711 => 'Perth', @@ -36494,29 +31100,14 @@ 6186295 => 'Spearwood', 6186296 => 'Herne Hill', 6186297 => 'Herne Hill', - 61862980 => 'Kalamunda', + 6186298 => 'Kalamunda', 61862981 => 'Perth', 61862982 => 'Perth/Kalamunda', - 61862983 => 'Kalamunda', - 61862984 => 'Kalamunda', - 61862985 => 'Kalamunda', - 61862986 => 'Kalamunda', - 61862987 => 'Kalamunda', - 61862988 => 'Kalamunda', - 61862989 => 'Kalamunda', 6186299 => 'Kalamunda', 6186304 => 'Wanneroo', 61863050 => 'Wanneroo', - 6186310 => 'Perth', - 6186311 => 'Perth', + 618631 => 'Perth', 6186312 => 'Fremantle', - 6186313 => 'Perth', - 6186314 => 'Perth', - 6186315 => 'Perth', - 6186316 => 'Perth', - 6186317 => 'Perth', - 6186318 => 'Perth', - 6186319 => 'Perth', 6186320 => 'Perth', 6186321 => 'Perth', 6186322 => 'Perth', @@ -36538,25 +31129,13 @@ 6186350 => 'Perth', 61863555 => 'Perth', 61863556 => 'Perth', - 6186360 => 'Perth', - 61863610 => 'Perth', - 61863611 => 'Perth', + 618636 => 'Perth', 61863612 => 'Armadale', 61863613 => 'Herne Hill', 61863614 => 'Kalamunda', 61863615 => 'Rottnest', 61863616 => 'Spearwood', 61863617 => 'Wanneroo', - 61863618 => 'Perth', - 61863619 => 'Perth', - 6186362 => 'Perth', - 6186363 => 'Perth', - 6186364 => 'Perth', - 6186365 => 'Perth', - 6186366 => 'Perth', - 6186367 => 'Perth', - 6186368 => 'Perth', - 6186369 => 'Perth', 6186370 => 'Perth', 6186371 => 'Perth', 6186372 => 'Perth', @@ -36602,31 +31181,17 @@ 61864007 => 'Wanneroo', 61864008 => 'Wanneroo', 61864009 => 'Wanneroo', - 61864010 => 'Wanneroo', + 6186401 => 'Wanneroo', 61864011 => 'Rottnest', - 61864012 => 'Wanneroo', - 61864013 => 'Wanneroo', - 61864014 => 'Wanneroo', - 61864015 => 'Wanneroo', - 61864016 => 'Wanneroo', - 61864017 => 'Wanneroo', - 61864018 => 'Wanneroo', - 61864019 => 'Wanneroo', 61864020 => 'Wanneroo', 61864021 => 'Wanneroo', 61864022 => 'Wanneroo', 6186404 => 'Wanneroo', 6186406 => 'Wanneroo', + 6186414 => 'Fremantle', 61864140 => 'Spearwood/Fremantle', - 61864141 => 'Fremantle', - 61864142 => 'Fremantle', - 61864143 => 'Fremantle', 61864144 => 'Spearwood/Fremantle', - 61864145 => 'Fremantle', 61864146 => 'Fremantle/Spearwood', - 61864147 => 'Fremantle', - 61864148 => 'Fremantle', - 61864149 => 'Fremantle', 61864150 => 'Fremantle', 61864151 => 'Fremantle', 6186420 => 'Fremantle', @@ -36647,15 +31212,7 @@ 61864588 => 'Perth', 61864589 => 'Perth', 6186459 => 'Perth', - 6186460 => 'Perth', - 6186461 => 'Perth', - 6186462 => 'Perth', - 6186463 => 'Perth', - 6186464 => 'Perth', - 6186465 => 'Perth', - 6186466 => 'Perth', - 6186467 => 'Perth', - 6186468 => 'Perth', + 618646 => 'Perth', 6186469 => 'Kalamunda', 6186477 => 'Perth', 6186478 => 'Perth', @@ -37324,16 +31881,7 @@ 61870083 => 'Adelaide', 61870085 => 'Adelaide', 6187009 => 'Adelaide', - 6187070 => 'Adelaide', - 6187071 => 'Adelaide', - 6187072 => 'Adelaide', - 6187073 => 'Adelaide', - 6187074 => 'Adelaide', - 6187075 => 'Adelaide', - 6187076 => 'Adelaide', - 6187077 => 'Adelaide', - 6187078 => 'Adelaide', - 6187079 => 'Adelaide', + 618707 => 'Adelaide', 6187080 => 'Adelaide', 6187081 => 'Adelaide', 6187082 => 'Adelaide', @@ -37358,25 +31906,9 @@ 61871112 => 'Adelaide', 61871113 => 'Adelaide', 6187117 => 'Adelaide', - 61871200 => 'Adelaide', + 618712 => 'Adelaide', 61871201 => 'Woodside', - 61871202 => 'Adelaide', 61871203 => 'Mount Barker', - 61871204 => 'Adelaide', - 61871205 => 'Adelaide', - 61871206 => 'Adelaide', - 61871207 => 'Adelaide', - 61871208 => 'Adelaide', - 61871209 => 'Adelaide', - 6187121 => 'Adelaide', - 6187122 => 'Adelaide', - 6187123 => 'Adelaide', - 6187124 => 'Adelaide', - 6187125 => 'Adelaide', - 6187126 => 'Adelaide', - 6187127 => 'Adelaide', - 6187128 => 'Adelaide', - 6187129 => 'Adelaide', 61871300 => 'Adelaide', 61871301 => 'Adelaide', 61871302 => 'Adelaide', @@ -37402,16 +31934,10 @@ 61871847 => 'Mount Barker', 61871848 => 'Salisbury', 61871849 => 'Woodside', + 6187185 => 'Woodside', 61871850 => 'Mclaren Vale', 61871851 => 'Salisbury', - 61871852 => 'Woodside', 61871853 => 'Salisbury', - 61871854 => 'Woodside', - 61871855 => 'Woodside', - 61871856 => 'Woodside', - 61871857 => 'Woodside', - 61871858 => 'Woodside', - 61871859 => 'Woodside', 6187186 => 'Mclaren Vale', 6187187 => 'Mount Barker', 6187188 => 'Salisbury', @@ -37427,25 +31953,12 @@ 61872021 => 'Adelaide', 6187210 => 'Adelaide', 61872110 => 'Adelaide', - 6187220 => 'Adelaide', - 6187221 => 'Adelaide', - 6187222 => 'Adelaide', - 6187223 => 'Adelaide', - 6187224 => 'Adelaide', - 6187225 => 'Adelaide', - 6187226 => 'Adelaide', + 618722 => 'Adelaide', 6187227 => 'Woodside', 61872280 => 'Salisbury', 61872281 => 'Mclaren Vale', - 61872282 => 'Adelaide', 61872283 => 'Mount Barker', 61872284 => 'Woodside', - 61872285 => 'Adelaide', - 61872286 => 'Adelaide', - 61872287 => 'Adelaide', - 61872288 => 'Adelaide', - 61872289 => 'Adelaide', - 6187229 => 'Adelaide', 6187230 => 'Adelaide', 6187231 => 'Adelaide', 61872320 => 'Adelaide', @@ -37473,15 +31986,7 @@ 61872829 => 'Salisbury', 6187283 => 'Mclaren Vale', 6187284 => 'Salisbury', - 61872850 => 'Salisbury', - 61872851 => 'Salisbury', - 61872852 => 'Salisbury', - 61872853 => 'Salisbury', - 61872854 => 'Salisbury', - 61872855 => 'Salisbury', - 61872856 => 'Salisbury', - 61872857 => 'Salisbury', - 61872858 => 'Salisbury', + 6187285 => 'Salisbury', 61872859 => 'Mclaren Vale', 61872860 => 'Mclaren Vale', 61872861 => 'Mount Barker', @@ -37496,16 +32001,8 @@ 6187287 => 'Mount Barker', 6187288 => 'Mclaren Vale', 6187289 => 'Salisbury', - 6187320 => 'Adelaide', - 6187321 => 'Adelaide', - 6187322 => 'Adelaide', - 6187323 => 'Adelaide', - 6187324 => 'Adelaide', - 6187325 => 'Adelaide', - 6187326 => 'Adelaide', + 618732 => 'Adelaide', 6187327 => 'Woodside', - 6187328 => 'Adelaide', - 6187329 => 'Adelaide', 61873333 => 'Adelaide', 61873334 => 'Adelaide', 6187370 => 'Salisbury', @@ -37545,16 +32042,8 @@ 61874445 => 'Adelaide', 61874777 => 'Adelaide', 61874778 => 'Adelaide', + 6187480 => 'Salisbury', 61874800 => 'Mclaren Vale', - 61874801 => 'Salisbury', - 61874802 => 'Salisbury', - 61874803 => 'Salisbury', - 61874804 => 'Salisbury', - 61874805 => 'Salisbury', - 61874806 => 'Salisbury', - 61874807 => 'Salisbury', - 61874808 => 'Salisbury', - 61874809 => 'Salisbury', 61874810 => 'Woodside', 61874812 => 'Woodside', 61874815 => 'Woodside', @@ -38495,16 +32984,10 @@ 61877247 => 'Tilley Swamp', 61877248 => 'Tintinara', 61877249 => 'Western Flat', + 6187725 => 'Mount Gambier', 61877250 => 'Willalooka', 61877251 => 'Wirrega', 61877252 => 'Wrattonbully', - 61877253 => 'Mount Gambier', - 61877254 => 'Mount Gambier', - 61877255 => 'Mount Gambier', - 61877256 => 'Mount Gambier', - 61877257 => 'Mount Gambier', - 61877258 => 'Mount Gambier', - 61877259 => 'Mount Gambier', 61878000 => 'Alford', 61878001 => 'Ardrossan', 61878002 => 'Arthurton', @@ -38871,13 +33354,7 @@ 61879268 => 'Darwin', 61879269 => 'Darwin', 6187927 => 'Darwin', - 61879280 => 'Darwin', - 61879281 => 'Darwin', - 61879282 => 'Darwin', - 61879283 => 'Darwin', - 61879284 => 'Darwin', - 61879285 => 'Darwin', - 61879286 => 'Darwin', + 6187928 => 'Darwin', 61879287 => 'Alice Springs', 61879288 => 'Alice Springs', 61879289 => 'Alice Springs', @@ -38938,7 +33415,6 @@ 61879799 => 'Darwin', 6187980 => 'Darwin', 6187988 => 'Darwin', - 61879889 => 'Darwin', 6187989 => 'Darwin', 61879994 => 'Batchelor', 61879995 => 'Batchelor', @@ -39249,31 +33725,10 @@ 61881902 => 'Adelaide', 6188193 => 'Adelaide', 6188198 => 'Adelaide', - 6188200 => 'Adelaide', - 6188201 => 'Adelaide', - 6188202 => 'Adelaide', - 6188203 => 'Adelaide', - 6188204 => 'Adelaide', - 6188205 => 'Adelaide', - 6188206 => 'Adelaide', - 61882070 => 'Adelaide', - 61882071 => 'Adelaide', - 61882072 => 'Adelaide', + 618820 => 'Adelaide', 61882073 => 'Mclaren Vale', - 61882074 => 'Adelaide', - 61882075 => 'Adelaide', - 61882076 => 'Adelaide', - 61882077 => 'Adelaide', - 61882078 => 'Adelaide', 61882079 => 'Salisbury', - 6188208 => 'Adelaide', - 61882090 => 'Salisbury', - 61882091 => 'Salisbury', - 61882092 => 'Salisbury', - 61882093 => 'Salisbury', - 61882094 => 'Salisbury', - 61882095 => 'Salisbury', - 61882096 => 'Salisbury', + 6188209 => 'Salisbury', 61882097 => 'Woodside', 61882098 => 'Woodside', 61882099 => 'Woodside', @@ -39289,36 +33744,15 @@ 6188246 => 'Adelaide', 6188248 => 'Adelaide', 6188249 => 'Adelaide', - 6188250 => 'Salisbury', - 6188251 => 'Salisbury', - 6188252 => 'Salisbury', + 618825 => 'Salisbury', 6188253 => 'Adelaide', - 6188254 => 'Salisbury', - 6188255 => 'Salisbury', - 6188256 => 'Salisbury', 6188257 => 'Adelaide', - 6188258 => 'Salisbury', - 6188259 => 'Salisbury', 618826 => 'Adelaide', 618827 => 'Adelaide', 618828 => 'Salisbury', 618829 => 'Adelaide', - 6188300 => 'Adelaide', - 61883010 => 'Adelaide', - 61883011 => 'Adelaide', - 61883012 => 'Adelaide', - 61883013 => 'Adelaide', - 61883014 => 'Adelaide', - 61883015 => 'Adelaide', - 61883016 => 'Adelaide', + 618830 => 'Adelaide', 61883017 => 'Mclaren Vale', - 61883018 => 'Adelaide', - 61883019 => 'Adelaide', - 6188302 => 'Adelaide', - 6188303 => 'Adelaide', - 6188304 => 'Adelaide', - 6188305 => 'Adelaide', - 6188306 => 'Adelaide', 61883070 => 'Mclaren Vale', 61883071 => 'Mclaren Vale', 61883072 => 'Mclaren Vale', @@ -39327,10 +33761,7 @@ 61883075 => 'Salisbury', 61883076 => 'Salisbury', 61883077 => 'Salisbury', - 61883078 => 'Adelaide', 61883079 => 'Salisbury', - 6188308 => 'Adelaide', - 6188309 => 'Adelaide', 6188310 => 'Adelaide', 6188311 => 'Adelaide', 6188312 => 'Adelaide', @@ -39350,68 +33781,35 @@ 6188327 => 'Mclaren Vale', 6188328 => 'Mclaren Vale', 6188329 => 'Mclaren Vale', - 6188330 => 'Adelaide', - 6188331 => 'Adelaide', - 6188332 => 'Adelaide', - 6188333 => 'Adelaide', - 6188334 => 'Adelaide', + 618833 => 'Adelaide', 6188335 => 'Salisbury', - 6188336 => 'Adelaide', - 6188337 => 'Adelaide', - 6188338 => 'Adelaide', - 6188339 => 'Adelaide', 618834 => 'Adelaide', 618835 => 'Adelaide', 618836 => 'Adelaide', 618837 => 'Adelaide', + 618838 => 'Mclaren Vale', 6188380 => 'Salisbury', - 6188381 => 'Mclaren Vale', - 6188382 => 'Mclaren Vale', - 6188383 => 'Mclaren Vale', - 6188384 => 'Mclaren Vale', 6188385 => 'Woodside', - 6188386 => 'Mclaren Vale', - 6188387 => 'Mclaren Vale', 6188388 => 'Mount Barker', 6188389 => 'Woodside', 6188390 => 'Adelaide', 6188391 => 'Mount Barker', 6188392 => 'Mclaren Vale', - 61883930 => 'Mount Barker', - 61883931 => 'Mount Barker', + 6188393 => 'Mount Barker', 61883932 => 'Salisbury', 61883933 => 'Salisbury', 61883934 => 'Salisbury', 61883935 => 'Salisbury', - 61883936 => 'Mount Barker', - 61883937 => 'Mount Barker', - 61883938 => 'Mount Barker', - 61883939 => 'Mount Barker', 6188394 => 'Adelaide', 6188395 => 'Adelaide', 6188396 => 'Adelaide', 6188397 => 'Adelaide', 6188398 => 'Mount Barker', 6188399 => 'Mount Barker', - 6188400 => 'Adelaide', - 6188401 => 'Adelaide', - 6188402 => 'Adelaide', - 6188403 => 'Adelaide', - 6188404 => 'Adelaide', - 6188405 => 'Adelaide', - 61884060 => 'Adelaide', - 61884061 => 'Adelaide', - 61884062 => 'Adelaide', - 61884063 => 'Adelaide', - 61884064 => 'Adelaide', - 61884065 => 'Adelaide', + 618840 => 'Adelaide', 61884066 => 'Mclaren Vale', 61884067 => 'Mount Barker', 61884068 => 'Salisbury', - 61884069 => 'Adelaide', - 6188407 => 'Adelaide', - 6188408 => 'Adelaide', - 6188409 => 'Adelaide', 618841 => 'Adelaide', 618842 => 'Adelaide', 6188431 => 'Adelaide', @@ -39438,16 +33836,7 @@ 6188464 => 'Adelaide', 6188465 => 'Adelaide', 6188468 => 'Adelaide', - 6188470 => 'Adelaide', - 6188471 => 'Adelaide', - 6188472 => 'Adelaide', - 6188473 => 'Adelaide', - 6188474 => 'Adelaide', - 6188475 => 'Adelaide', - 6188476 => 'Adelaide', - 6188477 => 'Adelaide', - 6188478 => 'Adelaide', - 6188479 => 'Adelaide', + 618847 => 'Adelaide', 6188480 => 'Salisbury', 6188481 => 'Mount Barker', 6188482 => 'Salisbury', @@ -39659,22 +34048,12 @@ 61885197 => 'Tailem Bend', 61885198 => 'Tailem Bend', 61885199 => 'Windsor', - 61885200 => 'Two Wells', - 61885201 => 'Two Wells', - 61885202 => 'Two Wells', - 61885203 => 'Two Wells', - 61885204 => 'Two Wells', - 61885205 => 'Two Wells', + 6188520 => 'Two Wells', 61885206 => 'Gawler', 61885207 => 'Hamley Bridge', 61885208 => 'Riverton', 61885209 => 'Barmera', - 61885210 => 'Gawler', - 61885211 => 'Gawler', - 61885212 => 'Gawler', - 61885213 => 'Gawler', - 61885214 => 'Gawler', - 61885215 => 'Gawler', + 6188521 => 'Gawler', 61885216 => 'Freeling', 61885217 => 'Freeling', 61885218 => 'Hamley Bridge', @@ -39682,34 +34061,18 @@ 6188522 => 'Gawler', 6188523 => 'Gawler', 6188524 => 'Gawler', - 61885250 => 'Freeling', - 61885251 => 'Freeling', - 61885252 => 'Freeling', - 61885253 => 'Freeling', - 61885254 => 'Freeling', - 61885255 => 'Freeling', + 6188525 => 'Freeling', 61885256 => 'Gawler', 61885257 => 'Gawler', 61885258 => 'Gawler', 61885259 => 'Gawler', + 6188526 => 'Gawler', 61885260 => 'Mypolonga', 61885261 => 'Murray Bridge', 61885262 => 'Mannum', 61885263 => 'Karoonda', - 61885264 => 'Gawler', - 61885265 => 'Gawler', - 61885266 => 'Gawler', - 61885267 => 'Gawler', - 61885268 => 'Gawler', - 61885269 => 'Gawler', 6188527 => 'Mallala', - 61885280 => 'Hamley Bridge', - 61885281 => 'Hamley Bridge', - 61885282 => 'Hamley Bridge', - 61885283 => 'Hamley Bridge', - 61885284 => 'Hamley Bridge', - 61885285 => 'Hamley Bridge', - 61885286 => 'Hamley Bridge', + 6188528 => 'Hamley Bridge', 61885287 => 'Goolwa', 61885288 => 'Victor Harbor', 61885289 => 'Willunga', @@ -39745,12 +34108,7 @@ 61885337 => 'Two Wells', 61885338 => 'Two Wells', 61885339 => 'Murray Bridge', - 61885340 => 'Murray Bridge', - 61885341 => 'Murray Bridge', - 61885342 => 'Murray Bridge', - 61885343 => 'Murray Bridge', - 61885344 => 'Murray Bridge', - 61885345 => 'Murray Bridge', + 6188534 => 'Murray Bridge', 61885346 => 'Tanunda', 61885347 => 'Mantung', 61885348 => 'Mantung', @@ -39796,16 +34154,11 @@ 61885397 => 'Langhorne Creek', 61885398 => 'Milang', 61885399 => 'Strathalbyn', - 61885400 => 'Morgan', - 61885401 => 'Morgan', - 61885402 => 'Morgan', - 61885403 => 'Morgan', - 61885404 => 'Morgan', + 6188540 => 'Morgan', 61885405 => 'Blanchetown', 61885406 => 'Blanchetown', 61885407 => 'New Well', 61885408 => 'Blanchetown', - 61885409 => 'Morgan', 6188541 => 'Waikerie', 61885420 => 'Waikerie', 61885421 => 'Waikerie', @@ -39886,14 +34239,9 @@ 61885497 => 'Mount Pleasant', 61885498 => 'Robertstown', 61885499 => 'Sanderston', - 61885500 => 'Willunga', - 61885501 => 'Willunga', - 61885502 => 'Willunga', - 61885503 => 'Willunga', - 61885504 => 'Willunga', + 6188550 => 'Willunga', 61885505 => 'Yankalilla', 61885506 => 'Strathalbyn', - 61885507 => 'Willunga', 61885508 => 'Goolwa', 61885509 => 'Goolwa', 61885510 => 'Victor Harbor', @@ -39907,25 +34255,13 @@ 61885518 => 'Parndana', 61885519 => 'Karatta', 6188552 => 'Victor Harbor', - 61885530 => 'Kingscote', + 6188553 => 'Kingscote', 61885531 => 'Penneshaw', - 61885532 => 'Kingscote', - 61885533 => 'Kingscote', - 61885534 => 'Kingscote', - 61885535 => 'Kingscote', 61885536 => 'Penneshaw', 61885537 => 'Penneshaw', 61885538 => 'Penneshaw', - 61885539 => 'Kingscote', 6188554 => 'Victor Harbor', - 61885550 => 'Goolwa', - 61885551 => 'Goolwa', - 61885552 => 'Goolwa', - 61885553 => 'Goolwa', - 61885554 => 'Goolwa', - 61885555 => 'Goolwa', - 61885556 => 'Goolwa', - 61885557 => 'Goolwa', + 6188555 => 'Goolwa', 61885558 => 'Victor Harbor', 61885559 => 'Victor Harbor', 6188556 => 'Willunga', @@ -39961,26 +34297,15 @@ 61885617 => 'Walker Flat', 61885618 => 'Sedan', 61885619 => 'Swan Reach', - 61885620 => 'Tanunda', - 61885621 => 'Tanunda', - 61885622 => 'Tanunda', - 61885623 => 'Tanunda', - 61885624 => 'Tanunda', + 6188562 => 'Tanunda', 61885625 => 'Sedan', 61885626 => 'Sandleton', 61885627 => 'Bower', - 61885628 => 'Tanunda', - 61885629 => 'Tanunda', 6188563 => 'Tanunda', + 6188564 => 'Tanunda', 61885640 => 'Truro', - 61885641 => 'Tanunda', - 61885642 => 'Tanunda', - 61885643 => 'Tanunda', - 61885644 => 'Tanunda', 61885645 => 'Sedan', 61885646 => 'Sedan', - 61885647 => 'Tanunda', - 61885648 => 'Tanunda', 61885649 => 'Truro', 61885650 => 'Sedan', 61885651 => 'Sedan', @@ -40012,26 +34337,13 @@ 61885677 => 'Copeville', 61885678 => 'Culburra', 61885679 => 'Geranium', - 61885680 => 'Mount Pleasant', - 61885681 => 'Mount Pleasant', - 61885682 => 'Mount Pleasant', - 61885683 => 'Mount Pleasant', - 61885684 => 'Mount Pleasant', - 61885685 => 'Mount Pleasant', + 6188568 => 'Mount Pleasant', 61885686 => 'Tanunda', 61885687 => 'Tanunda', 61885688 => 'Tanunda', 61885689 => 'Tanunda', - 61885690 => 'Mannum', - 61885691 => 'Mannum', - 61885692 => 'Mannum', + 6188569 => 'Mannum', 61885693 => 'Sanderston', - 61885694 => 'Mannum', - 61885695 => 'Mannum', - 61885696 => 'Mannum', - 61885697 => 'Mannum', - 61885698 => 'Mannum', - 61885699 => 'Mannum', 61885700 => 'Swan Reach', 61885701 => 'Swan Reach', 61885702 => 'Swan Reach', @@ -40143,15 +34455,9 @@ 61885818 => 'Robertstown', 61885819 => 'Robertstown', 6188582 => 'Berri', + 6188583 => 'Berri', 61885830 => 'Barmera', - 61885831 => 'Berri', - 61885832 => 'Berri', - 61885833 => 'Berri', 61885834 => 'Barmera', - 61885835 => 'Berri', - 61885836 => 'Berri', - 61885837 => 'Berri', - 61885838 => 'Berri', 61885839 => 'Barmera', 6188584 => 'Loxton', 61885850 => 'Gurrai', @@ -40235,15 +34541,9 @@ 61885947 => 'Marama', 61885948 => 'Meningie', 61885949 => 'Meningie East', - 61885950 => 'Renmark', - 61885951 => 'Renmark', + 6188595 => 'Renmark', 61885952 => 'Berri', - 61885953 => 'Renmark', - 61885954 => 'Renmark', - 61885955 => 'Renmark', 61885956 => 'Taldra', - 61885957 => 'Renmark', - 61885958 => 'Renmark', 61885959 => 'Loxton', 61885960 => 'Narrung', 61885961 => 'Coonalpyn', @@ -40265,16 +34565,8 @@ 61885977 => 'Loxton', 61885978 => 'Paruna', 61885979 => 'Renmark', - 61885980 => 'Yankalilla', - 61885981 => 'Yankalilla', - 61885982 => 'Yankalilla', - 61885983 => 'Yankalilla', - 61885984 => 'Yankalilla', - 61885985 => 'Yankalilla', - 61885986 => 'Yankalilla', + 6188598 => 'Yankalilla', 61885987 => 'Tailem Bend', - 61885988 => 'Yankalilla', - 61885989 => 'Yankalilla', 61885990 => 'Taldra', 61885991 => 'Taplan', 61885992 => 'Wanbi', @@ -40555,15 +34847,10 @@ 61886267 => 'Streaky Bay', 61886268 => 'Wirrulla', 61886269 => 'Ceduna', - 61886270 => 'Kimba', - 61886271 => 'Kimba', - 61886272 => 'Kimba', - 61886273 => 'Kimba', - 61886274 => 'Kimba', + 6188627 => 'Kimba', 61886275 => 'Kelly', 61886276 => 'Kelly', 61886277 => 'Kelly', - 61886278 => 'Kimba', 61886279 => 'Kelly', 61886280 => 'Arno Bay', 61886281 => 'Arno Bay', @@ -40575,15 +34862,10 @@ 61886287 => 'Ceduna', 61886288 => 'Wharminda', 61886289 => 'Wharminda', + 6188629 => 'Cowell', 61886290 => 'Coffin Bay', 61886291 => 'Coulta', - 61886292 => 'Cowell', - 61886293 => 'Cowell', - 61886294 => 'Cowell', - 61886295 => 'Cowell', - 61886296 => 'Cowell', 61886297 => 'Miltalie', - 61886298 => 'Cowell', 61886299 => 'Cummins', 61886300 => 'Port Pirie', 61886301 => 'Port Pirie', @@ -40606,16 +34888,9 @@ 61886318 => 'Sheringa', 61886319 => 'Whyalla', 6188632 => 'Port Pirie', - 61886330 => 'Port Pirie', - 61886331 => 'Port Pirie', - 61886332 => 'Port Pirie', - 61886333 => 'Port Pirie', - 61886334 => 'Port Pirie', - 61886335 => 'Port Pirie', + 6188633 => 'Port Pirie', 61886336 => 'Darke Peak', 61886337 => 'Elliston', - 61886338 => 'Port Pirie', - 61886339 => 'Port Pirie', 61886340 => 'Nelshaby', 61886341 => 'Nelshaby', 61886342 => 'Port Pirie', @@ -40626,26 +34901,16 @@ 61886347 => 'Mambray Creek', 61886348 => 'Mambray Creek', 61886349 => 'Port Pirie', - 61886350 => 'Port Broughton', - 61886351 => 'Port Broughton', - 61886352 => 'Port Broughton', - 61886353 => 'Port Broughton', - 61886354 => 'Port Broughton', - 61886355 => 'Port Broughton', + 6188635 => 'Port Broughton', 61886356 => 'Minnipa', 61886357 => 'Mount Hope', 61886358 => 'Port Lincoln', 61886359 => 'Port Neill', - 61886360 => 'Crystal Brook', - 61886361 => 'Crystal Brook', - 61886362 => 'Crystal Brook', - 61886363 => 'Crystal Brook', - 61886364 => 'Crystal Brook', + 6188636 => 'Crystal Brook', 61886365 => 'Wandearah East', 61886366 => 'Wandearah East', 61886367 => 'Redhill', 61886368 => 'Redhill', - 61886369 => 'Crystal Brook', 61886370 => 'Rudall', 61886371 => 'Gladstone', 61886372 => 'Georgetown', @@ -40851,22 +35116,12 @@ 61886627 => 'Georgetown', 61886628 => 'Georgetown', 61886629 => 'Gladstone', - 61886630 => 'Laura', - 61886631 => 'Laura', - 61886632 => 'Laura', - 61886633 => 'Laura', - 61886634 => 'Laura', - 61886635 => 'Laura', + 6188663 => 'Laura', 61886636 => 'Wanilla', 61886637 => 'Wharminda', 61886638 => 'Wudinna', 61886639 => 'Yabmana', - 61886640 => 'Jamestown', - 61886641 => 'Jamestown', - 61886642 => 'Jamestown', - 61886643 => 'Jamestown', - 61886644 => 'Jamestown', - 61886645 => 'Jamestown', + 6188664 => 'Jamestown', 61886646 => 'Port Lincoln', 61886647 => 'Gladstone', 61886648 => 'Gladstone', @@ -40881,16 +35136,9 @@ 61886657 => 'Caltowie', 61886658 => 'Caltowie', 61886659 => 'Caltowie', - 61886660 => 'Melrose', - 61886661 => 'Melrose', - 61886662 => 'Melrose', - 61886663 => 'Melrose', - 61886664 => 'Melrose', - 61886665 => 'Melrose', + 6188666 => 'Melrose', 61886666 => 'Willowie', 61886667 => 'Willowie', - 61886668 => 'Melrose', - 61886669 => 'Melrose', 61886670 => 'Gairdner', 61886671 => 'Gairdner', 61886672 => 'Booleroo Centre', @@ -40959,16 +35207,10 @@ 61886744 => 'Woomera', 61886748 => 'Gairdner', 61886749 => 'Frome', - 61886750 => 'Frome', - 61886751 => 'Frome', + 6188675 => 'Frome', 61886752 => 'Leigh Creek South', 61886753 => 'Leigh Creek South', 61886754 => 'Leigh Creek South', - 61886755 => 'Frome', - 61886756 => 'Frome', - 61886757 => 'Frome', - 61886758 => 'Frome', - 61886759 => 'Frome', 61886760 => 'Cummins', 61886761 => 'Cummins', 61886762 => 'Cummins', @@ -41002,16 +35244,11 @@ 61886790 => 'Orroroo', 61886791 => 'Orroroo', 61886792 => 'Andamooka', - 61886800 => 'Wudinna', - 61886801 => 'Wudinna', - 61886802 => 'Wudinna', - 61886803 => 'Wudinna', - 61886804 => 'Wudinna', + 6188680 => 'Wudinna', 61886805 => 'Minnipa', 61886806 => 'Minnipa', 61886807 => 'Minnipa', 61886808 => 'Minnipa', - 61886809 => 'Wudinna', 61886810 => 'Koongawa', 61886811 => 'Kyancutta', 61886812 => 'Kyancutta', @@ -41021,15 +35258,7 @@ 61886818 => 'Kyancutta', 61886819 => 'Kyancutta', 6188682 => 'Port Lincoln', - 61886830 => 'Port Lincoln', - 61886831 => 'Port Lincoln', - 61886832 => 'Port Lincoln', - 61886833 => 'Port Lincoln', - 61886834 => 'Port Lincoln', - 61886835 => 'Port Lincoln', - 61886836 => 'Port Lincoln', - 61886837 => 'Port Lincoln', - 61886838 => 'Port Lincoln', + 6188683 => 'Port Lincoln', 61886839 => 'Rudall', 61886840 => 'Port Lincoln', 61886841 => 'Port Lincoln', @@ -41240,16 +35469,10 @@ 61887067 => 'Millicent', 61887068 => 'Millicent', 61887069 => 'Laffer', - 61887070 => 'Mount Gambier', - 61887071 => 'Mount Gambier', - 61887072 => 'Mount Gambier', + 6188707 => 'Mount Gambier', 61887073 => 'Monkoora', 61887074 => 'Monkoora', 61887075 => 'Monkoora', - 61887076 => 'Mount Gambier', - 61887077 => 'Mount Gambier', - 61887078 => 'Mount Gambier', - 61887079 => 'Mount Gambier', 61887080 => 'Naracoorte', 61887081 => 'Naracoorte', 61887082 => 'Naracoorte', @@ -41485,26 +35708,15 @@ 61887357 => 'Rendelsham', 61887358 => 'Rendelsham', 61887359 => 'Thornlea', - 61887360 => 'Coonawarra', - 61887361 => 'Coonawarra', - 61887362 => 'Coonawarra', - 61887363 => 'Coonawarra', - 61887364 => 'Coonawarra', - 61887365 => 'Coonawarra', + 6188736 => 'Coonawarra', 61887366 => 'Short', 61887367 => 'Short', 61887368 => 'Short', 61887369 => 'Short', 6188737 => 'Penola', + 6188738 => 'Port Macdonnell', 61887380 => 'Kongorong', 61887381 => 'Kongorong', - 61887382 => 'Port Macdonnell', - 61887383 => 'Port Macdonnell', - 61887384 => 'Port Macdonnell', - 61887385 => 'Port Macdonnell', - 61887386 => 'Port Macdonnell', - 61887387 => 'Port Macdonnell', - 61887388 => 'Port Macdonnell', 61887389 => 'Kongorong', 61887390 => 'Tarpeena', 61887391 => 'Tarpeena', @@ -41741,34 +35953,16 @@ 61887667 => 'Conmurra', 61887668 => 'Conmurra', 61887669 => 'Conmurra', - 61887670 => 'Kingston Se', - 61887671 => 'Kingston Se', - 61887672 => 'Kingston Se', - 61887673 => 'Kingston Se', - 61887674 => 'Kingston Se', + 6188767 => 'Kingston Se', 61887675 => 'Keilira', - 61887676 => 'Kingston Se', 61887677 => 'Taratap', 61887678 => 'Tilley Swamp', 61887679 => 'Keilira', - 61887680 => 'Robe', - 61887681 => 'Robe', - 61887682 => 'Robe', - 61887683 => 'Robe', - 61887684 => 'Robe', - 61887685 => 'Robe', - 61887686 => 'Robe', + 6188768 => 'Robe', 61887687 => 'Reedy Creek', 61887688 => 'Reedy Creek', 61887689 => 'Reedy Creek', - 61887690 => 'Lucindale South', - 61887691 => 'Lucindale South', - 61887692 => 'Lucindale South', - 61887693 => 'Lucindale South', - 61887694 => 'Lucindale South', - 61887695 => 'Lucindale South', - 61887696 => 'Lucindale South', - 61887697 => 'Lucindale South', + 6188769 => 'Lucindale South', 61887698 => 'Lochaber', 61887699 => 'Frances', 61887700 => 'Bangham', @@ -42287,12 +36481,7 @@ 6188825 => 'Moonta', 6188826 => 'Bute', 6188827 => 'Paskeville', - 61888280 => 'Kadina', - 61888281 => 'Kadina', - 61888282 => 'Kadina', - 61888283 => 'Kadina', - 61888284 => 'Kadina', - 61888285 => 'Kadina', + 6188828 => 'Kadina', 61888286 => 'Moonta', 61888287 => 'Alford', 61888288 => 'Bute', @@ -42344,25 +36533,13 @@ 6188837 => 'Ardrossan', 6188838 => 'Pine Point', 6188839 => 'Pine Point', + 6188840 => 'Riverton', 61888400 => 'Auburn', 61888401 => 'Auburn', 61888402 => 'Auburn', - 61888403 => 'Riverton', - 61888404 => 'Riverton', - 61888405 => 'Riverton', - 61888406 => 'Riverton', - 61888407 => 'Riverton', - 61888408 => 'Riverton', - 61888409 => 'Riverton', - 61888410 => 'Clare', - 61888411 => 'Clare', - 61888412 => 'Clare', - 61888413 => 'Clare', - 61888414 => 'Clare', + 6188841 => 'Clare', 61888415 => 'Spalding', - 61888416 => 'Clare', 61888417 => 'Blyth', - 61888418 => 'Clare', 61888419 => 'Brinkworth', 6188842 => 'Clare', 6188843 => 'Clare', @@ -42393,12 +36570,7 @@ 61888518 => 'South Hummocks', 61888519 => 'Booborowie', 6188852 => 'Yorketown', - 61888530 => 'Minlaton', - 61888531 => 'Minlaton', - 61888532 => 'Minlaton', - 61888533 => 'Minlaton', - 61888534 => 'Minlaton', - 61888535 => 'Minlaton', + 6188853 => 'Minlaton', 61888536 => 'Curramulka', 61888537 => 'Curramulka', 61888538 => 'Curramulka', @@ -42413,12 +36585,7 @@ 61888547 => 'Curramulka', 61888548 => 'Curramulka', 61888549 => 'Warooka', - 61888550 => 'Warooka', - 61888551 => 'Warooka', - 61888552 => 'Warooka', - 61888553 => 'Warooka', - 61888554 => 'Warooka', - 61888555 => 'Warooka', + 6188855 => 'Warooka', 61888556 => 'Thistle', 61888557 => 'Wedge', 61888558 => 'Wedge', @@ -42720,12 +36887,7 @@ 61888917 => 'Nantawarra', 61888918 => 'Thistle', 61888919 => 'Thistle', - 61888920 => 'Burra', - 61888921 => 'Burra', - 61888922 => 'Burra', - 61888923 => 'Burra', - 61888924 => 'Burra', - 61888925 => 'Burra', + 6188892 => 'Burra', 61888926 => 'Hallett', 61888927 => 'Braemer', 61888928 => 'Braemer', @@ -42946,21 +37108,14 @@ 61889188 => 'Noonamah', 61889189 => 'Pine Creek', 6188919 => 'Darwin', - 6188920 => 'Darwin', + 618892 => 'Darwin', 61889210 => 'Victoria River', - 61889211 => 'Darwin', - 61889212 => 'Darwin', 61889213 => 'Alice Springs', 61889214 => 'Alice Springs', 61889215 => 'Roper River', 61889216 => 'Tiwi', 61889217 => 'Victoria River', - 61889218 => 'Darwin', 61889219 => 'Elliott', - 6188922 => 'Darwin', - 6188923 => 'Darwin', - 6188924 => 'Darwin', - 6188925 => 'Darwin', 61889260 => 'Petermann', 61889261 => 'Plenty', 61889262 => 'Ranken River', @@ -42971,8 +37126,6 @@ 61889267 => 'Tennant Creek', 61889268 => 'Yulara', 61889269 => 'Alyangula', - 6188927 => 'Darwin', - 6188928 => 'Darwin', 6188929 => 'Alice Springs', 6188930 => 'Darwin', 6188931 => 'Darwin', @@ -43029,6 +37182,7 @@ 61889397 => 'Batchelor', 61889398 => 'Daly', 61889399 => 'Daly', + 618894 => 'Darwin', 61889400 => 'Elliott', 61889401 => 'Petermann', 61889402 => 'Plenty', @@ -43039,36 +37193,17 @@ 61889407 => 'Tanami', 61889408 => 'Tennant Creek', 61889409 => 'Yulara', - 6188941 => 'Darwin', - 6188942 => 'Darwin', - 6188943 => 'Darwin', - 6188944 => 'Darwin', - 6188945 => 'Darwin', - 6188946 => 'Darwin', - 6188947 => 'Darwin', - 6188948 => 'Darwin', 61889490 => 'Alyangula', 61889491 => 'Arnhem', 61889492 => 'Batchelor', 61889493 => 'Borroloola', 61889494 => 'Carpentaria', 61889495 => 'Daly', - 61889496 => 'Darwin', 61889497 => 'Jabiru', 61889498 => 'Katherine', 61889499 => 'Nhulunbuy', - 6188950 => 'Alice Springs', - 6188951 => 'Alice Springs', - 6188952 => 'Alice Springs', - 6188953 => 'Alice Springs', + 618895 => 'Alice Springs', 6188954 => 'Petermann', - 61889550 => 'Alice Springs', - 61889551 => 'Alice Springs', - 61889552 => 'Alice Springs', - 61889553 => 'Alice Springs', - 61889554 => 'Alice Springs', - 61889555 => 'Alice Springs', - 61889556 => 'Alice Springs', 61889557 => 'Petermann', 61889558 => 'Petermann', 61889559 => 'Petermann', @@ -43092,8 +37227,6 @@ 61889577 => 'Yulara', 61889578 => 'Tanami', 61889579 => 'Tanami', - 6188958 => 'Alice Springs', - 6188959 => 'Alice Springs', 61889600 => 'Noonamah', 61889601 => 'Pine Creek', 61889602 => 'Roper River', @@ -43114,15 +37247,7 @@ 61889617 => 'Tanami', 61889618 => 'Tennant Creek', 61889619 => 'Alyangula', - 61889620 => 'Tennant Creek', - 61889621 => 'Tennant Creek', - 61889622 => 'Tennant Creek', - 61889623 => 'Tennant Creek', - 61889624 => 'Tennant Creek', - 61889625 => 'Tennant Creek', - 61889626 => 'Tennant Creek', - 61889627 => 'Tennant Creek', - 61889628 => 'Tennant Creek', + 6188962 => 'Tennant Creek', 61889629 => 'Elliott', 61889630 => 'Tennant Creek', 61889631 => 'Alice Springs', @@ -43185,12 +37310,7 @@ 61889688 => 'Nhulunbuy', 61889689 => 'Darwin', 6188969 => 'Elliott', - 61889700 => 'Arnhem', - 61889701 => 'Arnhem', - 61889702 => 'Arnhem', - 61889703 => 'Arnhem', - 61889704 => 'Arnhem', - 61889705 => 'Arnhem', + 6188970 => 'Arnhem', 61889706 => 'Tiwi', 61889707 => 'Tiwi', 61889708 => 'Tiwi', @@ -43198,15 +37318,9 @@ 6188971 => 'Katherine', 6188972 => 'Katherine', 6188973 => 'Katherine', - 61889740 => 'Katherine', - 61889741 => 'Katherine', - 61889742 => 'Katherine', - 61889743 => 'Katherine', - 61889744 => 'Katherine', + 6188974 => 'Katherine', 61889745 => 'Victoria River', - 61889746 => 'Katherine', 61889747 => 'Pine Creek', - 61889748 => 'Katherine', 61889749 => 'Carpentaria', 61889750 => 'Victoria River', 61889751 => 'Victoria River', @@ -43218,14 +37332,8 @@ 61889757 => 'Borroloola', 61889758 => 'Borroloola', 61889759 => 'Carpentaria', - 61889760 => 'Batchelor', + 6188976 => 'Batchelor', 61889761 => 'Pine Creek', - 61889762 => 'Batchelor', - 61889763 => 'Batchelor', - 61889764 => 'Batchelor', - 61889765 => 'Batchelor', - 61889766 => 'Batchelor', - 61889767 => 'Batchelor', 61889768 => 'Pine Creek', 61889769 => 'Pine Creek', 61889770 => 'Victoria River', @@ -43248,53 +37356,25 @@ 61889787 => 'Arnhem', 61889788 => 'Arnhem', 61889789 => 'Arnhem', - 61889790 => 'Arnhem', - 61889791 => 'Arnhem', + 6188979 => 'Arnhem', 61889792 => 'Jabiru', 61889793 => 'Jabiru', 61889794 => 'Jabiru', - 61889795 => 'Arnhem', - 61889796 => 'Arnhem', - 61889797 => 'Arnhem', - 61889798 => 'Arnhem', 61889799 => 'Jabiru', - 6188980 => 'Darwin', - 6188981 => 'Darwin', - 6188982 => 'Darwin', - 6188983 => 'Darwin', - 61889840 => 'Darwin', - 61889841 => 'Darwin', - 61889842 => 'Darwin', - 61889843 => 'Darwin', - 61889844 => 'Darwin', - 61889845 => 'Darwin', - 61889846 => 'Darwin', + 618898 => 'Darwin', 61889847 => 'Noonamah', 61889848 => 'Noonamah', 61889849 => 'Noonamah', - 6188985 => 'Darwin', + 6188986 => 'Noonamah', 61889860 => 'Katherine', - 61889861 => 'Noonamah', - 61889862 => 'Noonamah', - 61889863 => 'Noonamah', - 61889864 => 'Noonamah', - 61889865 => 'Noonamah', - 61889866 => 'Noonamah', - 61889867 => 'Darwin', 61889868 => 'Nhulunbuy', 61889869 => 'Davenport', - 61889870 => 'Nhulunbuy', - 61889871 => 'Nhulunbuy', - 61889872 => 'Nhulunbuy', - 61889873 => 'Nhulunbuy', + 6188987 => 'Nhulunbuy', 61889874 => 'Alyangula', - 61889875 => 'Nhulunbuy', 61889876 => 'Alyangula', 61889877 => 'Alyangula', - 61889878 => 'Nhulunbuy', 61889879 => 'Arnhem', 6188988 => 'Noonamah', - 6188989 => 'Darwin', 61889900 => 'Alice Springs', 61889901 => 'Davenport', 61889902 => 'Elliott', @@ -43560,16 +37640,8 @@ 61890208 => 'Kambalda', 61890209 => 'Kambalda', 6189021 => 'Kalgoorlie', - 61890220 => 'Kalgoorlie', - 61890221 => 'Kalgoorlie', - 61890222 => 'Kalgoorlie', - 61890223 => 'Kalgoorlie', - 61890224 => 'Kalgoorlie', - 61890225 => 'Kalgoorlie', + 6189022 => 'Kalgoorlie', 61890226 => 'Nullarbor', - 61890227 => 'Kalgoorlie', - 61890228 => 'Kalgoorlie', - 61890229 => 'Kalgoorlie', 61890230 => 'Wialki North', 61890231 => 'Wialki North', 61890232 => 'Wialki North', @@ -43600,26 +37672,14 @@ 61890257 => 'Esperance', 61890258 => 'Eyre', 61890259 => 'Gibson', - 61890260 => 'Kalgoorlie', - 61890261 => 'Kalgoorlie', - 61890262 => 'Kalgoorlie', - 61890263 => 'Kalgoorlie', - 61890264 => 'Kalgoorlie', + 6189026 => 'Kalgoorlie', 61890265 => 'Leinster', - 61890266 => 'Kalgoorlie', - 61890267 => 'Kalgoorlie', 61890268 => 'Collurabbie', 61890269 => 'Collurabbie', - 61890270 => 'Kambalda', - 61890271 => 'Kambalda', - 61890272 => 'Kambalda', - 61890273 => 'Kambalda', + 6189027 => 'Kambalda', 61890274 => 'Goldfields', 61890275 => 'Goldfields', - 61890276 => 'Kambalda', 61890277 => 'Nullarbor', - 61890278 => 'Kambalda', - 61890279 => 'Kambalda', 61890280 => 'Goldfields', 61890281 => 'Grass Patch', 61890282 => 'Kalgoorlie', @@ -43777,16 +37837,11 @@ 61890446 => 'Burracoppin', 61890447 => 'Burracoppin South', 61890449 => 'Warralakin', + 6189045 => 'Kellerberrin', 61890450 => 'Warralakin', 61890451 => 'Mount Stirling', 61890452 => 'Mount Stirling', 61890453 => 'Goomarin', - 61890454 => 'Kellerberrin', - 61890455 => 'Kellerberrin', - 61890456 => 'Kellerberrin', - 61890457 => 'Kellerberrin', - 61890458 => 'Kellerberrin', - 61890459 => 'Kellerberrin', 61890460 => 'Condingup', 61890461 => 'Condingup', 61890462 => 'Coomalbidgup', @@ -43956,14 +38011,9 @@ 61890627 => 'Corrigin West', 61890628 => 'Corrigin West', 61890629 => 'Corrigin West', - 61890630 => 'Corrigin', - 61890631 => 'Corrigin', - 61890632 => 'Corrigin', - 61890633 => 'Corrigin', - 61890634 => 'Corrigin', + 6189063 => 'Corrigin', 61890635 => 'Muntadgin East', 61890636 => 'Mount Walker South', - 61890637 => 'Corrigin', 61890638 => 'Bruce Rock', 61890639 => 'Bruce Rock', 61890640 => 'Shackleton', @@ -43998,16 +38048,8 @@ 61890688 => 'Laverton', 61890689 => 'Laverton', 61890699 => 'Westonia', - 61890710 => 'Esperance', - 61890711 => 'Esperance', - 61890712 => 'Esperance', - 61890713 => 'Esperance', - 61890714 => 'Esperance', - 61890715 => 'Esperance', - 61890716 => 'Esperance', - 61890717 => 'Esperance', + 6189071 => 'Esperance', 61890718 => 'Ardath', - 61890719 => 'Esperance', 61890720 => 'Esperance', 61890721 => 'Esperance', 61890722 => 'Esperance', @@ -44098,26 +38140,12 @@ 61890886 => 'Kalgoorlie', 61890887 => 'Collurabbie', 6189091 => 'Kalgoorlie', - 61890920 => 'Kalgoorlie', - 61890921 => 'Kalgoorlie', - 61890922 => 'Kalgoorlie', - 61890923 => 'Kalgoorlie', - 61890924 => 'Kalgoorlie', - 61890925 => 'Kalgoorlie', - 61890926 => 'Kalgoorlie', + 6189092 => 'Kalgoorlie', 61890927 => 'Wialki North', 61890928 => 'Wilgoyne', 61890929 => 'Yilgarn South', - 61890930 => 'Kalgoorlie', - 61890931 => 'Kalgoorlie', - 61890932 => 'Kalgoorlie', - 61890933 => 'Kalgoorlie', - 61890934 => 'Kalgoorlie', - 61890935 => 'Kalgoorlie', + 6189093 => 'Kalgoorlie', 61890936 => 'Goldfields', - 61890937 => 'Kalgoorlie', - 61890938 => 'Kalgoorlie', - 61890939 => 'Kalgoorlie', 61890940 => 'Bodallin', 61890941 => 'Korbelka', 61890942 => 'Bodallin North', @@ -44357,9 +38385,9 @@ 61891177 => 'Wittenoom', 61891178 => 'Christmas Island', 61891179 => 'Cocos Island', + 61891180 => 'Broome', 61891181 => 'Christmas Island', 61891182 => 'Cocos Island', - 61891180 => 'Broome', 61891183 => 'Derby', 61891184 => 'Fitzroy Crossing', 61891185 => 'Hall\'s Creek', @@ -44591,26 +38619,13 @@ 61891427 => 'Whaleback', 61891428 => 'Cocos Island', 61891429 => 'Broome', - 61891430 => 'Karratha', - 61891431 => 'Karratha', - 61891432 => 'Karratha', + 6189143 => 'Karratha', 61891433 => 'Tom Price', 61891434 => 'Paraburdoo', - 61891435 => 'Karratha', - 61891436 => 'Karratha', - 61891437 => 'Karratha', 61891438 => 'Tom Price', - 61891439 => 'Karratha', - 61891440 => 'Karratha', - 61891441 => 'Karratha', - 61891442 => 'Karratha', + 6189144 => 'Karratha', 61891443 => 'Dampier', - 61891444 => 'Karratha', - 61891445 => 'Karratha', - 61891446 => 'Karratha', - 61891447 => 'Karratha', 61891448 => 'Whaleback', - 61891449 => 'Karratha', 61891450 => 'Broome', 61891451 => 'Broome', 61891452 => 'Broome', @@ -44722,7 +38737,7 @@ 61891637 => 'Hall\'s Creek', 61891638 => 'Fitzroy Crossing', 61891639 => 'Fitzroy Crossing', - 61891640 => 'Christmas Island', + 6189164 => 'Christmas Island', 61891650 => 'De Grey', 61891651 => 'De Grey', 61891652 => 'Mount Bruce', @@ -44733,16 +38748,9 @@ 61891657 => 'Newman', 61891658 => 'Paraburdoo', 61891659 => 'Paraburdoo', - 61891660 => 'Kununurra', + 6189166 => 'Kununurra', 61891661 => 'Fitzroy Crossing', - 61891662 => 'Kununurra', 61891663 => 'Ord', - 61891664 => 'Kununurra', - 61891665 => 'Kununurra', - 61891666 => 'Kununurra', - 61891667 => 'Kununurra', - 61891668 => 'Kununurra', - 61891669 => 'Kununurra', 6189167 => 'Ord', 61891680 => 'Kununurra', 61891681 => 'Kununurra', @@ -44776,26 +38784,11 @@ 61891719 => 'Roebuck', 6189172 => 'Port Hedland', 6189173 => 'Port Hedland', - 61891740 => 'Port Hedland', - 61891741 => 'Port Hedland', - 61891742 => 'Port Hedland', - 61891743 => 'Port Hedland', - 61891744 => 'Port Hedland', + 6189174 => 'Port Hedland', 61891745 => 'Newman', - 61891746 => 'Port Hedland', - 61891747 => 'Port Hedland', - 61891748 => 'Port Hedland', - 61891749 => 'Port Hedland', - 61891750 => 'Newman', - 61891751 => 'Newman', - 61891752 => 'Newman', - 61891753 => 'Newman', - 61891754 => 'Newman', - 61891755 => 'Newman', + 6189175 => 'Newman', 61891756 => 'Whaleback', 61891757 => 'Whaleback', - 61891758 => 'Newman', - 61891759 => 'Newman', 61891760 => 'Marble Bar', 61891761 => 'Marble Bar', 61891762 => 'Whaleback', @@ -44806,16 +38799,11 @@ 61891767 => 'De Grey/Sandfire/De Grey', 61891768 => 'De Grey', 61891769 => 'Great Sandy', + 6189177 => 'Newman', 61891770 => 'Port Hedland', 61891771 => 'Port Hedland', 61891772 => 'Port Hedland', 61891773 => 'Port Hedland', - 61891774 => 'Newman', - 61891775 => 'Newman', - 61891776 => 'Newman', - 61891777 => 'Newman', - 61891778 => 'Newman', - 61891779 => 'Newman', 61891780 => 'Tom Price', 61891781 => 'Tom Price', 61891782 => 'Whaleback', @@ -44848,14 +38836,9 @@ 61891816 => 'Onslow', 61891819 => 'Mount Bruce', 6189182 => 'Karratha', - 61891830 => 'Dampier', - 61891831 => 'Dampier', - 61891832 => 'Dampier', - 61891833 => 'Dampier', - 61891834 => 'Dampier', + 6189183 => 'Dampier', 61891835 => 'Karratha', 61891836 => 'Karratha', - 61891837 => 'Dampier', 61891838 => 'Karratha', 61891839 => 'Karratha', 61891840 => 'Pannawonica', @@ -44871,16 +38854,8 @@ 6189185 => 'Karratha', 6189186 => 'Karratha', 6189187 => 'Karratha', - 61891880 => 'Tom Price', - 61891881 => 'Tom Price', - 61891882 => 'Tom Price', - 61891883 => 'Tom Price', - 61891884 => 'Tom Price', - 61891885 => 'Tom Price', - 61891886 => 'Tom Price', - 61891887 => 'Tom Price', + 6189188 => 'Tom Price', 61891888 => 'Mount Bruce', - 61891889 => 'Tom Price', 61891890 => 'Tom Price', 61891891 => 'Tom Price', 61891892 => 'Tom Price', @@ -44909,16 +38884,8 @@ 61891917 => 'Leopold', 61891918 => 'Broome', 61891919 => 'Broome', - 61891920 => 'Broome', - 61891921 => 'Broome', - 61891922 => 'Broome', - 61891923 => 'Broome', + 6189192 => 'Broome', 61891924 => 'Roebuck', - 61891925 => 'Broome', - 61891926 => 'Broome', - 61891927 => 'Broome', - 61891928 => 'Broome', - 61891929 => 'Broome', 61891930 => 'Fitzroy Crossing', 61891931 => 'Derby', 61891932 => 'Derby', @@ -44969,298 +38936,55 @@ 61891987 => 'Millstream', 61891988 => 'Millstream', 61891999 => 'Karratha', - 6189200 => 'Perth', - 6189201 => 'Perth', - 6189202 => 'Perth', - 6189203 => 'Perth', - 6189204 => 'Perth', - 6189205 => 'Perth', + 61892 => 'Perth', 6189206 => 'Wanneroo', - 6189207 => 'Perth', - 6189208 => 'Perth', - 6189209 => 'Perth', - 6189210 => 'Perth', - 6189211 => 'Perth', - 6189212 => 'Perth', - 6189213 => 'Perth', - 6189214 => 'Perth', - 6189215 => 'Perth', - 6189216 => 'Perth', - 6189217 => 'Perth', - 6189218 => 'Perth', - 6189219 => 'Perth', - 6189220 => 'Perth', - 6189221 => 'Perth', - 6189222 => 'Perth', - 6189223 => 'Perth', - 6189224 => 'Perth', - 6189225 => 'Perth', - 6189226 => 'Perth', - 6189227 => 'Perth', - 6189228 => 'Perth', - 6189229 => 'Perth', - 6189230 => 'Perth', - 6189231 => 'Perth', - 6189232 => 'Perth', 6189233 => 'Wanneroo', 6189234 => 'Armadale', - 6189235 => 'Perth', 6189236 => 'Spearwood', - 6189237 => 'Perth', - 6189238 => 'Perth', 6189239 => 'Fremantle', - 6189240 => 'Perth', - 6189241 => 'Perth', - 6189242 => 'Perth', - 6189243 => 'Perth', - 6189244 => 'Perth', - 6189245 => 'Perth', - 6189246 => 'Perth', - 6189247 => 'Perth', - 6189248 => 'Perth', - 6189249 => 'Perth', - 6189250 => 'Perth', - 6189251 => 'Perth', 6189252 => 'Kalamunda', - 6189253 => 'Perth', - 6189254 => 'Perth', 6189255 => 'Kalamunda', - 6189256 => 'Perth', 6189257 => 'Kalamunda', - 6189258 => 'Perth', - 6189259 => 'Perth', - 6189260 => 'Perth', - 6189261 => 'Perth', - 6189262 => 'Perth', - 6189263 => 'Perth', - 6189264 => 'Perth', - 6189265 => 'Perth', - 6189266 => 'Perth', - 6189267 => 'Perth', - 6189268 => 'Perth', - 6189269 => 'Perth', - 6189270 => 'Perth', - 6189271 => 'Perth', - 6189272 => 'Perth', - 6189273 => 'Perth', - 6189274 => 'Perth', - 6189275 => 'Perth', - 6189276 => 'Perth', - 6189277 => 'Perth', - 6189278 => 'Perth', - 6189279 => 'Perth', - 6189280 => 'Perth', - 6189281 => 'Perth', - 6189282 => 'Perth', - 6189283 => 'Perth', - 6189284 => 'Perth', - 6189285 => 'Perth', - 6189286 => 'Perth', - 6189287 => 'Perth', - 6189288 => 'Perth', - 6189289 => 'Perth', - 6189290 => 'Kalamunda', - 6189291 => 'Kalamunda', + 618929 => 'Kalamunda', 6189292 => 'Rottnest', - 6189293 => 'Kalamunda', - 6189294 => 'Kalamunda', - 6189295 => 'Kalamunda', 6189296 => 'Herne Hill', 6189297 => 'Herne Hill', - 6189298 => 'Kalamunda', - 6189299 => 'Kalamunda', - 6189300 => 'Wanneroo', - 6189301 => 'Wanneroo', - 6189302 => 'Wanneroo', - 6189303 => 'Wanneroo', - 6189304 => 'Wanneroo', - 6189305 => 'Wanneroo', - 6189306 => 'Wanneroo', - 6189307 => 'Wanneroo', - 6189308 => 'Wanneroo', - 6189309 => 'Wanneroo', - 6189310 => 'Perth', - 6189311 => 'Perth', - 6189312 => 'Perth', - 6189313 => 'Perth', - 6189314 => 'Perth', - 6189315 => 'Perth', - 6189316 => 'Perth', - 6189317 => 'Perth', - 6189318 => 'Perth', - 6189319 => 'Perth', - 6189320 => 'Perth', - 6189321 => 'Perth', - 6189322 => 'Perth', - 6189323 => 'Perth', - 6189324 => 'Perth', - 6189325 => 'Perth', - 6189326 => 'Perth', - 6189327 => 'Perth', - 6189328 => 'Perth', - 6189329 => 'Perth', - 6189330 => 'Perth', - 6189331 => 'Perth', - 6189332 => 'Perth', - 6189333 => 'Perth', - 6189334 => 'Perth', + 61893 => 'Perth', + 618930 => 'Wanneroo', 6189335 => 'Fremantle', 6189336 => 'Fremantle', - 6189337 => 'Perth', - 6189338 => 'Perth', - 6189339 => 'Perth', - 6189340 => 'Perth', - 6189341 => 'Perth', - 6189342 => 'Perth', - 6189343 => 'Perth', - 6189344 => 'Perth', - 6189345 => 'Perth', - 6189346 => 'Perth', - 6189347 => 'Perth', - 6189348 => 'Perth', - 6189349 => 'Perth', - 6189350 => 'Perth', - 6189351 => 'Perth', - 6189352 => 'Perth', - 6189353 => 'Perth', - 6189354 => 'Perth', - 6189355 => 'Perth', - 6189356 => 'Perth', - 6189357 => 'Perth', - 6189358 => 'Perth', - 6189359 => 'Perth', - 6189360 => 'Perth', - 6189361 => 'Perth', - 6189362 => 'Perth', - 6189363 => 'Perth', - 6189364 => 'Perth', - 6189365 => 'Perth', - 6189366 => 'Perth', - 6189367 => 'Perth', - 6189368 => 'Perth', - 6189369 => 'Perth', - 6189370 => 'Perth', - 6189371 => 'Perth', 6189372 => 'Rottnest', - 6189373 => 'Perth', - 6189374 => 'Perth', - 6189375 => 'Perth', - 6189376 => 'Perth', - 6189377 => 'Perth', - 6189378 => 'Perth', - 6189379 => 'Perth', - 6189380 => 'Perth', - 6189381 => 'Perth', - 6189382 => 'Perth', - 6189383 => 'Perth', - 6189384 => 'Perth', - 6189385 => 'Perth', - 6189386 => 'Perth', - 6189387 => 'Perth', - 6189388 => 'Perth', - 6189389 => 'Perth', - 6189390 => 'Armadale', - 6189391 => 'Armadale', - 6189392 => 'Perth', - 6189393 => 'Armadale', - 6189394 => 'Armadale', + 618939 => 'Armadale', + 6189395 => 'Spearwood', 61893950 => 'Herne Hill', 61893951 => 'Herne Hill', 61893952 => 'Herne Hill', - 61893953 => 'Spearwood', - 61893954 => 'Spearwood', - 61893955 => 'Spearwood', - 61893956 => 'Spearwood', - 61893957 => 'Spearwood', - 61893958 => 'Spearwood', - 61893959 => 'Spearwood', - 6189396 => 'Armadale', - 6189397 => 'Armadale', - 6189398 => 'Armadale', - 6189399 => 'Armadale', - 6189400 => 'Wanneroo', - 6189401 => 'Wanneroo', - 6189402 => 'Wanneroo', - 6189403 => 'Wanneroo', - 6189404 => 'Wanneroo', - 6189405 => 'Wanneroo', - 6189406 => 'Wanneroo', - 6189407 => 'Wanneroo', - 6189408 => 'Wanneroo', - 6189409 => 'Wanneroo', - 6189410 => 'Spearwood', - 6189411 => 'Spearwood', - 6189412 => 'Spearwood', - 6189413 => 'Perth', - 6189414 => 'Spearwood', - 6189415 => 'Perth', - 6189416 => 'Perth', - 6189417 => 'Spearwood', - 6189418 => 'Spearwood', - 6189419 => 'Spearwood', - 6189420 => 'Perth', - 6189421 => 'Perth', - 6189422 => 'Perth', - 6189423 => 'Perth', - 6189424 => 'Perth', - 6189425 => 'Perth', - 6189426 => 'Perth', - 6189427 => 'Perth', - 6189428 => 'Perth', - 6189429 => 'Perth', + 61894 => 'Perth', + 618940 => 'Wanneroo', + 618941 => 'Spearwood', 6189430 => 'Fremantle', 6189431 => 'Fremantle', 6189432 => 'Fremantle', 6189433 => 'Fremantle', 6189434 => 'Spearwood', 6189435 => 'Fremantle', - 6189436 => 'Perth', 6189437 => 'Spearwood', - 6189438 => 'Perth', 6189439 => 'Spearwood', - 618944 => 'Perth', - 618945 => 'Perth', - 618946 => 'Perth', - 618947 => 'Perth', - 618948 => 'Perth', 6189490 => 'Armadale', - 6189491 => 'Perth', - 6189492 => 'Perth', - 6189493 => 'Perth', 6189494 => 'Spearwood', 6189495 => 'Armadale', 6189496 => 'Armadale', 6189497 => 'Armadale', - 61894980 => 'Armadale', - 61894981 => 'Armadale', - 61894982 => 'Armadale', - 61894983 => 'Armadale', - 61894984 => 'Armadale', + 6189498 => 'Armadale', 61894985 => 'Spearwood', 61894986 => 'Spearwood', 61894987 => 'Spearwood', - 61894988 => 'Armadale', - 61894989 => 'Armadale', 6189499 => 'Spearwood', - 61895000 => 'Rockingham', - 61895001 => 'Rockingham', - 61895002 => 'Rockingham', + 6189500 => 'Rockingham', 61895003 => 'Mandurah', 61895004 => 'Mandurah', 61895005 => 'Mandurah', - 61895006 => 'Rockingham', - 61895007 => 'Rockingham', - 61895008 => 'Rockingham', - 61895009 => 'Rockingham', - 61895010 => 'Bullsbrook East', - 61895011 => 'Bullsbrook East', - 61895012 => 'Bullsbrook East', - 61895013 => 'Bullsbrook East', - 61895014 => 'Bullsbrook East', - 61895015 => 'Bullsbrook East', - 61895016 => 'Bullsbrook East', - 61895017 => 'Bullsbrook East', - 61895018 => 'Bullsbrook East', + 6189501 => 'Bullsbrook East', 61895019 => 'Rockingham', 61895020 => 'Bakers Hill', 61895021 => 'Bakers Hill', @@ -45443,15 +39167,10 @@ 61895207 => 'Byford', 61895208 => 'Mandurah', 61895209 => 'Lake Clifton', - 61895210 => 'Pinjarra', - 61895211 => 'Pinjarra', - 61895212 => 'Pinjarra', + 6189521 => 'Pinjarra', 61895213 => 'Dwellingup', - 61895214 => 'Pinjarra', 61895215 => 'Rockingham', 61895216 => 'Mandurah', - 61895217 => 'Pinjarra', - 61895218 => 'Pinjarra', 61895219 => 'Mandurah', 6189522 => 'Mandurah', 6189523 => 'Rockingham', @@ -45462,14 +39181,7 @@ 6189528 => 'Rockingham', 6189529 => 'Rockingham', 6189530 => 'Pinjarra', - 61895310 => 'Pinjarra', - 61895311 => 'Pinjarra', - 61895312 => 'Pinjarra', - 61895313 => 'Pinjarra', - 61895314 => 'Pinjarra', - 61895315 => 'Pinjarra', - 61895316 => 'Pinjarra', - 61895317 => 'Pinjarra', + 6189531 => 'Pinjarra', 61895318 => 'Mandurah', 61895319 => 'Mandurah', 61895320 => 'Byford', @@ -45496,16 +39208,8 @@ 61895368 => 'Mandurah', 61895369 => 'Gidgegannup', 6189537 => 'Mandurah', - 61895380 => 'Dwellingup', - 61895381 => 'Dwellingup', - 61895382 => 'Dwellingup', - 61895383 => 'Dwellingup', + 6189538 => 'Dwellingup', 61895384 => 'Mount Wells', - 61895385 => 'Dwellingup', - 61895386 => 'Dwellingup', - 61895387 => 'Dwellingup', - 61895388 => 'Dwellingup', - 61895389 => 'Dwellingup', 61895390 => 'Toodyay', 61895391 => 'Mount Helena', 61895392 => 'Bakers Hill', @@ -45693,15 +39397,7 @@ 61895634 => 'Yanchep', 6189570 => 'Bullsbrook East', 6189571 => 'Bullsbrook East', - 61895720 => 'Mount Helena', - 61895721 => 'Mount Helena', - 61895722 => 'Mount Helena', - 61895723 => 'Mount Helena', - 61895724 => 'Mount Helena', - 61895725 => 'Mount Helena', - 61895726 => 'Mount Helena', - 61895727 => 'Mount Helena', - 61895728 => 'Mount Helena', + 6189572 => 'Mount Helena', 61895729 => 'Gidgegannup', 6189573 => 'Mount Helena', 61895740 => 'Bakers Hill', @@ -45727,12 +39423,7 @@ 61895787 => 'Gingin', 61895788 => 'Gingin', 61895789 => 'Gingin', - 61895790 => 'Bindoon', - 61895791 => 'Bindoon', - 61895792 => 'Bindoon', - 61895793 => 'Bindoon', - 61895794 => 'Bindoon', - 61895795 => 'Bindoon', + 6189579 => 'Bindoon', 61895796 => 'Rockingham', 61895797 => 'Mount Helena', 61895798 => 'Mount Helena', @@ -45740,16 +39431,9 @@ 6189581 => 'Mandurah', 6189582 => 'Mandurah', 6189583 => 'Mandurah', + 6189584 => 'Mandurah', 61895840 => 'Toodyay', 61895841 => 'Toodyay', - 61895842 => 'Mandurah', - 61895843 => 'Mandurah', - 61895844 => 'Mandurah', - 61895845 => 'Mandurah', - 61895846 => 'Mandurah', - 61895847 => 'Mandurah', - 61895848 => 'Mandurah', - 61895849 => 'Mandurah', 6189585 => 'Mandurah', 6189586 => 'Mandurah', 6189587 => 'Mandurah', @@ -46770,18 +40454,10 @@ 61897197 => 'Capel', 61897198 => 'Collie', 61897199 => 'Dardanup', + 618972 => 'Bunbury', 61897200 => 'Myalup', 61897201 => 'Myalup', 61897202 => 'Myalup', - 61897203 => 'Bunbury', - 61897204 => 'Bunbury', - 61897205 => 'Bunbury', - 61897206 => 'Bunbury', - 61897207 => 'Bunbury', - 61897208 => 'Bunbury', - 61897209 => 'Bunbury', - 6189721 => 'Bunbury', - 6189722 => 'Bunbury', 61897230 => 'Brunswick Junction', 61897231 => 'Darkan', 61897232 => 'Donnybrook', @@ -46792,16 +40468,8 @@ 61897237 => 'Busselton', 61897238 => 'Cundinup', 61897239 => 'Jangardup', - 6189724 => 'Bunbury', - 6189725 => 'Bunbury', - 61897260 => 'Bunbury', 61897261 => 'Brunswick Junction', - 61897262 => 'Bunbury', 61897263 => 'Brunswick Junction', - 61897264 => 'Bunbury', - 61897265 => 'Bunbury', - 61897266 => 'Bunbury', - 61897267 => 'Bunbury', 61897268 => 'Brunswick Junction', 61897269 => 'Brunswick Junction', 6189727 => 'Capel', @@ -46810,12 +40478,7 @@ 61897291 => 'Harvey', 61897292 => 'Harvey', 61897293 => 'Harvey', - 61897294 => 'Bunbury', - 61897295 => 'Bunbury', - 61897296 => 'Bunbury', - 61897297 => 'Bunbury', 61897298 => 'Harvey', - 61897299 => 'Bunbury', 61897300 => 'Margaret River', 61897301 => 'Marybrook', 61897302 => 'Nannup', @@ -46827,38 +40490,17 @@ 61897308 => 'Dinninup North', 61897309 => 'Nyamup', 6189731 => 'Donnybrook', - 61897320 => 'Donnybrook', - 61897321 => 'Donnybrook', + 6189732 => 'Donnybrook', 61897322 => 'Upper Preston', - 61897323 => 'Donnybrook', - 61897324 => 'Donnybrook', - 61897325 => 'Donnybrook', - 61897326 => 'Donnybrook', - 61897327 => 'Donnybrook', - 61897328 => 'Donnybrook', - 61897329 => 'Donnybrook', - 61897330 => 'Waroona', - 61897331 => 'Waroona', - 61897332 => 'Waroona', - 61897333 => 'Waroona', - 61897334 => 'Waroona', - 61897335 => 'Waroona', - 61897336 => 'Waroona', - 61897337 => 'Waroona', - 61897338 => 'Waroona', + 6189733 => 'Waroona', 61897339 => 'Collie', 6189734 => 'Collie', 6189735 => 'Collie', + 6189736 => 'Upper Preston', 61897360 => 'Darkan', 61897361 => 'Darkan', 61897362 => 'Darkan', 61897363 => 'Darkan', - 61897364 => 'Upper Preston', - 61897365 => 'Upper Preston', - 61897366 => 'Upper Preston', - 61897367 => 'Upper Preston', - 61897368 => 'Upper Preston', - 61897369 => 'Upper Preston', 61897370 => 'Tonebridge', 61897371 => 'Wilga', 61897372 => 'Brunswick Junction', @@ -46988,26 +40630,12 @@ 61897568 => 'Marybrook', 61897569 => 'Marybrook', 6189757 => 'Margaret River', - 61897580 => 'Augusta', - 61897581 => 'Augusta', - 61897582 => 'Augusta', - 61897583 => 'Augusta', - 61897584 => 'Augusta', - 61897585 => 'Augusta', - 61897586 => 'Augusta', + 6189758 => 'Augusta', 61897587 => 'Margaret River', 61897588 => 'Margaret River', 61897589 => 'Margaret River', - 61897590 => 'Margaret River', + 6189759 => 'Margaret River', 61897591 => 'Marybrook', - 61897592 => 'Margaret River', - 61897593 => 'Margaret River', - 61897594 => 'Margaret River', - 61897595 => 'Margaret River', - 61897596 => 'Margaret River', - 61897597 => 'Margaret River', - 61897598 => 'Margaret River', - 61897599 => 'Margaret River', 61897600 => 'Margaret River', 61897601 => 'Bunbury', 61897602 => 'Balingup', @@ -47049,16 +40677,11 @@ 61897647 => 'Bridgetown', 61897648 => 'Bridgetown', 61897649 => 'Bridgetown', + 6189765 => 'Manjimup', 61897650 => 'Boyup Brook', 61897651 => 'Boyup Brook', 61897652 => 'Boyup Brook', 61897653 => 'Boyup Brook', - 61897654 => 'Manjimup', - 61897655 => 'Manjimup', - 61897656 => 'Manjimup', - 61897657 => 'Manjimup', - 61897658 => 'Manjimup', - 61897659 => 'Manjimup', 6189766 => 'Wilga', 61897670 => 'Dinninup', 61897671 => 'Dinninup', @@ -47096,26 +40719,14 @@ 61897748 => 'Marybrook', 61897749 => 'Augusta', 6189775 => 'Pemberton', - 61897760 => 'Pemberton', - 61897761 => 'Pemberton', + 6189776 => 'Pemberton', 61897762 => 'Beedelup', 61897763 => 'Beedelup', - 61897764 => 'Pemberton', - 61897765 => 'Pemberton', - 61897766 => 'Pemberton', - 61897767 => 'Pemberton', - 61897768 => 'Pemberton', 61897769 => 'Beedelup', + 6189777 => 'Pemberton', 61897770 => 'Manjimup', 61897771 => 'Manjimup', 61897772 => 'Manjimup', - 61897773 => 'Pemberton', - 61897774 => 'Pemberton', - 61897775 => 'Pemberton', - 61897776 => 'Pemberton', - 61897777 => 'Pemberton', - 61897778 => 'Pemberton', - 61897779 => 'Pemberton', 61897780 => 'Bunbury', 61897781 => 'Cundinup', 61897782 => 'Cundinup', @@ -47136,16 +40747,11 @@ 61897797 => 'Dinninup North', 61897798 => 'Nyamup', 61897799 => 'Bunbury', - 61897800 => 'Bunbury', - 61897801 => 'Bunbury', + 6189780 => 'Bunbury', 61897802 => 'Collie', 61897803 => 'Capel', 61897804 => 'Donnybrook', 61897805 => 'Margaret River', - 61897806 => 'Bunbury', - 61897807 => 'Bunbury', - 61897808 => 'Bunbury', - 61897809 => 'Bunbury', 61897810 => 'Busselton', 61897811 => 'Busselton', 61897812 => 'Bunbury', @@ -47226,16 +40832,11 @@ 61897887 => 'Bridgetown', 61897888 => 'Brunswick Junction', 61897889 => 'Brunswick Junction', + 6189789 => 'Bunbury', 61897890 => 'Jangardup', 61897891 => 'Jangardup', 61897892 => 'Tonebridge', - 61897893 => 'Bunbury', - 61897894 => 'Bunbury', 61897895 => 'Boyup Brook', - 61897896 => 'Bunbury', - 61897897 => 'Bunbury', - 61897898 => 'Bunbury', - 61897899 => 'Bunbury', 61897900 => 'Bunbury', 61897901 => 'Boyup Brook', 61897902 => 'Boyup Brook', @@ -47765,12 +41366,7 @@ 61898507 => 'Narrogin', 61898508 => 'Narrogin', 61898509 => 'Bradfords', - 61898510 => 'Mount Barker', - 61898511 => 'Mount Barker', - 61898512 => 'Mount Barker', - 61898513 => 'Mount Barker', - 61898514 => 'Mount Barker', - 61898515 => 'Mount Barker', + 6189851 => 'Mount Barker', 61898516 => 'Muradup', 61898517 => 'Tenterden', 61898518 => 'Nalyerlup', @@ -48064,16 +41660,9 @@ 61898807 => 'Hyden East', 61898808 => 'Hyden East', 61898809 => 'Kulin West', - 61898810 => 'Narrogin', - 61898811 => 'Narrogin', - 61898812 => 'Narrogin', - 61898813 => 'Narrogin', - 61898814 => 'Narrogin', - 61898815 => 'Narrogin', - 61898816 => 'Narrogin', + 6189881 => 'Narrogin', 61898817 => 'Karlgarin', 61898818 => 'Karlgarin', - 61898819 => 'Narrogin', 61898820 => 'Narrogin', 61898821 => 'Narrogin', 61898822 => 'Narrogin', @@ -48174,16 +41763,10 @@ 61898917 => 'Pingelly East', 61898918 => 'Pumphreys', 61898919 => 'Quindanning', - 61898920 => 'Albany', + 6189892 => 'Albany', 61898921 => 'Mount Barker', - 61898922 => 'Albany', 61898923 => 'Denmark', 61898924 => 'Porongurup', - 61898925 => 'Albany', - 61898926 => 'Albany', - 61898927 => 'Albany', - 61898928 => 'Albany', - 61898929 => 'Albany', 61898930 => 'Wagin', 61898931 => 'Tarwonga', 61898932 => 'Wickepin', @@ -48607,16 +42190,11 @@ 61899377 => 'Morawa', 61899378 => 'Morawa', 61899379 => 'Geraldton', - 61899380 => 'Geraldton', - 61899381 => 'Geraldton', - 61899382 => 'Geraldton', - 61899383 => 'Geraldton', - 61899384 => 'Geraldton', + 6189938 => 'Geraldton', 61899385 => 'Northampton', 61899386 => 'Northampton', 61899387 => 'Northern Gully', 61899388 => 'Northern Gully', - 61899389 => 'Geraldton', 61899390 => 'Mingenew/Yandanooka/Yaringa', 61899391 => 'Nabawa/Yuna/Yuna East', 61899392 => 'Nangetty/Ajana/Arrowsmith', @@ -48758,14 +42336,9 @@ 61899537 => 'Gutha West', 61899538 => 'Howatharra', 61899539 => 'Lake Mason', + 6189954 => 'Three Springs', 61899540 => 'Lake Mason', - 61899541 => 'Three Springs', 61899542 => 'Latham', - 61899543 => 'Three Springs', - 61899544 => 'Three Springs', - 61899545 => 'Three Springs', - 61899546 => 'Three Springs', - 61899547 => 'Three Springs', 61899548 => 'Arrowsmith', 61899549 => 'Arrowsmith', 61899550 => 'Ajana', @@ -48893,14 +42466,7 @@ 61899707 => 'Geraldton', 61899708 => 'Geraldton', 61899709 => 'Geraldton', - 61899710 => 'Morawa', - 61899711 => 'Morawa', - 61899712 => 'Morawa', - 61899713 => 'Morawa', - 61899714 => 'Morawa', - 61899715 => 'Morawa', - 61899716 => 'Morawa', - 61899717 => 'Morawa', + 6189971 => 'Morawa', 61899718 => 'Perenjori', 61899719 => 'Perenjori East', 61899720 => 'Gutha West', diff --git a/src/geocoding/data/en/675.php b/src/geocoding/data/en/675.php index 1f48460b5..fb650578d 100644 --- a/src/geocoding/data/en/675.php +++ b/src/geocoding/data/en/675.php @@ -15,9 +15,7 @@ 67542 => 'Madang', 67545 => 'Sepik', 67547 => 'Morobe', - 67553 => 'Highlands', - 67554 => 'Highlands', - 67562 => 'Oro', - 67564 => 'MP/Gulf/Tabubil/Kiunga', + 6755 => 'Highlands', + 6756 => 'MP/Gulf/Tabubil/Kiunga', 6759 => 'Islands', ); diff --git a/src/geocoding/data/en/7.php b/src/geocoding/data/en/7.php index 0e9dd8772..dbbd58456 100644 --- a/src/geocoding/data/en/7.php +++ b/src/geocoding/data/en/7.php @@ -13,7 +13,7 @@ return array ( 7301 => 'Republic of Buryatia', 7302 => 'Chita', - 733622 => 'Baikonur', + 733 => 'Baikonur', 7341 => 'Udmurtian Republic', 7342 => 'Perm', 7343 => 'Ekaterinburg', @@ -33,7 +33,7 @@ 7390 => 'Republic of Khakassia', 7391 => 'Krasnoyarsk Territory', 7394 => 'Republic of Tuva', - 7401 => 'Kaliningrad', + 740 => 'Kaliningrad', 7411 => 'Republic of Sakha', 7413 => 'Magadan', 7415 => 'Kamchatka Region', @@ -77,7 +77,7 @@ 771041 => 'Aktau, Zhezkazgan', 771042 => 'Zharyk', 771043 => 'Zhairem', - 771063 => 'Satpaev', + 77106 => 'Satpaev', 77112 => 'Uralsk', 771130 => 'Peremetnoye', 771131 => 'Darinskoye', @@ -98,11 +98,12 @@ 771146 => 'Akzhaiksky District', 771147 => 'Akzhaiksky District', 771149 => 'Zelenovsky District', - 7712 => 'Atyrau Region', 77122 => 'Atyrau', + 771230 => 'Atyrau Region', 7712302 => 'Tengizshevroil', 7712303 => 'Tengizs', 771231 => 'Akkystau', + 771232 => 'Atyrau Region', 771233 => 'Ganyushkino', 771234 => 'Indernborski', 771235 => 'Dossor', @@ -110,7 +111,7 @@ 771237 => 'Kulsary', 771238 => 'Miyaly', 771239 => 'Makat', - 7713 => 'Aktobe Region', + 77125 => 'Atyrau Region', 77132 => 'Aktobe/Kargalinskoye', 771330 => 'Khromtau District', 771331 => 'Martuk', @@ -130,7 +131,7 @@ 771347 => 'Aitekebisky District', 771348 => 'Shalkarsky District', 771349 => 'Shalkarsky District', - 7714 => 'Kostanai Region', + 77135 => 'Aktobe Region', 77142 => 'Kostanai', 771430 => 'Arkalyk', 771431 => 'Rudny', @@ -158,7 +159,9 @@ 771455 => 'Zatobolsk', 771456 => 'Kachar', 771457 => 'Dzhangildinsky District', + 771458 => 'Kostanai Region', 77145834 => 'Krasnogorsk', + 771459 => 'Kostanai Region', 77152 => 'Petropavlovsk', 771531 => 'Bulayevo', 771532 => 'Smirnovo', @@ -198,8 +201,7 @@ 771648 => 'Derzhavinsk', 771649 => 'Zhaksynsky District', 771651 => 'Kabanbai Batyr', - 77172 => 'Astana', - 7718 => 'Pavlodar Region', + 7717 => 'Astana', 77182 => 'Pavlodar', 771831 => 'Zhelezinka', 771832 => 'Irtyshsk', @@ -216,7 +218,6 @@ 771844 => 'Irtyshsky District', 771845 => 'Pavlodar Area', 77187 => 'Ekibastuz', - 7721 => 'Karaganda Region', 77212 => 'Karaganda', 77213 => 'Aktau/Temirtau', 772131 => 'Abai', @@ -231,12 +232,13 @@ 772153 => 'Topar', 772154 => 'Botakara', 772156 => 'Shakhtinsk', + 772159 => 'Karaganda Region', 77222 => 'Semey', 772230 => 'Urdzhar', 772236 => 'Beskaragai', 772237 => 'Ayagoz', 772239 => 'Makanchi', - 772246 => 'Barshatas', + 77224 => 'Barshatas', 772251 => 'Kurchatov', 772252 => 'Karaul', 772256 => 'Kainar', @@ -263,7 +265,6 @@ 772348 => 'Kokpekty', 772351 => 'Borodulikha', 772353 => 'Novaya Shulba', - 7724 => 'Kyzylorda Region', 77242 => 'Kyzylorda', 772431 => 'Zhalagash', 772432 => 'Shiyeli', @@ -273,6 +274,7 @@ 772437 => 'Zhosaly', 772438 => 'Aiteke bi', 772439 => 'Aralsky District', + 77245 => 'Kyzylorda Region', 77252 => 'Shymkent', 772530 => 'Temirlanovka', 772531 => 'Aksukent', @@ -306,15 +308,15 @@ 772642 => 'Moiynkum', 772643 => 'Shu', 772644 => 'Karatau', - 7727 => 'Almaty Region', 77272 => 'Almaty', 772725 => 'Otegen Batyra', 77272956 => 'Talgar', 77272983 => 'Kaskelen', 77273 => 'Almaty', - 772740 => 'Karassaisky District', + 77274 => 'Karassaisky District', 772752 => 'Otegen Batyra', 772757 => 'Akshi', + 772759 => 'Almaty Region', 772770 => 'Uzynagash', 772771 => 'Kaskelen', 772772 => 'Kapchagai', diff --git a/src/geocoding/data/en/880.php b/src/geocoding/data/en/880.php index 0578ebb97..5720cb9e3 100644 --- a/src/geocoding/data/en/880.php +++ b/src/geocoding/data/en/880.php @@ -45,7 +45,6 @@ 8803172 => 'Chittagong', 8803174 => 'Chittagong', 8803175 => 'Chittagong', - 8803181 => 'Chittagong', 88032151 => 'Noakhali', 88032152 => 'Noakhali', 88032153 => 'Noakhali', @@ -184,7 +183,6 @@ 880462674 => 'Nazirpur, Pirojpur', 88046268 => 'Nazirpur, Bagerhat', 88046278 => 'Swarupkhati, Bagerhat', - 88046528 => 'Chitalmari, Bagerhat', 88046532 => 'Fakirhat, Bagerhat', 88046533 => 'Fakirhat, Bagerhat', 88046534 => 'Fakirhat, Bagerhat', @@ -404,28 +402,12 @@ 88069268 => 'Tongibari', 88070222 => 'Bheramara, Kushtia', 88070223 => 'Bheramara, Kushtia', - 8807153 => 'Kushtia', - 8807154 => 'Kushtia', - 8807155 => 'Kushtia', - 8807161 => 'Kushtia', - 8807162 => 'Kushtia', - 8807171 => 'Kushtia', - 8807175 => 'Daulatpur, Kushtia', - 8807176 => 'Kumarkhali, Kushtia', - 8807189 => 'Kushtia', 88072175 => 'Rajshahi', 88072176 => 'Rajshahi', 88072177 => 'Rajshahi', 88072180 => 'Rajshahi', 88072181 => 'Rajshahi', 88072186 => 'Rajshahi', - 880722556 => 'Godagari, Rajshahi', - 88072258 => 'Godagari', - 88072278 => 'Paba', - 880722856 => 'Putia, Rajshahi', - 88072288 => 'Baneswar', - 880722956 => 'Tanore, Rajshahi', - 88072298 => 'Tanore', 88073162 => 'Pabna', 88073163 => 'Pabna', 88073164 => 'Pabna', @@ -450,39 +432,17 @@ 88074163 => 'Nagoan', 88074169 => 'Santahar, Nagoan', 88074189 => 'Nagoan', - 88074258 => 'Manda', - 880742675 => 'Mohadevpur, Nagoan', - 88074268 => 'Mahadevpur', 88075162 => 'Sirajganj', 88075163 => 'Sirajganj', 88075172 => 'Sirajganj', 88075173 => 'Sirajganj', 88075189 => 'Sirajganj', - 880752256 => 'Belkuchi, Sirajganj', - 88075228 => 'Belkuchi, Sirajganj', - 88075238 => 'Chouhali, Sirajganj', - 88075248 => 'Kamarkhand, Sirajganj', - 880752556 => 'Kazipur, Sirajganj', - 88075258 => 'Kazipur, Sirajganj', - 880752656 => 'Raiganj, Sirajganj', - 88075268 => 'Raigonj, Sirajganj', - 88075278 => 'Shajatpur, Sirajganj', - 880752856 => 'Tarash, Sirajganj', - 88075288 => 'Tarash, Sirajganj', - 880752956 => 'Ullapara, Sirajganj', - 88075298 => 'Ullapara, Sirajganj', 88076162 => 'Chuadanga', 88076163 => 'Chuadanga', 88076164 => 'Chuadanga', 88076189 => 'Chuadanga', 88076222 => 'Alamdanga, Chuadanga', 88076223 => 'Alamdanga, Chuadanga', - 88077161 => 'Natore', - 88077162 => 'Natore', - 88077166 => 'Natore', - 88077167 => 'Natore', - 88077175 => 'Lalpur, Natore', - 88077189 => 'Natore', 880772474 => 'Gurudashpur, Natore', 88078155 => 'Chapai Nobabganj', 88078156 => 'Chapai Nobabganj', @@ -492,11 +452,8 @@ 88078174 => 'Rahanpur, Chapai Nobabganj', 88078175 => 'Shibganj, Chapai Nobabganj', 88078189 => 'Chapai Nobabganj', - 88078238 => 'Rohanpur', - 88078258 => 'Shibgonj', 88079162 => 'Meherpur', 88079163 => 'Meherpur', - 880792374 => 'Mujibnagar, Meherpur', 880802056 => 'Chauddagram, Comilla', 88080208 => 'Chauddagram, Comilla', 880802256 => 'Chandina, Comilla', @@ -530,17 +487,6 @@ 88082171 => 'Sylhet MEA', 88082172 => 'Sylhet MEA', 88082176 => 'Sylhet MEA', - 88082181 => 'Sylhet MEA', - 88082208 => 'Kanaighat', - 88082228 => 'Balagonj', - 88082238 => 'Bianibazar', - 88082248 => 'Biswanath', - 880822556 => 'Companiganj, Sylhet', - 88082268 => 'Fenchugonj', - 88082278 => 'Golapgonj', - 880822956 => 'Jaintapur, Sylhet', - 88082298 => 'Jaintapur', - 880823256 => 'Jokiganj, Sylhet', 88083152 => 'Habiganj', 88083153 => 'Habiganj', 88083161 => 'Habiganj', @@ -550,10 +496,6 @@ 88083278 => 'Madabpur', 880832856 => 'Nabiganj, Habiganj', 88083288 => 'Nabigonj', - 88083326 => 'Sayestaganj, Habiganj', - 88083327 => 'Sayestaganj, Habiganj', - 88083328 => 'Sayestaganj, Habiganj', - 88083329 => 'Sayestaganj, Habiganj', 88084163 => 'Chandpur', 88084164 => 'Chandpur', 88084165 => 'Chandpur', @@ -626,8 +568,6 @@ 880902756 => 'Iswarganj, Mymensingh', 88090278 => 'Ishwargonj', 88090288 => 'Muktagacha', - 880903256 => 'Trisal, Mymensingh', - 880903356 => 'Phulpur, Mymensingh', 8809151 => 'Mymensingh', 8809152 => 'Mymensingh', 8809153 => 'Mymensingh', @@ -656,9 +596,6 @@ 880922856 => 'Modhupur, Tangail', 88092288 => 'Modhupur', 88092298 => 'Mirzapur', - 880923256 => 'Shakhipur, Tangail', - 88092328 => 'Shakhipur', - 880923373 => 'Nagarpur, Tangail', 88093161 => 'Sherpur', 88093173 => 'Nalitabari, Sherpur', 88093175 => 'Nakla, Sherpur', @@ -683,10 +620,6 @@ 88095161 => 'Netrokona', 88095162 => 'Netrokona', 88095189 => 'Netrokona', - 880952456 => 'Mohanganj, Netrokona', - 880952556 => 'Durgapur, Netrokona', - 880952856 => 'Kendua, Netrokona', - 880952956 => 'Madan, Netrokona', 88098162 => 'Jamalpur', 88098163 => 'Jamalpur', 88098164 => 'Jamalpur', @@ -694,7 +627,4 @@ 88098174 => 'Islampur, Jamalpur', 88098175 => 'Dewanganj, Jamalpur', 88098189 => 'Jamalpur', - 88098248 => 'Islampur', - 880982756 => 'Sarishabari, Jamalpur', - 88098278 => 'Sarishabari', ); diff --git a/src/geocoding/data/en/886.php b/src/geocoding/data/en/886.php index 4a40ef464..63ef7081a 100644 --- a/src/geocoding/data/en/886.php +++ b/src/geocoding/data/en/886.php @@ -14,14 +14,18 @@ 8862 => 'Taipei', 8863 => 'Taoyuan/Hsinchu/Yilan/Hualien', 88637 => 'Miaoli', - 8864 => 'Taichung/Changhua', + 88642 => 'Taichung/Changhua', + 88643 => 'Taichung/Changhua', + 88647 => 'Taichung/Changhua', + 88648 => 'Taichung/Changhua', 88649 => 'Nantou', 8865 => 'Chiayi/Yunlin', 8866 => 'Tainan/Penghu', 8867 => 'Kaohsiung', - 8868 => 'Pingtung', - 88682 => 'Kinmen', + 88680 => 'Pingtung', + 886823 => 'Kinmen', 886826 => 'Wuqiu', - 886836 => 'Matsu', + 88687 => 'Pingtung', + 88688 => 'Pingtung', 88689 => 'Taitung', ); diff --git a/src/geocoding/data/en/90.php b/src/geocoding/data/en/90.php index 35099d5be..a4ae29d5c 100644 --- a/src/geocoding/data/en/90.php +++ b/src/geocoding/data/en/90.php @@ -12,167 +12,85 @@ return array ( 90212 => 'Istanbul (Europe)', - 90213 => 'Istanbul (Europe)', 90216 => 'Istanbul (Anatolia)', - 90217 => 'Istanbul (Anatolia)', 90222 => 'Esksehir', - 90223 => 'Esksehir', 90224 => 'Bursa', - 90225 => 'Bursa', 90226 => 'Yalova', - 90227 => 'Yalova', 90228 => 'Bilecik', - 90229 => 'Bilecik', 90232 => 'Izmir', - 90233 => 'Izmir', 90236 => 'Manisa', - 90237 => 'Manisa', 90242 => 'Antalya', - 90243 => 'Antalya', 90246 => 'Isparta', - 90247 => 'Isparta', 90248 => 'Burdur', - 90249 => 'Burdur', 90252 => 'Mugla', - 90253 => 'Mugla', 90256 => 'Aydin', - 90257 => 'Aydin', 90258 => 'Denizli', - 90259 => 'Denizli', 90262 => 'Kocaeli', - 90263 => 'Kocaeli', 90264 => 'Sakarya', - 90265 => 'Sakarya', 90266 => 'Balikesir', - 90267 => 'Balikesir', 90272 => 'Afyon', - 90273 => 'Afyon', 90274 => 'Kutahya', - 90275 => 'Kutahya', 90276 => 'Usak', - 90277 => 'Usak', 90282 => 'Tekirdag', - 90283 => 'Tekirdag', 90284 => 'Edirne', - 90285 => 'Edirne', 90286 => 'Canakkale', - 90287 => 'Canakkale', 90288 => 'Kirklareli', - 90289 => 'Kirklareli', 90312 => 'Ankara', - 90313 => 'Ankara', 90318 => 'Kirikkale', - 90319 => 'Kirikkale', 90322 => 'Adana', - 90323 => 'Adana', 90324 => 'Icel', - 90325 => 'Icel', 90326 => 'Hatay', - 90327 => 'Hatay', 90328 => 'Osmaniye', - 90329 => 'Osmaniye', 90332 => 'Konya', - 90333 => 'Konya', 90338 => 'Karaman', - 90339 => 'Karaman', 90342 => 'Gaziantep', - 90343 => 'Gaziantep', 90344 => 'K. Maras', - 90345 => 'K. Maras', 90346 => 'Sivas', - 90347 => 'Sivas', 90348 => 'Kilis', - 90349 => 'Kilis', 90352 => 'Kayseri', - 90353 => 'Kayseri', 90354 => 'Yozgat', - 90355 => 'Yozgat', 90356 => 'Tokat', - 90357 => 'Tokat', 90358 => 'Amasya', - 90359 => 'Amasya', 90362 => 'Samsun', - 90363 => 'Samsun', 90364 => 'Corum', - 90365 => 'Corum', 90366 => 'Kastamonu', - 90367 => 'Kastamonu', 90368 => 'Sinop', - 90369 => 'Sinop', 90370 => 'Karabuk', - 90371 => 'Karabuk', 90372 => 'Zongdulak', - 90373 => 'Zongdulak', 90374 => 'Bolu', - 90375 => 'Bolu', 90376 => 'Cankiri', - 90377 => 'Cankiri', 90378 => 'Bartin', - 90379 => 'Bartin', 90380 => 'Duzce', - 90381 => 'Duzce', 90382 => 'Aksaray', - 90383 => 'Aksaray', 90384 => 'Nevsehir', - 90385 => 'Nevsehir', 90386 => 'Kirsehir', - 90387 => 'Kirsehir', 90388 => 'Nigde', - 90389 => 'Nigde', 90412 => 'Diyarbakir', - 90413 => 'Diyarbakir', 90414 => 'Sanliurfa', - 90415 => 'Sanliurfa', 90416 => 'Adiyaman', - 90417 => 'Adiyaman', 90422 => 'Malatya', - 90423 => 'Malatya', 90424 => 'Elazig', - 90425 => 'Elazig', 90426 => 'Bingol', - 90427 => 'Bingol', 90428 => 'Tuniceli', - 90429 => 'Tuniceli', 90432 => 'Van', - 90433 => 'Van', 90434 => 'Bitlis', - 90435 => 'Bitlis', 90436 => 'Mus', - 90437 => 'Mus', 90438 => 'Hakkari', - 90439 => 'Hakkari', 90442 => 'Erzurum', - 90443 => 'Erzurum', 90446 => 'Erzincan', - 90447 => 'Erzincan', 90452 => 'Ordu', - 90453 => 'Ordu', 90454 => 'Giresun', - 90455 => 'Giresun', 90456 => 'Gumushane', - 90457 => 'Gumushane', 90458 => 'Bayburt', - 90459 => 'Bayburt', 90462 => 'Trabzon', - 90463 => 'Trabzon', 90464 => 'Rize', - 90465 => 'Rize', 90466 => 'Artvin', - 90467 => 'Artvin', 90472 => 'Agri', - 90473 => 'Agri', 90474 => 'Kars', - 90475 => 'Kars', 90476 => 'Igdir', - 90477 => 'Igdir', 90478 => 'Ardahan', - 90479 => 'Ardahan', 90482 => 'Mardin', - 90483 => 'Mardin', 90484 => 'Stirt', - 90485 => 'Stirt', 90486 => 'Sirnak', - 90487 => 'Sirnak', 90488 => 'Batman', - 90489 => 'Batman', ); diff --git a/src/geocoding/data/en/94.php b/src/geocoding/data/en/94.php index adb76983f..0bbb42c01 100644 --- a/src/geocoding/data/en/94.php +++ b/src/geocoding/data/en/94.php @@ -38,6 +38,6 @@ 9465 => 'Batticaloa', 9466 => 'Matale', 9467 => 'Kalmunai, Ampara', - 9481 => 'Kandy', - 9491 => 'Galle', + 948 => 'Kandy', + 949 => 'Galle', ); diff --git a/src/geocoding/data/en/992.php b/src/geocoding/data/en/992.php index 508e5d425..369c9e101 100644 --- a/src/geocoding/data/en/992.php +++ b/src/geocoding/data/en/992.php @@ -70,5 +70,5 @@ 9923554 => 'Murgab', 9923555 => 'Roshtkala', 9923556 => 'Rushan', - 992372 => 'Dushanbe', + 99237 => 'Dushanbe', ); diff --git a/src/geocoding/data/en/996.php b/src/geocoding/data/en/996.php index c215ab001..4de2a0030 100644 --- a/src/geocoding/data/en/996.php +++ b/src/geocoding/data/en/996.php @@ -20,7 +20,7 @@ 9963137 => 'Kayndy, Chuy region', 9963138 => 'Tokmok, Chuy region', 9963139 => 'Lebedinovka, Chuy region', - 9963222 => 'Osh', + 996322 => 'Osh', 9963230 => 'Eski-Nookat, Osh region', 9963231 => 'Aravan, Osh region', 9963232 => 'Kara-Suu, Osh region', @@ -28,22 +28,22 @@ 9963234 => 'Gulcha, Osh region', 9963237 => 'Daroot-Korgon, Osh region', 9963239 => 'Kara-Kulja, Osh region', - 9963422 => 'Talas', + 996342 => 'Talas', 9963456 => 'Kyzyl-Adyr, Talas region', 9963457 => 'Bakay-Ata, Talas region', 9963458 => 'Kokoy, Talas region', 9963459 => 'Pokrovka, Talas region', - 9963522 => 'Naryn', + 996352 => 'Naryn', 9963534 => 'At-Bashy, Naryn region', 9963535 => 'Kochkor, Naryn region', 9963536 => 'Chaek/Minkush, Naryn region', 9963537 => 'Baetov, Naryn region', - 9963622 => 'Batken, Naryn region', + 996362 => 'Batken, Naryn region', 9963653 => 'Sulukta, Naryn region', 9963655 => 'Pulgon, Naryn region', 9963656 => 'Isfana, Naryn region', 9963657 => 'Kyzylkia, Naryn region', - 9963722 => 'Jalal-Abat', + 996372 => 'Jalal-Abat', 9963734 => 'Massy/Kochkor-Ata, Jalal-Abat region', 9963736 => 'Bazarkorgon, Jalal-Abat region', 9963738 => 'Kazarman, Jalal-Abat region', @@ -55,7 +55,7 @@ 9963747 => 'Toktogul, Jalal-Abat region', 9963748 => 'Kok-Jangak/Suzak, Jalal-Abat region', 9963749 => 'Kanysh-Kya (Chatkal), Jalal-Abat region', - 9963922 => 'Karakol, Issyk-Ko region', + 996392 => 'Karakol, Issyk-Ko region', 9963942 => 'Ananyevo, Issyk-Ko region', 9963943 => 'Cholpon-Ata, Issyk-Ko region', 9963944 => 'Balykchy, Issyk-Ko region', diff --git a/src/geocoding/data/es/58.php b/src/geocoding/data/es/58.php index 9b01bd806..a19d0c794 100644 --- a/src/geocoding/data/es/58.php +++ b/src/geocoding/data/es/58.php @@ -11,6 +11,6 @@ */ return array ( - 58212 => 'Distrito Capital/Miranda/Vargas', + 5821 => 'Distrito Capital/Miranda/Vargas', 58237 => 'Dependencias Federales', ); diff --git a/src/geocoding/data/fr/352.php b/src/geocoding/data/fr/352.php index afe7d8b25..1edbffe05 100644 --- a/src/geocoding/data/fr/352.php +++ b/src/geocoding/data/fr/352.php @@ -11,14 +11,17 @@ */ return array ( - 35221 => 'Weicherdange', 35222 => 'Luxembourg-Ville', 35223 => 'Mondorf-les-Bains/Bascharage/Noerdange/Remich', - 35224 => 'Luxembourg', + 352240 => 'Luxembourg', + 352241 => 'Luxembourg', + 3522420 => 'Luxembourg', 3522421 => 'Weicherdange', 3522422 => 'Luxembourg-Ville', 3522423 => 'Mondorf-les-Bains/Bascharage/Noerdange/Remich', + 3522424 => 'Luxembourg', 3522425 => 'Luxembourg', + 3522426 => 'Luxembourg', 3522427 => 'Belair, Luxembourg', 3522428 => 'Luxembourg-Ville', 3522429 => 'Luxembourg/Kockelscheuer', @@ -30,11 +33,15 @@ 3522435 => 'Sandweiler/Moutfort/Roodt-sur-Syre', 3522436 => 'Hesperange/Kockelscheuer/Roeser', 3522437 => 'Leudelange/Ehlange/Mondercange', + 3522438 => 'Luxembourg', 3522439 => 'Windhof/Steinfort', 3522440 => 'Howald', + 3522441 => 'Luxembourg', 3522442 => 'Plateau de Kirchberg', 3522443 => 'Findel/Kirchberg', + 3522444 => 'Luxembourg', 3522445 => 'Diedrich', + 3522446 => 'Luxembourg', 3522447 => 'Lintgen', 3522448 => 'Contern/Foetz', 3522449 => 'Howald', @@ -48,22 +55,29 @@ 3522457 => 'Esch-sur-Alzette/Schifflange', 3522458 => 'Soleuvre/Differdange', 3522459 => 'Soleuvre', + 352246 => 'Luxembourg', 3522467 => 'Dudelange', + 3522470 => 'Luxembourg', 3522471 => 'Betzdorf', 3522472 => 'Echternach', 3522473 => 'Rosport', 3522474 => 'Wasserbillig', 3522475 => 'Grevenmacher-sur-Moselle', 3522476 => 'Wormeldange', + 3522477 => 'Luxembourg', 3522478 => 'Junglinster', 3522479 => 'Berdorf/Consdorf', 3522480 => 'Diekirch', 3522481 => 'Ettelbruck/Reckange-sur-Mess', + 3522482 => 'Luxembourg', 3522483 => 'Vianden', 3522484 => 'Han/Lesse', 3522485 => 'Bissen/Roost', + 3522486 => 'Luxembourg', 3522487 => 'Larochette', 3522488 => 'Mertzig/Wahl', + 3522489 => 'Luxembourg', + 352249 => 'Luxembourg', 3522492 => 'Clervaux/Fischbach/Hosingen', 3522495 => 'Wiltz', 3522497 => 'Huldange', @@ -186,11 +200,13 @@ 35236 => 'Hesperange/Kockelscheuer/Roeser', 35237 => 'Leudelange/Ehlange/Mondercange', 35239 => 'Windhof/Steinfort', - 3524 => 'Luxembourg-Ville', 35240 => 'Howald', + 35241 => 'Luxembourg-Ville', 35242 => 'Plateau de Kirchberg', 35243 => 'Findel/Kirchberg', + 35244 => 'Luxembourg-Ville', 35245 => 'Diedrich', + 35246 => 'Luxembourg-Ville', 35247 => 'Lintgen', 35248 => 'Contern/Foetz', 35249 => 'Howald', diff --git a/src/geocoding/data/ru/7.php b/src/geocoding/data/ru/7.php index 7f280a2d5..4ee982bb3 100644 --- a/src/geocoding/data/ru/7.php +++ b/src/geocoding/data/ru/7.php @@ -11,9 +11,8 @@ */ return array ( - 733622 => 'Байконыр', + 733 => 'Байконыр', 77102 => 'Жезказган', - 77103 => 'Жезказган', 771030 => 'Жана-Аркинский р-н', 771031 => 'Шетский р-н', 771032 => 'Каражал', @@ -28,7 +27,7 @@ 771041 => 'Актау, Жезказган', 771042 => 'Акой', 771043 => 'Жайрем (поселок)', - 771063 => 'Сатпаев', + 77106 => 'Сатпаев', 77112 => 'Уральск', 771130 => 'Зеленовский р-н', 771131 => 'Зеленовский р-н', @@ -49,11 +48,12 @@ 771146 => 'Акжаикский р-н', 771147 => 'Акжаикский р-н', 771149 => 'Акжаикский р-н', - 7712 => 'Атырауская область', 77122 => 'Атырау', + 771230 => 'Атырауская область', 7712302 => 'Тенгизшевройл', 7712303 => 'Тензиз', 771231 => 'Исатайский р-н', + 771232 => 'Атырауская область', 771233 => 'Курмангазинский р-н', 771234 => 'Индерский р-н', 771235 => 'Макатский р-н', @@ -61,7 +61,7 @@ 771237 => 'Жылыойский р-н', 771238 => 'Кзылкогинский р-н', 771239 => 'Макатский р-н', - 7713 => 'Актюбинская область', + 77125 => 'Атырауская область', 77132 => 'Актобе/Актюбинск', 771330 => 'Хромтауский р-н', 771331 => 'Мартукский р-н', @@ -81,7 +81,7 @@ 771347 => 'Айтекебийский р-н', 771348 => 'Шалкарский р-н', 771349 => 'Шалкарский р-н', - 7714 => 'Костанайская область', + 77135 => 'Актюбинская область', 77142 => 'Костанай', 771430 => 'Аркалык', 771431 => 'Рудный', @@ -109,7 +109,9 @@ 771455 => 'Костанайский р-н', 771456 => 'Качар', 771457 => 'Джангильдинский р-н', + 771458 => 'Костанайская область', 77145834 => 'Красногорск', + 771459 => 'Костанайская область', 77152 => 'Петропавловск', 771531 => 'Магжана Жумабаева р-н', 771532 => 'Аккайынский р-н', @@ -149,8 +151,7 @@ 771648 => 'Жаркаинский р-н', 771649 => 'Жаксынский р-н', 771651 => 'Целиноградский р-н', - 77172 => 'Астана', - 7718 => 'Павлодарская область', + 7717 => 'Астана', 77182 => 'Павлодар', 771831 => 'Железинский р-н', 771832 => 'Иртышский р-н', @@ -167,13 +168,12 @@ 771844 => 'Иртышский р-н', 771845 => 'Павлодар', 77187 => 'Экибастуз', - 7721 => 'Карагандинская область', 77212 => 'Караганда', + 77213 => 'Темиртау', 772131 => 'Абайский р-н', 772132 => 'Нуринский р-н', 772137 => 'Сарань', 772138 => 'Бухар-Жырауский р-н', - 77213 => 'Темиртау', 772144 => 'Нуринский р-н', 772146 => 'Каркаралинск', 772147 => 'Каркаралинский р-н', @@ -182,12 +182,13 @@ 772153 => 'Абайский р-н', 772154 => 'Бухар-Жырауский р-н', 772156 => 'Шахтинск', + 772159 => 'Карагандинская область', 77222 => 'Семипалатинск', 772230 => 'Урджарский р-н', 772236 => 'Бескарагайский р-н', 772237 => 'Аязог', 772239 => 'Урджарский р-н', - 772246 => 'Эмельтау', + 77224 => 'Эмельтау', 772251 => 'Курчатов', 772252 => 'Абайский р-н', 772256 => 'Алгабас', @@ -214,7 +215,6 @@ 772348 => 'Кокпектинский р-н', 772351 => 'Бородулихинский р-н', 772353 => 'Бородулихинский р-н', - 7724 => 'Кызылординская область', 77242 => 'Кызылорда', 772431 => 'Жалагашский р-н', 772432 => 'Шиелийский р-н', @@ -224,6 +224,7 @@ 772437 => 'Кармакшинский р-н', 772438 => 'Казалинский р-н', 772439 => 'Аральский р-н', + 77245 => 'Кызылординская область', 77252 => 'Шымкент', 772530 => 'Темирлановка', 772531 => 'Аксукент', @@ -257,15 +258,15 @@ 772642 => 'Мойынкумский р-н', 772643 => 'Шуский р-н', 772644 => 'Таласский р-н', - 7727 => 'Алматинская область', + 77272 => 'Алма-Ата', 772725 => 'Отеген-Батыр', 77272956 => 'Талгар', 77272983 => 'Каскелен', - 77272 => 'Алма-Ата', 77273 => 'Алма-Ата', - 772740 => 'Карасайский р-н', + 77274 => 'Карасайский р-н', 772752 => 'Илийский р-н', 772757 => 'Акший', + 772759 => 'Алматинская область', 772770 => 'Жамбылский р-н', 772771 => 'Карасайский р-н', 772772 => 'Капчагай', diff --git a/src/geocoding/data/tr/90.php b/src/geocoding/data/tr/90.php index aaaa71339..fe812a3ef 100644 --- a/src/geocoding/data/tr/90.php +++ b/src/geocoding/data/tr/90.php @@ -12,77 +12,40 @@ return array ( 90212 => 'Istanbul (Avrupa)', - 90213 => 'Istanbul (Avrupa)', 90222 => 'Eskisehir', - 90223 => 'Eskisehir', 90232 => 'İzmir', - 90233 => 'İzmir', 90252 => 'Muğla', - 90253 => 'Muğla', 90256 => 'Aydın', - 90257 => 'Aydın', 90262 => 'Kocaeli (İzmit)', - 90263 => 'Kocaeli (İzmit)', 90264 => 'Sakarya (Adapazarı)', - 90265 => 'Sakarya (Adapazarı)', 90266 => 'Balıkesir', - 90267 => 'Balıkesir', 90274 => 'Kütahya', - 90275 => 'Kütahya', 90276 => 'Uşak', - 90277 => 'Uşak', 90282 => 'Tekirdağ', - 90283 => 'Tekirdağ', 90286 => 'Çanakkale', - 90287 => 'Çanakkale', 90288 => 'Kırklareli', - 90289 => 'Kırklareli', 90318 => 'Kırıkkale', - 90319 => 'Kırıkkale', 90324 => 'Mersin', - 90325 => 'Mersin', 90344 => 'Kahramanmaraş', - 90345 => 'Kahramanmaraş', 90364 => 'Çorum', - 90365 => 'Çorum', 90370 => 'Karabük', - 90371 => 'Karabük', 90372 => 'Zonguldak', - 90373 => 'Zonguldak', 90376 => 'Çankırı', - 90377 => 'Çankırı', 90378 => 'Bartın', - 90379 => 'Bartın', 90380 => 'Düzce', - 90381 => 'Düzce', 90384 => 'Nevşehir', - 90385 => 'Nevşehir', 90386 => 'Kırşehir', - 90387 => 'Kırşehir', 90388 => 'Niğde', - 90389 => 'Niğde', 90412 => 'Diyarbakır', - 90413 => 'Diyarbakır', 90414 => 'Şanlıurfa', - 90415 => 'Şanlıurfa', 90416 => 'Adıyaman', - 90417 => 'Adıyaman', 90424 => 'Elazığ', - 90425 => 'Elazığ', 90426 => 'Bingöl', - 90427 => 'Bingöl', 90428 => 'Tunceli', - 90429 => 'Tunceli', 90436 => 'Muş', - 90437 => 'Muş', 90456 => 'Gümüşhane', - 90457 => 'Gümüşhane', 90472 => 'Ağrı', - 90473 => 'Ağrı', 90476 => 'Iğdır', - 90477 => 'Iğdır', 90484 => 'Siirt', - 90485 => 'Siirt', 90486 => 'Şırnak', - 90487 => 'Şırnak', ); diff --git a/src/geocoding/data/uk/380.php b/src/geocoding/data/uk/380.php index 6788f86c0..41d807740 100644 --- a/src/geocoding/data/uk/380.php +++ b/src/geocoding/data/uk/380.php @@ -26,34 +26,52 @@ 3803144 => 'Іршава, Закарпатська', 3803145 => 'Перечин, Закарпатська', 3803146 => 'Міжгірʼя, Закарпатська', - 38032 => 'Львів/Львівська', + 380320 => 'Львів/Львівська', + 380321 => 'Львів/Львівська', 380322 => 'Брюховичі/Львів, Львівська', 3803230 => 'Пустомити, Львівська', 3803231 => 'Городок, Львівська', + 3803232 => 'Львів/Львівська', + 3803233 => 'Львів/Львівська', 3803234 => 'Мостиська, Львівська', + 3803235 => 'Львів/Львівська', 3803236 => 'Самбір, Львівська', + 3803237 => 'Львів/Львівська', 3803238 => 'Старий Самбір, Львівська', 3803239 => 'Жидачів, Львівська', + 3803240 => 'Львів/Львівська', 3803241 => 'Миколаїв, Львівська', + 3803242 => 'Львів/Львівська', + 3803243 => 'Львів/Львівська', 3803244 => 'Дрогобич, Львівська', 3803245 => 'Стрий, Львівська', + 3803246 => 'Львів/Львівська', 3803247 => 'Трускавець, Львівська', 3803248 => 'Борислав/Східниця, Львівська', 3803249 => 'Червоноград, Львівська', + 3803250 => 'Львів/Львівська', 3803251 => 'Сколе/Славське, Львівська', 3803252 => 'Жовква, Львівська', + 3803253 => 'Львів/Львівська', 3803254 => 'Камʼянка-Бузька, Львівська', 3803255 => 'Радехів, Львівська', 3803256 => 'Новояворівськ, Львівська', 3803257 => 'Сокаль, Львівська', + 3803258 => 'Львів/Львівська', 3803259 => 'Яворів, Львівська', 3803260 => 'Моршин, Львівська', 3803261 => 'Новий Роздол, Львівська', + 3803262 => 'Львів/Львівська', 3803263 => 'Перемишляни, Львівська', 3803264 => 'Буськ, Львівська', 3803265 => 'Золочів, Львівська', 3803266 => 'Броди, Львівська', + 3803267 => 'Львів/Львівська', + 3803268 => 'Львів/Львівська', 3803269 => 'Турка, Львівська', + 380327 => 'Львів/Львівська', + 380328 => 'Львів/Львівська', + 380329 => 'Львів/Львівська', 38033 => 'Волинська', 380332 => 'Луцьк, Волинська', 3803342 => 'Володимир-Волинський, Волинська', @@ -367,13 +385,16 @@ 3805357 => 'Оржиця, Полтава', 3805358 => 'Пирятин, Полтава', 3805359 => 'Гребінка, Полтава', - 380536 => 'Кременчук, Полтава', + 3805360 => 'Кременчук, Полтава', 3805361 => 'Лубни, Полтава', 3805362 => 'Хорол, Полтава', 3805363 => 'Решетилівка, Полтава', 3805364 => 'Машівка, Полтава', 3805365 => 'Глобине, Полтава', 3805366 => 'Кременчук, Полтава', + 3805367 => 'Кременчук, Полтава', + 3805368 => 'Кременчук, Полтава', + 3805369 => 'Кременчук, Полтава', 38054 => 'Суми', 3805442 => 'Путивль, Суми', 3805443 => 'Білопілля, Суми', @@ -412,9 +433,9 @@ 3805547 => 'Білозерка, Херсон', 3805548 => 'Новотроїцьке, Херсон', 3805549 => 'Нова Каховка, Херсон', - 38056 => 'Дніпропетро́вськ/Дніпро', + 380560 => 'Дніпропетро́вськ/Дніпро', + 380561 => 'Дніпропетро́вськ/Дніпро', 380562 => 'Дніпропетровськ, Дніпро', - 380563 => 'Павлоград, Дніпро', 3805630 => 'Межова, Дніпро', 3805631 => 'Петропавлівка, Дніпро', 3805632 => 'Павлоград, Дніпро', @@ -422,23 +443,32 @@ 3805634 => 'Петриківка, Дніпро', 3805635 => 'Юрʼївка, Дніпро', 3805636 => 'Тернівка, Дніпро', + 3805637 => 'Павлоград, Дніпро', 3805638 => 'Покровське, Дніпро', 3805639 => 'Васильківка, Дніпро', 380564 => 'Кривий Ріг, Дніпро', 3805650 => 'Софіївка, Дніпро', + 3805651 => 'Дніпропетро́вськ/Дніпро', 3805652 => 'Жовті Води, Дніпро', 3805653 => 'Вільногірськ, Дніпро', 3805654 => 'Кринички, Дніпро', + 3805655 => 'Дніпропетро́вськ/Дніпро', 3805656 => 'Апостолове, Дніпро', 3805657 => 'Широке, Дніпро', 3805658 => 'Верхньодніпровськ, Дніпро', - 380566 => 'Нікополь, Дніпро', + 3805659 => 'Дніпропетро́вськ/Дніпро', + 3805660 => 'Нікополь, Дніпро', + 3805661 => 'Нікополь, Дніпро', 3805662 => 'Нікополь, Дніпро', 3805663 => 'Синельникове, Дніпро', + 3805664 => 'Нікополь, Дніпро', 3805665 => 'Марганець, Дніпро', + 3805666 => 'Нікополь, Дніпро', 3805667 => 'Орджонікідзе, Дніпро', 3805668 => 'Томаківка, Дніпро', 3805669 => 'Солоне, Дніпро', + 380567 => 'Дніпропетро́вськ/Дніпро', + 380568 => 'Дніпропетро́вськ/Дніпро', 380569 => 'Дніпродзержинськ/Новомосковськ, Дніпро', 3805690 => 'Царичанка, Дніпро', 3805691 => 'Магдалинівка, Дніпро', @@ -494,75 +524,108 @@ 3806175 => 'Василівка/Дніпрорудне, Запорізька', 3806178 => 'Токмак, Запорізька', 380619 => 'Мелітополь, Запорізька', - 3806192 => 'Мелітополь, Запорізька', - 38062 => 'Донецьк', + 380620 => 'Донецьк', + 380621 => 'Донецьк', + 380622 => 'Донецьк', 380623 => 'Красноармійськ/Макіївка, Донецьк', 3806232 => 'Макіївка, Донецьк', 3806236 => 'Ясинувата, Донецьк', 3806237 => 'Селидове, Донецьк', 3806239 => 'Красноармійськ, Донецьк', - 380624 => 'Горлівка, Донецьк', + 3806240 => 'Горлівка, Донецьк', + 3806241 => 'Горлівка, Донецьк', 3806242 => 'Горлівка, Донецьк', 3806243 => 'Велика Новосілка, Донецьк', 3806244 => 'Волноваха, Донецьк', + 3806245 => 'Горлівка, Донецьк', 3806246 => 'Володарське, Донецьк', 3806247 => 'Дзержинськ, Донецьк', + 3806248 => 'Горлівка, Донецьк', 3806249 => 'Дебальцеве, Донецьк', 3806250 => 'Кіровське, Донецьк', + 3806251 => 'Донецьк', 3806252 => 'Єнакієве, Донецьк', 3806253 => 'Старобешеве, Донецьк', 3806254 => 'Торез, Донецьк', 3806255 => 'Шахтарськ, Донецьк', 3806256 => 'Сніжне, Донецьк', 3806257 => 'Іловайськ/Харцизьк, Донецьк', + 3806258 => 'Донецьк', 3806259 => 'Амвросіївка, Донецьк', - 380626 => 'Краматорськ/Словʼянськ, Донецьк', + 3806260 => 'Краматорськ/Словʼянськ, Донецьк', 3806261 => 'Красний Лиман, Донецьк', 3806262 => 'Святогірськ/Словʼянськ, Донецьк', + 3806263 => 'Краматорськ/Словʼянськ, Донецьк', 3806264 => 'Краматорськ, Донецьк', + 3806265 => 'Краматорськ/Словʼянськ, Донецьк', + 3806266 => 'Краматорськ/Словʼянськ, Донецьк', 3806267 => 'Дружківка, Донецьк', + 3806268 => 'Краматорськ/Словʼянськ, Донецьк', 3806269 => 'Олександрівка, Донецьк', - 380627 => 'Артемівськ, Донецьк', + 3806270 => 'Артемівськ, Донецьк', + 3806271 => 'Артемівськ, Донецьк', 3806272 => 'Костянтинівка, Донецьк', 3806273 => 'Вугледар, Донецьк', 3806274 => 'Артемівськ/Сіверськ, Донецьк', 3806275 => 'Докучаєвськ, Донецьк', + 3806276 => 'Артемівськ, Донецьк', 3806277 => 'Добропілля, Донецьк', 3806278 => 'Марʼїнка, Донецьк', 3806279 => 'Тельманове, Донецьк', + 380628 => 'Донецьк', 380629 => 'Маріуполь, Донецьк', 3806296 => 'Новоазовськ, Донецьк', 3806297 => 'Мангуш/Ялта, Донецьк', - 38064 => 'Луганськ', + 380640 => 'Луганськ', + 380641 => 'Луганськ', 380642 => 'Луганськ/Олександрівськ, Луганськ', + 3806430 => 'Луганськ', 3806431 => 'Антрацит, Луганськ', 3806432 => 'Красний Луч, Луганськ', 3806433 => 'Ровеньки, Луганськ', 3806434 => 'Свердловськ, Луганськ', 3806435 => 'Краснодон, Луганськ', 3806436 => 'Лутугине, Луганськ', + 3806437 => 'Луганськ', + 3806438 => 'Луганськ', + 3806439 => 'Луганськ', + 3806440 => 'Луганськ', 3806441 => 'Перевальськ, Луганськ', 3806442 => 'Алчевськ, Луганськ', 3806443 => 'Брянка, Луганськ', 3806444 => 'Стаханов, Луганськ', 3806445 => 'Новоайдар, Луганськ', 3806446 => 'Кіровськ, Луганськ', + 3806447 => 'Луганськ', + 3806448 => 'Луганськ', + 3806449 => 'Луганськ', + 3806450 => 'Луганськ', 3806451 => 'Лисичанськ, Луганськ', 3806452 => 'Сєвєродонецьк, Луганськ', 3806453 => 'Рубіжне, Луганськ', 3806454 => 'Кремінна, Луганськ', 3806455 => 'Первомайськ, Луганськ', 3806456 => 'Троїцьке, Луганськ', + 3806457 => 'Луганськ', + 3806458 => 'Луганськ', + 3806459 => 'Луганськ', + 3806460 => 'Луганськ', 3806461 => 'Старобільськ, Луганськ', 3806462 => 'Білокуракине, Луганськ', 3806463 => 'Новопсков, Луганськ', 3806464 => 'Марківка, Луганськ', 3806465 => 'Мілове, Луганськ', 3806466 => 'Біловодськ, Луганськ', + 3806467 => 'Луганськ', + 3806468 => 'Луганськ', + 3806469 => 'Луганськ', + 380647 => 'Луганськ', 3806471 => 'Сватове, Луганськ', 3806472 => 'Станиця Луганськ, Луганськ', 3806473 => 'Словʼяносербськ, Луганськ', 3806474 => 'Попасна, Луганськ', + 380648 => 'Луганськ', + 380649 => 'Луганськ', 38065 => 'Крим', 38069 => 'Севастополь', ); diff --git a/src/geocoding/data/zh/886.php b/src/geocoding/data/zh/886.php index 7339cd74d..8edc5c106 100644 --- a/src/geocoding/data/zh/886.php +++ b/src/geocoding/data/zh/886.php @@ -14,14 +14,18 @@ 8862 => '台北', 8863 => '桃园、新竹、花莲、宜兰', 88637 => '苗栗', - 8864 => '台中、彰化', + 88642 => '台中、彰化', + 88643 => '台中、彰化', + 88647 => '台中、彰化', + 88648 => '台中、彰化', 88649 => '南投', 8865 => '嘉义、云林', 8866 => '台南、澎湖', 8867 => '高雄', - 8868 => '屏东', - 88682 => '金门', + 88680 => '屏东', + 886823 => '金门', 886826 => '乌丘', - 886836 => '马祖', + 88687 => '屏东', + 88688 => '屏东', 88689 => '台东', ); diff --git a/src/geocoding/data/zh_Hant/886.php b/src/geocoding/data/zh_Hant/886.php index 6cad51ec9..a8564f844 100644 --- a/src/geocoding/data/zh_Hant/886.php +++ b/src/geocoding/data/zh_Hant/886.php @@ -14,14 +14,18 @@ 8862 => '臺北', 8863 => '桃園、新竹、花蓮、宜蘭', 88637 => '苗栗', - 8864 => '臺中、彰化', + 88642 => '臺中、彰化', + 88643 => '臺中、彰化', + 88647 => '臺中、彰化', + 88648 => '臺中、彰化', 88649 => '南投', 8865 => '嘉義、雲林', 8866 => '臺南、澎湖', 8867 => '高雄', - 8868 => '屏東', - 88682 => '金門', + 88680 => '屏東', + 886823 => '金門', 886826 => '烏坵', - 886836 => '馬祖', + 88687 => '屏東', + 88688 => '屏東', 88689 => '臺東', ); diff --git a/src/prefixmapper/MappingFileProvider.php b/src/prefixmapper/MappingFileProvider.php index f179bf0d3..722d9eca3 100644 --- a/src/prefixmapper/MappingFileProvider.php +++ b/src/prefixmapper/MappingFileProvider.php @@ -23,7 +23,7 @@ public function __construct($map) public function getFileName($countryCallingCode, $language, $script, $region) { if (strlen($language) == 0) { - return ""; + return ''; } if ($language === 'zh' && ($region == 'TW' || $region == 'HK' || $region == 'MO')) { @@ -40,7 +40,7 @@ public function getFileName($countryCallingCode, $language, $script, $region) } } - return ""; + return ''; } protected function inMap($language, $countryCallingCode) diff --git a/src/prefixmapper/PrefixFileReader.php b/src/prefixmapper/PrefixFileReader.php index 811f1594c..bda340a34 100644 --- a/src/prefixmapper/PrefixFileReader.php +++ b/src/prefixmapper/PrefixFileReader.php @@ -34,7 +34,7 @@ public function __construct($phonePrefixDataDirectory) protected function loadMappingFileProvider() { - $mapPath = $this->phonePrefixDataDirectory . DIRECTORY_SEPARATOR . "Map.php"; + $mapPath = $this->phonePrefixDataDirectory . DIRECTORY_SEPARATOR . 'Map.php'; if (!file_exists($mapPath)) { throw new \InvalidArgumentException("Invalid data directory: $mapPath"); } @@ -70,7 +70,7 @@ protected function loadPhonePrefixMapFromFile($fileName) { $path = $this->phonePrefixDataDirectory . DIRECTORY_SEPARATOR . $fileName; if (!file_exists($path)) { - throw new \InvalidArgumentException("Data does not exist"); + throw new \InvalidArgumentException('Data does not exist'); } $map = require $path; @@ -108,13 +108,13 @@ public function getDescriptionForNumber(PhoneNumber $number, $language, $script, $description = ($phonePrefixDescriptions !== null) ? $phonePrefixDescriptions->lookup($number) : null; // When a location is not available in the requested language, fall back to English. if (($description === null || strlen($description) === 0) && $this->mayFallBackToEnglish($language)) { - $defaultMap = $this->getPhonePrefixDescriptions($phonePrefix, "en", "", ""); + $defaultMap = $this->getPhonePrefixDescriptions($phonePrefix, 'en', '', ''); if ($defaultMap === null) { - return ""; + return ''; } $description = $defaultMap->lookup($number); } - return ($description !== null) ? $description : ""; + return ($description !== null) ? $description : ''; } } diff --git a/src/prefixmapper/PrefixTimeZonesMap.php b/src/prefixmapper/PrefixTimeZonesMap.php index c2982cd62..bdb779630 100644 --- a/src/prefixmapper/PrefixTimeZonesMap.php +++ b/src/prefixmapper/PrefixTimeZonesMap.php @@ -12,7 +12,7 @@ class PrefixTimeZonesMap protected final PhonePrefixMap phonePrefixMap = new PhonePrefixMap(); protected static final String RAW_STRING_TIMEZONES_SEPARATOR = "&"; */ - const RAW_STRING_TIMEZONES_SEPARATOR = "&"; + const RAW_STRING_TIMEZONES_SEPARATOR = '&'; protected $phonePrefixMap; public function __construct($map) diff --git a/src/timezone/data/map_data.php b/src/timezone/data/map_data.php index cb924cb59..5d8442e16 100644 --- a/src/timezone/data/map_data.php +++ b/src/timezone/data/map_data.php @@ -2505,568 +2505,45 @@ 423 => 'Europe/Vaduz', 43 => 'Europe/Vienna', 44 => 'Europe/Guernsey&Europe/Isle_of_Man&Europe/Jersey&Europe/London', - 44113 => 'Europe/London', - 44114 => 'Europe/London', - 44115 => 'Europe/London', - 44116 => 'Europe/London', - 44117 => 'Europe/London', - 44118 => 'Europe/London', - 441200 => 'Europe/London', - 441202 => 'Europe/London', - 441204 => 'Europe/London', - 441205 => 'Europe/London', - 441206 => 'Europe/London', - 441207 => 'Europe/London', - 441208 => 'Europe/London', - 441209 => 'Europe/London', - 44121 => 'Europe/London', - 441223 => 'Europe/London', - 441224 => 'Europe/London', - 441225 => 'Europe/London', - 441226 => 'Europe/London', - 441227 => 'Europe/London', - 441228 => 'Europe/London', - 441229 => 'Europe/London', - 441233 => 'Europe/London', - 441234 => 'Europe/London', - 441235 => 'Europe/London', - 441236 => 'Europe/London', - 441237 => 'Europe/London', - 441239 => 'Europe/London', - 441241 => 'Europe/London', - 441242 => 'Europe/London', - 441243 => 'Europe/London', - 441244 => 'Europe/London', - 441245 => 'Europe/London', - 441246 => 'Europe/London', - 441248 => 'Europe/London', - 441249 => 'Europe/London', - 441250 => 'Europe/London', - 441252 => 'Europe/London', - 441253 => 'Europe/London', - 441254 => 'Europe/London', - 441255 => 'Europe/London', - 441256 => 'Europe/London', - 441257 => 'Europe/London', - 441258 => 'Europe/London', - 441259 => 'Europe/London', - 441260 => 'Europe/London', - 441261 => 'Europe/London', - 441262 => 'Europe/London', - 441263 => 'Europe/London', - 441264 => 'Europe/London', - 441267 => 'Europe/London', - 441268 => 'Europe/London', - 441269 => 'Europe/London', - 441270 => 'Europe/London', - 441271 => 'Europe/London', - 441273 => 'Europe/London', - 441274 => 'Europe/London', - 441275 => 'Europe/London', - 441276 => 'Europe/London', - 441277 => 'Europe/London', - 441278 => 'Europe/London', - 441279 => 'Europe/London', - 441280 => 'Europe/London', - 441282 => 'Europe/London', - 441283 => 'Europe/London', - 441284 => 'Europe/London', - 441285 => 'Europe/London', - 441286 => 'Europe/London', - 441287 => 'Europe/London', - 441288 => 'Europe/London', - 441289 => 'Europe/London', - 44129 => 'Europe/London', + 4411 => 'Europe/London', + 4412 => 'Europe/London', 44130 => 'Europe/London', 44131 => 'Europe/London', - 441320 => 'Europe/London', - 441322 => 'Europe/London', - 441323 => 'Europe/London', - 441324 => 'Europe/London', - 441325 => 'Europe/London', - 441326 => 'Europe/London', - 441327 => 'Europe/London', - 441328 => 'Europe/London', - 441329 => 'Europe/London', - 441330 => 'Europe/London', - 441332 => 'Europe/London', - 441333 => 'Europe/London', - 441334 => 'Europe/London', - 441335 => 'Europe/London', - 441337 => 'Europe/London', - 441339 => 'Europe/London', - 441340 => 'Europe/London', - 441341 => 'Europe/London', - 441342 => 'Europe/London', - 441343 => 'Europe/London', - 441344 => 'Europe/London', - 441346 => 'Europe/London', - 441347 => 'Europe/London', - 441348 => 'Europe/London', - 441349 => 'Europe/London', - 441350 => 'Europe/London', - 441352 => 'Europe/London', - 441353 => 'Europe/London', - 441354 => 'Europe/London', - 441355 => 'Europe/London', - 441356 => 'Europe/London', - 441357 => 'Europe/London', - 441358 => 'Europe/London', - 441359 => 'Europe/London', - 441360 => 'Europe/London', - 441361 => 'Europe/London', - 441362 => 'Europe/London', - 441363 => 'Europe/London', - 441364 => 'Europe/London', - 441366 => 'Europe/London', - 441367 => 'Europe/London', - 441368 => 'Europe/London', - 441369 => 'Europe/London', - 441371 => 'Europe/London', - 441372 => 'Europe/London', - 441373 => 'Europe/London', - 441375 => 'Europe/London', - 441376 => 'Europe/London', - 441377 => 'Europe/London', - 441379 => 'Europe/London', - 441380 => 'Europe/London', - 441381 => 'Europe/London', - 441382 => 'Europe/London', - 441383 => 'Europe/London', - 441384 => 'Europe/London', - 441386 => 'Europe/London', - 441387 => 'Europe/London', - 441388 => 'Europe/London', - 441389 => 'Europe/London', + 44132 => 'Europe/London', + 44133 => 'Europe/London', + 44134 => 'Europe/London', + 44135 => 'Europe/London', + 44136 => 'Europe/London', + 44137 => 'Europe/London', + 44138 => 'Europe/London', 441392 => 'Europe/London', 441394 => 'Europe/London', 441395 => 'Europe/London', 441397 => 'Europe/London', 441398 => 'Europe/London', - 441400 => 'Europe/London', - 441403 => 'Europe/London', - 441404 => 'Europe/London', - 441405 => 'Europe/London', - 441406 => 'Europe/London', - 441407 => 'Europe/London', - 441408 => 'Europe/London', - 441409 => 'Europe/London', - 44141 => 'Europe/London', - 441420 => 'Europe/London', - 441422 => 'Europe/London', - 441423 => 'Europe/London', - 441424 => 'Europe/London', - 441425 => 'Europe/London', - 441427 => 'Europe/London', - 441428 => 'Europe/London', - 441429 => 'Europe/London', - 44143 => 'Europe/London', - 441440 => 'Europe/London', - 441442 => 'Europe/London', - 441443 => 'Europe/London', - 441444 => 'Europe/London', - 441445 => 'Europe/London', - 441446 => 'Europe/London', - 441449 => 'Europe/London', - 441450 => 'Europe/London', - 441451 => 'Europe/London', - 441452 => 'Europe/London', - 441453 => 'Europe/London', - 441454 => 'Europe/London', - 441455 => 'Europe/London', - 441456 => 'Europe/London', - 441457 => 'Europe/London', - 441458 => 'Europe/London', - 441460 => 'Europe/London', - 441461 => 'Europe/London', - 441462 => 'Europe/London', - 441463 => 'Europe/London', - 441464 => 'Europe/London', - 441465 => 'Europe/London', - 441466 => 'Europe/London', - 441467 => 'Europe/London', - 441469 => 'Europe/London', - 44147 => 'Europe/London', - 441480 => 'Europe/London', + 4414 => 'Europe/London', 441481 => 'Europe/Guernsey', - 441482 => 'Europe/London', - 441483 => 'Europe/London', - 441484 => 'Europe/London', - 441485 => 'Europe/London', - 441487 => 'Europe/London', - 441488 => 'Europe/London', - 441489 => 'Europe/London', - 441490 => 'Europe/London', - 441491 => 'Europe/London', - 441492 => 'Europe/London', - 441493 => 'Europe/London', - 441494 => 'Europe/London', - 441495 => 'Europe/London', - 441496 => 'Europe/London', - 441497 => 'Europe/London', - 441499 => 'Europe/London', - 441501 => 'Europe/London', - 441502 => 'Europe/London', - 441503 => 'Europe/London', - 441505 => 'Europe/London', - 441506 => 'Europe/London', - 441507 => 'Europe/London', - 441508 => 'Europe/London', - 441509 => 'Europe/London', - 44151 => 'Europe/London', - 441520 => 'Europe/London', - 441522 => 'Europe/London', - 441524 => 'Europe/London', - 441525 => 'Europe/London', - 441526 => 'Europe/London', - 441527 => 'Europe/London', - 441528 => 'Europe/London', - 441529 => 'Europe/London', - 441530 => 'Europe/London', - 441531 => 'Europe/London', + 4415 => 'Europe/London', 441534 => 'Europe/Jersey', - 441535 => 'Europe/London', - 441536 => 'Europe/London', - 441538 => 'Europe/London', - 441539 => 'Europe/London', - 441540 => 'Europe/London', - 441542 => 'Europe/London', - 441543 => 'Europe/London', - 441544 => 'Europe/London', - 441545 => 'Europe/London', - 441546 => 'Europe/London', - 441547 => 'Europe/London', - 441548 => 'Europe/London', - 441549 => 'Europe/London', - 441550 => 'Europe/London', - 441553 => 'Europe/London', - 441554 => 'Europe/London', - 441555 => 'Europe/London', - 441556 => 'Europe/London', - 441557 => 'Europe/London', - 441558 => 'Europe/London', - 441559 => 'Europe/London', - 44156 => 'Europe/London', - 441570 => 'Europe/London', - 441571 => 'Europe/London', - 441572 => 'Europe/London', - 441573 => 'Europe/London', - 441575 => 'Europe/London', - 441576 => 'Europe/London', - 441577 => 'Europe/London', - 441578 => 'Europe/London', - 441579 => 'Europe/London', - 441580 => 'Europe/London', - 441581 => 'Europe/London', - 441582 => 'Europe/London', - 441583 => 'Europe/London', - 441584 => 'Europe/London', - 441586 => 'Europe/London', - 441588 => 'Europe/London', - 441590 => 'Europe/London', - 441591 => 'Europe/London', - 441592 => 'Europe/London', - 441593 => 'Europe/London', - 441594 => 'Europe/London', - 441595 => 'Europe/London', - 441597 => 'Europe/London', - 441598 => 'Europe/London', - 441599 => 'Europe/London', - 441600 => 'Europe/London', - 441603 => 'Europe/London', - 441604 => 'Europe/London', - 441606 => 'Europe/London', - 441608 => 'Europe/London', - 441609 => 'Europe/London', - 44161 => 'Europe/London', - 441620 => 'Europe/London', - 441621 => 'Europe/London', - 441622 => 'Europe/London', - 441623 => 'Europe/London', + 4416 => 'Europe/London', 441624 => 'Europe/Isle_of_Man', - 441625 => 'Europe/London', - 441626 => 'Europe/London', - 441628 => 'Europe/London', - 441629 => 'Europe/London', - 441630 => 'Europe/London', - 441631 => 'Europe/London', - 441633 => 'Europe/London', - 441634 => 'Europe/London', - 441635 => 'Europe/London', - 441636 => 'Europe/London', - 441637 => 'Europe/London', - 441638 => 'Europe/London', - 441639 => 'Europe/London', - 441641 => 'Europe/London', - 441642 => 'Europe/London', - 441643 => 'Europe/London', - 441644 => 'Europe/London', - 441646 => 'Europe/London', - 441647 => 'Europe/London', - 441650 => 'Europe/London', - 441651 => 'Europe/London', - 441652 => 'Europe/London', - 441653 => 'Europe/London', - 441654 => 'Europe/London', - 441655 => 'Europe/London', - 441656 => 'Europe/London', - 441659 => 'Europe/London', - 441661 => 'Europe/London', - 441663 => 'Europe/London', - 441664 => 'Europe/London', - 441665 => 'Europe/London', - 441666 => 'Europe/London', - 441667 => 'Europe/London', - 441668 => 'Europe/London', - 441669 => 'Europe/London', - 441670 => 'Europe/London', - 441671 => 'Europe/London', - 441672 => 'Europe/London', - 441673 => 'Europe/London', - 441674 => 'Europe/London', - 441675 => 'Europe/London', - 441676 => 'Europe/London', - 441677 => 'Europe/London', - 441678 => 'Europe/London', - 441680 => 'Europe/London', - 441681 => 'Europe/London', - 441683 => 'Europe/London', - 441684 => 'Europe/London', - 441685 => 'Europe/London', - 441686 => 'Europe/London', - 441687 => 'Europe/London', - 441688 => 'Europe/London', - 441689 => 'Europe/London', - 441690 => 'Europe/London', - 441691 => 'Europe/London', - 441692 => 'Europe/London', - 441694 => 'Europe/London', - 441695 => 'Europe/London', - 441697 => 'Europe/London', - 441698 => 'Europe/London', - 441700 => 'Europe/London', - 441702 => 'Europe/London', - 441704 => 'Europe/London', - 441706 => 'Europe/London', - 441707 => 'Europe/London', - 441708 => 'Europe/London', - 441709 => 'Europe/London', - 44172 => 'Europe/London', - 441730 => 'Europe/London', - 441732 => 'Europe/London', - 441733 => 'Europe/London', - 441736 => 'Europe/London', - 441737 => 'Europe/London', - 441738 => 'Europe/London', - 441740 => 'Europe/London', - 441743 => 'Europe/London', - 441744 => 'Europe/London', - 441745 => 'Europe/London', - 441746 => 'Europe/London', - 441747 => 'Europe/London', - 441748 => 'Europe/London', - 441749 => 'Europe/London', - 441750 => 'Europe/London', - 441751 => 'Europe/London', - 441752 => 'Europe/London', - 441753 => 'Europe/London', - 441754 => 'Europe/London', - 441756 => 'Europe/London', - 441757 => 'Europe/London', - 441758 => 'Europe/London', - 441759 => 'Europe/London', - 441760 => 'Europe/London', - 441761 => 'Europe/London', - 441763 => 'Europe/London', - 441764 => 'Europe/London', - 441765 => 'Europe/London', - 441766 => 'Europe/London', - 441767 => 'Europe/London', - 441768 => 'Europe/London', - 441769 => 'Europe/London', - 441770 => 'Europe/London', - 441771 => 'Europe/London', - 441772 => 'Europe/London', - 441773 => 'Europe/London', - 441775 => 'Europe/London', - 441776 => 'Europe/London', - 441777 => 'Europe/London', - 441778 => 'Europe/London', - 441779 => 'Europe/London', - 441780 => 'Europe/London', - 441782 => 'Europe/London', - 441784 => 'Europe/London', - 441785 => 'Europe/London', - 441786 => 'Europe/London', - 441787 => 'Europe/London', - 441788 => 'Europe/London', - 441789 => 'Europe/London', - 441790 => 'Europe/London', - 441792 => 'Europe/London', - 441793 => 'Europe/London', - 441794 => 'Europe/London', - 441795 => 'Europe/London', - 441796 => 'Europe/London', - 441797 => 'Europe/London', - 441798 => 'Europe/London', - 441799 => 'Europe/London', - 441803 => 'Europe/London', - 441805 => 'Europe/London', - 441806 => 'Europe/London', - 441807 => 'Europe/London', - 441808 => 'Europe/London', - 441809 => 'Europe/London', - 441821 => 'Europe/London', - 441822 => 'Europe/London', - 441823 => 'Europe/London', - 441824 => 'Europe/London', - 441825 => 'Europe/London', - 441827 => 'Europe/London', - 441828 => 'Europe/London', - 441829 => 'Europe/London', - 441830 => 'Europe/London', - 441832 => 'Europe/London', - 441833 => 'Europe/London', - 441834 => 'Europe/London', - 441835 => 'Europe/London', - 441837 => 'Europe/London', - 441838 => 'Europe/London', - 441840 => 'Europe/London', - 441841 => 'Europe/London', - 441842 => 'Europe/London', - 441843 => 'Europe/London', - 441844 => 'Europe/London', - 441845 => 'Europe/London', - 441847 => 'Europe/London', - 441848 => 'Europe/London', - 441851 => 'Europe/London', - 441852 => 'Europe/London', - 441854 => 'Europe/London', - 441855 => 'Europe/London', - 441856 => 'Europe/London', - 441857 => 'Europe/London', - 441858 => 'Europe/London', - 441859 => 'Europe/London', - 441862 => 'Europe/London', - 441863 => 'Europe/London', - 441864 => 'Europe/London', - 441865 => 'Europe/London', - 441866 => 'Europe/London', - 441869 => 'Europe/London', - 44187 => 'Europe/London', - 441880 => 'Europe/London', - 441882 => 'Europe/London', - 441883 => 'Europe/London', - 441884 => 'Europe/London', - 441885 => 'Europe/London', - 441886 => 'Europe/London', - 441887 => 'Europe/London', - 441888 => 'Europe/London', - 441889 => 'Europe/London', - 441890 => 'Europe/London', - 441892 => 'Europe/London', - 441895 => 'Europe/London', - 441896 => 'Europe/London', - 441899 => 'Europe/London', - 441900 => 'Europe/London', - 441902 => 'Europe/London', - 441903 => 'Europe/London', - 441904 => 'Europe/London', - 441905 => 'Europe/London', - 441908 => 'Europe/London', - 441909 => 'Europe/London', - 44191 => 'Europe/London', - 441920 => 'Europe/London', - 441922 => 'Europe/London', - 441923 => 'Europe/London', - 441924 => 'Europe/London', - 441925 => 'Europe/London', - 441926 => 'Europe/London', - 441928 => 'Europe/London', - 441929 => 'Europe/London', - 441931 => 'Europe/London', - 441932 => 'Europe/London', - 441933 => 'Europe/London', - 441934 => 'Europe/London', - 441935 => 'Europe/London', - 441937 => 'Europe/London', - 441938 => 'Europe/London', - 441939 => 'Europe/London', - 441942 => 'Europe/London', - 441943 => 'Europe/London', - 441944 => 'Europe/London', - 441945 => 'Europe/London', - 441946 => 'Europe/London', - 441947 => 'Europe/London', - 441948 => 'Europe/London', - 441949 => 'Europe/London', - 441950 => 'Europe/London', - 441951 => 'Europe/London', - 441952 => 'Europe/London', - 441953 => 'Europe/London', - 441954 => 'Europe/London', - 441955 => 'Europe/London', - 441957 => 'Europe/London', - 441959 => 'Europe/London', - 441962 => 'Europe/London', - 441963 => 'Europe/London', - 441964 => 'Europe/London', - 441967 => 'Europe/London', - 441968 => 'Europe/London', - 441969 => 'Europe/London', - 441970 => 'Europe/London', - 441971 => 'Europe/London', - 441972 => 'Europe/London', - 441974 => 'Europe/London', - 441975 => 'Europe/London', - 441977 => 'Europe/London', - 441978 => 'Europe/London', - 44198 => 'Europe/London', - 441992 => 'Europe/London', - 441993 => 'Europe/London', - 441994 => 'Europe/London', - 441995 => 'Europe/London', - 441997 => 'Europe/London', - 4420 => 'Europe/London', - 4423 => 'Europe/London', - 4424 => 'Europe/London', - 4428 => 'Europe/London', - 4429 => 'Europe/London', + 4417 => 'Europe/London', + 4418 => 'Europe/London', + 4419 => 'Europe/London', + 442 => 'Europe/London', 45 => 'Europe/Copenhagen', 46 => 'Europe/Stockholm', 47 => 'Arctic/Longyearbyen&Europe/Oslo', - 4721 => 'Europe/Oslo', - 4722 => 'Europe/Oslo', - 4723 => 'Europe/Oslo', - 4724 => 'Europe/Oslo', - 4731 => 'Europe/Oslo', - 4732 => 'Europe/Oslo', - 4733 => 'Europe/Oslo', - 4735 => 'Europe/Oslo', - 4737 => 'Europe/Oslo', - 4738 => 'Europe/Oslo', + 472 => 'Europe/Oslo', + 473 => 'Europe/Oslo', 4751 => 'Europe/Oslo', 4752 => 'Europe/Oslo', 4753 => 'Europe/Oslo', 4755 => 'Europe/Oslo', 4756 => 'Europe/Oslo', 4757 => 'Europe/Oslo', - 4761 => 'Europe/Oslo', - 4762 => 'Europe/Oslo', - 4763 => 'Europe/Oslo', - 4764 => 'Europe/Oslo', - 4766 => 'Europe/Oslo', - 4767 => 'Europe/Oslo', - 4769 => 'Europe/Oslo', - 4770 => 'Europe/Oslo', - 4771 => 'Europe/Oslo', - 4772 => 'Europe/Oslo', - 4773 => 'Europe/Oslo', - 4774 => 'Europe/Oslo', - 4775 => 'Europe/Oslo', - 4776 => 'Europe/Oslo', - 4777 => 'Europe/Oslo', - 4778 => 'Europe/Oslo', + 476 => 'Europe/Oslo', + 477 => 'Europe/Oslo', 4779 => 'Arctic/Longyearbyen', 48 => 'Europe/Warsaw', 49 => 'Europe/Berlin', @@ -4862,6 +4339,7 @@ 5933 => 'America/Guayaquil', 5934 => 'America/Guayaquil', 5935 => 'America/Guayaquil', + 59352 => 'America/Guayaquil&Pacific/Galapagos', 5936 => 'America/Guayaquil', 5937 => 'America/Guayaquil', 594 => 'America/Cayenne', @@ -4875,11 +4353,90 @@ 5997 => 'America/Kralendijk', 5999 => 'America/Curacao', 60 => 'Asia/Kuching', - 61 => 'Antarctica/Macquarie&Australia/Adelaide&Australia/Eucla&Australia/Lord_Howe&Australia/Perth&Australia/Sydney&Indian/Christmas&Indian/Cocos', + 61 => 'Australia/Adelaide&Australia/Eucla&Australia/Lord_Howe&Australia/Perth&Australia/Sydney&Indian/Christmas&Indian/Cocos', 612 => 'Australia/Sydney', + 61255007 => 'Australia/Lord_Howe', + 61255053 => 'Australia/Lord_Howe', + 61255143 => 'Australia/Lord_Howe', + 61255213 => 'Australia/Lord_Howe', + 61255280 => 'Australia/Lord_Howe', + 61255307 => 'Australia/Lord_Howe', + 61255369 => 'Australia/Lord_Howe', + 61255413 => 'Australia/Lord_Howe', + 61255568 => 'Australia/Lord_Howe', + 61255936 => 'Australia/Lord_Howe', + 61255937 => 'Australia/Lord_Howe', + 61265080 => 'Australia/Lord_Howe', + 61265081 => 'Australia/Lord_Howe', + 61265082 => 'Australia/Lord_Howe', + 61265099 => 'Australia/Lord_Howe', + 61265164 => 'Australia/Lord_Howe', + 61265251 => 'Australia/Lord_Howe', + 61265296 => 'Australia/Lord_Howe', + 61265341 => 'Australia/Lord_Howe', + 61265606 => 'Australia/Lord_Howe', + 61265632 => 'Australia/Lord_Howe', + 61265998 => 'Australia/Lord_Howe', 613 => 'Australia/Sydney', 617 => 'Australia/Sydney', - 618 => 'Australia/Adelaide&Australia/Perth', + 618510 => 'Australia/Adelaide&Australia/Perth', + 61851001 => 'Indian/Christmas', + 61851002 => 'Indian/Cocos', + 61851030 => 'Indian/Christmas', + 61851031 => 'Indian/Cocos', + 61851059 => 'Indian/Christmas', + 61851060 => 'Indian/Cocos', + 61851116 => 'Australia/Adelaide&Australia/Perth', + 61851117 => 'Indian/Christmas', + 61851118 => 'Indian/Cocos', + 61851119 => 'Australia/Adelaide&Australia/Perth', + 6185112 => 'Australia/Adelaide&Australia/Perth', + 6185113 => 'Australia/Adelaide&Australia/Perth', + 6185114 => 'Australia/Adelaide&Australia/Perth', + 6186 => 'Australia/Adelaide&Australia/Perth', + 6187 => 'Australia/Adelaide&Australia/Perth', + 6188 => 'Australia/Adelaide&Australia/Perth', + 6189 => 'Australia/Adelaide&Australia/Perth', + 61890393 => 'Australia/Adelaide&Australia/Eucla&Australia/Perth', + 61890395 => 'Australia/Adelaide&Australia/Eucla&Australia/Perth', + 61891006 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891007 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891008 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891009 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891010 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891011 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891012 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891029 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891122 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891149 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891150 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891178 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891179 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891181 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891182 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891209 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891210 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891263 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891264 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891308 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891312 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891322 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891326 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891368 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891375 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891428 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891456 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891497 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891498 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 6189162 => 'Indian/Cocos', + 6189164 => 'Indian/Christmas', + 61891700 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891701 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891702 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', + 61891710 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891711 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891712 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas', + 61891959 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos', 62 => 'Asia/Jakarta&Asia/Jayapura&Asia/Makassar', 622 => 'Asia/Jakarta', 6231 => 'Asia/Jakarta', @@ -4988,18 +4545,8 @@ 688 => 'Pacific/Funafuti', 689 => 'Pacific/Gambier&Pacific/Marquesas&Pacific/Tahiti', 6894 => 'Pacific/Tahiti', - 6895 => 'Pacific/Tahiti', - 6896 => 'Pacific/Tahiti', - 6898 => 'Pacific/Tahiti', - 68990 => 'Pacific/Tahiti', - 68991 => 'Pacific/Marquesas', - 68992 => 'Pacific/Marquesas', - 68993 => 'Pacific/Tahiti', - 68994 => 'Pacific/Tahiti', - 68995 => 'Pacific/Tahiti', - 68996 => 'Pacific/Tahiti', - 68997 => 'Pacific/Gambier', - 68998 => 'Pacific/Tahiti', + 68987 => 'Pacific/Gambier&Pacific/Marquesas&Pacific/Tahiti', + 68989 => 'Pacific/Tahiti', 690 => 'Pacific/Fakaofo', 691 => 'Pacific/Kosrae&Pacific/Ponape&Pacific/Truk', 69132 => 'Pacific/Ponape', @@ -5015,18 +4562,11 @@ 7 => 'Asia/Almaty&Asia/Anadyr&Asia/Aqtobe&Asia/Irkutsk&Asia/Kamchatka&Asia/Krasnoyarsk&Asia/Magadan&Asia/Novosibirsk&Asia/Omsk&Asia/Sakhalin&Asia/Vladivostok&Asia/Yakutsk&Asia/Yekaterinburg&Europe/Bucharest&Europe/Moscow&Europe/Samara', 7301 => 'Asia/Irkutsk', 7302 => 'Asia/Yakutsk', - 7336 => 'Asia/Almaty', + 733 => 'Asia/Almaty', + 734 => 'Asia/Yekaterinburg', 7341 => 'Europe/Samara', - 7342 => 'Asia/Yekaterinburg', - 7343 => 'Asia/Yekaterinburg', - 7345 => 'Asia/Yekaterinburg', - 7346 => 'Asia/Yekaterinburg', - 7347 => 'Asia/Yekaterinburg', - 7349 => 'Asia/Yekaterinburg', - 7351 => 'Asia/Yekaterinburg', - 7352 => 'Asia/Yekaterinburg', - 7353 => 'Asia/Yekaterinburg', - 7365 => 'Europe/Moscow', + 735 => 'Asia/Yekaterinburg', + 736 => 'Europe/Moscow', 7381 => 'Asia/Omsk', 7382 => 'Asia/Novosibirsk', 7383 => 'Asia/Novosibirsk', @@ -5037,69 +4577,28 @@ 7391 => 'Asia/Krasnoyarsk', 7394 => 'Asia/Krasnoyarsk', 7395 => 'Asia/Irkutsk', - 7401 => 'Europe/Bucharest', + 740 => 'Europe/Bucharest', 7411 => 'Asia/Yakutsk', 7413 => 'Asia/Magadan', 7415 => 'Asia/Kamchatka', 7416 => 'Asia/Yakutsk', 7421 => 'Asia/Vladivostok', 7423 => 'Asia/Vladivostok', - 7424 => 'Asia/Magadan', + 7424 => 'Asia/Sakhalin', 7426 => 'Asia/Vladivostok', 7427 => 'Asia/Anadyr', - 7471 => 'Europe/Moscow', - 7472 => 'Europe/Moscow', - 7473 => 'Europe/Moscow', - 7474 => 'Europe/Moscow', - 7475 => 'Europe/Moscow', - 7481 => 'Europe/Moscow', - 7482 => 'Europe/Moscow', - 7483 => 'Europe/Moscow', - 7484 => 'Europe/Moscow', - 7485 => 'Europe/Moscow', - 7486 => 'Europe/Moscow', - 7487 => 'Europe/Moscow', - 7491 => 'Europe/Moscow', - 7492 => 'Europe/Moscow', - 7493 => 'Europe/Moscow', - 7494 => 'Europe/Moscow', - 7495 => 'Europe/Moscow', - 7496 => 'Europe/Moscow', - 7498 => 'Europe/Moscow', - 7499 => 'Europe/Moscow', - 7710 => 'Asia/Almaty', + 747 => 'Europe/Moscow', + 748 => 'Europe/Moscow', + 749 => 'Europe/Moscow', + 771 => 'Asia/Almaty', 7711 => 'Asia/Aqtobe', 7712 => 'Asia/Aqtobe', 7713 => 'Asia/Aqtobe', - 7714 => 'Asia/Almaty', - 7715 => 'Asia/Almaty', - 7716 => 'Asia/Almaty', - 7717 => 'Asia/Almaty', - 7718 => 'Asia/Almaty', - 7721 => 'Asia/Almaty', - 7722 => 'Asia/Almaty', - 7723 => 'Asia/Almaty', - 7724 => 'Asia/Almaty', - 7725 => 'Asia/Almaty', - 7726 => 'Asia/Almaty', - 7727 => 'Asia/Almaty', - 7728 => 'Asia/Almaty', + 772 => 'Asia/Almaty', 7729 => 'Asia/Aqtobe', - 7811 => 'Europe/Moscow', - 7812 => 'Europe/Moscow', - 7813 => 'Europe/Moscow', - 7814 => 'Europe/Moscow', - 7815 => 'Europe/Moscow', - 7816 => 'Europe/Moscow', - 7817 => 'Europe/Moscow', - 7818 => 'Europe/Moscow', - 7820 => 'Europe/Moscow', - 7821 => 'Europe/Moscow', - 7831 => 'Europe/Moscow', - 7833 => 'Europe/Moscow', - 7834 => 'Europe/Moscow', - 7835 => 'Europe/Moscow', - 7836 => 'Europe/Moscow', + 781 => 'Europe/Moscow', + 782 => 'Europe/Moscow', + 783 => 'Europe/Moscow', 7840 => 'Europe/Bucharest&Europe/Moscow', 7841 => 'Europe/Moscow', 7842 => 'Europe/Samara', @@ -5111,19 +4610,8 @@ 7848 => 'Europe/Samara', 7851 => 'Europe/Samara', 7855 => 'Europe/Moscow', - 7861 => 'Europe/Moscow', - 7862 => 'Europe/Moscow', - 7863 => 'Europe/Moscow', - 7865 => 'Europe/Moscow', - 7866 => 'Europe/Moscow', - 7867 => 'Europe/Moscow', - 7869 => 'Europe/Moscow', - 7871 => 'Europe/Moscow', - 7872 => 'Europe/Moscow', - 7873 => 'Europe/Moscow', - 7877 => 'Europe/Moscow', - 7878 => 'Europe/Moscow', - 7879 => 'Europe/Moscow', + 786 => 'Europe/Moscow', + 787 => 'Europe/Moscow', 81 => 'Asia/Tokyo', 82 => 'Asia/Seoul', 84 => 'Asia/Bangkok', diff --git a/tests/Issues/CodeCoverageTest.php b/tests/Issues/CodeCoverageTest.php index bbf4992da..c58df9aba 100644 --- a/tests/Issues/CodeCoverageTest.php +++ b/tests/Issues/CodeCoverageTest.php @@ -24,22 +24,22 @@ public function testNullException() $this->phoneUtil->parse(null, null); } catch (\Exception $e) { $this->assertEquals("libphonenumber\\NumberParseException", get_class($e)); - $this->assertEquals("The phone number supplied was null.", $e->getMessage()); + $this->assertEquals('The phone number supplied was null.', $e->getMessage()); - $this->assertEquals("Error type: 1. The phone number supplied was null.", (string)$e); + $this->assertEquals('Error type: 1. The phone number supplied was null.', (string)$e); } } public function testTooShortNumber() { try { - $this->phoneUtil->parse("+441", "GB"); + $this->phoneUtil->parse('+441', 'GB'); } catch (\Exception $e) { $this->assertEquals("libphonenumber\\NumberParseException", get_class($e)); - $this->assertEquals("The string supplied is too short to be a phone number.", $e->getMessage()); + $this->assertEquals('The string supplied is too short to be a phone number.', $e->getMessage()); $this->assertEquals(3, $e->getCode()); - $this->assertEquals("Error type: 3. The string supplied is too short to be a phone number.", (string)$e); + $this->assertEquals('Error type: 3. The string supplied is too short to be a phone number.', (string)$e); } } } diff --git a/tests/Issues/Issue106Test.php b/tests/Issues/Issue106Test.php index e294182ed..b6f8a7770 100644 --- a/tests/Issues/Issue106Test.php +++ b/tests/Issues/Issue106Test.php @@ -28,16 +28,16 @@ public function setUp() public function testGeocoderForZh() { - $this->assertEquals("Taipei", $this->geocoder->getDescriptionForNumber(self::$TW_Number1, "en")); + $this->assertEquals('Taipei', $this->geocoder->getDescriptionForNumber(self::$TW_Number1, 'en')); $this->assertEquals( pack('H*', 'e58fb0') . pack('H*', 'e58c97'), - $this->geocoder->getDescriptionForNumber(self::$TW_Number1, "zh_CN") + $this->geocoder->getDescriptionForNumber(self::$TW_Number1, 'zh_CN') ); $this->assertEquals( pack('H*', 'e887ba') . pack('H*', 'e58c97'), - $this->geocoder->getDescriptionForNumber(self::$TW_Number1, "zh_TW") + $this->geocoder->getDescriptionForNumber(self::$TW_Number1, 'zh_TW') ); } } diff --git a/tests/Issues/Issue135Test.php b/tests/Issues/Issue135Test.php index 769fd3c97..d6821bf95 100644 --- a/tests/Issues/Issue135Test.php +++ b/tests/Issues/Issue135Test.php @@ -26,9 +26,9 @@ public function setUp() */ public function testConvertAlphaCharactersInNumber() { - $input = "1800-ABC-DEF"; + $input = '1800-ABC-DEF'; // Alpha chars are converted to digits; everything else is left untouched. - $expectedOutput = "1800-222-333"; + $expectedOutput = '1800-222-333'; $this->assertEquals($expectedOutput, PhoneNumberUtil::convertAlphaCharactersInNumber($input)); } @@ -39,10 +39,10 @@ public function testConvertAlphaCharactersInNumber() public function testGetCountryMobileToken() { // MX - $this->assertEquals("1", PhoneNumberUtil::getCountryMobileToken(52)); + $this->assertEquals('1', PhoneNumberUtil::getCountryMobileToken(52)); // Country calling code for Sweden, which has no mobile token. - $this->assertEquals("", PhoneNumberUtil::getCountryMobileToken(46)); + $this->assertEquals('', PhoneNumberUtil::getCountryMobileToken(46)); } /** @@ -51,7 +51,7 @@ public function testGetCountryMobileToken() */ public function testIsViablePhoneNumber() { - $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber("1")); + $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber('1')); } /** @@ -60,7 +60,7 @@ public function testIsViablePhoneNumber() */ public function testExtractPossibleNumber() { - $this->assertEquals("0800-345-600", PhoneNumberUtil::extractPossibleNumber("Tel:0800-345-600")); + $this->assertEquals('0800-345-600', PhoneNumberUtil::extractPossibleNumber('Tel:0800-345-600')); } /** @@ -69,12 +69,12 @@ public function testExtractPossibleNumber() */ public function testNormaliseReplaceAlphaCharacters() { - $inputNumber = "034-I-am-HUNGRY"; - $expectedOutput = "034426486479"; + $inputNumber = '034-I-am-HUNGRY'; + $expectedOutput = '034426486479'; $this->assertEquals( $expectedOutput, PhoneNumberUtil::normalize($inputNumber), - "Conversion did not correctly replace alpha characters" + 'Conversion did not correctly replace alpha characters' ); } @@ -84,9 +84,9 @@ public function testNormaliseReplaceAlphaCharacters() */ public function testNormalizeDiallableCharsOnly() { - $inputNumber = "03*4-56&+a#234"; - $expectedOutput = "03*456+#234"; + $inputNumber = '03*4-56&+a#234'; + $expectedOutput = '03*456+#234'; $this->assertEquals($expectedOutput, PhoneNumberUtil::normalizeDiallableCharsOnly($inputNumber), - "Conversion did not correctly remove non-diallable characters"); + 'Conversion did not correctly remove non-diallable characters'); } } diff --git a/tests/Issues/Issue14Test.php b/tests/Issues/Issue14Test.php index 7d5cd5b89..82a180c91 100644 --- a/tests/Issues/Issue14Test.php +++ b/tests/Issues/Issue14Test.php @@ -21,8 +21,8 @@ public function setUp() public function testKWMobileNumber() { - $number = "51440519"; - $phoneNumber = $this->phoneUtil->parse($number, "KW"); + $number = '51440519'; + $phoneNumber = $this->phoneUtil->parse($number, 'KW'); $this->assertTrue($this->phoneUtil->isValidNumber($phoneNumber)); $this->assertEquals(PhoneNumberType::MOBILE, $this->phoneUtil->getNumberType($phoneNumber)); diff --git a/tests/Issues/Issue159Test.php b/tests/Issues/Issue159Test.php index a320fad46..4210357f5 100644 --- a/tests/Issues/Issue159Test.php +++ b/tests/Issues/Issue159Test.php @@ -14,7 +14,7 @@ */ class Issue159Test extends TestCase { - const LOS_ANGELES_TZ = "America/Los_Angeles"; + const LOS_ANGELES_TZ = 'America/Los_Angeles'; public function setUp() { diff --git a/tests/Issues/Issue17Test.php b/tests/Issues/Issue17Test.php index 176df4c8a..f7b2e63a8 100644 --- a/tests/Issues/Issue17Test.php +++ b/tests/Issues/Issue17Test.php @@ -28,10 +28,10 @@ public function setUp() public function testIsleOfManLocale() { - $number = "447624206000"; + $number = '447624206000'; $phoneNumber = $this->phoneUtil->parse($number, 'GB'); - $this->assertEquals("Isle of Man", $this->geocoder->getDescriptionForNumber($phoneNumber, 'en')); + $this->assertEquals('Isle of Man', $this->geocoder->getDescriptionForNumber($phoneNumber, 'en')); } } diff --git a/tests/Issues/Issue21Test.php b/tests/Issues/Issue21Test.php index 3ec161962..81a032bae 100644 --- a/tests/Issues/Issue21Test.php +++ b/tests/Issues/Issue21Test.php @@ -20,8 +20,8 @@ public function setUp() public function testFloatNumber() { - $number = "0358112345678987"; - $phoneNumber = $this->phoneUtil->parse($number, "DE"); + $number = '0358112345678987'; + $phoneNumber = $this->phoneUtil->parse($number, 'DE'); $this->assertTrue($this->phoneUtil->isValidNumber($phoneNumber)); @@ -36,8 +36,8 @@ public function testFloatNumber() public function testLongerNumber() { - $number = "12345678901234567"; - $phoneNumber = $this->phoneUtil->parse($number, "DE"); + $number = '12345678901234567'; + $phoneNumber = $this->phoneUtil->parse($number, 'DE'); $this->assertEquals('+4912345678901234567', $this->phoneUtil->format($phoneNumber, PhoneNumberFormat::E164)); $this->assertEquals('+49 12345678901234567', $this->phoneUtil->format($phoneNumber, PhoneNumberFormat::INTERNATIONAL)); diff --git a/tests/Issues/Issue34Test.php b/tests/Issues/Issue34Test.php index ee17bd94d..ca96d1d88 100644 --- a/tests/Issues/Issue34Test.php +++ b/tests/Issues/Issue34Test.php @@ -19,10 +19,10 @@ public function setUp() public function testIsValidNumberForRegion() { - $number = "+33 6 76 83 51 85"; - $region = "DE"; + $number = '+33 6 76 83 51 85'; + $region = 'DE'; $phoneNumber = $this->phoneUtil->parse($number, $region); - $this->assertFalse($this->phoneUtil->isValidNumberForRegion($phoneNumber, "DE")); + $this->assertFalse($this->phoneUtil->isValidNumberForRegion($phoneNumber, 'DE')); } } diff --git a/tests/Issues/Issue35Test.php b/tests/Issues/Issue35Test.php index a2b2c1486..d368b41aa 100644 --- a/tests/Issues/Issue35Test.php +++ b/tests/Issues/Issue35Test.php @@ -20,8 +20,8 @@ public function setUp() public function testSerializingPhoneNumber() { - $number = "+441174900000"; - $region = "GB"; + $number = '+441174900000'; + $region = 'GB'; $phoneNumber = $this->phoneUtil->parse($number, $region); $serializedString = serialize($phoneNumber); diff --git a/tests/Issues/Issue36Test.php b/tests/Issues/Issue36Test.php index 341185db5..371f14e99 100644 --- a/tests/Issues/Issue36Test.php +++ b/tests/Issues/Issue36Test.php @@ -28,10 +28,10 @@ public function setUp() public function testIsleOfManLocale() { - $number = "447797752305"; + $number = '447797752305'; $phoneNumber = $this->phoneUtil->parse($number, 'GB'); - $this->assertEquals("Jersey", $this->geocoder->getDescriptionForNumber($phoneNumber, 'en')); + $this->assertEquals('Jersey', $this->geocoder->getDescriptionForNumber($phoneNumber, 'en')); } } diff --git a/tests/Issues/Issue3Test.php b/tests/Issues/Issue3Test.php index 401e9579f..73978df8a 100644 --- a/tests/Issues/Issue3Test.php +++ b/tests/Issues/Issue3Test.php @@ -24,6 +24,6 @@ public function testParseUSNumber() { $number = $this->phoneNumberUtil->parse('011543549480042', 'US'); - $this->assertEquals("+543549480042", $this->phoneNumberUtil->format($number, PhoneNumberFormat::E164)); + $this->assertEquals('+543549480042', $this->phoneNumberUtil->format($number, PhoneNumberFormat::E164)); } } diff --git a/tests/Issues/Issue44Test.php b/tests/Issues/Issue44Test.php index f7c5abd0d..a64a5566e 100644 --- a/tests/Issues/Issue44Test.php +++ b/tests/Issues/Issue44Test.php @@ -29,50 +29,50 @@ public function setUp() public function testMemoryUsageOfGeoLocationWithNoResult() { - $number = $this->phoneUtil->parse("86-157-9662-1289", "CN"); + $number = $this->phoneUtil->parse('86-157-9662-1289', 'CN'); $startMemory = memory_get_usage(); - $location = $this->geocoder->getDescriptionForNumber($number, "en"); + $location = $this->geocoder->getDescriptionForNumber($number, 'en'); $endMemory = memory_get_usage(); - $this->assertEquals("China", $location); + $this->assertEquals('China', $location); $memoryUsed = $endMemory - $startMemory; - $this->assertLessThan(5000000, $memoryUsed, "Memory usage should be below 5MB"); + $this->assertLessThan(5000000, $memoryUsed, 'Memory usage should be below 5MB'); } public function testMemoryUsageOfGeoLocationWithResult() { - $number = $this->phoneUtil->parse("86-131-2270-1411", "CN"); + $number = $this->phoneUtil->parse('86-131-2270-1411', 'CN'); $startMemory = memory_get_usage(); - $location = $this->geocoder->getDescriptionForNumber($number, "en"); + $location = $this->geocoder->getDescriptionForNumber($number, 'en'); $endMemory = memory_get_usage(); - $this->assertEquals("Shanghai", $location); + $this->assertEquals('Shanghai', $location); $memoryUsed = $endMemory - $startMemory; - $this->assertLessThan(5000000, $memoryUsed, "Memory usage should be below 5MB"); + $this->assertLessThan(5000000, $memoryUsed, 'Memory usage should be below 5MB'); } public function testChineseGeolocation() { - $number = $this->phoneUtil->parse("+86 150 3657 7264", "CN"); - $location = $this->geocoder->getDescriptionForNumber($number, "en"); + $number = $this->phoneUtil->parse('+86 150 3657 7264', 'CN'); + $location = $this->geocoder->getDescriptionForNumber($number, 'en'); - $this->assertEquals("Luoyang, Henan", $location); + $this->assertEquals('Luoyang, Henan', $location); } public function testChineseCarrierLookup() { - $number = $this->phoneUtil->parse("+86 150 3657 7264", "CN"); + $number = $this->phoneUtil->parse('+86 150 3657 7264', 'CN'); $carrier = PhoneNumberToCarrierMapper::getInstance(); - $location = $carrier->getNameForNumber($number, "en"); + $location = $carrier->getNameForNumber($number, 'en'); - $this->assertEquals("China Mobile", $location); + $this->assertEquals('China Mobile', $location); } } diff --git a/tests/Issues/Issue4Test.php b/tests/Issues/Issue4Test.php index 7868b9059..c4ebbcd07 100644 --- a/tests/Issues/Issue4Test.php +++ b/tests/Issues/Issue4Test.php @@ -24,6 +24,6 @@ public function testParseUSNumber() { $number = $this->phoneNumberUtil->parse('0351-152-303-473', 'AR'); - $this->assertEquals("+5493512303473", $this->phoneNumberUtil->format($number, PhoneNumberFormat::E164)); + $this->assertEquals('+5493512303473', $this->phoneNumberUtil->format($number, PhoneNumberFormat::E164)); } } diff --git a/tests/Issues/UKNumbersTest.php b/tests/Issues/UKNumbersTest.php index 0be50cf13..e936040d2 100644 --- a/tests/Issues/UKNumbersTest.php +++ b/tests/Issues/UKNumbersTest.php @@ -23,7 +23,6 @@ public function setUp() self::META_DATA_FILE_PREFIX, CountryCodeToRegionCodeMap::$countryCodeToRegionCodeMap ); - ; } public function testMobileNumber() @@ -32,16 +31,16 @@ public function testMobileNumber() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertTrue($valid, "Checking phone number is valid"); + $this->assertTrue($valid, 'Checking phone number is valid'); $type = $this->phoneUtil->getNumberType($phoneObject); - $this->assertEquals(PhoneNumberType::MOBILE, $type, "Checking phone number is detected as mobile"); + $this->assertEquals(PhoneNumberType::MOBILE, $type, 'Checking phone number is detected as mobile'); $formattedE164 = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::E164); - $this->assertEquals("+447987458147", $formattedE164, "Checking E164 format is correct"); + $this->assertEquals('+447987458147', $formattedE164, 'Checking E164 format is correct'); $formattedNational = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::NATIONAL); - $this->assertEquals("07987 458147", $formattedNational, "Checking National format is correct"); + $this->assertEquals('07987 458147', $formattedNational, 'Checking National format is correct'); } public function testFixedLine() @@ -50,16 +49,16 @@ public function testFixedLine() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertTrue($valid, "Checking phone number is valid"); + $this->assertTrue($valid, 'Checking phone number is valid'); $type = $this->phoneUtil->getNumberType($phoneObject); - $this->assertEquals(PhoneNumberType::FIXED_LINE, $type, "Checking phone number is detected as fixed line"); + $this->assertEquals(PhoneNumberType::FIXED_LINE, $type, 'Checking phone number is detected as fixed line'); $formattedE164 = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::E164); - $this->assertEquals("+441234512345", $formattedE164, "Checking E164 format is correct"); + $this->assertEquals('+441234512345', $formattedE164, 'Checking E164 format is correct'); $formattedNational = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::NATIONAL); - $this->assertEquals("01234 512345", $formattedNational, "Checking National format is correct"); + $this->assertEquals('01234 512345', $formattedNational, 'Checking National format is correct'); } public function testSharedCost() @@ -68,16 +67,16 @@ public function testSharedCost() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertTrue($valid, "Checking phone number is valid"); + $this->assertTrue($valid, 'Checking phone number is valid'); $type = $this->phoneUtil->getNumberType($phoneObject); - $this->assertEquals(PhoneNumberType::SHARED_COST, $type, "Checking phone number is detected as shared cost"); + $this->assertEquals(PhoneNumberType::SHARED_COST, $type, 'Checking phone number is detected as shared cost'); $formattedE164 = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::E164); - $this->assertEquals("+448451234568", $formattedE164, "Checking E164 format is correct"); + $this->assertEquals('+448451234568', $formattedE164, 'Checking E164 format is correct'); $formattedNational = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::NATIONAL); - $this->assertEquals("0845 123 4568", $formattedNational, "Checking National format is correct"); + $this->assertEquals('0845 123 4568', $formattedNational, 'Checking National format is correct'); } public function testPersonalNumber() @@ -86,20 +85,20 @@ public function testPersonalNumber() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertTrue($valid, "Checking phone number is valid"); + $this->assertTrue($valid, 'Checking phone number is valid'); $type = $this->phoneUtil->getNumberType($phoneObject); $this->assertEquals( PhoneNumberType::PERSONAL_NUMBER, $type, - "Checking phone number is detected as a personal number" + 'Checking phone number is detected as a personal number' ); $formattedE164 = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::E164); - $this->assertEquals("+447010020249", $formattedE164, "Checking E164 format is correct"); + $this->assertEquals('+447010020249', $formattedE164, 'Checking E164 format is correct'); $formattedNational = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::NATIONAL); - $this->assertEquals("070 1002 0249", $formattedNational, "Checking National format is correct"); + $this->assertEquals('070 1002 0249', $formattedNational, 'Checking National format is correct'); } public function testUAN() @@ -108,16 +107,16 @@ public function testUAN() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertTrue($valid, "Checking phone number is valid"); + $this->assertTrue($valid, 'Checking phone number is valid'); $type = $this->phoneUtil->getNumberType($phoneObject); - $this->assertEquals(PhoneNumberType::UAN, $type, "Checking phone number is detected as UAN"); + $this->assertEquals(PhoneNumberType::UAN, $type, 'Checking phone number is detected as UAN'); $formattedE164 = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::E164); - $this->assertEquals("+443335555555", $formattedE164, "Checking E164 format is correct"); + $this->assertEquals('+443335555555', $formattedE164, 'Checking E164 format is correct'); $formattedNational = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::NATIONAL); - $this->assertEquals("0333 555 5555", $formattedNational, "Checking National format is correct"); + $this->assertEquals('0333 555 5555', $formattedNational, 'Checking National format is correct'); } public function testTollFree() @@ -126,16 +125,16 @@ public function testTollFree() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertTrue($valid, "Checking phone number is valid"); + $this->assertTrue($valid, 'Checking phone number is valid'); $type = $this->phoneUtil->getNumberType($phoneObject); - $this->assertEquals(PhoneNumberType::TOLL_FREE, $type, "Checking phone number is detected as TOLL FREE"); + $this->assertEquals(PhoneNumberType::TOLL_FREE, $type, 'Checking phone number is detected as TOLL FREE'); $formattedE164 = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::E164); - $this->assertEquals("+44800800150", $formattedE164, "Checking E164 format is correct"); + $this->assertEquals('+44800800150', $formattedE164, 'Checking E164 format is correct'); $formattedNational = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::NATIONAL); - $this->assertEquals("0800 800150", $formattedNational, "Checking National format is correct"); + $this->assertEquals('0800 800150', $formattedNational, 'Checking National format is correct'); } public function testPremium() @@ -144,16 +143,16 @@ public function testPremium() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertTrue($valid, "Checking phone number is valid"); + $this->assertTrue($valid, 'Checking phone number is valid'); $type = $this->phoneUtil->getNumberType($phoneObject); - $this->assertEquals(PhoneNumberType::PREMIUM_RATE, $type, "Checking phone number is detected as PREMIUM RATE"); + $this->assertEquals(PhoneNumberType::PREMIUM_RATE, $type, 'Checking phone number is detected as PREMIUM RATE'); $formattedE164 = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::E164); - $this->assertEquals("+449063020288", $formattedE164, "Checking E164 format is correct"); + $this->assertEquals('+449063020288', $formattedE164, 'Checking E164 format is correct'); $formattedNational = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::NATIONAL); - $this->assertEquals("0906 302 0288", $formattedNational, "Checking National format is correct"); + $this->assertEquals('0906 302 0288', $formattedNational, 'Checking National format is correct'); } public function testChildLine() @@ -162,20 +161,20 @@ public function testChildLine() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertTrue($valid, "Checking phone number is valid"); + $this->assertTrue($valid, 'Checking phone number is valid'); $type = $this->phoneUtil->getNumberType($phoneObject); $this->assertEquals( PhoneNumberType::TOLL_FREE, $type, - "Checking phone number is detected as TOLL FREE" + 'Checking phone number is detected as TOLL FREE' ); $formattedE164 = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::E164); - $this->assertEquals("+448001111", $formattedE164, "Checking E164 format is correct"); + $this->assertEquals('+448001111', $formattedE164, 'Checking E164 format is correct'); $formattedNational = $this->phoneUtil->format($phoneObject, PhoneNumberFormat::NATIONAL); - $this->assertEquals("0800 1111", $formattedNational, "Checking National format is correct"); + $this->assertEquals('0800 1111', $formattedNational, 'Checking National format is correct'); } public function testInvalidNumber() @@ -184,6 +183,6 @@ public function testInvalidNumber() $phoneObject = $this->phoneUtil->parse($number, 'GB'); $valid = $this->phoneUtil->isValidNumber($phoneObject); - $this->assertFalse($valid, "Checking phone number is invalid"); + $this->assertFalse($valid, 'Checking phone number is invalid'); } } diff --git a/tests/buildtools/BuildMetadataFromXmlTest.php b/tests/buildtools/BuildMetadataFromXmlTest.php index 1a2ed8ad2..636abeb82 100644 --- a/tests/buildtools/BuildMetadataFromXmlTest.php +++ b/tests/buildtools/BuildMetadataFromXmlTest.php @@ -18,11 +18,11 @@ class BuildMetadataFromXmlTest extends TestCase { public function testValidateRERemovesWhiteSpaces() { - $input = " hello world "; + $input = ' hello world '; // Should remove all the white spaces contained in the provided string. - $this->assertEquals("helloworld", BuildMetadataFromXml::validateRE($input, true)); + $this->assertEquals('helloworld', BuildMetadataFromXml::validateRE($input, true)); // Make sure it only happens when the last parameter is set to true. - $this->assertEquals(" hello world ", BuildMetadataFromXml::validateRE($input, false)); + $this->assertEquals(' hello world ', BuildMetadataFromXml::validateRE($input, false)); } public function testValidateREThrowsException() @@ -69,7 +69,7 @@ public function testValidateREThrowsException() public function testValidateRE() { - $validPattern = "[a-zA-Z]d{1,9}"; + $validPattern = '[a-zA-Z]d{1,9}'; // The provided pattern should be left unchanged. $this->assertEquals($validPattern, BuildMetadataFromXml::validateRE($validPattern, false)); } @@ -95,23 +95,23 @@ private function parseXMLString($xmlString) public function testLoadTerritoryTagMetadata() { - $xmlInput = "" - . ""; + . ''; $territoryElement = $this->parseXMLString($xmlInput); $phoneMetadata = BuildMetadataFromXml::loadTerritoryTagMetadata('33', $territoryElement, '0'); $this->assertEquals(33, $phoneMetadata->getCountryCode()); - $this->assertEquals("2", $phoneMetadata->getLeadingDigits()); - $this->assertEquals("00", $phoneMetadata->getInternationalPrefix()); - $this->assertEquals("0011", $phoneMetadata->getPreferredInternationalPrefix()); - $this->assertEquals("0", $phoneMetadata->getNationalPrefixForParsing()); - $this->assertEquals("9$1", $phoneMetadata->getNationalPrefixTransformRule()); - $this->assertEquals("0", $phoneMetadata->getNationalPrefix()); - $this->assertEquals(" x", $phoneMetadata->getPreferredExtnPrefix()); + $this->assertEquals('2', $phoneMetadata->getLeadingDigits()); + $this->assertEquals('00', $phoneMetadata->getInternationalPrefix()); + $this->assertEquals('0011', $phoneMetadata->getPreferredInternationalPrefix()); + $this->assertEquals('0', $phoneMetadata->getNationalPrefixForParsing()); + $this->assertEquals('9$1', $phoneMetadata->getNationalPrefixTransformRule()); + $this->assertEquals('0', $phoneMetadata->getNationalPrefix()); + $this->assertEquals(' x', $phoneMetadata->getPreferredExtnPrefix()); $this->assertTrue($phoneMetadata->isMainCountryForCode()); $this->assertTrue($phoneMetadata->isMobileNumberPortableRegion()); } @@ -131,7 +131,7 @@ public function testLoadTerritoryTagMetadataSetsNationalPrefixForParsingByDefaul $territoryElement = $this->parseXMLString($xmlInput); $phoneMetadata = BuildMetadataFromXml::loadTerritoryTagMetadata('33', $territoryElement, '00'); // When unspecified, nationalPrefixForParsing defaults to nationalPrefix. - $this->assertEquals("00", $phoneMetadata->getNationalPrefix()); + $this->assertEquals('00', $phoneMetadata->getNationalPrefix()); $this->assertEquals($phoneMetadata->getNationalPrefix(), $phoneMetadata->getNationalPrefixForParsing()); } @@ -146,7 +146,7 @@ public function testLoadTerritoryTagMetadataWithRequiredAttributesOnly() public function testLoadInternationalFormat() { $intlFormat = '$1 $2'; - $xmlInput = "" . $intlFormat . ""; + $xmlInput = '' . $intlFormat . ''; $numberFormatElement = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); $nationalFormat = new NumberFormat(); @@ -159,7 +159,7 @@ public function testLoadInternationalFormat() public function testLoadInternationalFormatWithBothNationalAndIntlFormatsDefined() { $intlFormat = '$1 $2'; - $xmlInput = "" . $intlFormat . ""; + $xmlInput = '' . $intlFormat . ''; $numberFormatElement = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); $nationalFormat = new NumberFormat(); @@ -240,7 +240,7 @@ public function testLoadNationalFormatRequiresFormat() */ public function testLoadNationalFormatExpectsExactlyOneFormat() { - $xmlInput = ""; + $xmlInput = ''; $numberFormatElement = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); $numberFormat = new NumberFormat(); @@ -288,11 +288,11 @@ public function testLoadAvailableFormatsPropagatesCarrierCodeFormattingRule() public function testLoadAvailableFormatsSetsProvidedNationalPrefixFormattingRule() { - $xmlInput = "" - . " " + $xmlInput = '' + . ' ' . ' $1 $2 $3' - . " " - . ""; + . ' ' + . ''; $element = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); @@ -302,11 +302,11 @@ public function testLoadAvailableFormatsSetsProvidedNationalPrefixFormattingRule public function testLoadAvailableFormatsClearsIntlFormat() { - $xmlInput = "" - . " " + $xmlInput = '' + . ' ' . ' $1 $2 $3' - . " " - . ""; + . ' ' + . ''; $element = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); @@ -316,12 +316,12 @@ public function testLoadAvailableFormatsClearsIntlFormat() public function testLoadAvailableFormatsHandlesMultipleNumberFormats() { - $xmlInput = "" - . " " + $xmlInput = '' + . ' ' . ' $1 $2 $3' . ' $1-$2' - . " " - . ""; + . ' ' + . ''; $element = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); @@ -344,9 +344,9 @@ public function testLoadInternationalFormatDoesNotSetIntlFormatWhenNA() public function testSetLeadingDigitsPatterns() { - $xmlInput = "" - . "12" - . ""; + $xmlInput = '' + . '12' + . ''; $numberFormatElement = $this->parseXMLString($xmlInput); $numberFormat = new NumberFormat(); @@ -362,17 +362,17 @@ public function testSetLeadingDigitsPatterns() */ public function testSetLeadingDigitsPatternsNotAddedTwiceWhenInternationalFormatsPresent() { - $xmlInput = "" + $xmlInput = '' . " " - . " 1" + . ' 1' . ' $1' - . " " + . ' ' . " " - . " 2" + . ' 2' . ' $1' . ' 9-$1' - . " " - . ""; + . ' ' + . ''; $element = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); @@ -403,7 +403,7 @@ public function testGetDomesticCarrierCodeFormattingRuleFromElement() public function testProcessPhoneNumberDescElementWithInvalidInput() { $generalDesc = new PhoneNumberDesc(); - $territoryElement = $this->parseXMLString(""); + $territoryElement = $this->parseXMLString(''); $phoneNumberDesc = BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'invalidType'); @@ -414,9 +414,9 @@ public function testProcessPhoneNumberDescElementOverridesGeneralDesc() { $generalDesc = new PhoneNumberDesc(); $generalDesc->setNationalNumberPattern('\\d{8}'); - $xmlInput = "" + $xmlInput = '' . " \\d{6}" - . ""; + . ''; $territoryElement = $this->parseXMLString($xmlInput); @@ -427,25 +427,25 @@ public function testProcessPhoneNumberDescElementOverridesGeneralDesc() public function testBuildPhoneMetadataCollection_liteBuild() { - $xmlInput = "" - . " " - . " " - . " " + $xmlInput = '' + . ' ' + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " " + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " 10123456" - . " " - . " " + . ' ' + . ' 10123456' + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " 10123456" - . " " - . " " - . " " - . ""; + . ' ' + . ' 10123456' + . ' ' + . ' ' + . ' ' + . ''; $document = $this->parseXMLString($xmlInput); @@ -461,36 +461,36 @@ public function testBuildPhoneMetadataCollection_liteBuild() $this->assertTrue($metadata->hasGeneralDesc()); $this->assertFalse($metadata->getGeneralDesc()->hasExampleNumber()); - $this->assertEquals("", $metadata->getGeneralDesc()->getExampleNumber()); + $this->assertEquals('', $metadata->getGeneralDesc()->getExampleNumber()); $this->assertTrue($metadata->hasFixedLine()); $this->assertFalse($metadata->getFixedLine()->hasExampleNumber()); - $this->assertEquals("", $metadata->getFixedLine()->getExampleNumber()); + $this->assertEquals('', $metadata->getFixedLine()->getExampleNumber()); $this->assertTrue($metadata->hasMobile()); $this->assertFalse($metadata->getMobile()->hasExampleNumber()); - $this->assertEquals("", $metadata->getMobile()->getExampleNumber()); + $this->assertEquals('', $metadata->getMobile()->getExampleNumber()); } public function testBuildPhoneMetadataCollection_specialBuild() { - $xmlInput = "" - . " " - . " " - . " " + $xmlInput = '' + . ' ' + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " " + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " 10123456" - . " " - . " " + . ' ' + . ' 10123456' + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " 10123456" - . " " - . " " - . " " - . ""; + . ' ' + . ' 10123456' + . ' ' + . ' ' + . ' ' + . ''; $document = $this->parseXMLString($xmlInput); @@ -505,37 +505,37 @@ public function testBuildPhoneMetadataCollection_specialBuild() $metadata = $metadataCollection[0]; $this->assertTrue($metadata->hasGeneralDesc()); $this->assertFalse($metadata->getGeneralDesc()->hasExampleNumber()); - $this->assertEquals("", $metadata->getGeneralDesc()->getExampleNumber()); + $this->assertEquals('', $metadata->getGeneralDesc()->getExampleNumber()); // Consider clearing fixed-line if empty after being filtered. $this->assertTrue($metadata->hasFixedLine()); $this->assertFalse($metadata->getFixedLine()->hasExampleNumber()); - $this->assertEquals("", $metadata->getFixedLine()->getExampleNumber()); + $this->assertEquals('', $metadata->getFixedLine()->getExampleNumber()); $this->assertTrue($metadata->hasMobile()); $this->assertTrue($metadata->getMobile()->hasExampleNumber()); - $this->assertEquals("10123456", $metadata->getMobile()->getExampleNumber()); + $this->assertEquals('10123456', $metadata->getMobile()->getExampleNumber()); } public function testBuildPhoneMetadataCollection_fullBuild() { - $xmlInput = "" - . " " - . " " - . " " + $xmlInput = '' + . ' ' + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " " + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " 10123456" - . " " - . " " + . ' ' + . ' 10123456' + . ' ' + . ' ' . " [1-9]\\d{7}" - . " " - . " 10123456" - . " " - . " " - . " " - . ""; + . ' ' + . ' 10123456' + . ' ' + . ' ' + . ' ' + . ''; $document = $this->parseXMLString($xmlInput); @@ -550,21 +550,21 @@ public function testBuildPhoneMetadataCollection_fullBuild() $metadata = $metadataCollection[0]; $this->assertTrue($metadata->hasGeneralDesc()); $this->assertFalse($metadata->getGeneralDesc()->hasExampleNumber()); - $this->assertEquals("", $metadata->getGeneralDesc()->getExampleNumber()); + $this->assertEquals('', $metadata->getGeneralDesc()->getExampleNumber()); $this->assertTrue($metadata->hasFixedLine()); $this->assertTrue($metadata->getFixedLine()->hasExampleNumber()); - $this->assertEquals("10123456", $metadata->getFixedLine()->getExampleNumber()); + $this->assertEquals('10123456', $metadata->getFixedLine()->getExampleNumber()); $this->assertTrue($metadata->hasMobile()); $this->assertTrue($metadata->getMobile()->hasExampleNumber()); - $this->assertEquals("10123456", $metadata->getMobile()->getExampleNumber()); + $this->assertEquals('10123456', $metadata->getMobile()->getExampleNumber()); } public function testProcessPhoneNumberDescOutputsExampleNumberByDefault() { $generalDesc = new PhoneNumberDesc(); - $xmlInput = "" - . " 01 01 01 01" - . ""; + $xmlInput = '' + . ' 01 01 01 01' + . ''; $territoryElement = $this->parseXMLString($xmlInput); @@ -576,9 +576,9 @@ public function testProcessPhoneNumberDescOutputsExampleNumberByDefault() public function testProcessPhoneNumberDescRemovesWhiteSpacesInPatterns() { $generalDesc = new PhoneNumberDesc(); - $xmlInput = "" + $xmlInput = '' . " \t \\d { 6 } " - . ""; + . ''; $countryElement = $this->parseXMLString($xmlInput); @@ -589,10 +589,10 @@ public function testProcessPhoneNumberDescRemovesWhiteSpacesInPatterns() public function testSetRelevantDescPatternsSetsSameMobileAndFixedLinePattern() { - $xmlInput = "" + $xmlInput = '' . " \\d{6}" . " \\d{6}" - . ""; + . ''; $territoryElement = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); @@ -603,7 +603,7 @@ public function testSetRelevantDescPatternsSetsSameMobileAndFixedLinePattern() public function testSetRelevantDescPatternsSetsAllDescriptionsForRegularLengthNumbers() { - $xmlInput = "" + $xmlInput = '' . " \\d{1}" . " \\d{2}" . " \\d{3}" @@ -613,7 +613,7 @@ public function testSetRelevantDescPatternsSetsAllDescriptionsForRegularLengthNu . " \\d{7}" . " \\d{8}" . " \\d{9}" - . ""; + . ''; $territoryElement = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); @@ -631,18 +631,18 @@ public function testSetRelevantDescPatternsSetsAllDescriptionsForRegularLengthNu public function testSetRelevantDescPatternsSetsAllDescriptionsForShortNumbers() { - $xmlInput = "" + $xmlInput = '' . " \\d{1}" . " \\d{2}" . " \\d{3}" . " \\d{4}" - . " " + . ' ' . " \\d{5}" - . " " - . " " + . ' ' + . ' ' . " \\d{6}" - . " " - . ""; + . ' ' + . ''; $territoryElement = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); @@ -661,10 +661,10 @@ public function testSetRelevantDescPatternsSetsAllDescriptionsForShortNumbers() */ public function testSetRelevantDescPatternsThrowsErrorIfTypePresentMultipleTimes() { - $xmlInput = "" + $xmlInput = '' . " \\d{6}" . " \\d{6}" - . ""; + . ''; $territoryElement = $this->parseXMLString($xmlInput); $metadata = new PhoneMetadata(); @@ -673,16 +673,16 @@ public function testSetRelevantDescPatternsThrowsErrorIfTypePresentMultipleTimes public function testAlternateFormatsOmitsDescPatterns() { - $xmlInput = "" - . " " + $xmlInput = '' + . ' ' . " " - . " 1" + . ' 1' . ' $1' - . " " - . " " + . ' ' + . ' ' . " \\d{1}" . " \\d{2}" - . ""; + . ''; $territoryElement = $this->parseXMLString($xmlInput); $metadata = BuildMetadataFromXml::loadCountryMetadata('FR', $territoryElement, false @@ -696,27 +696,27 @@ public function testAlternateFormatsOmitsDescPatterns() public function testNationalPrefixRulesSetCorrectly() { - $xmlInput = "' - . " " + . ' ' . " " - . " 1" + . ' 1' . ' $1' - . " " + . ' ' . " " - . " 2" + . ' 2' . ' $1' - . " " - . " " + . ' ' + . ' ' . " \\d{1}" - . ""; + . ''; $territoryElement = $this->parseXMLString($xmlInput); $metadata = BuildMetadataFromXml::loadCountryMetadata('FR', $territoryElement, false /* isShortNumberMetadata */, true /* isAlternateFormatsMetadata */); $this->assertTrue($metadata->getNumberFormat(0)->getNationalPrefixOptionalWhenFormatting()); // This is inherited from the territory, with $NP replaced by the actual national prefix, and // $FG replaced with $1. - $this->assertEquals("0$1", $metadata->getNumberFormat(0)->getNationalPrefixFormattingRule()); + $this->assertEquals('0$1', $metadata->getNumberFormat(0)->getNationalPrefixFormattingRule()); // Here it is explicitly set to false. $this->assertFalse($metadata->getNumberFormat(1)->getNationalPrefixOptionalWhenFormatting()); } @@ -727,12 +727,12 @@ public function testProcessPhoneNumberDescElement_PossibleLengthsSetCorrectly() // The number lengths set for the general description must be a super-set of those in the // element being parsed. $generalDesc->setPossibleLength(array(4, 6, 7, 13)); - $territoryElement = $this->parseXMLString("" - . "" + $territoryElement = $this->parseXMLString('' + . '' // Sorting will be done when parsing. - . " " - . "" - . ""); + . ' ' + . '' + . ''); $fixedLine = BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'fixedLine'); @@ -756,17 +756,17 @@ public function testProcessPhoneNumberDescElement_PossibleLengthsSetCorrectly() public function testSetPossibleLengthsGeneralDesc_BuiltFromChildElements() { - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . "" - . " " - . "" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . '' + . ' ' + . '' + . '' + . ' ' + . '' + . ''); $generalDesc = new PhoneNumberDesc(); BuildMetadataFromXml::setPossibleLengthsGeneralDesc($generalDesc, 'someId', $territoryElement, @@ -786,14 +786,14 @@ public function testSetPossibleLengthsGeneralDesc_BuiltFromChildElements() public function testSetPossibleLengthsGeneralDesc_IgnoresNoIntlDialling() { - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . '' + . ' ' + . '' + . ''); $generalDesc = new PhoneNumberDesc(); BuildMetadataFromXml::setPossibleLengthsGeneralDesc($generalDesc, 'someId', $territoryElement, @@ -809,20 +809,20 @@ public function testSetPossibleLengthsGeneralDesc_IgnoresNoIntlDialling() public function testSetPossibleLengthsGeneralDesc_ShortNumberMetadata() { - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . "" - . " " - . "" - . "" - . " " - . "" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . '' + . ' ' + . '' + . '' + . ' ' + . '' + . '' + . ' ' + . '' + . ''); $generalDesc = new PhoneNumberDesc(); BuildMetadataFromXml::setPossibleLengthsGeneralDesc($generalDesc, 'someId', $territoryElement, @@ -841,11 +841,11 @@ public function testSetPossibleLengthsGeneralDesc_ShortNumberMetadata() */ public function testSetPossibleLengthsGeneralDesc_ShortNumberMetadataErrorsOnLocalLengths() { - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); $generalDesc = new PhoneNumberDesc(); BuildMetadataFromXml::setPossibleLengthsGeneralDesc($generalDesc, 'someId', $territoryElement, @@ -861,11 +861,11 @@ public function testProcessPhoneNumberDescElement_ErrorDuplicates() $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(6)); - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'mobile'); } @@ -879,11 +879,11 @@ public function testProcessPhoneNumberDescElement_ErrorDuplicatesOneLocal() $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(6)); - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'mobile'); } @@ -897,12 +897,12 @@ public function testProcessPhoneNumberDescElement_ErrorUncoveredLengths() $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(4)); - $territoryElement = $this->parseXMLString("" - . "" + $territoryElement = $this->parseXMLString('' + . '' // Sorting will be done when parsing. - . " " - . "" - . ""); + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'noInternationalDialling'); } @@ -914,12 +914,12 @@ public function testProcessPhoneNumberDescElement_SameAsParent() // element being parsed. $generalDesc->setPossibleLength(array(4, 6, 7)); $generalDesc->setPossibleLengthLocalOnly(array(2)); - $territoryElement = $this->parseXMLString("" - . "" + $territoryElement = $this->parseXMLString('' + . '' // Sorting will be done when parsing. - . " " - . "" - . ""); + . ' ' + . '' + . ''); $phoneNumberDesc = BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'fixedLine'); @@ -938,11 +938,11 @@ public function testProcessPhoneNumberDescElement_InvalidNumber() { $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(4)); - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'fixedLine'); } @@ -953,15 +953,15 @@ public function testProcessPhoneNumberDescElement_InvalidNumber() */ public function testLoadCountryMetadata_GeneralDescHasNumberLengthsSet() { - $territoryElement = $this->parseXMLString("" - . "" + $territoryElement = $this->parseXMLString('' + . '' // This shouldn't be set, the possible lengths should be derived for generalDesc. - . " " - . "" - . "" - . " " - . "" - . ""); + . ' ' + . '' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::loadCountryMetadata('FR', $territoryElement, false /* isShortNumberMetadata */, false /* isAlternateFormatsMetadata */); @@ -975,11 +975,11 @@ public function testProcessPhoneNumberDescElement_ErrorEmptyPossibleLengthString { $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(4)); - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'fixedLine'); } @@ -992,11 +992,11 @@ public function testProcessPhoneNumberDescElement_ErrorRangeSpecifiedWithComma() { $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(4)); - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'fixedLine'); } @@ -1010,11 +1010,11 @@ public function testProcessPhoneNumberDescElement_ErrorIncompleteRange() $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(4)); - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'fixedLine'); } @@ -1027,11 +1027,11 @@ public function testProcessPhoneNumberDescElement_ErrorNoDashInRange() { $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(4)); - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'fixedLine'); } @@ -1044,11 +1044,11 @@ public function testProcessPhoneNumberDescElement_ErrorRangeIsNotFromMinToMax() { $generalDesc = new PhoneNumberDesc(); $generalDesc->setPossibleLength(array(4)); - $territoryElement = $this->parseXMLString("" - . "" - . " " - . "" - . ""); + $territoryElement = $this->parseXMLString('' + . '' + . ' ' + . '' + . ''); BuildMetadataFromXml::processPhoneNumberDescElement($generalDesc, $territoryElement, 'fixedLine'); } @@ -1061,9 +1061,9 @@ public function testGetMetadataFilter() try { BuildMetadataFromXml::getMetadataFilter(true, true); - $this->fail("getMetadataFilter should fail when liteBuild and specialBuild are both set"); + $this->fail('getMetadataFilter should fail when liteBuild and specialBuild are both set'); } catch (\RuntimeException $e) { - $this->assertEquals("liteBuild and specialBuild may not both be set", $e->getMessage()); + $this->assertEquals('liteBuild and specialBuild may not both be set', $e->getMessage()); } } } diff --git a/tests/buildtools/GeneratePhonePrefixDataTest.php b/tests/buildtools/GeneratePhonePrefixDataTest.php index 7708f37b0..c11a74278 100644 --- a/tests/buildtools/GeneratePhonePrefixDataTest.php +++ b/tests/buildtools/GeneratePhonePrefixDataTest.php @@ -17,16 +17,16 @@ public static function setUpBeforeClass() // Languages for US. - $phonePrefixData->addConfigurationMapping($temporaryMap, "1", "en"); - $phonePrefixData->addConfigurationMapping($temporaryMap, "1", "en_US"); - $phonePrefixData->addConfigurationMapping($temporaryMap, "1", "es"); + $phonePrefixData->addConfigurationMapping($temporaryMap, '1', 'en'); + $phonePrefixData->addConfigurationMapping($temporaryMap, '1', 'en_US'); + $phonePrefixData->addConfigurationMapping($temporaryMap, '1', 'es'); // Languages for France. - $phonePrefixData->addConfigurationMapping($temporaryMap, "33", "fr"); - $phonePrefixData->addConfigurationMapping($temporaryMap, "33", "en"); + $phonePrefixData->addConfigurationMapping($temporaryMap, '33', 'fr'); + $phonePrefixData->addConfigurationMapping($temporaryMap, '33', 'en'); // Languages for China. - $phonePrefixData->addConfigurationMapping($temporaryMap, "86", "zh_Hans"); + $phonePrefixData->addConfigurationMapping($temporaryMap, '86', 'zh_Hans'); self::$available_data_files = $temporaryMap; } @@ -37,18 +37,18 @@ public function testAddConfigurationMapping() $languagesForUS = self::$available_data_files[1]; - $this->assertContains("en", $languagesForUS); - $this->assertContains("en_US", $languagesForUS); - $this->assertContains("es", $languagesForUS); + $this->assertContains('en', $languagesForUS); + $this->assertContains('en_US', $languagesForUS); + $this->assertContains('es', $languagesForUS); $languagesForFR = self::$available_data_files[33]; - $this->assertContains("fr", $languagesForFR); - $this->assertContains("en", $languagesForFR); + $this->assertContains('fr', $languagesForFR); + $this->assertContains('en', $languagesForFR); $languagesForCN = self::$available_data_files[86]; $this->assertCount(1, $languagesForCN); - $this->assertContains("zh_Hans", $languagesForCN); + $this->assertContains('zh_Hans', $languagesForCN); } } diff --git a/tests/buildtools/MetadataFilterTest.php b/tests/buildtools/MetadataFilterTest.php index c346ebcc7..c1e1345d1 100644 --- a/tests/buildtools/MetadataFilterTest.php +++ b/tests/buildtools/MetadataFilterTest.php @@ -10,14 +10,14 @@ class MetadataFilterTest extends TestCase { - private static $ID = "AM"; + private static $ID = 'AM'; private static $countryCode = 374; - private static $internationalPrefix = "0[01]"; - private static $preferredInternationalPrefix = "00"; + private static $internationalPrefix = '0[01]'; + private static $preferredInternationalPrefix = '00'; private static $nationalNumberPattern = "\\d{8}"; private static $possibleLengths = array(8); private static $possibleLengthsLocalOnly = array(5, 6); - private static $exampleNumber = "10123456"; + private static $exampleNumber = '10123456'; public function testForLiteBuild() { @@ -204,93 +204,93 @@ public function testParseFieldMapFromString_equivalentExpressions() // Order and whitespace don't matter $this->assertEquals($this->recursive_ksort(MetadataFilter::parseFieldMapFromString( - " nationalNumberPattern " - . ": uan ( exampleNumber , possibleLengthLocalOnly, possibleLength ) " - . ": nationalPrefix " - . ": fixedLine " - . ": pager ( exampleNumber ) ")), + ' nationalNumberPattern ' + . ': uan ( exampleNumber , possibleLengthLocalOnly, possibleLength ) ' + . ': nationalPrefix ' + . ': fixedLine ' + . ': pager ( exampleNumber ) ')), $this->recursive_ksort(MetadataFilter::parseFieldMapFromString( - "uan(possibleLength,exampleNumber,possibleLengthLocalOnly)" - . ":pager(exampleNumber)" - . ":fixedLine" - . ":nationalPrefix" - . ":nationalNumberPattern"))); + 'uan(possibleLength,exampleNumber,possibleLengthLocalOnly)' + . ':pager(exampleNumber)' + . ':fixedLine' + . ':nationalPrefix' + . ':nationalNumberPattern'))); // Parent explicitly listing all possible children. $this->assertEquals( $this->recursive_ksort(MetadataFilter::parseFieldMapFromString( - "uan(nationalNumberPattern,possibleLength,exampleNumber,possibleLengthLocalOnly)")), - $this->recursive_ksort(MetadataFilter::parseFieldMapFromString("uan"))); + 'uan(nationalNumberPattern,possibleLength,exampleNumber,possibleLengthLocalOnly)')), + $this->recursive_ksort(MetadataFilter::parseFieldMapFromString('uan'))); // All parent's children covered, some implicitly and some explicitly. $this->assertEquals( $this->recursive_ksort(MetadataFilter::parseFieldMapFromString( - "uan(nationalNumberPattern,possibleLength,exampleNumber)" - . ":possibleLengthLocalOnly")), - $this->recursive_ksort(MetadataFilter::parseFieldMapFromString("uan:possibleLengthLocalOnly"))); + 'uan(nationalNumberPattern,possibleLength,exampleNumber)' + . ':possibleLengthLocalOnly')), + $this->recursive_ksort(MetadataFilter::parseFieldMapFromString('uan:possibleLengthLocalOnly'))); // Child field covered by all parents explicitly. // It seems this will always be better expressed as a wildcard child, but the check is complex // and may not be worth it. $this->assertEquals( MetadataFilter::parseFieldMapFromString( - "fixedLine(exampleNumber)" - . ":mobile(exampleNumber)" - . ":tollFree(exampleNumber)" - . ":premiumRate(exampleNumber)" - . ":sharedCost(exampleNumber)" - . ":personalNumber(exampleNumber)" - . ":voip(exampleNumber)" - . ":pager(exampleNumber)" - . ":uan(exampleNumber)" - . ":emergency(exampleNumber)" - . ":voicemail(exampleNumber)" - . ":shortCode(exampleNumber)" - . ":standardRate(exampleNumber)" - . ":carrierSpecific(exampleNumber)" - . ":smsServices(exampleNumber)" - . ":noInternationalDialling(exampleNumber)"), - MetadataFilter::parseFieldMapFromString("exampleNumber")); + 'fixedLine(exampleNumber)' + . ':mobile(exampleNumber)' + . ':tollFree(exampleNumber)' + . ':premiumRate(exampleNumber)' + . ':sharedCost(exampleNumber)' + . ':personalNumber(exampleNumber)' + . ':voip(exampleNumber)' + . ':pager(exampleNumber)' + . ':uan(exampleNumber)' + . ':emergency(exampleNumber)' + . ':voicemail(exampleNumber)' + . ':shortCode(exampleNumber)' + . ':standardRate(exampleNumber)' + . ':carrierSpecific(exampleNumber)' + . ':smsServices(exampleNumber)' + . ':noInternationalDialling(exampleNumber)'), + MetadataFilter::parseFieldMapFromString('exampleNumber')); // Child field given as a group by itself while it's covered by all parents implicitly. // It seems this will always be better expressed without the wildcard child, but the check is // complex and may not be worth it. $this->assertEquals( MetadataFilter::parseFieldMapFromString( - "fixedLine" - . ":mobile" - . ":tollFree" - . ":premiumRate" - . ":sharedCost" - . ":personalNumber" - . ":voip" - . ":pager" - . ":uan" - . ":emergency" - . ":voicemail" - . ":shortCode" - . ":standardRate" - . ":carrierSpecific" - . ":smsServices" - . ":noInternationalDialling" - . ":exampleNumber"), + 'fixedLine' + . ':mobile' + . ':tollFree' + . ':premiumRate' + . ':sharedCost' + . ':personalNumber' + . ':voip' + . ':pager' + . ':uan' + . ':emergency' + . ':voicemail' + . ':shortCode' + . ':standardRate' + . ':carrierSpecific' + . ':smsServices' + . ':noInternationalDialling' + . ':exampleNumber'), MetadataFilter::parseFieldMapFromString( - "fixedLine" - . ":mobile" - . ":tollFree" - . ":premiumRate" - . ":sharedCost" - . ":personalNumber" - . ":voip" - . ":pager" - . ":uan" - . ":emergency" - . ":voicemail" - . ":shortCode" - . ":standardRate" - . ":carrierSpecific" - . ":smsServices" - . ":noInternationalDialling")); + 'fixedLine' + . ':mobile' + . ':tollFree' + . ':premiumRate' + . ':sharedCost' + . ':personalNumber' + . ':voip' + . ':pager' + . ':uan' + . ':emergency' + . ':voicemail' + . ':shortCode' + . ':standardRate' + . ':carrierSpecific' + . ':smsServices' + . ':noInternationalDialling')); } /** @@ -321,7 +321,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Empty input. try { - MetadataFilter::parseFieldMapFromString(""); + MetadataFilter::parseFieldMapFromString(''); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -330,7 +330,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Whitespace input. try { - MetadataFilter::parseFieldMapFromString(" "); + MetadataFilter::parseFieldMapFromString(' '); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -339,7 +339,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Bad token given as only group. try { - MetadataFilter::parseFieldMapFromString("something_else"); + MetadataFilter::parseFieldMapFromString('something_else'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -348,7 +348,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Bad token given as last group. try { - MetadataFilter::parseFieldMapFromString("fixedLine:something_else"); + MetadataFilter::parseFieldMapFromString('fixedLine:something_else'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -358,7 +358,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Bad token given as middle group. try { MetadataFilter::parseFieldMapFromString( - "pager:nationalPrefix:something_else:nationalNumberPattern"); + 'pager:nationalPrefix:something_else:nationalNumberPattern'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -367,7 +367,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Childless field given as parent. try { - MetadataFilter::parseFieldMapFromString("nationalPrefix(exampleNumber)"); + MetadataFilter::parseFieldMapFromString('nationalPrefix(exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -376,7 +376,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Child field given as parent. try { - MetadataFilter::parseFieldMapFromString("possibleLength(exampleNumber)"); + MetadataFilter::parseFieldMapFromString('possibleLength(exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -385,7 +385,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Bad token given as parent. try { - MetadataFilter::parseFieldMapFromString("something_else(exampleNumber)"); + MetadataFilter::parseFieldMapFromString('something_else(exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -394,7 +394,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Parent field given as only child. try { - MetadataFilter::parseFieldMapFromString("fixedLine(uan)"); + MetadataFilter::parseFieldMapFromString('fixedLine(uan)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -403,7 +403,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Parent field given as first child. try { - MetadataFilter::parseFieldMapFromString("fixedLine(uan,possibleLength)"); + MetadataFilter::parseFieldMapFromString('fixedLine(uan,possibleLength)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -412,7 +412,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Parent field given as last child. try { - MetadataFilter::parseFieldMapFromString("fixedLine(possibleLength,uan)"); + MetadataFilter::parseFieldMapFromString('fixedLine(possibleLength,uan)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -421,7 +421,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Parent field given as middle child. try { - MetadataFilter::parseFieldMapFromString("fixedLine(possibleLength,uan,exampleNumber)"); + MetadataFilter::parseFieldMapFromString('fixedLine(possibleLength,uan,exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -430,7 +430,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Childless field given as only child. try { - MetadataFilter::parseFieldMapFromString("fixedLine(nationalPrefix)"); + MetadataFilter::parseFieldMapFromString('fixedLine(nationalPrefix)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -439,7 +439,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Bad token given as only child. try { - MetadataFilter::parseFieldMapFromString("fixedLine(something_else)"); + MetadataFilter::parseFieldMapFromString('fixedLine(something_else)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -448,7 +448,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Bad token given as last child. try { - MetadataFilter::parseFieldMapFromString("uan(possibleLength,something_else)"); + MetadataFilter::parseFieldMapFromString('uan(possibleLength,something_else)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -457,7 +457,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Empty parent. try { - MetadataFilter::parseFieldMapFromString("(exampleNumber)"); + MetadataFilter::parseFieldMapFromString('(exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -466,7 +466,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Whitespace parent. try { - MetadataFilter::parseFieldMapFromString(" (exampleNumber)"); + MetadataFilter::parseFieldMapFromString(' (exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -475,7 +475,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Empty child. try { - MetadataFilter::parseFieldMapFromString("fixedLine()"); + MetadataFilter::parseFieldMapFromString('fixedLine()'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -484,7 +484,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Whitespace child. try { - MetadataFilter::parseFieldMapFromString("fixedLine( )"); + MetadataFilter::parseFieldMapFromString('fixedLine( )'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -493,7 +493,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Empty parent and child. try { - MetadataFilter::parseFieldMapFromString("()"); + MetadataFilter::parseFieldMapFromString('()'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -502,7 +502,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Whitespace parent and empty child. try { - MetadataFilter::parseFieldMapFromString(" ()"); + MetadataFilter::parseFieldMapFromString(' ()'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -511,7 +511,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Parent field given as a group twice. try { - MetadataFilter::parseFieldMapFromString("fixedLine:uan:fixedLine"); + MetadataFilter::parseFieldMapFromString('fixedLine:uan:fixedLine'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -520,7 +520,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Parent field given as the parent of a group and as a group by itself. try { - MetadataFilter::parseFieldMapFromString("fixedLine(exampleNumber):fixedLine"); + MetadataFilter::parseFieldMapFromString('fixedLine(exampleNumber):fixedLine'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -529,7 +529,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Parent field given as the parent of one group and then as the parent of another group. try { - MetadataFilter::parseFieldMapFromString("fixedLine(exampleNumber):fixedLine(possibleLength)"); + MetadataFilter::parseFieldMapFromString('fixedLine(exampleNumber):fixedLine(possibleLength)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -538,7 +538,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Childless field given twice as a group. try { - MetadataFilter::parseFieldMapFromString("nationalPrefix:uan:nationalPrefix"); + MetadataFilter::parseFieldMapFromString('nationalPrefix:uan:nationalPrefix'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -547,7 +547,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Child field given twice as a group. try { - MetadataFilter::parseFieldMapFromString("exampleNumber:uan:exampleNumber"); + MetadataFilter::parseFieldMapFromString('exampleNumber:uan:exampleNumber'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -556,7 +556,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Child field given first as the only child in a group and then as a group by itself. try { - MetadataFilter::parseFieldMapFromString("fixedLine(exampleNumber):exampleNumber"); + MetadataFilter::parseFieldMapFromString('fixedLine(exampleNumber):exampleNumber'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -566,9 +566,9 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Child field given first as a child in a group and then as a group by itself. try { MetadataFilter::parseFieldMapFromString( - "uan(nationalNumberPattern,possibleLength,exampleNumber)" - . ":possibleLengthLocalOnly" - . ":exampleNumber"); + 'uan(nationalNumberPattern,possibleLength,exampleNumber)' + . ':possibleLengthLocalOnly' + . ':exampleNumber'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -578,7 +578,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Child field given twice as children of the same parent. try { MetadataFilter::parseFieldMapFromString( - "fixedLine(possibleLength,exampleNumber,possibleLength)"); + 'fixedLine(possibleLength,exampleNumber,possibleLength)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -588,22 +588,22 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Child field given as a group by itself while it's covered by all parents explicitly. try { MetadataFilter::parseFieldMapFromString( - "fixedLine(exampleNumber)" - . ":mobile(exampleNumber)" - . ":tollFree(exampleNumber)" - . ":premiumRate(exampleNumber)" - . ":sharedCost(exampleNumber)" - . ":personalNumber(exampleNumber)" - . ":voip(exampleNumber)" - . ":pager(exampleNumber)" - . ":uan(exampleNumber)" - . ":emergency(exampleNumber)" - . ":voicemail(exampleNumber)" - . ":shortCode(exampleNumber)" - . ":standardRate(exampleNumber)" - . ":carrierSpecific(exampleNumber)" - . ":noInternationalDialling(exampleNumber)" - . ":exampleNumber"); + 'fixedLine(exampleNumber)' + . ':mobile(exampleNumber)' + . ':tollFree(exampleNumber)' + . ':premiumRate(exampleNumber)' + . ':sharedCost(exampleNumber)' + . ':personalNumber(exampleNumber)' + . ':voip(exampleNumber)' + . ':pager(exampleNumber)' + . ':uan(exampleNumber)' + . ':emergency(exampleNumber)' + . ':voicemail(exampleNumber)' + . ':shortCode(exampleNumber)' + . ':standardRate(exampleNumber)' + . ':carrierSpecific(exampleNumber)' + . ':noInternationalDialling(exampleNumber)' + . ':exampleNumber'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -614,23 +614,23 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // some explicitly. try { MetadataFilter::parseFieldMapFromString( - "fixedLine" - . ":mobile" - . ":tollFree" - . ":premiumRate" - . ":sharedCost" - . ":personalNumber" - . ":voip" - . ":pager(exampleNumber)" - . ":uan(exampleNumber)" - . ":emergency(exampleNumber)" - . ":voicemail(exampleNumber)" - . ":shortCode(exampleNumber)" - . ":standardRate(exampleNumber)" - . ":carrierSpecific(exampleNumber)" - . ":smsServices" - . ":noInternationalDialling(exampleNumber)" - . ":exampleNumber"); + 'fixedLine' + . ':mobile' + . ':tollFree' + . ':premiumRate' + . ':sharedCost' + . ':personalNumber' + . ':voip' + . ':pager(exampleNumber)' + . ':uan(exampleNumber)' + . ':emergency(exampleNumber)' + . ':voicemail(exampleNumber)' + . ':shortCode(exampleNumber)' + . ':standardRate(exampleNumber)' + . ':carrierSpecific(exampleNumber)' + . ':smsServices' + . ':noInternationalDialling(exampleNumber)' + . ':exampleNumber'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -639,7 +639,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Missing right parenthesis in only group. try { - MetadataFilter::parseFieldMapFromString("fixedLine(exampleNumber"); + MetadataFilter::parseFieldMapFromString('fixedLine(exampleNumber'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -648,7 +648,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Missing right parenthesis in first group. try { - MetadataFilter::parseFieldMapFromString("fixedLine(exampleNumber:pager"); + MetadataFilter::parseFieldMapFromString('fixedLine(exampleNumber:pager'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -657,7 +657,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Missing left parenthesis in only group. try { - MetadataFilter::parseFieldMapFromString("fixedLineexampleNumber)"); + MetadataFilter::parseFieldMapFromString('fixedLineexampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -666,7 +666,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Early right parenthesis in only group. try { - MetadataFilter::parseFieldMapFromString("fixedLine(example_numb)er"); + MetadataFilter::parseFieldMapFromString('fixedLine(example_numb)er'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -675,7 +675,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Extra right parenthesis at end of only group. try { - MetadataFilter::parseFieldMapFromString("fixedLine(exampleNumber))"); + MetadataFilter::parseFieldMapFromString('fixedLine(exampleNumber))'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -684,7 +684,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Extra right parenthesis between proper parentheses. try { - MetadataFilter::parseFieldMapFromString("fixedLine(example_numb)er)"); + MetadataFilter::parseFieldMapFromString('fixedLine(example_numb)er)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -693,7 +693,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Extra left parenthesis in only group. try { - MetadataFilter::parseFieldMapFromString("fixedLine((exampleNumber)"); + MetadataFilter::parseFieldMapFromString('fixedLine((exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -702,7 +702,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Extra level of children. try { - MetadataFilter::parseFieldMapFromString("fixedLine(exampleNumber(possibleLength))"); + MetadataFilter::parseFieldMapFromString('fixedLine(exampleNumber(possibleLength))'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -711,7 +711,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Trailing comma in children. try { - MetadataFilter::parseFieldMapFromString("fixedLine(exampleNumber,)"); + MetadataFilter::parseFieldMapFromString('fixedLine(exampleNumber,)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -720,7 +720,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Leading comma in children. try { - MetadataFilter::parseFieldMapFromString("fixedLine(,exampleNumber)"); + MetadataFilter::parseFieldMapFromString('fixedLine(,exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -729,7 +729,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Empty token between commas. try { - MetadataFilter::parseFieldMapFromString("fixedLine(possibleLength,,exampleNumber)"); + MetadataFilter::parseFieldMapFromString('fixedLine(possibleLength,,exampleNumber)'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -738,7 +738,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Trailing colon. try { - MetadataFilter::parseFieldMapFromString("uan:"); + MetadataFilter::parseFieldMapFromString('uan:'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -747,7 +747,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Leading colon. try { - MetadataFilter::parseFieldMapFromString(":uan"); + MetadataFilter::parseFieldMapFromString(':uan'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -756,7 +756,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Empty token between colons. try { - MetadataFilter::parseFieldMapFromString("uan::fixedLine"); + MetadataFilter::parseFieldMapFromString('uan::fixedLine'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. @@ -765,7 +765,7 @@ public function testParseFieldMapFromString_RuntimeExceptionCases() // Missing colon between groups. try { - MetadataFilter::parseFieldMapFromString("uan(possibleLength)pager"); + MetadataFilter::parseFieldMapFromString('uan(possibleLength)pager'); $this->fail(); } catch (\RuntimeException $e) { // Test passed. diff --git a/tests/carrier/PhoneNumberToCarrierMapperTest.php b/tests/carrier/PhoneNumberToCarrierMapperTest.php index 5d0039a78..698af810d 100644 --- a/tests/carrier/PhoneNumberToCarrierMapperTest.php +++ b/tests/carrier/PhoneNumberToCarrierMapperTest.php @@ -9,7 +9,7 @@ class PhoneNumberToCarrierMapperTest extends TestCase { - const TEST_META_DATA_FILE_PREFIX = "/../tests/carrier/data/"; + const TEST_META_DATA_FILE_PREFIX = '/../tests/carrier/data/'; private static $AO_MOBILE1; private static $AO_MOBILE2; private static $AO_FIXED1; @@ -83,57 +83,60 @@ public function setUp() public function testGetNameForMobilePortableRegion() { - $this->assertEquals("British carrier", $this->carrierMapper->getNameForNumber(self::$UK_MOBILE1, "en")); - $this->assertEquals("Brittisk operat" . pack('H*', 'c3b6') . "r", $this->carrierMapper->getNameForNumber(self::$UK_MOBILE1, "sv_SE")); - $this->assertEquals("British carrier", $this->carrierMapper->getNameForNumber(self::$UK_MOBILE1, "fr")); + $this->assertEquals('British carrier', $this->carrierMapper->getNameForNumber(self::$UK_MOBILE1, 'en')); + $this->assertEquals('Brittisk operat' . pack('H*', 'c3b6') . 'r', $this->carrierMapper->getNameForNumber(self::$UK_MOBILE1, + 'sv_SE')); + $this->assertEquals('British carrier', $this->carrierMapper->getNameForNumber(self::$UK_MOBILE1, 'fr')); // Returns an empty string because the UK implements mobile number portability. - $this->assertEquals("", $this->carrierMapper->getSafeDisplayName(self::$UK_MOBILE1, "en")); + $this->assertEquals('', $this->carrierMapper->getSafeDisplayName(self::$UK_MOBILE1, 'en')); } public function testGetNameForNonMobilePortableRegion() { - $this->assertEquals("Angolan carrier", $this->carrierMapper->getNameForNumber(self::$AO_MOBILE1, "en")); - $this->assertEquals("Angolan carrier", $this->carrierMapper->getSafeDisplayName(self::$AO_MOBILE1, "en")); + $this->assertEquals('Angolan carrier', $this->carrierMapper->getNameForNumber(self::$AO_MOBILE1, 'en')); + $this->assertEquals('Angolan carrier', $this->carrierMapper->getSafeDisplayName(self::$AO_MOBILE1, 'en')); } public function testGetNameForFixedLineNumber() { - $this->assertEquals("", $this->carrierMapper->getNameForNumber(self::$AO_FIXED1, "en")); - $this->assertEquals("", $this->carrierMapper->getNameForNumber(self::$UK_FIXED1, "en")); + $this->assertEquals('', $this->carrierMapper->getNameForNumber(self::$AO_FIXED1, 'en')); + $this->assertEquals('', $this->carrierMapper->getNameForNumber(self::$UK_FIXED1, 'en')); // If the carrier information is present in the files and the method that assumes a valid // number is used, a carrier is returned - $this->assertEquals("Angolan fixed line carrier", $this->carrierMapper->getNameForValidNumber(self::$AO_FIXED2, "en")); - $this->assertEquals("", $this->carrierMapper->getNameForValidNumber(self::$UK_FIXED2, "en")); + $this->assertEquals('Angolan fixed line carrier', $this->carrierMapper->getNameForValidNumber(self::$AO_FIXED2, + 'en')); + $this->assertEquals('', $this->carrierMapper->getNameForValidNumber(self::$UK_FIXED2, 'en')); } public function testGetNameForFixedOrMobileNumber() { - $this->assertEquals("US carrier", $this->carrierMapper->getNameForNumber(self::$US_FIXED_OR_MOBILE, "en")); + $this->assertEquals('US carrier', $this->carrierMapper->getNameForNumber(self::$US_FIXED_OR_MOBILE, 'en')); } public function testGetNameForPagerNumber() { - $this->assertEquals("British pager", $this->carrierMapper->getNameForNumber(self::$UK_PAGER, "en")); + $this->assertEquals('British pager', $this->carrierMapper->getNameForNumber(self::$UK_PAGER, 'en')); } public function testGetNameForNumberWithNoDataFile() { - $this->assertEquals("", $this->carrierMapper->getNameForNumber(self::$NUMBER_WITH_INVALID_COUNTRY_CODE, "en")); - $this->assertEquals("", $this->carrierMapper->getNameForNumber(self::$INTERNATIONAL_TOLL_FREE, "en")); + $this->assertEquals('', $this->carrierMapper->getNameForNumber(self::$NUMBER_WITH_INVALID_COUNTRY_CODE, 'en')); + $this->assertEquals('', $this->carrierMapper->getNameForNumber(self::$INTERNATIONAL_TOLL_FREE, 'en')); - $this->assertEquals("", $this->carrierMapper->getNameForValidNumber(self::$NUMBER_WITH_INVALID_COUNTRY_CODE, "en")); - $this->assertEquals("", $this->carrierMapper->getNameForValidNumber(self::$INTERNATIONAL_TOLL_FREE, "en")); + $this->assertEquals('', $this->carrierMapper->getNameForValidNumber(self::$NUMBER_WITH_INVALID_COUNTRY_CODE, + 'en')); + $this->assertEquals('', $this->carrierMapper->getNameForValidNumber(self::$INTERNATIONAL_TOLL_FREE, 'en')); } public function testGetNameForNumberWithMissingPrefix() { - $this->assertEquals("", $this->carrierMapper->getNameForNumber(self::$UK_MOBILE2, "en")); - $this->assertEquals("", $this->carrierMapper->getNameForNumber(self::$AO_MOBILE2, "en")); + $this->assertEquals('', $this->carrierMapper->getNameForNumber(self::$UK_MOBILE2, 'en')); + $this->assertEquals('', $this->carrierMapper->getNameForNumber(self::$AO_MOBILE2, 'en')); } public function testGetNameForInvalidNumber() { - $this->assertEquals("", $this->carrierMapper->getNameForNumber(self::$UK_INVALID_NUMBER, "en")); - $this->assertEquals("", $this->carrierMapper->getNameForNumber(self::$AO_INVALID_NUMBER, "en")); + $this->assertEquals('', $this->carrierMapper->getNameForNumber(self::$UK_INVALID_NUMBER, 'en')); + $this->assertEquals('', $this->carrierMapper->getNameForNumber(self::$AO_INVALID_NUMBER, 'en')); } } diff --git a/tests/core/AsYouTypeFormatterTest.php b/tests/core/AsYouTypeFormatterTest.php index ba221c14d..a13b99b6a 100644 --- a/tests/core/AsYouTypeFormatterTest.php +++ b/tests/core/AsYouTypeFormatterTest.php @@ -26,42 +26,42 @@ public function setUp() public function testInvalidRegion() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::ZZ); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+4", $formatter->inputDigit('4')); - $this->assertEquals("+48 ", $formatter->inputDigit('8')); - $this->assertEquals("+48 8", $formatter->inputDigit('8')); - $this->assertEquals("+48 88", $formatter->inputDigit('8')); - $this->assertEquals("+48 88 1", $formatter->inputDigit('1')); - $this->assertEquals("+48 88 12", $formatter->inputDigit('2')); - $this->assertEquals("+48 88 123", $formatter->inputDigit('3')); - $this->assertEquals("+48 88 123 1", $formatter->inputDigit('1')); - $this->assertEquals("+48 88 123 12", $formatter->inputDigit('2')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+4', $formatter->inputDigit('4')); + $this->assertEquals('+48 ', $formatter->inputDigit('8')); + $this->assertEquals('+48 8', $formatter->inputDigit('8')); + $this->assertEquals('+48 88', $formatter->inputDigit('8')); + $this->assertEquals('+48 88 1', $formatter->inputDigit('1')); + $this->assertEquals('+48 88 12', $formatter->inputDigit('2')); + $this->assertEquals('+48 88 123', $formatter->inputDigit('3')); + $this->assertEquals('+48 88 123 1', $formatter->inputDigit('1')); + $this->assertEquals('+48 88 123 12', $formatter->inputDigit('2')); $formatter->clear(); - $this->assertEquals("6", $formatter->inputDigit('6')); - $this->assertEquals("65", $formatter->inputDigit('5')); - $this->assertEquals("650", $formatter->inputDigit('0')); - $this->assertEquals("6502", $formatter->inputDigit('2')); - $this->assertEquals("65025", $formatter->inputDigit('5')); - $this->assertEquals("650253", $formatter->inputDigit('3')); + $this->assertEquals('6', $formatter->inputDigit('6')); + $this->assertEquals('65', $formatter->inputDigit('5')); + $this->assertEquals('650', $formatter->inputDigit('0')); + $this->assertEquals('6502', $formatter->inputDigit('2')); + $this->assertEquals('65025', $formatter->inputDigit('5')); + $this->assertEquals('650253', $formatter->inputDigit('3')); } public function testInvalidPlusSign() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::ZZ); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+4", $formatter->inputDigit('4')); - $this->assertEquals("+48 ", $formatter->inputDigit('8')); - $this->assertEquals("+48 8", $formatter->inputDigit('8')); - $this->assertEquals("+48 88", $formatter->inputDigit('8')); - $this->assertEquals("+48 88 1", $formatter->inputDigit('1')); - $this->assertEquals("+48 88 12", $formatter->inputDigit('2')); - $this->assertEquals("+48 88 123", $formatter->inputDigit('3')); - $this->assertEquals("+48 88 123 1", $formatter->inputDigit('1')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+4', $formatter->inputDigit('4')); + $this->assertEquals('+48 ', $formatter->inputDigit('8')); + $this->assertEquals('+48 8', $formatter->inputDigit('8')); + $this->assertEquals('+48 88', $formatter->inputDigit('8')); + $this->assertEquals('+48 88 1', $formatter->inputDigit('1')); + $this->assertEquals('+48 88 12', $formatter->inputDigit('2')); + $this->assertEquals('+48 88 123', $formatter->inputDigit('3')); + $this->assertEquals('+48 88 123 1', $formatter->inputDigit('1')); // A plus sign can only appear at the beginning of the number; otherwise, no formatting is // applied. - $this->assertEquals("+48881231+", $formatter->inputDigit('+')); - $this->assertEquals("+48881231+2", $formatter->inputDigit('2')); + $this->assertEquals('+48881231+', $formatter->inputDigit('+')); + $this->assertEquals('+48881231+2', $formatter->inputDigit('2')); } public function testTooLongNumberMatchingMultipleLeadingDigits() @@ -70,148 +70,148 @@ public function testTooLongNumberMatchingMultipleLeadingDigits() // The bug occurred last time for countries which have two formatting rules with exactly the // same leading digits pattern but differ in length. $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::ZZ); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+81 ", $formatter->inputDigit('1')); - $this->assertEquals("+81 9", $formatter->inputDigit('9')); - $this->assertEquals("+81 90", $formatter->inputDigit('0')); - $this->assertEquals("+81 90 1", $formatter->inputDigit('1')); - $this->assertEquals("+81 90 12", $formatter->inputDigit('2')); - $this->assertEquals("+81 90 123", $formatter->inputDigit('3')); - $this->assertEquals("+81 90 1234", $formatter->inputDigit('4')); - $this->assertEquals("+81 90 1234 5", $formatter->inputDigit('5')); - $this->assertEquals("+81 90 1234 56", $formatter->inputDigit('6')); - $this->assertEquals("+81 90 1234 567", $formatter->inputDigit('7')); - $this->assertEquals("+81 90 1234 5678", $formatter->inputDigit('8')); - $this->assertEquals("+81 90 12 345 6789", $formatter->inputDigit('9')); - $this->assertEquals("+81901234567890", $formatter->inputDigit('0')); - $this->assertEquals("+819012345678901", $formatter->inputDigit('1')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+81 ', $formatter->inputDigit('1')); + $this->assertEquals('+81 9', $formatter->inputDigit('9')); + $this->assertEquals('+81 90', $formatter->inputDigit('0')); + $this->assertEquals('+81 90 1', $formatter->inputDigit('1')); + $this->assertEquals('+81 90 12', $formatter->inputDigit('2')); + $this->assertEquals('+81 90 123', $formatter->inputDigit('3')); + $this->assertEquals('+81 90 1234', $formatter->inputDigit('4')); + $this->assertEquals('+81 90 1234 5', $formatter->inputDigit('5')); + $this->assertEquals('+81 90 1234 56', $formatter->inputDigit('6')); + $this->assertEquals('+81 90 1234 567', $formatter->inputDigit('7')); + $this->assertEquals('+81 90 1234 5678', $formatter->inputDigit('8')); + $this->assertEquals('+81 90 12 345 6789', $formatter->inputDigit('9')); + $this->assertEquals('+81901234567890', $formatter->inputDigit('0')); + $this->assertEquals('+819012345678901', $formatter->inputDigit('1')); } public function testCountryWithSpaceInNationalPrefixFormattingRule() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::BY); - $this->assertEquals("8", $formatter->inputDigit('8')); - $this->assertEquals("88", $formatter->inputDigit('8')); - $this->assertEquals("881", $formatter->inputDigit('1')); - $this->assertEquals("8 819", $formatter->inputDigit('9')); - $this->assertEquals("8 8190", $formatter->inputDigit('0')); + $this->assertEquals('8', $formatter->inputDigit('8')); + $this->assertEquals('88', $formatter->inputDigit('8')); + $this->assertEquals('881', $formatter->inputDigit('1')); + $this->assertEquals('8 819', $formatter->inputDigit('9')); + $this->assertEquals('8 8190', $formatter->inputDigit('0')); // The formatting rule for 5 digit numbers states that no space should be present after the // national prefix. - $this->assertEquals("881 901", $formatter->inputDigit('1')); - $this->assertEquals("8 819 012", $formatter->inputDigit('2')); + $this->assertEquals('881 901', $formatter->inputDigit('1')); + $this->assertEquals('8 819 012', $formatter->inputDigit('2')); // Too long, no formatting rule applies. - $this->assertEquals("88190123", $formatter->inputDigit('3')); + $this->assertEquals('88190123', $formatter->inputDigit('3')); } public function testCountryWithSpaceInNationalPrefixFormattingRuleAndLongNdd() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::BY); - $this->assertEquals("9", $formatter->inputDigit('9')); - $this->assertEquals("99", $formatter->inputDigit('9')); - $this->assertEquals("999", $formatter->inputDigit('9')); - $this->assertEquals("9999", $formatter->inputDigit('9')); - $this->assertEquals("99999 ", $formatter->inputDigit('9')); - $this->assertEquals("99999 1", $formatter->inputDigit('1')); - $this->assertEquals("99999 12", $formatter->inputDigit('2')); - $this->assertEquals("99999 123", $formatter->inputDigit('3')); - $this->assertEquals("99999 1234", $formatter->inputDigit('4')); - $this->assertEquals("99999 12 345", $formatter->inputDigit('5')); + $this->assertEquals('9', $formatter->inputDigit('9')); + $this->assertEquals('99', $formatter->inputDigit('9')); + $this->assertEquals('999', $formatter->inputDigit('9')); + $this->assertEquals('9999', $formatter->inputDigit('9')); + $this->assertEquals('99999 ', $formatter->inputDigit('9')); + $this->assertEquals('99999 1', $formatter->inputDigit('1')); + $this->assertEquals('99999 12', $formatter->inputDigit('2')); + $this->assertEquals('99999 123', $formatter->inputDigit('3')); + $this->assertEquals('99999 1234', $formatter->inputDigit('4')); + $this->assertEquals('99999 12 345', $formatter->inputDigit('5')); } public function testAYTFUS() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::US); - $this->assertEquals("6", $formatter->inputDigit('6')); - $this->assertEquals("65", $formatter->inputDigit('5')); - $this->assertEquals("650", $formatter->inputDigit('0')); - $this->assertEquals("650 2", $formatter->inputDigit('2')); - $this->assertEquals("650 25", $formatter->inputDigit('5')); - $this->assertEquals("650 253", $formatter->inputDigit('3')); + $this->assertEquals('6', $formatter->inputDigit('6')); + $this->assertEquals('65', $formatter->inputDigit('5')); + $this->assertEquals('650', $formatter->inputDigit('0')); + $this->assertEquals('650 2', $formatter->inputDigit('2')); + $this->assertEquals('650 25', $formatter->inputDigit('5')); + $this->assertEquals('650 253', $formatter->inputDigit('3')); // Note this is how a US local number (without area code) should be formatted. - $this->assertEquals("650 2532", $formatter->inputDigit('2')); - $this->assertEquals("650 253 22", $formatter->inputDigit('2')); - $this->assertEquals("650 253 222", $formatter->inputDigit('2')); - $this->assertEquals("650 253 2222", $formatter->inputDigit('2')); + $this->assertEquals('650 2532', $formatter->inputDigit('2')); + $this->assertEquals('650 253 22', $formatter->inputDigit('2')); + $this->assertEquals('650 253 222', $formatter->inputDigit('2')); + $this->assertEquals('650 253 2222', $formatter->inputDigit('2')); $formatter->clear(); - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("16", $formatter->inputDigit('6')); - $this->assertEquals("1 65", $formatter->inputDigit('5')); - $this->assertEquals("1 650", $formatter->inputDigit('0')); - $this->assertEquals("1 650 2", $formatter->inputDigit('2')); - $this->assertEquals("1 650 25", $formatter->inputDigit('5')); - $this->assertEquals("1 650 253", $formatter->inputDigit('3')); - $this->assertEquals("1 650 253 2", $formatter->inputDigit('2')); - $this->assertEquals("1 650 253 22", $formatter->inputDigit('2')); - $this->assertEquals("1 650 253 222", $formatter->inputDigit('2')); - $this->assertEquals("1 650 253 2222", $formatter->inputDigit('2')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('16', $formatter->inputDigit('6')); + $this->assertEquals('1 65', $formatter->inputDigit('5')); + $this->assertEquals('1 650', $formatter->inputDigit('0')); + $this->assertEquals('1 650 2', $formatter->inputDigit('2')); + $this->assertEquals('1 650 25', $formatter->inputDigit('5')); + $this->assertEquals('1 650 253', $formatter->inputDigit('3')); + $this->assertEquals('1 650 253 2', $formatter->inputDigit('2')); + $this->assertEquals('1 650 253 22', $formatter->inputDigit('2')); + $this->assertEquals('1 650 253 222', $formatter->inputDigit('2')); + $this->assertEquals('1 650 253 2222', $formatter->inputDigit('2')); $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("01", $formatter->inputDigit('1')); - $this->assertEquals("011 ", $formatter->inputDigit('1')); - $this->assertEquals("011 4", $formatter->inputDigit('4')); - $this->assertEquals("011 44 ", $formatter->inputDigit('4')); - $this->assertEquals("011 44 6", $formatter->inputDigit('6')); - $this->assertEquals("011 44 61", $formatter->inputDigit('1')); - $this->assertEquals("011 44 6 12", $formatter->inputDigit('2')); - $this->assertEquals("011 44 6 123", $formatter->inputDigit('3')); - $this->assertEquals("011 44 6 123 1", $formatter->inputDigit('1')); - $this->assertEquals("011 44 6 123 12", $formatter->inputDigit('2')); - $this->assertEquals("011 44 6 123 123", $formatter->inputDigit('3')); - $this->assertEquals("011 44 6 123 123 1", $formatter->inputDigit('1')); - $this->assertEquals("011 44 6 123 123 12", $formatter->inputDigit('2')); - $this->assertEquals("011 44 6 123 123 123", $formatter->inputDigit('3')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('01', $formatter->inputDigit('1')); + $this->assertEquals('011 ', $formatter->inputDigit('1')); + $this->assertEquals('011 4', $formatter->inputDigit('4')); + $this->assertEquals('011 44 ', $formatter->inputDigit('4')); + $this->assertEquals('011 44 6', $formatter->inputDigit('6')); + $this->assertEquals('011 44 61', $formatter->inputDigit('1')); + $this->assertEquals('011 44 6 12', $formatter->inputDigit('2')); + $this->assertEquals('011 44 6 123', $formatter->inputDigit('3')); + $this->assertEquals('011 44 6 123 1', $formatter->inputDigit('1')); + $this->assertEquals('011 44 6 123 12', $formatter->inputDigit('2')); + $this->assertEquals('011 44 6 123 123', $formatter->inputDigit('3')); + $this->assertEquals('011 44 6 123 123 1', $formatter->inputDigit('1')); + $this->assertEquals('011 44 6 123 123 12', $formatter->inputDigit('2')); + $this->assertEquals('011 44 6 123 123 123', $formatter->inputDigit('3')); $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("01", $formatter->inputDigit('1')); - $this->assertEquals("011 ", $formatter->inputDigit('1')); - $this->assertEquals("011 5", $formatter->inputDigit('5')); - $this->assertEquals("011 54 ", $formatter->inputDigit('4')); - $this->assertEquals("011 54 9", $formatter->inputDigit('9')); - $this->assertEquals("011 54 91", $formatter->inputDigit('1')); - $this->assertEquals("011 54 9 11", $formatter->inputDigit('1')); - $this->assertEquals("011 54 9 11 2", $formatter->inputDigit('2')); - $this->assertEquals("011 54 9 11 23", $formatter->inputDigit('3')); - $this->assertEquals("011 54 9 11 231", $formatter->inputDigit('1')); - $this->assertEquals("011 54 9 11 2312", $formatter->inputDigit('2')); - $this->assertEquals("011 54 9 11 2312 1", $formatter->inputDigit('1')); - $this->assertEquals("011 54 9 11 2312 12", $formatter->inputDigit('2')); - $this->assertEquals("011 54 9 11 2312 123", $formatter->inputDigit('3')); - $this->assertEquals("011 54 9 11 2312 1234", $formatter->inputDigit('4')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('01', $formatter->inputDigit('1')); + $this->assertEquals('011 ', $formatter->inputDigit('1')); + $this->assertEquals('011 5', $formatter->inputDigit('5')); + $this->assertEquals('011 54 ', $formatter->inputDigit('4')); + $this->assertEquals('011 54 9', $formatter->inputDigit('9')); + $this->assertEquals('011 54 91', $formatter->inputDigit('1')); + $this->assertEquals('011 54 9 11', $formatter->inputDigit('1')); + $this->assertEquals('011 54 9 11 2', $formatter->inputDigit('2')); + $this->assertEquals('011 54 9 11 23', $formatter->inputDigit('3')); + $this->assertEquals('011 54 9 11 231', $formatter->inputDigit('1')); + $this->assertEquals('011 54 9 11 2312', $formatter->inputDigit('2')); + $this->assertEquals('011 54 9 11 2312 1', $formatter->inputDigit('1')); + $this->assertEquals('011 54 9 11 2312 12', $formatter->inputDigit('2')); + $this->assertEquals('011 54 9 11 2312 123', $formatter->inputDigit('3')); + $this->assertEquals('011 54 9 11 2312 1234', $formatter->inputDigit('4')); $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("01", $formatter->inputDigit('1')); - $this->assertEquals("011 ", $formatter->inputDigit('1')); - $this->assertEquals("011 2", $formatter->inputDigit('2')); - $this->assertEquals("011 24", $formatter->inputDigit('4')); - $this->assertEquals("011 244 ", $formatter->inputDigit('4')); - $this->assertEquals("011 244 2", $formatter->inputDigit('2')); - $this->assertEquals("011 244 28", $formatter->inputDigit('8')); - $this->assertEquals("011 244 280", $formatter->inputDigit('0')); - $this->assertEquals("011 244 280 0", $formatter->inputDigit('0')); - $this->assertEquals("011 244 280 00", $formatter->inputDigit('0')); - $this->assertEquals("011 244 280 000", $formatter->inputDigit('0')); - $this->assertEquals("011 244 280 000 0", $formatter->inputDigit('0')); - $this->assertEquals("011 244 280 000 00", $formatter->inputDigit('0')); - $this->assertEquals("011 244 280 000 000", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('01', $formatter->inputDigit('1')); + $this->assertEquals('011 ', $formatter->inputDigit('1')); + $this->assertEquals('011 2', $formatter->inputDigit('2')); + $this->assertEquals('011 24', $formatter->inputDigit('4')); + $this->assertEquals('011 244 ', $formatter->inputDigit('4')); + $this->assertEquals('011 244 2', $formatter->inputDigit('2')); + $this->assertEquals('011 244 28', $formatter->inputDigit('8')); + $this->assertEquals('011 244 280', $formatter->inputDigit('0')); + $this->assertEquals('011 244 280 0', $formatter->inputDigit('0')); + $this->assertEquals('011 244 280 00', $formatter->inputDigit('0')); + $this->assertEquals('011 244 280 000', $formatter->inputDigit('0')); + $this->assertEquals('011 244 280 000 0', $formatter->inputDigit('0')); + $this->assertEquals('011 244 280 000 00', $formatter->inputDigit('0')); + $this->assertEquals('011 244 280 000 000', $formatter->inputDigit('0')); $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+4", $formatter->inputDigit('4')); - $this->assertEquals("+48 ", $formatter->inputDigit('8')); - $this->assertEquals("+48 8", $formatter->inputDigit('8')); - $this->assertEquals("+48 88", $formatter->inputDigit('8')); - $this->assertEquals("+48 88 1", $formatter->inputDigit('1')); - $this->assertEquals("+48 88 12", $formatter->inputDigit('2')); - $this->assertEquals("+48 88 123", $formatter->inputDigit('3')); - $this->assertEquals("+48 88 123 1", $formatter->inputDigit('1')); - $this->assertEquals("+48 88 123 12", $formatter->inputDigit('2')); - $this->assertEquals("+48 88 123 12 1", $formatter->inputDigit('1')); - $this->assertEquals("+48 88 123 12 12", $formatter->inputDigit('2')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+4', $formatter->inputDigit('4')); + $this->assertEquals('+48 ', $formatter->inputDigit('8')); + $this->assertEquals('+48 8', $formatter->inputDigit('8')); + $this->assertEquals('+48 88', $formatter->inputDigit('8')); + $this->assertEquals('+48 88 1', $formatter->inputDigit('1')); + $this->assertEquals('+48 88 12', $formatter->inputDigit('2')); + $this->assertEquals('+48 88 123', $formatter->inputDigit('3')); + $this->assertEquals('+48 88 123 1', $formatter->inputDigit('1')); + $this->assertEquals('+48 88 123 12', $formatter->inputDigit('2')); + $this->assertEquals('+48 88 123 12 1', $formatter->inputDigit('1')); + $this->assertEquals('+48 88 123 12 12', $formatter->inputDigit('2')); } public function testAYTFUSFullWidthCharacters() @@ -219,421 +219,421 @@ public function testAYTFUSFullWidthCharacters() $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::US); $this->assertEquals("\xEF\xBC\x96", $formatter->inputDigit("\xEF\xBC\x96")); $this->assertEquals("\xEF\xBC\x96\xEF\xBC\x95", $formatter->inputDigit("\xEF\xBC\x95")); - $this->assertEquals("650", $formatter->inputDigit("\xEF\xBC\x90")); - $this->assertEquals("650 2", $formatter->inputDigit("\xEF\xBC\x92")); - $this->assertEquals("650 25", $formatter->inputDigit("\xEF\xBC\x95")); - $this->assertEquals("650 253", $formatter->inputDigit("\xEF\xBC\x93")); - $this->assertEquals("650 2532", $formatter->inputDigit("\xEF\xBC\x92")); - $this->assertEquals("650 253 22", $formatter->inputDigit("\xEF\xBC\x92")); - $this->assertEquals("650 253 222", $formatter->inputDigit("\xEF\xBC\x92")); - $this->assertEquals("650 253 2222", $formatter->inputDigit("\xEF\xBC\x92")); + $this->assertEquals('650', $formatter->inputDigit("\xEF\xBC\x90")); + $this->assertEquals('650 2', $formatter->inputDigit("\xEF\xBC\x92")); + $this->assertEquals('650 25', $formatter->inputDigit("\xEF\xBC\x95")); + $this->assertEquals('650 253', $formatter->inputDigit("\xEF\xBC\x93")); + $this->assertEquals('650 2532', $formatter->inputDigit("\xEF\xBC\x92")); + $this->assertEquals('650 253 22', $formatter->inputDigit("\xEF\xBC\x92")); + $this->assertEquals('650 253 222', $formatter->inputDigit("\xEF\xBC\x92")); + $this->assertEquals('650 253 2222', $formatter->inputDigit("\xEF\xBC\x92")); } public function testAYTFUSMobileShortCode() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::US); - $this->assertEquals("*", $formatter->inputDigit('*')); - $this->assertEquals("*1", $formatter->inputDigit('1')); - $this->assertEquals("*12", $formatter->inputDigit('2')); - $this->assertEquals("*121", $formatter->inputDigit('1')); - $this->assertEquals("*121#", $formatter->inputDigit('#')); + $this->assertEquals('*', $formatter->inputDigit('*')); + $this->assertEquals('*1', $formatter->inputDigit('1')); + $this->assertEquals('*12', $formatter->inputDigit('2')); + $this->assertEquals('*121', $formatter->inputDigit('1')); + $this->assertEquals('*121#', $formatter->inputDigit('#')); } public function testAYTFUSVanityNumber() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::US); - $this->assertEquals("8", $formatter->inputDigit('8')); - $this->assertEquals("80", $formatter->inputDigit('0')); - $this->assertEquals("800", $formatter->inputDigit('0')); - $this->assertEquals("800 ", $formatter->inputDigit(' ')); - $this->assertEquals("800 M", $formatter->inputDigit('M')); - $this->assertEquals("800 MY", $formatter->inputDigit('Y')); - $this->assertEquals("800 MY ", $formatter->inputDigit(' ')); - $this->assertEquals("800 MY A", $formatter->inputDigit('A')); - $this->assertEquals("800 MY AP", $formatter->inputDigit('P')); - $this->assertEquals("800 MY APP", $formatter->inputDigit('P')); - $this->assertEquals("800 MY APPL", $formatter->inputDigit('L')); - $this->assertEquals("800 MY APPLE", $formatter->inputDigit('E')); + $this->assertEquals('8', $formatter->inputDigit('8')); + $this->assertEquals('80', $formatter->inputDigit('0')); + $this->assertEquals('800', $formatter->inputDigit('0')); + $this->assertEquals('800 ', $formatter->inputDigit(' ')); + $this->assertEquals('800 M', $formatter->inputDigit('M')); + $this->assertEquals('800 MY', $formatter->inputDigit('Y')); + $this->assertEquals('800 MY ', $formatter->inputDigit(' ')); + $this->assertEquals('800 MY A', $formatter->inputDigit('A')); + $this->assertEquals('800 MY AP', $formatter->inputDigit('P')); + $this->assertEquals('800 MY APP', $formatter->inputDigit('P')); + $this->assertEquals('800 MY APPL', $formatter->inputDigit('L')); + $this->assertEquals('800 MY APPLE', $formatter->inputDigit('E')); } public function testAYTFAndRememberPositionUS() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::US); - $this->assertEquals("1", $formatter->inputDigitAndRememberPosition('1')); + $this->assertEquals('1', $formatter->inputDigitAndRememberPosition('1')); $this->assertEquals(1, $formatter->getRememberedPosition()); - $this->assertEquals("16", $formatter->inputDigit('6')); - $this->assertEquals("1 65", $formatter->inputDigit('5')); + $this->assertEquals('16', $formatter->inputDigit('6')); + $this->assertEquals('1 65', $formatter->inputDigit('5')); $this->assertEquals(1, $formatter->getRememberedPosition()); - $this->assertEquals("1 650", $formatter->inputDigitAndRememberPosition('0')); + $this->assertEquals('1 650', $formatter->inputDigitAndRememberPosition('0')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("1 650 2", $formatter->inputDigit('2')); - $this->assertEquals("1 650 25", $formatter->inputDigit('5')); + $this->assertEquals('1 650 2', $formatter->inputDigit('2')); + $this->assertEquals('1 650 25', $formatter->inputDigit('5')); // Note the remembered position for digit "0" changes from 4 to 5, because a space is now // inserted in the front. $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("1 650 253", $formatter->inputDigit('3')); - $this->assertEquals("1 650 253 2", $formatter->inputDigit('2')); - $this->assertEquals("1 650 253 22", $formatter->inputDigit('2')); + $this->assertEquals('1 650 253', $formatter->inputDigit('3')); + $this->assertEquals('1 650 253 2', $formatter->inputDigit('2')); + $this->assertEquals('1 650 253 22', $formatter->inputDigit('2')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("1 650 253 222", $formatter->inputDigitAndRememberPosition('2')); + $this->assertEquals('1 650 253 222', $formatter->inputDigitAndRememberPosition('2')); $this->assertEquals(13, $formatter->getRememberedPosition()); - $this->assertEquals("1 650 253 2222", $formatter->inputDigit('2')); + $this->assertEquals('1 650 253 2222', $formatter->inputDigit('2')); $this->assertEquals(13, $formatter->getRememberedPosition()); - $this->assertEquals("165025322222", $formatter->inputDigit('2')); + $this->assertEquals('165025322222', $formatter->inputDigit('2')); $this->assertEquals(10, $formatter->getRememberedPosition()); - $this->assertEquals("1650253222222", $formatter->inputDigit('2')); + $this->assertEquals('1650253222222', $formatter->inputDigit('2')); $this->assertEquals(10, $formatter->getRememberedPosition()); $formatter->clear(); - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("16", $formatter->inputDigitAndRememberPosition('6')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('16', $formatter->inputDigitAndRememberPosition('6')); $this->assertEquals(2, $formatter->getRememberedPosition()); - $this->assertEquals("1 65", $formatter->inputDigit('5')); - $this->assertEquals("1 650", $formatter->inputDigit('0')); + $this->assertEquals('1 65', $formatter->inputDigit('5')); + $this->assertEquals('1 650', $formatter->inputDigit('0')); $this->assertEquals(3, $formatter->getRememberedPosition()); - $this->assertEquals("1 650 2", $formatter->inputDigit('2')); - $this->assertEquals("1 650 25", $formatter->inputDigit('5')); + $this->assertEquals('1 650 2', $formatter->inputDigit('2')); + $this->assertEquals('1 650 25', $formatter->inputDigit('5')); $this->assertEquals(3, $formatter->getRememberedPosition()); - $this->assertEquals("1 650 253", $formatter->inputDigit('3')); - $this->assertEquals("1 650 253 2", $formatter->inputDigit('2')); - $this->assertEquals("1 650 253 22", $formatter->inputDigit('2')); + $this->assertEquals('1 650 253', $formatter->inputDigit('3')); + $this->assertEquals('1 650 253 2', $formatter->inputDigit('2')); + $this->assertEquals('1 650 253 22', $formatter->inputDigit('2')); $this->assertEquals(3, $formatter->getRememberedPosition()); - $this->assertEquals("1 650 253 222", $formatter->inputDigit('2')); - $this->assertEquals("1 650 253 2222", $formatter->inputDigit('2')); - $this->assertEquals("165025322222", $formatter->inputDigit('2')); + $this->assertEquals('1 650 253 222', $formatter->inputDigit('2')); + $this->assertEquals('1 650 253 2222', $formatter->inputDigit('2')); + $this->assertEquals('165025322222', $formatter->inputDigit('2')); $this->assertEquals(2, $formatter->getRememberedPosition()); - $this->assertEquals("1650253222222", $formatter->inputDigit('2')); + $this->assertEquals('1650253222222', $formatter->inputDigit('2')); $this->assertEquals(2, $formatter->getRememberedPosition()); $formatter->clear(); - $this->assertEquals("6", $formatter->inputDigit('6')); - $this->assertEquals("65", $formatter->inputDigit('5')); - $this->assertEquals("650", $formatter->inputDigit('0')); - $this->assertEquals("650 2", $formatter->inputDigit('2')); - $this->assertEquals("650 25", $formatter->inputDigit('5')); - $this->assertEquals("650 253", $formatter->inputDigit('3')); - $this->assertEquals("650 2532", $formatter->inputDigitAndRememberPosition('2')); + $this->assertEquals('6', $formatter->inputDigit('6')); + $this->assertEquals('65', $formatter->inputDigit('5')); + $this->assertEquals('650', $formatter->inputDigit('0')); + $this->assertEquals('650 2', $formatter->inputDigit('2')); + $this->assertEquals('650 25', $formatter->inputDigit('5')); + $this->assertEquals('650 253', $formatter->inputDigit('3')); + $this->assertEquals('650 2532', $formatter->inputDigitAndRememberPosition('2')); $this->assertEquals(8, $formatter->getRememberedPosition()); - $this->assertEquals("650 253 22", $formatter->inputDigit('2')); + $this->assertEquals('650 253 22', $formatter->inputDigit('2')); $this->assertEquals(9, $formatter->getRememberedPosition()); - $this->assertEquals("650 253 222", $formatter->inputDigit('2')); + $this->assertEquals('650 253 222', $formatter->inputDigit('2')); // No more formatting when semicolon is entered. - $this->assertEquals("650253222;", $formatter->inputDigit(';')); + $this->assertEquals('650253222;', $formatter->inputDigit(';')); $this->assertEquals(7, $formatter->getRememberedPosition()); - $this->assertEquals("650253222;2", $formatter->inputDigit('2')); + $this->assertEquals('650253222;2', $formatter->inputDigit('2')); $formatter->clear(); - $this->assertEquals("6", $formatter->inputDigit('6')); - $this->assertEquals("65", $formatter->inputDigit('5')); - $this->assertEquals("650", $formatter->inputDigit('0')); + $this->assertEquals('6', $formatter->inputDigit('6')); + $this->assertEquals('65', $formatter->inputDigit('5')); + $this->assertEquals('650', $formatter->inputDigit('0')); // No more formatting when users choose to do their own formatting. - $this->assertEquals("650-", $formatter->inputDigit('-')); - $this->assertEquals("650-2", $formatter->inputDigitAndRememberPosition('2')); + $this->assertEquals('650-', $formatter->inputDigit('-')); + $this->assertEquals('650-2', $formatter->inputDigitAndRememberPosition('2')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("650-25", $formatter->inputDigit('5')); + $this->assertEquals('650-25', $formatter->inputDigit('5')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("650-253", $formatter->inputDigit('3')); + $this->assertEquals('650-253', $formatter->inputDigit('3')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("650-253-", $formatter->inputDigit('-')); - $this->assertEquals("650-253-2", $formatter->inputDigit('2')); - $this->assertEquals("650-253-22", $formatter->inputDigit('2')); - $this->assertEquals("650-253-222", $formatter->inputDigit('2')); - $this->assertEquals("650-253-2222", $formatter->inputDigit('2')); + $this->assertEquals('650-253-', $formatter->inputDigit('-')); + $this->assertEquals('650-253-2', $formatter->inputDigit('2')); + $this->assertEquals('650-253-22', $formatter->inputDigit('2')); + $this->assertEquals('650-253-222', $formatter->inputDigit('2')); + $this->assertEquals('650-253-2222', $formatter->inputDigit('2')); $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("01", $formatter->inputDigit('1')); - $this->assertEquals("011 ", $formatter->inputDigit('1')); - $this->assertEquals("011 4", $formatter->inputDigitAndRememberPosition('4')); - $this->assertEquals("011 48 ", $formatter->inputDigit('8')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('01', $formatter->inputDigit('1')); + $this->assertEquals('011 ', $formatter->inputDigit('1')); + $this->assertEquals('011 4', $formatter->inputDigitAndRememberPosition('4')); + $this->assertEquals('011 48 ', $formatter->inputDigit('8')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("011 48 8", $formatter->inputDigit('8')); + $this->assertEquals('011 48 8', $formatter->inputDigit('8')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("011 48 88", $formatter->inputDigit('8')); - $this->assertEquals("011 48 88 1", $formatter->inputDigit('1')); - $this->assertEquals("011 48 88 12", $formatter->inputDigit('2')); + $this->assertEquals('011 48 88', $formatter->inputDigit('8')); + $this->assertEquals('011 48 88 1', $formatter->inputDigit('1')); + $this->assertEquals('011 48 88 12', $formatter->inputDigit('2')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("011 48 88 123", $formatter->inputDigit('3')); - $this->assertEquals("011 48 88 123 1", $formatter->inputDigit('1')); - $this->assertEquals("011 48 88 123 12", $formatter->inputDigit('2')); - $this->assertEquals("011 48 88 123 12 1", $formatter->inputDigit('1')); - $this->assertEquals("011 48 88 123 12 12", $formatter->inputDigit('2')); + $this->assertEquals('011 48 88 123', $formatter->inputDigit('3')); + $this->assertEquals('011 48 88 123 1', $formatter->inputDigit('1')); + $this->assertEquals('011 48 88 123 12', $formatter->inputDigit('2')); + $this->assertEquals('011 48 88 123 12 1', $formatter->inputDigit('1')); + $this->assertEquals('011 48 88 123 12 12', $formatter->inputDigit('2')); $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+1", $formatter->inputDigit('1')); - $this->assertEquals("+1 6", $formatter->inputDigitAndRememberPosition('6')); - $this->assertEquals("+1 65", $formatter->inputDigit('5')); - $this->assertEquals("+1 650", $formatter->inputDigit('0')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+1', $formatter->inputDigit('1')); + $this->assertEquals('+1 6', $formatter->inputDigitAndRememberPosition('6')); + $this->assertEquals('+1 65', $formatter->inputDigit('5')); + $this->assertEquals('+1 650', $formatter->inputDigit('0')); $this->assertEquals(4, $formatter->getRememberedPosition()); - $this->assertEquals("+1 650 2", $formatter->inputDigit('2')); + $this->assertEquals('+1 650 2', $formatter->inputDigit('2')); $this->assertEquals(4, $formatter->getRememberedPosition()); - $this->assertEquals("+1 650 25", $formatter->inputDigit('5')); - $this->assertEquals("+1 650 253", $formatter->inputDigitAndRememberPosition('3')); - $this->assertEquals("+1 650 253 2", $formatter->inputDigit('2')); - $this->assertEquals("+1 650 253 22", $formatter->inputDigit('2')); - $this->assertEquals("+1 650 253 222", $formatter->inputDigit('2')); + $this->assertEquals('+1 650 25', $formatter->inputDigit('5')); + $this->assertEquals('+1 650 253', $formatter->inputDigitAndRememberPosition('3')); + $this->assertEquals('+1 650 253 2', $formatter->inputDigit('2')); + $this->assertEquals('+1 650 253 22', $formatter->inputDigit('2')); + $this->assertEquals('+1 650 253 222', $formatter->inputDigit('2')); $this->assertEquals(10, $formatter->getRememberedPosition()); $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+1", $formatter->inputDigit('1')); - $this->assertEquals("+1 6", $formatter->inputDigitAndRememberPosition('6')); - $this->assertEquals("+1 65", $formatter->inputDigit('5')); - $this->assertEquals("+1 650", $formatter->inputDigit('0')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+1', $formatter->inputDigit('1')); + $this->assertEquals('+1 6', $formatter->inputDigitAndRememberPosition('6')); + $this->assertEquals('+1 65', $formatter->inputDigit('5')); + $this->assertEquals('+1 650', $formatter->inputDigit('0')); $this->assertEquals(4, $formatter->getRememberedPosition()); - $this->assertEquals("+1 650 2", $formatter->inputDigit('2')); + $this->assertEquals('+1 650 2', $formatter->inputDigit('2')); $this->assertEquals(4, $formatter->getRememberedPosition()); - $this->assertEquals("+1 650 25", $formatter->inputDigit('5')); - $this->assertEquals("+1 650 253", $formatter->inputDigit('3')); - $this->assertEquals("+1 650 253 2", $formatter->inputDigit('2')); - $this->assertEquals("+1 650 253 22", $formatter->inputDigit('2')); - $this->assertEquals("+1 650 253 222", $formatter->inputDigit('2')); - $this->assertEquals("+1650253222;", $formatter->inputDigit(';')); + $this->assertEquals('+1 650 25', $formatter->inputDigit('5')); + $this->assertEquals('+1 650 253', $formatter->inputDigit('3')); + $this->assertEquals('+1 650 253 2', $formatter->inputDigit('2')); + $this->assertEquals('+1 650 253 22', $formatter->inputDigit('2')); + $this->assertEquals('+1 650 253 222', $formatter->inputDigit('2')); + $this->assertEquals('+1650253222;', $formatter->inputDigit(';')); $this->assertEquals(3, $formatter->getRememberedPosition()); } public function testAYTFGBFixedLine() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::GB); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("02", $formatter->inputDigit('2')); - $this->assertEquals("020", $formatter->inputDigit('0')); - $this->assertEquals("020 7", $formatter->inputDigitAndRememberPosition('7')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('02', $formatter->inputDigit('2')); + $this->assertEquals('020', $formatter->inputDigit('0')); + $this->assertEquals('020 7', $formatter->inputDigitAndRememberPosition('7')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("020 70", $formatter->inputDigit('0')); - $this->assertEquals("020 703", $formatter->inputDigit('3')); + $this->assertEquals('020 70', $formatter->inputDigit('0')); + $this->assertEquals('020 703', $formatter->inputDigit('3')); $this->assertEquals(5, $formatter->getRememberedPosition()); - $this->assertEquals("020 7031", $formatter->inputDigit('1')); - $this->assertEquals("020 7031 3", $formatter->inputDigit('3')); - $this->assertEquals("020 7031 30", $formatter->inputDigit('0')); - $this->assertEquals("020 7031 300", $formatter->inputDigit('0')); - $this->assertEquals("020 7031 3000", $formatter->inputDigit('0')); + $this->assertEquals('020 7031', $formatter->inputDigit('1')); + $this->assertEquals('020 7031 3', $formatter->inputDigit('3')); + $this->assertEquals('020 7031 30', $formatter->inputDigit('0')); + $this->assertEquals('020 7031 300', $formatter->inputDigit('0')); + $this->assertEquals('020 7031 3000', $formatter->inputDigit('0')); } public function testAYTFGBTollFree() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::GB); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("08", $formatter->inputDigit('8')); - $this->assertEquals("080", $formatter->inputDigit('0')); - $this->assertEquals("080 7", $formatter->inputDigit('7')); - $this->assertEquals("080 70", $formatter->inputDigit('0')); - $this->assertEquals("080 703", $formatter->inputDigit('3')); - $this->assertEquals("080 7031", $formatter->inputDigit('1')); - $this->assertEquals("080 7031 3", $formatter->inputDigit('3')); - $this->assertEquals("080 7031 30", $formatter->inputDigit('0')); - $this->assertEquals("080 7031 300", $formatter->inputDigit('0')); - $this->assertEquals("080 7031 3000", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('08', $formatter->inputDigit('8')); + $this->assertEquals('080', $formatter->inputDigit('0')); + $this->assertEquals('080 7', $formatter->inputDigit('7')); + $this->assertEquals('080 70', $formatter->inputDigit('0')); + $this->assertEquals('080 703', $formatter->inputDigit('3')); + $this->assertEquals('080 7031', $formatter->inputDigit('1')); + $this->assertEquals('080 7031 3', $formatter->inputDigit('3')); + $this->assertEquals('080 7031 30', $formatter->inputDigit('0')); + $this->assertEquals('080 7031 300', $formatter->inputDigit('0')); + $this->assertEquals('080 7031 3000', $formatter->inputDigit('0')); } public function testAYTFGBPremiumRate() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::GB); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("09", $formatter->inputDigit('9')); - $this->assertEquals("090", $formatter->inputDigit('0')); - $this->assertEquals("090 7", $formatter->inputDigit('7')); - $this->assertEquals("090 70", $formatter->inputDigit('0')); - $this->assertEquals("090 703", $formatter->inputDigit('3')); - $this->assertEquals("090 7031", $formatter->inputDigit('1')); - $this->assertEquals("090 7031 3", $formatter->inputDigit('3')); - $this->assertEquals("090 7031 30", $formatter->inputDigit('0')); - $this->assertEquals("090 7031 300", $formatter->inputDigit('0')); - $this->assertEquals("090 7031 3000", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('09', $formatter->inputDigit('9')); + $this->assertEquals('090', $formatter->inputDigit('0')); + $this->assertEquals('090 7', $formatter->inputDigit('7')); + $this->assertEquals('090 70', $formatter->inputDigit('0')); + $this->assertEquals('090 703', $formatter->inputDigit('3')); + $this->assertEquals('090 7031', $formatter->inputDigit('1')); + $this->assertEquals('090 7031 3', $formatter->inputDigit('3')); + $this->assertEquals('090 7031 30', $formatter->inputDigit('0')); + $this->assertEquals('090 7031 300', $formatter->inputDigit('0')); + $this->assertEquals('090 7031 3000', $formatter->inputDigit('0')); } public function testAYTFNZMobile() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::NZ); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("02", $formatter->inputDigit('2')); - $this->assertEquals("021", $formatter->inputDigit('1')); - $this->assertEquals("02-11", $formatter->inputDigit('1')); - $this->assertEquals("02-112", $formatter->inputDigit('2')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('02', $formatter->inputDigit('2')); + $this->assertEquals('021', $formatter->inputDigit('1')); + $this->assertEquals('02-11', $formatter->inputDigit('1')); + $this->assertEquals('02-112', $formatter->inputDigit('2')); // Note the unittest is using fake metadata which might produce non-ideal results. - $this->assertEquals("02-112 3", $formatter->inputDigit('3')); - $this->assertEquals("02-112 34", $formatter->inputDigit('4')); - $this->assertEquals("02-112 345", $formatter->inputDigit('5')); - $this->assertEquals("02-112 3456", $formatter->inputDigit('6')); + $this->assertEquals('02-112 3', $formatter->inputDigit('3')); + $this->assertEquals('02-112 34', $formatter->inputDigit('4')); + $this->assertEquals('02-112 345', $formatter->inputDigit('5')); + $this->assertEquals('02-112 3456', $formatter->inputDigit('6')); } public function testAYTFDE() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::DE); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("03", $formatter->inputDigit('3')); - $this->assertEquals("030", $formatter->inputDigit('0')); - $this->assertEquals("030/1", $formatter->inputDigit('1')); - $this->assertEquals("030/12", $formatter->inputDigit('2')); - $this->assertEquals("030/123", $formatter->inputDigit('3')); - $this->assertEquals("030/1234", $formatter->inputDigit('4')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('03', $formatter->inputDigit('3')); + $this->assertEquals('030', $formatter->inputDigit('0')); + $this->assertEquals('030/1', $formatter->inputDigit('1')); + $this->assertEquals('030/12', $formatter->inputDigit('2')); + $this->assertEquals('030/123', $formatter->inputDigit('3')); + $this->assertEquals('030/1234', $formatter->inputDigit('4')); // 04134 1234 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("04", $formatter->inputDigit('4')); - $this->assertEquals("041", $formatter->inputDigit('1')); - $this->assertEquals("041 3", $formatter->inputDigit('3')); - $this->assertEquals("041 34", $formatter->inputDigit('4')); - $this->assertEquals("04134 1", $formatter->inputDigit('1')); - $this->assertEquals("04134 12", $formatter->inputDigit('2')); - $this->assertEquals("04134 123", $formatter->inputDigit('3')); - $this->assertEquals("04134 1234", $formatter->inputDigit('4')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('04', $formatter->inputDigit('4')); + $this->assertEquals('041', $formatter->inputDigit('1')); + $this->assertEquals('041 3', $formatter->inputDigit('3')); + $this->assertEquals('041 34', $formatter->inputDigit('4')); + $this->assertEquals('04134 1', $formatter->inputDigit('1')); + $this->assertEquals('04134 12', $formatter->inputDigit('2')); + $this->assertEquals('04134 123', $formatter->inputDigit('3')); + $this->assertEquals('04134 1234', $formatter->inputDigit('4')); // 08021 2345 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("08", $formatter->inputDigit('8')); - $this->assertEquals("080", $formatter->inputDigit('0')); - $this->assertEquals("080 2", $formatter->inputDigit('2')); - $this->assertEquals("080 21", $formatter->inputDigit('1')); - $this->assertEquals("08021 2", $formatter->inputDigit('2')); - $this->assertEquals("08021 23", $formatter->inputDigit('3')); - $this->assertEquals("08021 234", $formatter->inputDigit('4')); - $this->assertEquals("08021 2345", $formatter->inputDigit('5')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('08', $formatter->inputDigit('8')); + $this->assertEquals('080', $formatter->inputDigit('0')); + $this->assertEquals('080 2', $formatter->inputDigit('2')); + $this->assertEquals('080 21', $formatter->inputDigit('1')); + $this->assertEquals('08021 2', $formatter->inputDigit('2')); + $this->assertEquals('08021 23', $formatter->inputDigit('3')); + $this->assertEquals('08021 234', $formatter->inputDigit('4')); + $this->assertEquals('08021 2345', $formatter->inputDigit('5')); // 00 1 650 253 2250 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("00", $formatter->inputDigit('0')); - $this->assertEquals("00 1 ", $formatter->inputDigit('1')); - $this->assertEquals("00 1 6", $formatter->inputDigit('6')); - $this->assertEquals("00 1 65", $formatter->inputDigit('5')); - $this->assertEquals("00 1 650", $formatter->inputDigit('0')); - $this->assertEquals("00 1 650 2", $formatter->inputDigit('2')); - $this->assertEquals("00 1 650 25", $formatter->inputDigit('5')); - $this->assertEquals("00 1 650 253", $formatter->inputDigit('3')); - $this->assertEquals("00 1 650 253 2", $formatter->inputDigit('2')); - $this->assertEquals("00 1 650 253 22", $formatter->inputDigit('2')); - $this->assertEquals("00 1 650 253 222", $formatter->inputDigit('2')); - $this->assertEquals("00 1 650 253 2222", $formatter->inputDigit('2')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('00', $formatter->inputDigit('0')); + $this->assertEquals('00 1 ', $formatter->inputDigit('1')); + $this->assertEquals('00 1 6', $formatter->inputDigit('6')); + $this->assertEquals('00 1 65', $formatter->inputDigit('5')); + $this->assertEquals('00 1 650', $formatter->inputDigit('0')); + $this->assertEquals('00 1 650 2', $formatter->inputDigit('2')); + $this->assertEquals('00 1 650 25', $formatter->inputDigit('5')); + $this->assertEquals('00 1 650 253', $formatter->inputDigit('3')); + $this->assertEquals('00 1 650 253 2', $formatter->inputDigit('2')); + $this->assertEquals('00 1 650 253 22', $formatter->inputDigit('2')); + $this->assertEquals('00 1 650 253 222', $formatter->inputDigit('2')); + $this->assertEquals('00 1 650 253 2222', $formatter->inputDigit('2')); } public function testAYTFAR() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::AR); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("01", $formatter->inputDigit('1')); - $this->assertEquals("011", $formatter->inputDigit('1')); - $this->assertEquals("011 7", $formatter->inputDigit('7')); - $this->assertEquals("011 70", $formatter->inputDigit('0')); - $this->assertEquals("011 703", $formatter->inputDigit('3')); - $this->assertEquals("011 7031", $formatter->inputDigit('1')); - $this->assertEquals("011 7031-3", $formatter->inputDigit('3')); - $this->assertEquals("011 7031-30", $formatter->inputDigit('0')); - $this->assertEquals("011 7031-300", $formatter->inputDigit('0')); - $this->assertEquals("011 7031-3000", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('01', $formatter->inputDigit('1')); + $this->assertEquals('011', $formatter->inputDigit('1')); + $this->assertEquals('011 7', $formatter->inputDigit('7')); + $this->assertEquals('011 70', $formatter->inputDigit('0')); + $this->assertEquals('011 703', $formatter->inputDigit('3')); + $this->assertEquals('011 7031', $formatter->inputDigit('1')); + $this->assertEquals('011 7031-3', $formatter->inputDigit('3')); + $this->assertEquals('011 7031-30', $formatter->inputDigit('0')); + $this->assertEquals('011 7031-300', $formatter->inputDigit('0')); + $this->assertEquals('011 7031-3000', $formatter->inputDigit('0')); } public function testAYTFARMobile() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::AR); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+5", $formatter->inputDigit('5')); - $this->assertEquals("+54 ", $formatter->inputDigit('4')); - $this->assertEquals("+54 9", $formatter->inputDigit('9')); - $this->assertEquals("+54 91", $formatter->inputDigit('1')); - $this->assertEquals("+54 9 11", $formatter->inputDigit('1')); - $this->assertEquals("+54 9 11 2", $formatter->inputDigit('2')); - $this->assertEquals("+54 9 11 23", $formatter->inputDigit('3')); - $this->assertEquals("+54 9 11 231", $formatter->inputDigit('1')); - $this->assertEquals("+54 9 11 2312", $formatter->inputDigit('2')); - $this->assertEquals("+54 9 11 2312 1", $formatter->inputDigit('1')); - $this->assertEquals("+54 9 11 2312 12", $formatter->inputDigit('2')); - $this->assertEquals("+54 9 11 2312 123", $formatter->inputDigit('3')); - $this->assertEquals("+54 9 11 2312 1234", $formatter->inputDigit('4')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+5', $formatter->inputDigit('5')); + $this->assertEquals('+54 ', $formatter->inputDigit('4')); + $this->assertEquals('+54 9', $formatter->inputDigit('9')); + $this->assertEquals('+54 91', $formatter->inputDigit('1')); + $this->assertEquals('+54 9 11', $formatter->inputDigit('1')); + $this->assertEquals('+54 9 11 2', $formatter->inputDigit('2')); + $this->assertEquals('+54 9 11 23', $formatter->inputDigit('3')); + $this->assertEquals('+54 9 11 231', $formatter->inputDigit('1')); + $this->assertEquals('+54 9 11 2312', $formatter->inputDigit('2')); + $this->assertEquals('+54 9 11 2312 1', $formatter->inputDigit('1')); + $this->assertEquals('+54 9 11 2312 12', $formatter->inputDigit('2')); + $this->assertEquals('+54 9 11 2312 123', $formatter->inputDigit('3')); + $this->assertEquals('+54 9 11 2312 1234', $formatter->inputDigit('4')); } public function testAYTFKR() { // +82 51 234 5678 $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::KR); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+82 ", $formatter->inputDigit('2')); - $this->assertEquals("+82 5", $formatter->inputDigit('5')); - $this->assertEquals("+82 51", $formatter->inputDigit('1')); - $this->assertEquals("+82 51-2", $formatter->inputDigit('2')); - $this->assertEquals("+82 51-23", $formatter->inputDigit('3')); - $this->assertEquals("+82 51-234", $formatter->inputDigit('4')); - $this->assertEquals("+82 51-234-5", $formatter->inputDigit('5')); - $this->assertEquals("+82 51-234-56", $formatter->inputDigit('6')); - $this->assertEquals("+82 51-234-567", $formatter->inputDigit('7')); - $this->assertEquals("+82 51-234-5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+82 ', $formatter->inputDigit('2')); + $this->assertEquals('+82 5', $formatter->inputDigit('5')); + $this->assertEquals('+82 51', $formatter->inputDigit('1')); + $this->assertEquals('+82 51-2', $formatter->inputDigit('2')); + $this->assertEquals('+82 51-23', $formatter->inputDigit('3')); + $this->assertEquals('+82 51-234', $formatter->inputDigit('4')); + $this->assertEquals('+82 51-234-5', $formatter->inputDigit('5')); + $this->assertEquals('+82 51-234-56', $formatter->inputDigit('6')); + $this->assertEquals('+82 51-234-567', $formatter->inputDigit('7')); + $this->assertEquals('+82 51-234-5678', $formatter->inputDigit('8')); // +82 2 531 5678 $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+82 ", $formatter->inputDigit('2')); - $this->assertEquals("+82 2", $formatter->inputDigit('2')); - $this->assertEquals("+82 25", $formatter->inputDigit('5')); - $this->assertEquals("+82 2-53", $formatter->inputDigit('3')); - $this->assertEquals("+82 2-531", $formatter->inputDigit('1')); - $this->assertEquals("+82 2-531-5", $formatter->inputDigit('5')); - $this->assertEquals("+82 2-531-56", $formatter->inputDigit('6')); - $this->assertEquals("+82 2-531-567", $formatter->inputDigit('7')); - $this->assertEquals("+82 2-531-5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+82 ', $formatter->inputDigit('2')); + $this->assertEquals('+82 2', $formatter->inputDigit('2')); + $this->assertEquals('+82 25', $formatter->inputDigit('5')); + $this->assertEquals('+82 2-53', $formatter->inputDigit('3')); + $this->assertEquals('+82 2-531', $formatter->inputDigit('1')); + $this->assertEquals('+82 2-531-5', $formatter->inputDigit('5')); + $this->assertEquals('+82 2-531-56', $formatter->inputDigit('6')); + $this->assertEquals('+82 2-531-567', $formatter->inputDigit('7')); + $this->assertEquals('+82 2-531-5678', $formatter->inputDigit('8')); // +82 2 3665 5678 $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+82 ", $formatter->inputDigit('2')); - $this->assertEquals("+82 2", $formatter->inputDigit('2')); - $this->assertEquals("+82 23", $formatter->inputDigit('3')); - $this->assertEquals("+82 2-36", $formatter->inputDigit('6')); - $this->assertEquals("+82 2-366", $formatter->inputDigit('6')); - $this->assertEquals("+82 2-3665", $formatter->inputDigit('5')); - $this->assertEquals("+82 2-3665-5", $formatter->inputDigit('5')); - $this->assertEquals("+82 2-3665-56", $formatter->inputDigit('6')); - $this->assertEquals("+82 2-3665-567", $formatter->inputDigit('7')); - $this->assertEquals("+82 2-3665-5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+82 ', $formatter->inputDigit('2')); + $this->assertEquals('+82 2', $formatter->inputDigit('2')); + $this->assertEquals('+82 23', $formatter->inputDigit('3')); + $this->assertEquals('+82 2-36', $formatter->inputDigit('6')); + $this->assertEquals('+82 2-366', $formatter->inputDigit('6')); + $this->assertEquals('+82 2-3665', $formatter->inputDigit('5')); + $this->assertEquals('+82 2-3665-5', $formatter->inputDigit('5')); + $this->assertEquals('+82 2-3665-56', $formatter->inputDigit('6')); + $this->assertEquals('+82 2-3665-567', $formatter->inputDigit('7')); + $this->assertEquals('+82 2-3665-5678', $formatter->inputDigit('8')); // 02-114 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("02", $formatter->inputDigit('2')); - $this->assertEquals("021", $formatter->inputDigit('1')); - $this->assertEquals("02-11", $formatter->inputDigit('1')); - $this->assertEquals("02-114", $formatter->inputDigit('4')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('02', $formatter->inputDigit('2')); + $this->assertEquals('021', $formatter->inputDigit('1')); + $this->assertEquals('02-11', $formatter->inputDigit('1')); + $this->assertEquals('02-114', $formatter->inputDigit('4')); // 02-1300 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("02", $formatter->inputDigit('2')); - $this->assertEquals("021", $formatter->inputDigit('1')); - $this->assertEquals("02-13", $formatter->inputDigit('3')); - $this->assertEquals("02-130", $formatter->inputDigit('0')); - $this->assertEquals("02-1300", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('02', $formatter->inputDigit('2')); + $this->assertEquals('021', $formatter->inputDigit('1')); + $this->assertEquals('02-13', $formatter->inputDigit('3')); + $this->assertEquals('02-130', $formatter->inputDigit('0')); + $this->assertEquals('02-1300', $formatter->inputDigit('0')); // 011-456-7890 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("01", $formatter->inputDigit('1')); - $this->assertEquals("011", $formatter->inputDigit('1')); - $this->assertEquals("011-4", $formatter->inputDigit('4')); - $this->assertEquals("011-45", $formatter->inputDigit('5')); - $this->assertEquals("011-456", $formatter->inputDigit('6')); - $this->assertEquals("011-456-7", $formatter->inputDigit('7')); - $this->assertEquals("011-456-78", $formatter->inputDigit('8')); - $this->assertEquals("011-456-789", $formatter->inputDigit('9')); - $this->assertEquals("011-456-7890", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('01', $formatter->inputDigit('1')); + $this->assertEquals('011', $formatter->inputDigit('1')); + $this->assertEquals('011-4', $formatter->inputDigit('4')); + $this->assertEquals('011-45', $formatter->inputDigit('5')); + $this->assertEquals('011-456', $formatter->inputDigit('6')); + $this->assertEquals('011-456-7', $formatter->inputDigit('7')); + $this->assertEquals('011-456-78', $formatter->inputDigit('8')); + $this->assertEquals('011-456-789', $formatter->inputDigit('9')); + $this->assertEquals('011-456-7890', $formatter->inputDigit('0')); // 011-9876-7890 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("01", $formatter->inputDigit('1')); - $this->assertEquals("011", $formatter->inputDigit('1')); - $this->assertEquals("011-9", $formatter->inputDigit('9')); - $this->assertEquals("011-98", $formatter->inputDigit('8')); - $this->assertEquals("011-987", $formatter->inputDigit('7')); - $this->assertEquals("011-9876", $formatter->inputDigit('6')); - $this->assertEquals("011-9876-7", $formatter->inputDigit('7')); - $this->assertEquals("011-9876-78", $formatter->inputDigit('8')); - $this->assertEquals("011-9876-789", $formatter->inputDigit('9')); - $this->assertEquals("011-9876-7890", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('01', $formatter->inputDigit('1')); + $this->assertEquals('011', $formatter->inputDigit('1')); + $this->assertEquals('011-9', $formatter->inputDigit('9')); + $this->assertEquals('011-98', $formatter->inputDigit('8')); + $this->assertEquals('011-987', $formatter->inputDigit('7')); + $this->assertEquals('011-9876', $formatter->inputDigit('6')); + $this->assertEquals('011-9876-7', $formatter->inputDigit('7')); + $this->assertEquals('011-9876-78', $formatter->inputDigit('8')); + $this->assertEquals('011-9876-789', $formatter->inputDigit('9')); + $this->assertEquals('011-9876-7890', $formatter->inputDigit('0')); } public function testAYTF_MX() @@ -641,299 +641,299 @@ public function testAYTF_MX() $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::MX); // +52 800 123 4567 - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+5", $formatter->inputDigit('5')); - $this->assertEquals("+52 ", $formatter->inputDigit('2')); - $this->assertEquals("+52 8", $formatter->inputDigit('8')); - $this->assertEquals("+52 80", $formatter->inputDigit('0')); - $this->assertEquals("+52 800", $formatter->inputDigit('0')); - $this->assertEquals("+52 800 1", $formatter->inputDigit('1')); - $this->assertEquals("+52 800 12", $formatter->inputDigit('2')); - $this->assertEquals("+52 800 123", $formatter->inputDigit('3')); - $this->assertEquals("+52 800 123 4", $formatter->inputDigit('4')); - $this->assertEquals("+52 800 123 45", $formatter->inputDigit('5')); - $this->assertEquals("+52 800 123 456", $formatter->inputDigit('6')); - $this->assertEquals("+52 800 123 4567", $formatter->inputDigit('7')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+5', $formatter->inputDigit('5')); + $this->assertEquals('+52 ', $formatter->inputDigit('2')); + $this->assertEquals('+52 8', $formatter->inputDigit('8')); + $this->assertEquals('+52 80', $formatter->inputDigit('0')); + $this->assertEquals('+52 800', $formatter->inputDigit('0')); + $this->assertEquals('+52 800 1', $formatter->inputDigit('1')); + $this->assertEquals('+52 800 12', $formatter->inputDigit('2')); + $this->assertEquals('+52 800 123', $formatter->inputDigit('3')); + $this->assertEquals('+52 800 123 4', $formatter->inputDigit('4')); + $this->assertEquals('+52 800 123 45', $formatter->inputDigit('5')); + $this->assertEquals('+52 800 123 456', $formatter->inputDigit('6')); + $this->assertEquals('+52 800 123 4567', $formatter->inputDigit('7')); // +52 55 1234 5678 $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+5", $formatter->inputDigit('5')); - $this->assertEquals("+52 ", $formatter->inputDigit('2')); - $this->assertEquals("+52 5", $formatter->inputDigit('5')); - $this->assertEquals("+52 55", $formatter->inputDigit('5')); - $this->assertEquals("+52 55 1", $formatter->inputDigit('1')); - $this->assertEquals("+52 55 12", $formatter->inputDigit('2')); - $this->assertEquals("+52 55 123", $formatter->inputDigit('3')); - $this->assertEquals("+52 55 1234", $formatter->inputDigit('4')); - $this->assertEquals("+52 55 1234 5", $formatter->inputDigit('5')); - $this->assertEquals("+52 55 1234 56", $formatter->inputDigit('6')); - $this->assertEquals("+52 55 1234 567", $formatter->inputDigit('7')); - $this->assertEquals("+52 55 1234 5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+5', $formatter->inputDigit('5')); + $this->assertEquals('+52 ', $formatter->inputDigit('2')); + $this->assertEquals('+52 5', $formatter->inputDigit('5')); + $this->assertEquals('+52 55', $formatter->inputDigit('5')); + $this->assertEquals('+52 55 1', $formatter->inputDigit('1')); + $this->assertEquals('+52 55 12', $formatter->inputDigit('2')); + $this->assertEquals('+52 55 123', $formatter->inputDigit('3')); + $this->assertEquals('+52 55 1234', $formatter->inputDigit('4')); + $this->assertEquals('+52 55 1234 5', $formatter->inputDigit('5')); + $this->assertEquals('+52 55 1234 56', $formatter->inputDigit('6')); + $this->assertEquals('+52 55 1234 567', $formatter->inputDigit('7')); + $this->assertEquals('+52 55 1234 5678', $formatter->inputDigit('8')); // +52 212 345 6789 $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+5", $formatter->inputDigit('5')); - $this->assertEquals("+52 ", $formatter->inputDigit('2')); - $this->assertEquals("+52 2", $formatter->inputDigit('2')); - $this->assertEquals("+52 21", $formatter->inputDigit('1')); - $this->assertEquals("+52 212", $formatter->inputDigit('2')); - $this->assertEquals("+52 212 3", $formatter->inputDigit('3')); - $this->assertEquals("+52 212 34", $formatter->inputDigit('4')); - $this->assertEquals("+52 212 345", $formatter->inputDigit('5')); - $this->assertEquals("+52 212 345 6", $formatter->inputDigit('6')); - $this->assertEquals("+52 212 345 67", $formatter->inputDigit('7')); - $this->assertEquals("+52 212 345 678", $formatter->inputDigit('8')); - $this->assertEquals("+52 212 345 6789", $formatter->inputDigit('9')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+5', $formatter->inputDigit('5')); + $this->assertEquals('+52 ', $formatter->inputDigit('2')); + $this->assertEquals('+52 2', $formatter->inputDigit('2')); + $this->assertEquals('+52 21', $formatter->inputDigit('1')); + $this->assertEquals('+52 212', $formatter->inputDigit('2')); + $this->assertEquals('+52 212 3', $formatter->inputDigit('3')); + $this->assertEquals('+52 212 34', $formatter->inputDigit('4')); + $this->assertEquals('+52 212 345', $formatter->inputDigit('5')); + $this->assertEquals('+52 212 345 6', $formatter->inputDigit('6')); + $this->assertEquals('+52 212 345 67', $formatter->inputDigit('7')); + $this->assertEquals('+52 212 345 678', $formatter->inputDigit('8')); + $this->assertEquals('+52 212 345 6789', $formatter->inputDigit('9')); // +52 1 55 1234 5678 $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+5", $formatter->inputDigit('5')); - $this->assertEquals("+52 ", $formatter->inputDigit('2')); - $this->assertEquals("+52 1", $formatter->inputDigit('1')); - $this->assertEquals("+52 15", $formatter->inputDigit('5')); - $this->assertEquals("+52 1 55", $formatter->inputDigit('5')); - $this->assertEquals("+52 1 55 1", $formatter->inputDigit('1')); - $this->assertEquals("+52 1 55 12", $formatter->inputDigit('2')); - $this->assertEquals("+52 1 55 123", $formatter->inputDigit('3')); - $this->assertEquals("+52 1 55 1234", $formatter->inputDigit('4')); - $this->assertEquals("+52 1 55 1234 5", $formatter->inputDigit('5')); - $this->assertEquals("+52 1 55 1234 56", $formatter->inputDigit('6')); - $this->assertEquals("+52 1 55 1234 567", $formatter->inputDigit('7')); - $this->assertEquals("+52 1 55 1234 5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+5', $formatter->inputDigit('5')); + $this->assertEquals('+52 ', $formatter->inputDigit('2')); + $this->assertEquals('+52 1', $formatter->inputDigit('1')); + $this->assertEquals('+52 15', $formatter->inputDigit('5')); + $this->assertEquals('+52 1 55', $formatter->inputDigit('5')); + $this->assertEquals('+52 1 55 1', $formatter->inputDigit('1')); + $this->assertEquals('+52 1 55 12', $formatter->inputDigit('2')); + $this->assertEquals('+52 1 55 123', $formatter->inputDigit('3')); + $this->assertEquals('+52 1 55 1234', $formatter->inputDigit('4')); + $this->assertEquals('+52 1 55 1234 5', $formatter->inputDigit('5')); + $this->assertEquals('+52 1 55 1234 56', $formatter->inputDigit('6')); + $this->assertEquals('+52 1 55 1234 567', $formatter->inputDigit('7')); + $this->assertEquals('+52 1 55 1234 5678', $formatter->inputDigit('8')); // +52 1 541 234 5678 $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+5", $formatter->inputDigit('5')); - $this->assertEquals("+52 ", $formatter->inputDigit('2')); - $this->assertEquals("+52 1", $formatter->inputDigit('1')); - $this->assertEquals("+52 15", $formatter->inputDigit('5')); - $this->assertEquals("+52 1 54", $formatter->inputDigit('4')); - $this->assertEquals("+52 1 541", $formatter->inputDigit('1')); - $this->assertEquals("+52 1 541 2", $formatter->inputDigit('2')); - $this->assertEquals("+52 1 541 23", $formatter->inputDigit('3')); - $this->assertEquals("+52 1 541 234", $formatter->inputDigit('4')); - $this->assertEquals("+52 1 541 234 5", $formatter->inputDigit('5')); - $this->assertEquals("+52 1 541 234 56", $formatter->inputDigit('6')); - $this->assertEquals("+52 1 541 234 567", $formatter->inputDigit('7')); - $this->assertEquals("+52 1 541 234 5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+5', $formatter->inputDigit('5')); + $this->assertEquals('+52 ', $formatter->inputDigit('2')); + $this->assertEquals('+52 1', $formatter->inputDigit('1')); + $this->assertEquals('+52 15', $formatter->inputDigit('5')); + $this->assertEquals('+52 1 54', $formatter->inputDigit('4')); + $this->assertEquals('+52 1 541', $formatter->inputDigit('1')); + $this->assertEquals('+52 1 541 2', $formatter->inputDigit('2')); + $this->assertEquals('+52 1 541 23', $formatter->inputDigit('3')); + $this->assertEquals('+52 1 541 234', $formatter->inputDigit('4')); + $this->assertEquals('+52 1 541 234 5', $formatter->inputDigit('5')); + $this->assertEquals('+52 1 541 234 56', $formatter->inputDigit('6')); + $this->assertEquals('+52 1 541 234 567', $formatter->inputDigit('7')); + $this->assertEquals('+52 1 541 234 5678', $formatter->inputDigit('8')); } public function testAYTF_International_Toll_Free() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::US); // +800 1234 5678 - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+80", $formatter->inputDigit('0')); - $this->assertEquals("+800 ", $formatter->inputDigit('0')); - $this->assertEquals("+800 1", $formatter->inputDigit('1')); - $this->assertEquals("+800 12", $formatter->inputDigit('2')); - $this->assertEquals("+800 123", $formatter->inputDigit('3')); - $this->assertEquals("+800 1234", $formatter->inputDigit('4')); - $this->assertEquals("+800 1234 5", $formatter->inputDigit('5')); - $this->assertEquals("+800 1234 56", $formatter->inputDigit('6')); - $this->assertEquals("+800 1234 567", $formatter->inputDigit('7')); - $this->assertEquals("+800 1234 5678", $formatter->inputDigit('8')); - $this->assertEquals("+800123456789", $formatter->inputDigit('9')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+80', $formatter->inputDigit('0')); + $this->assertEquals('+800 ', $formatter->inputDigit('0')); + $this->assertEquals('+800 1', $formatter->inputDigit('1')); + $this->assertEquals('+800 12', $formatter->inputDigit('2')); + $this->assertEquals('+800 123', $formatter->inputDigit('3')); + $this->assertEquals('+800 1234', $formatter->inputDigit('4')); + $this->assertEquals('+800 1234 5', $formatter->inputDigit('5')); + $this->assertEquals('+800 1234 56', $formatter->inputDigit('6')); + $this->assertEquals('+800 1234 567', $formatter->inputDigit('7')); + $this->assertEquals('+800 1234 5678', $formatter->inputDigit('8')); + $this->assertEquals('+800123456789', $formatter->inputDigit('9')); } public function testAYTFMultipleLeadingDigitPatterns() { // +81 50 2345 6789 $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::JP); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+81 ", $formatter->inputDigit('1')); - $this->assertEquals("+81 5", $formatter->inputDigit('5')); - $this->assertEquals("+81 50", $formatter->inputDigit('0')); - $this->assertEquals("+81 50 2", $formatter->inputDigit('2')); - $this->assertEquals("+81 50 23", $formatter->inputDigit('3')); - $this->assertEquals("+81 50 234", $formatter->inputDigit('4')); - $this->assertEquals("+81 50 2345", $formatter->inputDigit('5')); - $this->assertEquals("+81 50 2345 6", $formatter->inputDigit('6')); - $this->assertEquals("+81 50 2345 67", $formatter->inputDigit('7')); - $this->assertEquals("+81 50 2345 678", $formatter->inputDigit('8')); - $this->assertEquals("+81 50 2345 6789", $formatter->inputDigit('9')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+81 ', $formatter->inputDigit('1')); + $this->assertEquals('+81 5', $formatter->inputDigit('5')); + $this->assertEquals('+81 50', $formatter->inputDigit('0')); + $this->assertEquals('+81 50 2', $formatter->inputDigit('2')); + $this->assertEquals('+81 50 23', $formatter->inputDigit('3')); + $this->assertEquals('+81 50 234', $formatter->inputDigit('4')); + $this->assertEquals('+81 50 2345', $formatter->inputDigit('5')); + $this->assertEquals('+81 50 2345 6', $formatter->inputDigit('6')); + $this->assertEquals('+81 50 2345 67', $formatter->inputDigit('7')); + $this->assertEquals('+81 50 2345 678', $formatter->inputDigit('8')); + $this->assertEquals('+81 50 2345 6789', $formatter->inputDigit('9')); // +81 222 12 5678 $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+81 ", $formatter->inputDigit('1')); - $this->assertEquals("+81 2", $formatter->inputDigit('2')); - $this->assertEquals("+81 22", $formatter->inputDigit('2')); - $this->assertEquals("+81 22 2", $formatter->inputDigit('2')); - $this->assertEquals("+81 22 21", $formatter->inputDigit('1')); - $this->assertEquals("+81 2221 2", $formatter->inputDigit('2')); - $this->assertEquals("+81 222 12 5", $formatter->inputDigit('5')); - $this->assertEquals("+81 222 12 56", $formatter->inputDigit('6')); - $this->assertEquals("+81 222 12 567", $formatter->inputDigit('7')); - $this->assertEquals("+81 222 12 5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+81 ', $formatter->inputDigit('1')); + $this->assertEquals('+81 2', $formatter->inputDigit('2')); + $this->assertEquals('+81 22', $formatter->inputDigit('2')); + $this->assertEquals('+81 22 2', $formatter->inputDigit('2')); + $this->assertEquals('+81 22 21', $formatter->inputDigit('1')); + $this->assertEquals('+81 2221 2', $formatter->inputDigit('2')); + $this->assertEquals('+81 222 12 5', $formatter->inputDigit('5')); + $this->assertEquals('+81 222 12 56', $formatter->inputDigit('6')); + $this->assertEquals('+81 222 12 567', $formatter->inputDigit('7')); + $this->assertEquals('+81 222 12 5678', $formatter->inputDigit('8')); // 011113 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("01", $formatter->inputDigit('1')); - $this->assertEquals("011", $formatter->inputDigit('1')); - $this->assertEquals("011 1", $formatter->inputDigit('1')); - $this->assertEquals("011 11", $formatter->inputDigit('1')); - $this->assertEquals("011113", $formatter->inputDigit('3')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('01', $formatter->inputDigit('1')); + $this->assertEquals('011', $formatter->inputDigit('1')); + $this->assertEquals('011 1', $formatter->inputDigit('1')); + $this->assertEquals('011 11', $formatter->inputDigit('1')); + $this->assertEquals('011113', $formatter->inputDigit('3')); // +81 3332 2 5678 $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+81 ", $formatter->inputDigit('1')); - $this->assertEquals("+81 3", $formatter->inputDigit('3')); - $this->assertEquals("+81 33", $formatter->inputDigit('3')); - $this->assertEquals("+81 33 3", $formatter->inputDigit('3')); - $this->assertEquals("+81 3332", $formatter->inputDigit('2')); - $this->assertEquals("+81 3332 2", $formatter->inputDigit('2')); - $this->assertEquals("+81 3332 2 5", $formatter->inputDigit('5')); - $this->assertEquals("+81 3332 2 56", $formatter->inputDigit('6')); - $this->assertEquals("+81 3332 2 567", $formatter->inputDigit('7')); - $this->assertEquals("+81 3332 2 5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+81 ', $formatter->inputDigit('1')); + $this->assertEquals('+81 3', $formatter->inputDigit('3')); + $this->assertEquals('+81 33', $formatter->inputDigit('3')); + $this->assertEquals('+81 33 3', $formatter->inputDigit('3')); + $this->assertEquals('+81 3332', $formatter->inputDigit('2')); + $this->assertEquals('+81 3332 2', $formatter->inputDigit('2')); + $this->assertEquals('+81 3332 2 5', $formatter->inputDigit('5')); + $this->assertEquals('+81 3332 2 56', $formatter->inputDigit('6')); + $this->assertEquals('+81 3332 2 567', $formatter->inputDigit('7')); + $this->assertEquals('+81 3332 2 5678', $formatter->inputDigit('8')); } public function testAYTFLongIDD_AU() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::AU); // 0011 1 650 253 2250 - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("00", $formatter->inputDigit('0')); - $this->assertEquals("001", $formatter->inputDigit('1')); - $this->assertEquals("0011", $formatter->inputDigit('1')); - $this->assertEquals("0011 1 ", $formatter->inputDigit('1')); - $this->assertEquals("0011 1 6", $formatter->inputDigit('6')); - $this->assertEquals("0011 1 65", $formatter->inputDigit('5')); - $this->assertEquals("0011 1 650", $formatter->inputDigit('0')); - $this->assertEquals("0011 1 650 2", $formatter->inputDigit('2')); - $this->assertEquals("0011 1 650 25", $formatter->inputDigit('5')); - $this->assertEquals("0011 1 650 253", $formatter->inputDigit('3')); - $this->assertEquals("0011 1 650 253 2", $formatter->inputDigit('2')); - $this->assertEquals("0011 1 650 253 22", $formatter->inputDigit('2')); - $this->assertEquals("0011 1 650 253 222", $formatter->inputDigit('2')); - $this->assertEquals("0011 1 650 253 2222", $formatter->inputDigit('2')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('00', $formatter->inputDigit('0')); + $this->assertEquals('001', $formatter->inputDigit('1')); + $this->assertEquals('0011', $formatter->inputDigit('1')); + $this->assertEquals('0011 1 ', $formatter->inputDigit('1')); + $this->assertEquals('0011 1 6', $formatter->inputDigit('6')); + $this->assertEquals('0011 1 65', $formatter->inputDigit('5')); + $this->assertEquals('0011 1 650', $formatter->inputDigit('0')); + $this->assertEquals('0011 1 650 2', $formatter->inputDigit('2')); + $this->assertEquals('0011 1 650 25', $formatter->inputDigit('5')); + $this->assertEquals('0011 1 650 253', $formatter->inputDigit('3')); + $this->assertEquals('0011 1 650 253 2', $formatter->inputDigit('2')); + $this->assertEquals('0011 1 650 253 22', $formatter->inputDigit('2')); + $this->assertEquals('0011 1 650 253 222', $formatter->inputDigit('2')); + $this->assertEquals('0011 1 650 253 2222', $formatter->inputDigit('2')); // 0011 81 3332 2 5678 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("00", $formatter->inputDigit('0')); - $this->assertEquals("001", $formatter->inputDigit('1')); - $this->assertEquals("0011", $formatter->inputDigit('1')); - $this->assertEquals("00118", $formatter->inputDigit('8')); - $this->assertEquals("0011 81 ", $formatter->inputDigit('1')); - $this->assertEquals("0011 81 3", $formatter->inputDigit('3')); - $this->assertEquals("0011 81 33", $formatter->inputDigit('3')); - $this->assertEquals("0011 81 33 3", $formatter->inputDigit('3')); - $this->assertEquals("0011 81 3332", $formatter->inputDigit('2')); - $this->assertEquals("0011 81 3332 2", $formatter->inputDigit('2')); - $this->assertEquals("0011 81 3332 2 5", $formatter->inputDigit('5')); - $this->assertEquals("0011 81 3332 2 56", $formatter->inputDigit('6')); - $this->assertEquals("0011 81 3332 2 567", $formatter->inputDigit('7')); - $this->assertEquals("0011 81 3332 2 5678", $formatter->inputDigit('8')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('00', $formatter->inputDigit('0')); + $this->assertEquals('001', $formatter->inputDigit('1')); + $this->assertEquals('0011', $formatter->inputDigit('1')); + $this->assertEquals('00118', $formatter->inputDigit('8')); + $this->assertEquals('0011 81 ', $formatter->inputDigit('1')); + $this->assertEquals('0011 81 3', $formatter->inputDigit('3')); + $this->assertEquals('0011 81 33', $formatter->inputDigit('3')); + $this->assertEquals('0011 81 33 3', $formatter->inputDigit('3')); + $this->assertEquals('0011 81 3332', $formatter->inputDigit('2')); + $this->assertEquals('0011 81 3332 2', $formatter->inputDigit('2')); + $this->assertEquals('0011 81 3332 2 5', $formatter->inputDigit('5')); + $this->assertEquals('0011 81 3332 2 56', $formatter->inputDigit('6')); + $this->assertEquals('0011 81 3332 2 567', $formatter->inputDigit('7')); + $this->assertEquals('0011 81 3332 2 5678', $formatter->inputDigit('8')); // 0011 244 250 253 222 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("00", $formatter->inputDigit('0')); - $this->assertEquals("001", $formatter->inputDigit('1')); - $this->assertEquals("0011", $formatter->inputDigit('1')); - $this->assertEquals("00112", $formatter->inputDigit('2')); - $this->assertEquals("001124", $formatter->inputDigit('4')); - $this->assertEquals("0011 244 ", $formatter->inputDigit('4')); - $this->assertEquals("0011 244 2", $formatter->inputDigit('2')); - $this->assertEquals("0011 244 25", $formatter->inputDigit('5')); - $this->assertEquals("0011 244 250", $formatter->inputDigit('0')); - $this->assertEquals("0011 244 250 2", $formatter->inputDigit('2')); - $this->assertEquals("0011 244 250 25", $formatter->inputDigit('5')); - $this->assertEquals("0011 244 250 253", $formatter->inputDigit('3')); - $this->assertEquals("0011 244 250 253 2", $formatter->inputDigit('2')); - $this->assertEquals("0011 244 250 253 22", $formatter->inputDigit('2')); - $this->assertEquals("0011 244 250 253 222", $formatter->inputDigit('2')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('00', $formatter->inputDigit('0')); + $this->assertEquals('001', $formatter->inputDigit('1')); + $this->assertEquals('0011', $formatter->inputDigit('1')); + $this->assertEquals('00112', $formatter->inputDigit('2')); + $this->assertEquals('001124', $formatter->inputDigit('4')); + $this->assertEquals('0011 244 ', $formatter->inputDigit('4')); + $this->assertEquals('0011 244 2', $formatter->inputDigit('2')); + $this->assertEquals('0011 244 25', $formatter->inputDigit('5')); + $this->assertEquals('0011 244 250', $formatter->inputDigit('0')); + $this->assertEquals('0011 244 250 2', $formatter->inputDigit('2')); + $this->assertEquals('0011 244 250 25', $formatter->inputDigit('5')); + $this->assertEquals('0011 244 250 253', $formatter->inputDigit('3')); + $this->assertEquals('0011 244 250 253 2', $formatter->inputDigit('2')); + $this->assertEquals('0011 244 250 253 22', $formatter->inputDigit('2')); + $this->assertEquals('0011 244 250 253 222', $formatter->inputDigit('2')); } public function testAYTFLongIDD_KR() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::KR); // 00300 1 650 253 2222 - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("00", $formatter->inputDigit('0')); - $this->assertEquals("003", $formatter->inputDigit('3')); - $this->assertEquals("0030", $formatter->inputDigit('0')); - $this->assertEquals("00300", $formatter->inputDigit('0')); - $this->assertEquals("00300 1 ", $formatter->inputDigit('1')); - $this->assertEquals("00300 1 6", $formatter->inputDigit('6')); - $this->assertEquals("00300 1 65", $formatter->inputDigit('5')); - $this->assertEquals("00300 1 650", $formatter->inputDigit('0')); - $this->assertEquals("00300 1 650 2", $formatter->inputDigit('2')); - $this->assertEquals("00300 1 650 25", $formatter->inputDigit('5')); - $this->assertEquals("00300 1 650 253", $formatter->inputDigit('3')); - $this->assertEquals("00300 1 650 253 2", $formatter->inputDigit('2')); - $this->assertEquals("00300 1 650 253 22", $formatter->inputDigit('2')); - $this->assertEquals("00300 1 650 253 222", $formatter->inputDigit('2')); - $this->assertEquals("00300 1 650 253 2222", $formatter->inputDigit('2')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('00', $formatter->inputDigit('0')); + $this->assertEquals('003', $formatter->inputDigit('3')); + $this->assertEquals('0030', $formatter->inputDigit('0')); + $this->assertEquals('00300', $formatter->inputDigit('0')); + $this->assertEquals('00300 1 ', $formatter->inputDigit('1')); + $this->assertEquals('00300 1 6', $formatter->inputDigit('6')); + $this->assertEquals('00300 1 65', $formatter->inputDigit('5')); + $this->assertEquals('00300 1 650', $formatter->inputDigit('0')); + $this->assertEquals('00300 1 650 2', $formatter->inputDigit('2')); + $this->assertEquals('00300 1 650 25', $formatter->inputDigit('5')); + $this->assertEquals('00300 1 650 253', $formatter->inputDigit('3')); + $this->assertEquals('00300 1 650 253 2', $formatter->inputDigit('2')); + $this->assertEquals('00300 1 650 253 22', $formatter->inputDigit('2')); + $this->assertEquals('00300 1 650 253 222', $formatter->inputDigit('2')); + $this->assertEquals('00300 1 650 253 2222', $formatter->inputDigit('2')); } public function testAYTFLongNDD_KR() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::KR); // 08811-9876-7890 - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("08", $formatter->inputDigit('8')); - $this->assertEquals("088", $formatter->inputDigit('8')); - $this->assertEquals("0881", $formatter->inputDigit('1')); - $this->assertEquals("08811", $formatter->inputDigit('1')); - $this->assertEquals("08811-9", $formatter->inputDigit('9')); - $this->assertEquals("08811-98", $formatter->inputDigit('8')); - $this->assertEquals("08811-987", $formatter->inputDigit('7')); - $this->assertEquals("08811-9876", $formatter->inputDigit('6')); - $this->assertEquals("08811-9876-7", $formatter->inputDigit('7')); - $this->assertEquals("08811-9876-78", $formatter->inputDigit('8')); - $this->assertEquals("08811-9876-789", $formatter->inputDigit('9')); - $this->assertEquals("08811-9876-7890", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('08', $formatter->inputDigit('8')); + $this->assertEquals('088', $formatter->inputDigit('8')); + $this->assertEquals('0881', $formatter->inputDigit('1')); + $this->assertEquals('08811', $formatter->inputDigit('1')); + $this->assertEquals('08811-9', $formatter->inputDigit('9')); + $this->assertEquals('08811-98', $formatter->inputDigit('8')); + $this->assertEquals('08811-987', $formatter->inputDigit('7')); + $this->assertEquals('08811-9876', $formatter->inputDigit('6')); + $this->assertEquals('08811-9876-7', $formatter->inputDigit('7')); + $this->assertEquals('08811-9876-78', $formatter->inputDigit('8')); + $this->assertEquals('08811-9876-789', $formatter->inputDigit('9')); + $this->assertEquals('08811-9876-7890', $formatter->inputDigit('0')); // 08500 11-9876-7890 $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("08", $formatter->inputDigit('8')); - $this->assertEquals("085", $formatter->inputDigit('5')); - $this->assertEquals("0850", $formatter->inputDigit('0')); - $this->assertEquals("08500 ", $formatter->inputDigit('0')); - $this->assertEquals("08500 1", $formatter->inputDigit('1')); - $this->assertEquals("08500 11", $formatter->inputDigit('1')); - $this->assertEquals("08500 11-9", $formatter->inputDigit('9')); - $this->assertEquals("08500 11-98", $formatter->inputDigit('8')); - $this->assertEquals("08500 11-987", $formatter->inputDigit('7')); - $this->assertEquals("08500 11-9876", $formatter->inputDigit('6')); - $this->assertEquals("08500 11-9876-7", $formatter->inputDigit('7')); - $this->assertEquals("08500 11-9876-78", $formatter->inputDigit('8')); - $this->assertEquals("08500 11-9876-789", $formatter->inputDigit('9')); - $this->assertEquals("08500 11-9876-7890", $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('08', $formatter->inputDigit('8')); + $this->assertEquals('085', $formatter->inputDigit('5')); + $this->assertEquals('0850', $formatter->inputDigit('0')); + $this->assertEquals('08500 ', $formatter->inputDigit('0')); + $this->assertEquals('08500 1', $formatter->inputDigit('1')); + $this->assertEquals('08500 11', $formatter->inputDigit('1')); + $this->assertEquals('08500 11-9', $formatter->inputDigit('9')); + $this->assertEquals('08500 11-98', $formatter->inputDigit('8')); + $this->assertEquals('08500 11-987', $formatter->inputDigit('7')); + $this->assertEquals('08500 11-9876', $formatter->inputDigit('6')); + $this->assertEquals('08500 11-9876-7', $formatter->inputDigit('7')); + $this->assertEquals('08500 11-9876-78', $formatter->inputDigit('8')); + $this->assertEquals('08500 11-9876-789', $formatter->inputDigit('9')); + $this->assertEquals('08500 11-9876-7890', $formatter->inputDigit('0')); } public function testAYTFLongNDD_SG() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::SG); // 777777 9876 7890 - $this->assertEquals("7", $formatter->inputDigit('7')); - $this->assertEquals("77", $formatter->inputDigit('7')); - $this->assertEquals("777", $formatter->inputDigit('7')); - $this->assertEquals("7777", $formatter->inputDigit('7')); - $this->assertEquals("77777", $formatter->inputDigit('7')); - $this->assertEquals("777777 ", $formatter->inputDigit('7')); - $this->assertEquals("777777 9", $formatter->inputDigit('9')); - $this->assertEquals("777777 98", $formatter->inputDigit('8')); - $this->assertEquals("777777 987", $formatter->inputDigit('7')); - $this->assertEquals("777777 9876", $formatter->inputDigit('6')); - $this->assertEquals("777777 9876 7", $formatter->inputDigit('7')); - $this->assertEquals("777777 9876 78", $formatter->inputDigit('8')); - $this->assertEquals("777777 9876 789", $formatter->inputDigit('9')); - $this->assertEquals("777777 9876 7890", $formatter->inputDigit('0')); + $this->assertEquals('7', $formatter->inputDigit('7')); + $this->assertEquals('77', $formatter->inputDigit('7')); + $this->assertEquals('777', $formatter->inputDigit('7')); + $this->assertEquals('7777', $formatter->inputDigit('7')); + $this->assertEquals('77777', $formatter->inputDigit('7')); + $this->assertEquals('777777 ', $formatter->inputDigit('7')); + $this->assertEquals('777777 9', $formatter->inputDigit('9')); + $this->assertEquals('777777 98', $formatter->inputDigit('8')); + $this->assertEquals('777777 987', $formatter->inputDigit('7')); + $this->assertEquals('777777 9876', $formatter->inputDigit('6')); + $this->assertEquals('777777 9876 7', $formatter->inputDigit('7')); + $this->assertEquals('777777 9876 78', $formatter->inputDigit('8')); + $this->assertEquals('777777 9876 789', $formatter->inputDigit('9')); + $this->assertEquals('777777 9876 7890', $formatter->inputDigit('0')); } public function testAYTFShortNumberFormattingFix_AU() @@ -942,73 +942,73 @@ public function testAYTFShortNumberFormattingFix_AU() $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::AU); // 1234567890 - For leading digit 1, the national prefix formatting rule has first group only. - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("12", $formatter->inputDigit('2')); - $this->assertEquals("123", $formatter->inputDigit('3')); - $this->assertEquals("1234", $formatter->inputDigit('4')); - $this->assertEquals("1234 5", $formatter->inputDigit('5')); - $this->assertEquals("1234 56", $formatter->inputDigit('6')); - $this->assertEquals("1234 567", $formatter->inputDigit('7')); - $this->assertEquals("1234 567 8", $formatter->inputDigit('8')); - $this->assertEquals("1234 567 89", $formatter->inputDigit('9')); - $this->assertEquals("1234 567 890", $formatter->inputDigit('0')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('12', $formatter->inputDigit('2')); + $this->assertEquals('123', $formatter->inputDigit('3')); + $this->assertEquals('1234', $formatter->inputDigit('4')); + $this->assertEquals('1234 5', $formatter->inputDigit('5')); + $this->assertEquals('1234 56', $formatter->inputDigit('6')); + $this->assertEquals('1234 567', $formatter->inputDigit('7')); + $this->assertEquals('1234 567 8', $formatter->inputDigit('8')); + $this->assertEquals('1234 567 89', $formatter->inputDigit('9')); + $this->assertEquals('1234 567 890', $formatter->inputDigit('0')); // +61 1234 567 890 - Test the same number, but with the country code. $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+6", $formatter->inputDigit('6')); - $this->assertEquals("+61 ", $formatter->inputDigit('1')); - $this->assertEquals("+61 1", $formatter->inputDigit('1')); - $this->assertEquals("+61 12", $formatter->inputDigit('2')); - $this->assertEquals("+61 123", $formatter->inputDigit('3')); - $this->assertEquals("+61 1234", $formatter->inputDigit('4')); - $this->assertEquals("+61 1234 5", $formatter->inputDigit('5')); - $this->assertEquals("+61 1234 56", $formatter->inputDigit('6')); - $this->assertEquals("+61 1234 567", $formatter->inputDigit('7')); - $this->assertEquals("+61 1234 567 8", $formatter->inputDigit('8')); - $this->assertEquals("+61 1234 567 89", $formatter->inputDigit('9')); - $this->assertEquals("+61 1234 567 890", $formatter->inputDigit('0')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+6', $formatter->inputDigit('6')); + $this->assertEquals('+61 ', $formatter->inputDigit('1')); + $this->assertEquals('+61 1', $formatter->inputDigit('1')); + $this->assertEquals('+61 12', $formatter->inputDigit('2')); + $this->assertEquals('+61 123', $formatter->inputDigit('3')); + $this->assertEquals('+61 1234', $formatter->inputDigit('4')); + $this->assertEquals('+61 1234 5', $formatter->inputDigit('5')); + $this->assertEquals('+61 1234 56', $formatter->inputDigit('6')); + $this->assertEquals('+61 1234 567', $formatter->inputDigit('7')); + $this->assertEquals('+61 1234 567 8', $formatter->inputDigit('8')); + $this->assertEquals('+61 1234 567 89', $formatter->inputDigit('9')); + $this->assertEquals('+61 1234 567 890', $formatter->inputDigit('0')); // 212345678 - For leading digit 2, the national prefix formatting rule puts the national prefix // before the first group. $formatter->clear(); - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("02", $formatter->inputDigit('2')); - $this->assertEquals("021", $formatter->inputDigit('1')); - $this->assertEquals("02 12", $formatter->inputDigit('2')); - $this->assertEquals("02 123", $formatter->inputDigit('3')); - $this->assertEquals("02 1234", $formatter->inputDigit('4')); - $this->assertEquals("02 1234 5", $formatter->inputDigit('5')); - $this->assertEquals("02 1234 56", $formatter->inputDigit('6')); - $this->assertEquals("02 1234 567", $formatter->inputDigit('7')); - $this->assertEquals("02 1234 5678", $formatter->inputDigit('8')); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('02', $formatter->inputDigit('2')); + $this->assertEquals('021', $formatter->inputDigit('1')); + $this->assertEquals('02 12', $formatter->inputDigit('2')); + $this->assertEquals('02 123', $formatter->inputDigit('3')); + $this->assertEquals('02 1234', $formatter->inputDigit('4')); + $this->assertEquals('02 1234 5', $formatter->inputDigit('5')); + $this->assertEquals('02 1234 56', $formatter->inputDigit('6')); + $this->assertEquals('02 1234 567', $formatter->inputDigit('7')); + $this->assertEquals('02 1234 5678', $formatter->inputDigit('8')); // 212345678 - Test the same number, but without the leading 0. $formatter->clear(); - $this->assertEquals("2", $formatter->inputDigit('2')); - $this->assertEquals("21", $formatter->inputDigit('1')); - $this->assertEquals("212", $formatter->inputDigit('2')); - $this->assertEquals("2123", $formatter->inputDigit('3')); - $this->assertEquals("21234", $formatter->inputDigit('4')); - $this->assertEquals("212345", $formatter->inputDigit('5')); - $this->assertEquals("2123456", $formatter->inputDigit('6')); - $this->assertEquals("21234567", $formatter->inputDigit('7')); - $this->assertEquals("212345678", $formatter->inputDigit('8')); + $this->assertEquals('2', $formatter->inputDigit('2')); + $this->assertEquals('21', $formatter->inputDigit('1')); + $this->assertEquals('212', $formatter->inputDigit('2')); + $this->assertEquals('2123', $formatter->inputDigit('3')); + $this->assertEquals('21234', $formatter->inputDigit('4')); + $this->assertEquals('212345', $formatter->inputDigit('5')); + $this->assertEquals('2123456', $formatter->inputDigit('6')); + $this->assertEquals('21234567', $formatter->inputDigit('7')); + $this->assertEquals('212345678', $formatter->inputDigit('8')); // +61 2 1234 5678 - Test the same number, but with the country code. $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+6", $formatter->inputDigit('6')); - $this->assertEquals("+61 ", $formatter->inputDigit('1')); - $this->assertEquals("+61 2", $formatter->inputDigit('2')); - $this->assertEquals("+61 21", $formatter->inputDigit('1')); - $this->assertEquals("+61 2 12", $formatter->inputDigit('2')); - $this->assertEquals("+61 2 123", $formatter->inputDigit('3')); - $this->assertEquals("+61 2 1234", $formatter->inputDigit('4')); - $this->assertEquals("+61 2 1234 5", $formatter->inputDigit('5')); - $this->assertEquals("+61 2 1234 56", $formatter->inputDigit('6')); - $this->assertEquals("+61 2 1234 567", $formatter->inputDigit('7')); - $this->assertEquals("+61 2 1234 5678", $formatter->inputDigit('8')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+6', $formatter->inputDigit('6')); + $this->assertEquals('+61 ', $formatter->inputDigit('1')); + $this->assertEquals('+61 2', $formatter->inputDigit('2')); + $this->assertEquals('+61 21', $formatter->inputDigit('1')); + $this->assertEquals('+61 2 12', $formatter->inputDigit('2')); + $this->assertEquals('+61 2 123', $formatter->inputDigit('3')); + $this->assertEquals('+61 2 1234', $formatter->inputDigit('4')); + $this->assertEquals('+61 2 1234 5', $formatter->inputDigit('5')); + $this->assertEquals('+61 2 1234 56', $formatter->inputDigit('6')); + $this->assertEquals('+61 2 1234 567', $formatter->inputDigit('7')); + $this->assertEquals('+61 2 1234 5678', $formatter->inputDigit('8')); } public function testAYTFShortNumberFormattingFix_KR() @@ -1018,41 +1018,41 @@ public function testAYTFShortNumberFormattingFix_KR() $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::KR); // 111 - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("11", $formatter->inputDigit('1')); - $this->assertEquals("111", $formatter->inputDigit('1')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('11', $formatter->inputDigit('1')); + $this->assertEquals('111', $formatter->inputDigit('1')); // 114 $formatter->clear(); - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("11", $formatter->inputDigit('1')); - $this->assertEquals("114", $formatter->inputDigit('4')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('11', $formatter->inputDigit('1')); + $this->assertEquals('114', $formatter->inputDigit('4')); // 13121234 - Test a mobile number without the national prefix. Even though it is not an // emergency number, it should be formatted as a block. $formatter->clear(); - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("13", $formatter->inputDigit('3')); - $this->assertEquals("131", $formatter->inputDigit('1')); - $this->assertEquals("1312", $formatter->inputDigit('2')); - $this->assertEquals("13121", $formatter->inputDigit('1')); - $this->assertEquals("131212", $formatter->inputDigit('2')); - $this->assertEquals("1312123", $formatter->inputDigit('3')); - $this->assertEquals("13121234", $formatter->inputDigit('4')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('13', $formatter->inputDigit('3')); + $this->assertEquals('131', $formatter->inputDigit('1')); + $this->assertEquals('1312', $formatter->inputDigit('2')); + $this->assertEquals('13121', $formatter->inputDigit('1')); + $this->assertEquals('131212', $formatter->inputDigit('2')); + $this->assertEquals('1312123', $formatter->inputDigit('3')); + $this->assertEquals('13121234', $formatter->inputDigit('4')); // +82 131-2-1234 - Test the same number, but with the country code. $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+82 ", $formatter->inputDigit('2')); - $this->assertEquals("+82 1", $formatter->inputDigit('1')); - $this->assertEquals("+82 13", $formatter->inputDigit('3')); - $this->assertEquals("+82 131", $formatter->inputDigit('1')); - $this->assertEquals("+82 131-2", $formatter->inputDigit('2')); - $this->assertEquals("+82 131-2-1", $formatter->inputDigit('1')); - $this->assertEquals("+82 131-2-12", $formatter->inputDigit('2')); - $this->assertEquals("+82 131-2-123", $formatter->inputDigit('3')); - $this->assertEquals("+82 131-2-1234", $formatter->inputDigit('4')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+82 ', $formatter->inputDigit('2')); + $this->assertEquals('+82 1', $formatter->inputDigit('1')); + $this->assertEquals('+82 13', $formatter->inputDigit('3')); + $this->assertEquals('+82 131', $formatter->inputDigit('1')); + $this->assertEquals('+82 131-2', $formatter->inputDigit('2')); + $this->assertEquals('+82 131-2-1', $formatter->inputDigit('1')); + $this->assertEquals('+82 131-2-12', $formatter->inputDigit('2')); + $this->assertEquals('+82 131-2-123', $formatter->inputDigit('3')); + $this->assertEquals('+82 131-2-1234', $formatter->inputDigit('4')); } public function testAYTFShortNumberFormattingFix_MX() @@ -1061,63 +1061,63 @@ public function testAYTFShortNumberFormattingFix_MX() $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::MX); // 911 - $this->assertEquals("9", $formatter->inputDigit('9')); - $this->assertEquals("91", $formatter->inputDigit('1')); - $this->assertEquals("911", $formatter->inputDigit('1')); + $this->assertEquals('9', $formatter->inputDigit('9')); + $this->assertEquals('91', $formatter->inputDigit('1')); + $this->assertEquals('911', $formatter->inputDigit('1')); // 800 123 4567 - Test a toll-free number, which should have a formatting rule applied to it // even though it doesn't begin with the national prefix. $formatter->clear(); - $this->assertEquals("8", $formatter->inputDigit('8')); - $this->assertEquals("80", $formatter->inputDigit('0')); - $this->assertEquals("800", $formatter->inputDigit('0')); - $this->assertEquals("800 1", $formatter->inputDigit('1')); - $this->assertEquals("800 12", $formatter->inputDigit('2')); - $this->assertEquals("800 123", $formatter->inputDigit('3')); - $this->assertEquals("800 123 4", $formatter->inputDigit('4')); - $this->assertEquals("800 123 45", $formatter->inputDigit('5')); - $this->assertEquals("800 123 456", $formatter->inputDigit('6')); - $this->assertEquals("800 123 4567", $formatter->inputDigit('7')); + $this->assertEquals('8', $formatter->inputDigit('8')); + $this->assertEquals('80', $formatter->inputDigit('0')); + $this->assertEquals('800', $formatter->inputDigit('0')); + $this->assertEquals('800 1', $formatter->inputDigit('1')); + $this->assertEquals('800 12', $formatter->inputDigit('2')); + $this->assertEquals('800 123', $formatter->inputDigit('3')); + $this->assertEquals('800 123 4', $formatter->inputDigit('4')); + $this->assertEquals('800 123 45', $formatter->inputDigit('5')); + $this->assertEquals('800 123 456', $formatter->inputDigit('6')); + $this->assertEquals('800 123 4567', $formatter->inputDigit('7')); // +52 800 123 4567 - Test the same number, but with the country code. $formatter->clear(); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+5", $formatter->inputDigit('5')); - $this->assertEquals("+52 ", $formatter->inputDigit('2')); - $this->assertEquals("+52 8", $formatter->inputDigit('8')); - $this->assertEquals("+52 80", $formatter->inputDigit('0')); - $this->assertEquals("+52 800", $formatter->inputDigit('0')); - $this->assertEquals("+52 800 1", $formatter->inputDigit('1')); - $this->assertEquals("+52 800 12", $formatter->inputDigit('2')); - $this->assertEquals("+52 800 123", $formatter->inputDigit('3')); - $this->assertEquals("+52 800 123 4", $formatter->inputDigit('4')); - $this->assertEquals("+52 800 123 45", $formatter->inputDigit('5')); - $this->assertEquals("+52 800 123 456", $formatter->inputDigit('6')); - $this->assertEquals("+52 800 123 4567", $formatter->inputDigit('7')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+5', $formatter->inputDigit('5')); + $this->assertEquals('+52 ', $formatter->inputDigit('2')); + $this->assertEquals('+52 8', $formatter->inputDigit('8')); + $this->assertEquals('+52 80', $formatter->inputDigit('0')); + $this->assertEquals('+52 800', $formatter->inputDigit('0')); + $this->assertEquals('+52 800 1', $formatter->inputDigit('1')); + $this->assertEquals('+52 800 12', $formatter->inputDigit('2')); + $this->assertEquals('+52 800 123', $formatter->inputDigit('3')); + $this->assertEquals('+52 800 123 4', $formatter->inputDigit('4')); + $this->assertEquals('+52 800 123 45', $formatter->inputDigit('5')); + $this->assertEquals('+52 800 123 456', $formatter->inputDigit('6')); + $this->assertEquals('+52 800 123 4567', $formatter->inputDigit('7')); } public function testAYTFNoNationalPrefix() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::IT); - $this->assertEquals("3", $formatter->inputDigit('3')); - $this->assertEquals("33", $formatter->inputDigit('3')); - $this->assertEquals("333", $formatter->inputDigit('3')); - $this->assertEquals("333 3", $formatter->inputDigit('3')); - $this->assertEquals("333 33", $formatter->inputDigit('3')); - $this->assertEquals("333 333", $formatter->inputDigit('3')); + $this->assertEquals('3', $formatter->inputDigit('3')); + $this->assertEquals('33', $formatter->inputDigit('3')); + $this->assertEquals('333', $formatter->inputDigit('3')); + $this->assertEquals('333 3', $formatter->inputDigit('3')); + $this->assertEquals('333 33', $formatter->inputDigit('3')); + $this->assertEquals('333 333', $formatter->inputDigit('3')); } public function testAYTFNoNationalPrefixFormattingRule() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::AO); - $this->assertEquals("3", $formatter->inputDigit('3')); - $this->assertEquals("33", $formatter->inputDigit('3')); - $this->assertEquals("333", $formatter->inputDigit('3')); - $this->assertEquals("333 3", $formatter->inputDigit('3')); - $this->assertEquals("333 33", $formatter->inputDigit('3')); - $this->assertEquals("333 333", $formatter->inputDigit('3')); + $this->assertEquals('3', $formatter->inputDigit('3')); + $this->assertEquals('33', $formatter->inputDigit('3')); + $this->assertEquals('333', $formatter->inputDigit('3')); + $this->assertEquals('333 3', $formatter->inputDigit('3')); + $this->assertEquals('333 33', $formatter->inputDigit('3')); + $this->assertEquals('333 333', $formatter->inputDigit('3')); } public function testAYTFShortNumberFormattingFix_US() @@ -1126,21 +1126,21 @@ public function testAYTFShortNumberFormattingFix_US() $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::US); // 101 - Test that the initial 1 is not treated as a national prefix. - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("10", $formatter->inputDigit('0')); - $this->assertEquals("101", $formatter->inputDigit('1')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('10', $formatter->inputDigit('0')); + $this->assertEquals('101', $formatter->inputDigit('1')); // 112 - Test that the initial 1 is not treated as a national prefix. $formatter->clear(); - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("11", $formatter->inputDigit('1')); - $this->assertEquals("112", $formatter->inputDigit('2')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('11', $formatter->inputDigit('1')); + $this->assertEquals('112', $formatter->inputDigit('2')); // 122 - Test that the initial 1 is treated as a national prefix. $formatter->clear(); - $this->assertEquals("1", $formatter->inputDigit('1')); - $this->assertEquals("12", $formatter->inputDigit('2')); - $this->assertEquals("1 22", $formatter->inputDigit('2')); + $this->assertEquals('1', $formatter->inputDigit('1')); + $this->assertEquals('12', $formatter->inputDigit('2')); + $this->assertEquals('1 22', $formatter->inputDigit('2')); } public function testAYTFClearNDDAfterIDDExtraction() @@ -1149,55 +1149,55 @@ public function testAYTFClearNDDAfterIDDExtraction() // Check that when we have successfully extracted an IDD, the previously extracted NDD is // cleared since it is no longer valid. - $this->assertEquals("0", $formatter->inputDigit('0')); - $this->assertEquals("00", $formatter->inputDigit('0')); - $this->assertEquals("007", $formatter->inputDigit('7')); - $this->assertEquals("0070", $formatter->inputDigit('0')); - $this->assertEquals("00700", $formatter->inputDigit('0')); - $this->assertEquals("0", $formatter->getExtractedNationalPrefix()); + $this->assertEquals('0', $formatter->inputDigit('0')); + $this->assertEquals('00', $formatter->inputDigit('0')); + $this->assertEquals('007', $formatter->inputDigit('7')); + $this->assertEquals('0070', $formatter->inputDigit('0')); + $this->assertEquals('00700', $formatter->inputDigit('0')); + $this->assertEquals('0', $formatter->getExtractedNationalPrefix()); // Once the IDD "00700" has been extracted, it no longer makes sense for the initial "0" to be // treated as an NDD. - $this->assertEquals("00700 1 ", $formatter->inputDigit('1')); - $this->assertEquals("", $formatter->getExtractedNationalPrefix()); - - $this->assertEquals("00700 1 2", $formatter->inputDigit('2')); - $this->assertEquals("00700 1 23", $formatter->inputDigit('3')); - $this->assertEquals("00700 1 234", $formatter->inputDigit('4')); - $this->assertEquals("00700 1 234 5", $formatter->inputDigit('5')); - $this->assertEquals("00700 1 234 56", $formatter->inputDigit('6')); - $this->assertEquals("00700 1 234 567", $formatter->inputDigit('7')); - $this->assertEquals("00700 1 234 567 8", $formatter->inputDigit('8')); - $this->assertEquals("00700 1 234 567 89", $formatter->inputDigit('9')); - $this->assertEquals("00700 1 234 567 890", $formatter->inputDigit('0')); - $this->assertEquals("00700 1 234 567 8901", $formatter->inputDigit('1')); - $this->assertEquals("00700123456789012", $formatter->inputDigit('2')); - $this->assertEquals("007001234567890123", $formatter->inputDigit('3')); - $this->assertEquals("0070012345678901234", $formatter->inputDigit('4')); - $this->assertEquals("00700123456789012345", $formatter->inputDigit('5')); - $this->assertEquals("007001234567890123456", $formatter->inputDigit('6')); - $this->assertEquals("0070012345678901234567", $formatter->inputDigit('7')); + $this->assertEquals('00700 1 ', $formatter->inputDigit('1')); + $this->assertEquals('', $formatter->getExtractedNationalPrefix()); + + $this->assertEquals('00700 1 2', $formatter->inputDigit('2')); + $this->assertEquals('00700 1 23', $formatter->inputDigit('3')); + $this->assertEquals('00700 1 234', $formatter->inputDigit('4')); + $this->assertEquals('00700 1 234 5', $formatter->inputDigit('5')); + $this->assertEquals('00700 1 234 56', $formatter->inputDigit('6')); + $this->assertEquals('00700 1 234 567', $formatter->inputDigit('7')); + $this->assertEquals('00700 1 234 567 8', $formatter->inputDigit('8')); + $this->assertEquals('00700 1 234 567 89', $formatter->inputDigit('9')); + $this->assertEquals('00700 1 234 567 890', $formatter->inputDigit('0')); + $this->assertEquals('00700 1 234 567 8901', $formatter->inputDigit('1')); + $this->assertEquals('00700123456789012', $formatter->inputDigit('2')); + $this->assertEquals('007001234567890123', $formatter->inputDigit('3')); + $this->assertEquals('0070012345678901234', $formatter->inputDigit('4')); + $this->assertEquals('00700123456789012345', $formatter->inputDigit('5')); + $this->assertEquals('007001234567890123456', $formatter->inputDigit('6')); + $this->assertEquals('0070012345678901234567', $formatter->inputDigit('7')); } public function testAYTFNumberPatternsBecomingInvalidShouldNotResultInDigitLoss() { $formatter = $this->phoneUtil->getAsYouTypeFormatter(RegionCode::CN); - $this->assertEquals("+", $formatter->inputDigit('+')); - $this->assertEquals("+8", $formatter->inputDigit('8')); - $this->assertEquals("+86 ", $formatter->inputDigit('6')); - $this->assertEquals("+86 9", $formatter->inputDigit('9')); - $this->assertEquals("+86 98", $formatter->inputDigit('8')); - $this->assertEquals("+86 988", $formatter->inputDigit('8')); - $this->assertEquals("+86 988 1", $formatter->inputDigit('1')); + $this->assertEquals('+', $formatter->inputDigit('+')); + $this->assertEquals('+8', $formatter->inputDigit('8')); + $this->assertEquals('+86 ', $formatter->inputDigit('6')); + $this->assertEquals('+86 9', $formatter->inputDigit('9')); + $this->assertEquals('+86 98', $formatter->inputDigit('8')); + $this->assertEquals('+86 988', $formatter->inputDigit('8')); + $this->assertEquals('+86 988 1', $formatter->inputDigit('1')); // Now the number pattern is no longer valid because there are multiple leading digit patterns; // when we try again to extract a country code we should ensure we use the last leading digit // pattern, rather than the first one such that it *thinks* it's found a valid formatting rule // again. // https://github.com/googlei18n/libphonenumber/issues/437 - $this->assertEquals("+8698812", $formatter->inputDigit('2')); - $this->assertEquals("+86988123", $formatter->inputDigit('3')); - $this->assertEquals("+869881234", $formatter->inputDigit('4')); - $this->assertEquals("+8698812345", $formatter->inputDigit('5')); + $this->assertEquals('+8698812', $formatter->inputDigit('2')); + $this->assertEquals('+86988123', $formatter->inputDigit('3')); + $this->assertEquals('+869881234', $formatter->inputDigit('4')); + $this->assertEquals('+8698812345', $formatter->inputDigit('5')); } } diff --git a/tests/core/ExampleNumbersTest.php b/tests/core/ExampleNumbersTest.php index cdb303f5f..7f4bd30c8 100644 --- a/tests/core/ExampleNumbersTest.php +++ b/tests/core/ExampleNumbersTest.php @@ -238,9 +238,9 @@ public function supportedGlobalNetworkCallingCodes() public function testGlobalNetworkNumbers($callingCode) { $exampleNumber = $this->phoneNumberUtil->getExampleNumberForNonGeoEntity($callingCode); - $this->assertNotNull($exampleNumber, "No example phone number for calling code " . $callingCode); + $this->assertNotNull($exampleNumber, 'No example phone number for calling code ' . $callingCode); if (!$this->phoneNumberUtil->isValidNumber($exampleNumber)) { - $this->fail("Failed validation for " . $exampleNumber); + $this->fail('Failed validation for ' . $exampleNumber); } } @@ -251,7 +251,7 @@ public function testGlobalNetworkNumbers($callingCode) public function testEveryRegionHasAnExampleNumber($regionCode) { $exampleNumber = $this->phoneNumberUtil->getExampleNumber($regionCode); - $this->assertNotNull($exampleNumber, "No example number found for region " . $regionCode); + $this->assertNotNull($exampleNumber, 'No example number found for region ' . $regionCode); /* * Check the number is valid @@ -304,7 +304,7 @@ public function testShortNumbersValidAndCorrectCost($regionCode) } $phoneNumber = $this->phoneNumberUtil->parse($exampleShortNumber, $regionCode); if (!$this->shortNumberInfo->isValidShortNumber($phoneNumber)) { - $this->fail("Failed validation for " . (string)$phoneNumber); + $this->fail('Failed validation for ' . $phoneNumber); } } @@ -340,7 +340,7 @@ public function testShortNumberHasCorrectCost($regionCode, $cost) $phoneNumber = $this->phoneNumberUtil->parse($exampleShortNumber, $regionCode); $exampleShortNumberCost = $this->shortNumberInfo->getExpectedCostForRegion($phoneNumber, $regionCode); - $this->assertEquals($cost, $exampleShortNumberCost, 'Wrong cost for ' . (string)$phoneNumber); + $this->assertEquals($cost, $exampleShortNumberCost, 'Wrong cost for ' . $phoneNumber); } } @@ -359,13 +359,13 @@ public function testEmergency($regionCode) $regionCode ) || !$this->shortNumberInfo->isEmergencyNumber($exampleNumber, $regionCode) ) { - $this->fail("Emergency example number test failed for " . $regionCode); + $this->fail('Emergency example number test failed for ' . $regionCode); } elseif ($this->shortNumberInfo->getExpectedCostForRegion( $phoneNumber, $regionCode ) !== ShortNumberCost::TOLL_FREE ) { - $this->fail("Emergency example number not toll free for " . $regionCode); + $this->fail('Emergency example number not toll free for ' . $regionCode); } } } @@ -385,7 +385,7 @@ public function testCarrierSpecificShortNumbers($regionCode) if (!$this->shortNumberInfo->isPossibleShortNumberForRegion($carrierSpecificNumber, $regionCode) || !$this->shortNumberInfo->isCarrierSpecificForRegion($carrierSpecificNumber, $regionCode) ) { - $this->fail("Carrier-specific test failed for " . $regionCode); + $this->fail('Carrier-specific test failed for ' . $regionCode); } } } diff --git a/tests/core/MatcherTest.php b/tests/core/MatcherTest.php index aea678e91..d194c6580 100644 --- a/tests/core/MatcherTest.php +++ b/tests/core/MatcherTest.php @@ -3,7 +3,6 @@ namespace libphonenumber\Tests\core; use libphonenumber\MatcherAPIInterface; -use libphonenumber\PhoneNumber; use libphonenumber\PhoneNumberDesc; use libphonenumber\RegexBasedMatcher; use PHPUnit\Framework\TestCase; @@ -17,31 +16,31 @@ public function testRegexBasedMatcher() private function checkMatcherBehavesAsExpected(MatcherAPIInterface $matcher) { - $desc = $this->createDesc(""); + $desc = $this->createDesc(''); // Test if there is no matcher data. - $this->assertInvalid($matcher, "1", $desc); + $this->assertInvalid($matcher, '1', $desc); $desc = $this->createDesc("9\\d{2}"); - $this->assertInvalid($matcher, "91", $desc); - $this->assertInvalid($matcher, "81", $desc); - $this->assertMatched($matcher, "911", $desc); - $this->assertInvalid($matcher, "811", $desc); - $this->assertTooLong($matcher, "9111", $desc); - $this->assertInvalid($matcher, "8111", $desc); + $this->assertInvalid($matcher, '91', $desc); + $this->assertInvalid($matcher, '81', $desc); + $this->assertMatched($matcher, '911', $desc); + $this->assertInvalid($matcher, '811', $desc); + $this->assertTooLong($matcher, '9111', $desc); + $this->assertInvalid($matcher, '8111', $desc); $desc = $this->createDesc("\\d{1,2}"); - $this->assertMatched($matcher, "2", $desc); - $this->assertMatched($matcher, "20", $desc); + $this->assertMatched($matcher, '2', $desc); + $this->assertMatched($matcher, '20', $desc); - $desc = $this->createDesc("20?"); - $this->assertMatched($matcher, "2", $desc); - $this->assertMatched($matcher, "20", $desc); + $desc = $this->createDesc('20?'); + $this->assertMatched($matcher, '2', $desc); + $this->assertMatched($matcher, '20', $desc); - $desc = $this->createDesc("2|20"); - $this->assertMatched($matcher, "2", $desc); + $desc = $this->createDesc('2|20'); + $this->assertMatched($matcher, '2', $desc); // Subtle case where lookingAt() and matches() result in different ends(). - $this->assertMatched($matcher, "20", $desc); + $this->assertMatched($matcher, '20', $desc); } /** @@ -81,11 +80,11 @@ private function assertTooLong(MatcherAPIInterface $matcher, $number, PhoneNumbe private function descToString(PhoneNumberDesc $desc) { - $string = "pattern: "; + $string = 'pattern: '; if ($desc->hasNationalNumberPattern()) { $string .= $desc->getNationalNumberPattern(); } else { - $string .= "none"; + $string .= 'none'; } return $string; diff --git a/tests/core/MultiFileMetadataSourceImplTest.php b/tests/core/MultiFileMetadataSourceImplTest.php index 20371867a..1666288b7 100644 --- a/tests/core/MultiFileMetadataSourceImplTest.php +++ b/tests/core/MultiFileMetadataSourceImplTest.php @@ -29,22 +29,22 @@ public function testMissingMetadataFileThrowsRuntimeException() // do is make sure the exception has the file name in it. try { - $this->multiFileMetadataSource->loadMetadataFromFile("no/such/file", "XX", -1, new DefaultMetadataLoader()); - $this->fail("Expected Exception"); + $this->multiFileMetadataSource->loadMetadataFromFile('no/such/file', 'XX', -1, new DefaultMetadataLoader()); + $this->fail('Expected Exception'); } catch (\RuntimeException $e) { - $this->assertContains('no/such/file_XX', $e->getMessage(), "Unexpected error: " . $e->getMessage()); + $this->assertContains('no/such/file_XX', $e->getMessage(), 'Unexpected error: ' . $e->getMessage()); } try { $this->multiFileMetadataSource->loadMetadataFromFile( - "no/such/file", + 'no/such/file', PhoneNumberUtil::REGION_CODE_FOR_NON_GEO_ENTITY, 123, new DefaultMetadataLoader() ); - $this->fail("Expected Exception"); + $this->fail('Expected Exception'); } catch (\RuntimeException $e) { - $this->assertContains('no/such/file_123', $e->getMessage(), "Unexpected error: " . $e->getMessage()); + $this->assertContains('no/such/file_123', $e->getMessage(), 'Unexpected error: ' . $e->getMessage()); } } } diff --git a/tests/core/PhoneNumberMatchTest.php b/tests/core/PhoneNumberMatchTest.php index 0cd1dcc54..d68598e19 100644 --- a/tests/core/PhoneNumberMatchTest.php +++ b/tests/core/PhoneNumberMatchTest.php @@ -12,8 +12,8 @@ public function testValueTypeSemantics() { $number = new PhoneNumber(); - $match1 = new PhoneNumberMatch(10, "1 800 234 45 67", $number); - $match2 = new PhoneNumberMatch(10, "1 800 234 45 67", $number); + $match1 = new PhoneNumberMatch(10, '1 800 234 45 67', $number); + $match2 = new PhoneNumberMatch(10, '1 800 234 45 67', $number); $this->assertEquals($match1, $match2); $this->assertEquals($match1->start(), $match2->start()); @@ -21,13 +21,13 @@ public function testValueTypeSemantics() $this->assertEquals($match1->number(), $match2->number()); $this->assertEquals($match1->rawString(), $match2->rawString()); - $this->assertEquals("1 800 234 45 67", $match1->rawString()); + $this->assertEquals('1 800 234 45 67', $match1->rawString()); } public function testIllegalArguments() { try { - new PhoneNumberMatch(-110, "1 800 234 45 67", new PhoneNumber()); + new PhoneNumberMatch(-110, '1 800 234 45 67', new PhoneNumber()); $this->fail(); } catch (\InvalidArgumentException $e) { $this->addToAssertionCount(1); diff --git a/tests/core/PhoneNumberMatcherTest.php b/tests/core/PhoneNumberMatcherTest.php index 672137180..4d2307cb3 100644 --- a/tests/core/PhoneNumberMatcherTest.php +++ b/tests/core/PhoneNumberMatcherTest.php @@ -34,7 +34,7 @@ public function testContainsMoreThanOneSlashInNationalNumber() $number = new PhoneNumber(); $number->setCountryCode(1); $number->setCountryCodeSource(CountryCodeSource::FROM_DEFAULT_COUNTRY); - $candidate = "1/05/2013"; + $candidate = '1/05/2013'; $this->assertTrue(PhoneNumberMatcher::containsMoreThanOneSlashInNationalNumber($number, $candidate)); // Here, the country code source thinks it started with a country calling code, but this is not @@ -42,26 +42,26 @@ public function testContainsMoreThanOneSlashInNationalNumber() $number = new PhoneNumber(); $number->setCountryCodeSource(274); $number->setCountryCodeSource(CountryCodeSource::FROM_NUMBER_WITHOUT_PLUS_SIGN); - $candidate = "27/4/2013"; + $candidate = '27/4/2013'; $this->assertTrue(PhoneNumberMatcher::containsMoreThanOneSlashInNationalNumber($number, $candidate)); // Now it should be false, because the first slash is after the country calling code. $number = new PhoneNumber(); $number->setCountryCode(49); $number->setCountryCodeSource(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN); - $candidate = "49/69/2013"; + $candidate = '49/69/2013'; $this->assertFalse(PhoneNumberMatcher::containsMoreThanOneSlashInNationalNumber($number, $candidate)); $number = new PhoneNumber(); $number->setCountryCode(49); $number->setCountryCodeSource(CountryCodeSource::FROM_NUMBER_WITHOUT_PLUS_SIGN); - $candidate = "+49/69/2013"; + $candidate = '+49/69/2013'; $this->assertFalse(PhoneNumberMatcher::containsMoreThanOneSlashInNationalNumber($number, $candidate)); - $candidate = "+ 49/69/2013"; + $candidate = '+ 49/69/2013'; $this->assertFalse(PhoneNumberMatcher::containsMoreThanOneSlashInNationalNumber($number, $candidate)); - $candidate = "+ 49/69/20/13"; + $candidate = '+ 49/69/20/13'; $this->assertTrue(PhoneNumberMatcher::containsMoreThanOneSlashInNationalNumber($number, $candidate)); // Here, the first group is not assumed to be the country calling code, even though it is the @@ -69,149 +69,149 @@ public function testContainsMoreThanOneSlashInNationalNumber() $number = new PhoneNumber(); $number->setCountryCode(49); $number->setCountryCodeSource(CountryCodeSource::FROM_DEFAULT_COUNTRY); - $candidate = "49/69/2013"; + $candidate = '49/69/2013'; $this->assertTrue(PhoneNumberMatcher::containsMoreThanOneSlashInNationalNumber($number, $candidate)); } public function testFindNationalNumber() { // same cases as in testParseNationalNumber - $this->doTestFindInContext("033316005", RegionCode::NZ); + $this->doTestFindInContext('033316005', RegionCode::NZ); // ("33316005", RegionCode.NZ) is omitted since the national prefix is obligatory for these // types of numbers in New Zealand. // National prefix attached and some formatting present. - $this->doTestFindInContext("03-331 6005", RegionCode::NZ); - $this->doTestFindInContext("03 331 6005", RegionCode::NZ); + $this->doTestFindInContext('03-331 6005', RegionCode::NZ); + $this->doTestFindInContext('03 331 6005', RegionCode::NZ); // Testing international prefixes. // Should strip country code. - $this->doTestFindInContext("0064 3 331 6005", RegionCode::NZ); + $this->doTestFindInContext('0064 3 331 6005', RegionCode::NZ); // Try again, but this time we have an international number with Region Code US. It should // recognize the country code and parse accordingly. - $this->doTestFindInContext("01164 3 331 6005", RegionCode::US); - $this->doTestFindInContext("+64 3 331 6005", RegionCode::US); + $this->doTestFindInContext('01164 3 331 6005', RegionCode::US); + $this->doTestFindInContext('+64 3 331 6005', RegionCode::US); - $this->doTestFindInContext("64(0)64123456", RegionCode::NZ); + $this->doTestFindInContext('64(0)64123456', RegionCode::NZ); // Check that using a "/" is fine in a phone number. // Note that real Polish numbers do *not* start with a 0. - $this->doTestFindInContext("0123/456789", RegionCode::PL); - $this->doTestFindInContext("123-456-7890", RegionCode::US); + $this->doTestFindInContext('0123/456789', RegionCode::PL); + $this->doTestFindInContext('123-456-7890', RegionCode::US); } public function testFindWithInternationalPrefixes() { - $this->doTestFindInContext("+1 (650) 333-6000", RegionCode::NZ); - $this->doTestFindInContext("1-650-333-6000", RegionCode::US); + $this->doTestFindInContext('+1 (650) 333-6000', RegionCode::NZ); + $this->doTestFindInContext('1-650-333-6000', RegionCode::US); // Calling the US number from Singapore by using different service providers // 1st test: calling using SingTel IDD service (IDD is 001) - $this->doTestFindInContext("0011-650-333-6000", RegionCode::SG); + $this->doTestFindInContext('0011-650-333-6000', RegionCode::SG); // 2nd test: calling using StarHub IDD service (IDD is 008) - $this->doTestFindInContext("0081-650-333-6000", RegionCode::SG); + $this->doTestFindInContext('0081-650-333-6000', RegionCode::SG); // 3rd test: calling using SingTel V019 service (IDD is 019) - $this->doTestFindInContext("0191-650-333-6000", RegionCode::SG); + $this->doTestFindInContext('0191-650-333-6000', RegionCode::SG); // Calling the US number from Poland - $this->doTestFindInContext("0~01-650-333-6000", RegionCode::PL); + $this->doTestFindInContext('0~01-650-333-6000', RegionCode::PL); // Using "++" at the start. - $this->doTestFindInContext("++1 (650) 333-6000", RegionCode::PL); + $this->doTestFindInContext('++1 (650) 333-6000', RegionCode::PL); // Using a full-width plus sign. $this->doTestFindInContext("\xEF\xBC\x8B1 (650) 333-6000", RegionCode::SG); // The whole number, including punctuation, is here represented in full-width form. - $this->doTestFindInContext("＋１ （６５０） ３３３－６０００", RegionCode::SG); + $this->doTestFindInContext('＋１ （６５０） ３３３－６０００', RegionCode::SG); } public function testFindWithLeadingZero() { - $this->doTestFindInContext("+39 02-36618 300", RegionCode::NZ); - $this->doTestFindInContext("02-36618 300", RegionCode::IT); - $this->doTestFindInContext("312 345 678", RegionCode::IT); + $this->doTestFindInContext('+39 02-36618 300', RegionCode::NZ); + $this->doTestFindInContext('02-36618 300', RegionCode::IT); + $this->doTestFindInContext('312 345 678', RegionCode::IT); } public function testFindNationalNumberArgentina() { // Test parsing mobile numbers of Argentina. - $this->doTestFindInContext("+54 9 343 555 1212", RegionCode::AR); - $this->doTestFindInContext("0343 15 555 1212", RegionCode::AR); + $this->doTestFindInContext('+54 9 343 555 1212', RegionCode::AR); + $this->doTestFindInContext('0343 15 555 1212', RegionCode::AR); - $this->doTestFindInContext("+54 9 3715 65 4320", RegionCode::AR); - $this->doTestFindInContext("03715 15 65 4320", RegionCode::AR); + $this->doTestFindInContext('+54 9 3715 65 4320', RegionCode::AR); + $this->doTestFindInContext('03715 15 65 4320', RegionCode::AR); // Test parsing fixed-line numbers of Argentina. - $this->doTestFindInContext("+54 11 3797 0000", RegionCode::AR); - $this->doTestFindInContext("011 3797 0000", RegionCode::AR); + $this->doTestFindInContext('+54 11 3797 0000', RegionCode::AR); + $this->doTestFindInContext('011 3797 0000', RegionCode::AR); - $this->doTestFindInContext("+54 3715 65 4321", RegionCode::AR); - $this->doTestFindInContext("03715 65 4321", RegionCode::AR); + $this->doTestFindInContext('+54 3715 65 4321', RegionCode::AR); + $this->doTestFindInContext('03715 65 4321', RegionCode::AR); - $this->doTestFindInContext("+54 23 1234 0000", RegionCode::AR); - $this->doTestFindInContext("023 1234 0000", RegionCode::AR); + $this->doTestFindInContext('+54 23 1234 0000', RegionCode::AR); + $this->doTestFindInContext('023 1234 0000', RegionCode::AR); } public function testFindWithXInNumber() { - $this->doTestFindInContext("(0xx) 123456789", RegionCode::AR); + $this->doTestFindInContext('(0xx) 123456789', RegionCode::AR); // A case where x denotes both carrier codes and extension symbol. - $this->doTestFindInContext("(0xx) 123456789 x 1234", RegionCode::AR); + $this->doTestFindInContext('(0xx) 123456789 x 1234', RegionCode::AR); // This test is intentionally constructed such that the number of digit after xx is larger than // 7, so that the number won't be mistakenly treated as an extension, as we allow extensions up // to 7 digits. This assumption is okay for now as all the countries where a carrier selection // code is written in the form of xx have a national significant number of length larger than 7. - $this->doTestFindInContext("011xx5481429712", RegionCode::US); + $this->doTestFindInContext('011xx5481429712', RegionCode::US); } public function testFindNumbersMexico() { // Test parsing fixed-line numbers of Mexico. - $this->doTestFindInContext("+52 (449)978-0001", RegionCode::MX); - $this->doTestFindInContext("01 (449)978-0001", RegionCode::MX); - $this->doTestFindInContext("(449)978-0001", RegionCode::MX); + $this->doTestFindInContext('+52 (449)978-0001', RegionCode::MX); + $this->doTestFindInContext('01 (449)978-0001', RegionCode::MX); + $this->doTestFindInContext('(449)978-0001', RegionCode::MX); // Test parsing mobile numbers of Mexico. - $this->doTestFindInContext("+52 1 33 1234-5678", RegionCode::MX); - $this->doTestFindInContext("044 (33) 1234-5678", RegionCode::MX); - $this->doTestFindInContext("045 33 1234-5678", RegionCode::MX); + $this->doTestFindInContext('+52 1 33 1234-5678', RegionCode::MX); + $this->doTestFindInContext('044 (33) 1234-5678', RegionCode::MX); + $this->doTestFindInContext('045 33 1234-5678', RegionCode::MX); } public function testFindNumbersWithPlusWithNoRegion() { // RegionCode.ZZ is allowed only if the number starts with a '+' - then the country code can be // calculated. - $this->doTestFindInContext("+64 3 331 6005", RegionCode::ZZ); + $this->doTestFindInContext('+64 3 331 6005', RegionCode::ZZ); // Null is also allowed for the region code in these cases. - $this->doTestFindInContext("+64 3 331 6005", null); + $this->doTestFindInContext('+64 3 331 6005', null); } public function testFindExtensions() { - $this->doTestFindInContext("03 331 6005 ext 3456", RegionCode::NZ); - $this->doTestFindInContext("03-3316005x3456", RegionCode::NZ); - $this->doTestFindInContext("03-3316005 int.3456", RegionCode::NZ); - $this->doTestFindInContext("03 3316005 #3456", RegionCode::NZ); - $this->doTestFindInContext("0~0 1800 7493 524", RegionCode::PL); - $this->doTestFindInContext("(1800) 7493.524", RegionCode::US); + $this->doTestFindInContext('03 331 6005 ext 3456', RegionCode::NZ); + $this->doTestFindInContext('03-3316005x3456', RegionCode::NZ); + $this->doTestFindInContext('03-3316005 int.3456', RegionCode::NZ); + $this->doTestFindInContext('03 3316005 #3456', RegionCode::NZ); + $this->doTestFindInContext('0~0 1800 7493 524', RegionCode::PL); + $this->doTestFindInContext('(1800) 7493.524', RegionCode::US); // Check that the last instance of an extension token is matched. - $this->doTestFindInContext("0~0 1800 7493 524 ~1234", RegionCode::PL); + $this->doTestFindInContext('0~0 1800 7493 524 ~1234', RegionCode::PL); // Verifying bug-fix where the last digit of a number was previously omitted if it was a 0 when // extracting the extension. Also verifying a few different cases of extensions. - $this->doTestFindInContext("+44 2034567890x456", RegionCode::NZ); - $this->doTestFindInContext("+44 2034567890x456", RegionCode::GB); - $this->doTestFindInContext("+44 2034567890 x456", RegionCode::GB); - $this->doTestFindInContext("+44 2034567890 X456", RegionCode::GB); - $this->doTestFindInContext("+44 2034567890 X 456", RegionCode::GB); - $this->doTestFindInContext("+44 2034567890 X 456", RegionCode::GB); - $this->doTestFindInContext("+44 2034567890 X 456", RegionCode::GB); - - $this->doTestFindInContext("(800) 901-3355 x 7246433", RegionCode::US); - $this->doTestFindInContext("(800) 901-3355 , ext 7246433", RegionCode::US); - $this->doTestFindInContext("(800) 901-3355 ,extension 7246433", RegionCode::US); + $this->doTestFindInContext('+44 2034567890x456', RegionCode::NZ); + $this->doTestFindInContext('+44 2034567890x456', RegionCode::GB); + $this->doTestFindInContext('+44 2034567890 x456', RegionCode::GB); + $this->doTestFindInContext('+44 2034567890 X456', RegionCode::GB); + $this->doTestFindInContext('+44 2034567890 X 456', RegionCode::GB); + $this->doTestFindInContext('+44 2034567890 X 456', RegionCode::GB); + $this->doTestFindInContext('+44 2034567890 X 456', RegionCode::GB); + + $this->doTestFindInContext('(800) 901-3355 x 7246433', RegionCode::US); + $this->doTestFindInContext('(800) 901-3355 , ext 7246433', RegionCode::US); + $this->doTestFindInContext('(800) 901-3355 ,extension 7246433', RegionCode::US); // The next test differs from PhoneNumberUtil -> when matching we don't consider a lone comma to // indicate an extension, although we accept it when parsing. - $this->doTestFindInContext("(800) 901-3355 ,x 7246433", RegionCode::US); - $this->doTestFindInContext("(800) 901-3355 ext: 7246433", RegionCode::US); + $this->doTestFindInContext('(800) 901-3355 ,x 7246433', RegionCode::US); + $this->doTestFindInContext('(800) 901-3355 ext: 7246433', RegionCode::US); } public function testFindInterspersedWithSpace() { - $this->doTestFindInContext("0 3 3 3 1 6 0 0 5", RegionCode::NZ); + $this->doTestFindInContext('0 3 3 3 1 6 0 0 5', RegionCode::NZ); } /** @@ -219,7 +219,7 @@ public function testFindInterspersedWithSpace() */ public function testIntermediateParsePositions() { - $text = "Call 033316005 or 032316005!"; + $text = 'Call 033316005 or 032316005!'; // | | | | | | // 0 5 10 15 20 25 @@ -238,11 +238,11 @@ public function testIntermediateParsePositions() public function testFourMatchesInARow() { - $number1 = "415-666-7777"; - $number2 = "800-443-1223"; - $number3 = "212-443-1223"; - $number4 = "650-443-1223"; - $text = $number1 . " - " . $number2 . " - " . $number3 . " - " . $number4; + $number1 = '415-666-7777'; + $number2 = '800-443-1223'; + $number3 = '212-443-1223'; + $number4 = '650-443-1223'; + $text = $number1 . ' - ' . $number2 . ' - ' . $number3 . ' - ' . $number4; $iterator = $this->phoneUtil->findNumbers($text, RegionCode::US); @@ -265,9 +265,9 @@ public function testFourMatchesInARow() public function testMatchesFoundWithMultipleSpaces() { - $number1 = "(415) 666-7777"; - $number2 = "(800) 443-1223"; - $text = $number1 . " " . $number2; + $number1 = '(415) 666-7777'; + $number2 = '(800) 443-1223'; + $text = $number1 . ' ' . $number2; $iterator = $this->phoneUtil->findNumbers($text, RegionCode::US); @@ -282,8 +282,8 @@ public function testMatchesFoundWithMultipleSpaces() public function testMatchWithSurroundingZipcodes() { - $number = "415-666-7777"; - $zipPreceding = "My address is CA 34215 - " . $number . " is my number."; + $number = '415-666-7777'; + $zipPreceding = 'My address is CA 34215 - ' . $number . ' is my number.'; $iterator = $this->phoneUtil->findNumbers($zipPreceding, RegionCode::US); @@ -292,9 +292,9 @@ public function testMatchWithSurroundingZipcodes() $this->assertMatchProperties($match, $zipPreceding, $number, RegionCode::US); // Now repeat, but this time the phone number has spaces in it. It should still be found. - $number = "(415) 666 7777"; + $number = '(415) 666 7777'; - $zipFollowing = "My number is " . $number . ". 34215 is my zip-code."; + $zipFollowing = 'My number is ' . $number . '. 34215 is my zip-code.'; $iterator = $this->phoneUtil->findNumbers($zipFollowing, RegionCode::US); @@ -335,13 +335,13 @@ public function testIsLatinLetter($letter, $expectedResult) public function testMatchesWithSurroundingLatinChars() { $possibleOnlyContexts = array(); - $possibleOnlyContexts[] = array("abc", "def"); - $possibleOnlyContexts[] = array("abc", ""); - $possibleOnlyContexts[] = array("", "def"); + $possibleOnlyContexts[] = array('abc', 'def'); + $possibleOnlyContexts[] = array('abc', ''); + $possibleOnlyContexts[] = array('', 'def'); // Latin capital letter e with an acute accent. - $possibleOnlyContexts[] = array("\xC3\x89", ""); + $possibleOnlyContexts[] = array("\xC3\x89", ''); // e with an acute accent decomposed (with combining mark). - $possibleOnlyContexts[] = array("e\xCC\x81", ""); + $possibleOnlyContexts[] = array("e\xCC\x81", ''); // Numbers should not be considered valid, if they are surrounded by Latin characters, but // should be considered possible. @@ -351,10 +351,10 @@ public function testMatchesWithSurroundingLatinChars() public function testMoneyNotSeenAsPhoneNumber() { $possibleOnlyContexts = array(); - $possibleOnlyContexts[] = array("$", ""); - $possibleOnlyContexts[] = array("", "$"); - $possibleOnlyContexts[] = array("\xC2\xA3", ""); // Pound sign - $possibleOnlyContexts[] = array("\xC2\xA5", ""); // Yen sign + $possibleOnlyContexts[] = array('$', ''); + $possibleOnlyContexts[] = array('', '$'); + $possibleOnlyContexts[] = array("\xC2\xA3", ''); // Pound sign + $possibleOnlyContexts[] = array("\xC2\xA5", ''); // Yen sign $this->findMatchesInContexts($possibleOnlyContexts, false, true); } @@ -362,7 +362,7 @@ public function testMoneyNotSeenAsPhoneNumber() public function testPercentageNotSeenAsPhoneNumber() { $possibleOnlyContexts = array(); - $possibleOnlyContexts[] = array("", "%"); + $possibleOnlyContexts[] = array('', '%'); // Numbers followed by % should be dropped $this->findMatchesInContexts($possibleOnlyContexts, false, true); } @@ -383,22 +383,22 @@ public function testMatchesWithSurroundingLatinCharsAndLeadingPunctuation() // Contexts with trailing characters. Leading characters are okay here since the numbers we will // insert start with punctuation, but trailing characters are still not allowed. $possibleOnlyContexts = array(); - $possibleOnlyContexts[] = array("abc", "def"); - $possibleOnlyContexts[] = array("", "def"); - $possibleOnlyContexts[] = array("", "\xC3\x89"); + $possibleOnlyContexts[] = array('abc', 'def'); + $possibleOnlyContexts[] = array('', 'def'); + $possibleOnlyContexts[] = array('', "\xC3\x89"); // Numbers should not be considered valid, if they have trailing Latin characters, but should be // considered possible. - $numberWithPlus = "+14156667777"; - $numberWithBrackets = "(415)6667777"; + $numberWithPlus = '+14156667777'; + $numberWithBrackets = '(415)6667777'; $this->findMatchesInContexts($possibleOnlyContexts, false, true, RegionCode::US, $numberWithPlus); $this->findMatchesInContexts($possibleOnlyContexts, false, true, RegionCode::US, $numberWithBrackets); $validContexts = array(); - $validContexts[] = array("abc", ""); - $validContexts[] = array("\xC3\x89", ""); - $validContexts[] = array("\xC3\x89", "."); // Trailing punctuation. - $validContexts[] = array("\xC3\x89", " def"); // Trailing white space. + $validContexts[] = array('abc', ''); + $validContexts[] = array("\xC3\x89", ''); + $validContexts[] = array("\xC3\x89", '.'); // Trailing punctuation. + $validContexts[] = array("\xC3\x89", ' def'); // Trailing white space. // Numbers should be considered valid, since they start with punctuation. $this->findMatchesInContexts($validContexts, true, true, RegionCode::US, $numberWithPlus); @@ -408,9 +408,9 @@ public function testMatchesWithSurroundingLatinCharsAndLeadingPunctuation() public function testMatchesWithSurroundingChineseChars() { $validContexts = array(); - $validContexts[] = array("我的电话号码是", ""); - $validContexts[] = array("", "是我的电话号码"); - $validContexts[] = array("请拨打", "我在明天"); + $validContexts[] = array('我的电话号码是', ''); + $validContexts[] = array('', '是我的电话号码'); + $validContexts[] = array('请拨打', '我在明天'); // Numbers should be considered valid, since they are surrounded by Chinese. $this->findMatchesInContexts($validContexts, true, true); @@ -419,10 +419,10 @@ public function testMatchesWithSurroundingChineseChars() public function testMatchesWithSurroundingPunctuation() { $validContexts = array(); - $validContexts[] = array("My number-", ""); // At end of text - $validContexts[] = array("", ".Nice day."); // At start of text - $validContexts[] = array("Tel:", "."); // Punctuation surrounds number. - $validContexts[] = array("Tel: ", " on Saturdays."); // White-space is also fine. + $validContexts[] = array('My number-', ''); // At end of text + $validContexts[] = array('', '.Nice day.'); // At start of text + $validContexts[] = array('Tel:', '.'); // Punctuation surrounds number. + $validContexts[] = array('Tel: ', ' on Saturdays.'); // White-space is also fine. // Numbers should be considered valid, since they are surrounded by punctuation. $this->findMatchesInContexts($validContexts, true, true); @@ -430,18 +430,18 @@ public function testMatchesWithSurroundingPunctuation() public function testMatchesMultiplePhoneNumbersSeparatedByPhoneNumberPunctuation() { - $text = "Call 650-253-4561 -- 455-234-3451"; + $text = 'Call 650-253-4561 -- 455-234-3451'; $region = RegionCode::US; $number1 = new PhoneNumber(); $number1->setCountryCode($this->phoneUtil->getCountryCodeForRegion($region)); $number1->setNationalNumber(6502534561); - $match1 = new PhoneNumberMatch(5, "650-253-4561", $number1); + $match1 = new PhoneNumberMatch(5, '650-253-4561', $number1); $number2 = new PhoneNumber(); $number2->setCountryCode($this->phoneUtil->getCountryCodeForRegion($region)); $number2->setNationalNumber(4552343451); - $match2 = new PhoneNumberMatch(21, "455-234-3451", $number2); + $match2 = new PhoneNumberMatch(21, '455-234-3451', $number2); $matches = $this->phoneUtil->findNumbers($text, $region); @@ -455,7 +455,7 @@ public function testMatchesMultiplePhoneNumbersSeparatedByPhoneNumberPunctuation public function testDoesNotMatchMultiplePhoneNumbersSeparatedWithNoWhiteSpace() { // No white-space found between numbers - neither is found. - $text = "Call 650-253-4561--455-234-3451"; + $text = 'Call 650-253-4561--455-234-3451'; $region = RegionCode::US; $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers($text, $region))); @@ -468,23 +468,23 @@ public function testDoesNotMatchMultiplePhoneNumbersSeparatedWithNoWhiteSpace() public function dataImpossibleCases() { return array( - array("12345", RegionCode::US), - array("23456789", RegionCode::US), - array("234567890112", RegionCode::US), - array("650+253+1234", RegionCode::US), - array("3/10/1984", RegionCode::CA), - array("03/27/2011", RegionCode::US), - array("31/8/2011", RegionCode::US), - array("1/12/2011", RegionCode::US), - array("10/12/82", RegionCode::DE), - array("650x2531234", RegionCode::US), - array("2012-01-02 08:00", RegionCode::US), - array("2012/01/02 08:00", RegionCode::US), - array("20120102 08:00", RegionCode::US), - array("2014-04-12 04:04 PM", RegionCode::US), - array("2014-04-12  04:04 PM", RegionCode::US), - array("2014-04-12  04:04 PM", RegionCode::US), - array("2014-04-12 04:04 PM", RegionCode::US), + array('12345', RegionCode::US), + array('23456789', RegionCode::US), + array('234567890112', RegionCode::US), + array('650+253+1234', RegionCode::US), + array('3/10/1984', RegionCode::CA), + array('03/27/2011', RegionCode::US), + array('31/8/2011', RegionCode::US), + array('1/12/2011', RegionCode::US), + array('10/12/82', RegionCode::DE), + array('650x2531234', RegionCode::US), + array('2012-01-02 08:00', RegionCode::US), + array('2012/01/02 08:00', RegionCode::US), + array('20120102 08:00', RegionCode::US), + array('2014-04-12 04:04 PM', RegionCode::US), + array('2014-04-12  04:04 PM', RegionCode::US), + array('2014-04-12  04:04 PM', RegionCode::US), + array('2014-04-12 04:04 PM', RegionCode::US), ); } @@ -496,13 +496,13 @@ public function dataPossibleOnlyCases() { return array( // US numbers cannot start with 7 in the test metadata to be valid. - array("7121115678", RegionCode::US), + array('7121115678', RegionCode::US), // 'X' should not be found in numbers at leniencies stricter than POSSIBLE, unless it represents // a carrier code or extension. - array("1650 x 253 - 1234", RegionCode::US), - array("650 x 253 - 1234", RegionCode::US), - array("6502531x234", RegionCode::US), - array("(20) 3346 1234", RegionCode::GB), // Non-optional NP omitted + array('1650 x 253 - 1234', RegionCode::US), + array('650 x 253 - 1234', RegionCode::US), + array('6502531x234', RegionCode::US), + array('(20) 3346 1234', RegionCode::GB), // Non-optional NP omitted ); } @@ -514,25 +514,25 @@ public function dataPossibleOnlyCases() public function dataValidCases() { return array( - array("65 02 53 00 00", RegionCode::US), - array("6502 538365", RegionCode::US), - array("650//253-1234", RegionCode::US), // 2 slashes are illegal at higher levels - array("650/253/1234", RegionCode::US), - array("9002309. 158", RegionCode::US), - array("12 7/8 - 14 12/34 - 5", RegionCode::US), - array("12.1 - 23.71 - 23.45", RegionCode::US), - array("800 234 1 111x1111", RegionCode::US), - array("1979-2011 100", RegionCode::US), - array("+494949-4-94", RegionCode::DE), // National number in wrong format - array("４１５６６６６-７７７", RegionCode::US), - array("2012-0102 08", RegionCode::US), // Very strange formatting. - array("2012-01-02 08", RegionCode::US), + array('65 02 53 00 00', RegionCode::US), + array('6502 538365', RegionCode::US), + array('650//253-1234', RegionCode::US), // 2 slashes are illegal at higher levels + array('650/253/1234', RegionCode::US), + array('9002309. 158', RegionCode::US), + array('12 7/8 - 14 12/34 - 5', RegionCode::US), + array('12.1 - 23.71 - 23.45', RegionCode::US), + array('800 234 1 111x1111', RegionCode::US), + array('1979-2011 100', RegionCode::US), + array('+494949-4-94', RegionCode::DE), // National number in wrong format + array('４１５６６６６-７７７', RegionCode::US), + array('2012-0102 08', RegionCode::US), // Very strange formatting. + array('2012-01-02 08', RegionCode::US), // Breakdown assistance number with unexpected formatting. - array("1800-1-0-10 22", RegionCode::AU), - array("030-3-2 23 12 34", RegionCode::DE), - array("03 0 -3 2 23 12 34", RegionCode::DE), - array("(0)3 0 -3 2 23 12 34", RegionCode::DE), - array("0 3 0 -3 2 23 12 34", RegionCode::DE), + array('1800-1-0-10 22', RegionCode::AU), + array('030-3-2 23 12 34', RegionCode::DE), + array('03 0 -3 2 23 12 34', RegionCode::DE), + array('(0)3 0 -3 2 23 12 34', RegionCode::DE), + array('0 3 0 -3 2 23 12 34', RegionCode::DE), ); } @@ -544,19 +544,19 @@ public function dataValidCases() public function dataStrictGroupingCases() { return array( - array("(415) 6667777", RegionCode::US), - array("415-6667777", RegionCode::US), + array('(415) 6667777', RegionCode::US), + array('415-6667777', RegionCode::US), // Should be found by strict grouping but not exact grouping, as the last two groups are // formatted together as a block. - array("0800-2491234", RegionCode::DE), + array('0800-2491234', RegionCode::DE), // Doesn't match any formatting in the test file, but almost matches an alternate format (the // last two groups have been squashed together here). - array("0900-1 123123", RegionCode::DE), - array("(0)900-1 123123", RegionCode::DE), - array("0 900-1 123123", RegionCode::DE), + array('0900-1 123123', RegionCode::DE), + array('(0)900-1 123123', RegionCode::DE), + array('0 900-1 123123', RegionCode::DE), // NDC also found as part of the country calling code; this shouldn't ruin the grouping // expectations. - array("+33 3 34 2312", RegionCode::FR), + array('+33 3 34 2312', RegionCode::FR), ); } @@ -567,32 +567,32 @@ public function dataStrictGroupingCases() public function dataExactGroupingCases() { return array( - array("４１５６６６７７７７", RegionCode::US), - array("４１５-６６６-７７７７", RegionCode::US), - array("4156667777", RegionCode::US), - array("4156667777 x 123", RegionCode::US), - array("415-666-7777", RegionCode::US), - array("415/666-7777", RegionCode::US), - array("415-666-7777 ext. 503", RegionCode::US), - array("1 415 666 7777 x 123", RegionCode::US), - array("+1 415-666-7777", RegionCode::US), - array("+494949 49", RegionCode::DE), - array("+49-49-34", RegionCode::DE), - array("+49-4931-49", RegionCode::DE), - array("04931-49", RegionCode::DE), // With National Prefix - array("+49-494949", RegionCode::DE), // One group with country code - array("+49-494949 ext. 49", RegionCode::DE), - array("+49494949 ext. 49", RegionCode::DE), - array("0494949", RegionCode::DE), - array("0494949 ext. 49", RegionCode::DE), - array("01 (33) 3461 2234", RegionCode::MX), // Optional NP present - array("(33) 3461 2234", RegionCode::MX), // Optional NP omitted - array("1800-10-10 22", RegionCode::AU), // Breakdown assistance number. + array('４１５６６６７７７７', RegionCode::US), + array('４１５-６６６-７７７７', RegionCode::US), + array('4156667777', RegionCode::US), + array('4156667777 x 123', RegionCode::US), + array('415-666-7777', RegionCode::US), + array('415/666-7777', RegionCode::US), + array('415-666-7777 ext. 503', RegionCode::US), + array('1 415 666 7777 x 123', RegionCode::US), + array('+1 415-666-7777', RegionCode::US), + array('+494949 49', RegionCode::DE), + array('+49-49-34', RegionCode::DE), + array('+49-4931-49', RegionCode::DE), + array('04931-49', RegionCode::DE), // With National Prefix + array('+49-494949', RegionCode::DE), // One group with country code + array('+49-494949 ext. 49', RegionCode::DE), + array('+49494949 ext. 49', RegionCode::DE), + array('0494949', RegionCode::DE), + array('0494949 ext. 49', RegionCode::DE), + array('01 (33) 3461 2234', RegionCode::MX), // Optional NP present + array('(33) 3461 2234', RegionCode::MX), // Optional NP omitted + array('1800-10-10 22', RegionCode::AU), // Breakdown assistance number. // Doesn't match any formatting in the test file, but matches an alternate format exactly. - array("0900-1 123 123", RegionCode::DE), - array("(0)900-1 123 123", RegionCode::DE), - array("0 900-1 123 123", RegionCode::DE), - array("+33 3 34 23 12", RegionCode::FR), + array('0900-1 123 123', RegionCode::DE), + array('(0)900-1 123 123', RegionCode::DE), + array('0 900-1 123 123', RegionCode::DE), + array('+33 3 34 23 12', RegionCode::FR), ); } @@ -753,8 +753,13 @@ protected function doTestNumberNonMatchesForLeniency($string, $region, Leniency\ * @param string $region * @param string $number */ - protected function findMatchesInContexts($contexts, $isValid, $isPossible, $region = RegionCode::US, $number = "415-666-7777") - { + protected function findMatchesInContexts( + $contexts, + $isValid, + $isPossible, + $region = RegionCode::US, + $number = '415-666-7777' + ) { if ($isValid) { $this->doTestInContext($number, $region, $contexts, Leniency::VALID()); } else { @@ -781,55 +786,55 @@ public function testNonMatchingBracketsAreInvalid() // The digits up to the ", " form a valid US number, but it shouldn't be matched as one since // there was a non-matching bracket present. $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers( - "80.585 [79.964, 81.191]", RegionCode::US))); + '80.585 [79.964, 81.191]', RegionCode::US))); // The trailing "]" is thrown away before parsing, so the resultant number, while a valid US // number, does not have matching brackets. $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers( - "80.585 [79.964]", RegionCode::US))); + '80.585 [79.964]', RegionCode::US))); $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers( - "80.585 ((79.964)", RegionCode::US))); + '80.585 ((79.964)', RegionCode::US))); // This case has too many sets of brackets to be valid. $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers( - "(80).(585) (79).(9)64", RegionCode::US))); + '(80).(585) (79).(9)64', RegionCode::US))); } public function testNoMatchIfRegionIsNull() { // Fail on non-international prefix if region code is null. $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers( - "Random text body - number is 0331 6005, see you there", null))); + 'Random text body - number is 0331 6005, see you there', null))); } public function testNoMatchInEmptyString() { - $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers("", RegionCode::US))); - $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers(" ", RegionCode::US))); + $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers('', RegionCode::US))); + $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers(' ', RegionCode::US))); } public function testNoMatchIfNoNumber() { $this->assertTrue($this->hasNoMatches($this->phoneUtil->findNumbers( - "Random text body - number is foobar, see you there", RegionCode::US))); + 'Random text body - number is foobar, see you there', RegionCode::US))); } public function testSequences() { // Test multiple occurrences. - $text = "Call 033316005 or 032316005!"; + $text = 'Call 033316005 or 032316005!'; $region = RegionCode::NZ; $number1 = new PhoneNumber(); $number1->setCountryCode($this->phoneUtil->getCountryCodeForRegion($region)); $number1->setNationalNumber(33316005); - $match1 = new PhoneNumberMatch(5, "033316005", $number1); + $match1 = new PhoneNumberMatch(5, '033316005', $number1); $number2 = new PhoneNumber(); $number2->setCountryCode($this->phoneUtil->getCountryCodeForRegion($region)); $number2->setNationalNumber(32316005); - $match2 = new PhoneNumberMatch(19, "032316005", $number2); + $match2 = new PhoneNumberMatch(19, '032316005', $number2); $matches = $this->phoneUtil->findNumbers($text, $region, Leniency::POSSIBLE()); @@ -849,10 +854,10 @@ public function testNullInput() public function testMaxMatches() { // Set up text with 100 valid phone numbers. - $numbers = str_repeat("My info: 415-666-7777,", 100); + $numbers = str_repeat('My info: 415-666-7777,', 100); // Matches all 100. Max only applies to failed cases. - $number = $this->phoneUtil->parse("+14156667777", null); + $number = $this->phoneUtil->parse('+14156667777', null); $expected = array_fill(0, 100, $number); $iterable = $this->phoneUtil->findNumbers($numbers, RegionCode::US, Leniency::VALID(), 10); @@ -867,12 +872,12 @@ public function testMaxMatches() public function testMaxMatchesInvalid() { // Set up text with 10 invalid phone numbers followed by 100 valid. - $numbers = ""; + $numbers = ''; for ($i = 0; $i < 10; $i++) { - $numbers .= "My address is 949-8945-0"; + $numbers .= 'My address is 949-8945-0'; } for ($i = 0; $i < 100; $i++) { - $numbers .= "My info: 415-666-7777,"; + $numbers .= 'My info: 415-666-7777,'; } $iterable = $this->phoneUtil->findNumbers($numbers, RegionCode::US, Leniency::VALID(), 10); @@ -883,13 +888,13 @@ public function testMaxMatchesInvalid() public function testMaxMatchesMixed() { // Set up text with 100 valid numbers inside an invalid number. - $numbers = ""; + $numbers = ''; for ($i = 0; $i < 100; $i++) { - $numbers .= "My info: 415-666-7777 123 fake street"; + $numbers .= 'My info: 415-666-7777 123 fake street'; } // Only matches the first 10 despite there being 100 numbers due to max matches - $number = $this->phoneUtil->parse("+14156667777", null); + $number = $this->phoneUtil->parse('+14156667777', null); $expected = array_fill(0, 10, $number); $iterable = $this->phoneUtil->findNumbers($numbers, RegionCode::US, Leniency::VALID(), 10); @@ -905,7 +910,7 @@ public function testMaxMatchesMixed() public function testNonPlusPrefixedNumbersNotFoundForInvalidRegion() { // Does not start with a "+", we won't match it. - $iterable = $this->phoneUtil->findNumbers("1 456 764 156", RegionCode::ZZ); + $iterable = $this->phoneUtil->findNumbers('1 456 764 156', RegionCode::ZZ); $iterable->next(); $this->assertFalse($iterable->valid()); @@ -913,7 +918,7 @@ public function testNonPlusPrefixedNumbersNotFoundForInvalidRegion() public function testEmptyIteration() { - $iterable = $this->phoneUtil->findNumbers("", RegionCode::ZZ); + $iterable = $this->phoneUtil->findNumbers('', RegionCode::ZZ); $iterable->next(); $this->assertFalse($iterable->valid()); @@ -921,7 +926,7 @@ public function testEmptyIteration() public function testSingleIteration() { - $iterable = $this->phoneUtil->findNumbers("+14156667777", RegionCode::ZZ); + $iterable = $this->phoneUtil->findNumbers('+14156667777', RegionCode::ZZ); $iterable->next(); $this->assertTrue($iterable->valid()); @@ -934,7 +939,7 @@ public function testSingleIteration() public function testDoubleIteration() { - $iterable = $this->phoneUtil->findNumbers("+14156667777 foobar +14156667777 ", RegionCode::ZZ); + $iterable = $this->phoneUtil->findNumbers('+14156667777 foobar +14156667777 ', RegionCode::ZZ); $iterable->next(); $this->assertTrue($iterable->valid()); @@ -1015,33 +1020,33 @@ protected function doTestFindInContext($number, $defaultCountry) protected function findPossibleInContext($number, $defaultCountry) { $contextPairs = array(); - $contextPairs[] = array("", ""); // no content - $contextPairs[] = array(" ", "\t"); // whitespace only - $contextPairs[] = array("Hello ", ""); // no context at end - $contextPairs[] = array("", " to call me!"); // no context at start - $contextPairs[] = array("Hi there, call ", " to reach me!"); // no context at start - $contextPairs[] = array("Hi here, call ", " , or don't"); // with commas + $contextPairs[] = array('', ''); // no content + $contextPairs[] = array(' ', "\t"); // whitespace only + $contextPairs[] = array('Hello ', ''); // no context at end + $contextPairs[] = array('', ' to call me!'); // no context at start + $contextPairs[] = array('Hi there, call ', ' to reach me!'); // no context at start + $contextPairs[] = array('Hi here, call ', " , or don't"); // with commas // Three examples without whitespace around the number - $contextPairs[] = array("Hi call", ""); - $contextPairs[] = array("", "forme"); - $contextPairs[] = array("Hi call", "forme"); + $contextPairs[] = array('Hi call', ''); + $contextPairs[] = array('', 'forme'); + $contextPairs[] = array('Hi call', 'forme'); // With other small numbers. - $contextPairs[] = array("It's cheap! Call ", " before 6:30"); + $contextPairs[] = array("It's cheap! Call ", ' before 6:30'); // With a second number later. - $contextPairs[] = array("Call ", " or +1800-123-4567!"); - $contextPairs[] = array("Call me on June 2 at", ""); // with a Month-Day date + $contextPairs[] = array('Call ', ' or +1800-123-4567!'); + $contextPairs[] = array('Call me on June 2 at', ''); // with a Month-Day date // With publication pages - $contextPairs[] = array("As quoted by Alfonso 12-15 (2009), you may call me at ", ""); - $contextPairs[] = array("As quoted by Alfonso et al. 12-15 (2009), you may call me at ", ""); + $contextPairs[] = array('As quoted by Alfonso 12-15 (2009), you may call me at ', ''); + $contextPairs[] = array('As quoted by Alfonso et al. 12-15 (2009), you may call me at ', ''); // With dates, written in the American style. - $contextPairs[] = array("As I said on 03/10/2011, you may call be at ", ""); + $contextPairs[] = array('As I said on 03/10/2011, you may call be at ', ''); // With trailing numbers after a comma. The 45 should not be considered an extension - $contextPairs[] = array("", ", 45 days a year"); + $contextPairs[] = array('', ', 45 days a year'); // When matching we don't consider semicolon along with legitimate extension symbol to indicate // an extension. The 7246433 should not be considered an extension. - $contextPairs[] = array("", ";x 7246433"); + $contextPairs[] = array('', ';x 7246433'); // With a postfix stripped off as it looks like the start of another number. - $contextPairs[] = array("Call ", "/x12 more"); + $contextPairs[] = array('Call ', '/x12 more'); $this->doTestInContext($number, $defaultCountry, $contextPairs, Leniency::POSSIBLE()); } @@ -1057,15 +1062,15 @@ protected function findValidInContext($number, $defaultCountry) { $contextPairs = array(); // With other small numbers - $contextPairs[] = array("It's only 9.99! Call ", " to buy"); + $contextPairs[] = array("It's only 9.99! Call ", ' to buy'); // with a number Day.Month.Year date. - $contextPairs[] = array("Call me on 21.6.1984 at ", ""); + $contextPairs[] = array('Call me on 21.6.1984 at ', ''); // With a number Month/Day date. - $contextPairs[] = array("Call me on 06/21 at ", ""); + $contextPairs[] = array('Call me on 06/21 at ', ''); // With a number Day.Month date. - $contextPairs[] = array("Call me on 21.6. at ", ""); + $contextPairs[] = array('Call me on 21.6. at ', ''); // With a number Month/Day/Year date. - $contextPairs[] = array("Call me on 06/21/84 at ", ""); + $contextPairs[] = array('Call me on 06/21/84 at ', ''); $this->doTestInContext($number, $defaultCountry, $contextPairs, Leniency::VALID()); } @@ -1100,10 +1105,10 @@ protected function ensureTermination($text, $defaultCountry, Leniency\AbstractLe $textLength = mb_strlen($text); for ($index = 0; $index <= $textLength; $index++) { $sub = mb_substr($text, $index); - $matches = ""; + $matches = ''; // Iterates over all matches. foreach ($this->phoneUtil->findNumbers($sub, $defaultCountry, $leniency, PHP_INT_MAX) as $match) { - $matches .= ", " . $match; + $matches .= ', ' . $match; } } } diff --git a/tests/core/PhoneNumberTest.php b/tests/core/PhoneNumberTest.php index d06bdd49e..0e3a51d0b 100644 --- a/tests/core/PhoneNumberTest.php +++ b/tests/core/PhoneNumberTest.php @@ -37,10 +37,10 @@ public function testEqualWithItalianLeadingZeroSetToDefault() public function testEqualWithCountryCodeSourceSet() { $numberA = new PhoneNumber(); - $numberA->setRawInput("+1 650 253 00 00")->setCountryCode(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN); + $numberA->setRawInput('+1 650 253 00 00')->setCountryCode(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN); $numberB = new PhoneNumber(); - $numberB->setRawInput("+1 650 253 00 00")->setCountryCode(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN); + $numberB->setRawInput('+1 650 253 00 00')->setCountryCode(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN); $this->assertEquals($numberA, $numberB); } @@ -62,13 +62,13 @@ public function testNonEqualWithDifferingRawInput() $numberA = new PhoneNumber(); $numberA->setCountryCode(1) ->setNationalNumber(6502530000) - ->setRawInput("+1 650 253 00 00") + ->setRawInput('+1 650 253 00 00') ->setCountryCodeSource(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN); $numberB = new PhoneNumber(); $numberB->setCountryCode(1) ->setNationalNumber(6502530000) - ->setRawInput("+1-650-253-00-00") + ->setRawInput('+1-650-253-00-00') ->setCountryCodeSource(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN); $this->assertNotEquals($numberA, $numberB); @@ -78,7 +78,7 @@ public function testNonEqualWithDifferingRawInput() public function testNonEqualWithPreferredDomesticCarrierCodeSetToDefault() { $numberA = new PhoneNumber(); - $numberA->setCountryCode(1)->setNationalNumber(6502530000)->setPreferredDomesticCarrierCode(""); + $numberA->setCountryCode(1)->setNationalNumber(6502530000)->setPreferredDomesticCarrierCode(''); $numberB = new PhoneNumber(); $numberB->setCountryCode(1)->setNationalNumber(6502530000); @@ -90,10 +90,10 @@ public function testNonEqualWithPreferredDomesticCarrierCodeSetToDefault() public function testEqualWithPreferredDomesticCarrierCodeSetToDefault() { $numberA = new PhoneNumber(); - $numberA->setCountryCode(1)->setNationalNumber(6502530000)->setPreferredDomesticCarrierCode(""); + $numberA->setCountryCode(1)->setNationalNumber(6502530000)->setPreferredDomesticCarrierCode(''); $numberB = new PhoneNumber(); - $numberB->setCountryCode(1)->setNationalNumber(6502530000)->setPreferredDomesticCarrierCode(""); + $numberB->setCountryCode(1)->setNationalNumber(6502530000)->setPreferredDomesticCarrierCode(''); $this->assertEquals($numberA, $numberB); } diff --git a/tests/core/PhoneNumberUtilTest.php b/tests/core/PhoneNumberUtilTest.php index 613ba4a42..9db278271 100644 --- a/tests/core/PhoneNumberUtilTest.php +++ b/tests/core/PhoneNumberUtilTest.php @@ -19,44 +19,44 @@ class PhoneNumberUtilTest extends TestCase { - const TEST_META_DATA_FILE_PREFIX = "../../tests/core/data/PhoneNumberMetadataForTesting"; - private static $bsNumber = null; - private static $internationalTollFree = null; - private static $sgNumber = null; - private static $usShortByOneNumber = null; - private static $usTollFree = null; - private static $usNumber = null; - private static $usLocalNumber = null; - private static $usLongNumber = null; + const TEST_META_DATA_FILE_PREFIX = '../../tests/core/data/PhoneNumberMetadataForTesting'; + private static $bsNumber; + private static $internationalTollFree; + private static $sgNumber; + private static $usShortByOneNumber; + private static $usTollFree; + private static $usNumber; + private static $usLocalNumber; + private static $usLongNumber; /** * @var PhoneNumber */ - private static $nzNumber = null; - private static $usPremium = null; - private static $usSpoof = null; - private static $usSpoofWithRawInput = null; - private static $uzFixedLine = null; - private static $uzMobile = null; - private static $gbMobile = null; - private static $bsMobile = null; - private static $gbNumber = null; - private static $deShortNumber = null; - private static $itMobile = null; - private static $itNumber = null; - private static $auNumber = null; - private static $arMobile = null; - private static $arNumber = null; - private static $mxMobile1 = null; - private static $mxNumber1 = null; - private static $mxMobile2 = null; - private static $mxNumber2 = null; - private static $deNumber = null; - private static $jpStarNumber = null; - private static $internationalTollFreeTooLong = null; - private static $universalPremiumRate = null; - private static $alphaNumericNumber = null; - private static $aeUAN = null; - private static $unknownCountryCodeNoRawInput = null; + private static $nzNumber; + private static $usPremium; + private static $usSpoof; + private static $usSpoofWithRawInput; + private static $uzFixedLine; + private static $uzMobile; + private static $gbMobile; + private static $bsMobile; + private static $gbNumber; + private static $deShortNumber; + private static $itMobile; + private static $itNumber; + private static $auNumber; + private static $arMobile; + private static $arNumber; + private static $mxMobile1; + private static $mxNumber1; + private static $mxMobile2; + private static $mxNumber2; + private static $deNumber; + private static $jpStarNumber; + private static $internationalTollFreeTooLong; + private static $universalPremiumRate; + private static $alphaNumericNumber; + private static $aeUAN; + private static $unknownCountryCodeNoRawInput; /** * @var PhoneNumberUtil */ @@ -99,7 +99,7 @@ private static function initializePhoneUtilForTesting() self::$usSpoof = new PhoneNumber(); self::$usSpoof->setCountryCode(1)->setNationalNumber(0); self::$usSpoofWithRawInput = new PhoneNumber(); - self::$usSpoofWithRawInput->setCountryCode(1)->setNationalNumber(0)->setRawInput("000-000-0000"); + self::$usSpoofWithRawInput->setCountryCode(1)->setNationalNumber(0)->setRawInput('000-000-0000'); self::$uzFixedLine = new PhoneNumber(); self::$uzFixedLine->setCountryCode(998)->setNationalNumber(612201234); self::$uzMobile = new PhoneNumber(); @@ -184,7 +184,7 @@ public function testGetSupportedCallingCodes() public function testGetInstanceLoadBadMetadata() { - $this->assertNull($this->phoneUtil->getMetadataForRegion("No Such Region")); + $this->assertNull($this->phoneUtil->getMetadataForRegion('No Such Region')); $this->assertNull($this->phoneUtil->getMetadataForRegion(-1)); } @@ -220,13 +220,13 @@ public function testGetSupportedTypesForNonGeoEntity() public function testGetInstanceLoadUSMetadata() { $metadata = $this->phoneUtil->getMetadataForRegion(RegionCode::US); - $this->assertEquals("US", $metadata->getId()); + $this->assertEquals('US', $metadata->getId()); $this->assertEquals(1, $metadata->getCountryCode()); - $this->assertEquals("011", $metadata->getInternationalPrefix()); + $this->assertEquals('011', $metadata->getInternationalPrefix()); $this->assertTrue($metadata->hasNationalPrefix()); $this->assertEquals(2, $metadata->numberFormatSize()); $this->assertEquals("(\\d{3})(\\d{3})(\\d{4})", $metadata->getNumberFormat(1)->getPattern()); - $this->assertEquals("$1 $2 $3", $metadata->getNumberFormat(1)->getFormat()); + $this->assertEquals('$1 $2 $3', $metadata->getNumberFormat(1)->getFormat()); $this->assertEquals("[13-689]\\d{9}|2[0-35-9]\\d{8}", $metadata->getGeneralDesc()->getNationalNumberPattern()); $this->assertEquals("[13-689]\\d{9}|2[0-35-9]\\d{8}", $metadata->getFixedLine()->getNationalNumberPattern()); $this->assertCount(1, $metadata->getGeneralDesc()->getPossibleLength()); @@ -243,15 +243,15 @@ public function testGetInstanceLoadUSMetadata() public function testGetInstanceLoadDEMetadata() { $metadata = $this->phoneUtil->getMetadataForRegion(RegionCode::DE); - $this->assertEquals("DE", $metadata->getId()); + $this->assertEquals('DE', $metadata->getId()); $this->assertEquals(49, $metadata->getCountryCode()); - $this->assertEquals("00", $metadata->getInternationalPrefix()); - $this->assertEquals("0", $metadata->getNationalPrefix()); + $this->assertEquals('00', $metadata->getInternationalPrefix()); + $this->assertEquals('0', $metadata->getNationalPrefix()); $this->assertEquals(6, $metadata->numberFormatSize()); $this->assertEquals(1, $metadata->getNumberFormat(5)->leadingDigitsPatternSize()); - $this->assertEquals("900", $metadata->getNumberFormat(5)->getLeadingDigitsPattern(0)); + $this->assertEquals('900', $metadata->getNumberFormat(5)->getLeadingDigitsPattern(0)); $this->assertEquals("(\\d{3})(\\d{3,4})(\\d{4})", $metadata->getNumberFormat(5)->getPattern()); - $this->assertEquals("$1 $2 $3", $metadata->getNumberFormat(5)->getFormat()); + $this->assertEquals('$1 $2 $3', $metadata->getNumberFormat(5)->getFormat()); $this->assertCount(2, $metadata->getGeneralDesc()->getPossibleLengthLocalOnly()); $this->assertCount(8, $metadata->getGeneralDesc()->getPossibleLength()); // Nothing is present for fixed-line, since it is the same as the general desc, so for @@ -263,7 +263,7 @@ public function testGetInstanceLoadDEMetadata() "(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}", $metadata->getFixedLine()->getNationalNumberPattern() ); - $this->assertEquals("30123456", $metadata->getFixedLine()->getExampleNumber()); + $this->assertEquals('30123456', $metadata->getFixedLine()->getExampleNumber()); $this->assertContains(10, $metadata->getTollFree()->getPossibleLength()); $this->assertEquals("900([135]\\d{6}|9\\d{7})", $metadata->getPremiumRate()->getNationalNumberPattern()); } @@ -271,28 +271,28 @@ public function testGetInstanceLoadDEMetadata() public function testGetInstanceLoadARMetadata() { $metadata = $this->phoneUtil->getMetadataForRegion(RegionCode::AR); - $this->assertEquals("AR", $metadata->getId()); + $this->assertEquals('AR', $metadata->getId()); $this->assertEquals(54, $metadata->getCountryCode()); - $this->assertEquals("00", $metadata->getInternationalPrefix()); - $this->assertEquals("0", $metadata->getNationalPrefix()); - $this->assertEquals("0(?:(11|343|3715)15)?", $metadata->getNationalPrefixForParsing()); - $this->assertEquals("9$1", $metadata->getNationalPrefixTransformRule()); - $this->assertEquals("$2 15 $3-$4", $metadata->getNumberFormat(2)->getFormat()); + $this->assertEquals('00', $metadata->getInternationalPrefix()); + $this->assertEquals('0', $metadata->getNationalPrefix()); + $this->assertEquals('0(?:(11|343|3715)15)?', $metadata->getNationalPrefixForParsing()); + $this->assertEquals('9$1', $metadata->getNationalPrefixTransformRule()); + $this->assertEquals('$2 15 $3-$4', $metadata->getNumberFormat(2)->getFormat()); $this->assertEquals("(9)(\\d{4})(\\d{2})(\\d{4})", $metadata->getNumberFormat(3)->getPattern()); $this->assertEquals("(9)(\\d{4})(\\d{2})(\\d{4})", $metadata->getIntlNumberFormat(3)->getPattern()); - $this->assertEquals("$1 $2 $3 $4", $metadata->getIntlNumberFormat(3)->getFormat()); + $this->assertEquals('$1 $2 $3 $4', $metadata->getIntlNumberFormat(3)->getFormat()); } public function testGetInstanceLoadInternationalTollFreeMetadata() { $metadata = $this->phoneUtil->getMetadataForNonGeographicalRegion(800); - $this->assertEquals("001", $metadata->getId()); + $this->assertEquals('001', $metadata->getId()); $this->assertEquals(800, $metadata->getCountryCode()); - $this->assertEquals("$1 $2", $metadata->getNumberFormat(0)->getFormat()); + $this->assertEquals('$1 $2', $metadata->getNumberFormat(0)->getFormat()); $this->assertEquals("(\\d{4})(\\d{4})", $metadata->getNumberFormat(0)->getPattern()); $this->assertCount(0, $metadata->getGeneralDesc()->getPossibleLengthLocalOnly()); $this->assertCount(1, $metadata->getGeneralDesc()->getPossibleLength()); - $this->assertEquals("12345678", $metadata->getTollFree()->getExampleNumber()); + $this->assertEquals('12345678', $metadata->getTollFree()->getExampleNumber()); } public function testIsNumberGeographical() @@ -397,28 +397,28 @@ public function testGetLengthOfNationalDestinationCode() public function testGetCountryMobileToken() { $this->assertEquals( - "1", + '1', PhoneNumberUtil::getCountryMobileToken($this->phoneUtil->getCountryCodeForRegion(RegionCode::MX)) ); // Country calling code for Sweden, which has no mobile token. $this->assertEquals( - "", + '', PhoneNumberUtil::getCountryMobileToken($this->phoneUtil->getCountryCodeForRegion(RegionCode::SE)) ); } public function testGetNationalSignificantNumber() { - $this->assertEquals("6502530000", $this->phoneUtil->getNationalSignificantNumber(self::$usNumber)); + $this->assertEquals('6502530000', $this->phoneUtil->getNationalSignificantNumber(self::$usNumber)); // An Italian mobile number. - $this->assertEquals("345678901", $this->phoneUtil->getNationalSignificantNumber(self::$itMobile)); + $this->assertEquals('345678901', $this->phoneUtil->getNationalSignificantNumber(self::$itMobile)); // An Italian fixed line number. - $this->assertEquals("0236618300", $this->phoneUtil->getNationalSignificantNumber(self::$itNumber)); + $this->assertEquals('0236618300', $this->phoneUtil->getNationalSignificantNumber(self::$itNumber)); - $this->assertEquals("12345678", $this->phoneUtil->getNationalSignificantNumber(self::$internationalTollFree)); + $this->assertEquals('12345678', $this->phoneUtil->getNationalSignificantNumber(self::$internationalTollFree)); } public function testGetNationalSignificantNumber_ManyLeadingZeros() @@ -469,38 +469,38 @@ public function testGetExampleNumberForNonGeoEntity() public function testGetExampleNumberWithoutRegion() { // In our test metadata we don't cover all types: in our real metadata, we do. - $this->assertNotnull($this->phoneUtil->getExampleNumberForType(PhoneNumberType::FIXED_LINE)); - $this->assertNotnull($this->phoneUtil->getExampleNumberForType(PhoneNumberType::MOBILE)); - $this->assertNotnull($this->phoneUtil->getExampleNumberForType(PhoneNumberType::PREMIUM_RATE)); + $this->assertNotNull($this->phoneUtil->getExampleNumberForType(PhoneNumberType::FIXED_LINE)); + $this->assertNotNull($this->phoneUtil->getExampleNumberForType(PhoneNumberType::MOBILE)); + $this->assertNotNull($this->phoneUtil->getExampleNumberForType(PhoneNumberType::PREMIUM_RATE)); } public function testConvertAlphaCharactersInNumber() { - $input = "1800-ABC-DEF"; + $input = '1800-ABC-DEF'; // Alpha chars are converted to digits; everything else is left untouched. - $expectedOutput = "1800-222-333"; + $expectedOutput = '1800-222-333'; $this->assertEquals($expectedOutput, PhoneNumberUtil::convertAlphaCharactersInNumber($input)); } public function testNormaliseRemovePunctuation() { - $inputNumber = "034-56&+#2" . pack('H*', 'c2ad') . "34"; - $expectedOutput = "03456234"; + $inputNumber = '034-56&+#2' . pack('H*', 'c2ad') . '34'; + $expectedOutput = '03456234'; $this->assertEquals( $expectedOutput, PhoneNumberUtil::normalize($inputNumber), - "Conversion did not correctly remove punctuation" + 'Conversion did not correctly remove punctuation' ); } public function testNormaliseReplaceAlphaCharacters() { - $inputNumber = "034-I-am-HUNGRY"; - $expectedOutput = "034426486479"; + $inputNumber = '034-I-am-HUNGRY'; + $expectedOutput = '034426486479'; $this->assertEquals( $expectedOutput, PhoneNumberUtil::normalize($inputNumber), - "Conversion did not correctly replace alpha characters" + 'Conversion did not correctly replace alpha characters' ); } @@ -508,97 +508,97 @@ public function testNormaliseOtherDigits() { $inputNumber = "\xEF\xBC\x92" . "5\xD9\xA5" /* "２5٥" */ ; - $expectedOutput = "255"; + $expectedOutput = '255'; $this->assertEquals( $expectedOutput, PhoneNumberUtil::normalize($inputNumber), - "Conversion did not correctly replace non-latin digits" + 'Conversion did not correctly replace non-latin digits' ); // Eastern-Arabic digits. $inputNumber = "\xDB\xB5" . "2\xDB\xB0" /* "۵2۰" */ ; - $expectedOutput = "520"; + $expectedOutput = '520'; $this->assertEquals( $expectedOutput, PhoneNumberUtil::normalize($inputNumber), - "Conversion did not correctly replace non-latin digits" + 'Conversion did not correctly replace non-latin digits' ); } public function testNormaliseStripAlphaCharacters() { - $inputNumber = "034-56&+a#234"; - $expectedOutput = "03456234"; + $inputNumber = '034-56&+a#234'; + $expectedOutput = '03456234'; $this->assertEquals( $expectedOutput, PhoneNumberUtil::normalizeDigitsOnly($inputNumber), - "Conversion did not correctly remove alpha character" + 'Conversion did not correctly remove alpha character' ); } public function testNormaliseStripNonDiallableCharacters() { - $inputNumber = "03*4-56&+1a#234"; - $expectedOutput = "03*456+1#234"; + $inputNumber = '03*4-56&+1a#234'; + $expectedOutput = '03*456+1#234'; $this->assertEquals( $expectedOutput, PhoneNumberUtil::normalizeDiallableCharsOnly($inputNumber), - "Conversion did not correctly remove non-diallable characters" + 'Conversion did not correctly remove non-diallable characters' ); } public function testFormatUSNumber() { - $this->assertEquals("650 253 0000", $this->phoneUtil->format(self::$usNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('650 253 0000', $this->phoneUtil->format(self::$usNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+1 650 253 0000", + '+1 650 253 0000', $this->phoneUtil->format(self::$usNumber, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("800 253 0000", $this->phoneUtil->format(self::$usTollFree, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('800 253 0000', $this->phoneUtil->format(self::$usTollFree, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+1 800 253 0000", + '+1 800 253 0000', $this->phoneUtil->format(self::$usTollFree, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("900 253 0000", $this->phoneUtil->format(self::$usPremium, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('900 253 0000', $this->phoneUtil->format(self::$usPremium, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+1 900 253 0000", + '+1 900 253 0000', $this->phoneUtil->format(self::$usPremium, PhoneNumberFormat::INTERNATIONAL) ); $this->assertEquals( - "tel:+1-900-253-0000", + 'tel:+1-900-253-0000', $this->phoneUtil->format(self::$usPremium, PhoneNumberFormat::RFC3966) ); // Numbers with all zeros in the national number part will be formatted by using the raw_input // if that is available no matter which format is specified. $this->assertEquals( - "000-000-0000", + '000-000-0000', $this->phoneUtil->format(self::$usSpoofWithRawInput, PhoneNumberFormat::NATIONAL) ); - $this->assertEquals("0", $this->phoneUtil->format(self::$usSpoof, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('0', $this->phoneUtil->format(self::$usSpoof, PhoneNumberFormat::NATIONAL)); } public function testFormatBSNumber() { - $this->assertEquals("242 365 1234", $this->phoneUtil->format(self::$bsNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('242 365 1234', $this->phoneUtil->format(self::$bsNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+1 242 365 1234", + '+1 242 365 1234', $this->phoneUtil->format(self::$bsNumber, PhoneNumberFormat::INTERNATIONAL) ); } public function testFormatGBNumber() { - $this->assertEquals("(020) 7031 3000", $this->phoneUtil->format(self::$gbNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('(020) 7031 3000', $this->phoneUtil->format(self::$gbNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+44 20 7031 3000", + '+44 20 7031 3000', $this->phoneUtil->format(self::$gbNumber, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("(07912) 345 678", $this->phoneUtil->format(self::$gbMobile, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('(07912) 345 678', $this->phoneUtil->format(self::$gbMobile, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+44 7912 345 678", + '+44 7912 345 678', $this->phoneUtil->format(self::$gbMobile, PhoneNumberFormat::INTERNATIONAL) ); } @@ -607,201 +607,201 @@ public function testFormatDENumber() { $deNumber = new PhoneNumber(); $deNumber->setCountryCode(49)->setNationalNumber(301234); - $this->assertEquals("030/1234", $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); - $this->assertEquals("+49 30/1234", $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); - $this->assertEquals("tel:+49-30-1234", $this->phoneUtil->format($deNumber, PhoneNumberFormat::RFC3966)); + $this->assertEquals('030/1234', $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('+49 30/1234', $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); + $this->assertEquals('tel:+49-30-1234', $this->phoneUtil->format($deNumber, PhoneNumberFormat::RFC3966)); $deNumber->clear(); $deNumber->setCountryCode(49)->setNationalNumber(291123); - $this->assertEquals("0291 123", $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); - $this->assertEquals("+49 291 123", $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); + $this->assertEquals('0291 123', $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('+49 291 123', $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); $deNumber->clear(); $deNumber->setCountryCode(49)->setNationalNumber(29112345678); - $this->assertEquals("0291 12345678", $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); - $this->assertEquals("+49 291 12345678", $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); + $this->assertEquals('0291 12345678', $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('+49 291 12345678', $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); $deNumber->clear(); $deNumber->setCountryCode(49)->setNationalNumber(912312345); - $this->assertEquals("09123 12345", $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); - $this->assertEquals("+49 9123 12345", $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); + $this->assertEquals('09123 12345', $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('+49 9123 12345', $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); $deNumber->clear(); $deNumber->setCountryCode(49)->setNationalNumber(80212345); - $this->assertEquals("08021 2345", $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); - $this->assertEquals("+49 8021 2345", $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); + $this->assertEquals('08021 2345', $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('+49 8021 2345', $this->phoneUtil->format($deNumber, PhoneNumberFormat::INTERNATIONAL)); // Note this number is correctly formatted without national prefix. Most of the numbers that // are treated as invalid numbers by the library are short numbers, and they are usually not // dialed with national prefix. - $this->assertEquals("1234", $this->phoneUtil->format(self::$deShortNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('1234', $this->phoneUtil->format(self::$deShortNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+49 1234", + '+49 1234', $this->phoneUtil->format(self::$deShortNumber, PhoneNumberFormat::INTERNATIONAL) ); $deNumber->clear(); $deNumber->setCountryCode(49)->setNationalNumber(41341234); - $this->assertEquals("04134 1234", $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('04134 1234', $this->phoneUtil->format($deNumber, PhoneNumberFormat::NATIONAL)); } public function testFormatITNumber() { - $this->assertEquals("02 3661 8300", $this->phoneUtil->format(self::$itNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('02 3661 8300', $this->phoneUtil->format(self::$itNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+39 02 3661 8300", + '+39 02 3661 8300', $this->phoneUtil->format(self::$itNumber, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+390236618300", $this->phoneUtil->format(self::$itNumber, PhoneNumberFormat::E164)); + $this->assertEquals('+390236618300', $this->phoneUtil->format(self::$itNumber, PhoneNumberFormat::E164)); - $this->assertEquals("345 678 901", $this->phoneUtil->format(self::$itMobile, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('345 678 901', $this->phoneUtil->format(self::$itMobile, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+39 345 678 901", + '+39 345 678 901', $this->phoneUtil->format(self::$itMobile, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+39345678901", $this->phoneUtil->format(self::$itMobile, PhoneNumberFormat::E164)); + $this->assertEquals('+39345678901', $this->phoneUtil->format(self::$itMobile, PhoneNumberFormat::E164)); } public function testFormatAUNumber() { - $this->assertEquals("02 3661 8300", $this->phoneUtil->format(self::$auNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('02 3661 8300', $this->phoneUtil->format(self::$auNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+61 2 3661 8300", + '+61 2 3661 8300', $this->phoneUtil->format(self::$auNumber, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+61236618300", $this->phoneUtil->format(self::$auNumber, PhoneNumberFormat::E164)); + $this->assertEquals('+61236618300', $this->phoneUtil->format(self::$auNumber, PhoneNumberFormat::E164)); $auNumber = new PhoneNumber(); $auNumber->setCountryCode(61)->setNationalNumber(1800123456); - $this->assertEquals("1800 123 456", $this->phoneUtil->format($auNumber, PhoneNumberFormat::NATIONAL)); - $this->assertEquals("+61 1800 123 456", $this->phoneUtil->format($auNumber, PhoneNumberFormat::INTERNATIONAL)); - $this->assertEquals("+611800123456", $this->phoneUtil->format($auNumber, PhoneNumberFormat::E164)); + $this->assertEquals('1800 123 456', $this->phoneUtil->format($auNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('+61 1800 123 456', $this->phoneUtil->format($auNumber, PhoneNumberFormat::INTERNATIONAL)); + $this->assertEquals('+611800123456', $this->phoneUtil->format($auNumber, PhoneNumberFormat::E164)); } public function testFormatARNumber() { - $this->assertEquals("011 8765-4321", $this->phoneUtil->format(self::$arNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('011 8765-4321', $this->phoneUtil->format(self::$arNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+54 11 8765-4321", + '+54 11 8765-4321', $this->phoneUtil->format(self::$arNumber, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+541187654321", $this->phoneUtil->format(self::$arNumber, PhoneNumberFormat::E164)); + $this->assertEquals('+541187654321', $this->phoneUtil->format(self::$arNumber, PhoneNumberFormat::E164)); - $this->assertEquals("011 15 8765-4321", $this->phoneUtil->format(self::$arMobile, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('011 15 8765-4321', $this->phoneUtil->format(self::$arMobile, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+54 9 11 8765 4321", + '+54 9 11 8765 4321', $this->phoneUtil->format(self::$arMobile, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+5491187654321", $this->phoneUtil->format(self::$arMobile, PhoneNumberFormat::E164)); + $this->assertEquals('+5491187654321', $this->phoneUtil->format(self::$arMobile, PhoneNumberFormat::E164)); } public function testFormatMXNumber() { $this->assertEquals( - "045 234 567 8900", + '045 234 567 8900', $this->phoneUtil->format(self::$mxMobile1, PhoneNumberFormat::NATIONAL) ); $this->assertEquals( - "+52 1 234 567 8900", + '+52 1 234 567 8900', $this->phoneUtil->format(self::$mxMobile1, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+5212345678900", $this->phoneUtil->format(self::$mxMobile1, PhoneNumberFormat::E164)); + $this->assertEquals('+5212345678900', $this->phoneUtil->format(self::$mxMobile1, PhoneNumberFormat::E164)); $this->assertEquals( - "045 55 1234 5678", + '045 55 1234 5678', $this->phoneUtil->format(self::$mxMobile2, PhoneNumberFormat::NATIONAL) ); $this->assertEquals( - "+52 1 55 1234 5678", + '+52 1 55 1234 5678', $this->phoneUtil->format(self::$mxMobile2, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+5215512345678", $this->phoneUtil->format(self::$mxMobile2, PhoneNumberFormat::E164)); + $this->assertEquals('+5215512345678', $this->phoneUtil->format(self::$mxMobile2, PhoneNumberFormat::E164)); - $this->assertEquals("01 33 1234 5678", $this->phoneUtil->format(self::$mxNumber1, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('01 33 1234 5678', $this->phoneUtil->format(self::$mxNumber1, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+52 33 1234 5678", + '+52 33 1234 5678', $this->phoneUtil->format(self::$mxNumber1, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+523312345678", $this->phoneUtil->format(self::$mxNumber1, PhoneNumberFormat::E164)); + $this->assertEquals('+523312345678', $this->phoneUtil->format(self::$mxNumber1, PhoneNumberFormat::E164)); - $this->assertEquals("01 821 123 4567", $this->phoneUtil->format(self::$mxNumber2, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('01 821 123 4567', $this->phoneUtil->format(self::$mxNumber2, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "+52 821 123 4567", + '+52 821 123 4567', $this->phoneUtil->format(self::$mxNumber2, PhoneNumberFormat::INTERNATIONAL) ); - $this->assertEquals("+528211234567", $this->phoneUtil->format(self::$mxNumber2, PhoneNumberFormat::E164)); + $this->assertEquals('+528211234567', $this->phoneUtil->format(self::$mxNumber2, PhoneNumberFormat::E164)); } public function testFormatOutOfCountryCallingNumber() { $this->assertEquals( - "00 1 900 253 0000", + '00 1 900 253 0000', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$usPremium, RegionCode::DE) ); $this->assertEquals( - "1 650 253 0000", + '1 650 253 0000', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$usNumber, RegionCode::BS) ); $this->assertEquals( - "00 1 650 253 0000", + '00 1 650 253 0000', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$usNumber, RegionCode::PL) ); $this->assertEquals( - "011 44 7912 345 678", + '011 44 7912 345 678', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$gbMobile, RegionCode::US) ); $this->assertEquals( - "00 49 1234", + '00 49 1234', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$deShortNumber, RegionCode::GB) ); // Note this number is correctly formatted without national prefix. Most of the numbers that // are treated as invalid numbers by the library are short numbers, and they are usually not // dialed with national prefix. $this->assertEquals( - "1234", + '1234', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$deShortNumber, RegionCode::DE) ); $this->assertEquals( - "011 39 02 3661 8300", + '011 39 02 3661 8300', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$itNumber, RegionCode::US) ); $this->assertEquals( - "02 3661 8300", + '02 3661 8300', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$itNumber, RegionCode::IT) ); $this->assertEquals( - "+39 02 3661 8300", + '+39 02 3661 8300', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$itNumber, RegionCode::SG) ); $this->assertEquals( - "6521 8000", + '6521 8000', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$sgNumber, RegionCode::SG) ); $this->assertEquals( - "011 54 9 11 8765 4321", + '011 54 9 11 8765 4321', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$arMobile, RegionCode::US) ); $this->assertEquals( - "011 800 1234 5678", + '011 800 1234 5678', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$internationalTollFree, RegionCode::US) ); $arNumberWithExtn = new PhoneNumber(); - $arNumberWithExtn->mergeFrom(self::$arMobile)->setExtension("1234"); + $arNumberWithExtn->mergeFrom(self::$arMobile)->setExtension('1234'); $this->assertEquals( - "011 54 9 11 8765 4321 ext. 1234", + '011 54 9 11 8765 4321 ext. 1234', $this->phoneUtil->formatOutOfCountryCallingNumber($arNumberWithExtn, RegionCode::US) ); $this->assertEquals( - "0011 54 9 11 8765 4321 ext. 1234", + '0011 54 9 11 8765 4321 ext. 1234', $this->phoneUtil->formatOutOfCountryCallingNumber($arNumberWithExtn, RegionCode::AU) ); $this->assertEquals( - "011 15 8765-4321 ext. 1234", + '011 15 8765-4321 ext. 1234', $this->phoneUtil->formatOutOfCountryCallingNumber($arNumberWithExtn, RegionCode::AR) ); } @@ -811,12 +811,12 @@ public function testFormatOutOfCountryWithInvalidRegion() // AQ/Antarctica isn't a valid region code for phone number formatting, // so this falls back to intl formatting. $this->assertEquals( - "+1 650 253 0000", + '+1 650 253 0000', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$usNumber, RegionCode::AQ) ); // For region code 001, the out-of-country format always turns into the international format. $this->assertEquals( - "+1 650 253 0000", + '+1 650 253 0000', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$usNumber, RegionCode::UN001) ); } @@ -826,7 +826,7 @@ public function testFormatOutOfCountryWithPreferredIntlPrefix() // This should use 0011, since that is the preferred international prefix (both 0011 and 0012 // are accepted as possible international prefixes in our test metadta.) $this->assertEquals( - "0011 39 02 3661 8300", + '0011 39 02 3661 8300', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$itNumber, RegionCode::AU) ); } @@ -834,38 +834,38 @@ public function testFormatOutOfCountryWithPreferredIntlPrefix() public function testFormatOutOfCountryKeepingAlphaChars() { $alphaNumericNumber = new PhoneNumber(); - $alphaNumericNumber->setCountryCode(1)->setNationalNumber(8007493524)->setRawInput("1800 six-flag"); + $alphaNumericNumber->setCountryCode(1)->setNationalNumber(8007493524)->setRawInput('1800 six-flag'); $this->assertEquals( - "0011 1 800 SIX-FLAG", + '0011 1 800 SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AU) ); - $alphaNumericNumber->setRawInput("1-800-SIX-flag"); + $alphaNumericNumber->setRawInput('1-800-SIX-flag'); $this->assertEquals( - "0011 1 800-SIX-FLAG", + '0011 1 800-SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AU) ); - $alphaNumericNumber->setRawInput("Call us from UK: 00 1 800 SIX-flag"); + $alphaNumericNumber->setRawInput('Call us from UK: 00 1 800 SIX-flag'); $this->assertEquals( - "0011 1 800 SIX-FLAG", + '0011 1 800 SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AU) ); - $alphaNumericNumber->setRawInput("800 SIX-flag"); + $alphaNumericNumber->setRawInput('800 SIX-flag'); $this->assertEquals( - "0011 1 800 SIX-FLAG", + '0011 1 800 SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AU) ); // Formatting from within the NANPA region. $this->assertEquals( - "1 800 SIX-FLAG", + '1 800 SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::US) ); $this->assertEquals( - "1 800 SIX-FLAG", + '1 800 SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::BS) ); @@ -873,29 +873,29 @@ public function testFormatOutOfCountryKeepingAlphaChars() // formatOutOfCountryCallingNumber. $alphaNumericNumber->clearRawInput(); $this->assertEquals( - "00 1 800 749 3524", + '00 1 800 749 3524', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::DE) ); // Testing AU alpha number formatted from Australia. - $alphaNumericNumber->setCountryCode(61)->setNationalNumber(827493524)->setRawInput("+61 82749-FLAG"); + $alphaNumericNumber->setCountryCode(61)->setNationalNumber(827493524)->setRawInput('+61 82749-FLAG'); // This number should have the national prefix fixed. $this->assertEquals( - "082749-FLAG", + '082749-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AU) ); - $alphaNumericNumber->setRawInput("082749-FLAG"); + $alphaNumericNumber->setRawInput('082749-FLAG'); $this->assertEquals( - "082749-FLAG", + '082749-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AU) ); - $alphaNumericNumber->setNationalNumber(18007493524)->setRawInput("1-800-SIX-flag"); + $alphaNumericNumber->setNationalNumber(18007493524)->setRawInput('1-800-SIX-flag'); // This number should not have the national prefix prefixed, in accordance with the override for // this specific formatting rule. $this->assertEquals( - "1-800-SIX-FLAG", + '1-800-SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AU) ); @@ -903,42 +903,42 @@ public function testFormatOutOfCountryKeepingAlphaChars() // Here we check this. $alphaNumericNumber->setNationalNumber(1800749352); $this->assertEquals( - "1800 749 352", + '1800 749 352', $this->phoneUtil->formatOutOfCountryCallingNumber($alphaNumericNumber, RegionCode::AU) ); // Testing a region with multiple international prefixes. $this->assertEquals( - "+61 1-800-SIX-FLAG", + '+61 1-800-SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::SG) ); // Testing the case of calling from a non-supported region. $this->assertEquals( - "+61 1-800-SIX-FLAG", + '+61 1-800-SIX-FLAG', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AQ) ); // Testing the case with an invalid country calling code. - $alphaNumericNumber->setCountryCode(0)->setNationalNumber(18007493524)->setRawInput("1-800-SIX-flag"); + $alphaNumericNumber->setCountryCode(0)->setNationalNumber(18007493524)->setRawInput('1-800-SIX-flag'); // Uses the raw input only. $this->assertEquals( - "1-800-SIX-flag", + '1-800-SIX-flag', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::DE) ); // Testing the case of an invalid alpha number. - $alphaNumericNumber->setCountryCode(1)->setNationalNumber(80749)->setRawInput("180-SIX"); + $alphaNumericNumber->setCountryCode(1)->setNationalNumber(80749)->setRawInput('180-SIX'); // No country-code stripping can be done. $this->assertEquals( - "00 1 180-SIX", + '00 1 180-SIX', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::DE) ); // Testing the case of calling from a non-supported region. - $alphaNumericNumber->setCountryCode(1)->setNationalNumber(80749)->setRawInput("180-SIX"); + $alphaNumericNumber->setCountryCode(1)->setNationalNumber(80749)->setRawInput('180-SIX'); // No country-code stripping can be done since the number is invalid. $this->assertEquals( - "+1 180-SIX", + '+1 180-SIX', $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::AQ) ); } @@ -949,29 +949,29 @@ public function testFormatWithCarrierCode() // certain values. $arMobile = new PhoneNumber(); $arMobile->setCountryCode(54)->setNationalNumber(92234654321); - $this->assertEquals("02234 65-4321", $this->phoneUtil->format($arMobile, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('02234 65-4321', $this->phoneUtil->format($arMobile, PhoneNumberFormat::NATIONAL)); // Here we force 14 as the carrier code. $this->assertEquals( - "02234 14 65-4321", - $this->phoneUtil->formatNationalNumberWithCarrierCode($arMobile, "14") + '02234 14 65-4321', + $this->phoneUtil->formatNationalNumberWithCarrierCode($arMobile, '14') ); // Here we force the number to be shown with no carrier code. $this->assertEquals( - "02234 65-4321", - $this->phoneUtil->formatNationalNumberWithCarrierCode($arMobile, "") + '02234 65-4321', + $this->phoneUtil->formatNationalNumberWithCarrierCode($arMobile, '') ); // Here the international rule is used, so no carrier code should be present. - $this->assertEquals("+5492234654321", $this->phoneUtil->format($arMobile, PhoneNumberFormat::E164)); + $this->assertEquals('+5492234654321', $this->phoneUtil->format($arMobile, PhoneNumberFormat::E164)); // We don't support this for the US so there should be no change. $this->assertEquals( - "650 253 0000", - $this->phoneUtil->formatNationalNumberWithCarrierCode(self::$usNumber, "15") + '650 253 0000', + $this->phoneUtil->formatNationalNumberWithCarrierCode(self::$usNumber, '15') ); // Invalid country code should just get the NSN. $this->assertEquals( - "12345", - $this->phoneUtil->formatNationalNumberWithCarrierCode(self::$unknownCountryCodeNoRawInput, "89") + '12345', + $this->phoneUtil->formatNationalNumberWithCarrierCode(self::$unknownCountryCodeNoRawInput, '89') ); } @@ -982,45 +982,45 @@ public function testFormatWithPreferredCarrierCode() $arNumber->setCountryCode(54)->setNationalNumber(91234125678); // Test formatting with no preferred carrier code stored in the number itself. $this->assertEquals( - "01234 15 12-5678", - $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, "15") + '01234 15 12-5678', + $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, '15') ); $this->assertEquals( - "01234 12-5678", - $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, "") + '01234 12-5678', + $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, '') ); // Test formatting with preferred carrier code present. - $arNumber->setPreferredDomesticCarrierCode("19"); - $this->assertEquals("01234 12-5678", $this->phoneUtil->format($arNumber, PhoneNumberFormat::NATIONAL)); + $arNumber->setPreferredDomesticCarrierCode('19'); + $this->assertEquals('01234 12-5678', $this->phoneUtil->format($arNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "01234 19 12-5678", - $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, "15") + '01234 19 12-5678', + $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, '15') ); $this->assertEquals( - "01234 19 12-5678", - $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, "") + '01234 19 12-5678', + $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, '') ); // When the preferred_domestic_carrier_code is present (even when it is just a space), use it // instead of the default carrier code passed in. - $arNumber->setPreferredDomesticCarrierCode(" "); + $arNumber->setPreferredDomesticCarrierCode(' '); $this->assertEquals( - "01234 12-5678", - $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, "15") + '01234 12-5678', + $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, '15') ); // When the preferred_domestic_carrier_code is present but empty, treat it as unset and use // instead of the default carrier code passed in. - $arNumber->setPreferredDomesticCarrierCode(""); + $arNumber->setPreferredDomesticCarrierCode(''); $this->assertEquals( - "01234 15 12-5678", - $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, "15") + '01234 15 12-5678', + $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($arNumber, '15') ); // We don't support this for the US so there should be no change. $usNumber = new PhoneNumber(); - $usNumber->setCountryCode(1)->setNationalNumber(4241231234)->setPreferredDomesticCarrierCode("99"); - $this->assertEquals("424 123 1234", $this->phoneUtil->format($usNumber, PhoneNumberFormat::NATIONAL)); + $usNumber->setCountryCode(1)->setNationalNumber(4241231234)->setPreferredDomesticCarrierCode('99'); + $this->assertEquals('424 123 1234', $this->phoneUtil->format($usNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals( - "424 123 1234", - $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($usNumber, "15") + '424 123 1234', + $this->phoneUtil->formatNationalNumberWithPreferredCarrierCode($usNumber, '15') ); } @@ -1029,25 +1029,25 @@ public function testFormatNumberForMobileDialing() // Numbers are normally dialed in national format in-country, and international format from // outside the country. $this->assertEquals( - "030123456", + '030123456', $this->phoneUtil->formatNumberForMobileDialing(self::$deNumber, RegionCode::DE, false) ); $this->assertEquals( - "+4930123456", + '+4930123456', $this->phoneUtil->formatNumberForMobileDialing(self::$deNumber, RegionCode::CH, false) ); $this->assertEquals( - "+4930123456", + '+4930123456', $this->phoneUtil->formatNumberForMobileDialing(self::$deNumber, RegionCode::CH, false) ); $deNumberWithExtn = new PhoneNumber(); - $deNumberWithExtn->mergeFrom(self::$deNumber)->setExtension("1234"); + $deNumberWithExtn->mergeFrom(self::$deNumber)->setExtension('1234'); $this->assertEquals( - "030123456", + '030123456', $this->phoneUtil->formatNumberForMobileDialing($deNumberWithExtn, RegionCode::DE, false) ); $this->assertEquals( - "+4930123456", + '+4930123456', $this->phoneUtil->formatNumberForMobileDialing($deNumberWithExtn, RegionCode::CH, false) ); @@ -1055,7 +1055,7 @@ public function testFormatNumberForMobileDialing() // purposes. For such numbers, we expect nothing to be returned when the region code is not the // same one. $this->assertEquals( - "800 253 0000", + '800 253 0000', $this->phoneUtil->formatNumberForMobileDialing( self::$usTollFree, RegionCode::US, @@ -1063,22 +1063,22 @@ public function testFormatNumberForMobileDialing() ) ); $this->assertEquals( - "", + '', $this->phoneUtil->formatNumberForMobileDialing(self::$usTollFree, RegionCode::CN, true) ); $this->assertEquals( - "+1 650 253 0000", + '+1 650 253 0000', $this->phoneUtil->formatNumberForMobileDialing(self::$usNumber, RegionCode::US, true) ); $usNumberWithExtn = new PhoneNumber(); - $usNumberWithExtn->mergeFrom(self::$usNumber)->setExtension("1234"); + $usNumberWithExtn->mergeFrom(self::$usNumber)->setExtension('1234'); $this->assertEquals( - "+1 650 253 0000", + '+1 650 253 0000', $this->phoneUtil->formatNumberForMobileDialing($usNumberWithExtn, RegionCode::US, true) ); $this->assertEquals( - "8002530000", + '8002530000', $this->phoneUtil->formatNumberForMobileDialing( self::$usTollFree, RegionCode::US, @@ -1086,64 +1086,64 @@ public function testFormatNumberForMobileDialing() ) ); $this->assertEquals( - "", + '', $this->phoneUtil->formatNumberForMobileDialing(self::$usTollFree, RegionCode::CN, false) ); $this->assertEquals( - "+16502530000", + '+16502530000', $this->phoneUtil->formatNumberForMobileDialing(self::$usNumber, RegionCode::US, false) ); $this->assertEquals( - "+16502530000", + '+16502530000', $this->phoneUtil->formatNumberForMobileDialing($usNumberWithExtn, RegionCode::US, false) ); // An invalid US number, which is one digit too long. $this->assertEquals( - "+165025300001", + '+165025300001', $this->phoneUtil->formatNumberForMobileDialing(self::$usLongNumber, RegionCode::US, false) ); $this->assertEquals( - "+1 65025300001", + '+1 65025300001', $this->phoneUtil->formatNumberForMobileDialing(self::$usLongNumber, RegionCode::US, true) ); // Star numbers. In real life they appear in Israel, but we have them in JP in our test // metadata. $this->assertEquals( - "*2345", + '*2345', $this->phoneUtil->formatNumberForMobileDialing(self::$jpStarNumber, RegionCode::JP, false) ); $this->assertEquals( - "*2345", + '*2345', $this->phoneUtil->formatNumberForMobileDialing(self::$jpStarNumber, RegionCode::JP, true) ); $this->assertEquals( - "+80012345678", + '+80012345678', $this->phoneUtil->formatNumberForMobileDialing(self::$internationalTollFree, RegionCode::JP, false) ); $this->assertEquals( - "+800 1234 5678", + '+800 1234 5678', $this->phoneUtil->formatNumberForMobileDialing(self::$internationalTollFree, RegionCode::JP, true) ); // UAE numbers beginning with 600 (classified as UAN) need to be dialled without +971 locally. $this->assertEquals( - "+971600123456", + '+971600123456', $this->phoneUtil->formatNumberForMobileDialing(self::$aeUAN, RegionCode::JP, false) ); $this->assertEquals( - "600123456", + '600123456', $this->phoneUtil->formatNumberForMobileDialing(self::$aeUAN, RegionCode::AE, false) ); $this->assertEquals( - "+523312345678", + '+523312345678', $this->phoneUtil->formatNumberForMobileDialing(self::$mxNumber1, RegionCode::MX, false) ); $this->assertEquals( - "+523312345678", + '+523312345678', $this->phoneUtil->formatNumberForMobileDialing(self::$mxNumber1, RegionCode::US, false) ); @@ -1159,11 +1159,11 @@ public function testFormatNumberForMobileDialing() // Non-geographical numbers should always be dialed in international format. $this->assertEquals( - "+80012345678", + '+80012345678', $this->phoneUtil->formatNumberForMobileDialing(self::$internationalTollFree, RegionCode::US, false) ); $this->assertEquals( - "+80012345678", + '+80012345678', $this->phoneUtil->formatNumberForMobileDialing(self::$internationalTollFree, RegionCode::UN001, false) ); @@ -1172,71 +1172,71 @@ public function testFormatNumberForMobileDialing() $deShortNumber = new PhoneNumber(); $deShortNumber->setCountryCode(49)->setNationalNumber(123); $this->assertEquals( - "123", + '123', $this->phoneUtil->formatNumberForMobileDialing($deShortNumber, RegionCode::DE, false) ); - $this->assertEquals("", $this->phoneUtil->formatNumberForMobileDialing($deShortNumber, RegionCode::IT, false)); + $this->assertEquals('', $this->phoneUtil->formatNumberForMobileDialing($deShortNumber, RegionCode::IT, false)); // Test the special logic for Hungary, where the national prefix must be added before dialing // from a mobile phone for regular length numbers, but not for short numbers. $huRegularNumber = new PhoneNumber(); $huRegularNumber->setCountryCode(36)->setNationalNumber(301234567); $this->assertEquals( - "06301234567", + '06301234567', $this->phoneUtil->formatNumberForMobileDialing($huRegularNumber, RegionCode::HU, false) ); $this->assertEquals( - "+36301234567", + '+36301234567', $this->phoneUtil->formatNumberForMobileDialing($huRegularNumber, RegionCode::JP, false) ); $huShortNumber = new PhoneNumber(); $huShortNumber->setCountryCode(36)->setNationalNumber(104); $this->assertEquals( - "104", + '104', $this->phoneUtil->formatNumberForMobileDialing($huShortNumber, RegionCode::HU, false) ); - $this->assertEquals("", $this->phoneUtil->formatNumberForMobileDialing($huShortNumber, RegionCode::JP, false)); + $this->assertEquals('', $this->phoneUtil->formatNumberForMobileDialing($huShortNumber, RegionCode::JP, false)); // Test the special logic for NANPA countries, for which regular length phone numbers are always // output in international format, but short numbers are in national format. $this->assertEquals( - "+16502530000", + '+16502530000', $this->phoneUtil->formatNumberForMobileDialing(self::$usNumber, RegionCode::US, false) ); $this->assertEquals( - "+16502530000", + '+16502530000', $this->phoneUtil->formatNumberForMobileDialing(self::$usNumber, RegionCode::CA, false) ); $this->assertEquals( - "+16502530000", + '+16502530000', $this->phoneUtil->formatNumberForMobileDialing(self::$usNumber, RegionCode::BR, false) ); $usShortNumber = new PhoneNumber(); $usShortNumber->setCountryCode(1)->setNationalNumber(911); $this->assertEquals( - "911", + '911', $this->phoneUtil->formatNumberForMobileDialing($usShortNumber, RegionCode::US, false) ); - $this->assertEquals("", $this->phoneUtil->formatNumberForMobileDialing($usShortNumber, RegionCode::CA, false)); - $this->assertEquals("", $this->phoneUtil->formatNumberForMobileDialing($usShortNumber, RegionCode::BR, false)); + $this->assertEquals('', $this->phoneUtil->formatNumberForMobileDialing($usShortNumber, RegionCode::CA, false)); + $this->assertEquals('', $this->phoneUtil->formatNumberForMobileDialing($usShortNumber, RegionCode::BR, false)); // Test that the Australian emergency number 000 is formatted correctly. $auNumber = new PhoneNumber(); $auNumber->setCountryCode(61)->setNationalNumber(0)->setItalianLeadingZero(true)->setNumberOfLeadingZeros(2); - $this->assertEquals("000", $this->phoneUtil->formatNumberForMobileDialing($auNumber, RegionCode::AU, false)); - $this->assertEquals("", $this->phoneUtil->formatNumberForMobileDialing($auNumber, RegionCode::NZ, false)); + $this->assertEquals('000', $this->phoneUtil->formatNumberForMobileDialing($auNumber, RegionCode::AU, false)); + $this->assertEquals('', $this->phoneUtil->formatNumberForMobileDialing($auNumber, RegionCode::NZ, false)); } public function testFormatByPattern() { $newNumFormat = new NumberFormat(); $newNumFormat->setPattern("(\\d{3})(\\d{3})(\\d{4})"); - $newNumFormat->setFormat("($1) $2-$3"); + $newNumFormat->setFormat('($1) $2-$3'); $newNumberFormats = array(); $newNumberFormats[] = $newNumFormat; $this->assertEquals( - "(650) 253-0000", + '(650) 253-0000', $this->phoneUtil->formatByPattern( self::$usNumber, PhoneNumberFormat::NATIONAL, @@ -1244,7 +1244,7 @@ public function testFormatByPattern() ) ); $this->assertEquals( - "+1 (650) 253-0000", + '+1 (650) 253-0000', $this->phoneUtil->formatByPattern( self::$usNumber, PhoneNumberFormat::INTERNATIONAL, @@ -1252,7 +1252,7 @@ public function testFormatByPattern() ) ); $this->assertEquals( - "tel:+1-650-253-0000", + 'tel:+1-650-253-0000', $this->phoneUtil->formatByPattern( self::$usNumber, PhoneNumberFormat::RFC3966, @@ -1263,9 +1263,9 @@ public function testFormatByPattern() // $NP is set to '1' for the US. Here we check that for other NANPA countries the US rules are // followed. $newNumFormat->setNationalPrefixFormattingRule('$NP ($FG)'); - $newNumFormat->setFormat("$1 $2-$3"); + $newNumFormat->setFormat('$1 $2-$3'); $this->assertEquals( - "1 (242) 365-1234", + '1 (242) 365-1234', $this->phoneUtil->formatByPattern( self::$bsNumber, PhoneNumberFormat::NATIONAL, @@ -1273,7 +1273,7 @@ public function testFormatByPattern() ) ); $this->assertEquals( - "+1 242 365-1234", + '+1 242 365-1234', $this->phoneUtil->formatByPattern( self::$bsNumber, PhoneNumberFormat::INTERNATIONAL, @@ -1282,11 +1282,11 @@ public function testFormatByPattern() ); $newNumFormat->setPattern("(\\d{2})(\\d{5})(\\d{3})"); - $newNumFormat->setFormat("$1-$2 $3"); + $newNumFormat->setFormat('$1-$2 $3'); $newNumberFormats[0] = $newNumFormat; $this->assertEquals( - "02-36618 300", + '02-36618 300', $this->phoneUtil->formatByPattern( self::$itNumber, PhoneNumberFormat::NATIONAL, @@ -1294,7 +1294,7 @@ public function testFormatByPattern() ) ); $this->assertEquals( - "+39 02-36618 300", + '+39 02-36618 300', $this->phoneUtil->formatByPattern( self::$itNumber, PhoneNumberFormat::INTERNATIONAL, @@ -1304,10 +1304,10 @@ public function testFormatByPattern() $newNumFormat->setNationalPrefixFormattingRule('$NP$FG'); $newNumFormat->setPattern("(\\d{2})(\\d{4})(\\d{4})"); - $newNumFormat->setFormat("$1 $2 $3"); + $newNumFormat->setFormat('$1 $2 $3'); $newNumberFormats[0] = $newNumFormat; $this->assertEquals( - "020 7031 3000", + '020 7031 3000', $this->phoneUtil->formatByPattern( self::$gbNumber, PhoneNumberFormat::NATIONAL, @@ -1317,7 +1317,7 @@ public function testFormatByPattern() $newNumFormat->setNationalPrefixFormattingRule('($NP$FG)'); $this->assertEquals( - "(020) 7031 3000", + '(020) 7031 3000', $this->phoneUtil->formatByPattern( self::$gbNumber, PhoneNumberFormat::NATIONAL, @@ -1325,9 +1325,9 @@ public function testFormatByPattern() ) ); - $newNumFormat->setNationalPrefixFormattingRule(""); + $newNumFormat->setNationalPrefixFormattingRule(''); $this->assertEquals( - "20 7031 3000", + '20 7031 3000', $this->phoneUtil->formatByPattern( self::$gbNumber, PhoneNumberFormat::NATIONAL, @@ -1336,7 +1336,7 @@ public function testFormatByPattern() ); $this->assertEquals( - "+44 20 7031 3000", + '+44 20 7031 3000', $this->phoneUtil->formatByPattern( self::$gbNumber, PhoneNumberFormat::INTERNATIONAL, @@ -1347,10 +1347,10 @@ public function testFormatByPattern() public function testFormatE164Number() { - $this->assertEquals("+16502530000", $this->phoneUtil->format(self::$usNumber, PhoneNumberFormat::E164)); - $this->assertEquals("+4930123456", $this->phoneUtil->format(self::$deNumber, PhoneNumberFormat::E164)); + $this->assertEquals('+16502530000', $this->phoneUtil->format(self::$usNumber, PhoneNumberFormat::E164)); + $this->assertEquals('+4930123456', $this->phoneUtil->format(self::$deNumber, PhoneNumberFormat::E164)); $this->assertEquals( - "+80012345678", + '+80012345678', $this->phoneUtil->format(self::$internationalTollFree, PhoneNumberFormat::E164) ); } @@ -1358,136 +1358,136 @@ public function testFormatE164Number() public function testFormatNumberWithExtension() { $nzNumber = new PhoneNumber(); - $nzNumber->mergeFrom(self::$nzNumber)->setExtension("1234"); + $nzNumber->mergeFrom(self::$nzNumber)->setExtension('1234'); // Uses default extension prefix: - $this->assertEquals("03-331 6005 ext. 1234", $this->phoneUtil->format($nzNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('03-331 6005 ext. 1234', $this->phoneUtil->format($nzNumber, PhoneNumberFormat::NATIONAL)); // Uses RFC 3966 syntax. $this->assertEquals( - "tel:+64-3-331-6005;ext=1234", + 'tel:+64-3-331-6005;ext=1234', $this->phoneUtil->format($nzNumber, PhoneNumberFormat::RFC3966) ); // Extension prefix overridden in the territory information for the US: $usNumberWithExtension = new PhoneNumber(); - $usNumberWithExtension->mergeFrom(self::$usNumber)->setExtension("4567"); + $usNumberWithExtension->mergeFrom(self::$usNumber)->setExtension('4567'); $this->assertEquals( - "650 253 0000 extn. 4567", + '650 253 0000 extn. 4567', $this->phoneUtil->format($usNumberWithExtension, PhoneNumberFormat::NATIONAL) ); } public function testFormatInOriginalFormat() { - $number1 = $this->phoneUtil->parseAndKeepRawInput("+442087654321", RegionCode::GB); - $this->assertEquals("+44 20 8765 4321", $this->phoneUtil->formatInOriginalFormat($number1, RegionCode::GB)); + $number1 = $this->phoneUtil->parseAndKeepRawInput('+442087654321', RegionCode::GB); + $this->assertEquals('+44 20 8765 4321', $this->phoneUtil->formatInOriginalFormat($number1, RegionCode::GB)); - $number2 = $this->phoneUtil->parseAndKeepRawInput("02087654321", RegionCode::GB); - $this->assertEquals("(020) 8765 4321", $this->phoneUtil->formatInOriginalFormat($number2, RegionCode::GB)); + $number2 = $this->phoneUtil->parseAndKeepRawInput('02087654321', RegionCode::GB); + $this->assertEquals('(020) 8765 4321', $this->phoneUtil->formatInOriginalFormat($number2, RegionCode::GB)); - $number3 = $this->phoneUtil->parseAndKeepRawInput("011442087654321", RegionCode::US); - $this->assertEquals("011 44 20 8765 4321", $this->phoneUtil->formatInOriginalFormat($number3, RegionCode::US)); + $number3 = $this->phoneUtil->parseAndKeepRawInput('011442087654321', RegionCode::US); + $this->assertEquals('011 44 20 8765 4321', $this->phoneUtil->formatInOriginalFormat($number3, RegionCode::US)); - $number4 = $this->phoneUtil->parseAndKeepRawInput("442087654321", RegionCode::GB); - $this->assertEquals("44 20 8765 4321", $this->phoneUtil->formatInOriginalFormat($number4, RegionCode::GB)); + $number4 = $this->phoneUtil->parseAndKeepRawInput('442087654321', RegionCode::GB); + $this->assertEquals('44 20 8765 4321', $this->phoneUtil->formatInOriginalFormat($number4, RegionCode::GB)); - $number5 = $this->phoneUtil->parse("+442087654321", RegionCode::GB); - $this->assertEquals("(020) 8765 4321", $this->phoneUtil->formatInOriginalFormat($number5, RegionCode::GB)); + $number5 = $this->phoneUtil->parse('+442087654321', RegionCode::GB); + $this->assertEquals('(020) 8765 4321', $this->phoneUtil->formatInOriginalFormat($number5, RegionCode::GB)); // Invalid numbers that we have a formatting pattern for should be formatted properly. Note area // codes starting with 7 are intentionally excluded in the test metadata for testing purposes. - $number6 = $this->phoneUtil->parseAndKeepRawInput("7345678901", RegionCode::US); - $this->assertEquals("734 567 8901", $this->phoneUtil->formatInOriginalFormat($number6, RegionCode::US)); + $number6 = $this->phoneUtil->parseAndKeepRawInput('7345678901', RegionCode::US); + $this->assertEquals('734 567 8901', $this->phoneUtil->formatInOriginalFormat($number6, RegionCode::US)); // US is not a leading zero country, and the presence of the leading zero leads us to format the // number using raw_input. - $number7 = $this->phoneUtil->parseAndKeepRawInput("0734567 8901", RegionCode::US); - $this->assertEquals("0734567 8901", $this->phoneUtil->formatInOriginalFormat($number7, RegionCode::US)); + $number7 = $this->phoneUtil->parseAndKeepRawInput('0734567 8901', RegionCode::US); + $this->assertEquals('0734567 8901', $this->phoneUtil->formatInOriginalFormat($number7, RegionCode::US)); // This number is valid, but we don't have a formatting pattern for it. Fall back to the raw // input. - $number8 = $this->phoneUtil->parseAndKeepRawInput("02-4567-8900", RegionCode::KR); - $this->assertEquals("02-4567-8900", $this->phoneUtil->formatInOriginalFormat($number8, RegionCode::KR)); + $number8 = $this->phoneUtil->parseAndKeepRawInput('02-4567-8900', RegionCode::KR); + $this->assertEquals('02-4567-8900', $this->phoneUtil->formatInOriginalFormat($number8, RegionCode::KR)); - $number9 = $this->phoneUtil->parseAndKeepRawInput("01180012345678", RegionCode::US); - $this->assertEquals("011 800 1234 5678", $this->phoneUtil->formatInOriginalFormat($number9, RegionCode::US)); + $number9 = $this->phoneUtil->parseAndKeepRawInput('01180012345678', RegionCode::US); + $this->assertEquals('011 800 1234 5678', $this->phoneUtil->formatInOriginalFormat($number9, RegionCode::US)); - $number10 = $this->phoneUtil->parseAndKeepRawInput("+80012345678", RegionCode::KR); - $this->assertEquals("+800 1234 5678", $this->phoneUtil->formatInOriginalFormat($number10, RegionCode::KR)); + $number10 = $this->phoneUtil->parseAndKeepRawInput('+80012345678', RegionCode::KR); + $this->assertEquals('+800 1234 5678', $this->phoneUtil->formatInOriginalFormat($number10, RegionCode::KR)); // US local numbers are formatted correctly, as we have formatting patterns for them. - $localNumberUS = $this->phoneUtil->parseAndKeepRawInput("2530000", RegionCode::US); - $this->assertEquals("253 0000", $this->phoneUtil->formatInOriginalFormat($localNumberUS, RegionCode::US)); + $localNumberUS = $this->phoneUtil->parseAndKeepRawInput('2530000', RegionCode::US); + $this->assertEquals('253 0000', $this->phoneUtil->formatInOriginalFormat($localNumberUS, RegionCode::US)); $numberWithNationalPrefixUS = - $this->phoneUtil->parseAndKeepRawInput("18003456789", RegionCode::US); + $this->phoneUtil->parseAndKeepRawInput('18003456789', RegionCode::US); $this->assertEquals( - "1 800 345 6789", + '1 800 345 6789', $this->phoneUtil->formatInOriginalFormat($numberWithNationalPrefixUS, RegionCode::US) ); $numberWithoutNationalPrefixGB = - $this->phoneUtil->parseAndKeepRawInput("2087654321", RegionCode::GB); + $this->phoneUtil->parseAndKeepRawInput('2087654321', RegionCode::GB); $this->assertEquals( - "20 8765 4321", + '20 8765 4321', $this->phoneUtil->formatInOriginalFormat($numberWithoutNationalPrefixGB, RegionCode::GB) ); // Make sure no metadata is modified as a result of the previous function call. - $this->assertEquals("(020) 8765 4321", $this->phoneUtil->formatInOriginalFormat($number5, RegionCode::GB)); + $this->assertEquals('(020) 8765 4321', $this->phoneUtil->formatInOriginalFormat($number5, RegionCode::GB)); $numberWithNationalPrefixMX = - $this->phoneUtil->parseAndKeepRawInput("013312345678", RegionCode::MX); + $this->phoneUtil->parseAndKeepRawInput('013312345678', RegionCode::MX); $this->assertEquals( - "01 33 1234 5678", + '01 33 1234 5678', $this->phoneUtil->formatInOriginalFormat($numberWithNationalPrefixMX, RegionCode::MX) ); $numberWithoutNationalPrefixMX = - $this->phoneUtil->parseAndKeepRawInput("3312345678", RegionCode::MX); + $this->phoneUtil->parseAndKeepRawInput('3312345678', RegionCode::MX); $this->assertEquals( - "33 1234 5678", + '33 1234 5678', $this->phoneUtil->formatInOriginalFormat($numberWithoutNationalPrefixMX, RegionCode::MX) ); $italianFixedLineNumber = - $this->phoneUtil->parseAndKeepRawInput("0212345678", RegionCode::IT); + $this->phoneUtil->parseAndKeepRawInput('0212345678', RegionCode::IT); $this->assertEquals( - "02 1234 5678", + '02 1234 5678', $this->phoneUtil->formatInOriginalFormat($italianFixedLineNumber, RegionCode::IT) ); $numberWithNationalPrefixJP = - $this->phoneUtil->parseAndKeepRawInput("00777012", RegionCode::JP); + $this->phoneUtil->parseAndKeepRawInput('00777012', RegionCode::JP); $this->assertEquals( - "0077-7012", + '0077-7012', $this->phoneUtil->formatInOriginalFormat($numberWithNationalPrefixJP, RegionCode::JP) ); $numberWithoutNationalPrefixJP = - $this->phoneUtil->parseAndKeepRawInput("0777012", RegionCode::JP); + $this->phoneUtil->parseAndKeepRawInput('0777012', RegionCode::JP); $this->assertEquals( - "0777012", + '0777012', $this->phoneUtil->formatInOriginalFormat($numberWithoutNationalPrefixJP, RegionCode::JP) ); $numberWithCarrierCodeBR = - $this->phoneUtil->parseAndKeepRawInput("012 3121286979", RegionCode::BR); + $this->phoneUtil->parseAndKeepRawInput('012 3121286979', RegionCode::BR); $this->assertEquals( - "012 3121286979", + '012 3121286979', $this->phoneUtil->formatInOriginalFormat($numberWithCarrierCodeBR, RegionCode::BR) ); // The default national prefix used in this case is 045. When a number with national prefix 044 // is entered, we return the raw input as we don't want to change the number entered. $numberWithNationalPrefixMX1 = - $this->phoneUtil->parseAndKeepRawInput("044(33)1234-5678", RegionCode::MX); + $this->phoneUtil->parseAndKeepRawInput('044(33)1234-5678', RegionCode::MX); $this->assertEquals( - "044(33)1234-5678", + '044(33)1234-5678', $this->phoneUtil->formatInOriginalFormat($numberWithNationalPrefixMX1, RegionCode::MX) ); $numberWithNationalPrefixMX2 = - $this->phoneUtil->parseAndKeepRawInput("045(33)1234-5678", RegionCode::MX); + $this->phoneUtil->parseAndKeepRawInput('045(33)1234-5678', RegionCode::MX); $this->assertEquals( - "045 33 1234 5678", + '045 33 1234 5678', $this->phoneUtil->formatInOriginalFormat($numberWithNationalPrefixMX2, RegionCode::MX) ); @@ -1495,28 +1495,28 @@ public function testFormatInOriginalFormat() // prefix 0012 is entered, we return the raw input as we don't want to change the number // entered. $outOfCountryNumberFromAU1 = - $this->phoneUtil->parseAndKeepRawInput("0012 16502530000", RegionCode::AU); + $this->phoneUtil->parseAndKeepRawInput('0012 16502530000', RegionCode::AU); $this->assertEquals( - "0012 16502530000", + '0012 16502530000', $this->phoneUtil->formatInOriginalFormat($outOfCountryNumberFromAU1, RegionCode::AU) ); $outOfCountryNumberFromAU2 = - $this->phoneUtil->parseAndKeepRawInput("0011 16502530000", RegionCode::AU); + $this->phoneUtil->parseAndKeepRawInput('0011 16502530000', RegionCode::AU); $this->assertEquals( - "0011 1 650 253 0000", + '0011 1 650 253 0000', $this->phoneUtil->formatInOriginalFormat($outOfCountryNumberFromAU2, RegionCode::AU) ); // Test the star sign is not removed from or added to the original input by this method. - $starNumber = $this->phoneUtil->parseAndKeepRawInput("*1234", RegionCode::JP); - $this->assertEquals("*1234", $this->phoneUtil->formatInOriginalFormat($starNumber, RegionCode::JP)); - $numberWithoutStar = $this->phoneUtil->parseAndKeepRawInput("1234", RegionCode::JP); - $this->assertEquals("1234", $this->phoneUtil->formatInOriginalFormat($numberWithoutStar, RegionCode::JP)); + $starNumber = $this->phoneUtil->parseAndKeepRawInput('*1234', RegionCode::JP); + $this->assertEquals('*1234', $this->phoneUtil->formatInOriginalFormat($starNumber, RegionCode::JP)); + $numberWithoutStar = $this->phoneUtil->parseAndKeepRawInput('1234', RegionCode::JP); + $this->assertEquals('1234', $this->phoneUtil->formatInOriginalFormat($numberWithoutStar, RegionCode::JP)); // Test an invalid national number without raw input is just formatted as the national number. $this->assertEquals( - "650253000", + '650253000', $this->phoneUtil->formatInOriginalFormat(self::$usShortByOneNumber, RegionCode::US) ); } @@ -1782,14 +1782,14 @@ public function testGetCountryCodeForRegion() public function testGetNationalDiallingPrefixForRegion() { - $this->assertEquals("1", $this->phoneUtil->getNddPrefixForRegion(RegionCode::US, false)); + $this->assertEquals('1', $this->phoneUtil->getNddPrefixForRegion(RegionCode::US, false)); // Test non-main country to see it gets the national dialling prefix for the main country with // that country calling code. - $this->assertEquals("1", $this->phoneUtil->getNddPrefixForRegion(RegionCode::BS, false)); - $this->assertEquals("0", $this->phoneUtil->getNddPrefixForRegion(RegionCode::NZ, false)); + $this->assertEquals('1', $this->phoneUtil->getNddPrefixForRegion(RegionCode::BS, false)); + $this->assertEquals('0', $this->phoneUtil->getNddPrefixForRegion(RegionCode::NZ, false)); // Test case with non digit in the national prefix. - $this->assertEquals("0~0", $this->phoneUtil->getNddPrefixForRegion(RegionCode::AO, false)); - $this->assertEquals("00", $this->phoneUtil->getNddPrefixForRegion(RegionCode::AO, true)); + $this->assertEquals('0~0', $this->phoneUtil->getNddPrefixForRegion(RegionCode::AO, false)); + $this->assertEquals('00', $this->phoneUtil->getNddPrefixForRegion(RegionCode::AO, true)); // Test cases with invalid regions. $this->assertNull($this->phoneUtil->getNddPrefixForRegion(null, false)); $this->assertNull($this->phoneUtil->getNddPrefixForRegion(RegionCode::ZZ, false)); @@ -1815,16 +1815,16 @@ public function testIsPossibleNumber() $this->assertTrue($this->phoneUtil->isPossibleNumber(self::$gbNumber)); $this->assertTrue($this->phoneUtil->isPossibleNumber(self::$internationalTollFree)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("+1 650 253 0000", RegionCode::US)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("+1 650 GOO OGLE", RegionCode::US)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("(650) 253-0000", RegionCode::US)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("253-0000", RegionCode::US)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("+1 650 253 0000", RegionCode::GB)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("+44 20 7031 3000", RegionCode::GB)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("(020) 7031 300", RegionCode::GB)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("7031 3000", RegionCode::GB)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("3331 6005", RegionCode::NZ)); - $this->assertTrue($this->phoneUtil->isPossibleNumber("+800 1234 5678", RegionCode::UN001)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('+1 650 253 0000', RegionCode::US)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('+1 650 GOO OGLE', RegionCode::US)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('(650) 253-0000', RegionCode::US)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('253-0000', RegionCode::US)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('+1 650 253 0000', RegionCode::GB)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('+44 20 7031 3000', RegionCode::GB)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('(020) 7031 300', RegionCode::GB)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('7031 3000', RegionCode::GB)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('3331 6005', RegionCode::NZ)); + $this->assertTrue($this->phoneUtil->isPossibleNumber('+800 1234 5678', RegionCode::UN001)); } public function testIsPossibleNumberForType_DifferentTypeLengths() @@ -2144,13 +2144,13 @@ public function testIsNotPossibleNumber() $number->clear(); $number->setCountryCode(44)->setNationalNumber(300); $this->assertFalse($this->phoneUtil->isPossibleNumber($number)); - $this->assertFalse($this->phoneUtil->isPossibleNumber("+1 650 253 00000", RegionCode::US)); - $this->assertFalse($this->phoneUtil->isPossibleNumber("(650) 253-00000", RegionCode::US)); - $this->assertFalse($this->phoneUtil->isPossibleNumber("I want a Pizza", RegionCode::US)); - $this->assertFalse($this->phoneUtil->isPossibleNumber("253-000", RegionCode::US)); - $this->assertFalse($this->phoneUtil->isPossibleNumber("1 3000", RegionCode::GB)); - $this->assertFalse($this->phoneUtil->isPossibleNumber("+44 300", RegionCode::GB)); - $this->assertFalse($this->phoneUtil->isPossibleNumber("+800 1234 5678 9", RegionCode::UN001)); + $this->assertFalse($this->phoneUtil->isPossibleNumber('+1 650 253 00000', RegionCode::US)); + $this->assertFalse($this->phoneUtil->isPossibleNumber('(650) 253-00000', RegionCode::US)); + $this->assertFalse($this->phoneUtil->isPossibleNumber('I want a Pizza', RegionCode::US)); + $this->assertFalse($this->phoneUtil->isPossibleNumber('253-000', RegionCode::US)); + $this->assertFalse($this->phoneUtil->isPossibleNumber('1 3000', RegionCode::GB)); + $this->assertFalse($this->phoneUtil->isPossibleNumber('+44 300', RegionCode::GB)); + $this->assertFalse($this->phoneUtil->isPossibleNumber('+800 1234 5678 9', RegionCode::UN001)); } public function testTruncateTooLongNumber() @@ -2212,111 +2212,111 @@ public function testTruncateTooLongNumber() public function testIsViablePhoneNumber() { - $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber("1")); + $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber('1')); // Only one or two digits before strange non-possible punctuation. - $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber("1+1+1")); - $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber("80+0")); + $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber('1+1+1')); + $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber('80+0')); // Two digits is viable. - $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber("00")); - $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber("111")); + $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber('00')); + $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber('111')); // Alpha numbers. - $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber("0800-4-pizza")); - $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber("0800-4-PIZZA")); + $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber('0800-4-pizza')); + $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber('0800-4-PIZZA')); // We need at least three digits before any alpha characters. - $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber("08-PIZZA")); - $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber("8-PIZZA")); - $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber("12. March")); + $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber('08-PIZZA')); + $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber('8-PIZZA')); + $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber('12. March')); } public function testIsViablePhoneNumberNonAscii() { // Only one or two digits before possible punctuation followed by more digits. - $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber("1" . pack('H*', 'e38080') . "34")); - $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber("1" . pack('H*', 'e38080') . "3+4")); + $this->assertTrue(PhoneNumberUtil::isViablePhoneNumber('1' . pack('H*', 'e38080') . '34')); + $this->assertFalse(PhoneNumberUtil::isViablePhoneNumber('1' . pack('H*', 'e38080') . '3+4')); // Unicode variants of possible starting character and other allowed punctuation/digits. $this->assertTrue( PhoneNumberUtil::isViablePhoneNumber( - pack('H*', 'efbc88') . "1" . pack("H*", 'efbc89') . pack('H*', 'e38080') . "3456789" + pack('H*', 'efbc88') . '1' . pack('H*', 'efbc89') . pack('H*', 'e38080') . '3456789' ) ); // Testing a leading + is okay. $this->assertTrue( - PhoneNumberUtil::isViablePhoneNumber("+1" . pack("H*", 'efbc89') . pack('H*', 'e38080') . "3456789") + PhoneNumberUtil::isViablePhoneNumber('+1' . pack('H*', 'efbc89') . pack('H*', 'e38080') . '3456789') ); } public function testExtractPossibleNumber() { // Removes preceding funky punctuation and letters but leaves the rest untouched. - $this->assertEquals("0800-345-600", PhoneNumberUtil::extractPossibleNumber("Tel:0800-345-600")); - $this->assertEquals("0800 FOR PIZZA", PhoneNumberUtil::extractPossibleNumber("Tel:0800 FOR PIZZA")); + $this->assertEquals('0800-345-600', PhoneNumberUtil::extractPossibleNumber('Tel:0800-345-600')); + $this->assertEquals('0800 FOR PIZZA', PhoneNumberUtil::extractPossibleNumber('Tel:0800 FOR PIZZA')); // Should not remove plus sign - $this->assertEquals("+800-345-600", PhoneNumberUtil::extractPossibleNumber("Tel:+800-345-600")); + $this->assertEquals('+800-345-600', PhoneNumberUtil::extractPossibleNumber('Tel:+800-345-600')); // Should recognise wide digits as possible start values. $this->assertEquals( - pack("H*", 'efbc90') . pack("H*", 'efbc92') . pack("H*", 'efbc93'), - PhoneNumberUtil::extractPossibleNumber(pack("H*", 'efbc90') . pack("H*", 'efbc92') . pack("H*", 'efbc93')) + pack('H*', 'efbc90') . pack('H*', 'efbc92') . pack('H*', 'efbc93'), + PhoneNumberUtil::extractPossibleNumber(pack('H*', 'efbc90') . pack('H*', 'efbc92') . pack('H*', 'efbc93')) ); // Dashes are not possible start values and should be removed. $this->assertEquals( - pack("H*", 'efbc91') . pack("H*", 'efbc92') . pack("H*", 'efbc93'), + pack('H*', 'efbc91') . pack('H*', 'efbc92') . pack('H*', 'efbc93'), PhoneNumberUtil::extractPossibleNumber( - "Num-" . pack("H*", 'efbc91') . pack("H*", 'efbc92') . pack("H*", 'efbc93') + 'Num-' . pack('H*', 'efbc91') . pack('H*', 'efbc92') . pack('H*', 'efbc93') ) ); // If not possible number present, return empty string. - $this->assertEquals("", PhoneNumberUtil::extractPossibleNumber("Num-....")); + $this->assertEquals('', PhoneNumberUtil::extractPossibleNumber('Num-....')); // Leading brackets are stripped - these are not used when parsing. - $this->assertEquals("650) 253-0000", PhoneNumberUtil::extractPossibleNumber("(650) 253-0000")); + $this->assertEquals('650) 253-0000', PhoneNumberUtil::extractPossibleNumber('(650) 253-0000')); // Trailing non-alpha-numeric characters should be removed. - $this->assertEquals("650) 253-0000", PhoneNumberUtil::extractPossibleNumber("(650) 253-0000..- ..")); - $this->assertEquals("650) 253-0000", PhoneNumberUtil::extractPossibleNumber("(650) 253-0000.")); + $this->assertEquals('650) 253-0000', PhoneNumberUtil::extractPossibleNumber('(650) 253-0000..- ..')); + $this->assertEquals('650) 253-0000', PhoneNumberUtil::extractPossibleNumber('(650) 253-0000.')); // This case has a trailing RTL char. $this->assertEquals( - "650) 253-0000", - PhoneNumberUtil::extractPossibleNumber("(650) 253-0000" . pack("H*", 'e2808f')) + '650) 253-0000', + PhoneNumberUtil::extractPossibleNumber('(650) 253-0000' . pack('H*', 'e2808f')) ); } public function testMaybeStripNationalPrefix() { $metadata = new PhoneMetadata(); - $metadata->setNationalPrefixForParsing("34"); + $metadata->setNationalPrefixForParsing('34'); $phoneNumberDesc = new PhoneNumberDesc(); $phoneNumberDesc->setNationalNumberPattern("\\d{4,8}"); $metadata->setGeneralDesc($phoneNumberDesc); - $numberToStrip = "34356778"; - $strippedNumber = "356778"; + $numberToStrip = '34356778'; + $strippedNumber = '356778'; $carrierCode = null; $this->assertTrue( $this->phoneUtil->maybeStripNationalPrefixAndCarrierCode($numberToStrip, $metadata, $carrierCode) ); - $this->assertEquals($strippedNumber, $numberToStrip, "Should have had national prefix stripped."); + $this->assertEquals($strippedNumber, $numberToStrip, 'Should have had national prefix stripped.'); // Retry stripping - now the number should not start with the national prefix, so no more // stripping should occur. $carrierCode = null; $this->assertFalse( $this->phoneUtil->maybeStripNationalPrefixAndCarrierCode($numberToStrip, $metadata, $carrierCode) ); - $this->assertEquals($strippedNumber, $numberToStrip, "Should have had no change - no national prefix present."); + $this->assertEquals($strippedNumber, $numberToStrip, 'Should have had no change - no national prefix present.'); // Some countries have no national prefix. Repeat test with none specified. - $metadata->setNationalPrefixForParsing(""); + $metadata->setNationalPrefixForParsing(''); $carrierCode = null; $this->assertFalse( $this->phoneUtil->maybeStripNationalPrefixAndCarrierCode($numberToStrip, $metadata, $carrierCode) ); - $this->assertEquals($strippedNumber, $numberToStrip, "Should not strip anything with empty national prefix."); + $this->assertEquals($strippedNumber, $numberToStrip, 'Should not strip anything with empty national prefix.'); // If the resultant number doesn't match the national rule, it shouldn't be stripped. - $metadata->setNationalPrefixForParsing("3"); - $numberToStrip = "3123"; - $strippedNumber = "3123"; + $metadata->setNationalPrefixForParsing('3'); + $numberToStrip = '3123'; + $strippedNumber = '3123'; $carrierCode = null; $this->assertFalse( $this->phoneUtil->maybeStripNationalPrefixAndCarrierCode($numberToStrip, $metadata, $carrierCode) @@ -2328,39 +2328,39 @@ public function testMaybeStripNationalPrefix() ); // Test extracting carrier selection code. - $metadata->setNationalPrefixForParsing("0(81)?"); - $numberToStrip = "08122123456"; - $strippedNumber = "22123456"; - $carrierCode = ""; + $metadata->setNationalPrefixForParsing('0(81)?'); + $numberToStrip = '08122123456'; + $strippedNumber = '22123456'; + $carrierCode = ''; $this->assertTrue( $this->phoneUtil->maybeStripNationalPrefixAndCarrierCode($numberToStrip, $metadata, $carrierCode) ); - $this->assertEquals("81", $carrierCode); + $this->assertEquals('81', $carrierCode); $this->assertEquals( $strippedNumber, $numberToStrip, - "Should have had national prefix and carrier code stripped." + 'Should have had national prefix and carrier code stripped.' ); // If there was a transform rule, check it was applied. - $metadata->setNationalPrefixTransformRule("5\${1}5"); + $metadata->setNationalPrefixTransformRule('5${1}5'); // Note that a capturing group is present here. $metadata->setNationalPrefixForParsing("0(\\d{2})"); - $numberToStrip = "031123"; - $transformedNumber = "5315123"; + $numberToStrip = '031123'; + $transformedNumber = '5315123'; $carrierCode = null; $this->assertTrue( $this->phoneUtil->maybeStripNationalPrefixAndCarrierCode($numberToStrip, $metadata, $carrierCode) ); - $this->assertEquals($transformedNumber, $numberToStrip, "Should transform the 031 to a 5315."); + $this->assertEquals($transformedNumber, $numberToStrip, 'Should transform the 031 to a 5315.'); } public function testMaybeStripInternationalPrefix() { - $internationalPrefix = "00[39]"; - $numberToStrip = "0034567700-3898003"; + $internationalPrefix = '00[39]'; + $numberToStrip = '0034567700-3898003'; // Note the dash is removed as part of the normalization. - $strippedNumber = "45677003898003"; + $strippedNumber = '45677003898003'; $this->assertEquals( CountryCodeSource::FROM_NUMBER_WITH_IDD, $this->phoneUtil->maybeStripInternationalPrefixAndNormalize($numberToStrip, $internationalPrefix) @@ -2368,7 +2368,7 @@ public function testMaybeStripInternationalPrefix() $this->assertEquals( $strippedNumber, $numberToStrip, - "The number supplied was not stripped of its international prefix." + 'The number supplied was not stripped of its international prefix.' ); // Now the number no longer starts with an IDD prefix, so it should now report @@ -2378,7 +2378,7 @@ public function testMaybeStripInternationalPrefix() $this->phoneUtil->maybeStripInternationalPrefixAndNormalize($numberToStrip, $internationalPrefix) ); - $numberToStrip = "00945677003898003"; + $numberToStrip = '00945677003898003'; $this->assertEquals( CountryCodeSource::FROM_NUMBER_WITH_IDD, $this->phoneUtil->maybeStripInternationalPrefixAndNormalize($numberToStrip, $internationalPrefix) @@ -2386,11 +2386,11 @@ public function testMaybeStripInternationalPrefix() $this->assertEquals( $strippedNumber, $numberToStrip, - "The number supplied was not stripped of its international prefix." + 'The number supplied was not stripped of its international prefix.' ); // Test it works when the international prefix is broken up by spaces. - $numberToStrip = "00 9 45677003898003"; + $numberToStrip = '00 9 45677003898003'; $this->assertEquals( CountryCodeSource::FROM_NUMBER_WITH_IDD, $this->phoneUtil->maybeStripInternationalPrefixAndNormalize($numberToStrip, $internationalPrefix) @@ -2398,7 +2398,7 @@ public function testMaybeStripInternationalPrefix() $this->assertEquals( $strippedNumber, $numberToStrip, - "The number supplied was not stripped of its international prefix." + 'The number supplied was not stripped of its international prefix.' ); // Now the number no longer starts with an IDD prefix, so it should now report @@ -2409,8 +2409,8 @@ public function testMaybeStripInternationalPrefix() ); // Test the + symbol is also recognised and stripped. - $numberToStrip = "+45677003898003"; - $strippedNumber = "45677003898003"; + $numberToStrip = '+45677003898003'; + $strippedNumber = '45677003898003'; $this->assertEquals( CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN, $this->phoneUtil->maybeStripInternationalPrefixAndNormalize($numberToStrip, $internationalPrefix) @@ -2418,13 +2418,13 @@ public function testMaybeStripInternationalPrefix() $this->assertEquals( $strippedNumber, $numberToStrip, - "The number supplied was not stripped of the plus symbol." + 'The number supplied was not stripped of the plus symbol.' ); // If the number afterwards is a zero, we should not strip this - no country calling code begins // with 0. - $numberToStrip = "0090112-3123"; - $strippedNumber = "00901123123"; + $numberToStrip = '0090112-3123'; + $strippedNumber = '00901123123'; $this->assertEquals( CountryCodeSource::FROM_DEFAULT_COUNTRY, $this->phoneUtil->maybeStripInternationalPrefixAndNormalize($numberToStrip, $internationalPrefix) @@ -2436,7 +2436,7 @@ public function testMaybeStripInternationalPrefix() ); // Here the 0 is separated by a space from the IDD. - $numberToStrip = "009 0-112-3123"; + $numberToStrip = '009 0-112-3123'; $this->assertEquals( CountryCodeSource::FROM_DEFAULT_COUNTRY, $this->phoneUtil->maybeStripInternationalPrefixAndNormalize($numberToStrip, $internationalPrefix) @@ -2449,264 +2449,264 @@ public function testMaybeExtractCountryCode() $metadata = $this->phoneUtil->getMetadataForRegion(RegionCode::US); // Note that for the US, the IDD is 011. try { - $phoneNumber = "011112-3456789"; - $strippedNumber = "123456789"; + $phoneNumber = '011112-3456789'; + $strippedNumber = '123456789'; $countryCallingCode = 1; - $numberToFill = ""; + $numberToFill = ''; $this->assertEquals( $countryCallingCode, $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, true, $number), - "Did not extract country calling code " . $countryCallingCode . " correctly." + 'Did not extract country calling code ' . $countryCallingCode . ' correctly.' ); $this->assertEquals( CountryCodeSource::FROM_NUMBER_WITH_IDD, $number->getCountryCodeSource(), - "Did not figure out CountryCodeSource correctly" + 'Did not figure out CountryCodeSource correctly' ); // Should strip and normalize national significant number. $this->assertEquals( $strippedNumber, $numberToFill, - "Did not strip off the country calling code correctly." + 'Did not strip off the country calling code correctly.' ); } catch (NumberParseException $e) { - $this->fail("Should not have thrown an exception: " . $e->getMessage()); + $this->fail('Should not have thrown an exception: ' . $e->getMessage()); } $number->clear(); try { - $phoneNumber = "+6423456789"; + $phoneNumber = '+6423456789'; $countryCallingCode = 64; - $numberToFill = ""; + $numberToFill = ''; $this->assertEquals( $countryCallingCode, $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, true, $number), - "Did not extract country calling code " . $countryCallingCode . " correctly." + 'Did not extract country calling code ' . $countryCallingCode . ' correctly.' ); $this->assertEquals( CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN, $number->getCountryCodeSource(), - "Did not figure out CountryCodeSource correctly" + 'Did not figure out CountryCodeSource correctly' ); } catch (NumberParseException $e) { - $this->fail("Should not have thrown an exception: " . $e->getMessage()); + $this->fail('Should not have thrown an exception: ' . $e->getMessage()); } $number->clear(); try { - $phoneNumber = "+80012345678"; + $phoneNumber = '+80012345678'; $countryCallingCode = 800; - $numberToFill = ""; + $numberToFill = ''; $this->assertEquals( $countryCallingCode, $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, true, $number), - "Did not extract country calling code " . $countryCallingCode . " correctly." + 'Did not extract country calling code ' . $countryCallingCode . ' correctly.' ); $this->assertEquals( CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN, $number->getCountryCodeSource(), - "Did not figure out CountryCodeSource correctly" + 'Did not figure out CountryCodeSource correctly' ); } catch (NumberParseException $e) { - $this->fail("Should not have thrown an exception: " . $e->getMessage()); + $this->fail('Should not have thrown an exception: ' . $e->getMessage()); } $number->clear(); try { - $phoneNumber = "2345-6789"; - $numberToFill = ""; + $phoneNumber = '2345-6789'; + $numberToFill = ''; $this->assertEquals( 0, $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, true, $number), - "Should not have extracted a country calling code - no international prefix present." + 'Should not have extracted a country calling code - no international prefix present.' ); $this->assertEquals( CountryCodeSource::FROM_DEFAULT_COUNTRY, $number->getCountryCodeSource(), - "Did not figure out CountryCodeSource correctly" + 'Did not figure out CountryCodeSource correctly' ); } catch (NumberParseException $e) { - $this->fail("Should not have thrown an exception: " . $e->getMessage()); + $this->fail('Should not have thrown an exception: ' . $e->getMessage()); } $number->clear(); try { - $phoneNumber = "0119991123456789"; - $numberToFill = ""; + $phoneNumber = '0119991123456789'; + $numberToFill = ''; $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, true, $number); - $this->fail("Should have thrown an exception, no valid country calling code present."); + $this->fail('Should have thrown an exception, no valid country calling code present.'); } catch (NumberParseException $e) { // Expected. $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } $number->clear(); try { - $phoneNumber = "(1 610) 619 4466"; + $phoneNumber = '(1 610) 619 4466'; $countryCallingCode = 1; - $numberToFill = ""; + $numberToFill = ''; $this->assertEquals( $countryCallingCode, $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, true, $number), - "Should have extracted the country calling code of the region passed in" + 'Should have extracted the country calling code of the region passed in' ); $this->assertEquals( CountryCodeSource::FROM_NUMBER_WITHOUT_PLUS_SIGN, $number->getCountryCodeSource(), - "Did not figure out CountryCodeSource correctly" + 'Did not figure out CountryCodeSource correctly' ); } catch (NumberParseException $e) { - $this->fail("Should not have thrown an exception: " . $e->getMessage()); + $this->fail('Should not have thrown an exception: ' . $e->getMessage()); } $number->clear(); try { - $phoneNumber = "(1 610) 619 4466"; + $phoneNumber = '(1 610) 619 4466'; $countryCallingCode = 1; - $numberToFill = ""; + $numberToFill = ''; $this->assertEquals( $countryCallingCode, $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, false, $number), - "Should have extracted the country calling code of the region passed in" + 'Should have extracted the country calling code of the region passed in' ); - $this->assertFalse($number->hasCountryCodeSource(), "Should not contain CountryCodeSource"); + $this->assertFalse($number->hasCountryCodeSource(), 'Should not contain CountryCodeSource'); } catch (NumberParseException $e) { - $this->fail("Should not have thrown an exception: " . $e->getMessage()); + $this->fail('Should not have thrown an exception: ' . $e->getMessage()); } $number->clear(); try { - $phoneNumber = "(1 610) 619 446"; - $numberToFill = ""; + $phoneNumber = '(1 610) 619 446'; + $numberToFill = ''; $this->assertEquals( 0, $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, false, $number), - "Should not have extracted a country calling code - invalid number after extraction of uncertain country calling code." + 'Should not have extracted a country calling code - invalid number after extraction of uncertain country calling code.' ); - $this->assertFalse($number->hasCountryCodeSource(), "Should not contain CountryCodeSource"); + $this->assertFalse($number->hasCountryCodeSource(), 'Should not contain CountryCodeSource'); } catch (NumberParseException $e) { - $this->fail("Should not have thrown an exception: " . $e->getMessage()); + $this->fail('Should not have thrown an exception: ' . $e->getMessage()); } $number->clear(); try { - $phoneNumber = "(1 610) 619"; - $numberToFill = ""; + $phoneNumber = '(1 610) 619'; + $numberToFill = ''; $this->assertEquals( 0, $this->phoneUtil->maybeExtractCountryCode($phoneNumber, $metadata, $numberToFill, true, $number), - "Should not have extracted a country calling code - too short number both before and after extraction of uncertain country calling code." + 'Should not have extracted a country calling code - too short number both before and after extraction of uncertain country calling code.' ); $this->assertEquals( CountryCodeSource::FROM_DEFAULT_COUNTRY, $number->getCountryCodeSource(), - "Did not figure out CountryCodeSource correctly" + 'Did not figure out CountryCodeSource correctly' ); } catch (NumberParseException $e) { - $this->fail("Should not have thrown an exception: " . $e->getMessage()); + $this->fail('Should not have thrown an exception: ' . $e->getMessage()); } } public function testParseNationalNumber() { // National prefix attached. - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("033316005", RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('033316005', RegionCode::NZ)); // Some fields are not filled in by parse, but only by parseAndKeepRawInput $this->assertFalse(self::$nzNumber->hasCountryCodeSource()); $this->assertEquals(CountryCodeSource::UNSPECIFIED, self::$nzNumber->getCountryCodeSource()); - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("33316005", RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('33316005', RegionCode::NZ)); // National prefix attached and some formatting present. - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("03-331 6005", RegionCode::NZ)); - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("03 331 6005", RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('03-331 6005', RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('03 331 6005', RegionCode::NZ)); // Test parsing RFC3966 format with a phone context. $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse("tel:03-331-6005;phone-context=+64", RegionCode::NZ) + $this->phoneUtil->parse('tel:03-331-6005;phone-context=+64', RegionCode::NZ) ); $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse("tel:331-6005;phone-context=+64-3", RegionCode::NZ) + $this->phoneUtil->parse('tel:331-6005;phone-context=+64-3', RegionCode::NZ) ); $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse("tel:331-6005;phone-context=+64-3", RegionCode::US) + $this->phoneUtil->parse('tel:331-6005;phone-context=+64-3', RegionCode::US) ); $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse("My number is tel:03-331-6005;phone-context=+64", RegionCode::NZ) + $this->phoneUtil->parse('My number is tel:03-331-6005;phone-context=+64', RegionCode::NZ) ); // Test parsing RFC3966 format with optional user-defined parameters. The parameters will appear // after the context if present. $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse("tel:03-331-6005;phone-context=+64;a=%A1", RegionCode::NZ) + $this->phoneUtil->parse('tel:03-331-6005;phone-context=+64;a=%A1', RegionCode::NZ) ); // Test parsing RFC3966 with an ISDN subaddress. $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse("tel:03-331-6005;isub=12345;phone-context=+64", RegionCode::NZ) + $this->phoneUtil->parse('tel:03-331-6005;isub=12345;phone-context=+64', RegionCode::NZ) ); - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("tel:+64-3-331-6005;isub=12345", RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('tel:+64-3-331-6005;isub=12345', RegionCode::NZ)); // Test parsing RFC3966 with "tel:" missing - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("03-331-6005;phone-context=+64", RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('03-331-6005;phone-context=+64', RegionCode::NZ)); // Testing international prefixes. // Should strip country calling code. - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("0064 3 331 6005", RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('0064 3 331 6005', RegionCode::NZ)); // Try again, but this time we have an international number with Region Code US. It should // recognise the country calling code and parse accordingly. - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("01164 3 331 6005", RegionCode::US)); - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("+64 3 331 6005", RegionCode::US)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('01164 3 331 6005', RegionCode::US)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('+64 3 331 6005', RegionCode::US)); // We should ignore the leading plus here, since it is not followed by a valid country code but // instead is followed by the IDD for the US. - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("+01164 3 331 6005", RegionCode::US)); - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("+0064 3 331 6005", RegionCode::NZ)); - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("+ 00 64 3 331 6005", RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('+01164 3 331 6005', RegionCode::US)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('+0064 3 331 6005', RegionCode::NZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('+ 00 64 3 331 6005', RegionCode::NZ)); $this->assertEquals( self::$usLocalNumber, - $this->phoneUtil->parse("tel:253-0000;phone-context=www.google.com", RegionCode::US) + $this->phoneUtil->parse('tel:253-0000;phone-context=www.google.com', RegionCode::US) ); $this->assertEquals( self::$usLocalNumber, - $this->phoneUtil->parse("tel:253-0000;isub=12345;phone-context=www.google.com", RegionCode::US) + $this->phoneUtil->parse('tel:253-0000;isub=12345;phone-context=www.google.com', RegionCode::US) ); // This is invalid because no "+" sign is present as part of phone-context. The phone context // is simply ignored in this case just as if it contains a domain. $this->assertEquals( self::$usLocalNumber, - $this->phoneUtil->parse("tel:2530000;isub=12345;phone-context=1-650", RegionCode::US) + $this->phoneUtil->parse('tel:2530000;isub=12345;phone-context=1-650', RegionCode::US) ); $this->assertEquals( self::$usLocalNumber, - $this->phoneUtil->parse("tel:2530000;isub=12345;phone-context=1234.com", RegionCode::US) + $this->phoneUtil->parse('tel:2530000;isub=12345;phone-context=1234.com', RegionCode::US) ); $nzNumber = new PhoneNumber(); $nzNumber->setCountryCode(64)->setNationalNumber(64123456); - $this->assertEquals($nzNumber, $this->phoneUtil->parse("64(0)64123456", RegionCode::NZ)); + $this->assertEquals($nzNumber, $this->phoneUtil->parse('64(0)64123456', RegionCode::NZ)); // Check that using a "/" is fine in a phone number. - $this->assertEquals(self::$deNumber, $this->phoneUtil->parse("301/23456", RegionCode::DE)); + $this->assertEquals(self::$deNumber, $this->phoneUtil->parse('301/23456', RegionCode::DE)); $usNumber = new PhoneNumber(); // Check it doesn't use the '1' as a country calling code when parsing if the phone number was // already possible. $usNumber->setCountryCode(1)->setNationalNumber(1234567890); - $this->assertEquals($usNumber, $this->phoneUtil->parse("123-456-7890", RegionCode::US)); + $this->assertEquals($usNumber, $this->phoneUtil->parse('123-456-7890', RegionCode::US)); // Test star numbers. Although this is not strictly valid, we would like to make sure we can // parse the output we produce when formatting the number. - $this->assertEquals(self::$jpStarNumber, $this->phoneUtil->parse("+81 *2345", RegionCode::JP)); + $this->assertEquals(self::$jpStarNumber, $this->phoneUtil->parse('+81 *2345', RegionCode::JP)); $shortNumber = new PhoneNumber(); $shortNumber->setCountryCode(64)->setNationalNumber(12); - $this->assertEquals($shortNumber, $this->phoneUtil->parse("12", RegionCode::NZ)); + $this->assertEquals($shortNumber, $this->phoneUtil->parse('12', RegionCode::NZ)); // Test for short-code with leading zero for a country which has 0 as national prefix. Ensure // it's not interpreted as national prefix if the remaining number length is local-only in // terms of length. Example: In GB, length 6-7 are only possible local-only. $shortNumber = new PhoneNumber(); $shortNumber->setCountryCode(44)->setNationalNumber(123456)->setItalianLeadingZero(true); - $this->assertEquals($shortNumber, $this->phoneUtil->parse("0123456", RegionCode::GB)); + $this->assertEquals($shortNumber, $this->phoneUtil->parse('0123456', RegionCode::GB)); } public function testParseNumberWithAlphaCharacters() @@ -2714,68 +2714,68 @@ public function testParseNumberWithAlphaCharacters() // Test case with alpha characters. $tollFreeNumber = new PhoneNumber(); $tollFreeNumber->setCountryCode(64)->setNationalNumber(800332005); - $this->assertEquals($tollFreeNumber, $this->phoneUtil->parse("0800 DDA 005", RegionCode::NZ)); + $this->assertEquals($tollFreeNumber, $this->phoneUtil->parse('0800 DDA 005', RegionCode::NZ)); $premiumNumber = new PhoneNumber(); $premiumNumber->setCountryCode(64)->setNationalNumber(9003326005); - $this->assertEquals($premiumNumber, $this->phoneUtil->parse("0900 DDA 6005", RegionCode::NZ)); + $this->assertEquals($premiumNumber, $this->phoneUtil->parse('0900 DDA 6005', RegionCode::NZ)); // Not enough alpha characters for them to be considered intentional, so they are stripped. - $this->assertEquals($premiumNumber, $this->phoneUtil->parse("0900 332 6005a", RegionCode::NZ)); - $this->assertEquals($premiumNumber, $this->phoneUtil->parse("0900 332 600a5", RegionCode::NZ)); - $this->assertEquals($premiumNumber, $this->phoneUtil->parse("0900 332 600A5", RegionCode::NZ)); - $this->assertEquals($premiumNumber, $this->phoneUtil->parse("0900 a332 600A5", RegionCode::NZ)); + $this->assertEquals($premiumNumber, $this->phoneUtil->parse('0900 332 6005a', RegionCode::NZ)); + $this->assertEquals($premiumNumber, $this->phoneUtil->parse('0900 332 600a5', RegionCode::NZ)); + $this->assertEquals($premiumNumber, $this->phoneUtil->parse('0900 332 600A5', RegionCode::NZ)); + $this->assertEquals($premiumNumber, $this->phoneUtil->parse('0900 a332 600A5', RegionCode::NZ)); } public function testParseMaliciousInput() { // Lots of leading + signs before the possible number. - $maliciousNumber = str_repeat("+", 6000); - $maliciousNumber .= "12222-33-244 extensioB 343+"; + $maliciousNumber = str_repeat('+', 6000); + $maliciousNumber .= '12222-33-244 extensioB 343+'; try { $this->phoneUtil->parse($maliciousNumber, RegionCode::US); - $this->fail("This should not parse without throwing an exception " . $maliciousNumber); + $this->fail('This should not parse without throwing an exception ' . $maliciousNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::TOO_LONG, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } - $maliciousNumberWithAlmostExt = str_repeat("200", 350); - $maliciousNumberWithAlmostExt .= " extensiOB 345"; + $maliciousNumberWithAlmostExt = str_repeat('200', 350); + $maliciousNumberWithAlmostExt .= ' extensiOB 345'; try { $this->phoneUtil->parse($maliciousNumberWithAlmostExt, RegionCode::US); - $this->fail("This should not parse without throwing an exception " . $maliciousNumberWithAlmostExt); + $this->fail('This should not parse without throwing an exception ' . $maliciousNumberWithAlmostExt); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::TOO_LONG, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } } public function testParseWithInternationalPrefixes() { - $this->assertEquals(self::$usNumber, $this->phoneUtil->parse("+1 (650) 253-0000", RegionCode::NZ)); - $this->assertEquals(self::$internationalTollFree, $this->phoneUtil->parse("011 800 1234 5678", RegionCode::US)); - $this->assertEquals(self::$usNumber, $this->phoneUtil->parse("1-650-253-0000", RegionCode::US)); + $this->assertEquals(self::$usNumber, $this->phoneUtil->parse('+1 (650) 253-0000', RegionCode::NZ)); + $this->assertEquals(self::$internationalTollFree, $this->phoneUtil->parse('011 800 1234 5678', RegionCode::US)); + $this->assertEquals(self::$usNumber, $this->phoneUtil->parse('1-650-253-0000', RegionCode::US)); // Calling the US number from Singapore by using different service providers // 1st test: calling using SingTel IDD service (IDD is 001) - $this->assertEquals(self::$usNumber, $this->phoneUtil->parse("0011-650-253-0000", RegionCode::SG)); + $this->assertEquals(self::$usNumber, $this->phoneUtil->parse('0011-650-253-0000', RegionCode::SG)); // 2nd test: calling using StarHub IDD service (IDD is 008) - $this->assertEquals(self::$usNumber, $this->phoneUtil->parse("0081-650-253-0000", RegionCode::SG)); + $this->assertEquals(self::$usNumber, $this->phoneUtil->parse('0081-650-253-0000', RegionCode::SG)); // 3rd test: calling using SingTel V019 service (IDD is 019) - $this->assertEquals(self::$usNumber, $this->phoneUtil->parse("0191-650-253-0000", RegionCode::SG)); + $this->assertEquals(self::$usNumber, $this->phoneUtil->parse('0191-650-253-0000', RegionCode::SG)); // Calling the US number from Poland - $this->assertEquals(self::$usNumber, $this->phoneUtil->parse("0~01-650-253-0000", RegionCode::PL)); + $this->assertEquals(self::$usNumber, $this->phoneUtil->parse('0~01-650-253-0000', RegionCode::PL)); // Using "++" at the start. - $this->assertEquals(self::$usNumber, $this->phoneUtil->parse("++1 (650) 253-0000", RegionCode::PL)); + $this->assertEquals(self::$usNumber, $this->phoneUtil->parse('++1 (650) 253-0000', RegionCode::PL)); } public function testParseNonAscii() @@ -2783,27 +2783,27 @@ public function testParseNonAscii() // Using a full-width plus sign. $this->assertEquals( self::$usNumber, - $this->phoneUtil->parse(pack("H*", 'efbc8b') . "1 (650) 253-0000", RegionCode::SG) + $this->phoneUtil->parse(pack('H*', 'efbc8b') . '1 (650) 253-0000', RegionCode::SG) ); // Using a soft hyphen U+00AD. $this->assertEquals( self::$usNumber, - $this->phoneUtil->parse("1 (650) 253" . pack("H*", 'c2ad') . "-0000", RegionCode::US) + $this->phoneUtil->parse('1 (650) 253' . pack('H*', 'c2ad') . '-0000', RegionCode::US) ); // The whole number, including punctuation, is here represented in full-width form. $this->assertEquals( self::$usNumber, $this->phoneUtil->parse( - pack("H*", 'efbc8b') . pack("H*", 'efbc91') . pack("H*", 'e38080') . - pack("H*", 'efbc88') . pack("H*", 'efbc96') . pack("H*", 'efbc95') . pack("H*", 'efbc90') . pack( - "H*", + pack('H*', 'efbc8b') . pack('H*', 'efbc91') . pack('H*', 'e38080') . + pack('H*', 'efbc88') . pack('H*', 'efbc96') . pack('H*', 'efbc95') . pack('H*', 'efbc90') . pack( + 'H*', 'efbc89' ) . - pack("H*", 'e38080') . pack("H*", 'efbc92') . pack("H*", 'efbc95') . pack("H*", 'efbc93') . pack( - "H*", + pack('H*', 'e38080') . pack('H*', 'efbc92') . pack('H*', 'efbc95') . pack('H*', 'efbc93') . pack( + 'H*', 'efbc8d' ) . - pack("H*", 'efbc90') . pack("H*", 'efbc90') . pack("H*", 'efbc90') . pack("H*", 'efbc90'), + pack('H*', 'efbc90') . pack('H*', 'efbc90') . pack('H*', 'efbc90') . pack('H*', 'efbc90'), RegionCode::SG ) ); @@ -2811,16 +2811,16 @@ public function testParseNonAscii() $this->assertEquals( self::$usNumber, $this->phoneUtil->parse( - pack("H*", 'efbc8b') . pack("H*", 'efbc91') . pack("H*", 'e38080') . - pack("H*", 'efbc88') . pack("H*", 'efbc96') . pack("H*", 'efbc95') . pack("H*", 'efbc90') . pack( - "H*", + pack('H*', 'efbc8b') . pack('H*', 'efbc91') . pack('H*', 'e38080') . + pack('H*', 'efbc88') . pack('H*', 'efbc96') . pack('H*', 'efbc95') . pack('H*', 'efbc90') . pack( + 'H*', 'efbc89' ) . - pack("H*", 'e38080') . pack("H*", 'efbc92') . pack("H*", 'efbc95') . pack("H*", 'efbc93') . pack( - "H*", + pack('H*', 'e38080') . pack('H*', 'efbc92') . pack('H*', 'efbc95') . pack('H*', 'efbc93') . pack( + 'H*', 'e383bc' ) . - pack("H*", 'efbc90') . pack("H*", 'efbc90') . pack("H*", 'efbc90') . pack("H*", 'efbc90'), + pack('H*', 'efbc90') . pack('H*', 'efbc90') . pack('H*', 'efbc90') . pack('H*', 'efbc90'), RegionCode::SG ) ); @@ -2828,9 +2828,9 @@ public function testParseNonAscii() $this->assertEquals( self::$usNumber, $this->phoneUtil->parse( - pack('H*', 'e1a091') . " " - . pack('H*', 'e1a096') . pack('H*', 'e1a095') . pack('H*', 'e1a090') . " " - . pack('H*', 'e1a092') . pack('H*', 'e1a095') . pack('H*', 'e1a093') . " " + pack('H*', 'e1a091') . ' ' + . pack('H*', 'e1a096') . pack('H*', 'e1a095') . pack('H*', 'e1a090') . ' ' + . pack('H*', 'e1a092') . pack('H*', 'e1a095') . pack('H*', 'e1a093') . ' ' . pack('H*', 'e1a090') . pack('H*', 'e1a090') . pack('H*', 'e1a090') . pack('H*', 'e1a090'), RegionCode::US ) @@ -2839,10 +2839,10 @@ public function testParseNonAscii() public function testParseWithLeadingZero() { - $this->assertEquals(self::$itNumber, $this->phoneUtil->parse("+39 02-36618 300", RegionCode::NZ)); - $this->assertEquals(self::$itNumber, $this->phoneUtil->parse("02-36618 300", RegionCode::IT)); + $this->assertEquals(self::$itNumber, $this->phoneUtil->parse('+39 02-36618 300', RegionCode::NZ)); + $this->assertEquals(self::$itNumber, $this->phoneUtil->parse('02-36618 300', RegionCode::IT)); - $this->assertEquals(self::$itMobile, $this->phoneUtil->parse("345 678 901", RegionCode::IT)); + $this->assertEquals(self::$itMobile, $this->phoneUtil->parse('345 678 901', RegionCode::IT)); } public function testParseNationalNumberArgentina() @@ -2850,37 +2850,37 @@ public function testParseNationalNumberArgentina() // Test parsing mobile numbers of Argentina. $arNumber = new PhoneNumber(); $arNumber->setCountryCode(54)->setNationalNumber(93435551212); - $this->assertEquals($arNumber, $this->phoneUtil->parse("+54 9 343 555 1212", RegionCode::AR)); - $this->assertEquals($arNumber, $this->phoneUtil->parse("0343 15 555 1212", RegionCode::AR)); + $this->assertEquals($arNumber, $this->phoneUtil->parse('+54 9 343 555 1212', RegionCode::AR)); + $this->assertEquals($arNumber, $this->phoneUtil->parse('0343 15 555 1212', RegionCode::AR)); $arNumber->clear(); $arNumber->setCountryCode(54)->setNationalNumber(93715654320); - $this->assertEquals($arNumber, $this->phoneUtil->parse("+54 9 3715 65 4320", RegionCode::AR)); - $this->assertEquals($arNumber, $this->phoneUtil->parse("03715 15 65 4320", RegionCode::AR)); - $this->assertEquals(self::$arMobile, $this->phoneUtil->parse("911 876 54321", RegionCode::AR)); + $this->assertEquals($arNumber, $this->phoneUtil->parse('+54 9 3715 65 4320', RegionCode::AR)); + $this->assertEquals($arNumber, $this->phoneUtil->parse('03715 15 65 4320', RegionCode::AR)); + $this->assertEquals(self::$arMobile, $this->phoneUtil->parse('911 876 54321', RegionCode::AR)); // Test parsing fixed-line numbers of Argentina. - $this->assertEquals(self::$arNumber, $this->phoneUtil->parse("+54 11 8765 4321", RegionCode::AR)); - $this->assertEquals(self::$arNumber, $this->phoneUtil->parse("011 8765 4321", RegionCode::AR)); + $this->assertEquals(self::$arNumber, $this->phoneUtil->parse('+54 11 8765 4321', RegionCode::AR)); + $this->assertEquals(self::$arNumber, $this->phoneUtil->parse('011 8765 4321', RegionCode::AR)); $arNumber->clear(); $arNumber->setCountryCode(54)->setNationalNumber(3715654321); - $this->assertEquals($arNumber, $this->phoneUtil->parse("+54 3715 65 4321", RegionCode::AR)); - $this->assertEquals($arNumber, $this->phoneUtil->parse("03715 65 4321", RegionCode::AR)); + $this->assertEquals($arNumber, $this->phoneUtil->parse('+54 3715 65 4321', RegionCode::AR)); + $this->assertEquals($arNumber, $this->phoneUtil->parse('03715 65 4321', RegionCode::AR)); $arNumber->clear(); $arNumber->setCountryCode(54)->setNationalNumber(2312340000); - $this->assertEquals($arNumber, $this->phoneUtil->parse("+54 23 1234 0000", RegionCode::AR)); - $this->assertEquals($arNumber, $this->phoneUtil->parse("023 1234 0000", RegionCode::AR)); + $this->assertEquals($arNumber, $this->phoneUtil->parse('+54 23 1234 0000', RegionCode::AR)); + $this->assertEquals($arNumber, $this->phoneUtil->parse('023 1234 0000', RegionCode::AR)); } public function testParseWithXInNumber() { // Test that having an 'x' in the phone number at the start is ok and that it just gets removed. - $this->assertEquals(self::$arNumber, $this->phoneUtil->parse("01187654321", RegionCode::AR)); - $this->assertEquals(self::$arNumber, $this->phoneUtil->parse("(0) 1187654321", RegionCode::AR)); - $this->assertEquals(self::$arNumber, $this->phoneUtil->parse("0 1187654321", RegionCode::AR)); - $this->assertEquals(self::$arNumber, $this->phoneUtil->parse("(0xx) 1187654321", RegionCode::AR)); + $this->assertEquals(self::$arNumber, $this->phoneUtil->parse('01187654321', RegionCode::AR)); + $this->assertEquals(self::$arNumber, $this->phoneUtil->parse('(0) 1187654321', RegionCode::AR)); + $this->assertEquals(self::$arNumber, $this->phoneUtil->parse('0 1187654321', RegionCode::AR)); + $this->assertEquals(self::$arNumber, $this->phoneUtil->parse('(0xx) 1187654321', RegionCode::AR)); $arFromUs = new PhoneNumber(); $arFromUs->setCountryCode(54)->setNationalNumber(81429712); @@ -2888,7 +2888,7 @@ public function testParseWithXInNumber() // 7, so that the number won't be mistakenly treated as an extension, as we allow extensions up // to 7 digits. This assumption is okay for now as all the countries where a carrier selection // code is written in the form of xx have a national significant number of length larger than 7. - $this->assertEquals($arFromUs, $this->phoneUtil->parse("011xx5481429712", RegionCode::US)); + $this->assertEquals($arFromUs, $this->phoneUtil->parse('011xx5481429712', RegionCode::US)); } public function testParseNumbersMexico() @@ -2896,165 +2896,165 @@ public function testParseNumbersMexico() // Test parsing fixed-line numbers of Mexico. $mxNumber = new PhoneNumber(); $mxNumber->setCountryCode(52)->setNationalNumber(4499780001); - $this->assertEquals($mxNumber, $this->phoneUtil->parse("+52 (449)978-0001", RegionCode::MX)); - $this->assertEquals($mxNumber, $this->phoneUtil->parse("01 (449)978-0001", RegionCode::MX)); - $this->assertEquals($mxNumber, $this->phoneUtil->parse("(449)978-0001", RegionCode::MX)); + $this->assertEquals($mxNumber, $this->phoneUtil->parse('+52 (449)978-0001', RegionCode::MX)); + $this->assertEquals($mxNumber, $this->phoneUtil->parse('01 (449)978-0001', RegionCode::MX)); + $this->assertEquals($mxNumber, $this->phoneUtil->parse('(449)978-0001', RegionCode::MX)); // Test parsing mobile numbers of Mexico. $mxNumber->clear(); $mxNumber->setCountryCode(52)->setNationalNumber(13312345678); - $this->assertEquals($mxNumber, $this->phoneUtil->parse("+52 1 33 1234-5678", RegionCode::MX)); - $this->assertEquals($mxNumber, $this->phoneUtil->parse("044 (33) 1234-5678", RegionCode::MX)); - $this->assertEquals($mxNumber, $this->phoneUtil->parse("045 33 1234-5678", RegionCode::MX)); + $this->assertEquals($mxNumber, $this->phoneUtil->parse('+52 1 33 1234-5678', RegionCode::MX)); + $this->assertEquals($mxNumber, $this->phoneUtil->parse('044 (33) 1234-5678', RegionCode::MX)); + $this->assertEquals($mxNumber, $this->phoneUtil->parse('045 33 1234-5678', RegionCode::MX)); } public function testFailedParseOnInvalidNumbers() { try { - $sentencePhoneNumber = "This is not a phone number"; + $sentencePhoneNumber = 'This is not a phone number'; $this->phoneUtil->parse($sentencePhoneNumber, RegionCode::NZ); - $this->fail("This should not parse without throwing an exception " . $sentencePhoneNumber); + $this->fail('This should not parse without throwing an exception ' . $sentencePhoneNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $sentencePhoneNumber = "1 Still not a number"; + $sentencePhoneNumber = '1 Still not a number'; $this->phoneUtil->parse($sentencePhoneNumber, RegionCode::NZ); - $this->fail("This should not parse without throwing an exception " . $sentencePhoneNumber); + $this->fail('This should not parse without throwing an exception ' . $sentencePhoneNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $sentencePhoneNumber = "1 MICROSOFT"; + $sentencePhoneNumber = '1 MICROSOFT'; $this->phoneUtil->parse($sentencePhoneNumber, RegionCode::NZ); - $this->fail("This should not parse without throwing an exception " . $sentencePhoneNumber); + $this->fail('This should not parse without throwing an exception ' . $sentencePhoneNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $sentencePhoneNumber = "12 MICROSOFT"; + $sentencePhoneNumber = '12 MICROSOFT'; $this->phoneUtil->parse($sentencePhoneNumber, RegionCode::NZ); - $this->fail("This should not parse without throwing an exception " . $sentencePhoneNumber); + $this->fail('This should not parse without throwing an exception ' . $sentencePhoneNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $tooLongPhoneNumber = "01495 72553301873 810104"; + $tooLongPhoneNumber = '01495 72553301873 810104'; $this->phoneUtil->parse($tooLongPhoneNumber, RegionCode::GB); - $this->fail("This should not parse without throwing an exception " . $tooLongPhoneNumber); + $this->fail('This should not parse without throwing an exception ' . $tooLongPhoneNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::TOO_LONG, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $plusMinusPhoneNumber = "+---"; + $plusMinusPhoneNumber = '+---'; $this->phoneUtil->parse($plusMinusPhoneNumber, RegionCode::DE); - $this->fail("This should not parse without throwing an exception " . $plusMinusPhoneNumber); + $this->fail('This should not parse without throwing an exception ' . $plusMinusPhoneNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $plusStar = "+***"; + $plusStar = '+***'; $this->phoneUtil->parse($plusStar, RegionCode::DE); - $this->fail("This should not parse without throwing an exception " . $plusStar); + $this->fail('This should not parse without throwing an exception ' . $plusStar); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $plusStarPhoneNumber = "+*******91"; + $plusStarPhoneNumber = '+*******91'; $this->phoneUtil->parse($plusStarPhoneNumber, RegionCode::DE); - $this->fail("This should not parse without throwing an exception " . $plusStarPhoneNumber); + $this->fail('This should not parse without throwing an exception ' . $plusStarPhoneNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $tooShortPhoneNumber = "+49 0"; + $tooShortPhoneNumber = '+49 0'; $this->phoneUtil->parse($tooShortPhoneNumber, RegionCode::DE); - $this->fail("This should not parse without throwing an exception " . $tooShortPhoneNumber); + $this->fail('This should not parse without throwing an exception ' . $tooShortPhoneNumber); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::TOO_SHORT_NSN, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $invalidCountryCode = "+210 3456 56789"; + $invalidCountryCode = '+210 3456 56789'; $this->phoneUtil->parse($invalidCountryCode, RegionCode::NZ); - $this->fail("This is not a recognised region code: should fail: " . $invalidCountryCode); + $this->fail('This is not a recognised region code: should fail: ' . $invalidCountryCode); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $plusAndIddAndInvalidCountryCode = "+ 00 210 3 331 6005"; + $plusAndIddAndInvalidCountryCode = '+ 00 210 3 331 6005'; $this->phoneUtil->parse($plusAndIddAndInvalidCountryCode, RegionCode::NZ); - $this->fail("This should not parse without throwing an exception " . $plusAndIddAndInvalidCountryCode); + $this->fail('This should not parse without throwing an exception ' . $plusAndIddAndInvalidCountryCode); } catch (NumberParseException $e) { // Expected this exception. 00 is a correct IDD, but 210 is not a valid country code. $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $someNumber = "123 456 7890"; + $someNumber = '123 456 7890'; $this->phoneUtil->parse($someNumber, RegionCode::ZZ); $this->fail("'Unknown' region code not allowed: should fail."); } catch (NumberParseException $e) { @@ -3062,99 +3062,99 @@ public function testFailedParseOnInvalidNumbers() $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $someNumber = "123 456 7890"; + $someNumber = '123 456 7890'; $this->phoneUtil->parse($someNumber, RegionCode::CS); - $this->fail("Deprecated region code not allowed: should fail."); + $this->fail('Deprecated region code not allowed: should fail.'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $someNumber = "123 456 7890"; + $someNumber = '123 456 7890'; $this->phoneUtil->parse($someNumber, null); - $this->fail("Null region code not allowed: should fail."); + $this->fail('Null region code not allowed: should fail.'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $someNumber = "0044------"; + $someNumber = '0044------'; $this->phoneUtil->parse($someNumber, RegionCode::GB); - $this->fail("No number provided, only region code: should fail"); + $this->fail('No number provided, only region code: should fail'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::TOO_SHORT_AFTER_IDD, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $someNumber = "0044"; + $someNumber = '0044'; $this->phoneUtil->parse($someNumber, RegionCode::GB); - $this->fail("No number provided, only region code: should fail"); + $this->fail('No number provided, only region code: should fail'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::TOO_SHORT_AFTER_IDD, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $someNumber = "011"; + $someNumber = '011'; $this->phoneUtil->parse($someNumber, RegionCode::US); - $this->fail("Only IDD provided - should fail."); + $this->fail('Only IDD provided - should fail.'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::TOO_SHORT_AFTER_IDD, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $someNumber = "0119"; + $someNumber = '0119'; $this->phoneUtil->parse($someNumber, RegionCode::US); - $this->fail("Only IDD provided and then 9 - should fail."); + $this->fail('Only IDD provided and then 9 - should fail.'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::TOO_SHORT_AFTER_IDD, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $emptyNumber = ""; + $emptyNumber = ''; // Invalid region. $this->phoneUtil->parse($emptyNumber, RegionCode::ZZ); - $this->fail("Empty string - should fail."); + $this->fail('Empty string - should fail.'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } @@ -3162,31 +3162,31 @@ public function testFailedParseOnInvalidNumbers() $nullNumber = null; // Invalid region. $this->phoneUtil->parse($nullNumber, RegionCode::ZZ); - $this->fail("Null string - should fail."); + $this->fail('Null string - should fail.'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { $nullNumber = null; $this->phoneUtil->parse($nullNumber, RegionCode::US); - $this->fail("Null string - should fail."); + $this->fail('Null string - should fail.'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { - $domainRfcPhoneContext = "tel:555-1234;phone-context=www.google.com"; + $domainRfcPhoneContext = 'tel:555-1234;phone-context=www.google.com'; $this->phoneUtil->parse($domainRfcPhoneContext, RegionCode::ZZ); $this->fail("'Unknown' region code not allowed: should fail."); } catch (NumberParseException $e) { @@ -3194,14 +3194,14 @@ public function testFailedParseOnInvalidNumbers() $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } try { // This is invalid because no "+" sign is present as part of phone-context. This should not // succeed in being parsed. - $invalidRfcPhoneContext = "tel:555-1234;phone-context=1-331"; + $invalidRfcPhoneContext = 'tel:555-1234;phone-context=1-331'; $this->phoneUtil->parse($invalidRfcPhoneContext, RegionCode::ZZ); $this->fail("'Unknown' region code not allowed: should fail."); } catch (NumberParseException $e) { @@ -3209,7 +3209,7 @@ public function testFailedParseOnInvalidNumbers() $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } @@ -3223,7 +3223,7 @@ public function testFailedParseOnInvalidNumbers() $this->assertEquals( NumberParseException::NOT_A_NUMBER, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } } @@ -3232,40 +3232,40 @@ public function testParseNumbersWithPlusWithNoRegion() { // RegionCode.ZZ is allowed only if the number starts with a '+' - then the country calling code // can be calculated. - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("+64 3 331 6005", RegionCode::ZZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('+64 3 331 6005', RegionCode::ZZ)); // Test with full-width plus. - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("＋64 3 331 6005", RegionCode::ZZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('＋64 3 331 6005', RegionCode::ZZ)); // Test with normal plus but leading characters that need to be stripped. - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("Tel: +64 3 331 6005", RegionCode::ZZ)); - $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse("+64 3 331 6005", null)); - $this->assertEquals(self::$internationalTollFree, $this->phoneUtil->parse("+800 1234 5678", null)); - $this->assertEquals(self::$universalPremiumRate, $this->phoneUtil->parse("+979 123 456 789", null)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('Tel: +64 3 331 6005', RegionCode::ZZ)); + $this->assertEquals(self::$nzNumber, $this->phoneUtil->parse('+64 3 331 6005', null)); + $this->assertEquals(self::$internationalTollFree, $this->phoneUtil->parse('+800 1234 5678', null)); + $this->assertEquals(self::$universalPremiumRate, $this->phoneUtil->parse('+979 123 456 789', null)); // Test parsing RFC3966 format with a phone context. $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse("tel:03-331-6005;phone-context=+64", RegionCode::ZZ) + $this->phoneUtil->parse('tel:03-331-6005;phone-context=+64', RegionCode::ZZ) ); $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse(" tel:03-331-6005;phone-context=+64", RegionCode::ZZ) + $this->phoneUtil->parse(' tel:03-331-6005;phone-context=+64', RegionCode::ZZ) ); $this->assertEquals( self::$nzNumber, - $this->phoneUtil->parse("tel:03-331-6005;isub=12345;phone-context=+64", RegionCode::ZZ) + $this->phoneUtil->parse('tel:03-331-6005;isub=12345;phone-context=+64', RegionCode::ZZ) ); $nzNumberWithRawInput = new PhoneNumber(); $nzNumberWithRawInput->mergeFrom(self::$nzNumber); - $nzNumberWithRawInput->setRawInput("+64 3 331 6005"); + $nzNumberWithRawInput->setRawInput('+64 3 331 6005'); $nzNumberWithRawInput->setCountryCodeSource(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN); $this->assertEquals( $nzNumberWithRawInput, - $this->phoneUtil->parseAndKeepRawInput("+64 3 331 6005", RegionCode::ZZ) + $this->phoneUtil->parseAndKeepRawInput('+64 3 331 6005', RegionCode::ZZ) ); // Null is also allowed for the region code in these cases. - $this->assertEquals($nzNumberWithRawInput, $this->phoneUtil->parseAndKeepRawInput("+64 3 331 6005", null)); + $this->assertEquals($nzNumberWithRawInput, $this->phoneUtil->parseAndKeepRawInput('+64 3 331 6005', null)); } public function testParseNumberTooShortIfNationalPrefixStripped() @@ -3275,84 +3275,84 @@ public function testParseNumberTooShortIfNationalPrefixStripped() // length) phone number for that region. $byNumber = new PhoneNumber(); $byNumber->setCountryCode(375)->setNationalNumber(8123); - $this->assertEquals($byNumber, $this->phoneUtil->parse("8123", RegionCode::BY)); + $this->assertEquals($byNumber, $this->phoneUtil->parse('8123', RegionCode::BY)); $byNumber->setNationalNumber(81234); - $this->assertEquals($byNumber, $this->phoneUtil->parse("81234", RegionCode::BY)); + $this->assertEquals($byNumber, $this->phoneUtil->parse('81234', RegionCode::BY)); // The prefix doesn't get stripped, since the input is a viable 6-digit number, whereas the // result of stripping is only 5 digits. $byNumber->setNationalNumber(812345); - $this->assertEquals($byNumber, $this->phoneUtil->parse("812345", RegionCode::BY)); + $this->assertEquals($byNumber, $this->phoneUtil->parse('812345', RegionCode::BY)); // The prefix gets stripped, since only 6-digit numbers are possible. $byNumber->setNationalNumber(123456); - $this->assertEquals($byNumber, $this->phoneUtil->parse("8123456", RegionCode::BY)); + $this->assertEquals($byNumber, $this->phoneUtil->parse('8123456', RegionCode::BY)); } public function testParseExtensions() { $nzNumber = new PhoneNumber(); - $nzNumber->setCountryCode(64)->setNationalNumber(33316005)->setExtension("3456"); - $this->assertEquals($nzNumber, $this->phoneUtil->parse("03 331 6005 ext 3456", RegionCode::NZ)); - $this->assertEquals($nzNumber, $this->phoneUtil->parse("03-3316005x3456", RegionCode::NZ)); - $this->assertEquals($nzNumber, $this->phoneUtil->parse("03-3316005 int.3456", RegionCode::NZ)); - $this->assertEquals($nzNumber, $this->phoneUtil->parse("03 3316005 #3456", RegionCode::NZ)); + $nzNumber->setCountryCode(64)->setNationalNumber(33316005)->setExtension('3456'); + $this->assertEquals($nzNumber, $this->phoneUtil->parse('03 331 6005 ext 3456', RegionCode::NZ)); + $this->assertEquals($nzNumber, $this->phoneUtil->parse('03-3316005x3456', RegionCode::NZ)); + $this->assertEquals($nzNumber, $this->phoneUtil->parse('03-3316005 int.3456', RegionCode::NZ)); + $this->assertEquals($nzNumber, $this->phoneUtil->parse('03 3316005 #3456', RegionCode::NZ)); // Test the following do not extract extensions: - $this->assertEquals(self::$alphaNumericNumber, $this->phoneUtil->parse("1800 six-flags", RegionCode::US)); - $this->assertEquals(self::$alphaNumericNumber, $this->phoneUtil->parse("1800 SIX FLAGS", RegionCode::US)); - $this->assertEquals(self::$alphaNumericNumber, $this->phoneUtil->parse("0~0 1800 7493 5247", RegionCode::PL)); - $this->assertEquals(self::$alphaNumericNumber, $this->phoneUtil->parse("(1800) 7493.5247", RegionCode::US)); + $this->assertEquals(self::$alphaNumericNumber, $this->phoneUtil->parse('1800 six-flags', RegionCode::US)); + $this->assertEquals(self::$alphaNumericNumber, $this->phoneUtil->parse('1800 SIX FLAGS', RegionCode::US)); + $this->assertEquals(self::$alphaNumericNumber, $this->phoneUtil->parse('0~0 1800 7493 5247', RegionCode::PL)); + $this->assertEquals(self::$alphaNumericNumber, $this->phoneUtil->parse('(1800) 7493.5247', RegionCode::US)); // Check that the last instance of an extension token is matched. $extnNumber = new PhoneNumber(); - $extnNumber->mergeFrom(self::$alphaNumericNumber)->setExtension("1234"); - $this->assertEquals($extnNumber, $this->phoneUtil->parse("0~0 1800 7493 5247 ~1234", RegionCode::PL)); + $extnNumber->mergeFrom(self::$alphaNumericNumber)->setExtension('1234'); + $this->assertEquals($extnNumber, $this->phoneUtil->parse('0~0 1800 7493 5247 ~1234', RegionCode::PL)); // Verifying bug-fix where the last digit of a number was previously omitted if it was a 0 when // extracting the extension. Also verifying a few different cases of extensions. $ukNumber = new PhoneNumber(); - $ukNumber->setCountryCode(44)->setNationalNumber(2034567890)->setExtension("456"); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44 2034567890x456", RegionCode::NZ)); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44 2034567890x456", RegionCode::GB)); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44 2034567890 x456", RegionCode::GB)); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44 2034567890 X456", RegionCode::GB)); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44 2034567890 X 456", RegionCode::GB)); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44 2034567890 X 456", RegionCode::GB)); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44 2034567890 x 456 ", RegionCode::GB)); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44 2034567890 X 456", RegionCode::GB)); - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+44-2034567890;ext=456", RegionCode::GB)); + $ukNumber->setCountryCode(44)->setNationalNumber(2034567890)->setExtension('456'); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44 2034567890x456', RegionCode::NZ)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44 2034567890x456', RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44 2034567890 x456', RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44 2034567890 X456', RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44 2034567890 X 456', RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44 2034567890 X 456', RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44 2034567890 x 456 ', RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44 2034567890 X 456', RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+44-2034567890;ext=456', RegionCode::GB)); $this->assertEquals( $ukNumber, - $this->phoneUtil->parse("tel:2034567890;ext=456;phone-context=+44", RegionCode::ZZ) + $this->phoneUtil->parse('tel:2034567890;ext=456;phone-context=+44', RegionCode::ZZ) ); // Full-width extension, "extn" only. - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+442034567890ｅｘｔｎ456", RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+442034567890ｅｘｔｎ456', RegionCode::GB)); // "xtn" only. - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+442034567890ｘｔｎ456", RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+442034567890ｘｔｎ456', RegionCode::GB)); // "xt" only. - $this->assertEquals($ukNumber, $this->phoneUtil->parse("+442034567890ｘｔ456", RegionCode::GB)); + $this->assertEquals($ukNumber, $this->phoneUtil->parse('+442034567890ｘｔ456', RegionCode::GB)); $usWithExtension = new PhoneNumber(); - $usWithExtension->setCountryCode(1)->setNationalNumber(8009013355)->setExtension("7246433"); - $this->assertEquals($usWithExtension, $this->phoneUtil->parse("(800) 901-3355 x 7246433", RegionCode::US)); - $this->assertEquals($usWithExtension, $this->phoneUtil->parse("(800) 901-3355 , ext 7246433", RegionCode::US)); - $this->assertEquals($usWithExtension, $this->phoneUtil->parse("(800) 901-3355 ; 7246433", RegionCode::US)); + $usWithExtension->setCountryCode(1)->setNationalNumber(8009013355)->setExtension('7246433'); + $this->assertEquals($usWithExtension, $this->phoneUtil->parse('(800) 901-3355 x 7246433', RegionCode::US)); + $this->assertEquals($usWithExtension, $this->phoneUtil->parse('(800) 901-3355 , ext 7246433', RegionCode::US)); + $this->assertEquals($usWithExtension, $this->phoneUtil->parse('(800) 901-3355 ; 7246433', RegionCode::US)); // To test an extension character without surrounding spaces. - $this->assertEquals($usWithExtension, $this->phoneUtil->parse("(800) 901-3355;7246433", RegionCode::US)); + $this->assertEquals($usWithExtension, $this->phoneUtil->parse('(800) 901-3355;7246433', RegionCode::US)); $this->assertEquals( $usWithExtension, - $this->phoneUtil->parse("(800) 901-3355 ,extension 7246433", RegionCode::US) + $this->phoneUtil->parse('(800) 901-3355 ,extension 7246433', RegionCode::US) ); $this->assertEquals( $usWithExtension, - $this->phoneUtil->parse("(800) 901-3355 ,extensi" . pack("H*", 'c3b3') . "n 7246433", RegionCode::US) + $this->phoneUtil->parse('(800) 901-3355 ,extensi' . pack('H*', 'c3b3') . 'n 7246433', RegionCode::US) ); // Repeat with the small letter o with acute accent created by combining characters. $this->assertEquals( $usWithExtension, - $this->phoneUtil->parse("(800) 901-3355 ,extensio" . pack('H*', 'cc81') . "n 7246433", RegionCode::US) + $this->phoneUtil->parse('(800) 901-3355 ,extensio' . pack('H*', 'cc81') . 'n 7246433', RegionCode::US) ); - $this->assertEquals($usWithExtension, $this->phoneUtil->parse("(800) 901-3355 , 7246433", RegionCode::US)); - $this->assertEquals($usWithExtension, $this->phoneUtil->parse("(800) 901-3355 ext: 7246433", RegionCode::US)); + $this->assertEquals($usWithExtension, $this->phoneUtil->parse('(800) 901-3355 , 7246433', RegionCode::US)); + $this->assertEquals($usWithExtension, $this->phoneUtil->parse('(800) 901-3355 ext: 7246433', RegionCode::US)); // Testing Russian extension \u0434\u043E\u0431 with variants found online. $ruWithExtension = new PhoneNumber(); @@ -3373,14 +3373,14 @@ public function testParseExtensions() // Test that if a number has two extensions specified, we ignore the second. $usWithTwoExtensionsNumber = new PhoneNumber(); - $usWithTwoExtensionsNumber->setCountryCode(1)->setNationalNumber(2121231234)->setExtension("508"); + $usWithTwoExtensionsNumber->setCountryCode(1)->setNationalNumber(2121231234)->setExtension('508'); $this->assertEquals( $usWithTwoExtensionsNumber, - $this->phoneUtil->parse("(212)123-1234 x508/x1234", RegionCode::US) + $this->phoneUtil->parse('(212)123-1234 x508/x1234', RegionCode::US) ); $this->assertEquals( $usWithTwoExtensionsNumber, - $this->phoneUtil->parse("(212)123-1234 x508/ x1234", RegionCode::US) + $this->phoneUtil->parse('(212)123-1234 x508/ x1234', RegionCode::US) ); $this->assertEquals( $usWithTwoExtensionsNumber, @@ -3390,67 +3390,67 @@ public function testParseExtensions() // Test parsing numbers in the form (645) 123-1234-910# works, where the last 3 digits before // the # are an extension. $usWithExtension->clear(); - $usWithExtension->setCountryCode(1)->setNationalNumber(6451231234)->setExtension("910"); - $this->assertEquals($usWithExtension, $this->phoneUtil->parse("+1 (645) 123 1234-910#", RegionCode::US)); + $usWithExtension->setCountryCode(1)->setNationalNumber(6451231234)->setExtension('910'); + $this->assertEquals($usWithExtension, $this->phoneUtil->parse('+1 (645) 123 1234-910#', RegionCode::US)); // Retry with the same number in a slightly different format. - $this->assertEquals($usWithExtension, $this->phoneUtil->parse("+1 (645) 123 1234 ext. 910#", RegionCode::US)); + $this->assertEquals($usWithExtension, $this->phoneUtil->parse('+1 (645) 123 1234 ext. 910#', RegionCode::US)); } public function testParseAndKeepRaw() { $alphaNumericNumber = new PhoneNumber(); $alphaNumericNumber->mergeFrom(self::$alphaNumericNumber); - $alphaNumericNumber->setRawInput("800 six-flags"); + $alphaNumericNumber->setRawInput('800 six-flags'); $alphaNumericNumber->setCountryCodeSource(CountryCodeSource::FROM_DEFAULT_COUNTRY); $this->assertEquals( $alphaNumericNumber, - $this->phoneUtil->parseAndKeepRawInput("800 six-flags", RegionCode::US) + $this->phoneUtil->parseAndKeepRawInput('800 six-flags', RegionCode::US) ); $shorterAlphaNumber = new PhoneNumber(); $shorterAlphaNumber->setCountryCode(1)->setNationalNumber(8007493524); $shorterAlphaNumber - ->setRawInput("1800 six-flag") + ->setRawInput('1800 six-flag') ->setCountryCodeSource(CountryCodeSource::FROM_NUMBER_WITHOUT_PLUS_SIGN); $this->assertEquals( $shorterAlphaNumber, - $this->phoneUtil->parseAndKeepRawInput("1800 six-flag", RegionCode::US) + $this->phoneUtil->parseAndKeepRawInput('1800 six-flag', RegionCode::US) ); - $shorterAlphaNumber->setRawInput("+1800 six-flag")->setCountryCodeSource( + $shorterAlphaNumber->setRawInput('+1800 six-flag')->setCountryCodeSource( CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN ); $this->assertEquals( $shorterAlphaNumber, - $this->phoneUtil->parseAndKeepRawInput("+1800 six-flag", RegionCode::NZ) + $this->phoneUtil->parseAndKeepRawInput('+1800 six-flag', RegionCode::NZ) ); - $shorterAlphaNumber->setRawInput("001800 six-flag")->setCountryCodeSource( + $shorterAlphaNumber->setRawInput('001800 six-flag')->setCountryCodeSource( CountryCodeSource::FROM_NUMBER_WITH_IDD ); $this->assertEquals( $shorterAlphaNumber, - $this->phoneUtil->parseAndKeepRawInput("001800 six-flag", RegionCode::NZ) + $this->phoneUtil->parseAndKeepRawInput('001800 six-flag', RegionCode::NZ) ); // Invalid region code supplied. try { - $this->phoneUtil->parseAndKeepRawInput("123 456 7890", RegionCode::CS); - $this->fail("Deprecated region code not allowed: should fail."); + $this->phoneUtil->parseAndKeepRawInput('123 456 7890', RegionCode::CS); + $this->fail('Deprecated region code not allowed: should fail.'); } catch (NumberParseException $e) { // Expected this exception. $this->assertEquals( NumberParseException::INVALID_COUNTRY_CODE, $e->getErrorType(), - "Wrong error type stored in exception." + 'Wrong error type stored in exception.' ); } $koreanNumber = new PhoneNumber(); $koreanNumber->setCountryCode(82)->setNationalNumber(22123456)->setRawInput( - "08122123456" - )->setCountryCodeSource(CountryCodeSource::FROM_DEFAULT_COUNTRY)->setPreferredDomesticCarrierCode("81"); - $this->assertEquals($koreanNumber, $this->phoneUtil->parseAndKeepRawInput("08122123456", RegionCode::KR)); + '08122123456' + )->setCountryCodeSource(CountryCodeSource::FROM_DEFAULT_COUNTRY)->setPreferredDomesticCarrierCode('81'); + $this->assertEquals($koreanNumber, $this->phoneUtil->parseAndKeepRawInput('08122123456', RegionCode::KR)); } public function testParseItalianLeadingZeros() @@ -3458,24 +3458,24 @@ public function testParseItalianLeadingZeros() // Test the number "011". $oneZero = new PhoneNumber(); $oneZero->setCountryCode(61)->setNationalNumber(11)->setItalianLeadingZero(true); - $this->assertEquals($oneZero, $this->phoneUtil->parse("011", RegionCode::AU)); + $this->assertEquals($oneZero, $this->phoneUtil->parse('011', RegionCode::AU)); // Test the number "001". $twoZeros = new PhoneNumber(); $twoZeros->setCountryCode(61)->setNationalNumber(1)->setItalianLeadingZero(true)->setNumberOfLeadingZeros(2); - $this->assertEquals($twoZeros, $this->phoneUtil->parse("001", RegionCode::AU)); + $this->assertEquals($twoZeros, $this->phoneUtil->parse('001', RegionCode::AU)); // Test the number "000". This number has 2 leading zeros. $stillTwoZeros = new PhoneNumber(); $stillTwoZeros->setCountryCode(61)->setNationalNumber(0)->setItalianLeadingZero(true)->setNumberOfLeadingZeros( 2 ); - $this->assertEquals($stillTwoZeros, $this->phoneUtil->parse("000", RegionCode::AU)); + $this->assertEquals($stillTwoZeros, $this->phoneUtil->parse('000', RegionCode::AU)); // Test the number "0000". This number has 3 leading zeros. $threeZeros = new PhoneNumber(); $threeZeros->setCountryCode(61)->setNationalNumber(0)->setItalianLeadingZero(true)->setNumberOfLeadingZeros(3); - $this->assertEquals($threeZeros, $this->phoneUtil->parse("0000", RegionCode::AU)); + $this->assertEquals($threeZeros, $this->phoneUtil->parse('0000', RegionCode::AU)); } public function testParseHasDefaultNullRegion() @@ -3493,15 +3493,15 @@ public function testCountryWithNoNumberDesc() $adNumber = new PhoneNumber(); $adNumber->setCountryCode(376)->setNationalNumber(12345); - $this->assertEquals("+376 12345", $this->phoneUtil->format($adNumber, PhoneNumberFormat::INTERNATIONAL)); - $this->assertEquals("+37612345", $this->phoneUtil->format($adNumber, PhoneNumberFormat::E164)); - $this->assertEquals("12345", $this->phoneUtil->format($adNumber, PhoneNumberFormat::NATIONAL)); + $this->assertEquals('+376 12345', $this->phoneUtil->format($adNumber, PhoneNumberFormat::INTERNATIONAL)); + $this->assertEquals('+37612345', $this->phoneUtil->format($adNumber, PhoneNumberFormat::E164)); + $this->assertEquals('12345', $this->phoneUtil->format($adNumber, PhoneNumberFormat::NATIONAL)); $this->assertEquals(PhoneNumberType::UNKNOWN, $this->phoneUtil->getNumberType($adNumber)); $this->assertFalse($this->phoneUtil->isValidNumber($adNumber)); // Test dialing a US number from within Andorra. $this->assertEquals( - "00 1 650 253 0000", + '00 1 650 253 0000', $this->phoneUtil->formatOutOfCountryCallingNumber(self::$usNumber, RegionCode::AD) ); } @@ -3513,7 +3513,7 @@ public function testUnknownCountryCallingCode() // country calling code is, but just prefixing the country code and national number is about // the best we can do. $this->assertEquals( - "+212345", + '+212345', $this->phoneUtil->format(self::$unknownCountryCodeNoRawInput, PhoneNumberFormat::E164) ); } @@ -3524,55 +3524,55 @@ public function testIsNumberMatchMatches() // has been specified. $this->assertEquals( MatchType::EXACT_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331 6005", "+64 03 331 6005") + $this->phoneUtil->isNumberMatch('+64 3 331 6005', '+64 03 331 6005') ); - $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch("+800 1234 5678", "+80012345678")); + $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch('+800 1234 5678', '+80012345678')); $this->assertEquals( MatchType::EXACT_MATCH, - $this->phoneUtil->isNumberMatch("+64 03 331-6005", "+64 03331 6005") + $this->phoneUtil->isNumberMatch('+64 03 331-6005', '+64 03331 6005') ); - $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch("+643 331-6005", "+64033316005")); - $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch("+643 331-6005", "+6433316005")); - $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch("+64 3 331-6005", "+6433316005")); + $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch('+643 331-6005', '+64033316005')); + $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch('+643 331-6005', '+6433316005')); + $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch('+64 3 331-6005', '+6433316005')); $this->assertEquals( MatchType::EXACT_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005", "tel:+64-3-331-6005;isub=123") + $this->phoneUtil->isNumberMatch('+64 3 331-6005', 'tel:+64-3-331-6005;isub=123') ); // Test alpha numbers. $this->assertEquals( MatchType::EXACT_MATCH, - $this->phoneUtil->isNumberMatch("+1800 siX-Flags", "+1 800 7493 5247") + $this->phoneUtil->isNumberMatch('+1800 siX-Flags', '+1 800 7493 5247') ); // Test numbers with extensions. $this->assertEquals( MatchType::EXACT_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005 extn 1234", "+6433316005#1234") + $this->phoneUtil->isNumberMatch('+64 3 331-6005 extn 1234', '+6433316005#1234') ); $this->assertEquals( MatchType::EXACT_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005 ext. 1234", "+6433316005;1234") + $this->phoneUtil->isNumberMatch('+64 3 331-6005 ext. 1234', '+6433316005;1234') ); $this->assertEquals(MatchType::EXACT_MATCH, - $this->phoneUtil->isNumberMatch("+7 423 202-25-11 ext 100", "+7 4232022511 \xD0\xB4\xD0\xBE\xD0\xB1. 100")); + $this->phoneUtil->isNumberMatch('+7 423 202-25-11 ext 100', "+7 4232022511 \xD0\xB4\xD0\xBE\xD0\xB1. 100")); // Test proto buffers. - $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch(self::$nzNumber, "+6403 331 6005")); + $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch(self::$nzNumber, '+6403 331 6005')); $nzNumber = new PhoneNumber(); - $nzNumber->mergeFrom(self::$nzNumber)->setExtension("3456"); + $nzNumber->mergeFrom(self::$nzNumber)->setExtension('3456'); $this->assertEquals( MatchType::EXACT_MATCH, - $this->phoneUtil->isNumberMatch($nzNumber, "+643 331 6005 ext 3456") + $this->phoneUtil->isNumberMatch($nzNumber, '+643 331 6005 ext 3456') ); // Check empty extensions are ignored. - $nzNumber->setExtension(""); - $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch($nzNumber, "+6403 331 6005")); + $nzNumber->setExtension(''); + $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch($nzNumber, '+6403 331 6005')); // Check variant with two proto buffers. $this->assertEquals( MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch($nzNumber, self::$nzNumber), - "Number " . (string)$nzNumber . " did not match " . (string)self::$nzNumber + 'Number ' . $nzNumber . ' did not match ' . self::$nzNumber ); } @@ -3631,10 +3631,10 @@ public function testIsNumberMatchIgnoresSomeFields() $brNumberTwo = new PhoneNumber(); $brNumberOne->setCountryCode(55)->setNationalNumber(3121286979) ->setCountryCodeSource(CountryCodeSource::FROM_NUMBER_WITH_PLUS_SIGN) - ->setPreferredDomesticCarrierCode("12")->setRawInput("012 3121286979"); + ->setPreferredDomesticCarrierCode('12')->setRawInput('012 3121286979'); $brNumberTwo->setCountryCode(55)->setNationalNumber(3121286979) ->setCountryCodeSource(CountryCodeSource::FROM_DEFAULT_COUNTRY) - ->setPreferredDomesticCarrierCode("14")->setRawInput("143121286979"); + ->setPreferredDomesticCarrierCode('14')->setRawInput('143121286979'); $this->assertEquals(MatchType::EXACT_MATCH, $this->phoneUtil->isNumberMatch($brNumberOne, $brNumberTwo)); } @@ -3642,109 +3642,109 @@ public function testIsNumberMatchIgnoresSomeFields() public function testIsNumberMatchNonMatches() { // Non-matches. - $this->assertEquals(MatchType::NO_MATCH, $this->phoneUtil->isNumberMatch("03 331 6005", "03 331 6006")); - $this->assertEquals(MatchType::NO_MATCH, $this->phoneUtil->isNumberMatch("+800 1234 5678", "+1 800 1234 5678")); + $this->assertEquals(MatchType::NO_MATCH, $this->phoneUtil->isNumberMatch('03 331 6005', '03 331 6006')); + $this->assertEquals(MatchType::NO_MATCH, $this->phoneUtil->isNumberMatch('+800 1234 5678', '+1 800 1234 5678')); // Different country calling code, partial number match. - $this->assertEquals(MatchType::NO_MATCH, $this->phoneUtil->isNumberMatch("+64 3 331-6005", "+16433316005")); + $this->assertEquals(MatchType::NO_MATCH, $this->phoneUtil->isNumberMatch('+64 3 331-6005', '+16433316005')); // Different country calling code, same number. - $this->assertEquals(MatchType::NO_MATCH, $this->phoneUtil->isNumberMatch("+64 3 331-6005", "+6133316005")); + $this->assertEquals(MatchType::NO_MATCH, $this->phoneUtil->isNumberMatch('+64 3 331-6005', '+6133316005')); // Extension different, all else the same. $this->assertEquals( MatchType::NO_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005 extn 1234", "0116433316005#1235") + $this->phoneUtil->isNumberMatch('+64 3 331-6005 extn 1234', '0116433316005#1235') ); $this->assertEquals( MatchType::NO_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005 extn 1234", "tel:+64-3-331-6005;ext=1235") + $this->phoneUtil->isNumberMatch('+64 3 331-6005 extn 1234', 'tel:+64-3-331-6005;ext=1235') ); // NSN matches, but extension is different - not the same number. $this->assertEquals( MatchType::NO_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005 ext.1235", "3 331 6005#1234") + $this->phoneUtil->isNumberMatch('+64 3 331-6005 ext.1235', '3 331 6005#1234') ); // Invalid numbers that can't be parsed. - $this->assertEquals(MatchType::NOT_A_NUMBER, $this->phoneUtil->isNumberMatch("4", "3 331 6043")); - $this->assertEquals(MatchType::NOT_A_NUMBER, $this->phoneUtil->isNumberMatch("+43", "+64 3 331 6005")); - $this->assertEquals(MatchType::NOT_A_NUMBER, $this->phoneUtil->isNumberMatch("+43", "64 3 331 6005")); - $this->assertEquals(MatchType::NOT_A_NUMBER, $this->phoneUtil->isNumberMatch("Dog", "64 3 331 6005")); + $this->assertEquals(MatchType::NOT_A_NUMBER, $this->phoneUtil->isNumberMatch('4', '3 331 6043')); + $this->assertEquals(MatchType::NOT_A_NUMBER, $this->phoneUtil->isNumberMatch('+43', '+64 3 331 6005')); + $this->assertEquals(MatchType::NOT_A_NUMBER, $this->phoneUtil->isNumberMatch('+43', '64 3 331 6005')); + $this->assertEquals(MatchType::NOT_A_NUMBER, $this->phoneUtil->isNumberMatch('Dog', '64 3 331 6005')); } public function testIsNumberMatchNsnMatches() { // NSN matches. - $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch("+64 3 331-6005", "03 331 6005")); + $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch('+64 3 331-6005', '03 331 6005')); $this->assertEquals( MatchType::NSN_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005", "tel:03-331-6005;isub=1234;phone-context=abc.nz") + $this->phoneUtil->isNumberMatch('+64 3 331-6005', 'tel:03-331-6005;isub=1234;phone-context=abc.nz') ); - $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch(self::$nzNumber, "03 331 6005")); + $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch(self::$nzNumber, '03 331 6005')); // Here the second number possibly starts with the country calling code for New Zealand, // although we are unsure. $unchangedNzNumber = new PhoneNumber(); $unchangedNzNumber->mergeFrom(self::$nzNumber); $this->assertEquals( MatchType::NSN_MATCH, - $this->phoneUtil->isNumberMatch($unchangedNzNumber, "(64-3) 331 6005") + $this->phoneUtil->isNumberMatch($unchangedNzNumber, '(64-3) 331 6005') ); // Check the phone number proto was not edited during the method call. $this->assertEquals(self::$nzNumber, $unchangedNzNumber); // Here, the 1 might be a national prefix, if we compare it to the US number, so the resultant // match is an NSN match. - $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch(self::$usNumber, "1-650-253-0000")); - $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch(self::$usNumber, "6502530000")); - $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch("+1 650-253 0000", "1 650 253 0000")); - $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch("1 650-253 0000", "1 650 253 0000")); - $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch("1 650-253 0000", "+1 650 253 0000")); + $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch(self::$usNumber, '1-650-253-0000')); + $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch(self::$usNumber, '6502530000')); + $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch('+1 650-253 0000', '1 650 253 0000')); + $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch('1 650-253 0000', '1 650 253 0000')); + $this->assertEquals(MatchType::NSN_MATCH, $this->phoneUtil->isNumberMatch('1 650-253 0000', '+1 650 253 0000')); // For this case, the match will be a short NSN match, because we cannot assume that the 1 might // be a national prefix, so don't remove it when parsing. $randomNumber = new PhoneNumber(); $randomNumber->setCountryCode(41)->setNationalNumber(6502530000); $this->assertEquals( MatchType::SHORT_NSN_MATCH, - $this->phoneUtil->isNumberMatch($randomNumber, "1-650-253-0000") + $this->phoneUtil->isNumberMatch($randomNumber, '1-650-253-0000') ); } public function testIsNumberMatchShortNsnMatches() { // Short NSN matches with the country not specified for either one or both numbers. - $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch("+64 3 331-6005", "331 6005")); + $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch('+64 3 331-6005', '331 6005')); $this->assertEquals( MatchType::SHORT_NSN_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005", "tel:331-6005;phone-context=abc.nz") + $this->phoneUtil->isNumberMatch('+64 3 331-6005', 'tel:331-6005;phone-context=abc.nz') ); $this->assertEquals( MatchType::SHORT_NSN_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005", "tel:331-6005;isub=1234;phone-context=abc.nz") + $this->phoneUtil->isNumberMatch('+64 3 331-6005', 'tel:331-6005;isub=1234;phone-context=abc.nz') ); $this->assertEquals( MatchType::SHORT_NSN_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005", "tel:331-6005;isub=1234;phone-context=abc.nz;a=%A1") + $this->phoneUtil->isNumberMatch('+64 3 331-6005', 'tel:331-6005;isub=1234;phone-context=abc.nz;a=%A1') ); // We did not know that the "0" was a national prefix since neither number has a country code, // so this is considered a SHORT_NSN_MATCH. - $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch("3 331-6005", "03 331 6005")); - $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch("3 331-6005", "331 6005")); + $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch('3 331-6005', '03 331 6005')); + $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch('3 331-6005', '331 6005')); $this->assertEquals( MatchType::SHORT_NSN_MATCH, - $this->phoneUtil->isNumberMatch("3 331-6005", "tel:331-6005;phone-context=abc.nz") + $this->phoneUtil->isNumberMatch('3 331-6005', 'tel:331-6005;phone-context=abc.nz') ); - $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch("3 331-6005", "+64 331 6005")); + $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch('3 331-6005', '+64 331 6005')); // Short NSN match with the country specified. - $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch("03 331-6005", "331 6005")); - $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch("1 234 345 6789", "345 6789")); + $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch('03 331-6005', '331 6005')); + $this->assertEquals(MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch('1 234 345 6789', '345 6789')); $this->assertEquals( MatchType::SHORT_NSN_MATCH, - $this->phoneUtil->isNumberMatch("+1 (234) 345 6789", "345 6789") + $this->phoneUtil->isNumberMatch('+1 (234) 345 6789', '345 6789') ); // NSN matches, country calling code omitted for one number, extension missing for one. $this->assertEquals( MatchType::SHORT_NSN_MATCH, - $this->phoneUtil->isNumberMatch("+64 3 331-6005", "3 331 6005#1234") + $this->phoneUtil->isNumberMatch('+64 3 331-6005', '3 331 6005#1234') ); // One has Italian leading zero, one does not. $italianNumberOne = new PhoneNumber(); @@ -3756,8 +3756,8 @@ public function testIsNumberMatchShortNsnMatches() $this->phoneUtil->isNumberMatch($italianNumberOne, $italianNumberTwo) ); // One has an extension, the other has an extension of "". - $italianNumberOne->setExtension("1234")->clearItalianLeadingZero(); - $italianNumberTwo->setExtension(""); + $italianNumberOne->setExtension('1234')->clearItalianLeadingZero(); + $italianNumberTwo->setExtension(''); $this->assertEquals( MatchType::SHORT_NSN_MATCH, $this->phoneUtil->isNumberMatch($italianNumberOne, $italianNumberTwo) @@ -3782,15 +3782,15 @@ public function testCanBeInternationallyDialled() public function testIsAlphaNumber() { - $this->assertTrue($this->phoneUtil->isAlphaNumber("1800 six-flags")); - $this->assertTrue($this->phoneUtil->isAlphaNumber("1800 six-flags ext. 1234")); - $this->assertTrue($this->phoneUtil->isAlphaNumber("+800 six-flags")); - $this->assertTrue($this->phoneUtil->isAlphaNumber("180 six-flags")); - $this->assertFalse($this->phoneUtil->isAlphaNumber("1800 123-1234")); - $this->assertFalse($this->phoneUtil->isAlphaNumber("1 six-flags")); - $this->assertFalse($this->phoneUtil->isAlphaNumber("18 six-flags")); - $this->assertFalse($this->phoneUtil->isAlphaNumber("1800 123-1234 extension: 1234")); - $this->assertFalse($this->phoneUtil->isAlphaNumber("+800 1234-1234")); + $this->assertTrue($this->phoneUtil->isAlphaNumber('1800 six-flags')); + $this->assertTrue($this->phoneUtil->isAlphaNumber('1800 six-flags ext. 1234')); + $this->assertTrue($this->phoneUtil->isAlphaNumber('+800 six-flags')); + $this->assertTrue($this->phoneUtil->isAlphaNumber('180 six-flags')); + $this->assertFalse($this->phoneUtil->isAlphaNumber('1800 123-1234')); + $this->assertFalse($this->phoneUtil->isAlphaNumber('1 six-flags')); + $this->assertFalse($this->phoneUtil->isAlphaNumber('18 six-flags')); + $this->assertFalse($this->phoneUtil->isAlphaNumber('1800 123-1234 extension: 1234')); + $this->assertFalse($this->phoneUtil->isAlphaNumber('+800 1234-1234')); } public function testIsMobileNumberPortableRegion() diff --git a/tests/core/ShortNumberInfoTest.php b/tests/core/ShortNumberInfoTest.php index ed7d73cd7..c44b0d139 100644 --- a/tests/core/ShortNumberInfoTest.php +++ b/tests/core/ShortNumberInfoTest.php @@ -139,17 +139,17 @@ public function testGetExpectedCost() $this->assertEquals( ShortNumberCost::UNKNOWN_COST, - $this->shortInfo->getExpectedCostForRegion($this->parse("12345", RegionCode::FR), RegionCode::FR) + $this->shortInfo->getExpectedCostForRegion($this->parse('12345', RegionCode::FR), RegionCode::FR) ); $unknownCostNumber = new PhoneNumber(); $unknownCostNumber->setCountryCode(33)->setNationalNumber(12345); $this->assertEquals(ShortNumberCost::UNKNOWN_COST, $this->shortInfo->getExpectedCost($unknownCostNumber)); // Test that an invalid number may nevertheless have a cost other than UNKNOWN_COST. - $this->assertFalse($this->shortInfo->isValidShortNumberForRegion($this->parse("116123", RegionCode::FR), RegionCode::FR)); + $this->assertFalse($this->shortInfo->isValidShortNumberForRegion($this->parse('116123', RegionCode::FR), RegionCode::FR)); $this->assertEquals( ShortNumberCost::TOLL_FREE, - $this->shortInfo->getExpectedCostForRegion($this->parse("116123", RegionCode::FR), RegionCode::FR) + $this->shortInfo->getExpectedCostForRegion($this->parse('116123', RegionCode::FR), RegionCode::FR) ); $invalidNumber = new PhoneNumber(); $invalidNumber->setCountryCode(33)->setNationalNumber(116123); @@ -159,7 +159,7 @@ public function testGetExpectedCost() // Test a nonexistent country code. $this->assertEquals( ShortNumberCost::UNKNOWN_COST, - $this->shortInfo->getExpectedCostForRegion($this->parse("911", RegionCode::US), RegionCode::ZZ) + $this->shortInfo->getExpectedCostForRegion($this->parse('911', RegionCode::US), RegionCode::ZZ) ); $unknownCostNumber->clear(); $unknownCostNumber->setCountryCode(123)->setNationalNumber(911); @@ -171,13 +171,13 @@ public function testGetExpectedCostForSharedCountryCallingCode() // Test some numbers which have different costs in countries sharing the same country calling // code. In Australia, 1234 is premium-rate, 1194 is standard-rate, and 733 is toll-free. These // are not known to be valid numbers in the Christmas Islands. - $ambiguousPremiumRateString = "1234"; + $ambiguousPremiumRateString = '1234'; $ambiguousPremiumRateNumber = new PhoneNumber(); $ambiguousPremiumRateNumber->setCountryCode(61)->setNationalNumber(1234); - $ambiguousStandardRateString = "1194"; + $ambiguousStandardRateString = '1194'; $ambiguousStandardRateNumber = new PhoneNumber(); $ambiguousStandardRateNumber->setCountryCode(61)->setNationalNumber(1194); - $ambiguousTollFreeString = "733"; + $ambiguousTollFreeString = '733'; $ambiguousTollFreeNumber = new PhoneNumber(); $ambiguousTollFreeNumber->setCountryCode(61)->setNationalNumber(733); @@ -231,77 +231,77 @@ public function testGetExpectedCostForSharedCountryCallingCode() public function testGetExampleShortNumber() { - $this->assertEquals("110", $this->shortInfo->getExampleShortNumber(RegionCode::AD)); - $this->assertEquals("1010", $this->shortInfo->getExampleShortNumber(RegionCode::FR)); - $this->assertEquals("", $this->shortInfo->getExampleShortNumber(RegionCode::UN001)); - $this->assertEquals("", $this->shortInfo->getExampleShortNumber(null)); + $this->assertEquals('110', $this->shortInfo->getExampleShortNumber(RegionCode::AD)); + $this->assertEquals('1010', $this->shortInfo->getExampleShortNumber(RegionCode::FR)); + $this->assertEquals('', $this->shortInfo->getExampleShortNumber(RegionCode::UN001)); + $this->assertEquals('', $this->shortInfo->getExampleShortNumber(null)); } public function testGetExampleShortNumberForCost() { $this->assertEquals( - "3010", + '3010', $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::TOLL_FREE) ); $this->assertEquals( - "1023", + '1023', $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::STANDARD_RATE) ); $this->assertEquals( - "42000", + '42000', $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::PREMIUM_RATE) ); $this->assertEquals( - "", + '', $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::UNKNOWN_COST) ); } public function testConnectsToEmergencyNumber_US() { - $this->assertTrue($this->shortInfo->connectsToEmergencyNumber("911", RegionCode::US)); - $this->assertTrue($this->shortInfo->connectsToEmergencyNumber("112", RegionCode::US)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("999", RegionCode::US)); + $this->assertTrue($this->shortInfo->connectsToEmergencyNumber('911', RegionCode::US)); + $this->assertTrue($this->shortInfo->connectsToEmergencyNumber('112', RegionCode::US)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('999', RegionCode::US)); } public function testConnectsToEmergencyNumberLongNumber_US() { - $this->assertTrue($this->shortInfo->connectsToEmergencyNumber("9116666666", RegionCode::US)); - $this->assertTrue($this->shortInfo->connectsToEmergencyNumber("1126666666", RegionCode::US)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("9996666666", RegionCode::US)); + $this->assertTrue($this->shortInfo->connectsToEmergencyNumber('9116666666', RegionCode::US)); + $this->assertTrue($this->shortInfo->connectsToEmergencyNumber('1126666666', RegionCode::US)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('9996666666', RegionCode::US)); } public function testConnectsToEmergencyNumberWithFormatting_US() { - $this->assertTrue($this->shortInfo->connectsToEmergencyNumber("9-1-1", RegionCode::US)); - $this->assertTrue($this->shortInfo->connectsToEmergencyNumber("1-1-2", RegionCode::US)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("9-9-9", RegionCode::US)); + $this->assertTrue($this->shortInfo->connectsToEmergencyNumber('9-1-1', RegionCode::US)); + $this->assertTrue($this->shortInfo->connectsToEmergencyNumber('1-1-2', RegionCode::US)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('9-9-9', RegionCode::US)); } public function testConnectsToEmergencyNumberWithPlusSign_US() { - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("+911", RegionCode::US)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('+911', RegionCode::US)); $this->assertFalse( - $this->shortInfo->connectsToEmergencyNumber(self::$plusSymbol . "911", RegionCode::US) + $this->shortInfo->connectsToEmergencyNumber(self::$plusSymbol . '911', RegionCode::US) ); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber(" +911", RegionCode::US)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("+112", RegionCode::US)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("+999", RegionCode::US)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber(' +911', RegionCode::US)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('+112', RegionCode::US)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('+999', RegionCode::US)); } public function testConnectsToEmergencyNumber_BR() { - $this->assertTrue($this->shortInfo->connectsToEmergencyNumber("911", RegionCode::BR)); - $this->assertTrue($this->shortInfo->connectsToEmergencyNumber("190", RegionCode::BR)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("999", RegionCode::BR)); + $this->assertTrue($this->shortInfo->connectsToEmergencyNumber('911', RegionCode::BR)); + $this->assertTrue($this->shortInfo->connectsToEmergencyNumber('190', RegionCode::BR)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('999', RegionCode::BR)); } public function testConnectsToEmergencyNumberLongNumber_BR() { // Brazilian emergency numbers don't work when additional digits are appended. - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("9111", RegionCode::BR)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("1900", RegionCode::BR)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("9996", RegionCode::BR)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('9111', RegionCode::BR)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('1900', RegionCode::BR)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('9996', RegionCode::BR)); } public function testConnectsToEmergencyNumber_CL() @@ -320,97 +320,97 @@ public function testConnectsToEmergencyNumberLongNumber_CL() public function testConnectsToEmergencyNumber_AO() { // Angola doesn't have any metadata for emergency numbers in the test metadata. - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("911", RegionCode::AO)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("222123456", RegionCode::BR)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("923123456", RegionCode::BR)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('911', RegionCode::AO)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('222123456', RegionCode::BR)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('923123456', RegionCode::BR)); } public function testConnectsToEmergencyNumber_ZW() { // Zimbabwe doesn't have any metadata in the test metadata. - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("911", RegionCode::ZW)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("01312345", RegionCode::ZW)); - $this->assertFalse($this->shortInfo->connectsToEmergencyNumber("0711234567", RegionCode::ZW)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('911', RegionCode::ZW)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('01312345', RegionCode::ZW)); + $this->assertFalse($this->shortInfo->connectsToEmergencyNumber('0711234567', RegionCode::ZW)); } public function testIsEmergencyNumber_US() { - $this->assertTrue($this->shortInfo->isEmergencyNumber("911", RegionCode::US)); - $this->assertTrue($this->shortInfo->isEmergencyNumber("112", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("999", RegionCode::US)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('911', RegionCode::US)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('112', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('999', RegionCode::US)); } public function testIsEmergencyNumberLongNumber_US() { - $this->assertFalse($this->shortInfo->isEmergencyNumber("9116666666", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("1126666666", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("9996666666", RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('9116666666', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('1126666666', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('9996666666', RegionCode::US)); } public function testIsEmergencyNumberWithFormatting_US() { - $this->assertTrue($this->shortInfo->isEmergencyNumber("9-1-1", RegionCode::US)); - $this->assertTrue($this->shortInfo->isEmergencyNumber("*911", RegionCode::US)); - $this->assertTrue($this->shortInfo->isEmergencyNumber("1-1-2", RegionCode::US)); - $this->assertTrue($this->shortInfo->isEmergencyNumber("*112", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("9-9-9", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("*999", RegionCode::US)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('9-1-1', RegionCode::US)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('*911', RegionCode::US)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('1-1-2', RegionCode::US)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('*112', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('9-9-9', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('*999', RegionCode::US)); } public function testIsEmergencyNumberWithPlusSign_US() { - $this->assertFalse($this->shortInfo->isEmergencyNumber("+911", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber(self::$plusSymbol . "911", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber(" +911", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("+112", RegionCode::US)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("+999", RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('+911', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber(self::$plusSymbol . '911', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber(' +911', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('+112', RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('+999', RegionCode::US)); } public function testIsEmergencyNumber_BR() { - $this->assertTrue($this->shortInfo->isEmergencyNumber("911", RegionCode::BR)); - $this->assertTrue($this->shortInfo->isEmergencyNumber("190", RegionCode::BR)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("999", RegionCode::BR)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('911', RegionCode::BR)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('190', RegionCode::BR)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('999', RegionCode::BR)); } public function testIsEmergencyNumberLongNumber_BR() { - $this->assertFalse($this->shortInfo->isEmergencyNumber("9111", RegionCode::BR)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("1900", RegionCode::BR)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("9996", RegionCode::BR)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('9111', RegionCode::BR)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('1900', RegionCode::BR)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('9996', RegionCode::BR)); } public function testIsEmergencyNumber_AO() { // Angola doesn't have any metadata for emergency numbers in the test metadata. - $this->assertFalse($this->shortInfo->isEmergencyNumber("911", RegionCode::AO)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("222123456", RegionCode::AO)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("923123456", RegionCode::AO)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('911', RegionCode::AO)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('222123456', RegionCode::AO)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('923123456', RegionCode::AO)); } public function testIsEmergencyNumber_ZW() { // Zimbabwe doesn't have any metadata in the test metadata. - $this->assertFalse($this->shortInfo->isEmergencyNumber("911", RegionCode::ZW)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("01312345", RegionCode::ZW)); - $this->assertFalse($this->shortInfo->isEmergencyNumber("0711234567", RegionCode::ZW)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('911', RegionCode::ZW)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('01312345', RegionCode::ZW)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('0711234567', RegionCode::ZW)); } public function testEmergencyNumberForSharedCountryCallingCode() { // Test the emergency number 112, which is valid in both Australia and the Christmas Islands. - $this->assertTrue($this->shortInfo->isEmergencyNumber("112", RegionCode::AU)); - $this->assertTrue($this->shortInfo->isValidShortNumberForRegion($this->parse("112", RegionCode::AU), RegionCode::AU)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('112', RegionCode::AU)); + $this->assertTrue($this->shortInfo->isValidShortNumberForRegion($this->parse('112', RegionCode::AU), RegionCode::AU)); $this->assertEquals( ShortNumberCost::TOLL_FREE, - $this->shortInfo->getExpectedCostForRegion($this->parse("112", RegionCode::AU), RegionCode::AU) + $this->shortInfo->getExpectedCostForRegion($this->parse('112', RegionCode::AU), RegionCode::AU) ); - $this->assertTrue($this->shortInfo->isEmergencyNumber("112", RegionCode::CX)); - $this->assertTrue($this->shortInfo->isValidShortNumberForRegion($this->parse("112", RegionCode::CX), RegionCode::CX)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('112', RegionCode::CX)); + $this->assertTrue($this->shortInfo->isValidShortNumberForRegion($this->parse('112', RegionCode::CX), RegionCode::CX)); $this->assertEquals( ShortNumberCost::TOLL_FREE, - $this->shortInfo->getExpectedCostForRegion($this->parse("112", RegionCode::CX), RegionCode::CX) + $this->shortInfo->getExpectedCostForRegion($this->parse('112', RegionCode::CX), RegionCode::CX) ); $sharedEmergencyNumber = new PhoneNumber(); $sharedEmergencyNumber->setCountryCode(61)->setNationalNumber(112); @@ -422,20 +422,20 @@ public function testOverlappingNANPANumber() { // 211 is an emergency number in Barbados, while it is a toll-free information line in Canada // and the USA. - $this->assertTrue($this->shortInfo->isEmergencyNumber("211", RegionCode::BB)); + $this->assertTrue($this->shortInfo->isEmergencyNumber('211', RegionCode::BB)); $this->assertEquals( ShortNumberCost::TOLL_FREE, - $this->shortInfo->getExpectedCostForRegion($this->parse("211", RegionCode::BB), RegionCode::BB) + $this->shortInfo->getExpectedCostForRegion($this->parse('211', RegionCode::BB), RegionCode::BB) ); - $this->assertFalse($this->shortInfo->isEmergencyNumber("211", RegionCode::US)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('211', RegionCode::US)); $this->assertEquals( ShortNumberCost::UNKNOWN_COST, - $this->shortInfo->getExpectedCostForRegion($this->parse("211", RegionCode::US), RegionCode::US) + $this->shortInfo->getExpectedCostForRegion($this->parse('211', RegionCode::US), RegionCode::US) ); - $this->assertFalse($this->shortInfo->isEmergencyNumber("211", RegionCode::CA)); + $this->assertFalse($this->shortInfo->isEmergencyNumber('211', RegionCode::CA)); $this->assertEquals( ShortNumberCost::TOLL_FREE, - $this->shortInfo->getExpectedCostForRegion($this->parse("211", RegionCode::CA), RegionCode::CA) + $this->shortInfo->getExpectedCostForRegion($this->parse('211', RegionCode::CA), RegionCode::CA) ); } @@ -457,7 +457,7 @@ private function parse($number, $regionCode) try { return $this->phoneUtil->parse($number, $regionCode); } catch (NumberParseException $e) { - $this->fail("Test input data should always parse correctly: " . $number . " (" . $regionCode . ")"); + $this->fail('Test input data should always parse correctly: ' . $number . ' (' . $regionCode . ')'); } } } diff --git a/tests/core/data/PhoneNumberMetadataForTesting_AR.php b/tests/core/data/PhoneNumberMetadataForTesting_AR.php index 05130c295..502543b5e 100644 --- a/tests/core/data/PhoneNumberMetadataForTesting_AR.php +++ b/tests/core/data/PhoneNumberMetadataForTesting_AR.php @@ -255,9 +255,6 @@ array ( 0 => '911', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 3 => array ( @@ -267,9 +264,6 @@ array ( 0 => '9(?:1[02-9]|[23])', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 4 => array ( diff --git a/tests/core/data/PhoneNumberMetadataForTesting_MX.php b/tests/core/data/PhoneNumberMetadataForTesting_MX.php index 6679e1f7c..0530cc722 100644 --- a/tests/core/data/PhoneNumberMetadataForTesting_MX.php +++ b/tests/core/data/PhoneNumberMetadataForTesting_MX.php @@ -260,9 +260,6 @@ array ( 0 => '1(?:33|55|81)', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), 4 => array ( @@ -272,9 +269,6 @@ array ( 0 => '1(?:[124579]|3[0-24-9]|5[0-46-9]|8[02-9])', ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, ), ), 'mainCountryForCode' => false, diff --git a/tests/core/data/PhoneNumberMetadataForTesting_US.php b/tests/core/data/PhoneNumberMetadataForTesting_US.php index aaeef84fe..3fd088b12 100644 --- a/tests/core/data/PhoneNumberMetadataForTesting_US.php +++ b/tests/core/data/PhoneNumberMetadataForTesting_US.php @@ -159,7 +159,7 @@ ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => true, + 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => array ( diff --git a/tests/geocoding/PhoneNumberOfflineGeocoderTest.php b/tests/geocoding/PhoneNumberOfflineGeocoderTest.php index d205b5dff..a7447a8d8 100644 --- a/tests/geocoding/PhoneNumberOfflineGeocoderTest.php +++ b/tests/geocoding/PhoneNumberOfflineGeocoderTest.php @@ -8,7 +8,7 @@ class PhoneNumberOfflineGeocoderTest extends TestCase { - const TEST_META_DATA_FILE_PREFIX = "/../../tests/prefixmapper/data"; + const TEST_META_DATA_FILE_PREFIX = '/../../tests/prefixmapper/data'; private static $KO_Number1; private static $KO_Number2; private static $KO_Number3; @@ -94,12 +94,12 @@ public function testGetDescriptionForNumberWithNoDataFile() $this->assertEquals( pack('H*', 'e7be8e') . pack('H*', 'e59bbd'), - $this->geocoder->getDescriptionForNumber(self::$US_Number1, "zh_CN") + $this->geocoder->getDescriptionForNumber(self::$US_Number1, 'zh_CN') ); - $this->assertEquals("Bahamas", $this->geocoder->getDescriptionForNumber(self::$BS_Number1, "en_US")); - $this->assertEquals("Australia", $this->geocoder->getDescriptionForNumber(self::$AU_Number, "en_US")); - $this->assertEquals("", $this->geocoder->getDescriptionForNumber(self::$numberWithInvalidCountryCode, "en_US")); - $this->assertEquals("", $this->geocoder->getDescriptionForNumber(self::$internationalTollFree, "en_US")); + $this->assertEquals('Bahamas', $this->geocoder->getDescriptionForNumber(self::$BS_Number1, 'en_US')); + $this->assertEquals('Australia', $this->geocoder->getDescriptionForNumber(self::$AU_Number, 'en_US')); + $this->assertEquals('', $this->geocoder->getDescriptionForNumber(self::$numberWithInvalidCountryCode, 'en_US')); + $this->assertEquals('', $this->geocoder->getDescriptionForNumber(self::$internationalTollFree, 'en_US')); } public function testGetDescriptionForNumberWithMissingPrefix() @@ -107,43 +107,43 @@ public function testGetDescriptionForNumberWithMissingPrefix() // Test that the name of the country is returned when the number passed in is valid but not // covered by the geocoding data file. - $this->assertEquals("United States", $this->geocoder->getDescriptionForNumber(self::$US_Number4, "en_US")); + $this->assertEquals('United States', $this->geocoder->getDescriptionForNumber(self::$US_Number4, 'en_US')); } public function testGetDescriptionForNumberBelongingToMultipleCountriesIsEmpty() { // Test that nothing is returned when the number passed in is valid but not // covered by the geocoding data file and belongs to multiple countries - $this->assertEquals("", $this->geocoder->getDescriptionForNumber(self::$NANPA_TollFree, 'en_US')); + $this->assertEquals('', $this->geocoder->getDescriptionForNumber(self::$NANPA_TollFree, 'en_US')); } public function testGetDescriptionForNumber_en_US() { - $ca = $this->geocoder->getDescriptionForNumber(self::$US_Number1, "en_US"); - $this->assertEquals("CA", $ca); - $this->assertEquals("Mountain View, CA", $this->geocoder->getDescriptionForNumber(self::$US_Number2, "en_US")); - $this->assertEquals("New York, NY", $this->geocoder->getDescriptionForNumber(self::$US_Number3, "en_US")); + $ca = $this->geocoder->getDescriptionForNumber(self::$US_Number1, 'en_US'); + $this->assertEquals('CA', $ca); + $this->assertEquals('Mountain View, CA', $this->geocoder->getDescriptionForNumber(self::$US_Number2, 'en_US')); + $this->assertEquals('New York, NY', $this->geocoder->getDescriptionForNumber(self::$US_Number3, 'en_US')); } public function testGetDescriptionForKoreanNumber() { - $this->assertEquals("Seoul", $this->geocoder->getDescriptionForNumber(self::$KO_Number1, "en")); - $this->assertEquals("Incheon", $this->geocoder->getDescriptionForNumber(self::$KO_Number2, "en")); - $this->assertEquals("Jeju", $this->geocoder->getDescriptionForNumber(self::$KO_Number3, "en")); + $this->assertEquals('Seoul', $this->geocoder->getDescriptionForNumber(self::$KO_Number1, 'en')); + $this->assertEquals('Incheon', $this->geocoder->getDescriptionForNumber(self::$KO_Number2, 'en')); + $this->assertEquals('Jeju', $this->geocoder->getDescriptionForNumber(self::$KO_Number3, 'en')); $this->assertEquals( pack('H*', 'ec849c') . pack('H*', 'ec9ab8'), - $this->geocoder->getDescriptionForNumber(self::$KO_Number1, "ko") + $this->geocoder->getDescriptionForNumber(self::$KO_Number1, 'ko') ); $this->assertEquals( pack('H*', 'ec9db8') . pack('H*', 'ecb29c'), - $this->geocoder->getDescriptionForNumber(self::$KO_Number2, "ko") + $this->geocoder->getDescriptionForNumber(self::$KO_Number2, 'ko') ); } public function testGetDescriptionForArgentinianMobileNumber() { - $this->assertEquals("La Plata", $this->geocoder->getDescriptionForNumber(self::$AR_MobileNumber, "en")); + $this->assertEquals('La Plata', $this->geocoder->getDescriptionForNumber(self::$AR_MobileNumber, 'en')); } public function testGetDescriptionForFallBack() @@ -151,18 +151,18 @@ public function testGetDescriptionForFallBack() // No fallback, as the location name for the given phone number is available in the requested // language. - $this->assertEquals("Kalifornien", $this->geocoder->getDescriptionForNumber(self::$US_Number1, "de")); + $this->assertEquals('Kalifornien', $this->geocoder->getDescriptionForNumber(self::$US_Number1, 'de')); // German falls back to English. - $this->assertEquals("New York, NY", $this->geocoder->getDescriptionForNumber(self::$US_Number3, "de")); + $this->assertEquals('New York, NY', $this->geocoder->getDescriptionForNumber(self::$US_Number3, 'de')); // Italian fals back to English. - $this->assertEquals("CA", $this->geocoder->getDescriptionForNumber(self::$US_Number1, "it")); + $this->assertEquals('CA', $this->geocoder->getDescriptionForNumber(self::$US_Number1, 'it')); // Korean doesn't fall back to English. - $this->assertEquals( pack('H*', 'eb8c80') . pack('H*', 'ed959c') . pack('H*', 'ebafbc') . pack('H*', 'eab5ad'), - $this->geocoder->getDescriptionForNumber(self::$KO_Number3, "ko") + $this->geocoder->getDescriptionForNumber(self::$KO_Number3, 'ko') ); } @@ -171,36 +171,36 @@ public function testGetDescriptionForNumberWithUserRegion() // User in Italy, American number. We should just show United States, in Spanish, and not more // detailed information. $this->assertEquals( - "Estados Unidos", - $this->geocoder->getDescriptionForNumber(self::$US_Number1, "es_ES", "IT") + 'Estados Unidos', + $this->geocoder->getDescriptionForNumber(self::$US_Number1, 'es_ES', 'IT') ); // Unknown region - should just show country name. $this->assertEquals( - "Estados Unidos", - $this->geocoder->getDescriptionForNumber(self::$US_Number1, "es_ES", "ZZ") + 'Estados Unidos', + $this->geocoder->getDescriptionForNumber(self::$US_Number1, 'es_ES', 'ZZ') ); // User in the States, language German, should show detailed data. - $this->assertEquals("Kalifornien", $this->geocoder->getDescriptionForNumber(self::$US_Number1, "de", "US")); + $this->assertEquals('Kalifornien', $this->geocoder->getDescriptionForNumber(self::$US_Number1, 'de', 'US')); // User in the States, language French, no data for French, so we fallback to English detailed // data. - $this->assertEquals("CA", $this->geocoder->getDescriptionForNumber(self::$US_Number1, "fr", "US")); + $this->assertEquals('CA', $this->geocoder->getDescriptionForNumber(self::$US_Number1, 'fr', 'US')); // Invalid number - return an empty string. - $this->assertEquals("", $this->geocoder->getDescriptionForNumber(self::$US_InvalidNumber, "en", "US")); + $this->assertEquals('', $this->geocoder->getDescriptionForNumber(self::$US_InvalidNumber, 'en', 'US')); } public function testGetDescriptionForInvalidNumber() { - $this->assertEquals("", $this->geocoder->getDescriptionForNumber(self::$KO_InvalidNumber, "en")); - $this->assertEquals("", $this->geocoder->getDescriptionForNumber(self::$US_InvalidNumber, "en")); + $this->assertEquals('', $this->geocoder->getDescriptionForNumber(self::$KO_InvalidNumber, 'en')); + $this->assertEquals('', $this->geocoder->getDescriptionForNumber(self::$US_InvalidNumber, 'en')); } public function testGetDescriptionForNonGeographicalNumberWithGeocodingPrefix() { // We have a geocoding prefix, but we shouldn't use it since this is not geographical. - $this->assertEquals("South Korea", $this->geocoder->getDescriptionForNumber(self::$KO_Mobile, 'en')); + $this->assertEquals('South Korea', $this->geocoder->getDescriptionForNumber(self::$KO_Mobile, 'en')); } } diff --git a/tests/prefixmapper/PrefixFileReaderTest.php b/tests/prefixmapper/PrefixFileReaderTest.php index 86f4013b5..a8307e220 100644 --- a/tests/prefixmapper/PrefixFileReaderTest.php +++ b/tests/prefixmapper/PrefixFileReaderTest.php @@ -8,7 +8,7 @@ class PrefixFileReaderTest extends TestCase { - const TEST_META_DATA_FILE_PREFIX = "/data/"; + const TEST_META_DATA_FILE_PREFIX = '/data/'; private static $KO_NUMBER; private static $US_NUMBER1; private static $US_NUMBER2; @@ -44,36 +44,36 @@ public function setUp() public function testGetDescriptionForNumberWithMapping() { - $this->assertEquals("Kalifornien", $this->reader->getDescriptionForNumber(self::$US_NUMBER1, "de", "", "CH")); - $this->assertEquals("CA", $this->reader->getDescriptionForNumber(self::$US_NUMBER1, "en", "", "AU")); + $this->assertEquals('Kalifornien', $this->reader->getDescriptionForNumber(self::$US_NUMBER1, 'de', '', 'CH')); + $this->assertEquals('CA', $this->reader->getDescriptionForNumber(self::$US_NUMBER1, 'en', '', 'AU')); $this->assertEquals( pack('H*', 'ec849c') . pack('H*', 'ec9ab8'), - $this->reader->getDescriptionForNumber(self::$KO_NUMBER, "ko", "", "") + $this->reader->getDescriptionForNumber(self::$KO_NUMBER, 'ko', '', '') ); - $this->assertEquals("Seoul", $this->reader->getDescriptionForNumber(self::$KO_NUMBER, "en", "", "")); + $this->assertEquals('Seoul', $this->reader->getDescriptionForNumber(self::$KO_NUMBER, 'en', '', '')); } public function testGetDescriptionForNumberWithMissingMapping() { - $this->assertEquals("", $this->reader->getDescriptionForNumber(self::$US_NUMBER3, "en", "", "")); + $this->assertEquals('', $this->reader->getDescriptionForNumber(self::$US_NUMBER3, 'en', '', '')); } public function testGetDescriptionUsingFallbackLanguage() { // Mapping file exists but the number isn't present, causing it to fallback. - $this->assertEquals("New York, NY", $this->reader->getDescriptionForNumber(self::$US_NUMBER2, "de", "", "CH")); + $this->assertEquals('New York, NY', $this->reader->getDescriptionForNumber(self::$US_NUMBER2, 'de', '', 'CH')); // No mapping file exists, causing it to fallback. - $this->assertEquals("New York, NY", $this->reader->getDescriptionForNumber(self::$US_NUMBER2, "sv", "", "")); + $this->assertEquals('New York, NY', $this->reader->getDescriptionForNumber(self::$US_NUMBER2, 'sv', '', '')); } public function testGetDescriptionForNonFallbackLanguage() { - $this->assertEquals("", $this->reader->getDescriptionForNumber(self::$US_NUMBER2, "ko", "", "")); + $this->assertEquals('', $this->reader->getDescriptionForNumber(self::$US_NUMBER2, 'ko', '', '')); } public function testGetDescriptionForNumberWithoutMappingFile() { - $this->assertEquals("", $this->reader->getDescriptionForNumber(self::$SE_NUMBER, "sv", "", "")); - $this->assertEquals("", $this->reader->getDescriptionForNumber(self::$SE_NUMBER, "en", "", "")); + $this->assertEquals('', $this->reader->getDescriptionForNumber(self::$SE_NUMBER, 'sv', '', '')); + $this->assertEquals('', $this->reader->getDescriptionForNumber(self::$SE_NUMBER, 'en', '', '')); } } diff --git a/tests/timezone/PrefixTimeZonesMapTest.php b/tests/timezone/PrefixTimeZonesMapTest.php index 09769ac52..b05aa33d5 100644 --- a/tests/timezone/PrefixTimeZonesMapTest.php +++ b/tests/timezone/PrefixTimeZonesMapTest.php @@ -9,16 +9,16 @@ class PrefixTimeZonesMapTest extends TestCase { // US time zones - const CHICAGO_TZ = "America/Chicago"; - const DENVER_TZ = "America/Denver"; - const LOS_ANGELES_TZ = "America/Los_Angeles"; - const NEW_YORK_TZ = "America/New_York"; + const CHICAGO_TZ = 'America/Chicago'; + const DENVER_TZ = 'America/Denver'; + const LOS_ANGELES_TZ = 'America/Los_Angeles'; + const NEW_YORK_TZ = 'America/New_York'; // Russian time zones - const IRKUTSK_TZ = "Asia/Irkutsk"; - const MOSCOW_TZ = "Europe/Moscow"; - const VLADIVOSTOK_TZ = "Asia/Vladivostok"; - const YEKATERINBURG_TZ = "Asia/Yekaterinburg"; + const IRKUTSK_TZ = 'Asia/Irkutsk'; + const MOSCOW_TZ = 'Europe/Moscow'; + const VLADIVOSTOK_TZ = 'Asia/Vladivostok'; + const YEKATERINBURG_TZ = 'Asia/Yekaterinburg'; /** * @var PrefixTimeZonesMap */ @@ -31,7 +31,7 @@ class PrefixTimeZonesMapTest extends TestCase public static function setUpBeforeClass() { $sortedMapForUS = array(); - $sortedMapForUS[1] = self::NEW_YORK_TZ . "&" . self::CHICAGO_TZ . "&" . self::LOS_ANGELES_TZ . "&" . self::DENVER_TZ; + $sortedMapForUS[1] = self::NEW_YORK_TZ . '&' . self::CHICAGO_TZ . '&' . self::LOS_ANGELES_TZ . '&' . self::DENVER_TZ; $sortedMapForUS[1201] = self::NEW_YORK_TZ; $sortedMapForUS[1205] = self::CHICAGO_TZ; $sortedMapForUS[1208292] = self::LOS_ANGELES_TZ; diff --git a/tests/timezone/UKTest.php b/tests/timezone/UKTest.php index 9ffd9acef..676915600 100644 --- a/tests/timezone/UKTest.php +++ b/tests/timezone/UKTest.php @@ -20,7 +20,7 @@ public function testGBNumber() $number->setCountryCode(44)->setNationalNumber(1614960000); $timeZone = PhoneNumberToTimeZonesMapper::getInstance(); - $this->assertEquals(array("Europe/London"), $timeZone->getTimeZonesForNumber($number)); + $this->assertEquals(array('Europe/London'), $timeZone->getTimeZonesForNumber($number)); } public function testNonGeocodableNumber() @@ -31,7 +31,7 @@ public function testNonGeocodableNumber() $timeZone = PhoneNumberToTimeZonesMapper::getInstance(); $this->assertEquals( array( - "Europe/Guernsey", + 'Europe/Guernsey', 'Europe/Isle_of_Man', 'Europe/Jersey', 'Europe/London'