linkeddatacenter / BOTK-core

src/Filters.php

Doc Comments +1 added lines

@@ -58,6 +58,7 @@
 	
 	/**
 	 * Normalize email
+	 * @param string $value
 	 */
 	static function normalizeEmail($value)
 	{

Indentation +72 added lines, -72 removed lines

@@ -7,91 +7,91 @@
  */
 class Filters {
 
-	/**
-	 * uppercase, no trailing and ending blancs, no multiple spaces, no "strange" strings, no blanks after dot., a single blanc after comma
-	 */
-	static function normalizeAddress($value)
-	{
-		$value = filter_var($value, FILTER_SANITIZE_STRING); 	// no "strange" strings
-		$value = preg_replace('/\s*([,;])/', '$1 ', $value);	// a single blanc after comma and semicolon, no space before
-		$value = preg_replace('/\-/', ' - ', $value);			// a single blanc after and before dash
-		$value = preg_replace('/\s*\.\s*/', '.', $value);		// no blanks before and after dot 
-		$value = preg_replace('/[\s]{1,}/', ' ', $value);		// no multiple spaces,
-		$value = preg_replace('/,\s,\s/', ', ', $value);		// remove multiple comma
-		$value = preg_replace('/;\s;\s/', '; ', $value);		// remove multiple semicolon
-		$value = preg_replace('/\-\s\-\s/', '- ', $value);		// remove multiple dash
-		$value = preg_replace('/^\s*[\,\;]/', '', $value);		// remove  comma and semicolon at start
-		$value = trim($value); 									// no trailing and ending blancs
-		return mb_strtoupper($value,'UTF-8');					// uppercase
-	}
+    /**
+     * uppercase, no trailing and ending blancs, no multiple spaces, no "strange" strings, no blanks after dot., a single blanc after comma
+     */
+    static function normalizeAddress($value)
+    {
+        $value = filter_var($value, FILTER_SANITIZE_STRING); 	// no "strange" strings
+        $value = preg_replace('/\s*([,;])/', '$1 ', $value);	// a single blanc after comma and semicolon, no space before
+        $value = preg_replace('/\-/', ' - ', $value);			// a single blanc after and before dash
+        $value = preg_replace('/\s*\.\s*/', '.', $value);		// no blanks before and after dot 
+        $value = preg_replace('/[\s]{1,}/', ' ', $value);		// no multiple spaces,
+        $value = preg_replace('/,\s,\s/', ', ', $value);		// remove multiple comma
+        $value = preg_replace('/;\s;\s/', '; ', $value);		// remove multiple semicolon
+        $value = preg_replace('/\-\s\-\s/', '- ', $value);		// remove multiple dash
+        $value = preg_replace('/^\s*[\,\;]/', '', $value);		// remove  comma and semicolon at start
+        $value = trim($value); 									// no trailing and ending blancs
+        return mb_strtoupper($value,'UTF-8');					// uppercase
+    }
 	
 
-	static function normalizeToken($value)
-	{
-		$value = preg_replace('/[^\w]/', '', $value);
-		return strtoupper($value);
-	}
+    static function normalizeToken($value)
+    {
+        $value = preg_replace('/[^\w]/', '', $value);
+        return strtoupper($value);
+    }
 
 
-	/**
-	 * Normalize an italian telephone number
-	 */
-	static function normalizeItTelephone($value)
-	{
-		$value = preg_replace('/^[^0-9\+]+/', '', $value);  	// remove all from beginning execept numbers and +
-		$value = preg_replace('/^\+39/', '', $value);  			// remove +39 prefix		
-		$value = preg_replace('/^0039/', '', $value);  			// remove 0039 prefix
-		$value = preg_replace('/[\s\(\)]+/', '', $value);  		// remove all blanks and parenthesis
+    /**
+     * Normalize an italian telephone number
+     */
+    static function normalizeItTelephone($value)
+    {
+        $value = preg_replace('/^[^0-9\+]+/', '', $value);  	// remove all from beginning execept numbers and +
+        $value = preg_replace('/^\+39/', '', $value);  			// remove +39 prefix		
+        $value = preg_replace('/^0039/', '', $value);  			// remove 0039 prefix
+        $value = preg_replace('/[\s\(\)]+/', '', $value);  		// remove all blanks and parenthesis
 				
-		// separate number from extensions (if any)
-		if( preg_match('/([0-9]+)(.*)/', $value, $matches)){
-			$value = $matches[1];
-			$extension = preg_replace('/[^0-9]/', '', $matches[2]);;
-			if($extension){
-				$value .= " [$extension]";
-			}			
-		}					
+        // separate number from extensions (if any)
+        if( preg_match('/([0-9]+)(.*)/', $value, $matches)){
+            $value = $matches[1];
+            $extension = preg_replace('/[^0-9]/', '', $matches[2]);;
+            if($extension){
+                $value .= " [$extension]";
+            }			
+        }					
 
-		return $value;		
-	}
+        return $value;		
+    }
 	
 	
-	/**
-	 * Normalize email
-	 */
-	static function normalizeEmail($value)
-	{
-		$value =  	filter_var($value, FILTER_VALIDATE_EMAIL);
-		return strtoupper($value);		
-	}
+    /**
+     * Normalize email
+     */
+    static function normalizeEmail($value)
+    {
+        $value =  	filter_var($value, FILTER_VALIDATE_EMAIL);
+        return strtoupper($value);		
+    }
 	
 
-	/**
-	 * Create a normalizzed addres from a propery list.
-	 * Property list can contain follwin fields:
-	 * 		'addressCountry',
-	 * 		'addressLocality',
-	 * 		'addressRegion',
-	 * 		'streetAddress',
-	 * 		'postalCode',
-	 */
-	static function buildNormalizedAddress(array $properties)
-	{	
-		extract($properties);
+    /**
+     * Create a normalizzed addres from a propery list.
+     * Property list can contain follwin fields:
+     * 		'addressCountry',
+     * 		'addressLocality',
+     * 		'addressRegion',
+     * 		'streetAddress',
+     * 		'postalCode',
+     */
+    static function buildNormalizedAddress(array $properties)
+    {	
+        extract($properties);
 		
-		// veryfy that at least a minimum set of information are present
-		if(empty($streetAddress) || empty($addressCountry) || (empty($addressLocality) && empty($postalCode))){
-			return false;
-		}
+        // veryfy that at least a minimum set of information are present
+        if(empty($streetAddress) || empty($addressCountry) || (empty($addressLocality) && empty($postalCode))){
+            return false;
+        }
 
-		$geolabel = "$streetAddress ,";
-		if(!empty($postalCode)) { $geolabel.= " $postalCode";}
-		if(!empty($addressLocality)) { $geolabel.= " $addressLocality"; }
-		if(!empty($addressRegion)) { $geolabel.= " ($addressRegion)"; }
-		$geolabel.= " - $addressCountry";
+        $geolabel = "$streetAddress ,";
+        if(!empty($postalCode)) { $geolabel.= " $postalCode";}
+        if(!empty($addressLocality)) { $geolabel.= " $addressLocality"; }
+        if(!empty($addressRegion)) { $geolabel.= " ($addressRegion)"; }
+        $geolabel.= " - $addressCountry";
 		
-		return self::normalizeAddress($geolabel);
-	}
+        return self::normalizeAddress($geolabel);
+    }
 
 	
 }
\ No newline at end of file

Spacing +24 added lines, -24 removed lines

@@ -12,17 +12,17 @@ 
 	 */
 	static function normalizeAddress($value)
 	{
-		$value = filter_var($value, FILTER_SANITIZE_STRING); 	// no "strange" strings
-		$value = preg_replace('/\s*([,;])/', '$1 ', $value);	// a single blanc after comma and semicolon, no space before
-		$value = preg_replace('/\-/', ' - ', $value);			// a single blanc after and before dash
-		$value = preg_replace('/\s*\.\s*/', '.', $value);		// no blanks before and after dot 
-		$value = preg_replace('/[\s]{1,}/', ' ', $value);		// no multiple spaces,
-		$value = preg_replace('/,\s,\s/', ', ', $value);		// remove multiple comma
-		$value = preg_replace('/;\s;\s/', '; ', $value);		// remove multiple semicolon
-		$value = preg_replace('/\-\s\-\s/', '- ', $value);		// remove multiple dash
-		$value = preg_replace('/^\s*[\,\;]/', '', $value);		// remove  comma and semicolon at start
-		$value = trim($value); 									// no trailing and ending blancs
-		return mb_strtoupper($value,'UTF-8');					// uppercase
+		$value = filter_var($value, FILTER_SANITIZE_STRING); // no "strange" strings
+		$value = preg_replace('/\s*([,;])/', '$1 ', $value); // a single blanc after comma and semicolon, no space before
+		$value = preg_replace('/\-/', ' - ', $value); // a single blanc after and before dash
+		$value = preg_replace('/\s*\.\s*/', '.', $value); // no blanks before and after dot 
+		$value = preg_replace('/[\s]{1,}/', ' ', $value); // no multiple spaces,
+		$value = preg_replace('/,\s,\s/', ', ', $value); // remove multiple comma
+		$value = preg_replace('/;\s;\s/', '; ', $value); // remove multiple semicolon
+		$value = preg_replace('/\-\s\-\s/', '- ', $value); // remove multiple dash
+		$value = preg_replace('/^\s*[\,\;]/', '', $value); // remove  comma and semicolon at start
+		$value = trim($value); // no trailing and ending blancs
+		return mb_strtoupper($value, 'UTF-8'); // uppercase
 	}
 	
 
@@ -38,16 +38,16 @@ 
 	 */
 	static function normalizeItTelephone($value)
 	{
-		$value = preg_replace('/^[^0-9\+]+/', '', $value);  	// remove all from beginning execept numbers and +
-		$value = preg_replace('/^\+39/', '', $value);  			// remove +39 prefix		
-		$value = preg_replace('/^0039/', '', $value);  			// remove 0039 prefix
-		$value = preg_replace('/[\s\(\)]+/', '', $value);  		// remove all blanks and parenthesis
+		$value = preg_replace('/^[^0-9\+]+/', '', $value); // remove all from beginning execept numbers and +
+		$value = preg_replace('/^\+39/', '', $value); // remove +39 prefix		
+		$value = preg_replace('/^0039/', '', $value); // remove 0039 prefix
+		$value = preg_replace('/[\s\(\)]+/', '', $value); // remove all blanks and parenthesis
 				
 		// separate number from extensions (if any)
-		if( preg_match('/([0-9]+)(.*)/', $value, $matches)){
+		if (preg_match('/([0-9]+)(.*)/', $value, $matches)) {
 			$value = $matches[1];
-			$extension = preg_replace('/[^0-9]/', '', $matches[2]);;
-			if($extension){
+			$extension = preg_replace('/[^0-9]/', '', $matches[2]); ;
+			if ($extension) {
 				$value .= " [$extension]";
 			}			
 		}					
@@ -61,7 +61,7 @@ 
 	 */
 	static function normalizeEmail($value)
 	{
-		$value =  	filter_var($value, FILTER_VALIDATE_EMAIL);
+		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
 		return strtoupper($value);		
 	}
 	
@@ -80,15 +80,15 @@ 
 		extract($properties);
 		
 		// veryfy that at least a minimum set of information are present
-		if(empty($streetAddress) || empty($addressCountry) || (empty($addressLocality) && empty($postalCode))){
+		if (empty($streetAddress) || empty($addressCountry) || (empty($addressLocality) && empty($postalCode))) {
 			return false;
 		}
 
 		$geolabel = "$streetAddress ,";
-		if(!empty($postalCode)) { $geolabel.= " $postalCode";}
-		if(!empty($addressLocality)) { $geolabel.= " $addressLocality"; }
-		if(!empty($addressRegion)) { $geolabel.= " ($addressRegion)"; }
-		$geolabel.= " - $addressCountry";
+		if (!empty($postalCode)) { $geolabel .= " $postalCode"; }
+		if (!empty($addressLocality)) { $geolabel .= " $addressLocality"; }
+		if (!empty($addressRegion)) { $geolabel .= " ($addressRegion)"; }
+		$geolabel .= " - $addressCountry";
 		
 		return self::normalizeAddress($geolabel);
 	}

src/Model/LocalBusiness.php

Indentation +154 added lines, -154 removed lines

@@ -12,172 +12,172 @@
 class LocalBusiness extends AbstractModel implements ModelInterface 
 {
 
-	static protected $DEFAULT_OPTIONS = array (
-		'base'				=> array(
-								'default'	=> 'http://linkeddata.center/botk/resource/',
-								'filter'    => FILTER_SANITIZE_URL,
-			                   ),
-		'uri'				=> array(
-								'filter'    => FILTER_SANITIZE_URL,
-			                   ),
-		'lang'				=> array(
-								'default'	=> 'it',		
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[a-z]{2}$/')
-			                   ),
-		'id'				=> array(		
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[\w]+$/')
-			                   ),
-		'taxID'				=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeToken'
-			                   ),
-		'vatID'				=> array(	// italian rules
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[0-9]{11}$/')
-			                   ),
-		'legalName'			=> array(
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-			                   ),
-		'alternateName'		=> array(),
-		'addressCountry'	=> array(
-								'default'	=> 'IT',		
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[A-Z]{2}$/')
-			                   ),
-		'addressLocality'	=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-			                   ),
-		'addressRegion'		=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-			                   ),
-		'streetAddress'		=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-			                   ),
-		'postalCode'		=> array(	// italian rules
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[0-9]{5}$/')
-			                   ),
-		'page'				=> array(	
-								'filter'    => FILTER_SANITIZE_URL
-			                   ),
-		'telephone'			=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeItTelephone'
-			                   ),
-		'faxNumber'			=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeItTelephone'
-			                   ),
-		'email'				=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeEmail'
-			                   ),
-		'geoDescription'	=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-			                   ),
-		'lat'				=> array( // http://www.regexlib.com/REDetails.aspx?regexp_id=2728
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/')
-			                   ),
-		'long'				=> array( // http://stackoverflow.com/questions/3518504/regular-expression-for-matching-latitude-longitude-coordinates
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/')
-			                   ),
-	);
+    static protected $DEFAULT_OPTIONS = array (
+        'base'				=> array(
+                                'default'	=> 'http://linkeddata.center/botk/resource/',
+                                'filter'    => FILTER_SANITIZE_URL,
+                                ),
+        'uri'				=> array(
+                                'filter'    => FILTER_SANITIZE_URL,
+                                ),
+        'lang'				=> array(
+                                'default'	=> 'it',		
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[a-z]{2}$/')
+                                ),
+        'id'				=> array(		
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[\w]+$/')
+                                ),
+        'taxID'				=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeToken'
+                                ),
+        'vatID'				=> array(	// italian rules
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[0-9]{11}$/')
+                                ),
+        'legalName'			=> array(
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                ),
+        'alternateName'		=> array(),
+        'addressCountry'	=> array(
+                                'default'	=> 'IT',		
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[A-Z]{2}$/')
+                                ),
+        'addressLocality'	=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                ),
+        'addressRegion'		=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                ),
+        'streetAddress'		=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                ),
+        'postalCode'		=> array(	// italian rules
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[0-9]{5}$/')
+                                ),
+        'page'				=> array(	
+                                'filter'    => FILTER_SANITIZE_URL
+                                ),
+        'telephone'			=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeItTelephone'
+                                ),
+        'faxNumber'			=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeItTelephone'
+                                ),
+        'email'				=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeEmail'
+                                ),
+        'geoDescription'	=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                ),
+        'lat'				=> array( // http://www.regexlib.com/REDetails.aspx?regexp_id=2728
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/')
+                                ),
+        'long'				=> array( // http://stackoverflow.com/questions/3518504/regular-expression-for-matching-latitude-longitude-coordinates
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/')
+                                ),
+    );
 	
 	
-	public function asTurtle()
-	{
-		if(is_null($this->rdf)) {
-			$tc =0;
-			$rdf='';
-			extract($this->data);
+    public function asTurtle()
+    {
+        if(is_null($this->rdf)) {
+            $tc =0;
+            $rdf='';
+            extract($this->data);
 
-			// create uris
-			$organizationUri = empty($uri)?($base. (empty($id)?uniqid():$id)):$uri;
-			$addressUri = $organizationUri.'_address';
-			$placeUri = $organizationUri.'_place';
-			$geoUri = ( !empty($lat) && !empty($long) )?"geo:$lat,$long":($organizationUri.'_geo'); 
+            // create uris
+            $organizationUri = empty($uri)?($base. (empty($id)?uniqid():$id)):$uri;
+            $addressUri = $organizationUri.'_address';
+            $placeUri = $organizationUri.'_place';
+            $geoUri = ( !empty($lat) && !empty($long) )?"geo:$lat,$long":($organizationUri.'_geo'); 
 
 			
-			// define the minimum condition to skipp the rdf generation
+            // define the minimum condition to skipp the rdf generation
 			
-			$skippAddress = 	empty($alternateName) &&
-								empty($addressLocality) &&
-								empty($streetAddress) &&
-								empty($postalCode) &&
-								empty($page) &&
-								empty($telephone) &&
-								empty($faxNumber) &&
-								empty($email)
-			;
-			$skippGeo = empty($geoDescription) &&
-						empty($addressLocality) &&
-						empty($streetAddress) &&
-						empty($lat) && 
-						empty($long) ;
-			$skippPlace = $skippGeo && $skippAddress;
+            $skippAddress = 	empty($alternateName) &&
+                                empty($addressLocality) &&
+                                empty($streetAddress) &&
+                                empty($postalCode) &&
+                                empty($page) &&
+                                empty($telephone) &&
+                                empty($faxNumber) &&
+                                empty($email)
+            ;
+            $skippGeo = empty($geoDescription) &&
+                        empty($addressLocality) &&
+                        empty($streetAddress) &&
+                        empty($lat) && 
+                        empty($long) ;
+            $skippPlace = $skippGeo && $skippAddress;
 			
-			$skippOrganization = $skippPlace && empty($id)&& empty($vatID) && empty($taxID) && empty($legalName) ;
+            $skippOrganization = $skippPlace && empty($id)&& empty($vatID) && empty($taxID) && empty($legalName) ;
 
-	 		// serialize schema:Organization
-	 		if( !$skippOrganization){
-				$rdf.= sprintf( '<%s> a schema:Organization;', $organizationUri); $tc++;
-				if(!empty($id)) { $rdf.= sprintf( 'dct:identifier "%s";', $id); $tc++; }
-				if(!empty($vatID)) { $rdf.= sprintf( 'schema:vatID "%s"@%s;', $vatID, $lang); $tc++; }
-				if(!empty($taxtID)) { $rdf.= sprintf( 'schema:taxtID "%s"@%s;', $taxID, $lang); $tc++; }
-				if(!empty($legalName)) { $rdf.= sprintf( 'schema:legalName """%s"""@%s;', $legalName, $lang); $tc++; }
-				if( !$skippPlace) { $rdf.= sprintf( 'schema:location <%s>;', $placeUri); $tc++; }
-				$rdf.= " . ";
-			}	
+                // serialize schema:Organization
+                if( !$skippOrganization){
+                $rdf.= sprintf( '<%s> a schema:Organization;', $organizationUri); $tc++;
+                if(!empty($id)) { $rdf.= sprintf( 'dct:identifier "%s";', $id); $tc++; }
+                if(!empty($vatID)) { $rdf.= sprintf( 'schema:vatID "%s"@%s;', $vatID, $lang); $tc++; }
+                if(!empty($taxtID)) { $rdf.= sprintf( 'schema:taxtID "%s"@%s;', $taxID, $lang); $tc++; }
+                if(!empty($legalName)) { $rdf.= sprintf( 'schema:legalName """%s"""@%s;', $legalName, $lang); $tc++; }
+                if( !$skippPlace) { $rdf.= sprintf( 'schema:location <%s>;', $placeUri); $tc++; }
+                $rdf.= " . ";
+            }	
 			
-			// serialize schema:PostalAddress 
-			if( !$skippAddress){
-				$rdf.= sprintf( '<%s> a schema:PostalAddress;', $addressUri); $tc++;
-				if(!empty($alternateName)) { $rdf.= sprintf( 'schema:alternateName """%s"""@%;', $addressCountry,$lang); $tc++; }
-				if(!empty($streetAddress)) { $rdf.= sprintf( 'schema:streetAddress """%s"""@%s;', $streetAddress, $lang); $tc++; }
-				if(!empty($postalCode)) { $rdf.= sprintf( 'schema:postalCode "%s"@%s;', $postalCode, $lang); $tc++; }
-				if(!empty($addressLocality)) { $rdf.= sprintf( 'schema:addressLocality """%s"""@%s;', $addressLocality, $lang); $tc++; }
-				if(!empty($addressRegion)) { $rdf.= sprintf( 'schema:addressRegion """%s"""@%s;', $addressRegion, $lang); $tc++; }
-				if(!empty($addressCountry)) { $rdf.= sprintf( 'schema:addressCountry "%s";', $addressCountry); $tc++; }
-				if(!empty($telephone)) { $rdf.= sprintf( 'schema:telephone """%s"""@%s;', $telephone, $lang); $tc++; }
-				if(!empty($faxNumber)) { $rdf.= sprintf( 'schema:faxNumber """%s"""@%s;', $faxNumber, $lang); $tc++; }
-				if(!empty($page)) { $rdf.= sprintf( 'schema:page <%s>;', $page); $tc++; }
-				if(!empty($email)) { $rdf.= sprintf( 'schema:email "%s";', $email); $tc++; }
-				$rdf.= " . ";
-			}
+            // serialize schema:PostalAddress 
+            if( !$skippAddress){
+                $rdf.= sprintf( '<%s> a schema:PostalAddress;', $addressUri); $tc++;
+                if(!empty($alternateName)) { $rdf.= sprintf( 'schema:alternateName """%s"""@%;', $addressCountry,$lang); $tc++; }
+                if(!empty($streetAddress)) { $rdf.= sprintf( 'schema:streetAddress """%s"""@%s;', $streetAddress, $lang); $tc++; }
+                if(!empty($postalCode)) { $rdf.= sprintf( 'schema:postalCode "%s"@%s;', $postalCode, $lang); $tc++; }
+                if(!empty($addressLocality)) { $rdf.= sprintf( 'schema:addressLocality """%s"""@%s;', $addressLocality, $lang); $tc++; }
+                if(!empty($addressRegion)) { $rdf.= sprintf( 'schema:addressRegion """%s"""@%s;', $addressRegion, $lang); $tc++; }
+                if(!empty($addressCountry)) { $rdf.= sprintf( 'schema:addressCountry "%s";', $addressCountry); $tc++; }
+                if(!empty($telephone)) { $rdf.= sprintf( 'schema:telephone """%s"""@%s;', $telephone, $lang); $tc++; }
+                if(!empty($faxNumber)) { $rdf.= sprintf( 'schema:faxNumber """%s"""@%s;', $faxNumber, $lang); $tc++; }
+                if(!empty($page)) { $rdf.= sprintf( 'schema:page <%s>;', $page); $tc++; }
+                if(!empty($email)) { $rdf.= sprintf( 'schema:email "%s";', $email); $tc++; }
+                $rdf.= " . ";
+            }
 
-			// serialize schema:GeoCoordinates
-			if( !$skippGeo){
-				$geoLabel = \BOTK\Filters::buildNormalizedAddress($this->data);
-				$rdf.= sprintf( '<%s> a schema:GeoCoordinates;', $geoUri); $tc++;
-				if(!empty($geoLabel)) { $rdf.= sprintf( 'schema:alternateLabel ""%s""@%s;', $geoLabel, $lang); $tc++; }
-				if(!empty($geoDescription)) { $rdf.= sprintf( 'schema:alternateLabel ""%s""@%s;', $geoDescription, $lang); $tc++; }
-				if(!empty($lat)) { $rdf.= sprintf( 'wgs:lat %s ;', $lat); $tc++; }
-				if(!empty($long)) { $rdf.= sprintf( 'wgs:long %s ;', $long); $tc++; }
-				$rdf.= " . ";	
-			}
+            // serialize schema:GeoCoordinates
+            if( !$skippGeo){
+                $geoLabel = \BOTK\Filters::buildNormalizedAddress($this->data);
+                $rdf.= sprintf( '<%s> a schema:GeoCoordinates;', $geoUri); $tc++;
+                if(!empty($geoLabel)) { $rdf.= sprintf( 'schema:alternateLabel ""%s""@%s;', $geoLabel, $lang); $tc++; }
+                if(!empty($geoDescription)) { $rdf.= sprintf( 'schema:alternateLabel ""%s""@%s;', $geoDescription, $lang); $tc++; }
+                if(!empty($lat)) { $rdf.= sprintf( 'wgs:lat %s ;', $lat); $tc++; }
+                if(!empty($long)) { $rdf.= sprintf( 'wgs:long %s ;', $long); $tc++; }
+                $rdf.= " . ";	
+            }
 
-			// serialize schema:Place
-			if( !$skippPlace){
-				$rdf.= sprintf( '<%s> a schema:LocalBusiness;', $placeUri); $tc++;
-				if(!$skippAddress) { $rdf.= sprintf( 'schema:address <%s>;', $addressUri); $tc++; }
-				if(!$skippGeo) { $rdf.= sprintf( 'schema:geo <%s>;', $geoUri); $tc++; }
-				$rdf.= " . ";
-			}
+            // serialize schema:Place
+            if( !$skippPlace){
+                $rdf.= sprintf( '<%s> a schema:LocalBusiness;', $placeUri); $tc++;
+                if(!$skippAddress) { $rdf.= sprintf( 'schema:address <%s>;', $addressUri); $tc++; }
+                if(!$skippGeo) { $rdf.= sprintf( 'schema:geo <%s>;', $geoUri); $tc++; }
+                $rdf.= " . ";
+            }
 	
-			$this->rdf = $rdf;
-			$this->tripleCount  = $tc;
-		}
+            $this->rdf = $rdf;
+            $this->tripleCount  = $tc;
+        }
 		
-		return $this->rdf;
-	}
+        return $this->rdf;
+    }
 	
 }
