linkeddatacenter / BOTK-core

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 +170 added lines, -170 removed lines

@@ -4,212 +4,212 @@
 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(
-		'uri'				=> array(
-								'filter'    => FILTER_SANITIZE_URL,
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'base'				=> array(
-								'default'	=> 'http://linkeddata.center/botk/resource/',
-								'filter'    => FILTER_SANITIZE_URL,
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'id'				=> array(		
-								'filter'    => FILTER_CALLBACK,
-		                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ID',
-                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			                   ),
-		'page'				=> array(	
-								'filter'    => FILTER_SANITIZE_URL,
-                            	'flags'  	=> FILTER_FORCE_ARRAY,
-			                   ),
-		'homepage'			=> array(	
-								'filter'    => FILTER_SANITIZE_URL,
-                            	'flags'  	=> FILTER_FORCE_ARRAY,
-			                   ),
-	);
-	
-	protected $options ;
-	protected $vocabulary = array(
-		'rdf'		=> 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-		'rdfs'		=> 'http://www.w3.org/2000/01/rdf-schema#',
-		'owl'		=> 'http://www.w3.org/2002/07/owl#',
-		'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
-		'dct' 		=> 'http://purl.org/dc/terms/',
-		'void' 		=> 'http://rdfs.org/ns/void#',
-		'prov' 		=> 'http://www.w3.org/ns/prov#',
-		'schema'	=> 'http://schema.org/',
-		'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-		'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
-		'dq'		=> 'http://purl.org/linked-data/cube#',
-		'daq'		=> 'http://purl.org/eis/vocab/daq#',
-		'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
-	);
-	
-	protected $data;
-	protected $rdf =null; //lazy created
-	protected $tripleCount=0; //lazy created
-	protected $uniqueIdGenerator=null; // dependency injections
-	protected $droppedFields = array();
-	
-	abstract public function asTurtle();
+     * 						),
+     * 	'postalCode'		=> array(	// italian rules
+     *							'filter'    => FILTER_VALIDATE_REGEXP,	
+     *	                        'options' 	=> array('regexp'=>'/^[0-9]{5}$/'),
+     *                      	'flags'  	=> FILTER_REQUIRE_SCALAR,
+     *		                   ),
+     * )
+     */
+    protected static $DEFAULT_OPTIONS  = array(
+        'uri'				=> array(
+                                'filter'    => FILTER_SANITIZE_URL,
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'base'				=> array(
+                                'default'	=> 'http://linkeddata.center/botk/resource/',
+                                'filter'    => FILTER_SANITIZE_URL,
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'id'				=> array(		
+                                'filter'    => FILTER_CALLBACK,
+                                'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ID',
+                                'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                ),
+        'page'				=> array(	
+                                'filter'    => FILTER_SANITIZE_URL,
+                                'flags'  	=> FILTER_FORCE_ARRAY,
+                                ),
+        'homepage'			=> array(	
+                                'filter'    => FILTER_SANITIZE_URL,
+                                'flags'  	=> FILTER_FORCE_ARRAY,
+                                ),
+    );
+	
+    protected $options ;
+    protected $vocabulary = array(
+        'rdf'		=> 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+        'rdfs'		=> 'http://www.w3.org/2000/01/rdf-schema#',
+        'owl'		=> 'http://www.w3.org/2002/07/owl#',
+        'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
+        'dct' 		=> 'http://purl.org/dc/terms/',
+        'void' 		=> 'http://rdfs.org/ns/void#',
+        'prov' 		=> 'http://www.w3.org/ns/prov#',
+        'schema'	=> 'http://schema.org/',
+        'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
+        'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
+        'dq'		=> 'http://purl.org/linked-data/cube#',
+        'daq'		=> 'http://purl.org/eis/vocab/daq#',
+        'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
+    );
+	
+    protected $data;
+    protected $rdf =null; //lazy created
+    protected $tripleCount=0; //lazy created
+    protected $uniqueIdGenerator=null; // dependency injections
+    protected $droppedFields = array();
+	
+    abstract public function asTurtle();
 
-	protected function mergeOptions( array $options1, array $options2 )
-	{
-    	foreach($options2 as $property=>$option){
+    protected function mergeOptions( array $options1, array $options2 )
+    {
+        foreach($options2 as $property=>$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));
+        // ensure data are sanitized and validated
+        $sanitizedData = array_filter( filter_var_array($data, $options));
 		
-		// find and register dropped fields
-		foreach($data as $property=>$value){
-			if($value && empty($sanitizedData[$property])){
-				$this->droppedFields[]=$property;
-			}
-		}
+        // find and register dropped fields
+        foreach($data as $property=>$value){
+            if($value && empty($sanitizedData[$property])){
+                $this->droppedFields[]=$property;
+            }
+        }
 
-		$this->options = $options;
-		$this->data = $sanitizedData;
-		$this->setIdGenerator(function($data){return uniqid();});
+        $this->options = $options;
+        $this->data = $sanitizedData;
+        $this->setIdGenerator(function($data){return uniqid();});
     }
 	
 	
-	public function getDroppedFields()
-	{
-		return $this->droppedFields;
-	}
+    public function getDroppedFields()
+    {
+        return $this->droppedFields;
+    }
 
 	
-	/**
-	 * 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 getVocabularies()
-	{
-		return $this->vocabulary;
-	}
+    public function getVocabularies()
+    {
+        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 +32 added lines, -32 removed lines

@@ -29,7 +29,7 @@ 
 	 *		                   ),
 	 * )
 	 */
-	protected static $DEFAULT_OPTIONS  = array(
+	protected static $DEFAULT_OPTIONS = array(
 		'uri'				=> array(
 								'filter'    => FILTER_SANITIZE_URL,
                             	'flags'  	=> FILTER_REQUIRE_SCALAR,
@@ -54,7 +54,7 @@ 
 			                   ),
 	);
 	
-	protected $options ;
+	protected $options;
 	protected $vocabulary = array(
 		'rdf'		=> 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
 		'rdfs'		=> 'http://www.w3.org/2000/01/rdf-schema#',
@@ -72,19 +72,19 @@ 
 	);
 	
 	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
 	protected $droppedFields = array();
 	
 	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) {
 			
-			$options1[$property]=isset($options1[$property])
-				?array_merge($options1[$property], $option)
+			$options1[$property] = isset($options1[$property])
+				? array_merge($options1[$property], $option)
 				:$option;
     	}
 		
@@ -93,28 +93,28 @@ 
 
     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));
+		$sanitizedData = array_filter(filter_var_array($data, $options));
 		
 		// find and register dropped fields
-		foreach($data as $property=>$value){
-			if($value && empty($sanitizedData[$property])){
-				$this->droppedFields[]=$property;
+		foreach ($data as $property=>$value) {
+			if ($value && empty($sanitizedData[$property])) {
+				$this->droppedFields[] = $property;
 			}
 		}
 
 		$this->options = $options;
 		$this->data = $sanitizedData;
-		$this->setIdGenerator(function($data){return uniqid();});
+		$this->setIdGenerator(function($data) {return uniqid(); });
     }
 	
 	
@@ -129,7 +129,7 @@ 
 	 */
 	public function setIdGenerator($generator)
 	{
-		assert( is_callable($generator));
+		assert(is_callable($generator));
 		$this->uniqueIdGenerator = $generator;
 		
 		return $this;
@@ -141,14 +141,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);
 		}
 		
@@ -174,7 +174,7 @@ 
 	}
 	
 	
-	public function setVocabulary($prefix,$ns)
+	public function setVocabulary($prefix, $ns)
 	{
 		$this->vocabulary[$prefix] = $ns;
 	}
@@ -186,11 +186,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;
@@ -200,7 +200,7 @@ 
 	public function getTripleCount()
 	{
 		// triple count is computed during rdf creation
-		if (is_null($this->rdf)){
+		if (is_null($this->rdf)) {
 			$this->asTurtle();
 		}
 		
@@ -210,6 +210,6 @@ 
 		
 	public function __toString() 
 	{
-		return $this->getTurtleHeader() ."\n". $this->asTurtle();
+		return $this->getTurtleHeader()."\n".$this->asTurtle();
 	}
 }
\ No newline at end of file

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',

src/FactsFactory.php

Doc Comments +3 added lines

@@ -98,6 +98,9 @@
 	}
 	
 		
+	/**
+	 * @param string $error
+	 */
 	public function addError($error)
 	{
 		$this->errors[]= (string) $error;

Indentation +103 added lines, -103 removed lines

@@ -3,125 +3,125 @@
 
 class FactsFactory implements FactsFactoryInterface {
 	
-	protected $profile;
-	protected $tripleCount =0;
-	protected $errors = array();
-	protected $errorCount=0;
-	protected $unacceptableCount=0;
-	protected $entityCount=0;
-	
-	
-	public function __construct( array $profile )
-	{
-		assert(!empty($profile['model']) && class_exists('\BOTK\Model\\'.$profile['model']));
-		assert(isset($profile['options']) && is_array($profile['options']));
-		$defaults = array(
-			'source' 			  	  => null,
-			'resilience' 			  => 0.3,
-			'datamapper'			  => function($rawdata){return array();},
-			'rawDataValidationFilter' => function($rawdata){return is_array($rawdata);},	
-		);
-		$this->profile = array_merge($defaults,$profile);
-	}
-	
-	
-	/**
-	 * two level filter array
-	 */
-	public function removeEmpty( array $data )
-	{
-		$a = array();
-	    foreach ($data as $key => $value) {
-	       $a[$key] = is_array($value)?array_filter($value):$value;
-	    }
-	    return array_filter($a);
-	}
-	
-	
-	public function factualize( array $rawData )
-	{
-		$datamapper = $this->profile['datamapper'];
-		$class = '\BOTK\Model\\'.$this->profile['model'];
-		$data =$this->removeEmpty($datamapper($rawData));
+    protected $profile;
+    protected $tripleCount =0;
+    protected $errors = array();
+    protected $errorCount=0;
+    protected $unacceptableCount=0;
+    protected $entityCount=0;
+	
+	
+    public function __construct( array $profile )
+    {
+        assert(!empty($profile['model']) && class_exists('\BOTK\Model\\'.$profile['model']));
+        assert(isset($profile['options']) && is_array($profile['options']));
+        $defaults = array(
+            'source' 			  	  => null,
+            'resilience' 			  => 0.3,
+            'datamapper'			  => function($rawdata){return array();},
+            'rawDataValidationFilter' => function($rawdata){return is_array($rawdata);},	
+        );
+        $this->profile = array_merge($defaults,$profile);
+    }
+	
+	
+    /**
+     * two level filter array
+     */
+    public function removeEmpty( array $data )
+    {
+        $a = array();
+        foreach ($data as $key => $value) {
+            $a[$key] = is_array($value)?array_filter($value):$value;
+        }
+        return array_filter($a);
+    }
+	
+	
+    public function factualize( array $rawData )
+    {
+        $datamapper = $this->profile['datamapper'];
+        $class = '\BOTK\Model\\'.$this->profile['model'];
+        $data =$this->removeEmpty($datamapper($rawData));
 		
-		$facts = new $class($data,$this->profile['options']);
-		if($facts){
-			$this->entityCount++;
-			$this->tripleCount+=$facts->getTripleCount();
-		}
-		return $facts;
-	}
-	
-	
-	public function generateLinkedDataHeader()
-	{
-		$class = '\BOTK\Model\\'.$this->profile['model'];
-		$model = new $class();
-		return $model->getTurtleHeader(); 
-	}
-	
-	
-	public function generateLinkedDataFooter()
-	{
-		$now = date('c');
-		$rdf = '<> ';
-		$this->tripleCount += 6;
+        $facts = new $class($data,$this->profile['options']);
+        if($facts){
+            $this->entityCount++;
+            $this->tripleCount+=$facts->getTripleCount();
+        }
+        return $facts;
+    }
+	
+	
+    public function generateLinkedDataHeader()
+    {
+        $class = '\BOTK\Model\\'.$this->profile['model'];
+        $model = new $class();
+        return $model->getTurtleHeader(); 
+    }
+	
+	
+    public function generateLinkedDataFooter()
+    {
+        $now = date('c');
+        $rdf = '<> ';
+        $this->tripleCount += 6;
 
-		// add  provenance info
-		$verb=$this->tooManyErrors()?'invalidated':'generated';
-		$rdf .= "prov:{$verb}AtTime \"$now\"^^xsd:dateTime;";
-		if(empty($this->profile['source'])){
-			$rdf.= "prov:wasDerivedFrom <{$this->profile['source']}>;";	
-			$this->tripleCount++;
-		}
+        // add  provenance info
+        $verb=$this->tooManyErrors()?'invalidated':'generated';
+        $rdf .= "prov:{$verb}AtTime \"$now\"^^xsd:dateTime;";
+        if(empty($this->profile['source'])){
+            $rdf.= "prov:wasDerivedFrom <{$this->profile['source']}>;";	
+            $this->tripleCount++;
+        }
 		
-		// add dataset info
-		$rdf.= "foaf:primaryTopic [a void:Dataset; void:datadump <>;void:triples {$this->tripleCount} ;void:entities {$this->entityCount}] ;.";
+        // add dataset info
+        $rdf.= "foaf:primaryTopic [a void:Dataset; void:datadump <>;void:triples {$this->tripleCount} ;void:entities {$this->entityCount}] ;.";
 		
-		// add human readable comment
-		$rdf.= "\n\n# File **$verb** with {$this->tripleCount} good triples from {$this->entityCount} entities ({$this->unacceptableCount} ignored), {$this->errorCount} errors\n";
+        // add human readable comment
+        $rdf.= "\n\n# File **$verb** with {$this->tripleCount} good triples from {$this->entityCount} entities ({$this->unacceptableCount} ignored), {$this->errorCount} errors\n";
 		
-		return $rdf;
-	}
+        return $rdf;
+    }
 	
 	
-	public function  addToTripleCounter( $triplesCount)
-	{
-		$this->tripleCount += intval($triplesCount);
-		return $this;
-	}	
+    public function  addToTripleCounter( $triplesCount)
+    {
+        $this->tripleCount += intval($triplesCount);
+        return $this;
+    }	
 	
 	
-	public function getTripleCount()
-	{
-		return $this->tripleCount;
-	}
+    public function getTripleCount()
+    {
+        return $this->tripleCount;
+    }
 	
 		
-	public function addError($error)
-	{
-		$this->errors[]= (string) $error;
-		$this->errorCount++;
-		return $this;
-	}
+    public function addError($error)
+    {
+        $this->errors[]= (string) $error;
+        $this->errorCount++;
+        return $this;
+    }
 
 
-	public function tooManyErrors()
-	{
-		if( $this->entityCount < 100){ return false; }  // if less than 100 entity do not check
+    public function tooManyErrors()
+    {
+        if( $this->entityCount < 100){ return false; }  // if less than 100 entity do not check
 		
-		return ($this->errorCount/$this->entityCount) > $this->profile['resilience'];
-	}
+        return ($this->errorCount/$this->entityCount) > $this->profile['resilience'];
+    }
 
 
-	public function acceptable( $rawdata)
-	{
-		$rawValisdator = $this->profile['rawDataValidationFilter'];
+    public function acceptable( $rawdata)
+    {
+        $rawValisdator = $this->profile['rawDataValidationFilter'];
 		
-		if(!($valid = $rawValisdator($rawdata))){
-			$this->unacceptableCount++;
-		}
-		return $valid;
-	}
+        if(!($valid = $rawValisdator($rawdata))){
+            $this->unacceptableCount++;
+        }
+        return $valid;
+    }
 
 }
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -4,50 +4,50 @@ 
 class FactsFactory implements FactsFactoryInterface {
 	
 	protected $profile;
-	protected $tripleCount =0;
+	protected $tripleCount = 0;
 	protected $errors = array();
-	protected $errorCount=0;
-	protected $unacceptableCount=0;
-	protected $entityCount=0;
+	protected $errorCount = 0;
+	protected $unacceptableCount = 0;
+	protected $entityCount = 0;
 	
 	
-	public function __construct( array $profile )
+	public function __construct(array $profile)
 	{
 		assert(!empty($profile['model']) && class_exists('\BOTK\Model\\'.$profile['model']));
 		assert(isset($profile['options']) && is_array($profile['options']));
 		$defaults = array(
 			'source' 			  	  => null,
 			'resilience' 			  => 0.3,
-			'datamapper'			  => function($rawdata){return array();},
-			'rawDataValidationFilter' => function($rawdata){return is_array($rawdata);},	
+			'datamapper'			  => function($rawdata) {return array(); },
+			'rawDataValidationFilter' => function($rawdata) {return is_array($rawdata); },	
 		);
-		$this->profile = array_merge($defaults,$profile);
+		$this->profile = array_merge($defaults, $profile);
 	}
 	
 	
 	/**
 	 * two level filter array
 	 */
-	public function removeEmpty( array $data )
+	public function removeEmpty(array $data)
 	{
 		$a = array();
 	    foreach ($data as $key => $value) {
-	       $a[$key] = is_array($value)?array_filter($value):$value;
+	       $a[$key] = is_array($value) ? array_filter($value) : $value;
 	    }
 	    return array_filter($a);
 	}
 	
 	
-	public function factualize( array $rawData )
+	public function factualize(array $rawData)
 	{
 		$datamapper = $this->profile['datamapper'];
 		$class = '\BOTK\Model\\'.$this->profile['model'];
-		$data =$this->removeEmpty($datamapper($rawData));
+		$data = $this->removeEmpty($datamapper($rawData));
 		
-		$facts = new $class($data,$this->profile['options']);
-		if($facts){
+		$facts = new $class($data, $this->profile['options']);
+		if ($facts) {
 			$this->entityCount++;
-			$this->tripleCount+=$facts->getTripleCount();
+			$this->tripleCount += $facts->getTripleCount();
 		}
 		return $facts;
 	}
@@ -68,24 +68,24 @@ 
 		$this->tripleCount += 6;
 
 		// add  provenance info
-		$verb=$this->tooManyErrors()?'invalidated':'generated';
+		$verb = $this->tooManyErrors() ? 'invalidated' : 'generated';
 		$rdf .= "prov:{$verb}AtTime \"$now\"^^xsd:dateTime;";
-		if(empty($this->profile['source'])){
-			$rdf.= "prov:wasDerivedFrom <{$this->profile['source']}>;";	
+		if (empty($this->profile['source'])) {
+			$rdf .= "prov:wasDerivedFrom <{$this->profile['source']}>;";	
 			$this->tripleCount++;
 		}
 		
 		// add dataset info
-		$rdf.= "foaf:primaryTopic [a void:Dataset; void:datadump <>;void:triples {$this->tripleCount} ;void:entities {$this->entityCount}] ;.";
+		$rdf .= "foaf:primaryTopic [a void:Dataset; void:datadump <>;void:triples {$this->tripleCount} ;void:entities {$this->entityCount}] ;.";
 		
 		// add human readable comment
-		$rdf.= "\n\n# File **$verb** with {$this->tripleCount} good triples from {$this->entityCount} entities ({$this->unacceptableCount} ignored), {$this->errorCount} errors\n";
+		$rdf .= "\n\n# File **$verb** with {$this->tripleCount} good triples from {$this->entityCount} entities ({$this->unacceptableCount} ignored), {$this->errorCount} errors\n";
 		
 		return $rdf;
 	}
 	
 	
-	public function  addToTripleCounter( $triplesCount)
+	public function  addToTripleCounter($triplesCount)
 	{
 		$this->tripleCount += intval($triplesCount);
 		return $this;
@@ -100,7 +100,7 @@ 
 		
 	public function addError($error)
 	{
-		$this->errors[]= (string) $error;
+		$this->errors[] = (string) $error;
 		$this->errorCount++;
 		return $this;
 	}
@@ -108,17 +108,17 @@ 
 
 	public function tooManyErrors()
 	{
-		if( $this->entityCount < 100){ return false; }  // if less than 100 entity do not check
+		if ($this->entityCount < 100) { return false; }  // if less than 100 entity do not check
 		
-		return ($this->errorCount/$this->entityCount) > $this->profile['resilience'];
+		return ($this->errorCount / $this->entityCount) > $this->profile['resilience'];
 	}
 
 
-	public function acceptable( $rawdata)
+	public function acceptable($rawdata)
 	{
 		$rawValisdator = $this->profile['rawDataValidationFilter'];
 		
-		if(!($valid = $rawValisdator($rawdata))){
+		if (!($valid = $rawValisdator($rawdata))) {
 			$this->unacceptableCount++;
 		}
 		return $valid;

tests/unit/Model/LocalBusinessTest.php

Indentation +279 added lines, -279 removed lines

@@ -5,189 +5,189 @@ 
     /**
      * @dataProvider goodLocalBusiness
      */	
-	public function testConstructor($data, $expectedData)
-	{
-		$localBusiness = new BOTK\Model\LocalBusiness($data);		
-		$this->assertEquals($expectedData, $localBusiness->asArray());
-	}
-	public function goodLocalBusiness()
+    public function testConstructor($data, $expectedData)
     {
-    	return array( 
-    		array(
-	    		array(),
-	    		array(
-					'base'				=> 'http://linkeddata.center/botk/resource/',
-					'addressCountry'	=> 'IT',
-				),
-			),
+        $localBusiness = new BOTK\Model\LocalBusiness($data);		
+        $this->assertEquals($expectedData, $localBusiness->asArray());
+    }
+    public function goodLocalBusiness()
+    {
+        return array( 
+            array(
+                array(),
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource/',
+                    'addressCountry'	=> 'IT',
+                ),
+            ),
 			
-    		array(
-	    		array(
-					'base'				=> 'urn:a:',
-					'addressCountry'	=> 'US',
-				),
-	    		array(
-					'base'				=> 'urn:a:',
-					'addressCountry'	=> 'US',
-				),
-			),
+            array(
+                array(
+                    'base'				=> 'urn:a:',
+                    'addressCountry'	=> 'US',
+                ),
+                array(
+                    'base'				=> 'urn:a:',
+                    'addressCountry'	=> 'US',
+                ),
+            ),
 			
-    		array(
-	    		array(
-	    			'id'				=> '1234567890',
-					'taxID'				=> 'fgn nrc 63S0 6F205 A',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'Example srl',
-					'businessName'		=> 'Example',
-					'businessType'		=> 'schema:MedicalOrganization',
-					'addressCountry'	=> 'IT',
-					'addressLocality'	=> 'LECCO',
-					'addressRegion'		=> 'LC',
-					'streetAddress'		=> 'Via  Fausto Valsecchi,124',
-					'postalCode'		=> '23900',
-					'page'				=> 'http://linkeddata.center/',
-					'telephone'			=> '+39 3356382949',
-					'faxNumber'			=> '+39 335 63 82 949',
-					'email'				=> array('admin@fagnoni.com'),
-					'addressDescription'=> 'Via  F. Valsecchi,124-23900 Lecco (LC)',
-					'lat'				=> '1.12345',
-					'long'				=> '2.123456',
-				),
-	    		array(
-					'base'				=> 'http://linkeddata.center/botk/resource/',
-	    			'id'				=> '1234567890',
-					'businessType'		=> array('schema:MedicalOrganization'),
-					'taxID'				=> 'FGNNRC63S06F205A',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'EXAMPLE SRL',
-					'businessName'		=> array('Example'),
-					'addressCountry'	=> 'IT',
-					'addressLocality'	=> 'LECCO',
-					'addressRegion'		=> 'LC',
-					'streetAddress'		=> 'VIA FAUSTO VALSECCHI, 124',
-					'postalCode'		=> '23900',
-					'page'				=> array('http://linkeddata.center/'),
-					'telephone'			=> '3356382949',
-					'faxNumber'			=> '3356382949',
-					'email'				=> array('ADMIN@FAGNONI.COM'),
-					'addressDescription'=> 'VIA F.VALSECCHI, 124 - 23900 LECCO (LC)',
-					'lat'				=> '1.12345',
-					'long'				=> '2.123456',
-				),
-			),
-		);
-   	}
+            array(
+                array(
+                    'id'				=> '1234567890',
+                    'taxID'				=> 'fgn nrc 63S0 6F205 A',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'Example srl',
+                    'businessName'		=> 'Example',
+                    'businessType'		=> 'schema:MedicalOrganization',
+                    'addressCountry'	=> 'IT',
+                    'addressLocality'	=> 'LECCO',
+                    'addressRegion'		=> 'LC',
+                    'streetAddress'		=> 'Via  Fausto Valsecchi,124',
+                    'postalCode'		=> '23900',
+                    'page'				=> 'http://linkeddata.center/',
+                    'telephone'			=> '+39 3356382949',
+                    'faxNumber'			=> '+39 335 63 82 949',
+                    'email'				=> array('admin@fagnoni.com'),
+                    'addressDescription'=> 'Via  F. Valsecchi,124-23900 Lecco (LC)',
+                    'lat'				=> '1.12345',
+                    'long'				=> '2.123456',
+                ),
+                array(
+                    'base'				=> 'http://linkeddata.center/botk/resource/',
+                    'id'				=> '1234567890',
+                    'businessType'		=> array('schema:MedicalOrganization'),
+                    'taxID'				=> 'FGNNRC63S06F205A',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'EXAMPLE SRL',
+                    'businessName'		=> array('Example'),
+                    'addressCountry'	=> 'IT',
+                    'addressLocality'	=> 'LECCO',
+                    'addressRegion'		=> 'LC',
+                    'streetAddress'		=> 'VIA FAUSTO VALSECCHI, 124',
+                    'postalCode'		=> '23900',
+                    'page'				=> array('http://linkeddata.center/'),
+                    'telephone'			=> '3356382949',
+                    'faxNumber'			=> '3356382949',
+                    'email'				=> array('ADMIN@FAGNONI.COM'),
+                    'addressDescription'=> 'VIA F.VALSECCHI, 124 - 23900 LECCO (LC)',
+                    'lat'				=> '1.12345',
+                    'long'				=> '2.123456',
+                ),
+            ),
+        );
+        }
 
 
-	public function testGetDefaultOptions()
-	{	
-		$expectedOptions =  array (
-			'uri'				=> array(
-									'filter'    => FILTER_SANITIZE_URL,
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'base'				=> array(
-									'default'	=> 'http://linkeddata.center/botk/resource/',
-									'filter'    => FILTER_SANITIZE_URL,
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'id'				=> array(		
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ID',
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'page'				=> array(	
-									'filter'    => FILTER_SANITIZE_URL,
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-				                   ),
-			'homepage'			=> array(	
-									'filter'    => FILTER_SANITIZE_URL,
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-				                   ),
-			'businessType'		=> array(		
-									// additional types  as extension of schema:LocalBusiness
-									'filter'    => FILTER_DEFAULT,
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-				                   ),
-			'taxID'				=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TOKEN',
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'vatID'				=> array(	// italian rules
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[0-9]{11}$/'),
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'legalName'			=> array(
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'businessName'		=> array(
-									// a schema:alternateName for schema:PostalAddress
-									'filter'    => FILTER_DEFAULT,
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-								   ),
-			'addressDescription'=> array(	//	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'addressCountry'	=> array(
-									'default'	=> 'IT',		
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[A-Z]{2}$/'),
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'addressLocality'	=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'addressRegion'		=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'streetAddress'		=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'postalCode'		=> array(	// italian rules
-									'filter'    => FILTER_VALIDATE_REGEXP,
-			                        'options' 	=> array('regexp'=>'/^[0-9]{5}$/'),
-	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-				                   ),
-			'telephone'			=> array(	
-									'filter'    => FILTER_CALLBACK,	
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TELEPHONE',
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-				                   ),
-			'faxNumber'			=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TELEPHONE',
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-				                   ),
-			'email'				=> array(	
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_EMAIL',
-	                            	'flags'  	=> FILTER_FORCE_ARRAY,
-				                   ),
-			'lat'				=> array( 
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_GEO',
-				                   ),
-			'long'				=> array( 
-									'filter'    => FILTER_CALLBACK,
-			                        'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_GEO',
-				                   ),
-		);
+    public function testGetDefaultOptions()
+    {	
+        $expectedOptions =  array (
+            'uri'				=> array(
+                                    'filter'    => FILTER_SANITIZE_URL,
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'base'				=> array(
+                                    'default'	=> 'http://linkeddata.center/botk/resource/',
+                                    'filter'    => FILTER_SANITIZE_URL,
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'id'				=> array(		
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ID',
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'page'				=> array(	
+                                    'filter'    => FILTER_SANITIZE_URL,
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            'homepage'			=> array(	
+                                    'filter'    => FILTER_SANITIZE_URL,
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            'businessType'		=> array(		
+                                    // additional types  as extension of schema:LocalBusiness
+                                    'filter'    => FILTER_DEFAULT,
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            'taxID'				=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TOKEN',
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'vatID'				=> array(	// italian rules
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[0-9]{11}$/'),
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'legalName'			=> array(
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'businessName'		=> array(
+                                    // a schema:alternateName for schema:PostalAddress
+                                    'filter'    => FILTER_DEFAULT,
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            'addressDescription'=> array(	//	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'addressCountry'	=> array(
+                                    'default'	=> 'IT',		
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[A-Z]{2}$/'),
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'addressLocality'	=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'addressRegion'		=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'streetAddress'		=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_ADDRESS',
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'postalCode'		=> array(	// italian rules
+                                    'filter'    => FILTER_VALIDATE_REGEXP,
+                                    'options' 	=> array('regexp'=>'/^[0-9]{5}$/'),
+                                    'flags'  	=> FILTER_REQUIRE_SCALAR,
+                                    ),
+            'telephone'			=> array(	
+                                    'filter'    => FILTER_CALLBACK,	
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TELEPHONE',
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            'faxNumber'			=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_TELEPHONE',
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            'email'				=> array(	
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_EMAIL',
+                                    'flags'  	=> FILTER_FORCE_ARRAY,
+                                    ),
+            'lat'				=> array( 
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_GEO',
+                                    ),
+            'long'				=> array( 
+                                    'filter'    => FILTER_CALLBACK,
+                                    'options' 	=> '\BOTK\Filters::FILTER_SANITIZE_GEO',
+                                    ),
+        );
 		
-		$localBusiness = new BOTK\Model\LocalBusiness(array());
-		$this->assertEquals($expectedOptions, $localBusiness->getOptions());
-	}
+        $localBusiness = new BOTK\Model\LocalBusiness(array());
+        $this->assertEquals($expectedOptions, $localBusiness->getOptions());
+    }
 
 
 
@@ -195,120 +195,120 @@ 
     /**
      * @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 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 goodRdf()
     {
-    	return array(
-    		array( 
-    			array('uri'=>'urn:test:a'),
-    			'<urn:test:a> a schema:LocalBusiness;schema:address <urn:test:a_address>. <urn:test:a_address> a schema:PostalAddress;schema:addressCountry "IT". ',
-    			4,
-			),
-    		array(
-    			array(
-    				'base'				=> 'urn:test:',
-    				'id'				=> 'b',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'Calenda chiodi snc',
-				),
-    			'<urn:test:b> a schema:LocalBusiness;dct:identifier "b";schema:vatID "01234567890";schema:legalName "CALENDA CHIODI SNC";schema:address <urn:test:b_address>. <urn:test:b_address> a schema:PostalAddress;schema:addressCountry "IT". ',
-    			7,
-			),
+        return array(
+            array( 
+                array('uri'=>'urn:test:a'),
+                '<urn:test:a> a schema:LocalBusiness;schema:address <urn:test:a_address>. <urn:test:a_address> a schema:PostalAddress;schema:addressCountry "IT". ',
+                4,
+            ),
+            array(
+                array(
+                    'base'				=> 'urn:test:',
+                    'id'				=> 'b',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'Calenda chiodi snc',
+                ),
+                '<urn:test:b> a schema:LocalBusiness;dct:identifier "b";schema:vatID "01234567890";schema:legalName "CALENDA CHIODI SNC";schema:address <urn:test:b_address>. <urn:test:b_address> a schema:PostalAddress;schema:addressCountry "IT". ',
+                7,
+            ),
 			
-    		array(
-    			array(
-	    			'id'				=> '1234567890',
-					'taxID'				=> 'fgn nrc 63S0 6F205 A',
-					'vatID'				=> '01234567890',
-					'legalName'			=> 'Example srl',
-					'businessName'		=> 'Example',
-					'businessType'		=> 'schema:MedicalOrganization',
-					'addressCountry'	=> 'IT',
-					'addressLocality'	=> 'LECCO',
-					'addressRegion'		=> 'LC',
-					'streetAddress'		=> 'Via  Fausto Valsecchi,124',
-					'postalCode'		=> '23900',
-					'page'				=> 'http://linkeddata.center/',
-					'telephone'			=> '+39 3356382949',
-					'faxNumber'			=> '+39 335 63 82 949',
-					'email'				=> array('admin@fagnoni.com'),
-					'mailbox'			=> 'info@example.com',
-					'addressDescription'=> 'Via  F. Valsecchi,124-23900 Lecco (LC)',
-					'lat'				=> '1.12345',
-					'long'				=> '2.123456',
-				),
-    			'<http://linkeddata.center/botk/resource/1234567890> a schema:LocalBusiness;a schema:MedicalOrganization;dct:identifier "1234567890";schema:vatID "01234567890";schema:legalName "EXAMPLE SRL";schema:alternateName "Example";schema:telephone "3356382949";schema:faxNumber "3356382949";schema:page <http://linkeddata.center/>;schema:email "ADMIN@FAGNONI.COM";schema:geo <geo:1.12345,2.123456>;schema:address <http://linkeddata.center/botk/resource/1234567890_address>. <http://linkeddata.center/botk/resource/1234567890_address> a schema:PostalAddress;schema:description "VIA F.VALSECCHI, 124 - 23900 LECCO (LC)";schema:streetAddress "VIA FAUSTO VALSECCHI, 124";schema:postalCode "23900";schema:addressLocality "LECCO";schema:addressRegion "LC";schema:addressCountry "IT". <geo:1.12345,2.123456> a schema:GeoCoordinates;wgs:lat "1.12345"^^xsd:float;wgs:long "2.123456"^^xsd:float . ',
-    			22,
-			),
-		);
-	}
+            array(
+                array(
+                    'id'				=> '1234567890',
+                    'taxID'				=> 'fgn nrc 63S0 6F205 A',
+                    'vatID'				=> '01234567890',
+                    'legalName'			=> 'Example srl',
+                    'businessName'		=> 'Example',
+                    'businessType'		=> 'schema:MedicalOrganization',
+                    'addressCountry'	=> 'IT',
+                    'addressLocality'	=> 'LECCO',
+                    'addressRegion'		=> 'LC',
+                    'streetAddress'		=> 'Via  Fausto Valsecchi,124',
+                    'postalCode'		=> '23900',
+                    'page'				=> 'http://linkeddata.center/',
+                    'telephone'			=> '+39 3356382949',
+                    'faxNumber'			=> '+39 335 63 82 949',
+                    'email'				=> array('admin@fagnoni.com'),
+                    'mailbox'			=> 'info@example.com',
+                    'addressDescription'=> 'Via  F. Valsecchi,124-23900 Lecco (LC)',
+                    'lat'				=> '1.12345',
+                    'long'				=> '2.123456',
+                ),
+                '<http://linkeddata.center/botk/resource/1234567890> a schema:LocalBusiness;a schema:MedicalOrganization;dct:identifier "1234567890";schema:vatID "01234567890";schema:legalName "EXAMPLE SRL";schema:alternateName "Example";schema:telephone "3356382949";schema:faxNumber "3356382949";schema:page <http://linkeddata.center/>;schema:email "ADMIN@FAGNONI.COM";schema:geo <geo:1.12345,2.123456>;schema:address <http://linkeddata.center/botk/resource/1234567890_address>. <http://linkeddata.center/botk/resource/1234567890_address> a schema:PostalAddress;schema:description "VIA F.VALSECCHI, 124 - 23900 LECCO (LC)";schema:streetAddress "VIA FAUSTO VALSECCHI, 124";schema:postalCode "23900";schema:addressLocality "LECCO";schema:addressRegion "LC";schema:addressCountry "IT". <geo:1.12345,2.123456> a schema:GeoCoordinates;wgs:lat "1.12345"^^xsd:float;wgs:long "2.123456"^^xsd:float . ',
+                22,
+            ),
+        );
+    }
 
 
 
     /**
      * @dataProvider structuredAdresses
      */	
-	public function testBuildNormalizedAddress($rawdata, $expectedData)
-	{
-		$localBusiness = new BOTK\Model\LocalBusiness($rawdata);
-		$data=$localBusiness->asArray();
-		$this->assertEquals($expectedData, $data['addressDescription']);
-	}
-	public function structuredAdresses()
+    public function testBuildNormalizedAddress($rawdata, $expectedData)
     {
-    	return array( 
-    		array( 
-    			array(
-    				'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
-    				'addressLocality'	=> 'Lecco',
-    				'addressRegion'		=> 'LC',
-    				'addressCountry'	=> 'IT',
-    				'postalCode'		=> '23900',	
-				),	
-				'LUNGOLARIO LUIGI CADORNA, 1, 23900 LECCO (LC)'
-			),
-    		array( 
-    			array(
-    				'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
-    				'addressLocality'	=> 'Lecco',
-    				'addressCountry'	=> 'IT',	
-				),	
-				'LUNGOLARIO LUIGI CADORNA, 1, LECCO'
-			),
-    		array( 
-    			array(
-    				'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
-    				'addressCountry'	=> 'IT',
-    				'postalCode'		=> '23900',	
-				),	
-				'LUNGOLARIO LUIGI CADORNA, 1, 23900'
-			),
-    		array( 
-    			array(
-    				'addressDescription'	=> 'test address',
-				),	
-				'TEST ADDRESS'
-			),
-		);
-   	}
+        $localBusiness = new BOTK\Model\LocalBusiness($rawdata);
+        $data=$localBusiness->asArray();
+        $this->assertEquals($expectedData, $data['addressDescription']);
+    }
+    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)'
+            ),
+            array( 
+                array(
+                    'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
+                    'addressLocality'	=> 'Lecco',
+                    'addressCountry'	=> 'IT',	
+                ),	
+                'LUNGOLARIO LUIGI CADORNA, 1, LECCO'
+            ),
+            array( 
+                array(
+                    'streetAddress'		=> 'Lungolario Luigi Cadorna, 1',
+                    'addressCountry'	=> 'IT',
+                    'postalCode'		=> '23900',	
+                ),	
+                'LUNGOLARIO LUIGI CADORNA, 1, 23900'
+            ),
+            array( 
+                array(
+                    'addressDescription'	=> 'test address',
+                ),	
+                'TEST ADDRESS'
+            ),
+        );
+        }
 
 
     public  function testBadLocalBusiness()
-	{
-		$badData = array(
-			'vatID'				=>	'not a vat',
-			'addressCountry'	=>  'ITALY', 	// should be a two character ISO country code
-			'postalCode'		=>  '234992',	// too long
-			'email'				=>  'not an e mail',
-		);
-		$localBusiness = new BOTK\Model\LocalBusiness($badData);
-		$this->assertEquals(array_keys($badData), $localBusiness->getDroppedFields());
-	}
+    {
+        $badData = array(
+            'vatID'				=>	'not a vat',
+            'addressCountry'	=>  'ITALY', 	// should be a two character ISO country code
+            'postalCode'		=>  '234992',	// too long
+            'email'				=>  'not an e mail',
+        );
+        $localBusiness = new BOTK\Model\LocalBusiness($badData);
+        $this->assertEquals(array_keys($badData), $localBusiness->getDroppedFields());
+    }
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
 
 	public function testGetDefaultOptions()
 	{	
-		$expectedOptions =  array (
+		$expectedOptions = array(
 			'uri'				=> array(
 									'filter'    => FILTER_SANITIZE_URL,
 	                            	'flags'  	=> FILTER_REQUIRE_SCALAR,
@@ -256,7 +256,7 @@ 
 	public function testBuildNormalizedAddress($rawdata, $expectedData)
 	{
 		$localBusiness = new BOTK\Model\LocalBusiness($rawdata);
-		$data=$localBusiness->asArray();
+		$data = $localBusiness->asArray();
 		$this->assertEquals($expectedData, $data['addressDescription']);
 	}
 	public function structuredAdresses()
@@ -302,8 +302,8 @@ 
 	{
 		$badData = array(
 			'vatID'				=>	'not a vat',
-			'addressCountry'	=>  'ITALY', 	// should be a two character ISO country code
-			'postalCode'		=>  '234992',	// too long
+			'addressCountry'	=>  'ITALY', // should be a two character ISO country code
+			'postalCode'		=>  '234992', // too long
 			'email'				=>  'not an e mail',
 		);
 		$localBusiness = new BOTK\Model\LocalBusiness($badData);

tests/unit/Model/AbstractModelTest.php

Indentation +103 added lines, -103 removed lines

@@ -2,147 +2,147 @@
 
 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(
-		'rdf'		=> 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-		'rdfs'		=> 'http://www.w3.org/2000/01/rdf-schema#',
-		'owl'		=> 'http://www.w3.org/2002/07/owl#',
-		'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
-		'dct' 		=> 'http://purl.org/dc/terms/',
-		'void' 		=> 'http://rdfs.org/ns/void#',
-		'prov' 		=> 'http://www.w3.org/ns/prov#',
-		'schema'	=> 'http://schema.org/',
-		'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-		'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
-		'dq'		=> 'http://purl.org/linked-data/cube#',
-		'daq'		=> 'http://purl.org/eis/vocab/daq#',
-		'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
-	);
+    protected $vocabulary =  array(
+        'rdf'		=> 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+        'rdfs'		=> 'http://www.w3.org/2000/01/rdf-schema#',
+        'owl'		=> 'http://www.w3.org/2002/07/owl#',
+        'xsd' 		=> 'http://www.w3.org/2001/XMLSchema#',
+        'dct' 		=> 'http://purl.org/dc/terms/',
+        'void' 		=> 'http://rdfs.org/ns/void#',
+        'prov' 		=> 'http://www.w3.org/ns/prov#',
+        'schema'	=> 'http://schema.org/',
+        'wgs' 		=> 'http://www.w3.org/2003/01/geo/wgs84_pos#',
+        'foaf' 		=> 'http://xmlns.com/foaf/0.1/',
+        'dq'		=> 'http://purl.org/linked-data/cube#',
+        'daq'		=> 'http://purl.org/eis/vocab/daq#',
+        'botk' 		=> 'http://http://linkeddata.center/botk/v1#',
+    );
 	
 	
     /**
      * @dataProvider data
      */	
-	public function testConstructor($data, $expectedData)
-	{
-		$localBusiness = new DummyModel($data);		
-		$this->assertEquals($expectedData, $localBusiness->asArray());
-	}
-	public function data()
+    public function testConstructor($data, $expectedData)
     {
-    	return array( 
-    		array( array(), array('base'=> 'http://linkeddata.center/botk/resource/'),),
-    		array( array('base'	=> 'urn:a:','id'=>'x'), array('base'=> 'urn:a:','id'=>'x')),
-		);
-   	}
+        $localBusiness = new DummyModel($data);		
+        $this->assertEquals($expectedData, $localBusiness->asArray());
+    }
+    public function data()
+    {
+        return array( 
+            array( array(), array('base'=> 'http://linkeddata.center/botk/resource/'),),
+            array( array('base'	=> 'urn:a:','id'=>'x'), array('base'=> 'urn:a:','id'=>'x')),
+        );
+        }
 
 
-	public function testConstructorWithCustomOptions()
-	{
-		$localBusiness = new DummyModel(array(), array (
-			'base'	=> array('default'	=> 'urn:a:'),
-			'lang'	=> array('default'	=> 'en'),
-		));
-		$options = $localBusiness->getOptions();
-		$this->assertEquals(
-			array(		
-				'default'    => 'urn:a:',
-				'filter'    => FILTER_SANITIZE_URL,
-            	'flags'  	=> FILTER_REQUIRE_SCALAR,
-			),
-			$options['base']
-		);
-		$this->assertEquals(array('default'    => 'en'),$options['lang']);
-	}
+    public function testConstructorWithCustomOptions()
+    {
+        $localBusiness = new DummyModel(array(), array (
+            'base'	=> array('default'	=> 'urn:a:'),
+            'lang'	=> array('default'	=> 'en'),
+        ));
+        $options = $localBusiness->getOptions();
+        $this->assertEquals(
+            array(		
+                'default'    => 'urn:a:',
+                'filter'    => FILTER_SANITIZE_URL,
+                'flags'  	=> FILTER_REQUIRE_SCALAR,
+            ),
+            $options['base']
+        );
+        $this->assertEquals(array('default'    => 'en'),$options['lang']);
+    }
 	
 		
-	public function testgetVocabularies()
-	{
-		$obj = new DummyModel(array());
+    public function testgetVocabularies()
+    {
+        $obj = new DummyModel(array());
 		
-		$this->assertEquals($this->vocabulary,  $obj->getVocabularies());
-	}
+        $this->assertEquals($this->vocabulary,  $obj->getVocabularies());
+    }
 	
 	
-	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->getVocabularies());
-	}
+        $this->assertEquals($vocabulary,  $obj->getVocabularies());
+    }
 	
 	
-	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->getVocabularies());
-	}
+        $this->assertEquals($vocabulary,  $obj->getVocabularies());
+    }
 	
 
     /**
      * @dataProvider uris
      */	
-	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 testGetUri($data, $expectedData)
+    {
+        $obj = new DummyModel($data);
+        $obj->setIdGenerator(function($d){return'abc';});
+        $this->assertEquals($expectedData, $obj->getUri());
+    }
+    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 +25 added lines, -25 removed lines

@@ -2,12 +2,12 @@ 
 
 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(
+	protected $vocabulary = array(
 		'rdf'		=> 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
 		'rdfs'		=> 'http://www.w3.org/2000/01/rdf-schema#',
 		'owl'		=> 'http://www.w3.org/2002/07/owl#',
@@ -35,15 +35,15 @@ 
 	public function data()
     {
     	return array( 
-    		array( array(), array('base'=> 'http://linkeddata.center/botk/resource/'),),
-    		array( array('base'	=> 'urn:a:','id'=>'x'), array('base'=> 'urn:a:','id'=>'x')),
+    		array(array(), array('base'=> 'http://linkeddata.center/botk/resource/'),),
+    		array(array('base'	=> 'urn:a:', 'id'=>'x'), array('base'=> 'urn:a:', 'id'=>'x')),
 		);
    	}
 
 
 	public function testConstructorWithCustomOptions()
 	{
-		$localBusiness = new DummyModel(array(), array (
+		$localBusiness = new DummyModel(array(), array(
 			'base'	=> array('default'	=> 'urn:a:'),
 			'lang'	=> array('default'	=> 'en'),
 		));
@@ -56,7 +56,7 @@ 
 			),
 			$options['base']
 		);
-		$this->assertEquals(array('default'    => 'en'),$options['lang']);
+		$this->assertEquals(array('default'    => 'en'), $options['lang']);
 	}
 	
 		
@@ -64,7 +64,7 @@ 
 	{
 		$obj = new DummyModel(array());
 		
-		$this->assertEquals($this->vocabulary,  $obj->getVocabularies());
+		$this->assertEquals($this->vocabulary, $obj->getVocabularies());
 	}
 	
 	
@@ -74,9 +74,9 @@ 
 		$vocabulary['my'] = 'urn:test:';
 		
 		$obj = new DummyModel(array());
-		$obj->setVocabulary('my','urn:test:');
+		$obj->setVocabulary('my', 'urn:test:');
 		
-		$this->assertEquals($vocabulary,  $obj->getVocabularies());
+		$this->assertEquals($vocabulary, $obj->getVocabularies());
 	}
 	
 	
@@ -88,7 +88,7 @@ 
 		$obj = new DummyModel(array());
 		$obj->unsetVocabulary('foaf');
 		
-		$this->assertEquals($vocabulary,  $obj->getVocabularies());
+		$this->assertEquals($vocabulary, $obj->getVocabularies());
 	}
 	
 
@@ -98,40 +98,40 @@ 
 	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());
 	}
 	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'));
 	}
 	
 	
@@ -139,9 +139,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/FiltersTest.php

Indentation +110 added lines, -110 removed lines

@@ -7,153 +7,153 @@
     /**
      * @dataProvider adresses
      */	
-	public function testAddressFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_ADDRESS($data));
-	}
-	public function adresses()
+    public function testAddressFilter($data, $expectedData)
     {
-    	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-Italy',	'LUNGOLARIO LUIGI CADORNA 1 - 23900 - ITALY'),
-    		array( 'Lungolario L. Cadorna 1-23900-Italy',	'LUNGOLARIO L.CADORNA 1 - 23900 - ITALY'),
-    		array( 'Lungolario Luigi Cadorna num 1',	'LUNGOLARIO LUIGI CADORNA, 1'),
-    		array( 'Lungolario Luigi Cadorna n.1, Lecco',	'LUNGOLARIO LUIGI CADORNA, 1, LECCO'),
-    		array( 'Lungolario Luigi Cadorna n. 1, Lecco',	'LUNGOLARIO LUIGI CADORNA, 1, LECCO'),
-    		array( ',,test;;',	'TEST;'),
-    		array( '',			null), 
-		);
-   	}
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_ADDRESS($data));
+    }
+    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-Italy',	'LUNGOLARIO LUIGI CADORNA 1 - 23900 - ITALY'),
+            array( 'Lungolario L. Cadorna 1-23900-Italy',	'LUNGOLARIO L.CADORNA 1 - 23900 - ITALY'),
+            array( 'Lungolario Luigi Cadorna num 1',	'LUNGOLARIO LUIGI CADORNA, 1'),
+            array( 'Lungolario Luigi Cadorna n.1, Lecco',	'LUNGOLARIO LUIGI CADORNA, 1, LECCO'),
+            array( 'Lungolario Luigi Cadorna n. 1, Lecco',	'LUNGOLARIO LUIGI CADORNA, 1, LECCO'),
+            array( ',,test;;',	'TEST;'),
+            array( '',			null), 
+        );
+        }
 
 
     /**
      * @dataProvider tokens
      */	
-	public function testTokenFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TOKEN($data));
-	}
-	public function tokens()
+    public function testTokenFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TOKEN($data));
+    }
+    public function tokens()
     {
-    	return array( 
-    		array( 'abc d e #1',	'ABCDE1'), 
-    		array( 'abcde1',		'ABCDE1'), 
-    		array( 'ABCDE1',		'ABCDE1'), 
-    		array( ' ABC_DE-1 ',	'ABC_DE1'), 
-    		array( ' ABC_DE:1 ',	'ABC_DE1'),
-    		array( '',				false),  
-		);
-   	}
+        return array( 
+            array( 'abc d e #1',	'ABCDE1'), 
+            array( 'abcde1',		'ABCDE1'), 
+            array( 'ABCDE1',		'ABCDE1'), 
+            array( ' ABC_DE-1 ',	'ABC_DE1'), 
+            array( ' ABC_DE:1 ',	'ABC_DE1'),
+            array( '',				false),  
+        );
+        }
 	
 		
     /**
      * @dataProvider telephones
      */	
