detain / zip-zapper

src/Validator.php

Braces +11 added lines, -22 removed lines

@@ -12,8 +12,7 @@ 
  *
  * @author Joe Huss <detain@interserver.net>
  */
-class Validator
-{
+class Validator {
 	protected $zip_names = array(
 		'BR' => array('name' => 'CEP', 'acronym_text' => 'Código de endereçamento postal (Postal Addressing Code)'),
 		'CA' => array('name' => 'Postal Code', 'acronym_text' => ''),
@@ -285,54 +284,44 @@ 
 		'ZW' => array(), // Zimbabwe, Notes: System is being planned.
 	);
 
-	public function isValid($countryCode, $postalCode, $ignoreSpaces = false)
-	{
+	public function isValid($countryCode, $postalCode, $ignoreSpaces = false) {
 		//$postalCode = str_replace('-', '', $postalCode);
-		if (!isset($this->formats[$countryCode]))
-		{
+		if (!isset($this->formats[$countryCode])) {
 			throw new ValidationException(sprintf('Invalid country code: "%s"', $countryCode));
 		}
 
-		foreach ($this->formats[$countryCode] as $format)
-		{
+		foreach ($this->formats[$countryCode] as $format) {
 			#echo $postalCode . ' - ' . $this->getFormatPattern($format)."\n";
-			if (preg_match($this->getFormatPattern($format, $ignoreSpaces), $postalCode))
-			{
+			if (preg_match($this->getFormatPattern($format, $ignoreSpaces), $postalCode)) {
 				return true;
 			}
 		}
 
-		if (!count($this->formats[$countryCode]))
-		{
+		if (!count($this->formats[$countryCode])) {
 			return true;
 		}
 
 		return false;
 	}
 
-	public function getFormats($countryCode)
-	{
-		if (!isset($this->formats[$countryCode]))
-		{
+	public function getFormats($countryCode) {
+		if (!isset($this->formats[$countryCode])) {
 			throw new ValidationException(sprintf('Invalid country code: "%s"', $countryCode));
 		}
 
 		return $this->formats[$countryCode];
 	}
 
-	public function hasCountry($countryCode)
-	{
+	public function hasCountry($countryCode) {
 		return (isset($this->formats[$countryCode]));
 	}
 
-	protected function getFormatPattern($format, $ignoreSpaces = false)
-	{
+	protected function getFormatPattern($format, $ignoreSpaces = false) {
 		//$format = str_replace('-', '', $format);
 		$pattern = str_replace('#', '\d', $format);
 		$pattern = str_replace('@', '[a-zA-Z]', $pattern);
 
-		if ($ignoreSpaces)
-		{
+		if ($ignoreSpaces) {
 			$pattern = str_replace(' ', ' ?', $pattern);
 		}
 

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
 			$pattern = str_replace(' ', ' ?', $pattern);
 		}
 
-		return '/^' . $pattern . '$/';
+		return '/^'.$pattern.'$/';
 	}
 
 	public function getZipName($countryCode) {

bin/parse.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 	'US' => ['name' => 'ZIP code', 'acronym_text' => 'Zone Improvement Plan'],
 ];
 
-require(__DIR__ . '/../../../include/functions.inc.php');
+require(__DIR__.'/../../../include/functions.inc.php');
 function_requirements('getcurlpage');
 $page = getcurlpage('https://en.wikipedia.org/wiki/Special:Export/List_of_postal_codes');
 $page = str_replace("\n\n", "\n", $page);
@@ -45,13 +45,13 @@ 
 		$area = explode(',', $area);
 		foreach ($area as $each_area)
 			if (trim($each_area) != '' && trim($each_area) != '- no codes -')
-				$codes[] = "'" . trim($each_area) . "'";
+				$codes[] = "'".trim($each_area)."'";
 		$street = explode(',', $street);
 		foreach ($street as $each_street)
 			if (trim($each_street) != '')
-				$codes[] = "'" . trim($each_street) . "'";
+				$codes[] = "'".trim($each_street)."'";
 		$found[] = $iso;
-		echo "		'$iso' => [" . str_replace(['N', 'A'], ['#', '@'], implode(", ", $codes)) . "]," . (sizeof($codes) == 0 ? '	' : '') . "		// $country" . (trim($notes) != '' ? ', Notes: ' . $notes : '') . "\n";
+		echo "		'$iso' => [".str_replace(['N', 'A'], ['#', '@'], implode(", ", $codes))."],".(sizeof($codes) == 0 ? '	' : '')."		// $country".(trim($notes) != '' ? ', Notes: '.$notes : '')."\n";
 	}
 }
 $db = $GLOBALS['tf']->db;
@@ -75,12 +75,12 @@ 
 	$area = explode(',', $area);
 	foreach ($area as $each_area)
 		if (trim($each_area) != '' && trim($each_area) != '- no codes -')
-			$codes[] = "'" . trim($each_area) . "'";
+			$codes[] = "'".trim($each_area)."'";
 	$street = explode(',', $street);
 	foreach ($street as $each_street)
 		if (trim($each_street) != '')
-			$codes[] = "'" . trim($each_street) . "'";
-	echo "		'$iso' => [" . implode(", ", $codes) . "]	// $country" . (trim($notes) != '' ? ', Notes: ' . $notes : '') . "\n";
+			$codes[] = "'".trim($each_street)."'";
+	echo "		'$iso' => [".implode(", ", $codes)."]	// $country".(trim($notes) != '' ? ', Notes: '.$notes : '')."\n";
 }
 //$page = getcurlpage('https://en.wikipedia.org/wiki/List_of_postal_codes');
 //function_requirements('xml2array');