\ No newline at end of file

Spacing +43 added lines, -43 removed lines

@@ -12,7 +12,7 @@ 
 class LocalBusiness extends AbstractModel implements ModelInterface 
 {
 
-	static protected $DEFAULT_OPTIONS = array (
+	static protected $DEFAULT_OPTIONS = array(
 		'base'				=> array(
 								'default'	=> 'http://linkeddata.center/botk/resource/',
 								'filter'    => FILTER_SANITIZE_URL,
@@ -95,21 +95,21 @@ 
 	
 	public function asTurtle()
 	{
-		if(is_null($this->rdf)) {
-			$tc =0;
-			$rdf='';
+		if (is_null($this->rdf)) {
+			$tc = 0;
+			$rdf = '';
 			extract($this->data);
 
 			// create uris
-			$organizationUri = empty($uri)?($base. (empty($id)?uniqid():$id)):$uri;
+			$organizationUri = empty($uri) ? ($base.(empty($id) ? uniqid() : $id)) : $uri;
 			$addressUri = $organizationUri.'_address';
 			$placeUri = $organizationUri.'_place';
-			$geoUri = ( !empty($lat) && !empty($long) )?"geo:$lat,$long":($organizationUri.'_geo'); 
+			$geoUri = (!empty($lat) && !empty($long)) ? "geo:$lat,$long" : ($organizationUri.'_geo'); 
 
 			
 			// define the minimum condition to skipp the rdf generation
 			
-			$skippAddress = 	empty($alternateName) &&
+			$skippAddress = empty($alternateName) &&
 								empty($addressLocality) &&
 								empty($streetAddress) &&
 								empty($postalCode) &&
@@ -122,59 +122,59 @@ 
 						empty($addressLocality) &&
 						empty($streetAddress) &&
 						empty($lat) && 
-						empty($long) ;
+						empty($long);
 			$skippPlace = $skippGeo && $skippAddress;
 			
-			$skippOrganization = $skippPlace && empty($id)&& empty($vatID) && empty($taxID) && empty($legalName) ;
+			$skippOrganization = $skippPlace && empty($id) && empty($vatID) && empty($taxID) && empty($legalName);
 
 	 		// serialize schema:Organization
-	 		if( !$skippOrganization){
-				$rdf.= sprintf( '<%s> a schema:Organization;', $organizationUri); $tc++;
-				if(!empty($id)) { $rdf.= sprintf( 'dct:identifier "%s";', $id); $tc++; }
-				if(!empty($vatID)) { $rdf.= sprintf( 'schema:vatID "%s"@%s;', $vatID, $lang); $tc++; }
-				if(!empty($taxtID)) { $rdf.= sprintf( 'schema:taxtID "%s"@%s;', $taxID, $lang); $tc++; }
-				if(!empty($legalName)) { $rdf.= sprintf( 'schema:legalName """%s"""@%s;', $legalName, $lang); $tc++; }
-				if( !$skippPlace) { $rdf.= sprintf( 'schema:location <%s>;', $placeUri); $tc++; }
-				$rdf.= " . ";
+	 		if (!$skippOrganization) {
+				$rdf .= sprintf('<%s> a schema:Organization;', $organizationUri); $tc++;
+				if (!empty($id)) { $rdf .= sprintf('dct:identifier "%s";', $id); $tc++; }
+				if (!empty($vatID)) { $rdf .= sprintf('schema:vatID "%s"@%s;', $vatID, $lang); $tc++; }
+				if (!empty($taxtID)) { $rdf .= sprintf('schema:taxtID "%s"@%s;', $taxID, $lang); $tc++; }
+				if (!empty($legalName)) { $rdf .= sprintf('schema:legalName """%s"""@%s;', $legalName, $lang); $tc++; }
+				if (!$skippPlace) { $rdf .= sprintf('schema:location <%s>;', $placeUri); $tc++; }
+				$rdf .= " . ";
 			}	
 			
 			// serialize schema:PostalAddress 
-			if( !$skippAddress){
-				$rdf.= sprintf( '<%s> a schema:PostalAddress;', $addressUri); $tc++;
-				if(!empty($alternateName)) { $rdf.= sprintf( 'schema:alternateName """%s"""@%;', $addressCountry,$lang); $tc++; }
-				if(!empty($streetAddress)) { $rdf.= sprintf( 'schema:streetAddress """%s"""@%s;', $streetAddress, $lang); $tc++; }
-				if(!empty($postalCode)) { $rdf.= sprintf( 'schema:postalCode "%s"@%s;', $postalCode, $lang); $tc++; }
-				if(!empty($addressLocality)) { $rdf.= sprintf( 'schema:addressLocality """%s"""@%s;', $addressLocality, $lang); $tc++; }
-				if(!empty($addressRegion)) { $rdf.= sprintf( 'schema:addressRegion """%s"""@%s;', $addressRegion, $lang); $tc++; }
-				if(!empty($addressCountry)) { $rdf.= sprintf( 'schema:addressCountry "%s";', $addressCountry); $tc++; }
-				if(!empty($telephone)) { $rdf.= sprintf( 'schema:telephone """%s"""@%s;', $telephone, $lang); $tc++; }
-				if(!empty($faxNumber)) { $rdf.= sprintf( 'schema:faxNumber """%s"""@%s;', $faxNumber, $lang); $tc++; }
-				if(!empty($page)) { $rdf.= sprintf( 'schema:page <%s>;', $page); $tc++; }
-				if(!empty($email)) { $rdf.= sprintf( 'schema:email "%s";', $email); $tc++; }
-				$rdf.= " . ";
+			if (!$skippAddress) {
+				$rdf .= sprintf('<%s> a schema:PostalAddress;', $addressUri); $tc++;
+				if (!empty($alternateName)) { $rdf .= sprintf('schema:alternateName """%s"""@%;', $addressCountry, $lang); $tc++; }
+				if (!empty($streetAddress)) { $rdf .= sprintf('schema:streetAddress """%s"""@%s;', $streetAddress, $lang); $tc++; }
+				if (!empty($postalCode)) { $rdf .= sprintf('schema:postalCode "%s"@%s;', $postalCode, $lang); $tc++; }
+				if (!empty($addressLocality)) { $rdf .= sprintf('schema:addressLocality """%s"""@%s;', $addressLocality, $lang); $tc++; }
+				if (!empty($addressRegion)) { $rdf .= sprintf('schema:addressRegion """%s"""@%s;', $addressRegion, $lang); $tc++; }
+				if (!empty($addressCountry)) { $rdf .= sprintf('schema:addressCountry "%s";', $addressCountry); $tc++; }
+				if (!empty($telephone)) { $rdf .= sprintf('schema:telephone """%s"""@%s;', $telephone, $lang); $tc++; }
+				if (!empty($faxNumber)) { $rdf .= sprintf('schema:faxNumber """%s"""@%s;', $faxNumber, $lang); $tc++; }
+				if (!empty($page)) { $rdf .= sprintf('schema:page <%s>;', $page); $tc++; }
+				if (!empty($email)) { $rdf .= sprintf('schema:email "%s";', $email); $tc++; }
+				$rdf .= " . ";
 			}
 
 			// serialize schema:GeoCoordinates
-			if( !$skippGeo){
+			if (!$skippGeo) {
 				$geoLabel = \BOTK\Filters::buildNormalizedAddress($this->data);
-				$rdf.= sprintf( '<%s> a schema:GeoCoordinates;', $geoUri); $tc++;
-				if(!empty($geoLabel)) { $rdf.= sprintf( 'schema:alternateLabel ""%s""@%s;', $geoLabel, $lang); $tc++; }
-				if(!empty($geoDescription)) { $rdf.= sprintf( 'schema:alternateLabel ""%s""@%s;', $geoDescription, $lang); $tc++; }
-				if(!empty($lat)) { $rdf.= sprintf( 'wgs:lat %s ;', $lat); $tc++; }
-				if(!empty($long)) { $rdf.= sprintf( 'wgs:long %s ;', $long); $tc++; }
-				$rdf.= " . ";	
+				$rdf .= sprintf('<%s> a schema:GeoCoordinates;', $geoUri); $tc++;
+				if (!empty($geoLabel)) { $rdf .= sprintf('schema:alternateLabel ""%s""@%s;', $geoLabel, $lang); $tc++; }
+				if (!empty($geoDescription)) { $rdf .= sprintf('schema:alternateLabel ""%s""@%s;', $geoDescription, $lang); $tc++; }
+				if (!empty($lat)) { $rdf .= sprintf('wgs:lat %s ;', $lat); $tc++; }
+				if (!empty($long)) { $rdf .= sprintf('wgs:long %s ;', $long); $tc++; }
+				$rdf .= " . ";	
 			}
 
 			// serialize schema:Place
-			if( !$skippPlace){
-				$rdf.= sprintf( '<%s> a schema:LocalBusiness;', $placeUri); $tc++;
-				if(!$skippAddress) { $rdf.= sprintf( 'schema:address <%s>;', $addressUri); $tc++; }
-				if(!$skippGeo) { $rdf.= sprintf( 'schema:geo <%s>;', $geoUri); $tc++; }
-				$rdf.= " . ";
+			if (!$skippPlace) {
+				$rdf .= sprintf('<%s> a schema:LocalBusiness;', $placeUri); $tc++;
+				if (!$skippAddress) { $rdf .= sprintf('schema:address <%s>;', $addressUri); $tc++; }
+				if (!$skippGeo) { $rdf .= sprintf('schema:geo <%s>;', $geoUri); $tc++; }
+				$rdf .= " . ";
 			}
 	
 			$this->rdf = $rdf;
-			$this->tripleCount  = $tc;
+			$this->tripleCount = $tc;
 		}
 		
 		return $this->rdf;

src/Model/AbstractModel.php

Indentation +56 added lines, -56 removed lines

@@ -12,82 +12,82 @@
 abstract class AbstractModel 
 {
 
-	static protected $DEFAULT_OPTIONS = array (
-	);
+    static protected $DEFAULT_OPTIONS = array (
+    );
 	
 	
-	protected $data;
-	protected $options;
-	protected $rdf =null; //lazy created
-	protected $tripleCount=0; //lazy created
+    protected $data;
+    protected $options;
+    protected $rdf =null; //lazy created
+    protected $tripleCount=0; //lazy created
 	
 	
     public function __construct(array $data = array(), array $options = array()) 
     {
-    	// ensure  proper defaults exists
-    	$this->options = array_merge(static::$DEFAULT_OPTIONS, $options);
+        // ensure  proper defaults exists
+        $this->options = array_merge(static::$DEFAULT_OPTIONS, $options);
 
-		// set default values
-		foreach( $this->options as $property=>$option){	
-			if(empty($data[$property]) && isset($this->options[$property]['default'])){
-				$data[$property] = $this->options[$property]['default'];
-			}
-		}
+        // set default values
+        foreach( $this->options as $property=>$option){	
+            if(empty($data[$property]) && isset($this->options[$property]['default'])){
+                $data[$property] = $this->options[$property]['default'];
+            }
+        }
 
-		// ensure data are sanitized and validated
-		$sanitizedData = array();
-		foreach( $data as $property=>$value) {
+        // ensure data are sanitized and validated
+        $sanitizedData = array();
+        foreach( $data as $property=>$value) {
 			
-			// property must exist
-			if(!isset($this->options[$property])){
-				throw new DataModelException("Unknown property $property");
-			}
+            // property must exist
+            if(!isset($this->options[$property])){
+                throw new DataModelException("Unknown property $property");
+            }
 			
-			// apply filters to not empty variables
-			if( $value  ){
-				if(isset($this->options[$property]['filter'])){
-					$sanitizedValue = filter_var($value, $this->options[$property]['filter'], $this->options[$property]);
-					if(!$sanitizedValue){
-						throw new DataModelException("Invalid property value for $property ($value)");
-					}
-					$sanitizedData[$property]=$sanitizedValue;					
-				} else {
-					$sanitizedData[$property]=$value;
-				}
-			}
-		}
-		$this->data = $sanitizedData;
+            // apply filters to not empty variables
+            if( $value  ){
+                if(isset($this->options[$property]['filter'])){
+                    $sanitizedValue = filter_var($value, $this->options[$property]['filter'], $this->options[$property]);
+                    if(!$sanitizedValue){
+                        throw new DataModelException("Invalid property value for $property ($value)");
+                    }
+                    $sanitizedData[$property]=$sanitizedValue;					
+                } else {
+                    $sanitizedData[$property]=$value;
+                }
+            }
+        }
+        $this->data = $sanitizedData;
     }
 
 	
-	public function asArray()
-	{
-		return $this->data;
-	}
+    public function asArray()
+    {
+        return $this->data;
+    }
 
 	
-	public function getOptions()
-	{
-		return $this->options;
-	}
+    public function getOptions()
+    {
+        return $this->options;
+    }
 
 	
-	abstract public function asTurtle();
+    abstract public function asTurtle();
 	
 	
-	public function getTripleCount()
-	{
-		// triple count is computed during rdf creation
-		if (is_null($this->rdf)){
-			$this->asTurtle();
-		}
+    public function getTripleCount()
+    {
+        // triple count is computed during rdf creation
+        if (is_null($this->rdf)){
+            $this->asTurtle();
+        }
 		
-		return $this->tripleCount;
-	}
+        return $this->tripleCount;
+    }
 	
 		
-	public function __toString() 
-	{
-		return $this->asTurtle();
-	}
+    public function __toString() 
+    {
+        return $this->asTurtle();
+    }
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -12,14 +12,14 @@ 
 abstract class AbstractModel 
 {
 
-	static protected $DEFAULT_OPTIONS = array (
+	static protected $DEFAULT_OPTIONS = array(
 	);
 	
 	
 	protected $data;
 	protected $options;
-	protected $rdf =null; //lazy created
-	protected $tripleCount=0; //lazy created
+	protected $rdf = null; //lazy created
+	protected $tripleCount = 0; //lazy created
 	
 	
     public function __construct(array $data = array(), array $options = array()) 
@@ -28,31 +28,31 @@ 
     	$this->options = array_merge(static::$DEFAULT_OPTIONS, $options);
 
 		// set default values
-		foreach( $this->options as $property=>$option){	
-			if(empty($data[$property]) && isset($this->options[$property]['default'])){
+		foreach ($this->options as $property=>$option) {	
+			if (empty($data[$property]) && isset($this->options[$property]['default'])) {
 				$data[$property] = $this->options[$property]['default'];
 			}
 		}
 
 		// ensure data are sanitized and validated
 		$sanitizedData = array();
-		foreach( $data as $property=>$value) {
+		foreach ($data as $property=>$value) {
 			
 			// property must exist
-			if(!isset($this->options[$property])){
+			if (!isset($this->options[$property])) {
 				throw new DataModelException("Unknown property $property");
 			}
 			
 			// apply filters to not empty variables
-			if( $value  ){
-				if(isset($this->options[$property]['filter'])){
+			if ($value) {
+				if (isset($this->options[$property]['filter'])) {
 					$sanitizedValue = filter_var($value, $this->options[$property]['filter'], $this->options[$property]);
-					if(!$sanitizedValue){
+					if (!$sanitizedValue) {
 						throw new DataModelException("Invalid property value for $property ($value)");
 					}
-					$sanitizedData[$property]=$sanitizedValue;					
+					$sanitizedData[$property] = $sanitizedValue;					
 				} else {
-					$sanitizedData[$property]=$value;
+					$sanitizedData[$property] = $value;
 				}
 			}
 		}
@@ -78,7 +78,7 @@ 
 	public function getTripleCount()
 	{
 		// triple count is computed during rdf creation
-		if (is_null($this->rdf)){
+		if (is_null($this->rdf)) {
 			$this->asTurtle();
 		}
 		

src/ModelInterface.php

Indentation +5 added lines, -5 removed lines

@@ -4,10 +4,10 @@
 Interface ModelInterface 
 {
 	
-	public function asArray();
-	public function getOptions();
-	public function asTurtle();	
-	public function getTripleCount();
-	public function __toString();
+    public function asArray();
+    public function getOptions();
+    public function asTurtle();	
+    public function getTripleCount();
+    public function __toString();
 	
 }
\ No newline at end of file

src/FactsFactory.php

Indentation +16 added lines, -16 removed lines

@@ -3,24 +3,24 @@
 
 class FactsFactory implements FactsFactoryInterface {
 	
-	private $profile;
+    private $profile;
 	
-	public function __construct( array $profile)
-	{
-		assert(!empty($profile['model']) && class_exists('\BOTK\Model\\'.$profile['model']));
-		assert(isset($profile['datamapper']) && is_callable($profile['datamapper']));
-		assert(isset($profile['options']) && is_array($profile['options']));
-		$this->profile = $profile;
-	}
+    public function __construct( array $profile)
+    {
+        assert(!empty($profile['model']) && class_exists('\BOTK\Model\\'.$profile['model']));
+        assert(isset($profile['datamapper']) && is_callable($profile['datamapper']));
+        assert(isset($profile['options']) && is_array($profile['options']));
+        $this->profile = $profile;
+    }
 	
-	public function factualize( array $rawData){
-		$data = array();
-		$numOfRawData = count($rawData);
-		$datamapper = $this->profile['datamapper'];
-		$class = '\BOTK\Model\\'.$this->profile['model'];
-		$data = $datamapper($rawData);
+    public function factualize( array $rawData){
+        $data = array();
+        $numOfRawData = count($rawData);
+        $datamapper = $this->profile['datamapper'];
+        $class = '\BOTK\Model\\'.$this->profile['model'];
+        $data = $datamapper($rawData);
 		
-		return new $class($data,$this->profile['options']);
-	}
+        return new $class($data,$this->profile['options']);
+    }
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
 	
 	private $profile;
 	
-	public function __construct( array $profile)
+	public function __construct(array $profile)
 	{
 		assert(!empty($profile['model']) && class_exists('\BOTK\Model\\'.$profile['model']));
 		assert(isset($profile['datamapper']) && is_callable($profile['datamapper']));
@@ -13,14 +13,14 @@ 
 		$this->profile = $profile;
 	}
 	
-	public function factualize( array $rawData){
+	public function factualize(array $rawData) {
 		$data = array();
 		$numOfRawData = count($rawData);
 		$datamapper = $this->profile['datamapper'];
 		$class = '\BOTK\Model\\'.$this->profile['model'];
 		$data = $datamapper($rawData);
 		
-		return new $class($data,$this->profile['options']);
+		return new $class($data, $this->profile['options']);
 	}
 
 }
\ No newline at end of file

src/FactsFactoryInterface.php

Indentation +1 added lines, -1 removed lines

@@ -3,6 +3,6 @@
 
 Interface FactsFactoryInterface {
 	
-	public function factualize( array $rawData);
+    public function factualize( array $rawData);
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -3,6 +3,6 @@
 
 Interface FactsFactoryInterface {
 	
-	public function factualize( array $rawData);
+	public function factualize(array $rawData);
 
 }
\ No newline at end of file

tests/unit/FiltersTest.php

Indentation +92 added lines, -92 removed lines

@@ -5,119 +5,119 @@
     /**
      * @dataProvider telephones
      */	
-	public function testItTelephoneFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::normalizeItTelephone($data));
-	}
+    public function testItTelephoneFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::normalizeItTelephone($data));
+    }
 	
-	public function telephones()
+    public function telephones()
     {
-    	return array( 
-    		array( '+39 0341 2333991',		'03412333991'), 
-    		array( '  +39 0341 2333991 ',		'03412333991'),   
-    		array( '03412333991',		'03412333991'),  
-    		array( '003903412333991',		'03412333991'), 
-    		array( '00390341 23 33991',		'03412333991'), 
-    		array( '+39 0341 2333991',		'03412333991'), 
-    		array( '+39 03412333991',		'03412333991'), 
-    		array( '+39 0341 23 33 991',		'03412333991'),
-    		array( '+39 (0341) 2333991',		'03412333991'),
-    		array( '+39 (0341) 2333991 ext. 1234',		'03412333991 [1234]'),
-    		array( '+39 (0341) 2333991  {1234]',		'03412333991 [1234]'),		
-    		array( ' apdas 0341 2333991sfsd12sdfsf 34',		'03412333991 [1234]'),
-    		array( ' apdassdfs',''),
-		);
-   	}
+        return array( 
+            array( '+39 0341 2333991',		'03412333991'), 
+            array( '  +39 0341 2333991 ',		'03412333991'),   
+            array( '03412333991',		'03412333991'),  
+            array( '003903412333991',		'03412333991'), 
+            array( '00390341 23 33991',		'03412333991'), 
+            array( '+39 0341 2333991',		'03412333991'), 
+            array( '+39 03412333991',		'03412333991'), 
+            array( '+39 0341 23 33 991',		'03412333991'),
+            array( '+39 (0341) 2333991',		'03412333991'),
+            array( '+39 (0341) 2333991 ext. 1234',		'03412333991 [1234]'),
+            array( '+39 (0341) 2333991  {1234]',		'03412333991 [1234]'),		
+            array( ' apdas 0341 2333991sfsd12sdfsf 34',		'03412333991 [1234]'),
+            array( ' apdassdfs',''),
+        );
+        }
 	
-	public function testEmailFilter()
-	{
-		$this->assertEquals('ABC@EXAMPLE.COM', BOTK\Filters::normalizeEmail('abC@Example.com'));
-		$this->assertTrue(empty(BOTK\Filters::normalizeEmail('invalid email')));
-	}
+    public function testEmailFilter()
+    {
+        $this->assertEquals('ABC@EXAMPLE.COM', BOTK\Filters::normalizeEmail('abC@Example.com'));
+        $this->assertTrue(empty(BOTK\Filters::normalizeEmail('invalid email')));
+    }
 
     /**
      * @dataProvider tokens
      */	
-	public function testTokenFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::normalizeToken($data));
-	}
+    public function testTokenFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::normalizeToken($data));
+    }
 	
-	public function tokens()
+    public function tokens()
     {
-    	return array( 
-    		array( 'abc d e #1',	'ABCDE1'), 
-    		array( 'abcde1',		'ABCDE1'), 
-    		array( 'ABCDE1',		'ABCDE1'), 
-    		array( ' ABC_DE-1 ',	'ABC_DE1'), 
-    		array( ' ABC_DE:1 ',	'ABC_DE1'), 
-		);
-   	}
+        return array( 
+            array( 'abc d e #1',	'ABCDE1'), 
+            array( 'abcde1',		'ABCDE1'), 
+            array( 'ABCDE1',		'ABCDE1'), 
+            array( ' ABC_DE-1 ',	'ABC_DE1'), 
+            array( ' ABC_DE:1 ',	'ABC_DE1'), 
+        );
+        }
 
     /**
      * @dataProvider adresses
      */	
-	public function testAddressFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::normalizeAddress($data));
-	}
+    public function testAddressFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::normalizeAddress($data));
+    }
 	
-	public function adresses()
+    public function adresses()
     {
-    	return array( 
-    		array( 'Lungolario Luigi Cadorna, 1, 23900 Lecco LC, Italy',	'LUNGOLARIO LUIGI CADORNA, 1, 23900 LECCO LC, ITALY'),
-    		array( 'Lungolario Luigi Cadorna 1-23900 Lecco LC - Italy',	'LUNGOLARIO LUIGI CADORNA 1 - 23900 LECCO LC - ITALY'),
-    		array( 'Lungolario Luigi Cadorna 1 Lecco LC - -Italy',	'LUNGOLARIO LUIGI CADORNA 1 LECCO LC - ITALY'),
-    		array( ',,test;;',	'TEST;'), 
-		);
-   	}
+        return array( 
+            array( 'Lungolario Luigi Cadorna, 1, 23900 Lecco LC, Italy',	'LUNGOLARIO LUIGI CADORNA, 1, 23900 LECCO LC, ITALY'),
+            array( 'Lungolario Luigi Cadorna 1-23900 Lecco LC - Italy',	'LUNGOLARIO LUIGI CADORNA 1 - 23900 LECCO LC - ITALY'),
+            array( 'Lungolario Luigi Cadorna 1 Lecco LC - -Italy',	'LUNGOLARIO LUIGI CADORNA 1 LECCO LC - ITALY'),
+            array( ',,test;;',	'TEST;'), 
+        );
+        }
 	
 	
     /**
      * @dataProvider structuredAdresses
      */	
-	public function testBuildNormalizedAddress($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::buildNormalizedAddress($data));
-	}
+    public function testBuildNormalizedAddress($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::buildNormalizedAddress($data));
+    }
 	
-	public function structuredAdresses()
+    public function structuredAdresses()
     {
-    	return array( 
-    		array( 
-    			array(
-    				'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
-    				'addressLocality'	=> 'Lecco',
-    				'addressRegion'		=> 'LC',
-    				'addressCountry'	=> 'IT',
-    				'postalCode'		=> '23900',	
-				),	
-				'LUNGOLARIO LUIGI CADORNA, 1, 23900 LECCO (LC) - IT'
-			),
-    		array( 
-    			array(
-    				'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
-    				'addressLocality'	=> 'Lecco',
-    				'addressCountry'	=> 'IT',	
-				),	
-				'LUNGOLARIO LUIGI CADORNA, 1, LECCO - IT'
-			),
-    		array( 
-    			array(
-    				'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
-    				'addressCountry'	=> 'IT',
-    				'postalCode'		=> '23900',	
-				),	
-				'LUNGOLARIO LUIGI CADORNA, 1, 23900 - IT'
-			),
-    		array( 
-    			array(
-    				'addressCountry'	=> 'IT',
-    				'postalCode'		=> '23900',	
-				),	
-				false
-			),
-		);
-   	}
+        return array( 
+            array( 
+                array(
+                    'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
+                    'addressLocality'	=> 'Lecco',
+                    'addressRegion'		=> 'LC',
+                    'addressCountry'	=> 'IT',
+                    'postalCode'		=> '23900',	
+                ),	
+                'LUNGOLARIO LUIGI CADORNA, 1, 23900 LECCO (LC) - IT'
+            ),
+            array( 
+                array(
+                    'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
+                    'addressLocality'	=> 'Lecco',
+                    'addressCountry'	=> 'IT',	
+                ),	
+                'LUNGOLARIO LUIGI CADORNA, 1, LECCO - IT'
+            ),
+            array( 
+                array(
+                    'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
+                    'addressCountry'	=> 'IT',
+                    'postalCode'		=> '23900',	
+                ),	
+                'LUNGOLARIO LUIGI CADORNA, 1, 23900 - IT'
+            ),
+            array( 
+                array(
+                    'addressCountry'	=> 'IT',
+                    'postalCode'		=> '23900',	
+                ),	
+                false
+            ),
+        );
+        }
 }
 

Spacing +22 added lines, -22 removed lines

@@ -13,19 +13,19 @@ 
 	public function telephones()
     {
     	return array( 
-    		array( '+39 0341 2333991',		'03412333991'), 
-    		array( '  +39 0341 2333991 ',		'03412333991'),   
-    		array( '03412333991',		'03412333991'),  
-    		array( '003903412333991',		'03412333991'), 
-    		array( '00390341 23 33991',		'03412333991'), 
-    		array( '+39 0341 2333991',		'03412333991'), 
-    		array( '+39 03412333991',		'03412333991'), 
-    		array( '+39 0341 23 33 991',		'03412333991'),
-    		array( '+39 (0341) 2333991',		'03412333991'),
-    		array( '+39 (0341) 2333991 ext. 1234',		'03412333991 [1234]'),
-    		array( '+39 (0341) 2333991  {1234]',		'03412333991 [1234]'),		
-    		array( ' apdas 0341 2333991sfsd12sdfsf 34',		'03412333991 [1234]'),
-    		array( ' apdassdfs',''),
+    		array('+39 0341 2333991', '03412333991'), 
+    		array('  +39 0341 2333991 ', '03412333991'),   
+    		array('03412333991', '03412333991'),  
+    		array('003903412333991', '03412333991'), 
+    		array('00390341 23 33991', '03412333991'), 
+    		array('+39 0341 2333991', '03412333991'), 
+    		array('+39 03412333991', '03412333991'), 
+    		array('+39 0341 23 33 991', '03412333991'),
+    		array('+39 (0341) 2333991', '03412333991'),
+    		array('+39 (0341) 2333991 ext. 1234', '03412333991 [1234]'),
+    		array('+39 (0341) 2333991  {1234]', '03412333991 [1234]'),		
+    		array(' apdas 0341 2333991sfsd12sdfsf 34', '03412333991 [1234]'),
+    		array(' apdassdfs', ''),
 		);
    	}
 	
@@ -46,11 +46,11 @@ 
 	public function tokens()
     {
     	return array( 
-    		array( 'abc d e #1',	'ABCDE1'), 
-    		array( 'abcde1',		'ABCDE1'), 
-    		array( 'ABCDE1',		'ABCDE1'), 
-    		array( ' ABC_DE-1 ',	'ABC_DE1'), 
-    		array( ' ABC_DE:1 ',	'ABC_DE1'), 
+    		array('abc d e #1', 'ABCDE1'), 
+    		array('abcde1', 'ABCDE1'), 
+    		array('ABCDE1', 'ABCDE1'), 
+    		array(' ABC_DE-1 ', 'ABC_DE1'), 
+    		array(' ABC_DE:1 ', 'ABC_DE1'), 
 		);
    	}
 
@@ -65,10 +65,10 @@ 
 	public function adresses()
     {
     	return array( 
-    		array( 'Lungolario Luigi Cadorna, 1, 23900 Lecco LC, Italy',	'LUNGOLARIO LUIGI CADORNA, 1, 23900 LECCO LC, ITALY'),
-    		array( 'Lungolario Luigi Cadorna 1-23900 Lecco LC - Italy',	'LUNGOLARIO LUIGI CADORNA 1 - 23900 LECCO LC - ITALY'),
-    		array( 'Lungolario Luigi Cadorna 1 Lecco LC - -Italy',	'LUNGOLARIO LUIGI CADORNA 1 LECCO LC - ITALY'),
-    		array( ',,test;;',	'TEST;'), 
+    		array('Lungolario Luigi Cadorna, 1, 23900 Lecco LC, Italy', 'LUNGOLARIO LUIGI CADORNA, 1, 23900 LECCO LC, ITALY'),
+    		array('Lungolario Luigi Cadorna 1-23900 Lecco LC - Italy', 'LUNGOLARIO LUIGI CADORNA 1 - 23900 LECCO LC - ITALY'),
+    		array('Lungolario Luigi Cadorna 1 Lecco LC - -Italy', 'LUNGOLARIO LUIGI CADORNA 1 LECCO LC - ITALY'),
+    		array(',,test;;', 'TEST;'), 
 		);
    	}
 	

tests/unit/Model/LocalBusinessTest.php

Indentation +220 added lines, -220 removed lines

@@ -5,241 +5,241 @@
     /**
      * @dataProvider goodLocalBusiness
      */	
-	public function testDataFilteringWithValidDataAndDefaultOptions($data, $expectedData)
-	{
-		$localBusiness = new BOTK\Model\LocalBusiness($data);		
-		$this->assertEquals($expectedData, $localBusiness->asArray());
-	}
+    public function testDataFilteringWithValidDataAndDefaultOptions($data, $expectedData)
+    {
+        $localBusiness = new BOTK\Model\LocalBusiness($data);		
+        $this->assertEquals($expectedData, $localBusiness->asArray());
+    }
 	
-	public function goodLocalBusiness()
+    public function goodLocalBusiness()
     {
-    	return array( 
-    		array(
-	    		array(),
-	    		array(
-					'base'				=> 'http://linkeddata.center/botk/resource/',	
-					'lang'				=> 'it',
-					'addressCountry'	=> 'IT',
-				),
-			),
+        return array( 
+            array(
+                array(),
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource/',	
+                    'lang'				=> 'it',
+                    'addressCountry'	=> 'IT',
+                ),
+            ),
 			
-    		array(
-	    		array(
-					'base'				=> 'http://linkeddata.center/botk/resource#',
-					'lang'				=> 'en',
-					'addressCountry'	=> 'US',
-				),
-	    		array(
-					'base'				=> 'http://linkeddata.center/botk/resource#',
-					'lang'				=> 'en',
-					'addressCountry'	=> 'US',
-				),
-			),
+            array(
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource#',
+                    'lang'				=> 'en',
+                    'addressCountry'	=> 'US',
+                ),
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource#',
+                    'lang'				=> 'en',
+                    'addressCountry'	=> 'US',
+                ),
+            ),
 			
-    		array(
-	    		array(
-	    			'id'				=> '1234567890',
-					'taxID'				=> 'fgn nrc 63S0 6F205 A',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'Test  soc srl',
-					'alternateName'		=> 'Test  soc srl',
-					'addressCountry'	=> 'IT',
-					'addressLocality'	=> 'LECCO',
-					'addressRegion'		=> 'LC',
-					'streetAddress'		=> 'Via  F. Valsecchi,124',
-					'postalCode'		=> '23900',
-					'page'				=> 'http://linkeddata.center/',
-					'telephone'			=> '+39 3356382949',
-					'faxNumber'			=> '0341 255188 ',
-					'email'				=> 'enrico@fagnoni.com',
-					'geoDescription'	=> 'Via  F. Valsecchi,124-23900 Lecco (LC)',
-					'lat'				=> '1.12345',
-					'long'				=> '2.123456',
-				),
-	    		array(
-					'base'				=> 'http://linkeddata.center/botk/resource/',	
-					'lang'				=> 'it',
-	    			'id'				=> '1234567890',
-					'taxID'				=> 'FGNNRC63S06F205A',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'TEST SOC SRL',
-					'alternateName'		=> 'Test  soc srl',
-					'addressCountry'	=> 'IT',
-					'addressLocality'	=> 'LECCO',
-					'addressRegion'		=> 'LC',
-					'streetAddress'		=> 'VIA F.VALSECCHI, 124',
-					'postalCode'		=> '23900',
-					'page'				=> 'http://linkeddata.center/',
-					'telephone'			=> '3356382949',
-					'faxNumber'			=> '0341255188',
-					'email'				=> 'ENRICO@FAGNONI.COM',
-					'geoDescription'	=> 'VIA F.VALSECCHI, 124 - 23900 LECCO (LC)',
-					'lat'				=> '1.12345',
-					'long'				=> '2.123456',
-				),
-			),
-    		array(
-	    		array(
-	    			'id'				=> '1234567890',
-					'taxID'				=> '',
-					'vatID'				=> '',
-					'legalName'			=> null,
-					'alternateName'		=> '',
-					'addressCountry'	=> null,
-				),
-	    		array(
-					'base'				=> 'http://linkeddata.center/botk/resource/',	
-					'lang'				=> 'it',
-	    			'id'				=> '1234567890',
-					'addressCountry'	=> 'IT',
-	    		),
-			),			
-		);
-   	}
+            array(
+                array(
+                    'id'				=> '1234567890',
+                    'taxID'				=> 'fgn nrc 63S0 6F205 A',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'Test  soc srl',
+                    'alternateName'		=> 'Test  soc srl',
+                    'addressCountry'	=> 'IT',
+                    'addressLocality'	=> 'LECCO',
+                    'addressRegion'		=> 'LC',
+                    'streetAddress'		=> 'Via  F. Valsecchi,124',
+                    'postalCode'		=> '23900',
+                    'page'				=> 'http://linkeddata.center/',
+                    'telephone'			=> '+39 3356382949',
+                    'faxNumber'			=> '0341 255188 ',
+                    'email'				=> 'enrico@fagnoni.com',
+                    'geoDescription'	=> 'Via  F. Valsecchi,124-23900 Lecco (LC)',
+                    'lat'				=> '1.12345',
+                    'long'				=> '2.123456',
+                ),
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource/',	
+                    'lang'				=> 'it',
+                    'id'				=> '1234567890',
+                    'taxID'				=> 'FGNNRC63S06F205A',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'TEST SOC SRL',
+                    'alternateName'		=> 'Test  soc srl',
+                    'addressCountry'	=> 'IT',
+                    'addressLocality'	=> 'LECCO',
+                    'addressRegion'		=> 'LC',
+                    'streetAddress'		=> 'VIA F.VALSECCHI, 124',
+                    'postalCode'		=> '23900',
+                    'page'				=> 'http://linkeddata.center/',
+                    'telephone'			=> '3356382949',
+                    'faxNumber'			=> '0341255188',
+                    'email'				=> 'ENRICO@FAGNONI.COM',
+                    'geoDescription'	=> 'VIA F.VALSECCHI, 124 - 23900 LECCO (LC)',
+                    'lat'				=> '1.12345',
+                    'long'				=> '2.123456',
+                ),
+            ),
+            array(
+                array(
+                    'id'				=> '1234567890',
+                    'taxID'				=> '',
+                    'vatID'				=> '',
+                    'legalName'			=> null,
+                    'alternateName'		=> '',
+                    'addressCountry'	=> null,
+                ),
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource/',	
+                    'lang'				=> 'it',
+                    'id'				=> '1234567890',
+                    'addressCountry'	=> 'IT',
+                ),
+            ),			
+        );
+        }
 