-	public function testItTelephoneFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TELEPHONE($data));
-	}
-	public function telephones()
+    public function testItTelephoneFilter($data, $expectedData)
     {
-    	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', null),
-    		array( '', null),
-		);
-   	}
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TELEPHONE($data));
+    }
+    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', null),
+            array( '', null),
+        );
+        }
 	
 	
     /**
      * @dataProvider emails
      */		
-	public function testEmailFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_EMAIL($data));
-	}
-	public function emails()
+    public function testEmailFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_EMAIL($data));
+    }
+    public function emails()
     {
-    	return array( 
-    		array( 'abC@Example.com',		'ABC@EXAMPLE.COM'), 
-    		array( 'abc@linkeddata.center',	'ABC@LINKEDDATA.CENTER'),   
-    		array( 'invalid email',			null),  
-		);
-   	}
+        return array( 
+            array( 'abC@Example.com',		'ABC@EXAMPLE.COM'), 
+            array( 'abc@linkeddata.center',	'ABC@LINKEDDATA.CENTER'),   
+            array( 'invalid email',			null),  
+        );
+        }
 	
 	
     /**
      * @dataProvider ids
      */		
-	public function testIdFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_ID($data));
-	}
-	public function ids()
+    public function testIdFilter($data, $expectedData)
     {
-    	return array( 
-    		array( 'abC@Example.com',		'abc_example_com'), 
-    		array( 'Città di Castello',		'città_di_castello'),   
-    		array( 'a-b-1-2-ò',				'a_b_1_2_ò'),   
-    		array( 'Gigi d\'Alessio',		'gigi_d_alessio'),
-    		array( 'al "Mangione"',			'al_mangione'),    		
-    		array( '#125:34',				'125_34'), 		
-    		array( 'http://example.com/test?abc=3&x=1',	'http_example_com_test_abc_3_x_1'),
-    		array( '',						false), 
-		);
-   	}
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_ID($data));
+    }
+    public function ids()
+    {
+        return array( 
+            array( 'abC@Example.com',		'abc_example_com'), 
+            array( 'Città di Castello',		'città_di_castello'),   
+            array( 'a-b-1-2-ò',				'a_b_1_2_ò'),   
+            array( 'Gigi d\'Alessio',		'gigi_d_alessio'),
+            array( 'al "Mangione"',			'al_mangione'),    		
+            array( '#125:34',				'125_34'), 		
+            array( 'http://example.com/test?abc=3&x=1',	'http_example_com_test_abc_3_x_1'),
+            array( '',						false), 
+        );
+        }
 	
 	
     /**
      * @dataProvider geos
      */		
