linkeddatacenter / BOTK-core

src/Filters.php

Doc Comments +1 added lines

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

Indentation +64 added lines, -64 removed lines

@@ -7,82 +7,82 @@
  */
 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 FILTER_SANITIZE_ADDRESS($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
+    /**
+     * uppercase, no trailing and ending blancs, no multiple spaces, no "strange" strings, no blanks after dot., a single blanc after comma
+     */
+    static function FILTER_SANITIZE_ADDRESS($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 $value?mb_strtoupper($value,'UTF-8'):false;		// uppercase
-	}
+        return $value?mb_strtoupper($value,'UTF-8'):false;		// uppercase
+    }
 	
 
-	static function FILTER_SANITIZE_TOKEN($value)
-	{
-		$value = preg_replace('/[^\w]/', '', $value);
-		return $value?strtoupper($value):false;
-	}
+    static function FILTER_SANITIZE_TOKEN($value)
+    {
+        $value = preg_replace('/[^\w]/', '', $value);
+        return $value?strtoupper($value):false;
+    }
 
 
-	/**
-	 * Normalize an italian telephone number
-	 */
-	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
+     */
+    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?:false;		
-	}
+        return $value?:false;		
+    }
 	
 	
-	/**
-	 * Normalize email
-	 */
-	static function FILTER_SANITIZE_EMAIL($value)
-	{
-		$value =  filter_var($value, FILTER_VALIDATE_EMAIL);
-		return  $value?strtoupper($value):false;		
-	}
+    /**
+     * Normalize email
+     */
+    static function FILTER_SANITIZE_EMAIL($value)
+    {
+        $value =  filter_var($value, FILTER_VALIDATE_EMAIL);
+        return  $value?strtoupper($value):false;		
+    }
 	
 	
-	static function FILTER_SANITIZE_ID($value)
-	{
-		$value = strtolower($value);
-		$value = preg_replace('/[^a-z0-9]+/', ' ', $value);
-		$value = preg_replace('/[^a-z0-9]+/', ' ', $value);
-		$value = preg_replace('/[\s]{1,}/', '_', trim($value));
-		return $value?:false;
-	}
+    static function FILTER_SANITIZE_ID($value)
+    {
+        $value = strtolower($value);
+        $value = preg_replace('/[^a-z0-9]+/', ' ', $value);
+        $value = preg_replace('/[^a-z0-9]+/', ' ', $value);
+        $value = preg_replace('/[\s]{1,}/', '_', trim($value));
+        return $value?:false;
+    }
 	
 	
-	static function FILTER_SANITIZE_LAT_LONG($value)
-	{
-		// http://www.regexlib.com/REDetails.aspx?regexp_id=2728
-		$value = preg_replace('/,/', '.', $value);
-		$value = sprintf('%01.6f',floatval($value));
-		return preg_match('/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/', $value)?$value:false;
-	}
+    static function FILTER_SANITIZE_LAT_LONG($value)
+    {
+        // http://www.regexlib.com/REDetails.aspx?regexp_id=2728
+        $value = preg_replace('/,/', '.', $value);
+        $value = sprintf('%01.6f',floatval($value));
+        return preg_match('/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/', $value)?$value:false;
+    }
 	
 }
\ No newline at end of file

Spacing +24 added lines, -24 removed lines

@@ -13,24 +13,24 @@ 
 	static function FILTER_SANITIZE_ADDRESS($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
+		$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 $value?mb_strtoupper($value,'UTF-8'):false;		// uppercase
+		return $value ? mb_strtoupper($value, 'UTF-8') : false; // uppercase
 	}
 	
 
 	static function FILTER_SANITIZE_TOKEN($value)
 	{
 		$value = preg_replace('/[^\w]/', '', $value);
-		return $value?strtoupper($value):false;
+		return $value ? strtoupper($value) : false;
 	}
 
 
@@ -39,21 +39,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?:false;		
+		return $value ?: false;		
 	}
 	
 	
@@ -62,8 +62,8 @@ 
 	 */
 	static function FILTER_SANITIZE_EMAIL($value)
 	{
-		$value =  filter_var($value, FILTER_VALIDATE_EMAIL);
-		return  $value?strtoupper($value):false;		
+		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
+		return  $value ? strtoupper($value) : false;		
 	}
 	
 	
@@ -73,7 +73,7 @@ 
 		$value = preg_replace('/[^a-z0-9]+/', ' ', $value);
 		$value = preg_replace('/[^a-z0-9]+/', ' ', $value);
 		$value = preg_replace('/[\s]{1,}/', '_', trim($value));
-		return $value?:false;
+		return $value ?: false;
 	}
 	
 	
@@ -81,8 +81,8 @@ 
 	{
 		// http://www.regexlib.com/REDetails.aspx?regexp_id=2728
 		$value = preg_replace('/,/', '.', $value);
-		$value = sprintf('%01.6f',floatval($value));
-		return preg_match('/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/', $value)?$value:false;
+		$value = sprintf('%01.6f', floatval($value));
+		return preg_match('/^-?([1-8]?[0-9]\.{1}\d{1,6}$|90\.{1}0{1,6}$)/', $value) ? $value : false;
 	}
 	
 }
\ No newline at end of file

src/Model/AbstractModel.php

Doc Comments +11 added lines

@@ -112,6 +112,7 @@ 
 	
 	/**
 	 * dependecy injection setter 
+	 * @param \Closure $generator
 	 */
 	public function setIdGenerator($generator)
 	{
@@ -160,18 +161,28 @@ 
 	}
 	
 	
+	/**
+	 * @param string $prefix
+	 * @param string $ns
+	 */
 	public function setVocabulary($prefix,$ns)
 	{
 		$this->vocabulary[$prefix] = $ns;
 	}
 	
 	
+	/**
+	 * @param string $prefix
+	 */
 	public function unsetVocabulary($prefix)
 	{
 		unset($this->vocabulary[$prefix]);
 	}	
 	
 	