-	public function testGetDefaultOptions()
-	{
-		$options = array (
-			'base'				=> array(),
-			'lang'				=> array(
-									'default'	=> 'en',		
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[a-z]{2}$/')
-				                   ),
-		);
+    public function testGetDefaultOptions()
+    {
+        $options = array (
+            'base'				=> array(),
+            'lang'				=> array(
+                                    'default'	=> 'en',		
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[a-z]{2}$/')
+                                    ),
+        );
 		
-		$expectedOptions =array (
-			'base'				=> array(),
-			'uri'				=> array(
-									'filter'    => FILTER_SANITIZE_URL,
-				                   ),
-			'lang'				=> array(
-									'default'	=> 'en',		
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[a-z]{2}$/')
-				                   ),
-			'id'				=> array(		
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[\w]+$/')
-				                   ),
-			'taxID'				=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeToken'
-				                   ),
-			'vatID'				=> array(	// italian rules
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[0-9]{11}$/')
-				                   ),
-			'legalName'			=> array(
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-				                   ),
-			'alternateName'		=> array(),
-			'addressCountry'	=> array(
-									'default'	=> 'IT',		
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[A-Z]{2}$/')
-				                   ),
-			'addressLocality'	=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-				                   ),
-			'addressRegion'		=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-				                   ),
-			'streetAddress'		=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-				                   ),
-			'postalCode'		=> array(	// italian rules
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[0-9]{5}$/')
-				                   ),
-			'page'				=> array(	
-									'filter'    => FILTER_SANITIZE_URL
-				                   ),
-			'telephone'			=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeItTelephone'
-				                   ),
-			'faxNumber'			=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeItTelephone'
-				                   ),
-			'email'				=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeEmail'
-				                   ),
-			'geoDescription'	=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::normalizeAddress'
-				                   ),
-			'lat'				=> array( // http://www.regexlib.com/REDetails.aspx?regexp_id=2728
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/')
-				                   ),
-			'long'				=> array( // http://stackoverflow.com/questions/3518504/regular-expression-for-matching-latitude-longitude-coordinates
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/')
-				                   ),
-		);
+        $expectedOptions =array (
+            'base'				=> array(),
+            'uri'				=> array(
+                                    'filter'    => FILTER_SANITIZE_URL,
+                                    ),
+            'lang'				=> array(
+                                    'default'	=> 'en',		
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[a-z]{2}$/')
+                                    ),
+            'id'				=> array(		
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[\w]+$/')
+                                    ),
+            'taxID'				=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeToken'
+                                    ),
+            'vatID'				=> array(	// italian rules
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[0-9]{11}$/')
+                                    ),
+            'legalName'			=> array(
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                    ),
+            'alternateName'		=> array(),
+            'addressCountry'	=> array(
+                                    'default'	=> 'IT',		
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[A-Z]{2}$/')
+                                    ),
+            'addressLocality'	=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                    ),
+            'addressRegion'		=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                    ),
+            'streetAddress'		=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                    ),
+            'postalCode'		=> array(	// italian rules
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[0-9]{5}$/')
+                                    ),
+            'page'				=> array(	
+                                    'filter'    => FILTER_SANITIZE_URL
+                                    ),
+            'telephone'			=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeItTelephone'
+                                    ),
+            'faxNumber'			=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeItTelephone'
+                                    ),
+            'email'				=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeEmail'
+                                    ),
+            'geoDescription'	=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::normalizeAddress'
+                                    ),
+            'lat'				=> array( // http://www.regexlib.com/REDetails.aspx?regexp_id=2728
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/')
+                                    ),
+            'long'				=> array( // http://stackoverflow.com/questions/3518504/regular-expression-for-matching-latitude-longitude-coordinates
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/')
+                                    ),
+        );
 		