-	public function testGeoFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_GEO($data));
-	}
-	public function geos()
+    public function testGeoFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_GEO($data));
+    }
+    public function geos()
     {
-    	return array( 
-    		array( '1.1234567',				'1.123456'), 
-    		array( '1,123456',				'1.123456'),
-    		array( '+1.123456',				null), 
-    		array( '-1.1234567',			'-1.123456'),
-    		array( '90.0',					'90.0'),
-    		array( '-90.0',					'-90.0'),
-    		array( '90.1',					null), 
-    		array( '-90.1',					null), 
-    		array( '',						null), 
-		);
-   	}
+        return array( 
+            array( '1.1234567',				'1.123456'), 
+            array( '1,123456',				'1.123456'),
+            array( '+1.123456',				null), 
+            array( '-1.1234567',			'-1.123456'),
+            array( '90.0',					'90.0'),
+            array( '-90.0',					'-90.0'),
+            array( '90.1',					null), 
+            array( '-90.1',					null), 
+            array( '',						null), 
+        );
+        }
 	
 	
     /**
      * @dataProvider turtle_strings
      */		
-	public function testTurtleFilter($data, $expectedData)
-	{
-		$this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TURTLE_STRING($data));
-	}
-	public function turtle_strings()
+    public function testTurtleFilter($data, $expectedData)
+    {
+        $this->assertEquals($expectedData, BOTK\Filters::FILTER_SANITIZE_TURTLE_STRING($data));
+    }
+    public function turtle_strings()
     {
-    	return array( 
-    		array( 'abc',							'abc'), 
-    		array( '"la locanda"',					'\"la locanda\"'),
-    		array( 'da ""la locanda""',				'da \"\"la locanda\"\"'), 
-    		array( 'this is \ backslash',			'this is \\ backslash'),
-    		array( 'this is \\\\ doublebackslash',		'this is \\\\ doublebackslash'),
-    		array( '',								null), 
-		);
-   	}
+        return array( 
+            array( 'abc',							'abc'), 
+            array( '"la locanda"',					'\"la locanda\"'),
+            array( 'da ""la locanda""',				'da \"\"la locanda\"\"'), 
+            array( 'this is \ backslash',			'this is \\ backslash'),
+            array( 'this is \\\\ doublebackslash',		'this is \\\\ doublebackslash'),
+            array( '',								null), 
+        );
+        }
 	
 }
 

