linkeddatacenter / BOTK-core

src/SimpleCsvGateway.php

Indentation +42 added lines, -42 removed lines

@@ -7,54 +7,54 @@
 class SimpleCsvGateway 
 {
 	
-	protected $options;
-	protected $factsFactory;
+    protected $options;
+    protected $factsFactory;
 	
 	
-	static public function factory(array $options)
-	{
-		return new SimpleCsvGateway($options);
-	}
+    static public function factory(array $options)
+    {
+        return new SimpleCsvGateway($options);
+    }
 	
 	
-	public function __construct(array $options)
-	{
-		assert(!empty($options['factsProfile']['model']) && isset($options['factsProfile']['options']) && is_array($options['factsProfile']['options'])) ;
-		$defaults = array(
-			'bufferSize' 		=> 2000,
-			'skippFirstLine'	=> true,
-			'fieldDelimiter' 	=> ','
-		);
-		$this->options = array_merge($defaults,$options);
-		$this->factsFactory = new \BOTK\FactsFactory($options['factsProfile']);
-	}
+    public function __construct(array $options)
+    {
+        assert(!empty($options['factsProfile']['model']) && isset($options['factsProfile']['options']) && is_array($options['factsProfile']['options'])) ;
+        $defaults = array(
+            'bufferSize' 		=> 2000,
+            'skippFirstLine'	=> true,
+            'fieldDelimiter' 	=> ','
+        );
+        $this->options = array_merge($defaults,$options);
+        $this->factsFactory = new \BOTK\FactsFactory($options['factsProfile']);
+    }
 	
 	
-	protected function readRawData()
-	{
-		if( $this->factsFactory->tooManyErrors()) return false;
+    protected function readRawData()
+    {
+        if( $this->factsFactory->tooManyErrors()) return false;
 		
-		return fgetcsv(STDIN, $this->options['bufferSize'], $this->options['fieldDelimiter']);
-	}
-	
-	
-	public function run()
-	{
-		echo $this->factsFactory->generateLinkedDataHeader();
-		if($this->options['skippFirstLine']){ $this->readRawData();}
-	
-	    while ($rawdata = $this->readRawData()) {
-	    	if($this->factsFactory->acceptable($rawdata)){
-		    	try{
-		    		$facts =$this->factsFactory->factualize($rawdata);
-		    		echo $facts->asTurtle(), "\n";
-		    	}catch (\Exception $e) {
-					$this->factsFactory->addError($e->getMessage());
-				    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
-				}	    		
-	    	}
-	    }
+        return fgetcsv(STDIN, $this->options['bufferSize'], $this->options['fieldDelimiter']);
+    }
+	
+	
+    public function run()
+    {
+        echo $this->factsFactory->generateLinkedDataHeader();
+        if($this->options['skippFirstLine']){ $this->readRawData();}
+	
+        while ($rawdata = $this->readRawData()) {
+            if($this->factsFactory->acceptable($rawdata)){
+                try{
+                    $facts =$this->factsFactory->factualize($rawdata);
+                    echo $facts->asTurtle(), "\n";
+                }catch (\Exception $e) {
+                    $this->factsFactory->addError($e->getMessage());
+                    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
+                }	    		
+            }
+        }
 		
-		echo $this->factsFactory->generateLinkedDataFooter();		
-	}
+        echo $this->factsFactory->generateLinkedDataFooter();		
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -19,20 +19,20 @@ 
 	
 	public function __construct(array $options)
 	{
-		assert(!empty($options['factsProfile']['model']) && isset($options['factsProfile']['options']) && is_array($options['factsProfile']['options'])) ;
+		assert(!empty($options['factsProfile']['model']) && isset($options['factsProfile']['options']) && is_array($options['factsProfile']['options']));
 		$defaults = array(
 			'bufferSize' 		=> 2000,
 			'skippFirstLine'	=> true,
 			'fieldDelimiter' 	=> ','
 		);
-		$this->options = array_merge($defaults,$options);
+		$this->options = array_merge($defaults, $options);
 		$this->factsFactory = new \BOTK\FactsFactory($options['factsProfile']);
 	}
 	
 	
 	protected function readRawData()
 	{
-		if( $this->factsFactory->tooManyErrors()) return false;
+		if ($this->factsFactory->tooManyErrors()) return false;
 		
 		return fgetcsv(STDIN, $this->options['bufferSize'], $this->options['fieldDelimiter']);
 	}
@@ -41,16 +41,16 @@ 
 	public function run()
 	{
 		echo $this->factsFactory->generateLinkedDataHeader();
-		if($this->options['skippFirstLine']){ $this->readRawData();}
+		if ($this->options['skippFirstLine']) { $this->readRawData(); }
 	
 	    while ($rawdata = $this->readRawData()) {
-	    	if($this->factsFactory->acceptable($rawdata)){
-		    	try{
-		    		$facts =$this->factsFactory->factualize($rawdata);
+	    	if ($this->factsFactory->acceptable($rawdata)) {
+		    	try {
+		    		$facts = $this->factsFactory->factualize($rawdata);
 		    		echo $facts->asTurtle(), "\n";
-		    	}catch (\Exception $e) {
+		    	} catch (\Exception $e) {
 					$this->factsFactory->addError($e->getMessage());
-				    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
+				    echo "\n# Caught exception: ", $e->getMessage(), "\n";
 				}	    		
 	    	}
 	    }

Braces +4 added lines, -2 removed lines

@@ -32,7 +32,9 @@ 
 	
 	protected function readRawData()
 	{
-		if( $this->factsFactory->tooManyErrors()) return false;
+		if( $this->factsFactory->tooManyErrors()) {
+		    return false;
+		}
 		
 		return fgetcsv(STDIN, $this->options['bufferSize'], $this->options['fieldDelimiter']);
 	}
@@ -48,7 +50,7 @@ 
 		    	try{
 		    		$facts =$this->factsFactory->factualize($rawdata);
 		    		echo $facts->asTurtle(), "\n";
-		    	}catch (\Exception $e) {
+		    	} catch (\Exception $e) {
 					$this->factsFactory->addError($e->getMessage());
 				    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
 				}	    		

src/Filters.php

Indentation +91 added lines, -91 removed lines

@@ -9,114 +9,114 @@
  */
 class Filters {
 
-	/**
-	 * empty allowed
-	 */
-	static function FILTER_SANITIZE_ADDRESS($value)
-	{
-		$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,\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 = preg_replace('/\\+/', '/', $value);			// backslash changed to slash
-		$value = preg_replace('/\s+/', ' ', $value);			// no multiple spaces,
-		$value = preg_replace('/\s?,?\s?(N|N\.|NUM\.|NUM|NUMERO|NUMBER|#)\s?(\d+)/i', ', $2', $value);		
-																// try normalizing civic numbers
-		$value = mb_strtoupper($value,'UTF-8');					// move to upper (preserving accents)
-		$value = trim($value); 									// no trailing and ending blancs
+    /**
+     * empty allowed
+     */
+    static function FILTER_SANITIZE_ADDRESS($value)
+    {
+        $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,\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 = preg_replace('/\\+/', '/', $value);			// backslash changed to slash
+        $value = preg_replace('/\s+/', ' ', $value);			// no multiple spaces,
+        $value = preg_replace('/\s?,?\s?(N|N\.|NUM\.|NUM|NUMERO|NUMBER|#)\s?(\d+)/i', ', $2', $value);		
+                                                                // try normalizing civic numbers
+        $value = mb_strtoupper($value,'UTF-8');					// move to upper (preserving accents)
+        $value = trim($value); 									// no trailing and ending blancs
 		
-		return $value?:null;									// multibyte uppercase
-	}
+        return $value?:null;									// multibyte uppercase
+    }
 	
-	/**
-	 * not empty token
-	 */
-	static function FILTER_SANITIZE_TOKEN($value)
-	{
-		$value = preg_replace('/[^\w]/', '', $value);
-		$value = strtoupper($value);
+    /**
+     * not empty token
+     */
+    static function FILTER_SANITIZE_TOKEN($value)
+    {
+        $value = preg_replace('/[^\w]/', '', $value);
+        $value = strtoupper($value);
 		
-		return $value?:false;
-	}
+        return $value?:false;
+    }
 
 
-	/**
-	 * Normalize an italian telephone number
-	 * empty allowed
-	 */
-	static function FILTER_SANITIZE_TELEPHONE($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
+     * empty allowed
+     */
+    static function FILTER_SANITIZE_TELEPHONE($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?:null;		
-	}
+        return $value?:null;		
+    }
 	
 	
-	/**
-	 * Normalize email
-	 * empty allowed
-	 */
-	static function FILTER_SANITIZE_EMAIL($value)
-	{
-		$value =  filter_var($value, FILTER_VALIDATE_EMAIL);
-		$value = preg_replace('/\s+/', ' ', $value);			// no multiple spaces,
-		$value =  strtoupper($value);
+    /**
+     * Normalize email
+     * empty allowed
+     */
+    static function FILTER_SANITIZE_EMAIL($value)
+    {
+        $value =  filter_var($value, FILTER_VALIDATE_EMAIL);
+        $value = preg_replace('/\s+/', ' ', $value);			// no multiple spaces,
+        $value =  strtoupper($value);
 		
-		return  $value?:null;		
-	}
+        return  $value?:null;		
+    }
 	
 	
-	/**
-	 * not null lowercase id
-	 */
-	static function FILTER_SANITIZE_ID($value)
-	{
-		$value = mb_strtolower($value, 'UTF-8');
-		$value = preg_replace('/[^\p{L}0-9]+/u', ' ', $value);
-		$value = preg_replace('/\s+/', '_', trim($value));
+    /**
+     * not null lowercase id
+     */
+    static function FILTER_SANITIZE_ID($value)
+    {
+        $value = mb_strtolower($value, 'UTF-8');
+        $value = preg_replace('/[^\p{L}0-9]+/u', ' ', $value);
+        $value = preg_replace('/\s+/', '_', trim($value));
 		
-		return $value?:false;
-	}
+        return $value?:false;
+    }
 	
 	
-	/**
-	 * latitude and longitude coordinates (only dot as decimal place) trunked to 6 decimals
-	 * empty allowed
-	 */
-	static function FILTER_SANITIZE_GEO($value)
-	{
-		// http://www.regexlib.com/REDetails.aspx?regexp_id=2728
-		$value = preg_replace('/,/', '.', $value);
-		$value = preg_replace('/(.+)\.(\d{1,6}).*/', '$1.$2', $value);
-		return preg_match('/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/', $value)?$value:null;
-	}
+    /**
+     * latitude and longitude coordinates (only dot as decimal place) trunked to 6 decimals
+     * empty allowed
+     */
+    static function FILTER_SANITIZE_GEO($value)
+    {
+        // http://www.regexlib.com/REDetails.aspx?regexp_id=2728
+        $value = preg_replace('/,/', '.', $value);
+        $value = preg_replace('/(.+)\.(\d{1,6}).*/', '$1.$2', $value);
+        return preg_match('/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/', $value)?$value:null;
+    }
 	
 	
-	/**
-	 * quote quotes and backslash
-	 * empty allowed
-	 */
-	static function FILTER_SANITIZE_TURTLE_STRING($value)
-	{
-		$value = preg_replace('/"/', '\\"', $value);
-		$value = preg_replace('/\{1,}/', '\\\\', $value);
+    /**
+     * quote quotes and backslash
+     * empty allowed
+     */
+    static function FILTER_SANITIZE_TURTLE_STRING($value)
+    {
+        $value = preg_replace('/"/', '\\"', $value);
+        $value = preg_replace('/\{1,}/', '\\\\', $value);
 		
-		return $value?:null;
-	}
+        return $value?:null;
+    }
 	
 }
\ No newline at end of file

Spacing +28 added lines, -28 removed lines

@@ -14,21 +14,21 @@ 
 	 */
 	static function FILTER_SANITIZE_ADDRESS($value)
 	{
-		$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,\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 = preg_replace('/\\+/', '/', $value);			// backslash changed to slash
-		$value = preg_replace('/\s+/', ' ', $value);			// no multiple spaces,
+		$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,\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 = preg_replace('/\\+/', '/', $value); // backslash changed to slash
+		$value = preg_replace('/\s+/', ' ', $value); // no multiple spaces,
 		$value = preg_replace('/\s?,?\s?(N|N\.|NUM\.|NUM|NUMERO|NUMBER|#)\s?(\d+)/i', ', $2', $value);		
 																// try normalizing civic numbers
-		$value = mb_strtoupper($value,'UTF-8');					// move to upper (preserving accents)
-		$value = trim($value); 									// no trailing and ending blancs
+		$value = mb_strtoupper($value, 'UTF-8'); // move to upper (preserving accents)
+		$value = trim($value); // no trailing and ending blancs
 		
-		return $value?:null;									// multibyte uppercase
+		return $value ?: null; // multibyte uppercase
 	}
 	
 	/**
@@ -39,7 +39,7 @@ 
 		$value = preg_replace('/[^\w]/', '', $value);
 		$value = strtoupper($value);
 		
-		return $value?:false;
+		return $value ?: false;
 	}
 
 
@@ -49,21 +49,21 @@ 
 	 */
 	static function FILTER_SANITIZE_TELEPHONE($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]";
 			}			
 		}					
 
-		return $value?:null;		
+		return $value ?: null;		
 	}
 	
 	
@@ -73,11 +73,11 @@ 
 	 */
 	static function FILTER_SANITIZE_EMAIL($value)
 	{
-		$value =  filter_var($value, FILTER_VALIDATE_EMAIL);
-		$value = preg_replace('/\s+/', ' ', $value);			// no multiple spaces,
-		$value =  strtoupper($value);
+		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
+		$value = preg_replace('/\s+/', ' ', $value); // no multiple spaces,
+		$value = strtoupper($value);
 		
-		return  $value?:null;		
+		return  $value ?: null;		
 	}
 	
 	
@@ -90,7 +90,7 @@ 
 		$value = preg_replace('/[^\p{L}0-9]+/u', ' ', $value);
 		$value = preg_replace('/\s+/', '_', trim($value));
 		
-		return $value?:false;
+		return $value ?: false;
 	}
 	
 	
@@ -103,7 +103,7 @@ 
 		// http://www.regexlib.com/REDetails.aspx?regexp_id=2728
 		$value = preg_replace('/,/', '.', $value);
 		$value = preg_replace('/(.+)\.(\d{1,6}).*/', '$1.$2', $value);
-		return preg_match('/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/', $value)?$value:null;
+		return preg_match('/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/', $value) ? $value : null;
 	}
 	
 	