-		$localBusiness = new BOTK\Model\LocalBusiness(array(),$options);
-		$this->assertEquals($expectedOptions, $localBusiness->getOptions());
-	}
+        $localBusiness = new BOTK\Model\LocalBusiness(array(),$options);
+        $this->assertEquals($expectedOptions, $localBusiness->getOptions());
+    }
 
 
     /**
      * @dataProvider goodRdf
      */	
-	public function testRdfGeneration($data, $rdf, $tripleCount)
-	{
-		$localBusiness = new BOTK\Model\LocalBusiness($data);		
-		$this->assertEquals($rdf, (string) $localBusiness);
-		$this->assertEquals($localBusiness->asTurtle(), (string) $localBusiness, "equivalence with __tostring");
-		$this->assertEquals($tripleCount,  $localBusiness->getTripleCount());
-	}
+    public function testRdfGeneration($data, $rdf, $tripleCount)
+    {
+        $localBusiness = new BOTK\Model\LocalBusiness($data);		
+        $this->assertEquals($rdf, (string) $localBusiness);
+        $this->assertEquals($localBusiness->asTurtle(), (string) $localBusiness, "equivalence with __tostring");
+        $this->assertEquals($tripleCount,  $localBusiness->getTripleCount());
+    }
 	
-	public function goodRdf()
+    public function goodRdf()
     {
-    	return array(
-    		array(
-    			array(),
-    			'',
-    			0,
-			),
-    		array(
-    			array(
-    				'base'				=> 'urn:',
-    				'id'				=> 'abc',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'Calenda chiodi snc',
-				),
-    			'<urn:abc> a schema:Organization;dct:identifier "abc";schema:vatID "01234567890"@it;schema:legalName """CALENDA CHIODI SNC"""@it; . ',
-    			4,
-			),
+        return array(
+            array(
+                array(),
+                '',
+                0,
+            ),
+            array(
+                array(
+                    'base'				=> 'urn:',
+                    'id'				=> 'abc',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'Calenda chiodi snc',
+                ),
+                '<urn:abc> a schema:Organization;dct:identifier "abc";schema:vatID "01234567890"@it;schema:legalName """CALENDA CHIODI SNC"""@it; . ',
+                4,
+            ),
 			
-    		array(
-    			array(
-    				'uri'				=> 'urn:abc',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'Calenda chiodi snc',
-				),
-    			'<urn:abc> a schema:Organization;schema:vatID "01234567890"@it;schema:legalName """CALENDA CHIODI SNC"""@it; . ',
-    			3,
-			),
+            array(
+                array(
+                    'uri'				=> 'urn:abc',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'Calenda chiodi snc',
+                ),
+                '<urn:abc> a schema:Organization;schema:vatID "01234567890"@it;schema:legalName """CALENDA CHIODI SNC"""@it; . ',
+                3,
+            ),
 			
-    		array(
-    			array(
-    				'uri'				=> 'urn:abc',
-					'lat'				=> '43.23456',
-					'long'				=> '35.23444',
-				),
-    			'<urn:abc> a schema:Organization;schema:location <urn:abc_place>; . <geo:43.23456,35.23444> a schema:GeoCoordinates;wgs:lat 43.23456 ;wgs:long 35.23444 ; . <urn:abc_place> a schema:LocalBusiness;schema:geo <geo:43.23456,35.23444>; . ',
-    			7,
-			),
-		);
-	}
+            array(
+                array(
+                    'uri'				=> 'urn:abc',
+                    'lat'				=> '43.23456',
+                    'long'				=> '35.23444',
+                ),
+                '<urn:abc> a schema:Organization;schema:location <urn:abc_place>; . <geo:43.23456,35.23444> a schema:GeoCoordinates;wgs:lat 43.23456 ;wgs:long 35.23444 ; . <urn:abc_place> a schema:LocalBusiness;schema:geo <geo:43.23456,35.23444>; . ',
+                7,
+            ),
+        );
+    }
 }
 

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
 
 	public function testGetDefaultOptions()
 	{
-		$options = array (
+		$options = array(
 			'base'				=> array(),
 			'lang'				=> array(
 									'default'	=> 'en',		
@@ -108,7 +108,7 @@ 
 				                   ),
 		);
 		
-		$expectedOptions =array (
+		$expectedOptions = array(
 			'base'				=> array(),
 			'uri'				=> array(
 									'filter'    => FILTER_SANITIZE_URL,
@@ -185,7 +185,7 @@ 
 				                   ),
 		);
 		
-		$localBusiness = new BOTK\Model\LocalBusiness(array(),$options);
+		$localBusiness = new BOTK\Model\LocalBusiness(array(), $options);
 		$this->assertEquals($expectedOptions, $localBusiness->getOptions());
 	}
 
@@ -198,7 +198,7 @@ 
 		$localBusiness = new BOTK\Model\LocalBusiness($data);		
 		$this->assertEquals($rdf, (string) $localBusiness);
 		$this->assertEquals($localBusiness->asTurtle(), (string) $localBusiness, "equivalence with __tostring");
-		$this->assertEquals($tripleCount,  $localBusiness->getTripleCount());
+		$this->assertEquals($tripleCount, $localBusiness->getTripleCount());
 	}
 	
 	public function goodRdf()

tests/unit/FactsFactoryTest.php

Indentation +50 added lines, -50 removed lines

@@ -3,59 +3,59 @@
 class FactsFactoryTest extends PHPUnit_Framework_TestCase
 {	
 
-	public function testMakeLocalBusiness()
-	{
-		$profile = array(
-			'model'			=> 'LocalBusiness',
-			'options'		=> array(
-				'base' => 'urn:test'
-			),
-			'datamapper'	=> function(array $rawdata){
-				$data = array();
-				$data['id'] = $rawdata[0];
-				$data['legalName'] = $rawdata[2] . ' ' . $rawdata[1];
-				$data['alternateName'] = $rawdata[2];
-				$data['vatID'] = $rawdata[3];
-				$data['email'] = $rawdata[4];
-				$data['addressLocality'] = $rawdata[5];
-				$data['postalCode'] = $rawdata[7];
-				$data['addressRegion'] = $rawdata[8];
-				$data['streetAddress'] = $rawdata[9] . ' ' . $rawdata[10] . ', ' . $rawdata[11];
-				$data['long'] = $rawdata[14];			
-				$data['lat'] = $rawdata[15];
+    public function testMakeLocalBusiness()
+    {
+        $profile = array(
+            'model'			=> 'LocalBusiness',
+            'options'		=> array(
+                'base' => 'urn:test'
+            ),
+            'datamapper'	=> function(array $rawdata){
+                $data = array();
+                $data['id'] = $rawdata[0];
+                $data['legalName'] = $rawdata[2] . ' ' . $rawdata[1];
+                $data['alternateName'] = $rawdata[2];
+                $data['vatID'] = $rawdata[3];
+                $data['email'] = $rawdata[4];
+                $data['addressLocality'] = $rawdata[5];
+                $data['postalCode'] = $rawdata[7];
+                $data['addressRegion'] = $rawdata[8];
+                $data['streetAddress'] = $rawdata[9] . ' ' . $rawdata[10] . ', ' . $rawdata[11];
+                $data['long'] = $rawdata[14];			
+                $data['lat'] = $rawdata[15];
 				
-				return $data;
-			},
-		);
-		$rawdata = array(
-			'10042650',
-			'ERBORISTERIA I PRATI DI GIOVANNA MONAMI',
-			'',
-			'01209991007',
-			'',
-			'ROMA',
-			'ROMA',
-			'00195',
-			'RM',
-			'VIA',
-			'ANTONIO MORDINI',
-			'3',
-			'058091',
-			'0580912017145',
-			'12.464163',
-			'41.914001'
-		);
+                return $data;
+            },
+        );
+        $rawdata = array(
+            '10042650',
+            'ERBORISTERIA I PRATI DI GIOVANNA MONAMI',
+            '',
+            '01209991007',
+            '',
+            'ROMA',
+            'ROMA',
+            '00195',
+            'RM',
+            'VIA',
+            'ANTONIO MORDINI',
+            '3',
+            '058091',
+            '0580912017145',
+            '12.464163',
+            '41.914001'
+        );
 
-		$factsFactory = new \BOTK\FactsFactory($profile);
-		$facts = $factsFactory->factualize($rawdata);
-		$structuredData = $facts->asArray();
+        $factsFactory = new \BOTK\FactsFactory($profile);
+        $facts = $factsFactory->factualize($rawdata);
+        $structuredData = $facts->asArray();
 		
-		$this->assertInstanceOf('\BOTK\Model\LocalBusiness', $facts);
-		$this->assertEquals($structuredData['vatID'], '01209991007');
-		$this->assertEquals($structuredData['id'], '10042650');
-		$this->assertEquals($structuredData['long'], '12.464163');
-		$this->assertEquals($structuredData['streetAddress'], 'VIA ANTONIO MORDINI, 3');
-	}
+        $this->assertInstanceOf('\BOTK\Model\LocalBusiness', $facts);
+        $this->assertEquals($structuredData['vatID'], '01209991007');
+        $this->assertEquals($structuredData['id'], '10042650');
+        $this->assertEquals($structuredData['long'], '12.464163');
+        $this->assertEquals($structuredData['streetAddress'], 'VIA ANTONIO MORDINI, 3');
+    }
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -10,17 +10,17 @@
 			'options'		=> array(
 				'base' => 'urn:test'
 			),
-			'datamapper'	=> function(array $rawdata){
+			'datamapper'	=> function(array $rawdata) {
 				$data = array();
 				$data['id'] = $rawdata[0];
-				$data['legalName'] = $rawdata[2] . ' ' . $rawdata[1];
+				$data['legalName'] = $rawdata[2].' '.$rawdata[1];
 				$data['alternateName'] = $rawdata[2];
 				$data['vatID'] = $rawdata[3];
 				$data['email'] = $rawdata[4];
 				$data['addressLocality'] = $rawdata[5];
 				$data['postalCode'] = $rawdata[7];
 				$data['addressRegion'] = $rawdata[8];
-				$data['streetAddress'] = $rawdata[9] . ' ' . $rawdata[10] . ', ' . $rawdata[11];
+				$data['streetAddress'] = $rawdata[9].' '.$rawdata[10].', '.$rawdata[11];
 				$data['long'] = $rawdata[14];			
 				$data['lat'] = $rawdata[15];