Spacing +54 added lines, -54 removed lines

@@ -14,14 +14,14 @@ 
 	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-Italy',	'LUNGOLARIO LUIGI CADORNA 1 - 23900 - ITALY'),
-    		array( 'Lungolario L. Cadorna 1-23900-Italy',	'LUNGOLARIO L.CADORNA 1 - 23900 - ITALY'),
-    		array( 'Lungolario Luigi Cadorna num 1',	'LUNGOLARIO LUIGI CADORNA, 1'),
-    		array( 'Lungolario Luigi Cadorna n.1, Lecco',	'LUNGOLARIO LUIGI CADORNA, 1, LECCO'),
-    		array( 'Lungolario Luigi Cadorna n. 1, Lecco',	'LUNGOLARIO LUIGI CADORNA, 1, LECCO'),
-    		array( ',,test;;',	'TEST;'),
-    		array( '',			null), 
+    		array('Lungolario Luigi Cadorna, 1, 23900 Lecco LC, Italy', 'LUNGOLARIO LUIGI CADORNA, 1, 23900 LECCO LC, ITALY'),
+    		array('Lungolario Luigi Cadorna 1-23900-Italy', 'LUNGOLARIO LUIGI CADORNA 1 - 23900 - ITALY'),
+    		array('Lungolario L. Cadorna 1-23900-Italy', 'LUNGOLARIO L.CADORNA 1 - 23900 - ITALY'),
+    		array('Lungolario Luigi Cadorna num 1', 'LUNGOLARIO LUIGI CADORNA, 1'),
+    		array('Lungolario Luigi Cadorna n.1, Lecco', 'LUNGOLARIO LUIGI CADORNA, 1, LECCO'),
+    		array('Lungolario Luigi Cadorna n. 1, Lecco', 'LUNGOLARIO LUIGI CADORNA, 1, LECCO'),
+    		array(',,test;;', 'TEST;'),
+    		array('', null), 
 		);
    	}
 