+	/**
+	 * @param string $base
+	 */
 	public function getTurtleHeader($base=null)
 	{
 		$header = empty($base)?'': "@base <$base> .\n";

Indentation +154 added lines, -154 removed lines

@@ -7,195 +7,195 @@
 abstract class AbstractModel 
 {
 	
-	/**
-	 * 
-	 * MUST be redefined by concrete class with the model schema 
-	 * Each array element is composed by a propery name and and property options.
-	 * Property option is an array with following (optional) fields:
-	 * 		'default' 	a value to be used for the propery
-	 * 		'filter' 	a php filter 
-	 * 		'options' 	php filter options
-	 * 		'flags'		php filter flags
-	 * 
-	 * Example:array (
-	 *	'legalName'			=> array(
-	 *							'filter'    => FILTER_CALLBACK,	
-	 *	                        'options' 	=> '\BOTK\Filters::FILTER_NORMALIZZE_ADDRESS',
-	 *		                   ),
-	 *	'alternateName'		=> array(		
+    /**
+     * 
+     * MUST be redefined by concrete class with the model schema 
+     * Each array element is composed by a propery name and and property options.
+     * Property option is an array with following (optional) fields:
+     * 		'default' 	a value to be used for the propery
+     * 		'filter' 	a php filter 
+     * 		'options' 	php filter options
+     * 		'flags'		php filter flags
+     * 
+     * Example:array (
+     *	'legalName'			=> array(
+     *							'filter'    => FILTER_CALLBACK,	
+     *	                        'options' 	=> '\BOTK\Filters::FILTER_NORMALIZZE_ADDRESS',
+     *		                   ),
+     *	'alternateName'		=> array(		
                             	'flags'  	=> FILTER_FORCE_ARRAY,
-	 * 						),
-	 * 	'postalCode'		=> array(	// italian rules
-	 *							'filter'    => FILTER_VALIDATE_REGEXP,	
-	 *	                        'options' 	=> array('regexp'=>'/^[0-9]{5}$/'),
-	 *                      	'flags'  	=> FILTER_REQUIRE_SCALAR,
-	 *		                   ),
-	 * )
-	 */
-	protected static $DEFAULT_OPTIONS  = array(
-		'base'				=> array(
-								'default'	=> 'http://linkeddata.center/botk/resource/',
-								'filter'    => FILTER_SANITIZE_URL,
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'uri'				=> array(
-								'filter'    => FILTER_SANITIZE_URL,
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'lang'				=> array(
-								'default'	=> 'it',		
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^[a-z]{2}$/'),
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'id'				=> array(		
-								'filter'    => FILTER_VALIDATE_REGEXP,
-		                        'options' 	=> array('regexp'=>'/^\w+$/'),
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-	);
+     * 						),
+     * 	'postalCode'		=> array(	// italian rules
+     *							'filter'    => FILTER_VALIDATE_REGEXP,	
+     *	                        'options' 	=> array('regexp'=>'/^[0-9]{5}$/'),
+     *                      	'flags'  	=> FILTER_REQUIRE_SCALAR,
+     *		                   ),
+     * )
+     */
+    protected static $DEFAULT_OPTIONS  = array(
+        'base'				=> array(
+                                'default'	=> 'http://linkeddata.center/botk/resource/',
+                                'filter'    => FILTER_SANITIZE_URL,
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'uri'				=> array(
+                                'filter'    => FILTER_SANITIZE_URL,
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'lang'				=> array(
+                                'default'	=> 'it',		
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^[a-z]{2}$/'),
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'id'				=> array(		
+                                'filter'    => FILTER_VALIDATE_REGEXP,
+                                'options' 	=> array('regexp'=>'/^\w+$/'),
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+    );
 	
-	protected $options ;
-	protected $vocabulary = array(
-		'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
-		'schema'	=> 'http://schema.org/',
-		'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-		'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
-		'dct' 		=> 'http://purl.org/dc/terms/',
-		'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
-	);
-	protected $data;
-	protected $rdf =null; //lazy created
-	protected $tripleCount=0; //lazy created
-	protected $uniqueIdGenerator=null; // dependency injections
+    protected $options ;
+    protected $vocabulary = array(
+        'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
+        'schema'	=> 'http://schema.org/',
+        'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
+        'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
+        'dct' 		=> 'http://purl.org/dc/terms/',
+        'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
+    );
+    protected $data;
+    protected $rdf =null; //lazy created
+    protected $tripleCount=0; //lazy created
+    protected $uniqueIdGenerator=null; // dependency injections
 	
-	abstract public function asTurtle();
+    abstract public function asTurtle();
 
-	protected function mergeOptions( array $options1, array $options2 )
-	{
-    	foreach($options2 as $property=>$option){
-    		assert(is_array($option));
+    protected function mergeOptions( array $options1, array $options2 )
+    {
+        foreach($options2 as $property=>$option){
+            assert(is_array($option));
 			
-			$options1[$property]=isset($options1[$property])
-				?array_merge($options1[$property], $option)
-				:$option;
-    	}
+            $options1[$property]=isset($options1[$property])
+                ?array_merge($options1[$property], $option)
+                :$option;
+        }
 		
-		return $options1;
-	}
+        return $options1;
+    }
 
     public function __construct(array $data = array(), array $customOptions = array()) 
     {
-		$options = $this->mergeOptions(self::$DEFAULT_OPTIONS,$customOptions);
+        $options = $this->mergeOptions(self::$DEFAULT_OPTIONS,$customOptions);
 		
-		// set default values
-		foreach( $options as $property=>$option){	
-			if(empty($data[$property]) && isset($option['default'])){
-				$data[$property] = $option['default'];
-			}
-		}
+        // set default values
+        foreach( $options as $property=>$option){	
+            if(empty($data[$property]) && isset($option['default'])){
+                $data[$property] = $option['default'];
+            }
+        }
 
-		// ensure data are sanitized and validated
-		$sanitizedData = array_filter( filter_var_array($data, $options), function($value,$property) use($data,$options){
-			if ($value===false && isset($data[$property]) && $data[$property]!==false){
-				$id = empty($data['id'])?'unknown':$data['id'];
-				throw new DataModelException("failed validation of '$property' property of subject with id '$id'. Record dropped.");
-			}
-			return !is_null($value);
-		} , ARRAY_FILTER_USE_BOTH);
+        // ensure data are sanitized and validated
+        $sanitizedData = array_filter( filter_var_array($data, $options), function($value,$property) use($data,$options){
+            if ($value===false && isset($data[$property]) && $data[$property]!==false){
+                $id = empty($data['id'])?'unknown':$data['id'];
+                throw new DataModelException("failed validation of '$property' property of subject with id '$id'. Record dropped.");
+            }
+            return !is_null($value);
+        } , ARRAY_FILTER_USE_BOTH);
 
-		$this->options = $options;
-		$this->data = $sanitizedData;
-		$this->setIdGenerator(function($data){return uniqid();});
+        $this->options = $options;
+        $this->data = $sanitizedData;
+        $this->setIdGenerator(function($data){return uniqid();});
     }
 
 	
-	/**
-	 * dependecy injection setter 
-	 */
-	public function setIdGenerator($generator)
-	{
-		assert( is_callable($generator));
-		$this->uniqueIdGenerator = $generator;
+    /**
+     * dependecy injection setter 
+     */
+    public function setIdGenerator($generator)
+    {
+        assert( is_callable($generator));
+        $this->uniqueIdGenerator = $generator;
 		
-		return $this;
-	}
+        return $this;
+    }
 
 
-	/**
-	 * a generic implementation that use uri, base and id property (all optionals)
-	 */
-	public function getUri()
-	{
-		if(!empty($this->data['uri'])){
-			$uri =  $this->data['uri'];
-		} elseif(!empty($this->data['base'])) {
-			$idGenerator=$this->uniqueIdGenerator;
-			$uri = $this->data['base'];
-			$uri.=empty($this->data['id'])?$idGenerator($this->data):$this->data['id'];
-		} else{
-			$idGenerator=$this->uniqueIdGenerator;
-			$uri = 'urn:local:botk:'.$idGenerator($this->data);
-		}
+    /**
+     * a generic implementation that use uri, base and id property (all optionals)
+     */
+    public function getUri()
+    {
+        if(!empty($this->data['uri'])){
+            $uri =  $this->data['uri'];
+        } elseif(!empty($this->data['base'])) {
+            $idGenerator=$this->uniqueIdGenerator;
+            $uri = $this->data['base'];
+            $uri.=empty($this->data['id'])?$idGenerator($this->data):$this->data['id'];
+        } else{
+            $idGenerator=$this->uniqueIdGenerator;
+            $uri = 'urn:local:botk:'.$idGenerator($this->data);
+        }
 		
-		return $uri;
-	}
+        return $uri;
+    }
 		
 
-	public function asArray()
-	{
-		return $this->data;
-	}
+    public function asArray()
+    {
+        return $this->data;
+    }
 
 	
-	public function getOptions()
-	{
-		return $this->options;
-	}
+    public function getOptions()
+    {
+        return $this->options;
+    }
 
 
-	public function getVocabulary()
-	{
-		return $this->vocabulary;
-	}
+    public function getVocabulary()
+    {
+        return $this->vocabulary;
+    }
 	
 	
-	public function setVocabulary($prefix,$ns)
-	{
-		$this->vocabulary[$prefix] = $ns;
-	}
+    public function setVocabulary($prefix,$ns)
+    {
+        $this->vocabulary[$prefix] = $ns;
+    }
 	
 	
-	public function unsetVocabulary($prefix)
-	{
-		unset($this->vocabulary[$prefix]);
-	}	
+    public function unsetVocabulary($prefix)
+    {
+        unset($this->vocabulary[$prefix]);
+    }	
 	
 	
-	public function getTurtleHeader($base=null)
-	{
-		$header = empty($base)?'': "@base <$base> .\n";
-		foreach( $this->vocabulary as $prefix=>$ns ){
-			$header.="@prefix $prefix: <$ns> .\n";
-		}
+    public function getTurtleHeader($base=null)
+    {
+        $header = empty($base)?'': "@base <$base> .\n";
+        foreach( $this->vocabulary as $prefix=>$ns ){
+            $header.="@prefix $prefix: <$ns> .\n";
+        }
 		
-		return $header;
-	}
+        return $header;
+    }
 
 	
-	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->getTurtleHeader() ."\n". $this->asTurtle();
-	}
+    public function __toString() 
+    {
+        return $this->getTurtleHeader() ."\n". $this->asTurtle();
+    }
 }
\ No newline at end of file

Spacing +31 added lines, -31 removed lines

@@ -32,7 +32,7 @@ 
 	 *		                   ),
 	 * )
 	 */
-	protected static $DEFAULT_OPTIONS  = array(
+	protected static $DEFAULT_OPTIONS = array(
 		'base'				=> array(
 								'default'	=> 'http://linkeddata.center/botk/resource/',
 								'filter'    => FILTER_SANITIZE_URL,
@@ -55,7 +55,7 @@ 
 			                   ),
 	);
 	
-	protected $options ;
+	protected $options;
 	protected $vocabulary = array(
 		'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
 		'schema'	=> 'http://schema.org/',
@@ -65,19 +65,19 @@ 
 		'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
 	);
 	protected $data;
-	protected $rdf =null; //lazy created
-	protected $tripleCount=0; //lazy created
-	protected $uniqueIdGenerator=null; // dependency injections
+	protected $rdf = null; //lazy created
+	protected $tripleCount = 0; //lazy created
+	protected $uniqueIdGenerator = null; // dependency injections
 	
 	abstract public function asTurtle();
 
-	protected function mergeOptions( array $options1, array $options2 )
+	protected function mergeOptions(array $options1, array $options2)
 	{
-    	foreach($options2 as $property=>$option){
+    	foreach ($options2 as $property=>$option) {
     		assert(is_array($option));
 			
-			$options1[$property]=isset($options1[$property])
-				?array_merge($options1[$property], $option)
+			$options1[$property] = isset($options1[$property])
+				? array_merge($options1[$property], $option)
 				:$option;
     	}
 		
@@ -86,19 +86,19 @@ 
 
     public function __construct(array $data = array(), array $customOptions = array()) 
     {
-		$options = $this->mergeOptions(self::$DEFAULT_OPTIONS,$customOptions);
+		$options = $this->mergeOptions(self::$DEFAULT_OPTIONS, $customOptions);
 		
 		// set default values
-		foreach( $options as $property=>$option){	
-			if(empty($data[$property]) && isset($option['default'])){
+		foreach ($options as $property=>$option) {	
+			if (empty($data[$property]) && isset($option['default'])) {
 				$data[$property] = $option['default'];
 			}
 		}
 
 		// ensure data are sanitized and validated
-		$sanitizedData = array_filter( filter_var_array($data, $options), function($value,$property) use($data,$options){
-			if ($value===false && isset($data[$property]) && $data[$property]!==false){
-				$id = empty($data['id'])?'unknown':$data['id'];
+		$sanitizedData = array_filter(filter_var_array($data, $options), function($value, $property) use($data, $options){
+			if ($value === false && isset($data[$property]) && $data[$property] !== false) {
+				$id = empty($data['id']) ? 'unknown' : $data['id'];
 				throw new DataModelException("failed validation of '$property' property of subject with id '$id'. Record dropped.");
 			}
 			return !is_null($value);
@@ -106,7 +106,7 @@ 
 
 		$this->options = $options;
 		$this->data = $sanitizedData;
-		$this->setIdGenerator(function($data){return uniqid();});
+		$this->setIdGenerator(function($data) {return uniqid(); });
     }
 
 	
@@ -115,7 +115,7 @@ 
 	 */
 	public function setIdGenerator($generator)
 	{
-		assert( is_callable($generator));
+		assert(is_callable($generator));
 		$this->uniqueIdGenerator = $generator;
 		
 		return $this;
@@ -127,14 +127,14 @@ 
 	 */
 	public function getUri()
 	{
-		if(!empty($this->data['uri'])){
-			$uri =  $this->data['uri'];
-		} elseif(!empty($this->data['base'])) {
-			$idGenerator=$this->uniqueIdGenerator;
+		if (!empty($this->data['uri'])) {
+			$uri = $this->data['uri'];
+		} elseif (!empty($this->data['base'])) {
+			$idGenerator = $this->uniqueIdGenerator;
 			$uri = $this->data['base'];
-			$uri.=empty($this->data['id'])?$idGenerator($this->data):$this->data['id'];
-		} else{
-			$idGenerator=$this->uniqueIdGenerator;
+			$uri .= empty($this->data['id']) ? $idGenerator($this->data) : $this->data['id'];
+		} else {
+			$idGenerator = $this->uniqueIdGenerator;
 			$uri = 'urn:local:botk:'.$idGenerator($this->data);
 		}
 		
@@ -160,7 +160,7 @@ 
 	}
 	
 	
-	public function setVocabulary($prefix,$ns)
+	public function setVocabulary($prefix, $ns)
 	{
 		$this->vocabulary[$prefix] = $ns;
 	}
@@ -172,11 +172,11 @@ 
 	}	
 	
 	
-	public function getTurtleHeader($base=null)
+	public function getTurtleHeader($base = null)
 	{
-		$header = empty($base)?'': "@base <$base> .\n";
-		foreach( $this->vocabulary as $prefix=>$ns ){
-			$header.="@prefix $prefix: <$ns> .\n";
+		$header = empty($base) ? '' : "@base <$base> .\n";
+		foreach ($this->vocabulary as $prefix=>$ns) {
+			$header .= "@prefix $prefix: <$ns> .\n";
 		}
 		
 		return $header;
@@ -186,7 +186,7 @@ 
 	public function getTripleCount()
 	{
 		// triple count is computed during rdf creation
-		if (is_null($this->rdf)){
+		if (is_null($this->rdf)) {
 			$this->asTurtle();
 		}
 		
@@ -196,6 +196,6 @@ 
 		
 	public function __toString() 
 	{
-		return $this->getTurtleHeader() ."\n". $this->asTurtle();
+		return $this->getTurtleHeader()."\n".$this->asTurtle();
 	}
 }
\ No newline at end of file

tests/unit/FiltersTest.php

Indentation +51 added lines, -51 removed lines

@@ -5,72 +5,72 @@
     /**
      * @dataProvider telephones
      */	
-	public function testItTelephoneFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TELEPHONE($data));
-	}
+    public function testItTelephoneFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TELEPHONE($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::FILTER_SANITIZE_EMAIL('abC@Example.com'));
-		$this->assertTrue(empty(BOTK\Filters::FILTER_SANITIZE_EMAIL('invalid email')));
-	}
+    public function testEmailFilter()
+    {
+        $this->assertEquals('ABC@EXAMPLE.COM', BOTK\Filters::FILTER_SANITIZE_EMAIL('abC@Example.com'));
+        $this->assertTrue(empty(BOTK\Filters::FILTER_SANITIZE_EMAIL('invalid email')));
+    }
 
     /**
      * @dataProvider tokens
      */	
-	public function testTokenFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TOKEN($data));
-	}
+    public function testTokenFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TOKEN($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::FILTER_SANITIZE_ADDRESS($data));
-	}
+    public function testAddressFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_ADDRESS($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;'), 
+        );
+        }
 	
 }
 

tests/unit/Model/AbstractModelTest.php

Indentation +76 added lines, -76 removed lines

@@ -2,115 +2,115 @@
 
 class DummyModel extends BOTK\Model\AbstractModel
 {
-	public function asTurtle() { return '<urn:a:b> owl:sameAs <urn:a:b> .';}
+    public function asTurtle() { return '<urn:a:b> owl:sameAs <urn:a:b> .';}
 }
 
 class AbstractModelTest extends PHPUnit_Framework_TestCase
 {
-	protected $vocabulary = array(
-		'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
-		'schema'	=> 'http://schema.org/',
-		'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-		'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
-		'dct' 		=> 'http://purl.org/dc/terms/',
-		'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
-	);
+    protected $vocabulary = array(
+        'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
+        'schema'	=> 'http://schema.org/',
+        'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
+        'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
+        'dct' 		=> 'http://purl.org/dc/terms/',
+        'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
+    );
 	
 	
-	public function testGetVocabulary()
-	{
-		$vocabulary = array(
-			'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
-			'schema'	=> 'http://schema.org/',
-			'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-			'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
-			'dct' 		=> 'http://purl.org/dc/terms/',
-			'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
-		);
+    public function testGetVocabulary()
+    {
+        $vocabulary = array(
+            'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
+            'schema'	=> 'http://schema.org/',
+            'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
+            'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
+            'dct' 		=> 'http://purl.org/dc/terms/',
+            'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
+        );
 		
-		$obj = new DummyModel(array());
+        $obj = new DummyModel(array());
 		
-		$this->assertEquals($this->vocabulary,  $obj->getVocabulary());
-	}
+        $this->assertEquals($this->vocabulary,  $obj->getVocabulary());
+    }
 	
 	
-	public function testSetVocabulary()
-	{
-		$vocabulary = $this->vocabulary;
-		$vocabulary['my'] = 'urn:test:';
+    public function testSetVocabulary()
+    {
+        $vocabulary = $this->vocabulary;
+        $vocabulary['my'] = 'urn:test:';
 		
-		$obj = new DummyModel(array());
-		$obj->setVocabulary('my','urn:test:');
+        $obj = new DummyModel(array());
+        $obj->setVocabulary('my','urn:test:');
 		
-		$this->assertEquals($vocabulary,  $obj->getVocabulary());
-	}
+        $this->assertEquals($vocabulary,  $obj->getVocabulary());
+    }
 	
 	
-	public function testUnsetVocabulary()
-	{
-		$vocabulary = $this->vocabulary;
-		unset($vocabulary['foaf']);
+    public function testUnsetVocabulary()
+    {
+        $vocabulary = $this->vocabulary;
+        unset($vocabulary['foaf']);
 		
-		$obj = new DummyModel(array());
-		$obj->unsetVocabulary('foaf');
+        $obj = new DummyModel(array());
+        $obj->unsetVocabulary('foaf');
 		
-		$this->assertEquals($vocabulary,  $obj->getVocabulary());
-	}
+        $this->assertEquals($vocabulary,  $obj->getVocabulary());
+    }
 	
 
     /**
      * @dataProvider uris
      */	
-	public function testGetUri($data, $expectedData)
-	{
-		$obj = new DummyModel($data);
-		$obj->setIdGenerator(function($d){return'abc';});
-		$this->assertEquals($expectedData, $obj->getUri());
-	}
+    public function testGetUri($data, $expectedData)
+    {
+        $obj = new DummyModel($data);
+        $obj->setIdGenerator(function($d){return'abc';});
+        $this->assertEquals($expectedData, $obj->getUri());
+    }
 
 	
-	public function uris()
+    public function uris()
     {
-    	return array( 
-	    	array( array(),	'http://linkeddata.center/botk/resource/abc'),
-	    	array( array('base'=>'http://example.com/resource/'),	'http://example.com/resource/abc'),
-	    	array( array('base'=>'http://example.com/resource/', 'id'=>'efg'),	'http://example.com/resource/efg'),
-	    	array( array('uri'=>'http://example.com/resource/ijk'),	'http://example.com/resource/ijk'),	
-		);
-   	}
+        return array( 
+            array( array(),	'http://linkeddata.center/botk/resource/abc'),
+            array( array('base'=>'http://example.com/resource/'),	'http://example.com/resource/abc'),
+            array( array('base'=>'http://example.com/resource/', 'id'=>'efg'),	'http://example.com/resource/efg'),
+            array( array('uri'=>'http://example.com/resource/ijk'),	'http://example.com/resource/ijk'),	
+        );
+        }
 
-	public function testTurtleHeader()
-	{		
-		$obj = new DummyModel(array());
-		$s ="";
-		foreach( $this->vocabulary as $p=>$v){
-			$s.= "@prefix $p: <$v> .\n";
-		}
+    public function testTurtleHeader()
+    {		
+        $obj = new DummyModel(array());
+        $s ="";
+        foreach( $this->vocabulary as $p=>$v){
+            $s.= "@prefix $p: <$v> .\n";
+        }
 		
-		$this->assertEquals($s,  $obj->getTurtleHeader());
-	}
+        $this->assertEquals($s,  $obj->getTurtleHeader());
+    }
 	
 	
-	public function testTurtleHeaderWithBase()
-	{		
-		$obj = new DummyModel(array());
-		$s ="@base <urn:a:b> .\n";
-		foreach( $this->vocabulary as $p=>$v){
-			$s.= "@prefix $p: <$v> .\n";
-		}
+    public function testTurtleHeaderWithBase()
+    {		
+        $obj = new DummyModel(array());
+        $s ="@base <urn:a:b> .\n";
+        foreach( $this->vocabulary as $p=>$v){
+            $s.= "@prefix $p: <$v> .\n";
+        }
 		
-		$this->assertEquals($s,  $obj->getTurtleHeader('urn:a:b'));
-	}
+        $this->assertEquals($s,  $obj->getTurtleHeader('urn:a:b'));
+    }
 	
 	
 
-	public function testasString()
-	{		
-		$obj = new DummyModel(array());
-		$s= $obj->getTurtleHeader() ."\n<urn:a:b> owl:sameAs <urn:a:b> .";
+    public function testasString()
+    {		
+        $obj = new DummyModel(array());
+        $s= $obj->getTurtleHeader() ."\n<urn:a:b> owl:sameAs <urn:a:b> .";
 		
-		$this->assertEquals($s,  (string)$obj);
-	}
+        $this->assertEquals($s,  (string)$obj);
+    }
 	
 	
 

Spacing +20 added lines, -20 removed lines

@@ -2,7 +2,7 @@ 
 
 class DummyModel extends BOTK\Model\AbstractModel
 {
-	public function asTurtle() { return '<urn:a:b> owl:sameAs <urn:a:b> .';}
+	public function asTurtle() { return '<urn:a:b> owl:sameAs <urn:a:b> .'; }
 }
 
 class AbstractModelTest extends PHPUnit_Framework_TestCase
@@ -30,7 +30,7 @@ 
 		
 		$obj = new DummyModel(array());
 		
-		$this->assertEquals($this->vocabulary,  $obj->getVocabulary());
+		$this->assertEquals($this->vocabulary, $obj->getVocabulary());
 	}
 	
 	
@@ -40,9 +40,9 @@ 
 		$vocabulary['my'] = 'urn:test:';
 		
 		$obj = new DummyModel(array());
-		$obj->setVocabulary('my','urn:test:');
+		$obj->setVocabulary('my', 'urn:test:');
 		
-		$this->assertEquals($vocabulary,  $obj->getVocabulary());
+		$this->assertEquals($vocabulary, $obj->getVocabulary());
 	}
 	
 	
@@ -54,7 +54,7 @@ 
 		$obj = new DummyModel(array());
 		$obj->unsetVocabulary('foaf');
 		
-		$this->assertEquals($vocabulary,  $obj->getVocabulary());
+		$this->assertEquals($vocabulary, $obj->getVocabulary());
 	}
 	
 
@@ -64,7 +64,7 @@ 
 	public function testGetUri($data, $expectedData)
 	{
 		$obj = new DummyModel($data);
-		$obj->setIdGenerator(function($d){return'abc';});
+		$obj->setIdGenerator(function($d) {return'abc'; });
 		$this->assertEquals($expectedData, $obj->getUri());
 	}
 
@@ -72,34 +72,34 @@ 
 	public function uris()
     {
     	return array( 
-	    	array( array(),	'http://linkeddata.center/botk/resource/abc'),
-	    	array( array('base'=>'http://example.com/resource/'),	'http://example.com/resource/abc'),
-	    	array( array('base'=>'http://example.com/resource/', 'id'=>'efg'),	'http://example.com/resource/efg'),
-	    	array( array('uri'=>'http://example.com/resource/ijk'),	'http://example.com/resource/ijk'),	
+	    	array(array(), 'http://linkeddata.center/botk/resource/abc'),
+	    	array(array('base'=>'http://example.com/resource/'), 'http://example.com/resource/abc'),
+	    	array(array('base'=>'http://example.com/resource/', 'id'=>'efg'), 'http://example.com/resource/efg'),
+	    	array(array('uri'=>'http://example.com/resource/ijk'), 'http://example.com/resource/ijk'),	
 		);
    	}
 
 	public function testTurtleHeader()
 	{		
 		$obj = new DummyModel(array());
-		$s ="";
-		foreach( $this->vocabulary as $p=>$v){
-			$s.= "@prefix $p: <$v> .\n";
+		$s = "";
+		foreach ($this->vocabulary as $p=>$v) {
+			$s .= "@prefix $p: <$v> .\n";
 		}
 		
-		$this->assertEquals($s,  $obj->getTurtleHeader());
+		$this->assertEquals($s, $obj->getTurtleHeader());
 	}
 	
 	
 	public function testTurtleHeaderWithBase()
 	{		
 		$obj = new DummyModel(array());
-		$s ="@base <urn:a:b> .\n";
-		foreach( $this->vocabulary as $p=>$v){
-			$s.= "@prefix $p: <$v> .\n";
+		$s = "@base <urn:a:b> .\n";
+		foreach ($this->vocabulary as $p=>$v) {
+			$s .= "@prefix $p: <$v> .\n";
 		}
 		
-		$this->assertEquals($s,  $obj->getTurtleHeader('urn:a:b'));
+		$this->assertEquals($s, $obj->getTurtleHeader('urn:a:b'));
 	}
 	
 	
@@ -107,9 +107,9 @@ 
 	public function testasString()
 	{		
 		$obj = new DummyModel(array());
-		$s= $obj->getTurtleHeader() ."\n<urn:a:b> owl:sameAs <urn:a:b> .";
+		$s = $obj->getTurtleHeader()."\n<urn:a:b> owl:sameAs <urn:a:b> .";
 		
-		$this->assertEquals($s,  (string)$obj);
+		$this->assertEquals($s, (string) $obj);
 	}
 	
 	

tests/unit/Model/LocalBusinessTest.php

Indentation +324 added lines, -324 removed lines

@@ -5,364 +5,364 @@
     /**
      * @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',
-					'businessName'		=> 'Test  soc srl',
-					'businessType'		=> 'schema:MedicalOrganization',
-					'addressCountry'	=> 'IT',
-					'addressLocality'	=> 'LECCO',
-					'addressRegion'		=> 'LC',
-					'streetAddress'		=> 'Via  F. Valsecchi,124',
-					'postalCode'		=> '23900',
-					'page'				=> 'http://linkeddata.center/',
-					'telephone'			=> '+39 3356382949',
-					'faxNumber'			=> '+39 3356382949',
-					'email'				=> array('enrico@fagnoni.com'),
-					'geoDescription'	=> array('Via  F. Valsecchi,124-23900 Lecco (LC)'),
-					'lat'				=> '1.12345',
-					'long'				=> '2.123456',
-				),
-	    		array(
-					'base'				=> 'http://linkeddata.center/botk/resource/',	
-					'lang'				=> 'it',
-	    			'id'				=> '1234567890',
-					'businessType'		=> array('schema:MedicalOrganization'),
-					'taxID'				=> 'FGNNRC63S06F205A',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'TEST SOC SRL',
-					'businessName'		=> array('Test  soc srl'),
-					'addressCountry'	=> 'IT',
-					'addressLocality'	=> 'LECCO',
-					'addressRegion'		=> 'LC',
-					'streetAddress'		=> 'VIA F.VALSECCHI, 124',
-					'postalCode'		=> '23900',
-					'page'				=> array('http://linkeddata.center/'),
-					'telephone'			=> '3356382949',
-					'faxNumber'			=> '3356382949',
-					'email'				=> array('ENRICO@FAGNONI.COM'),
-					'geoDescription'	=> array('VIA F.VALSECCHI, 124 - 23900 LECCO (LC)'),
-					'lat'				=> '1.12345',
-					'long'				=> '2.123456',
-				),
-			),
-    		array(
-	    		array(
-	    			'id'				=> '1234567890',
-					'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',
+                    'businessName'		=> 'Test  soc srl',
+                    'businessType'		=> 'schema:MedicalOrganization',
+                    'addressCountry'	=> 'IT',
+                    'addressLocality'	=> 'LECCO',
+                    'addressRegion'		=> 'LC',
+                    'streetAddress'		=> 'Via  F. Valsecchi,124',
+                    'postalCode'		=> '23900',
+                    'page'				=> 'http://linkeddata.center/',
+                    'telephone'			=> '+39 3356382949',
+                    'faxNumber'			=> '+39 3356382949',
+                    'email'				=> array('enrico@fagnoni.com'),
+                    'geoDescription'	=> array('Via  F. Valsecchi,124-23900 Lecco (LC)'),
+                    'lat'				=> '1.12345',
+                    'long'				=> '2.123456',
+                ),
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource/',	
+                    'lang'				=> 'it',
+                    'id'				=> '1234567890',
+                    'businessType'		=> array('schema:MedicalOrganization'),
+                    'taxID'				=> 'FGNNRC63S06F205A',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'TEST SOC SRL',
+                    'businessName'		=> array('Test  soc srl'),
+                    'addressCountry'	=> 'IT',
+                    'addressLocality'	=> 'LECCO',
+                    'addressRegion'		=> 'LC',
+                    'streetAddress'		=> 'VIA F.VALSECCHI, 124',
+                    'postalCode'		=> '23900',
+                    'page'				=> array('http://linkeddata.center/'),
+                    'telephone'			=> '3356382949',
+                    'faxNumber'			=> '3356382949',
+                    'email'				=> array('ENRICO@FAGNONI.COM'),
+                    'geoDescription'	=> array('VIA F.VALSECCHI, 124 - 23900 LECCO (LC)'),
+                    'lat'				=> '1.12345',
+                    'long'				=> '2.123456',
+                ),
+            ),
+            array(
+                array(
+                    'id'				=> '1234567890',
+                    'addressCountry'	=> null,
+                ),
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource/',	
+                    'lang'				=> 'it',
+                    'id'				=> '1234567890',
+                    'addressCountry'	=> 'IT',
+                ),
+            ),			
+        );
+        }
 
-	public function testGetDefaultOptions()
-	{	
-		$expectedOptions =  array (
-			'base'				=> array(
-									'default'	=> 'http://linkeddata.center/botk/resource/',
-									'filter'    => FILTER_SANITIZE_URL,
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'uri'				=> array(
-									'filter'    => FILTER_SANITIZE_URL,
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'lang'				=> array(
-									'default'	=> 'it',		
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[a-z]{2}$/'),
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'id'				=> array(		
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^\w+$/'),
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'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,
-								   ),
-			'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,
-				                   ),
-			'page'				=> array(	
-									'filter'    => FILTER_SANITIZE_URL,
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-				                   ),
-			'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,
-				                   ),
-			'geoDescription'	=> array(
-									// a schema:alternateName for schema:GeoCoordinates	
-									'filter'    => FILTER_CALLBACK,	
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-				                   ),
-			'lat'				=> array( 
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_LAT_LONG',
-				                   ),
-			'long'				=> array( 
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_LAT_LONG',
-				                   ),
-		);
+    public function testGetDefaultOptions()
+    {	
+        $expectedOptions =  array (
+            'base'				=> array(
+                                    'default'	=> 'http://linkeddata.center/botk/resource/',
+                                    'filter'    => FILTER_SANITIZE_URL,
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'uri'				=> array(
+                                    'filter'    => FILTER_SANITIZE_URL,
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'lang'				=> array(
+                                    'default'	=> 'it',		
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[a-z]{2}$/'),
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'id'				=> array(		
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^\w+$/'),
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            '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,
+                                    ),
+            '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,
+                                    ),
+            'page'				=> array(	
+                                    'filter'    => FILTER_SANITIZE_URL,
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            '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,
+                                    ),
+            'geoDescription'	=> array(
+                                    // a schema:alternateName for schema:GeoCoordinates	
+                                    'filter'    => FILTER_CALLBACK,	
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            'lat'				=> array( 
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_LAT_LONG',
+                                    ),
+            'long'				=> array( 
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_LAT_LONG',
+                                    ),
+        );
 		
-		$localBusiness = new BOTK\Model\LocalBusiness(array());
-		$this->assertEquals($expectedOptions, $localBusiness->getOptions());
-	}
+        $localBusiness = new BOTK\Model\LocalBusiness(array());
+        $this->assertEquals($expectedOptions, $localBusiness->getOptions());
+    }
 
 
 
-	public function testChangeDefaultOptions()
-	{
-		$localBusiness = new BOTK\Model\LocalBusiness(array(), array (
-			'lang'	=> array('default'	=> 'en'),
-			'vatID' => array('options' 	=> array('regexp'=>'/^IT[0-9]{11}$/')),
-		));
-		$options = $localBusiness->getOptions();
-		$this->assertEquals(
-			array(
-				'default'	=> 'en',		
-				'filter'    => FILTER_VALIDATE_REGEXP,
-	            'flags'  	=> FILTER_REQUIRE_SCALAR,
-	            'options' 	=> array('regexp'=>'/^[a-z]{2}$/')
-			),
-			$options['lang']
-		);
-		$this->assertEquals(
-			array(
-				'filter'    => FILTER_VALIDATE_REGEXP,
-	            'flags'  	=> FILTER_REQUIRE_SCALAR,
-	            'options' 	=> array('regexp'=>'/^IT[0-9]{11}$/')
-	        ),
-			$options['vatID']
-		);
-	}
+    public function testChangeDefaultOptions()
+    {
+        $localBusiness = new BOTK\Model\LocalBusiness(array(), array (
+            'lang'	=> array('default'	=> 'en'),
+            'vatID' => array('options' 	=> array('regexp'=>'/^IT[0-9]{11}$/')),
+        ));
+        $options = $localBusiness->getOptions();
+        $this->assertEquals(
+            array(
+                'default'	=> 'en',		
+                'filter'    => FILTER_VALIDATE_REGEXP,
+                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                'options' 	=> array('regexp'=>'/^[a-z]{2}$/')
+            ),
+            $options['lang']
+        );
+        $this->assertEquals(
+            array(
+                'filter'    => FILTER_VALIDATE_REGEXP,
+                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                'options' 	=> array('regexp'=>'/^IT[0-9]{11}$/')
+            ),
+            $options['vatID']
+        );
+    }
 
 
     /**
      * @dataProvider goodRdf
      */	
-	public function testRdfGeneration($data, $rdf, $tripleCount)
-	{
-		$localBusiness = new BOTK\Model\LocalBusiness($data);		
-		$this->assertEquals($rdf, $localBusiness->asTurtle());
-		$this->assertEquals($tripleCount,  $localBusiness->getTripleCount());
-	}
+    public function testRdfGeneration($data, $rdf, $tripleCount)
+    {
+        $localBusiness = new BOTK\Model\LocalBusiness($data);		
+        $this->assertEquals($rdf, $localBusiness->asTurtle());
+        $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.234560,35.234440> a schema:GeoCoordinates;wgs:lat 43.234560 ;wgs:long 35.234440 ; . <urn:abc_place> a schema:LocalBusiness;schema:geo <geo:43.234560,35.234440>; . ',
-    			7,
-			),
-		);
-	}
+            array(
+                array(
+                    'uri'				=> 'urn:abc',
+                    'lat'				=> '43.23456',
+                    'long'				=> '35.23444',
+                ),
+                '<urn:abc> a schema:Organization;schema:location <urn:abc_place>; . <geo:43.234560,35.234440> a schema:GeoCoordinates;wgs:lat 43.234560 ;wgs:long 35.234440 ; . <urn:abc_place> a schema:LocalBusiness;schema:geo <geo:43.234560,35.234440>; . ',
+                7,
+            ),
+        );
+    }
 
 
     /**
      * @dataProvider structuredAdresses
      */	
-	public function testBuildNormalizedAddress($data, $expectedData)
-	{
-		$localBusiness = new BOTK\Model\LocalBusiness($data);
-		$this->assertEquals($expectedData, $localBusiness->buildNormalizedAddress($data));
-	}
+    public function testBuildNormalizedAddress($data, $expectedData)
+    {
+        $localBusiness = new BOTK\Model\LocalBusiness($data);
+        $this->assertEquals($expectedData, $localBusiness->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
+            ),
+        );
+        }
 
 
     /**
-	 * @expectedException \BOTK\Exceptions\DataModelException
+     * @expectedException \BOTK\Exceptions\DataModelException
      * @dataProvider badLocalBusiness
-	 * 
+     * 
      */	
     public  function testBadLocalBusiness($data)
-	{
-		$localBusiness = new BOTK\Model\LocalBusiness($data);
-	}
+    {
+        $localBusiness = new BOTK\Model\LocalBusiness($data);
+    }
 
-	public function badLocalBusiness()
+    public function badLocalBusiness()
     {
-    	return array( 
-			array(array('lang'				=> 'IT')),
-			array(array('id'				=> 'invalid id')),
-			array(array('vatID'				=> '012345678901')),			//too long
-			array(array('addressCountry'	=> 'italy')),					//too long
-			array(array('addressCountry'	=> 'it')),						//lowercase
-			array(array('postalCode'		=> '234992')),					//toolong
-			array(array('email'				=> 'ENRICO')),
-			array(array('lat'				=> '90.12345')),				//invalid lat
-			array(array('lat'				=> '-90.12345')),				//invalid lat
+        return array( 
+            array(array('lang'				=> 'IT')),
+            array(array('id'				=> 'invalid id')),
+            array(array('vatID'				=> '012345678901')),			//too long
+            array(array('addressCountry'	=> 'italy')),					//too long
+            array(array('addressCountry'	=> 'it')),						//lowercase
+            array(array('postalCode'		=> '234992')),					//toolong
+            array(array('email'				=> 'ENRICO')),
+            array(array('lat'				=> '90.12345')),				//invalid lat
+            array(array('lat'				=> '-90.12345')),				//invalid lat
 				
-		);
-   	}	
+        );
+        }	
 }
 

Spacing +9 added lines, -9 removed lines

@@ -97,7 +97,7 @@ 
 
 	public function testGetDefaultOptions()
 	{	
-		$expectedOptions =  array (
+		$expectedOptions = array(
 			'base'				=> array(
 									'default'	=> 'http://linkeddata.center/botk/resource/',
 									'filter'    => FILTER_SANITIZE_URL,
@@ -212,7 +212,7 @@ 
 
 	public function testChangeDefaultOptions()
 	{
-		$localBusiness = new BOTK\Model\LocalBusiness(array(), array (
+		$localBusiness = new BOTK\Model\LocalBusiness(array(), array(
 			'lang'	=> array('default'	=> 'en'),
 			'vatID' => array('options' 	=> array('regexp'=>'/^IT[0-9]{11}$/')),
 		));
@@ -244,7 +244,7 @@ 
 	{
 		$localBusiness = new BOTK\Model\LocalBusiness($data);		
 		$this->assertEquals($rdf, $localBusiness->asTurtle());
-		$this->assertEquals($tripleCount,  $localBusiness->getTripleCount());
+		$this->assertEquals($tripleCount, $localBusiness->getTripleCount());
 	}
 	
 	public function goodRdf()
@@ -354,13 +354,13 @@ 
     	return array( 
 			array(array('lang'				=> 'IT')),
 			array(array('id'				=> 'invalid id')),
-			array(array('vatID'				=> '012345678901')),			//too long
-			array(array('addressCountry'	=> 'italy')),					//too long
-			array(array('addressCountry'	=> 'it')),						//lowercase
-			array(array('postalCode'		=> '234992')),					//toolong
+			array(array('vatID'				=> '012345678901')), //too long
+			array(array('addressCountry'	=> 'italy')), //too long
+			array(array('addressCountry'	=> 'it')), //lowercase
+			array(array('postalCode'		=> '234992')), //toolong
 			array(array('email'				=> 'ENRICO')),
-			array(array('lat'				=> '90.12345')),				//invalid lat
-			array(array('lat'				=> '-90.12345')),				//invalid lat
+			array(array('lat'				=> '90.12345')), //invalid lat
+			array(array('lat'				=> '-90.12345')), //invalid lat
 				
 		);
    	}	

tests/unit/FactsFactoryTest.php

Indentation +76 added lines, -76 removed lines

@@ -3,85 +3,85 @@
 class FactsFactoryTest extends PHPUnit_Framework_TestCase
 {	
 
-	public function testMakeLocalBusiness()
-	{
-		$profile = array(
-			'model'			=> 'LocalBusiness',
-			'options'		=> array(
-				'base' => array( 'default'=> 'urn:test')
-			),
-			'datamapper'	=> function(array $rawdata){
-				$data = array();
-				$data['id'] = $rawdata[0];
-				$data['businessName'][] = $rawdata[2] . ' ' . $rawdata[1];
-				$data['businessName'][] = $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' => array( 'default'=> 'urn:test')
+            ),
+            'datamapper'	=> function(array $rawdata){
+                $data = array();
+                $data['id'] = $rawdata[0];
+                $data['businessName'][] = $rawdata[2] . ' ' . $rawdata[1];
+                $data['businessName'][] = $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(1, count($structuredData['businessName']));
-		$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(1, count($structuredData['businessName']));
+        $this->assertEquals($structuredData['vatID'], '01209991007');
+        $this->assertEquals($structuredData['id'], '10042650');
+        $this->assertEquals($structuredData['long'], '12.464163');
+        $this->assertEquals($structuredData['streetAddress'], 'VIA ANTONIO MORDINI, 3');
+    }
 
-	public function testRemoveEmpty()
-	{
-		$profile = array(
-			'model'			=> 'LocalBusiness',
-			'options'		=> array(),
-			'datamapper'	=> function(array $rawdata){return array();},
-		);
-		$data = array(
-			'one'	=> 'notempty',
-			'two'	=> null,
-			'three'	=> false,
-			'four'	=> 0,
-			'five'	=> array(),
-			'seven'	=> array(''),
-			'eight'	=> array('notempy'),
-			'nine'	=> array('notempy','',''),
-		);
-		$expectedData = array(
-			'one'	=> 'notempty',
-			'eight'	=> array('notempy'),
-			'nine'	=> array('notempy'),
-		);
-		$factsFactory = new \BOTK\FactsFactory($profile);
-		$this->assertEquals($expectedData, $factsFactory->removeEmpty($data));
-	}
+    public function testRemoveEmpty()
+    {
+        $profile = array(
+            'model'			=> 'LocalBusiness',
+            'options'		=> array(),
+            'datamapper'	=> function(array $rawdata){return array();},
+        );
+        $data = array(
+            'one'	=> 'notempty',
+            'two'	=> null,
+            'three'	=> false,
+            'four'	=> 0,
+            'five'	=> array(),
+            'seven'	=> array(''),
+            'eight'	=> array('notempy'),
+            'nine'	=> array('notempy','',''),
+        );
+        $expectedData = array(
+            'one'	=> 'notempty',
+            'eight'	=> array('notempy'),
+            'nine'	=> array('notempy'),
+        );
+        $factsFactory = new \BOTK\FactsFactory($profile);
+        $this->assertEquals($expectedData, $factsFactory->removeEmpty($data));
+    }
 }
 

Spacing +6 added lines, -6 removed lines

@@ -8,19 +8,19 @@ 
 		$profile = array(
 			'model'			=> 'LocalBusiness',
 			'options'		=> array(
-				'base' => array( 'default'=> 'urn:test')
+				'base' => array('default'=> 'urn:test')
 			),
-			'datamapper'	=> function(array $rawdata){
+			'datamapper'	=> function(array $rawdata) {
 				$data = array();
 				$data['id'] = $rawdata[0];
-				$data['businessName'][] = $rawdata[2] . ' ' . $rawdata[1];
+				$data['businessName'][] = $rawdata[2].' '.$rawdata[1];
 				$data['businessName'][] = $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];
 				
@@ -63,7 +63,7 @@ 
 		$profile = array(
 			'model'			=> 'LocalBusiness',
 			'options'		=> array(),
-			'datamapper'	=> function(array $rawdata){return array();},
+			'datamapper'	=> function(array $rawdata) {return array(); },
 		);
 		$data = array(
 			'one'	=> 'notempty',
@@ -73,7 +73,7 @@ 
 			'five'	=> array(),
 			'seven'	=> array(''),
 			'eight'	=> array('notempy'),
-			'nine'	=> array('notempy','',''),
+			'nine'	=> array('notempy', '', ''),
 		);
 		$expectedData = array(
 			'one'	=> 'notempty',

examples/sample1.php

Indentation +31 added lines, -31 removed lines

@@ -2,46 +2,46 @@
 require_once __DIR__.'/../vendor/autoload.php';
 
 $profile = array(
-	'model'			=> 'LocalBusiness',
-	'options'		=> array(
-		'base' => array( 'default'=> 'urn:sample1:')
-	),
-	'datamapper'	=> function(array $rawdata){
-		$data = array();
-		$data['id'] = $rawdata[0];
-		$data['businessType'] = 'schema:botk_'.\BOTK\Filters::FILTER_SANITIZE_ID($rawdata[16]);
-		$data['businessName'][] = trim($rawdata[2] . ' ' . $rawdata[1]);
-		$data['businessName'][] = $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];
+    'model'			=> 'LocalBusiness',
+    'options'		=> array(
+        'base' => array( 'default'=> 'urn:sample1:')
+    ),
+    'datamapper'	=> function(array $rawdata){
+        $data = array();
+        $data['id'] = $rawdata[0];
+        $data['businessType'] = 'schema:botk_'.\BOTK\Filters::FILTER_SANITIZE_ID($rawdata[16]);
+        $data['businessName'][] = trim($rawdata[2] . ' ' . $rawdata[1]);
+        $data['businessName'][] = $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;
-	},
+        return $data;
+    },
 );
 $factsFactory = new \BOTK\FactsFactory($profile);
 
 if (($handle = fopen("sample1.txt", "r")) !== FALSE) {
-	//$header = fgets($handle);
-	echo $factsFactory->generateLinkedDataHeader();
+    //$header = fgets($handle);
+    echo $factsFactory->generateLinkedDataHeader();
 
     while (($rawdata = fgetcsv($handle, 2000, "|")) !== FALSE) {
-    	try{
-    		$facts =$factsFactory->factualize($rawdata);
-    		echo $facts->asTurtle(), "\n";
-			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
-		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
-			$factsFactory->addError($e->getMessage());
-		}
+        try{
+            $facts =$factsFactory->factualize($rawdata);
+            echo $facts->asTurtle(), "\n";
+            $factsFactory->addToTripleCounter($facts->getTripleCount()) ;
+        }catch (Exception $e) {
+            echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
+            $factsFactory->addError($e->getMessage());
+        }
     }
 	
-	echo $factsFactory->generateLinkedDataFooter();
+    echo $factsFactory->generateLinkedDataFooter();
 	
     fclose($handle);	
 }

Spacing +9 added lines, -9 removed lines

@@ -4,20 +4,20 @@ 
 $profile = array(
 	'model'			=> 'LocalBusiness',
 	'options'		=> array(
-		'base' => array( 'default'=> 'urn:sample1:')
+		'base' => array('default'=> 'urn:sample1:')
 	),
-	'datamapper'	=> function(array $rawdata){
+	'datamapper'	=> function(array $rawdata) {
 		$data = array();
 		$data['id'] = $rawdata[0];
 		$data['businessType'] = 'schema:botk_'.\BOTK\Filters::FILTER_SANITIZE_ID($rawdata[16]);
-		$data['businessName'][] = trim($rawdata[2] . ' ' . $rawdata[1]);
+		$data['businessName'][] = trim($rawdata[2].' '.$rawdata[1]);
 		$data['businessName'][] = $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];
 		
@@ -31,12 +31,12 @@ 
 	echo $factsFactory->generateLinkedDataHeader();
 
     while (($rawdata = fgetcsv($handle, 2000, "|")) !== FALSE) {
-    	try{
-    		$facts =$factsFactory->factualize($rawdata);
+    	try {
+    		$facts = $factsFactory->factualize($rawdata);
     		echo $facts->asTurtle(), "\n";
-			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
-		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
+			$factsFactory->addToTripleCounter($facts->getTripleCount());
+    	} catch (Exception $e) {
+		    echo "\n# Caught exception: ", $e->getMessage(), "\n";
 			$factsFactory->addError($e->getMessage());
 		}
     }

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     		$facts =$factsFactory->factualize($rawdata);
     		echo $facts->asTurtle(), "\n";
 			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
+    	} catch (Exception $e) {
 		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
 			$factsFactory->addError($e->getMessage());
 		}

examples/sample2.php

Indentation +30 added lines, -30 removed lines

@@ -2,45 +2,45 @@
 require_once __DIR__.'/../vendor/autoload.php';
 
 $profile = array(
-	'model'			=> 'LocalBusiness',
-	'source'		=> 'https://www.dati.lombardia.it/Sanit-/Farmacie/cf6w-iiw9',
-	'options'		=> array(
-		'base' => array( 'default'=> 'http://salute.gov.it/resource/farmacie#')
-	),
-	'datamapper'	=> function(array $rawdata){
-		$data = array();
-		$data['id'] = $rawdata[2];
-		$data['businessType']= 'schema:botk_farmacie';
-		$data['businessName']= $rawdata[4];
-		$data['streetAddress'] = $rawdata[5];
-		$data['addressLocality'] = $rawdata[6];
-		$data['telephone'] = $rawdata[7];
-		$data['faxNumber'] = $rawdata[8];
-		$data['email'] = $rawdata[9];
-		$data['long'] = $rawdata[14];			
-		$data['lat'] = $rawdata[13];
+    'model'			=> 'LocalBusiness',
+    'source'		=> 'https://www.dati.lombardia.it/Sanit-/Farmacie/cf6w-iiw9',
+    'options'		=> array(
+        'base' => array( 'default'=> 'http://salute.gov.it/resource/farmacie#')
+    ),
+    'datamapper'	=> function(array $rawdata){
+        $data = array();
+        $data['id'] = $rawdata[2];
+        $data['businessType']= 'schema:botk_farmacie';
+        $data['businessName']= $rawdata[4];
+        $data['streetAddress'] = $rawdata[5];
+        $data['addressLocality'] = $rawdata[6];
+        $data['telephone'] = $rawdata[7];
+        $data['faxNumber'] = $rawdata[8];
+        $data['email'] = $rawdata[9];
+        $data['long'] = $rawdata[14];			
+        $data['lat'] = $rawdata[13];
 		
-		return $data;
-	},
+        return $data;
+    },
 );
 $factsFactory = new \BOTK\FactsFactory($profile);
 
 if (($handle = fopen("sample2.csv", "r")) !== FALSE) {
-	$header = fgets($handle);
-	echo $factsFactory->generateLinkedDataHeader();
+    $header = fgets($handle);
+    echo $factsFactory->generateLinkedDataHeader();
 
     while (($rawdata = fgetcsv($handle, 2000, ",")) !== FALSE) {
-    	try{
-    		$facts =$factsFactory->factualize($rawdata);
-    		echo $facts->asTurtle(), "\n";
-			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
-		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
-			$factsFactory->addError($e->getMessage());
-		}
+        try{
+            $facts =$factsFactory->factualize($rawdata);
+            echo $facts->asTurtle(), "\n";
+            $factsFactory->addToTripleCounter($facts->getTripleCount()) ;
+        }catch (Exception $e) {
+            echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
+            $factsFactory->addError($e->getMessage());
+        }
     }
 	
-	echo $factsFactory->generateLinkedDataFooter();
+    echo $factsFactory->generateLinkedDataFooter();
 	
     fclose($handle);
 	

Spacing +9 added lines, -9 removed lines

@@ -5,13 +5,13 @@ 
 	'model'			=> 'LocalBusiness',
 	'source'		=> 'https://www.dati.lombardia.it/Sanit-/Farmacie/cf6w-iiw9',
 	'options'		=> array(
-		'base' => array( 'default'=> 'http://salute.gov.it/resource/farmacie#')
+		'base' => array('default'=> 'http://salute.gov.it/resource/farmacie#')
 	),
-	'datamapper'	=> function(array $rawdata){
+	'datamapper'	=> function(array $rawdata) {
 		$data = array();
 		$data['id'] = $rawdata[2];
-		$data['businessType']= 'schema:botk_farmacie';
-		$data['businessName']= $rawdata[4];
+		$data['businessType'] = 'schema:botk_farmacie';
+		$data['businessName'] = $rawdata[4];
 		$data['streetAddress'] = $rawdata[5];
 		$data['addressLocality'] = $rawdata[6];
 		$data['telephone'] = $rawdata[7];
@@ -30,12 +30,12 @@ 
 	echo $factsFactory->generateLinkedDataHeader();
 
     while (($rawdata = fgetcsv($handle, 2000, ",")) !== FALSE) {
-    	try{
-    		$facts =$factsFactory->factualize($rawdata);
+    	try {
+    		$facts = $factsFactory->factualize($rawdata);
     		echo $facts->asTurtle(), "\n";
-			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
-		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
+			$factsFactory->addToTripleCounter($facts->getTripleCount());
+    	} catch (Exception $e) {
+		    echo "\n# Caught exception: ", $e->getMessage(), "\n";
 			$factsFactory->addError($e->getMessage());
 		}
     }

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     		$facts =$factsFactory->factualize($rawdata);
     		echo $facts->asTurtle(), "\n";
 			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
+    	} catch (Exception $e) {
 		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
 			$factsFactory->addError($e->getMessage());
 		}

examples/sample3.php

Indentation +32 added lines, -32 removed lines

@@ -2,47 +2,47 @@
 require_once __DIR__.'/../vendor/autoload.php';
 
 $profile = array(
-	'model'	=> 'LocalBusiness',
-	'source'=> 'http://www.salute.gov.it/dataset/farmacie.jsp',
-	'options' => array(
-		'base' => array( 'default'=> 'http://salute.gov.it/resource/farmacie#')
-	),
-	'datamapper'	=> function(array $rawdata){
-		$data = array();
-		$data['businessType']= 'schema:botk_farmacie';
-		$data['id'] = $rawdata[0];
-		$data['streetAddress'] = $rawdata[2];
-		$data['businessName'][]= $rawdata[2];
-		$data['businessName'][]= 'FARMACIA '.$rawdata[2];
-		$data['vatID'] = $rawdata[4];
-		$data['postalCode'] = $rawdata[5];
-		$data['addressLocality'] = $rawdata[7];
-		$data['addressRegion'] = $rawdata[10];
-		$data['lat'] = $rawdata[18];
-		$data['long'] = $rawdata[19];			
+    'model'	=> 'LocalBusiness',
+    'source'=> 'http://www.salute.gov.it/dataset/farmacie.jsp',
+    'options' => array(
+        'base' => array( 'default'=> 'http://salute.gov.it/resource/farmacie#')
+    ),
+    'datamapper'	=> function(array $rawdata){
+        $data = array();
+        $data['businessType']= 'schema:botk_farmacie';
+        $data['id'] = $rawdata[0];
+        $data['streetAddress'] = $rawdata[2];
+        $data['businessName'][]= $rawdata[2];
+        $data['businessName'][]= 'FARMACIA '.$rawdata[2];
+        $data['vatID'] = $rawdata[4];
+        $data['postalCode'] = $rawdata[5];
+        $data['addressLocality'] = $rawdata[7];
+        $data['addressRegion'] = $rawdata[10];
+        $data['lat'] = $rawdata[18];
+        $data['long'] = $rawdata[19];			
 		
-		return $data;
-	},
+        return $data;
+    },
 );
 $factsFactory = new \BOTK\FactsFactory($profile);
 
 if (($handle = fopen("sample3.CSV", "r")) !== FALSE) {
-	$header = fgets($handle);
-	echo $factsFactory->generateLinkedDataHeader();
+    $header = fgets($handle);
+    echo $factsFactory->generateLinkedDataHeader();
 
     while (($rawdata = fgetcsv($handle, 2000, ";")) !== FALSE) {
-    	if($rawdata[15]!='-') continue;
-    	try{
-    		$facts =$factsFactory->factualize($rawdata);
-    		echo $facts->asTurtle(), "\n";
-			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
-		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
-			$factsFactory->addError($e->getMessage());
-		}
+        if($rawdata[15]!='-') continue;
+        try{
+            $facts =$factsFactory->factualize($rawdata);
+            echo $facts->asTurtle(), "\n";
+            $factsFactory->addToTripleCounter($facts->getTripleCount()) ;
+        }catch (Exception $e) {
+            echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
+            $factsFactory->addError($e->getMessage());
+        }
     }
 	
-	echo $factsFactory->generateLinkedDataFooter();
+    echo $factsFactory->generateLinkedDataFooter();
 	
     fclose($handle);
 	

Spacing +11 added lines, -11 removed lines

@@ -5,15 +5,15 @@ 
 	'model'	=> 'LocalBusiness',
 	'source'=> 'http://www.salute.gov.it/dataset/farmacie.jsp',
 	'options' => array(
-		'base' => array( 'default'=> 'http://salute.gov.it/resource/farmacie#')
+		'base' => array('default'=> 'http://salute.gov.it/resource/farmacie#')
 	),
-	'datamapper'	=> function(array $rawdata){
+	'datamapper'	=> function(array $rawdata) {
 		$data = array();
-		$data['businessType']= 'schema:botk_farmacie';
+		$data['businessType'] = 'schema:botk_farmacie';
 		$data['id'] = $rawdata[0];
 		$data['streetAddress'] = $rawdata[2];
-		$data['businessName'][]= $rawdata[2];
-		$data['businessName'][]= 'FARMACIA '.$rawdata[2];
+		$data['businessName'][] = $rawdata[2];
+		$data['businessName'][] = 'FARMACIA '.$rawdata[2];
 		$data['vatID'] = $rawdata[4];
 		$data['postalCode'] = $rawdata[5];
 		$data['addressLocality'] = $rawdata[7];
@@ -31,13 +31,13 @@ 
 	echo $factsFactory->generateLinkedDataHeader();
 
     while (($rawdata = fgetcsv($handle, 2000, ";")) !== FALSE) {
-    	if($rawdata[15]!='-') continue;
-    	try{
-    		$facts =$factsFactory->factualize($rawdata);
+    	if ($rawdata[15] != '-') continue;
+    	try {
+    		$facts = $factsFactory->factualize($rawdata);
     		echo $facts->asTurtle(), "\n";
-			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
-		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
+			$factsFactory->addToTripleCounter($facts->getTripleCount());
+    	} catch (Exception $e) {
+		    echo "\n# Caught exception: ", $e->getMessage(), "\n";
 			$factsFactory->addError($e->getMessage());
 		}
     }

Braces +4 added lines, -2 removed lines

@@ -31,12 +31,14 @@
 	echo $factsFactory->generateLinkedDataHeader();
 
     while (($rawdata = fgetcsv($handle, 2000, ";")) !== FALSE) {
-    	if($rawdata[15]!='-') continue;
+    	if($rawdata[15]!='-') {
+    	    continue;
+    	}
     	try{
     		$facts =$factsFactory->factualize($rawdata);
     		echo $facts->asTurtle(), "\n";
 			$factsFactory->addToTripleCounter($facts->getTripleCount()) ;
-    	}catch (Exception $e) {
+    	} catch (Exception $e) {
 		    echo "\n# Caught exception: " ,  $e->getMessage(), "\n";
 			$factsFactory->addError($e->getMessage());
 		}