@@ -116,7 +116,7 @@ 
 		$value = preg_replace('/"/', '\\"', $value);
 		$value = preg_replace('/\{1,}/', '\\\\', $value);
 		
-		return $value?:null;
+		return $value ?: null;
 	}
 	
 }
\ No newline at end of file

src/FactsFactoryInterface.php

Indentation +9 added lines, -9 removed lines

@@ -2,13 +2,13 @@
 namespace BOTK;
 
 Interface FactsFactoryInterface {
-	public function removeEmpty( array $data );
-	public function factualize( array $rawData );
-	public function generateLinkedDataHeader();
-	public function generateLinkedDataFooter();
-	public function addToTripleCounter( $triplesCount);
-	public function getTripleCount();
-	public function addError($error);
-	public function tooManyErrors();
-	public function acceptable( $rawdata);
+    public function removeEmpty( array $data );
+    public function factualize( array $rawData );
+    public function generateLinkedDataHeader();
+    public function generateLinkedDataFooter();
+    public function addToTripleCounter( $triplesCount);
+    public function getTripleCount();
+    public function addError($error);
+    public function tooManyErrors();
+    public function acceptable( $rawdata);
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -2,13 +2,13 @@
 namespace BOTK;
 
 Interface FactsFactoryInterface {
-	public function removeEmpty( array $data );
-	public function factualize( array $rawData );
+	public function removeEmpty(array $data);
+	public function factualize(array $rawData);
 	public function generateLinkedDataHeader();
 	public function generateLinkedDataFooter();
-	public function addToTripleCounter( $triplesCount);
+	public function addToTripleCounter($triplesCount);
 	public function getTripleCount();
 	public function addError($error);
 	public function tooManyErrors();
-	public function acceptable( $rawdata);
+	public function acceptable($rawdata);
 }
\ No newline at end of file

src/Model/LocalBusiness.php

Indentation +165 added lines, -165 removed lines

@@ -9,187 +9,187 @@
  */
 class LocalBusiness extends AbstractModel implements \BOTK\ModelInterface 
 {
-	protected static $DEFAULT_OPTIONS = array (
-		'businessType'		=> array(		
-								// additional types  as extension of schema:LocalBusiness
-								'filter'    => FILTER_DEFAULT,
-                            	'flags'  	=> FILTER_FORCE_ARRAY,
-			                   ),
-		'taxID'				=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TOKEN',
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'vatID'				=> array(	// italian rules
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[0-9]{11}$/'),
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'legalName'			=> array(
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'businessName'		=> array(
-								// a schema:alternateName for schema:PostalAddress
-								'filter'    => FILTER_DEFAULT,
-                            	'flags'  	=> FILTER_FORCE_ARRAY,
-							   ),
-		'addressDescription'=> array(	//	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'addressCountry'	=> array(
-								'default'	=> 'IT',		
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[A-Z]{2}$/'),
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'addressLocality'	=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'addressRegion'		=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'streetAddress'		=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'postalCode'		=> array(	// italian rules
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[0-9]{5}$/'),
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'telephone'			=> array(	
-								'filter'    => FILTER_CALLBACK,	
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TELEPHONE',
-                            	'flags'  	=> FILTER_FORCE_ARRAY,
-			                   ),
-		'faxNumber'			=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TELEPHONE',
-                            	'flags'  	=> FILTER_FORCE_ARRAY,
-			                   ),
-		'email'				=> array(	
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_EMAIL',
-                            	'flags'  	=> FILTER_FORCE_ARRAY,
-			                   ),
-		'lat'				=> array( 
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_GEO',
-			                   ),
-		'long'				=> array( 
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_GEO',
-			                   ),
-	);
+    protected static $DEFAULT_OPTIONS = array (
+        'businessType'		=> array(		
+                                // additional types  as extension of schema:LocalBusiness
+                                'filter'    => FILTER_DEFAULT,
+                                'flags'  	=> FILTER_FORCE_ARRAY,
+                                ),
+        'taxID'				=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TOKEN',
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'vatID'				=> array(	// italian rules
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[0-9]{11}$/'),
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'legalName'			=> array(
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'businessName'		=> array(
+                                // a schema:alternateName for schema:PostalAddress
+                                'filter'    => FILTER_DEFAULT,
+                                'flags'  	=> FILTER_FORCE_ARRAY,
+                                ),
+        'addressDescription'=> array(	//	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'addressCountry'	=> array(
+                                'default'	=> 'IT',		
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[A-Z]{2}$/'),
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'addressLocality'	=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'addressRegion'		=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'streetAddress'		=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'postalCode'		=> array(	// italian rules
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[0-9]{5}$/'),
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'telephone'			=> array(	
+                                'filter'    => FILTER_CALLBACK,	
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TELEPHONE',
+                                'flags'  	=> FILTER_FORCE_ARRAY,
+                                ),
+        'faxNumber'			=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TELEPHONE',
+                                'flags'  	=> FILTER_FORCE_ARRAY,
+                                ),
+        'email'				=> array(	
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_EMAIL',
+                                'flags'  	=> FILTER_FORCE_ARRAY,
+                                ),
+        'lat'				=> array( 
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_GEO',
+                                ),
+        'long'				=> array( 
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_GEO',
+                                ),
+    );
 
-	public function __construct(array $data = array(), array $customOptions = array()) 
+    public function __construct(array $data = array(), array $customOptions = array()) 
     {
-    	$options = $this->mergeOptions(self::$DEFAULT_OPTIONS,$customOptions);
-    	parent::__construct($data, $options);
-		$this->addAddressDescription();
-	}
+        $options = $this->mergeOptions(self::$DEFAULT_OPTIONS,$customOptions);
+        parent::__construct($data, $options);
+        $this->addAddressDescription();
+    }
 	
 	
-	/**
-	 * If not existing, create an address description as a normalized address from following data properties:
-	 * 		'addressLocality',
-	 * 		'addressRegion',
-	 * 		'streetAddress',
-	 * 		'postalCode',
-	 */
-	private function addAddressDescription()
-	{	
-		extract($this->data);
+    /**
+     * If not existing, create an address description as a normalized address from following data properties:
+     * 		'addressLocality',
+     * 		'addressRegion',
+     * 		'streetAddress',
+     * 		'postalCode',
+     */
+    private function addAddressDescription()
+    {	
+        extract($this->data);
 
-		if(empty($addressDescription)){
-			if( !empty($streetAddress) && ( !empty($addressLocality) || !empty($postalCode))){
-				$addressDescription = "$streetAddress ,";
-				if(!empty($postalCode)) { $addressDescription.= " $postalCode";}
-				if(!empty($addressLocality)) { $addressDescription.= " $addressLocality"; }
-				if(!empty($addressRegion)) { $addressDescription.= " ($addressRegion)"; }
-			} else {
-				$addressDescription = null;
-			}
-		}
+        if(empty($addressDescription)){
+            if( !empty($streetAddress) && ( !empty($addressLocality) || !empty($postalCode))){
+                $addressDescription = "$streetAddress ,";
+                if(!empty($postalCode)) { $addressDescription.= " $postalCode";}
+                if(!empty($addressLocality)) { $addressDescription.= " $addressLocality"; }
+                if(!empty($addressRegion)) { $addressDescription.= " ($addressRegion)"; }
+            } else {
+                $addressDescription = null;
+            }
+        }
 		
-		$addressDescription = \BOTK\Filters::FILTER_SANITIZE_ADDRESS($addressDescription);
+        $addressDescription = \BOTK\Filters::FILTER_SANITIZE_ADDRESS($addressDescription);
 		
-		if(!empty($addressDescription)){
-			$this->data['addressDescription']=$addressDescription;
-		}
-	}
+        if(!empty($addressDescription)){
+            $this->data['addressDescription']=$addressDescription;
+        }
+    }
 	
 	
-	public function asTurtle()
-	{
-		if(is_null($this->rdf)) {
-			extract($this->data);
+    public function asTurtle()
+    {
+        if(is_null($this->rdf)) {
+            extract($this->data);
 
-			// create uris
-			$organizationUri = $this->getUri();
-			$addressUri = $organizationUri.'_address';
-			$geoUri = ( !empty($lat) && !empty($long) )?"geo:$lat,$long":null;
+            // create uris
+            $organizationUri = $this->getUri();
+            $addressUri = $organizationUri.'_address';
+            $geoUri = ( !empty($lat) && !empty($long) )?"geo:$lat,$long":null;
 			
-			$tripleCounter =0;
-			$turtleString='';
+            $tripleCounter =0;
+            $turtleString='';
 			
-			// define $_ as a macro to write simple rdf
-			$_= function($format, $var) use(&$turtleString, &$tripleCounter){
-				foreach((array)$var as $v){
-					if($var){
-						$turtleString.= sprintf($format,$v);
-						$tripleCounter++;
-					}
-				}
-			};
+            // define $_ as a macro to write simple rdf
+            $_= function($format, $var) use(&$turtleString, &$tripleCounter){
+                foreach((array)$var as $v){
+                    if($var){
+                        $turtleString.= sprintf($format,$v);
+                        $tripleCounter++;
+                    }
+                }
+            };
 				
-	 		// serialize schema:LocalBusiness
- 			$_('<%s> a schema:LocalBusiness;', $organizationUri);
-			!empty($businessType) 		&& $_('a %s;', $businessType);
-			!empty($id) 				&& $_('dct:identifier "%s";', $id);
-			!empty($vatID) 				&& $_('schema:vatID "%s";', $vatID); 
-			!empty($taxtID) 			&& $_('schema:taxtID "%s";', $taxID);
-			!empty($legalName)			&& $_('schema:legalName "%s";', $legalName);
-			!empty($businessName) 		&& $_('schema:alternateName "%s";', $businessName);
-			!empty($telephone) 			&& $_('schema:telephone "%s";', $telephone);
-			!empty($faxNumber) 			&& $_('schema:faxNumber "%s";', $faxNumber);
-			!empty($page) 				&& $_('schema:page <%s>;', $page);
-			!empty($email) 				&& $_('schema:email "%s";', $email);
-			!empty($homepage) 			&& $_('foaf:homepage <%s>;', $homepage);
-			!empty($mailbox) 			&& $_('foaf:mailbox <mailto:%s>;', $mailbox);
-			!empty($geoUri) 			&& $_('schema:geo <%s>;', $geoUri);
-			$_('schema:address <%s>. ', $addressUri);
+                // serialize schema:LocalBusiness
+                $_('<%s> a schema:LocalBusiness;', $organizationUri);
+            !empty($businessType) 		&& $_('a %s;', $businessType);
+            !empty($id) 				&& $_('dct:identifier "%s";', $id);
+            !empty($vatID) 				&& $_('schema:vatID "%s";', $vatID); 
+            !empty($taxtID) 			&& $_('schema:taxtID "%s";', $taxID);
+            !empty($legalName)			&& $_('schema:legalName "%s";', $legalName);
+            !empty($businessName) 		&& $_('schema:alternateName "%s";', $businessName);
+            !empty($telephone) 			&& $_('schema:telephone "%s";', $telephone);
+            !empty($faxNumber) 			&& $_('schema:faxNumber "%s";', $faxNumber);
+            !empty($page) 				&& $_('schema:page <%s>;', $page);
+            !empty($email) 				&& $_('schema:email "%s";', $email);
+            !empty($homepage) 			&& $_('foaf:homepage <%s>;', $homepage);
+            !empty($mailbox) 			&& $_('foaf:mailbox <mailto:%s>;', $mailbox);
+            !empty($geoUri) 			&& $_('schema:geo <%s>;', $geoUri);
+            $_('schema:address <%s>. ', $addressUri);
 			
-			// serialize schema:PostalAddress 
-			$_('<%s> a schema:PostalAddress;', $addressUri);
-			!empty($addressDescription) && $_('schema:description "%s";', $addressDescription);
-			!empty($streetAddress) 		&& $_('schema:streetAddress "%s";', $streetAddress);
-			!empty($postalCode) 		&& $_('schema:postalCode "%s";', $postalCode);
-			!empty($addressLocality) 	&& $_('schema:addressLocality "%s";', $addressLocality);
-			!empty($addressRegion) 		&& $_('schema:addressRegion "%s";', $addressRegion);
-			$_('schema:addressCountry "%s". ', $addressCountry);
+            // serialize schema:PostalAddress 
+            $_('<%s> a schema:PostalAddress;', $addressUri);
+            !empty($addressDescription) && $_('schema:description "%s";', $addressDescription);
+            !empty($streetAddress) 		&& $_('schema:streetAddress "%s";', $streetAddress);
+            !empty($postalCode) 		&& $_('schema:postalCode "%s";', $postalCode);
+            !empty($addressLocality) 	&& $_('schema:addressLocality "%s";', $addressLocality);
+            !empty($addressRegion) 		&& $_('schema:addressRegion "%s";', $addressRegion);
+            $_('schema:addressCountry "%s". ', $addressCountry);
 
-			// serialize schema:GeoCoordinates
-			if( !empty($geoUri)){
-				$_('<%s> a schema:GeoCoordinates;', $geoUri); 
-				$_('wgs:lat "%s"^^xsd:float;', $lat);
-				$_('wgs:long "%s"^^xsd:float . ', $long); 
-			}
+            // serialize schema:GeoCoordinates
+            if( !empty($geoUri)){
+                $_('<%s> a schema:GeoCoordinates;', $geoUri); 
+                $_('wgs:lat "%s"^^xsd:float;', $lat);
+                $_('wgs:long "%s"^^xsd:float . ', $long); 
+            }
 
-			$this->rdf = $turtleString;
-			$this->tripleCount = $tripleCounter;
-		}
+            $this->rdf = $turtleString;
+            $this->tripleCount = $tripleCounter;
+        }
 		
-		return $this->rdf;
-	}
+        return $this->rdf;
+    }
 	
 }
\ No newline at end of file

Spacing +35 added lines, -35 removed lines

@@ -9,7 +9,7 @@ 
  */
 class LocalBusiness extends AbstractModel implements \BOTK\ModelInterface 
 {
-	protected static $DEFAULT_OPTIONS = array (
+	protected static $DEFAULT_OPTIONS = array(
 		'businessType'		=> array(		
 								// additional types  as extension of schema:LocalBusiness
 								'filter'    => FILTER_DEFAULT,
@@ -93,7 +93,7 @@ 
 
 	public function __construct(array $data = array(), array $customOptions = array()) 
     {
-    	$options = $this->mergeOptions(self::$DEFAULT_OPTIONS,$customOptions);
+    	$options = $this->mergeOptions(self::$DEFAULT_OPTIONS, $customOptions);
     	parent::__construct($data, $options);
 		$this->addAddressDescription();
 	}
@@ -110,12 +110,12 @@ 
 	{	
 		extract($this->data);
 
-		if(empty($addressDescription)){
-			if( !empty($streetAddress) && ( !empty($addressLocality) || !empty($postalCode))){
+		if (empty($addressDescription)) {
+			if (!empty($streetAddress) && (!empty($addressLocality) || !empty($postalCode))) {
 				$addressDescription = "$streetAddress ,";
-				if(!empty($postalCode)) { $addressDescription.= " $postalCode";}
-				if(!empty($addressLocality)) { $addressDescription.= " $addressLocality"; }
-				if(!empty($addressRegion)) { $addressDescription.= " ($addressRegion)"; }
+				if (!empty($postalCode)) { $addressDescription .= " $postalCode"; }
+				if (!empty($addressLocality)) { $addressDescription .= " $addressLocality"; }
+				if (!empty($addressRegion)) { $addressDescription .= " ($addressRegion)"; }
 			} else {
 				$addressDescription = null;
 			}
@@ -123,30 +123,30 @@ 
 		
 		$addressDescription = \BOTK\Filters::FILTER_SANITIZE_ADDRESS($addressDescription);
 		
-		if(!empty($addressDescription)){
-			$this->data['addressDescription']=$addressDescription;
+		if (!empty($addressDescription)) {
+			$this->data['addressDescription'] = $addressDescription;
 		}
 	}
 	
 	
 	public function asTurtle()
 	{
-		if(is_null($this->rdf)) {
+		if (is_null($this->rdf)) {
 			extract($this->data);
 
 			// create uris
 			$organizationUri = $this->getUri();
 			$addressUri = $organizationUri.'_address';
-			$geoUri = ( !empty($lat) && !empty($long) )?"geo:$lat,$long":null;
+			$geoUri = (!empty($lat) && !empty($long)) ? "geo:$lat,$long" : null;
 			
-			$tripleCounter =0;
-			$turtleString='';
+			$tripleCounter = 0;
+			$turtleString = '';
 			
 			// define $_ as a macro to write simple rdf
-			$_= function($format, $var) use(&$turtleString, &$tripleCounter){
-				foreach((array)$var as $v){
-					if($var){
-						$turtleString.= sprintf($format,$v);
+			$_ = function($format, $var) use(&$turtleString, &$tripleCounter){
+				foreach ((array) $var as $v) {
+					if ($var) {
+						$turtleString .= sprintf($format, $v);
 						$tripleCounter++;
 					}
 				}
@@ -154,32 +154,32 @@ 
 				
 	 		// serialize schema:LocalBusiness
  			$_('<%s> a schema:LocalBusiness;', $organizationUri);
-			!empty($businessType) 		&& $_('a %s;', $businessType);
-			!empty($id) 				&& $_('dct:identifier "%s";', $id);
-			!empty($vatID) 				&& $_('schema:vatID "%s";', $vatID); 
-			!empty($taxtID) 			&& $_('schema:taxtID "%s";', $taxID);
-			!empty($legalName)			&& $_('schema:legalName "%s";', $legalName);
-			!empty($businessName) 		&& $_('schema:alternateName "%s";', $businessName);
-			!empty($telephone) 			&& $_('schema:telephone "%s";', $telephone);
-			!empty($faxNumber) 			&& $_('schema:faxNumber "%s";', $faxNumber);
-			!empty($page) 				&& $_('schema:page <%s>;', $page);
-			!empty($email) 				&& $_('schema:email "%s";', $email);
-			!empty($homepage) 			&& $_('foaf:homepage <%s>;', $homepage);
-			!empty($mailbox) 			&& $_('foaf:mailbox <mailto:%s>;', $mailbox);
-			!empty($geoUri) 			&& $_('schema:geo <%s>;', $geoUri);
+			!empty($businessType) && $_('a %s;', $businessType);
+			!empty($id) && $_('dct:identifier "%s";', $id);
+			!empty($vatID) && $_('schema:vatID "%s";', $vatID); 
+			!empty($taxtID) && $_('schema:taxtID "%s";', $taxID);
+			!empty($legalName) && $_('schema:legalName "%s";', $legalName);
+			!empty($businessName) && $_('schema:alternateName "%s";', $businessName);
+			!empty($telephone) && $_('schema:telephone "%s";', $telephone);
+			!empty($faxNumber) && $_('schema:faxNumber "%s";', $faxNumber);
+			!empty($page) && $_('schema:page <%s>;', $page);
+			!empty($email) && $_('schema:email "%s";', $email);
+			!empty($homepage) && $_('foaf:homepage <%s>;', $homepage);
+			!empty($mailbox) && $_('foaf:mailbox <mailto:%s>;', $mailbox);
+			!empty($geoUri) && $_('schema:geo <%s>;', $geoUri);
 			$_('schema:address <%s>. ', $addressUri);
 			
 			// serialize schema:PostalAddress 
 			$_('<%s> a schema:PostalAddress;', $addressUri);
 			!empty($addressDescription) && $_('schema:description "%s";', $addressDescription);
-			!empty($streetAddress) 		&& $_('schema:streetAddress "%s";', $streetAddress);
-			!empty($postalCode) 		&& $_('schema:postalCode "%s";', $postalCode);
-			!empty($addressLocality) 	&& $_('schema:addressLocality "%s";', $addressLocality);
-			!empty($addressRegion) 		&& $_('schema:addressRegion "%s";', $addressRegion);
+			!empty($streetAddress) && $_('schema:streetAddress "%s";', $streetAddress);
+			!empty($postalCode) && $_('schema:postalCode "%s";', $postalCode);
+			!empty($addressLocality) && $_('schema:addressLocality "%s";', $addressLocality);
+			!empty($addressRegion) && $_('schema:addressRegion "%s";', $addressRegion);
 			$_('schema:addressCountry "%s". ', $addressCountry);
 
 			// serialize schema:GeoCoordinates
-			if( !empty($geoUri)){
+			if (!empty($geoUri)) {
 				$_('<%s> a schema:GeoCoordinates;', $geoUri); 
 				$_('wgs:lat "%s"^^xsd:float;', $lat);
 				$_('wgs:long "%s"^^xsd:float . ', $long);