@@ -36,12 +36,12 @@ 
 	public function tokens()
     {
     	return array( 
-    		array( 'abc d e #1',	'ABCDE1'), 
-    		array( 'abcde1',		'ABCDE1'), 
-    		array( 'ABCDE1',		'ABCDE1'), 
-    		array( ' ABC_DE-1 ',	'ABC_DE1'), 
-    		array( ' ABC_DE:1 ',	'ABC_DE1'),
-    		array( '',				false),  
+    		array('abc d e #1', 'ABCDE1'), 
+    		array('abcde1', 'ABCDE1'), 
+    		array('ABCDE1', 'ABCDE1'), 
+    		array(' ABC_DE-1 ', 'ABC_DE1'), 
+    		array(' ABC_DE:1 ', 'ABC_DE1'),
+    		array('', false),  
 		);
    	}
 	
@@ -56,20 +56,20 @@ 
 	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', null),
-    		array( '', null),
+    		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', null),
+    		array('', null),
 		);
    	}
 	
@@ -84,9 +84,9 @@ 
 	public function emails()
     {
     	return array( 
-    		array( 'abC@Example.com',		'ABC@EXAMPLE.COM'), 
-    		array( 'abc@linkeddata.center',	'ABC@LINKEDDATA.CENTER'),   
-    		array( 'invalid email',			null),  
+    		array('abC@Example.com', 'ABC@EXAMPLE.COM'), 
+    		array('abc@linkeddata.center', 'ABC@LINKEDDATA.CENTER'),   
+    		array('invalid email', null),  
 		);
    	}
 	
@@ -101,14 +101,14 @@ 
 	public function ids()
     {
     	return array( 
-    		array( 'abC@Example.com',		'abc_example_com'), 
-    		array( 'Città di Castello',		'città_di_castello'),   
-    		array( 'a-b-1-2-ò',				'a_b_1_2_ò'),   
-    		array( 'Gigi d\'Alessio',		'gigi_d_alessio'),
-    		array( 'al "Mangione"',			'al_mangione'),    		
-    		array( '#125:34',				'125_34'), 		
-    		array( 'http://example.com/test?abc=3&x=1',	'http_example_com_test_abc_3_x_1'),
-    		array( '',						false), 
+    		array('abC@Example.com', 'abc_example_com'), 
+    		array('Città di Castello', 'città_di_castello'),   
+    		array('a-b-1-2-ò', 'a_b_1_2_ò'),   
+    		array('Gigi d\'Alessio', 'gigi_d_alessio'),
+    		array('al "Mangione"', 'al_mangione'),    		
+    		array('#125:34', '125_34'), 		
+    		array('http://example.com/test?abc=3&x=1', 'http_example_com_test_abc_3_x_1'),
+    		array('', false), 
 		);
    	}
 	
@@ -123,15 +123,15 @@ 
 	public function geos()
     {
     	return array( 
-    		array( '1.1234567',				'1.123456'), 
-    		array( '1,123456',				'1.123456'),
-    		array( '+1.123456',				null), 
-    		array( '-1.1234567',			'-1.123456'),
-    		array( '90.0',					'90.0'),
-    		array( '-90.0',					'-90.0'),
-    		array( '90.1',					null), 
-    		array( '-90.1',					null), 
-    		array( '',						null), 
+    		array('1.1234567', '1.123456'), 
+    		array('1,123456', '1.123456'),
+    		array('+1.123456', null), 
+    		array('-1.1234567', '-1.123456'),
+    		array('90.0', '90.0'),
+    		array('-90.0', '-90.0'),
+    		array('90.1', null), 
+    		array('-90.1', null), 
+    		array('', null), 
 		);
    	}
 	
@@ -146,12 +146,12 @@ 
 	public function turtle_strings()
     {
     	return array( 
-    		array( 'abc',							'abc'), 
-    		array( '"la locanda"',					'\"la locanda\"'),
-    		array( 'da ""la locanda""',				'da \"\"la locanda\"\"'), 
-    		array( 'this is \ backslash',			'this is \\ backslash'),
-    		array( 'this is \\\\ doublebackslash',		'this is \\\\ doublebackslash'),
-    		array( '',								null), 
+    		array('abc', 'abc'), 
+    		array('"la locanda"', '\"la locanda\"'),
+    		array('da ""la locanda""', 'da \"\"la locanda\"\"'), 
+    		array('this is \ backslash', 'this is \\ backslash'),
+    		array('this is \\\\ doublebackslash', 'this is \\\\ doublebackslash'),
+    		array('', null), 
 		);
    	}
 	

examples/sample2.php

Indentation +20 added lines, -20 removed lines

@@ -2,27 +2,27 @@
 require_once __DIR__.'/../vendor/autoload.php';
 
 $options = array(
-	'factsProfile' => array(
-		'model'			=> 'LocalBusiness',
-		'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];
+    'factsProfile' => array(
+        'model'			=> 'LocalBusiness',
+        '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;
+        },
+    ),
 );
 
 BOTK\SimpleCsvGateway::factory($options)->run();
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -5,13 +5,13 @@
 	'factsProfile' => array(
 		'model'			=> 'LocalBusiness',
 		'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];

examples/sample3.php

Indentation +25 added lines, -25 removed lines

@@ -2,32 +2,32 @@
 require_once __DIR__.'/../vendor/autoload.php';
 
 $options = array(
-	'factsProfile' => array(
-		'model'			=> 'LocalBusiness',
-		'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'] = 'FARMACIA '.$rawdata[3];
-			$data['vatID'] = $rawdata[4];
-			$data['postalCode'] = $rawdata[5];
-			$data['addressLocality'] = $rawdata[7];
-			$data['addressRegion'] = $rawdata[10];
-			$data['lat'] = $rawdata[18];
-			$data['long'] = $rawdata[19];			
+    'factsProfile' => array(
+        'model'			=> 'LocalBusiness',
+        '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'] = 'FARMACIA '.$rawdata[3];
+            $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;
-		},
-		'rawDataValidationFilter' => function( $rawdata){
-			// salta le farmacie non attive
-			return (!empty($rawdata[15]) && ($rawdata[15]=='-'));
-		},	
-	),
-	'fieldDelimiter' => ';'
+            return $data;
+        },
+        'rawDataValidationFilter' => function( $rawdata){
+            // salta le farmacie non attive
+            return (!empty($rawdata[15]) && ($rawdata[15]=='-'));
+        },	
+    ),
+    'fieldDelimiter' => ';'
 );
 
 BOTK\SimpleCsvGateway::factory($options)->run();

Spacing +5 added lines, -5 removed lines

@@ -5,11 +5,11 @@ 
 	'factsProfile' => array(
 		'model'			=> 'LocalBusiness',
 		'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'] = 'FARMACIA '.$rawdata[3];
@@ -22,9 +22,9 @@ 
 			
 			return $data;
 		},
-		'rawDataValidationFilter' => function( $rawdata){
+		'rawDataValidationFilter' => function($rawdata) {
 			// salta le farmacie non attive
-			return (!empty($rawdata[15]) && ($rawdata[15]=='-'));
+			return (!empty($rawdata[15]) && ($rawdata[15] == '-'));
 		},	
 	),
 	'fieldDelimiter' => ';'

examples/sample1.php

Indentation +27 added lines, -27 removed lines

@@ -2,34 +2,34 @@
 require_once __DIR__.'/../vendor/autoload.php';
 
 $options = array(
-	'factsProfile' => array(
-		'model'			=> 'LocalBusiness',
-		'options'		=> array(
-			'base' => array( 'default'=> 'urn:sample1:')
-		),
-		'datamapper'	=> function($rawdata){
-			$data = array();
-			$data['id'] = $rawdata[0];
-			$data['businessType'] = 'schema:'.\BOTK\Filters::FILTER_SANITIZE_ID($rawdata[16]);
-			$data['businessName'][] = $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];
+    'factsProfile' => array(
+        'model'			=> 'LocalBusiness',
+        'options'		=> array(
+            'base' => array( 'default'=> 'urn:sample1:')
+        ),
+        'datamapper'	=> function($rawdata){
+            $data = array();
+            $data['id'] = $rawdata[0];
+            $data['businessType'] = 'schema:'.\BOTK\Filters::FILTER_SANITIZE_ID($rawdata[16]);
+            $data['businessName'][] = $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;
-		},
-		'rawDataValidationFilter' => function( $rawdata){
-			return !empty($rawdata['16']);
-		},	
-	),
-	'skippFirstLine'	=> false,
-	'fieldDelimiter' => '|'
+            return $data;
+        },
+        'rawDataValidationFilter' => function( $rawdata){
+            return !empty($rawdata['16']);
+        },	
+    ),
+    'skippFirstLine'	=> false,
+    'fieldDelimiter' => '|'
 );
 
 BOTK\SimpleCsvGateway::factory($options)->run();

Spacing +4 added lines, -4 removed lines

@@ -5,9 +5,9 @@ 
 	'factsProfile' => array(
 		'model'			=> 'LocalBusiness',
 		'options'		=> array(
-			'base' => array( 'default'=> 'urn:sample1:')
+			'base' => array('default'=> 'urn:sample1:')
 		),
-		'datamapper'	=> function($rawdata){
+		'datamapper'	=> function($rawdata) {
 			$data = array();
 			$data['id'] = $rawdata[0];
 			$data['businessType'] = 'schema:'.\BOTK\Filters::FILTER_SANITIZE_ID($rawdata[16]);
@@ -18,13 +18,13 @@ 
 			$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];
 			
 			return $data;
 		},
-		'rawDataValidationFilter' => function( $rawdata){
+		'rawDataValidationFilter' => function($rawdata) {
 			return !empty($rawdata['16']);
 		},	
 	),