Benestar / asparagus

tests/integration/QueryBuilderTest.php

Spacing +33 added lines, -33 removed lines

@@ -15,71 +15,71 @@
 	);
 
 	public function testBasicFunctionality() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?name', '?email' )
-			->where( '?person', 'test:name', '?name' )
-			->also( 'test:email', '?email' )
-			->limit( 10 );
+		$queryBuilder->select('?name', '?email')
+			->where('?person', 'test:name', '?name')
+			->also('test:email', '?email')
+			->limit(10);
 
-		$this->assertIsExpected( 'basic_functionality', $queryBuilder->format() );
+		$this->assertIsExpected('basic_functionality', $queryBuilder->format());
 	}
 
 	public function testOptionalFilter() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
-		$queryBuilder->select( '?name' )
-			->where( '?person', 'test:name', '?name' )
-			->optional( '?person', 'test:email', '?email' )
-			->filter( '!BOUND (?email)' );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
+		$queryBuilder->select('?name')
+			->where('?person', 'test:name', '?name')
+			->optional('?person', 'test:email', '?email')
+			->filter('!BOUND (?email)');
 
-		$this->assertIsExpected( 'optional_filter', $queryBuilder->format() );
+		$this->assertIsExpected('optional_filter', $queryBuilder->format());
 	}
 
 	public function testUnion() {
-		$queryBuilder = new QueryBuilder( array(
+		$queryBuilder = new QueryBuilder(array(
 			'dc10' => 'http://purl.org/dc/elements/1.0/',
 			'dc11' => 'http://purl.org/dc/elements/1.1/'
-		) );
+		));
 
-		$queryBuilder->select( '?title', '?author' )
+		$queryBuilder->select('?title', '?author')
 			->union(
 				$queryBuilder->newSubgraph()
-					->where( '?book', 'dc10:title', '?title' )
-					->also( 'dc10:creator', '?author' ),
+					->where('?book', 'dc10:title', '?title')
+					->also('dc10:creator', '?author'),
 				$queryBuilder->newSubgraph()
-					->where( '?book', 'dc11:title', '?title' )
-					->also( 'dc11:creator', '?author' )
+					->where('?book', 'dc11:title', '?title')
+					->also('dc11:creator', '?author')
 			);
 
-		$this->assertIsExpected( 'union', $queryBuilder->format() );
+		$this->assertIsExpected('union', $queryBuilder->format());
 	}
 
 	public function testUndefinedPrefixDetected() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?age' )
-			->where( '?person', 'test:name', '?name' )
-			->also( 'nyan:age', '?age' );
+		$queryBuilder->select('?age')
+			->where('?person', 'test:name', '?name')
+			->also('nyan:age', '?age');
 
-		$this->setExpectedException( 'RangeException', 'nyan' );
+		$this->setExpectedException('RangeException', 'nyan');
 		$queryBuilder->getSPARQL();
 	}
 
 	public function testUndefinedVariableDetected() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?email' )
-			->where( '?person', 'test:name', '?name' )
-			->also( 'test:age', '?age' );
+		$queryBuilder->select('?email')
+			->where('?person', 'test:name', '?name')
+			->also('test:age', '?age');
 
-		$this->setExpectedException( 'RangeException', '?email' );
+		$this->setExpectedException('RangeException', '?email');
 		$queryBuilder->getSPARQL();
 	}
 
-	private function assertIsExpected( $name, $sparql ) {
-		$expected = file_get_contents( __DIR__ . '/../data/builder_' . $name . '.rq' );
+	private function assertIsExpected($name, $sparql) {
+		$expected = file_get_contents(__DIR__ . '/../data/builder_' . $name . '.rq');
 
-		$this->assertEquals( $expected, $sparql, 'Query didn\'t match the expected content of integration_' . $name . '.rq' );
+		$this->assertEquals($expected, $sparql, 'Query didn\'t match the expected content of integration_' . $name . '.rq');
 	}
 
 }

tests/integration/WDQSQueryExamplesTest.php

Spacing +139 added lines, -139 removed lines

@@ -22,245 +22,245 @@
 	);
 
 	public function testUSPresidentsAndSpouses() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?p', '?w', '?l', '?wl' )
-			->where( 'wd:Q30', 'p:P6/v:P6', '?p' )
-			->where( '?p', 'wdt:P26', '?w' )
+		$queryBuilder->select('?p', '?w', '?l', '?wl')
+			->where('wd:Q30', 'p:P6/v:P6', '?p')
+			->where('?p', 'wdt:P26', '?w')
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?p', 'rdfs:label', '?l' )
-					->filter( 'LANG(?l) = "en"' )
+					->where('?p', 'rdfs:label', '?l')
+					->filter('LANG(?l) = "en"')
 			)
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?w', 'rdfs:label', '?wl' )
-					->filter( 'LANG(?wl) = "en"' )
+					->where('?w', 'rdfs:label', '?wl')
+					->filter('LANG(?wl) = "en"')
 			);
 
-		$this->assertIsExpected( 'US_presidents_and_spouses', $queryBuilder->format() );
+		$this->assertIsExpected('US_presidents_and_spouses', $queryBuilder->format());
 	}
 
 	public function testPresidentsAndCausesOfDeath() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?h', '?cause', '?hl', '?causel' )
-			->where( '?h', 'wdt:P39', 'wd:Q11696' )
-			->also( 'wdt:P509', '?cause' )
+		$queryBuilder->select('?h', '?cause', '?hl', '?causel')
+			->where('?h', 'wdt:P39', 'wd:Q11696')
+			->also('wdt:P509', '?cause')
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?h', 'rdfs:label', '?hl' )
-					->filter( 'LANG(?hl) = "en"' )
+					->where('?h', 'rdfs:label', '?hl')
+					->filter('LANG(?hl) = "en"')
 			)
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?cause', 'rdfs:label', '?causel' )
-					->filter( 'LANG(?causel) = "en"' )
+					->where('?cause', 'rdfs:label', '?causel')
+					->filter('LANG(?causel) = "en"')
 			);
 
-		$this->assertIsExpected( 'Presidents_and_causes_of_death', $queryBuilder->format() );
+		$this->assertIsExpected('Presidents_and_causes_of_death', $queryBuilder->format());
 	}
 
 	public function testPeopleBornBeforeYear1880WithNoDeathDate() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?h', '?date' )
-			->where( '?h', 'wdt:P31', 'wd:Q5' )
-			->also( 'wdt:P569', '?date' )
-			->optional( '?h', 'wdt:P570', '?d' )
-			->filter( '?date < "1880-01-01T00:00:00Z"^^xsd:dateTime' )
-			->filter( '!BOUND(?d)' )
-			->limit( 100 );
+		$queryBuilder->select('?h', '?date')
+			->where('?h', 'wdt:P31', 'wd:Q5')
+			->also('wdt:P569', '?date')
+			->optional('?h', 'wdt:P570', '?d')
+			->filter('?date < "1880-01-01T00:00:00Z"^^xsd:dateTime')
+			->filter('!BOUND(?d)')
+			->limit(100);
 
-		$this->assertIsExpected( 'People_born_before_year_1880_with_no_death_date', $queryBuilder->format() );
+		$this->assertIsExpected('People_born_before_year_1880_with_no_death_date', $queryBuilder->format());
 	}
 
 	public function testLargestCitiesWithFemaleMayor() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
-
-		$queryBuilder->selectDistinct( '?city', '?citylabel', '?mayorlabel' )
-			->where( '?city', 'wdt:P31/wdt:P279*', 'wd:Q515' )
-			->also( 'p:P6', '?statement' )
-			->also( 'wdt:P1082', '?population' )
-			->where( '?statement', 'v:P6', '?mayor' )
-			->where( '?mayor', 'wdt:P21', 'wd:Q6581072' )
-			->filterNotExists( '?statement', 'q:P582', '?x' )
+		$queryBuilder = new QueryBuilder(self::$prefixes);
+
+		$queryBuilder->selectDistinct('?city', '?citylabel', '?mayorlabel')
+			->where('?city', 'wdt:P31/wdt:P279*', 'wd:Q515')
+			->also('p:P6', '?statement')
+			->also('wdt:P1082', '?population')
+			->where('?statement', 'v:P6', '?mayor')
+			->where('?mayor', 'wdt:P21', 'wd:Q6581072')
+			->filterNotExists('?statement', 'q:P582', '?x')
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?city', 'rdfs:label', '?citylabel' )
-					->filter( 'LANG(?citylabel) = "en"' )
+					->where('?city', 'rdfs:label', '?citylabel')
+					->filter('LANG(?citylabel) = "en"')
 			)
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?mayor', 'rdfs:label', '?mayorlabel' )
-					->filter( 'LANG(?mayorlabel) = "en"' )
+					->where('?mayor', 'rdfs:label', '?mayorlabel')
+					->filter('LANG(?mayorlabel) = "en"')
 			)
-			->orderBy( '?population', 'DESC' )
-			->limit( 10 );
+			->orderBy('?population', 'DESC')
+			->limit(10);
 
-		$this->assertIsExpected( 'Largest_cities_with_female_mayor', $queryBuilder->format() );
+		$this->assertIsExpected('Largest_cities_with_female_mayor', $queryBuilder->format());
 	}
 
 	public function testListOfCountriesOrderedByTheNumberOfTheirCitiesWithFemaleMayor() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
-
-		$queryBuilder->select( '?country', '?label', '(COUNT(*) AS ?COUNT)' )
-			->where( '?city', 'wdt:P31/wdt:P279*', 'wd:Q515' )
-			->also( 'p:P6', '?statement' )
-			->also( 'wdt:P17', '?country' )
-			->where( '?statement', 'v:P6', '?mayor' )
-			->where( '?mayor', 'wdt:P21', 'wd:Q6581072' )
-			->filterNotExists( '?statement', 'q:P582', '?x' )
+		$queryBuilder = new QueryBuilder(self::$prefixes);
+
+		$queryBuilder->select('?country', '?label', '(COUNT(*) AS ?COUNT)')
+			->where('?city', 'wdt:P31/wdt:P279*', 'wd:Q515')
+			->also('p:P6', '?statement')
+			->also('wdt:P17', '?country')
+			->where('?statement', 'v:P6', '?mayor')
+			->where('?mayor', 'wdt:P21', 'wd:Q6581072')
+			->filterNotExists('?statement', 'q:P582', '?x')
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?country', 'rdfs:label', '?label' )
-					->filter( 'LANG(?label) = "en"' )
+					->where('?country', 'rdfs:label', '?label')
+					->filter('LANG(?label) = "en"')
 			)
-			->groupBy( '?country', '?label' )
-			->orderBy( '?COUNT', 'DESC' )
-			->limit( 100 );
+			->groupBy('?country', '?label')
+			->orderBy('?COUNT', 'DESC')
+			->limit(100);
 
-		$this->assertIsExpected( 'List_of_countries_ordered_by_the_number_of_their_cities_with_female_mayor', $queryBuilder->format() );
+		$this->assertIsExpected('List_of_countries_ordered_by_the_number_of_their_cities_with_female_mayor', $queryBuilder->format());
 	}
 
 	public function testsHowManyStatesThisUSStateBorders() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?state', '?stateL', '?borders' )
+		$queryBuilder->select('?state', '?stateL', '?borders')
 			->subquery(
 				$queryBuilder->newSubquery()
-					->select( '?state', '(COUNT (?otherState) AS ?borders)' )
-					->where( '?state', 'wdt:P31', 'wd:Q35657' )
-					->where( '?otherState', 'wdt:P47', '?state' )
-					->also( 'wdt:P31', 'wd:Q35657' )
-					->groupBy( '?state' )
+					->select('?state', '(COUNT (?otherState) AS ?borders)')
+					->where('?state', 'wdt:P31', 'wd:Q35657')
+					->where('?otherState', 'wdt:P47', '?state')
+					->also('wdt:P31', 'wd:Q35657')
+					->groupBy('?state')
 			)
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?state', 'rdfs:label', '?stateL' )
-					->filter( 'LANG(?stateL) = "en"' )
+					->where('?state', 'rdfs:label', '?stateL')
+					->filter('LANG(?stateL) = "en"')
 			)
-			->orderBy( '?borders', 'DESC' );
+			->orderBy('?borders', 'DESC');
 
-		$this->assertIsExpected( 'How_many_states_this_US_state_borders', $queryBuilder->format() );
+		$this->assertIsExpected('How_many_states_this_US_state_borders', $queryBuilder->format());
 	}
 
 	public function testWhoseBirthdayIsToday() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?entity', '(YEAR(?date) AS ?YEAR)' )
-			->where( '?entityS', 'wdt:P569', '?date' )
-			->also( 'rdfs:label', '?entity' )
-			->filter( 'DATATYPE (?date) = xsd:dateTime' )
-			->filter( 'MONTH (?date) = MONTH (NOW ())' )
-			->filter( 'DAY (?date) = DAY (NOW ())' )
-			->limit( 10 );
+		$queryBuilder->select('?entity', '(YEAR(?date) AS ?YEAR)')
+			->where('?entityS', 'wdt:P569', '?date')
+			->also('rdfs:label', '?entity')
+			->filter('DATATYPE (?date) = xsd:dateTime')
+			->filter('MONTH (?date) = MONTH (NOW ())')
+			->filter('DAY (?date) = DAY (NOW ())')
+			->limit(10);
 
-		$this->assertIsExpected( 'Whose_birthday_is_today', $queryBuilder->format() );
+		$this->assertIsExpected('Whose_birthday_is_today', $queryBuilder->format());
 	}
 
 	public function testWhoDiscoveredTheMostAsteroids() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?discoverer', '?name', '(COUNT (?asteroid) AS ?count)' )
-			->where( '?asteroid', 'wdt:P31', 'wd:Q3863' )
-			->also( 'wdt:P61', '?discoverer' )
+		$queryBuilder->select('?discoverer', '?name', '(COUNT (?asteroid) AS ?count)')
+			->where('?asteroid', 'wdt:P31', 'wd:Q3863')
+			->also('wdt:P61', '?discoverer')
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?discoverer', 'rdfs:label', '?name' )
-					->filter( 'LANG(?name) = "en"' )
+					->where('?discoverer', 'rdfs:label', '?name')
+					->filter('LANG(?name) = "en"')
 			)
-			->groupBy( '?discoverer', '?name' )
-			->orderBy( '?count', 'DESC' )
-			->limit( 10 );
+			->groupBy('?discoverer', '?name')
+			->orderBy('?count', 'DESC')
+			->limit(10);
 
-		$this->assertIsExpected( 'Who_discovered_the_most_asteroids', $queryBuilder->format() );
+		$this->assertIsExpected('Who_discovered_the_most_asteroids', $queryBuilder->format());
 	}
 
 	public function testWhoDiscoveredTheMostPlanets() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?discoverer', '?name', '(COUNT (DISTINCT ?planet) AS ?count)' )
-			->where( '?ppart', 'wdt:P279*', 'wd:Q634' )
-			->where( '?planet', 'wdt:P31', '?ppart' )
-			->also( 'wdt:P61', '?discoverer' )
+		$queryBuilder->select('?discoverer', '?name', '(COUNT (DISTINCT ?planet) AS ?count)')
+			->where('?ppart', 'wdt:P279*', 'wd:Q634')
+			->where('?planet', 'wdt:P31', '?ppart')
+			->also('wdt:P61', '?discoverer')
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?discoverer', 'rdfs:label', '?name' )
-					->filter( 'LANG(?name) = "en"' )
+					->where('?discoverer', 'rdfs:label', '?name')
+					->filter('LANG(?name) = "en"')
 			)
-			->groupBy( '?discoverer', '?name' )
-			->orderBy( '?count', 'DESC' )
-			->limit( 10 );
+			->groupBy('?discoverer', '?name')
+			->orderBy('?count', 'DESC')
+			->limit(10);
 
-		$this->assertIsExpected( 'Who_discovered_the_most_planets', $queryBuilder->format() );
+		$this->assertIsExpected('Who_discovered_the_most_planets', $queryBuilder->format());
 	}
 
 	public function testAmericanUniversitiesFoundedBeforeTheStatesTheyResideInWereCreated() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
-
-		$queryBuilder->select( '?uniName', '?founded', '?stateName', '?stateStart' )
-			->where( '?uni', 'wdt:P31|wdt:P279/wdt:P31', 'wd:Q3918' )
-			->also( 'wdt:P131+', '?state' )
-			->also( 'wdt:P571', '?founded' )
-			->where( '?state', 'wdt:P31', 'wd:Q35657' )
-			->also( 'wdt:P571', '?stateStart' )
-			->filter( '?founded < ?stateStart' )
+		$queryBuilder = new QueryBuilder(self::$prefixes);
+
+		$queryBuilder->select('?uniName', '?founded', '?stateName', '?stateStart')
+			->where('?uni', 'wdt:P31|wdt:P279/wdt:P31', 'wd:Q3918')
+			->also('wdt:P131+', '?state')
+			->also('wdt:P571', '?founded')
+			->where('?state', 'wdt:P31', 'wd:Q35657')
+			->also('wdt:P571', '?stateStart')
+			->filter('?founded < ?stateStart')
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?state', 'rdfs:label', '?stateName' )
-					->filter( 'LANG(?stateName) = "en"' )
+					->where('?state', 'rdfs:label', '?stateName')
+					->filter('LANG(?stateName) = "en"')
 			)
 			->optional(
 				$queryBuilder->newSubgraph()
-					->where( '?uni', 'rdfs:label', '?uniName' )
-					->filter( 'LANG(?uniName) = "en"' )
+					->where('?uni', 'rdfs:label', '?uniName')
+					->filter('LANG(?uniName) = "en"')
 			)
-			->limit( 10 );
+			->limit(10);
 
-		$this->assertIsExpected( 'American_universities_founded_before_the_states_they_reside_in_were_created', $queryBuilder->format() );
+		$this->assertIsExpected('American_universities_founded_before_the_states_they_reside_in_were_created', $queryBuilder->format());
 	}
 
 	public function testWhatIsTheRelationBetweenTerrellBuckleyAndMiamiDolphins() {
-		$queryBuilder = new QueryBuilder( self::$prefixes );
+		$queryBuilder = new QueryBuilder(self::$prefixes);
 
-		$queryBuilder->select( '?l' )
-			->where( 'wd:Q5571382', '?p', 'wd:Q223243' )
-			->where( '?property', '?ref', '?p' )
-			->also( 'a', 'wikibase:Property' )
-			->also( 'rdfs:label', '?l' )
-			->filter( 'LANG(?l) = "en"' )
-			->limit( 10 );
+		$queryBuilder->select('?l')
+			->where('wd:Q5571382', '?p', 'wd:Q223243')
+			->where('?property', '?ref', '?p')
+			->also('a', 'wikibase:Property')
+			->also('rdfs:label', '?l')
+			->filter('LANG(?l) = "en"')
+			->limit(10);
 
-		$this->assertIsExpected( 'What_is_the_relation_between_Terrell_Buckley_and_Miami_Dolphins', $queryBuilder->format() );
+		$this->assertIsExpected('What_is_the_relation_between_Terrell_Buckley_and_Miami_Dolphins', $queryBuilder->format());
 	}
 
 	public function testAliasesOfPropertiesWhichAreUsedMoreThanOnce() {
-		$queryBuilder = new QueryBuilder( self::$prefixes + array(
+		$queryBuilder = new QueryBuilder(self::$prefixes + array(
 			'skos' => 'http://www.w3.org/2004/02/skos/core#'
-		) );
+		));
 
-		$queryBuilder->select( '?property', '?alias', '?occurences' )
+		$queryBuilder->select('?property', '?alias', '?occurences')
 			->subquery(
 				$queryBuilder->newSubquery()
-					->select( '?alias', '(COUNT (?alias) AS ?occurences)' )
-					->where( '?tmp', 'a', 'wikibase:Property' )
-					->also( 'skos:altLabel', '?alias' )
-					->filter( 'LANG (?alias) = "en"' )
-					->groupBy( '?alias' )
+					->select('?alias', '(COUNT (?alias) AS ?occurences)')
+					->where('?tmp', 'a', 'wikibase:Property')
+					->also('skos:altLabel', '?alias')
+					->filter('LANG (?alias) = "en"')
+					->groupBy('?alias')
 			)
-			->where( '?property', 'a', 'wikibase:Property' )
-			->also( 'skos:altLabel', '?alias' )
-			->filter( '?occurences > 1' )
-			->orderBy( '?alias' );
+			->where('?property', 'a', 'wikibase:Property')
+			->also('skos:altLabel', '?alias')
+			->filter('?occurences > 1')
+			->orderBy('?alias');
 
-		$this->assertIsExpected( 'Aliases_of_properties_which_are_used_more_than_once', $queryBuilder->format() );
+		$this->assertIsExpected('Aliases_of_properties_which_are_used_more_than_once', $queryBuilder->format());
 	}
 
-	private function assertIsExpected( $name, $sparql ) {
-		$expected = file_get_contents( __DIR__ . '/../data/wdqs_' . $name . '.rq' );
+	private function assertIsExpected($name, $sparql) {
+		$expected = file_get_contents(__DIR__ . '/../data/wdqs_' . $name . '.rq');
 
-		$this->assertEquals( $expected, $sparql, 'Query didn\'t match the expected content of integration_' . $name . '.rq' );
+		$this->assertEquals($expected, $sparql, 'Query didn\'t match the expected content of integration_' . $name . '.rq');
 	}
 
 }

tests/integration/QueryFormatterTest.php

Spacing +8 added lines, -8 removed lines

@@ -13,20 +13,20 @@
 	/**
 	 * @dataProvider provideTestFormat
 	 */
-	public function testFormat( $name ) {
+	public function testFormat($name) {
 		$formatter = new QueryFormatter();
-		$sparql = file_get_contents( __DIR__ . '/../data/formatter_' . $name . '_in.rq' );
-		$expected = file_get_contents( __DIR__ . '/../data/formatter_' . $name . '_out.rq' );
+		$sparql = file_get_contents(__DIR__ . '/../data/formatter_' . $name . '_in.rq');
+		$expected = file_get_contents(__DIR__ . '/../data/formatter_' . $name . '_out.rq');
 
-		$this->assertEquals( $expected, $formatter->format( $sparql ),
-			'Input from formatter_' . $name . '_in.rq didn\'t produce the expected output.'  );
+		$this->assertEquals($expected, $formatter->format($sparql),
+			'Input from formatter_' . $name . '_in.rq didn\'t produce the expected output.');
 	}
 
 	public function provideTestFormat() {
 		return array(
-			'Query without line-breaks' => array( 'one_line' ),
-			'Query with lots of spaces' => array( 'many_spaces' ),
-			'Query with few spaces' => array( 'few_spaces' )
+			'Query without line-breaks' => array('one_line'),
+			'Query with lots of spaces' => array('many_spaces'),
+			'Query with few spaces' => array('few_spaces')
 		);
 	}
 

tests/bootstrap.php

Spacing +9 added lines, -9 removed lines

@@ -1,19 +1,19 @@
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
-	die( 'Not an entry point' );
+if (PHP_SAPI !== 'cli') {
+	die('Not an entry point');
 }
 
-error_reporting( E_ALL | E_STRICT );
-ini_set( 'display_errors', 1 );
+error_reporting(E_ALL | E_STRICT);
+ini_set('display_errors', 1);
 
-if ( !is_readable( __DIR__ . '/../vendor/autoload.php' ) ) {
-	die( 'You need to install this package with Composer before you can run the tests' );
+if (!is_readable(__DIR__ . '/../vendor/autoload.php')) {
+	die('You need to install this package with Composer before you can run the tests');
 }
 
 $autoLoader = require_once __DIR__ . '/../vendor/autoload.php';
 
-$autoLoader->addPsr4( 'Asparagus\\Tests\\', __DIR__ . '/unit/' );
-$autoLoader->addPsr4( 'Asparagus\\Tests\\Integration\\', __DIR__ . '/integration/' );
+$autoLoader->addPsr4('Asparagus\\Tests\\', __DIR__ . '/unit/');
+$autoLoader->addPsr4('Asparagus\\Tests\\Integration\\', __DIR__ . '/integration/');
 
-unset( $autoLoader );
+unset($autoLoader);

tests/unit/RegexHelperTest.php

Spacing +72 added lines, -72 removed lines

@@ -15,120 +15,120 @@
 	/**
 	 * @dataProvider provideMatchingExpressions
 	 */
-	public function testMatchesRegex_matching( $regex, $expression ) {
+	public function testMatchesRegex_matching($regex, $expression) {
 		$regexHelper = new RegexHelper();
 
-		$this->assertTrue( $regexHelper->matchesRegex( $regex, $expression ) );
+		$this->assertTrue($regexHelper->matchesRegex($regex, $expression));
 	}
 
 	public function provideMatchingExpressions() {
 		return array(
-			array( '\{variable}', '?abc' ),
-			array( '\{variable}', '$abc' ),
-			array( 'AS \{variable}', 'AS ?nyan' ),
-			array( '\{iri}', 'http://www.example.com/test#' ),
-			array( '\{prefix}', 'foo_bar42' ),
-			array( '\{name}', 'foo_bar42' ),
-			array( '\{prefixed_iri}', '<http://www.example.com/test#>' ),
-			array( '\{prefixed_iri}', 'nyan:cat' ),
-			array( '\{native}', '123' ),
-			array( '\{native}', '"foo bar"' ),
-			array( '\{path}', 'nyan:cat' ),
-			array( '\{path}', '^nyan:cat' ),
-			array( '\{path}', 'nyan:cat' ),
-			array( '\{path}', 'nyan:cat/nyan:kitten' ),
-			array( '\{path}', 'nyan:cat/nyan:kitten/cat:kitten' ),
-			array( '\{path}', 'nyan:cat|nyan:kitten' ),
-			array( '\{path}', 'nyan:cat*' ),
-			array( '\{path}', 'nyan:cat+' ),
-			array( '\{path}', 'nyan:cat?' ),
-			array( '\{path}', '!nyan:cat' ),
-			array( '\{path}', '!(nyan:cat|nyan:kitten)' ),
-			array( '\{path}', '!^nyan:cat' ),
-			array( '\{path}', '!(^nyan:cat|^nyan:kitten)' ),
-			array( '\{path}', '(nyan:cat)' ),
-			array( '\{function}', 'COUNT (?x)' ),
-			array( '\{function}', '?x + ?y' ),
-			array( '\{function}', '!BOUND (?x)' ),
-			array( '\{function}', '<http://www.example.com/test#nyan>' ),
+			array('\{variable}', '?abc'),
+			array('\{variable}', '$abc'),
+			array('AS \{variable}', 'AS ?nyan'),
+			array('\{iri}', 'http://www.example.com/test#'),
+			array('\{prefix}', 'foo_bar42'),
+			array('\{name}', 'foo_bar42'),
+			array('\{prefixed_iri}', '<http://www.example.com/test#>'),
+			array('\{prefixed_iri}', 'nyan:cat'),
+			array('\{native}', '123'),
+			array('\{native}', '"foo bar"'),
+			array('\{path}', 'nyan:cat'),
+			array('\{path}', '^nyan:cat'),
+			array('\{path}', 'nyan:cat'),
+			array('\{path}', 'nyan:cat/nyan:kitten'),
+			array('\{path}', 'nyan:cat/nyan:kitten/cat:kitten'),
+			array('\{path}', 'nyan:cat|nyan:kitten'),
+			array('\{path}', 'nyan:cat*'),
+			array('\{path}', 'nyan:cat+'),
+			array('\{path}', 'nyan:cat?'),
+			array('\{path}', '!nyan:cat'),
+			array('\{path}', '!(nyan:cat|nyan:kitten)'),
+			array('\{path}', '!^nyan:cat'),
+			array('\{path}', '!(^nyan:cat|^nyan:kitten)'),
+			array('\{path}', '(nyan:cat)'),
+			array('\{function}', 'COUNT (?x)'),
+			array('\{function}', '?x + ?y'),
+			array('\{function}', '!BOUND (?x)'),
+			array('\{function}', '<http://www.example.com/test#nyan>'),
 		);
 	}
 
 	/**
 	 * @dataProvider provideNonMatchingExpressions
 	 */
-	public function testMatchesRegex_nonMatching( $regex, $expression ) {
+	public function testMatchesRegex_nonMatching($regex, $expression) {
 		$regexHelper = new RegexHelper();
 
-		$this->assertFalse( $regexHelper->matchesRegex( $regex, $expression ) );
+		$this->assertFalse($regexHelper->matchesRegex($regex, $expression));
 	}
 
 	public function provideNonMatchingExpressions() {
 		return array(
-			array( '\{variable}', 'foobar' ),
-			array( '\{variable}', '?foo bar' ),
-			array( 'AS \{variable}', 'AS ?nyan foobar' ),
-			array( '\{iri}', '<http://www.example.com/test#>' ),
-			array( '\{iri}', 'http://www.example.com/te>st#' ),
-			array( '\{iri}', 'http://www.example.com/te}st#' ),
-			array( '\{iri}', 'http://www.example.com/te st#' ),
-			array( '\{prefix}', 'nyan cat' ),
-			array( '\{prefix}', 'nyan:cat' ),
-			array( '\{name}', 'nyan cat' ),
-			array( '\{name}', 'nyan:cat' ),
-			array( '\{prefixed_iri}', 'http://www.example.com/test#nyan' ),
-			array( '\{prefixed_iri}', 'nyan:cat:kitten' ),
-			array( '\{native}', '"abc' ),
-			array( '\{native}', 'ab123' ),
-			array( '\{path}', 'foobar' ),
-			array( '\{path}', '?foobar' ),
-			array( '\{path}', '^!nyan:cat' ),
-			array( '\{path}', '!!!nyan:cat' ),
-			array( '\{path}', '()' ),
-			array( '\{function}', 'FOO BAR' ),
-			array( '\{function}', '(COUNT (?x))' )
+			array('\{variable}', 'foobar'),
+			array('\{variable}', '?foo bar'),
+			array('AS \{variable}', 'AS ?nyan foobar'),
+			array('\{iri}', '<http://www.example.com/test#>'),
+			array('\{iri}', 'http://www.example.com/te>st#'),
+			array('\{iri}', 'http://www.example.com/te}st#'),
+			array('\{iri}', 'http://www.example.com/te st#'),
+			array('\{prefix}', 'nyan cat'),
+			array('\{prefix}', 'nyan:cat'),
+			array('\{name}', 'nyan cat'),
+			array('\{name}', 'nyan:cat'),
+			array('\{prefixed_iri}', 'http://www.example.com/test#nyan'),
+			array('\{prefixed_iri}', 'nyan:cat:kitten'),
+			array('\{native}', '"abc'),
+			array('\{native}', 'ab123'),
+			array('\{path}', 'foobar'),
+			array('\{path}', '?foobar'),
+			array('\{path}', '^!nyan:cat'),
+			array('\{path}', '!!!nyan:cat'),
+			array('\{path}', '()'),
+			array('\{function}', 'FOO BAR'),
+			array('\{function}', '(COUNT (?x))')
 		);
 	}
 
 	/**
 	 * @dataProvider provideGetMatches
 	 */
-	public function testGetMatches( $regex, $expression, $matches ) {
+	public function testGetMatches($regex, $expression, $matches) {
 		$regexHelper = new RegexHelper();
 
-		$this->assertEquals( $matches, $regexHelper->getMatches( $regex, $expression ) );
+		$this->assertEquals($matches, $regexHelper->getMatches($regex, $expression));
 	}
 
 	public function provideGetMatches() {
 		return array(
-			array( '\{variable}', ' ?abc nyan $def ', array( 'abc', 'def' ) ),
-			array( 'AS \{variable}', 'FOO (?x) AS ?nyan', array( 'nyan' ) ),
-			array( 'AS \{variable}', 'FOO (<http://www.example.com/test?kitten> = "X AS ?kitten") AS ?nyan', array( 'nyan' ) )
+			array('\{variable}', ' ?abc nyan $def ', array('abc', 'def')),
+			array('AS \{variable}', 'FOO (?x) AS ?nyan', array('nyan')),
+			array('AS \{variable}', 'FOO (<http://www.example.com/test?kitten> = "X AS ?kitten") AS ?nyan', array('nyan'))
 		);
 	}
 
 	/**
 	 * @dataProvider provideEscapeSequences
 	 */
-	public function testEscapeSequences( $expression, array $matches ) {
+	public function testEscapeSequences($expression, array $matches) {
 		$regexHelper = new RegexHelper();
-		$escaped = $regexHelper->escapeSequences( $expression, $replacements );
+		$escaped = $regexHelper->escapeSequences($expression, $replacements);
 
-		$this->assertEquals( $matches, array_values( $replacements ) );
-		$this->assertEquals( $expression, strtr( $escaped, $replacements ) );
+		$this->assertEquals($matches, array_values($replacements));
+		$this->assertEquals($expression, strtr($escaped, $replacements));
 	}
 
 	public function provideEscapeSequences() {
 		return array(
-			array( 'foo bar', array() ),
-			array( 'cat " kitten', array() ),
-			array( 'I\'m a "nyan cat" and this is cool', array( '"nyan cat"' ) ),
-			array( 'This is "so sweet" and it\'s a "nyan" cat', array( '"so sweet"', '"nyan"' ) ),
-			array( 'This <iri> is cool', array( '<iri>' ) ),
-			array( 'This <iri> is > confusing', array( '<iri>' ) ),
-			array( 'A "nyan cat" with <iri> 42', array( '"nyan cat"', '<iri>' ) ),
-			array( 'A "nyan <iri> cat" with 42', array( '"nyan <iri> cat"' ) ),
-			array( 'A "nyan <iri cat" with <iri> 42', array( '"nyan <iri cat"', '<iri>' ) )
+			array('foo bar', array()),
+			array('cat " kitten', array()),
+			array('I\'m a "nyan cat" and this is cool', array('"nyan cat"')),
+			array('This is "so sweet" and it\'s a "nyan" cat', array('"so sweet"', '"nyan"')),
+			array('This <iri> is cool', array('<iri>')),
+			array('This <iri> is > confusing', array('<iri>')),
+			array('A "nyan cat" with <iri> 42', array('"nyan cat"', '<iri>')),
+			array('A "nyan <iri> cat" with 42', array('"nyan <iri> cat"')),
+			array('A "nyan <iri cat" with <iri> 42', array('"nyan <iri cat"', '<iri>'))
 		);
 	}
 

tests/unit/QueryBuilderTest.php

Spacing +48 added lines, -48 removed lines

@@ -16,11 +16,11 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->select( '?a', '?b' )
+			$queryBuilder->select('?a', '?b')
 		);
 
 		// use variables ?a and ?b
-		$queryBuilder->where( '?a', '?b', '?c' );
+		$queryBuilder->where('?a', '?b', '?c');
 
 		$this->assertEquals(
 			'SELECT ?a ?b WHERE { ?a ?b ?c . }',
@@ -30,20 +30,20 @@ 
 
 	public function testSelect_invalidArgument() {
 		$queryBuilder = new QueryBuilder();
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException('InvalidArgumentException');
 
-		$queryBuilder->select( '?a', false );
+		$queryBuilder->select('?a', false);
 	}
 
 	public function testSelectDistinct() {
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->selectDistinct( '?a', '?b' )
+			$queryBuilder->selectDistinct('?a', '?b')
 		);
 
 		// use variables ?a and ?b
-		$queryBuilder->where( '?a', '?b', '?c' );
+		$queryBuilder->where('?a', '?b', '?c');
 
 		$this->assertEquals(
 			'SELECT DISTINCT ?a ?b WHERE { ?a ?b ?c . }',
@@ -55,11 +55,11 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->selectReduced( '?a', '?b' )
+			$queryBuilder->selectReduced('?a', '?b')
 		);
 
 		// use variables ?a and ?b
-		$queryBuilder->where( '?a', '?b', '?c' );
+		$queryBuilder->where('?a', '?b', '?c');
 
 		$this->assertEquals(
 			'SELECT REDUCED ?a ?b WHERE { ?a ?b ?c . }',
@@ -71,11 +71,11 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->describe( '?a', '?b', '<foo:bar>' )
+			$queryBuilder->describe('?a', '?b', '<foo:bar>')
 		);
 
 		// use variables ?a and ?b
-		$queryBuilder->where( '?a', '?b', '?c' );
+		$queryBuilder->where('?a', '?b', '?c');
 
 		$this->assertEquals(
 			'DESCRIBE ?a ?b <foo:bar> WHERE { ?a ?b ?c . }',
@@ -87,13 +87,13 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->describe( 'foo:bar' )
+			$queryBuilder->describe('foo:bar')
 		);
 
 		// use variables ?a and ?b
-		$queryBuilder->where( '?a', '?b', '?c' );
+		$queryBuilder->where('?a', '?b', '?c');
 
-		$this->setExpectedException( 'RangeException' );
+		$this->setExpectedException('RangeException');
 		$queryBuilder->getSPARQL();
 	}
 
@@ -101,18 +101,18 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->select( '?a', '?b' )
+			$queryBuilder->select('?a', '?b')
 		);
 
-		$this->setExpectedException( 'RuntimeException' );
-		$queryBuilder->describe( 'foo:bar' );
+		$this->setExpectedException('RuntimeException');
+		$queryBuilder->describe('foo:bar');
 	}
 
 	public function testWhere() {
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->where( '?a', '?b', '?c' )
+			$queryBuilder->where('?a', '?b', '?c')
 		);
 	}
 
@@ -120,25 +120,25 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->also( '?a', '?b', '?c' )
+			$queryBuilder->also('?a', '?b', '?c')
 		);
 	}
 
 	public function testAlso_knownSubject() {
 		$queryBuilder = new QueryBuilder();
-		$queryBuilder->where( '?a', '?b', '?c' );
+		$queryBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->also( '?x', '?y' )
+			$queryBuilder->also('?x', '?y')
 		);
 	}
 
 	public function testAlso_knownPredicate() {
 		$queryBuilder = new QueryBuilder();
-		$queryBuilder->where( '?a', '?b', '?c' );
+		$queryBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->also( '?z' )
+			$queryBuilder->also('?z')
 		);
 	}
 
@@ -146,7 +146,7 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->filter( 'AVG (?x) > 9' )
+			$queryBuilder->filter('AVG (?x) > 9')
 		);
 	}
 
@@ -154,7 +154,7 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->filterExists( $queryBuilder->newSubgraph() )
+			$queryBuilder->filterExists($queryBuilder->newSubgraph())
 		);
 	}
 
@@ -162,7 +162,7 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->filterNotExists( $queryBuilder->newSubgraph() )
+			$queryBuilder->filterNotExists($queryBuilder->newSubgraph())
 		);
 	}
 
@@ -170,7 +170,7 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->optional( '?a', '?b', '?c' )
+			$queryBuilder->optional('?a', '?b', '?c')
 		);
 	}
 
@@ -178,7 +178,7 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->union( $queryBuilder->newSubgraph() )
+			$queryBuilder->union($queryBuilder->newSubgraph())
 		);
 	}
 
@@ -186,29 +186,29 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->subquery( $queryBuilder->newSubquery() )
+			$queryBuilder->subquery($queryBuilder->newSubquery())
 		);
 	}
 
 	public function testNewSubquery() {
-		$queryBuilder = new QueryBuilder( array( 'a' => 'b' ) );
+		$queryBuilder = new QueryBuilder(array('a' => 'b'));
 		$this->assertEquals(
-			new QueryBuilder( array( 'a' => 'b' ) ),
+			new QueryBuilder(array('a' => 'b')),
 			$queryBuilder->newSubquery()
 		);
 	}
 
 	public function testNewSubgraph() {
 		$queryBuilder = new QueryBuilder();
-		$this->assertInstanceOf( 'Asparagus\GraphBuilder', $queryBuilder->newSubgraph() );
-		$this->assertNotSame( $queryBuilder->newSubgraph(), $queryBuilder->newSubgraph() );
+		$this->assertInstanceOf('Asparagus\GraphBuilder', $queryBuilder->newSubgraph());
+		$this->assertNotSame($queryBuilder->newSubgraph(), $queryBuilder->newSubgraph());
 	}
 
 	public function testGroupBy() {
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->groupBy( '?test' )
+			$queryBuilder->groupBy('?test')
 		);
 	}
 
@@ -216,7 +216,7 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->having( 'AVG(?size) > 10' )
+			$queryBuilder->having('AVG(?size) > 10')
 		);
 	}
 
@@ -224,7 +224,7 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->orderBy( '?test' )
+			$queryBuilder->orderBy('?test')
 		);
 	}
 
@@ -232,7 +232,7 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->limit( 5 )
+			$queryBuilder->limit(5)
 		);
 	}
 
@@ -240,52 +240,52 @@ 
 		$queryBuilder = new QueryBuilder();
 		$this->assertSame(
 			$queryBuilder,
-			$queryBuilder->offset( 5 )
+			$queryBuilder->offset(5)
 		);
 	}
 
 	public function testGetSPARQL() {
 		$queryBuilder = new QueryBuilder();
 
-		$this->assertEquals( 'SELECT * WHERE { }', $queryBuilder->getSPARQL() );
+		$this->assertEquals('SELECT * WHERE { }', $queryBuilder->getSPARQL());
 	}
 
 	public function testGetSPARQL_withPrefixes() {
-		$queryBuilder = new QueryBuilder( array( 'foo' => 'bar' ) );
+		$queryBuilder = new QueryBuilder(array('foo' => 'bar'));
 
-		$this->assertEquals( 'PREFIX foo: <bar> SELECT * WHERE { }', $queryBuilder->getSPARQL() );
+		$this->assertEquals('PREFIX foo: <bar> SELECT * WHERE { }', $queryBuilder->getSPARQL());
 	}
 
 	public function testGetSPARQL_noPrefixes() {
-		$queryBuilder = new QueryBuilder( array( 'foo' => 'bar' ) );
+		$queryBuilder = new QueryBuilder(array('foo' => 'bar'));
 
-		$this->assertEquals( 'SELECT * WHERE { }', $queryBuilder->getSPARQL( false ) );
+		$this->assertEquals('SELECT * WHERE { }', $queryBuilder->getSPARQL(false));
 	}
 
 	public function testGetSPARQL_undefinedVariable() {
 		$queryBuilder = new QueryBuilder();
-		$this->setExpectedException( 'RangeException', '?x' );
+		$this->setExpectedException('RangeException', '?x');
 
-		$queryBuilder->select( '?x' )->getSPARQL();
+		$queryBuilder->select('?x')->getSPARQL();
 	}
 
 	public function testGetSPARQL_undefinedPrefix() {
 		$queryBuilder = new QueryBuilder();
-		$this->setExpectedException( 'RangeException', 'foo, nyan' );
+		$this->setExpectedException('RangeException', 'foo, nyan');
 
-		$queryBuilder->where( '?x', 'foo:bar', 'nyan:data' )->getSPARQL();
+		$queryBuilder->where('?x', 'foo:bar', 'nyan:data')->getSPARQL();
 	}
 
 	public function testToString() {
 		$queryBuilder = new QueryBuilder();
 
-		$this->assertEquals( 'SELECT * WHERE { }', strval( $queryBuilder ) );
+		$this->assertEquals('SELECT * WHERE { }', strval($queryBuilder));
 	}
 
 	public function testFormat() {
 		$queryBuilder = new QueryBuilder();
 
-		$this->assertEquals( "SELECT * WHERE {\n}\n", $queryBuilder->format() );
+		$this->assertEquals("SELECT * WHERE {\n}\n", $queryBuilder->format());
 	}
 
 }

tests/unit/UsageValidatorTest.php

Spacing +38 added lines, -38 removed lines

@@ -15,23 +15,23 @@ 
 	/**
 	 * @dataProvider provideDataOk
 	 */
-	public function testValidate_variablesOk( array $defined, array $used ) {
+	public function testValidate_variablesOk(array $defined, array $used) {
 		$usageValidator = new UsageValidator();
-		$usageValidator->trackDefinedVariables( $defined );
-		$usageValidator->trackUsedVariables( $used );
+		$usageValidator->trackDefinedVariables($defined);
+		$usageValidator->trackUsedVariables($used);
 		$usageValidator->validate();
 
-		$this->assertTrue( true );
+		$this->assertTrue(true);
 	}
 
 	/**
 	 * @dataProvider provideDataInvalid
 	 */
-	public function testValidate_variablesInvalid( array $defined, array $used ) {
+	public function testValidate_variablesInvalid(array $defined, array $used) {
 		$usageValidator = new UsageValidator();
-		$usageValidator->trackDefinedVariables( $defined );
-		$usageValidator->trackUsedVariables( $used );
-		$this->setExpectedException( 'RangeException' );
+		$usageValidator->trackDefinedVariables($defined);
+		$usageValidator->trackUsedVariables($used);
+		$this->setExpectedException('RangeException');
 
 		$usageValidator->validate();
 	}
@@ -39,82 +39,82 @@ 
 	/**
 	 * @dataProvider provideDataOk
 	 */
-	public function testValidate_prefixesOk( array $defined, array $used ) {
+	public function testValidate_prefixesOk(array $defined, array $used) {
 		$usageValidator = new UsageValidator();
-		$usageValidator->trackDefinedPrefixes( $defined );
-		$usageValidator->trackUsedPrefixes( $used );
+		$usageValidator->trackDefinedPrefixes($defined);
+		$usageValidator->trackUsedPrefixes($used);
 		$usageValidator->validate();
 
-		$this->assertTrue( true );
+		$this->assertTrue(true);
 	}
 
 	/**
 	 * @dataProvider provideDataInvalid
 	 */
-	public function testValidate_prefixesInvalid( array $defined, array $used ) {
+	public function testValidate_prefixesInvalid(array $defined, array $used) {
 		$usageValidator = new UsageValidator();
-		$usageValidator->trackDefinedPrefixes( $defined );
-		$usageValidator->trackUsedPrefixes( $used );
-		$this->setExpectedException( 'RangeException' );
+		$usageValidator->trackDefinedPrefixes($defined);
+		$usageValidator->trackUsedPrefixes($used);
+		$this->setExpectedException('RangeException');
 
 		$usageValidator->validate();
 	}
 
 	public function provideDataOk() {
 		return array(
-			array( array(), array() ),
-			array( array( 'foo', 'bar' ), array() ),
-			array( array( 'foo', 'bar' ), array( 'foo' ) ),
-			array( array( 'foo', 'bar' ), array( 'foo', 'bar' ) ),
+			array(array(), array()),
+			array(array('foo', 'bar'), array()),
+			array(array('foo', 'bar'), array('foo')),
+			array(array('foo', 'bar'), array('foo', 'bar')),
 		);
 	}
 
 	public function provideDataInvalid() {
 		return array(
-			array( array(), array( 'foo', 'bar' ) ),
-			array( array( 'foo' ), array( 'foo', 'bar' ) ),
-			array( array( 'bar' ), array( 'foo', 'bar' ) ),
+			array(array(), array('foo', 'bar')),
+			array(array('foo'), array('foo', 'bar')),
+			array(array('bar'), array('foo', 'bar')),
 		);
 	}
 
 	/**
 	 * @dataProvider provideTrackVariablesParsing
 	 */
-	public function testTrackVariablesParsing( $input, $expected ) {
+	public function testTrackVariablesParsing($input, $expected) {
 		$usageValidator = new UsageValidator();
-		$usageValidator->trackUsedVariables( $input );
-		$this->setExpectedException( 'RangeException', $expected );
+		$usageValidator->trackUsedVariables($input);
+		$this->setExpectedException('RangeException', $expected);
 
 		$usageValidator->validate();
 	}
 
 	public function provideTrackVariablesParsing() {
 		return array(
-			array( 'foo ?abc bar', '?abc' ),
-			array( 'foo $abc bar', '?abc' ),
-			array( '?foo abc $bar', '?foo, ?bar' ),
-			array( 'foo.?abc', '?abc' ),
-			array( '?foo$bar', '?foo' ),
-			array( '?foo AS ?bar', '?foo' )
+			array('foo ?abc bar', '?abc'),
+			array('foo $abc bar', '?abc'),
+			array('?foo abc $bar', '?foo, ?bar'),
+			array('foo.?abc', '?abc'),
+			array('?foo$bar', '?foo'),
+			array('?foo AS ?bar', '?foo')
 		);
 	}
 
 	/**
 	 * @dataProvider provideTrackPrefixesParsing
 	 */
-	public function testTrackPrefixesParsing( $input, $expected ) {
+	public function testTrackPrefixesParsing($input, $expected) {
 		$usageValidator = new UsageValidator();
-		$usageValidator->trackUsedPrefixes( $input );
-		$this->setExpectedException( 'RangeException', $expected );
+		$usageValidator->trackUsedPrefixes($input);
+		$this->setExpectedException('RangeException', $expected);
 
 		$usageValidator->validate();
 	}
 
 	public function provideTrackPrefixesParsing() {
 		return array(
-			array( 'abc foo:bar def', array( 'foo' ) ),
-			array( 'foo:abc xxx bar:def', array( 'foo', 'bar' ) ),
-			array( 'abc.foo:bar', array( 'foo' ) )
+			array('abc foo:bar def', array('foo')),
+			array('foo:abc xxx bar:def', array('foo', 'bar')),
+			array('abc.foo:bar', array('foo'))
 		);
 	}
 

tests/unit/GraphBuilderTest.php

Spacing +67 added lines, -67 removed lines

@@ -15,183 +15,183 @@
 class GraphBuilderTest extends \PHPUnit_Framework_TestCase {
 
 	public function testWhere() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->where( '?a', '?b', '?c' )
+			$graphBuilder->where('?a', '?b', '?c')
 		);
 
-		$this->assertEquals( ' ?a ?b ?c .', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' ?a ?b ?c .', $graphBuilder->getSPARQL());
 	}
 
 	public function testWhere_invalidSubject() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$graphBuilder->where( null, '?b', '?c' );
+		$graphBuilder->where(null, '?b', '?c');
 	}
 
 	public function testWhere_invalidPredicate() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$graphBuilder->where( '?a', null, '?c' );
+		$graphBuilder->where('?a', null, '?c');
 	}
 
 	public function testWhere_invalidObject() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$graphBuilder->where( '?a', '?b', null );
+		$graphBuilder->where('?a', '?b', null);
 	}
 
 	public function testAlso_knownSubject() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$graphBuilder->where( '?a', '?b', '?c' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$graphBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->also( '?x', '?y' )
+			$graphBuilder->also('?x', '?y')
 		);
 
-		$this->assertEquals( ' ?a ?b ?c ; ?x ?y .', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' ?a ?b ?c ; ?x ?y .', $graphBuilder->getSPARQL());
 	}
 
 	public function testAlso_knownPredicate() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$graphBuilder->where( '?a', '?b', '?c' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$graphBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->also( '?x' )
+			$graphBuilder->also('?x')
 		);
 
-		$this->assertEquals( ' ?a ?b ?c , ?x .', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' ?a ?b ?c , ?x .', $graphBuilder->getSPARQL());
 	}
 
 	public function testAlso_unknownSubject() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$graphBuilder->also( '?x', '?y' );
+		$graphBuilder->also('?x', '?y');
 	}
 
 	public function testAlso_unknownPredicate() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$graphBuilder->also( '?y' );
+		$graphBuilder->also('?y');
 	}
 
 	public function testFilter() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->filter( 'AVG (?x) > 5' )
+			$graphBuilder->filter('AVG (?x) > 5')
 		);
 
-		$this->assertEquals( ' FILTER (AVG (?x) > 5)', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' FILTER (AVG (?x) > 5)', $graphBuilder->getSPARQL());
 	}
 
 	public function testFilter_invalidExpression() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$graphBuilder->filter( 'FooBar' );
+		$graphBuilder->filter('FooBar');
 	}
 
 	public function testFilterExists() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$graphBuilder->where( '?a', '?b', '?c' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$graphBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->filterExists( $graphBuilder )
+			$graphBuilder->filterExists($graphBuilder)
 		);
 
-		$this->assertEquals( ' ?a ?b ?c . FILTER EXISTS { ?a ?b ?c . }', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' ?a ?b ?c . FILTER EXISTS { ?a ?b ?c . }', $graphBuilder->getSPARQL());
 	}
 
 	public function testFilterExists_triple() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->filterExists( '?a', '?b', '?c' )
+			$graphBuilder->filterExists('?a', '?b', '?c')
 		);
 
-		$this->assertEquals( ' FILTER EXISTS { ?a ?b ?c . }', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' FILTER EXISTS { ?a ?b ?c . }', $graphBuilder->getSPARQL());
 	}
 
 	public function testFilterNotExists() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$graphBuilder->where( '?a', '?b', '?c' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$graphBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->filterNotExists( $graphBuilder )
+			$graphBuilder->filterNotExists($graphBuilder)
 		);
 
-		$this->assertEquals( ' ?a ?b ?c . FILTER NOT EXISTS { ?a ?b ?c . }', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' ?a ?b ?c . FILTER NOT EXISTS { ?a ?b ?c . }', $graphBuilder->getSPARQL());
 	}
 
 	public function testFilterNotExists_triple() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->filterNotExists( '?a', '?b', '?c' )
+			$graphBuilder->filterNotExists('?a', '?b', '?c')
 		);
 
-		$this->assertEquals( ' FILTER NOT EXISTS { ?a ?b ?c . }', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' FILTER NOT EXISTS { ?a ?b ?c . }', $graphBuilder->getSPARQL());
 	}
 
 	public function testOptional() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$graphBuilder->where( '?a', '?b', '?c' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$graphBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->optional( $graphBuilder )
+			$graphBuilder->optional($graphBuilder)
 		);
 
-		$this->assertEquals( ' ?a ?b ?c . OPTIONAL { ?a ?b ?c . }', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' ?a ?b ?c . OPTIONAL { ?a ?b ?c . }', $graphBuilder->getSPARQL());
 	}
 
 	public function testOptional_triple() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->optional( '?a', '?b', '?c' )
+			$graphBuilder->optional('?a', '?b', '?c')
 		);
 
-		$this->assertEquals( ' OPTIONAL { ?a ?b ?c . }', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' OPTIONAL { ?a ?b ?c . }', $graphBuilder->getSPARQL());
 	}
 
 	public function testUnion() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$graphBuilder->where( '?a', '?b', '?c' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$graphBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->union( $graphBuilder, $graphBuilder )
+			$graphBuilder->union($graphBuilder, $graphBuilder)
 		);
 
-		$this->assertEquals( ' ?a ?b ?c . { ?a ?b ?c . } UNION { ?a ?b ?c . }', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' ?a ?b ?c . { ?a ?b ?c . } UNION { ?a ?b ?c . }', $graphBuilder->getSPARQL());
 	}
 
 	public function testSubquery() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
 		$queryBuilder = new QueryBuilder();
-		$queryBuilder->where( '?a', '?b', '?c' );
+		$queryBuilder->where('?a', '?b', '?c');
 		$this->assertSame(
 			$graphBuilder,
-			$graphBuilder->subquery( $queryBuilder )
+			$graphBuilder->subquery($queryBuilder)
 		);
 
-		$this->assertEquals( ' { SELECT * WHERE { ?a ?b ?c . } }', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' { SELECT * WHERE { ?a ?b ?c . } }', $graphBuilder->getSPARQL());
 	}
 
 	public function testGetSPARQL() {
-		$graphBuilder = new GraphBuilder( new UsageValidator() );
-		$graphBuilder->where( '?a', '?b', '?c' );
-		$graphBuilder->also( '?x', '?y' );
-		$graphBuilder->also( '?z' );
-		$graphBuilder->where( '?a', '?b', '?z' );
+		$graphBuilder = new GraphBuilder(new UsageValidator());
+		$graphBuilder->where('?a', '?b', '?c');
+		$graphBuilder->also('?x', '?y');
+		$graphBuilder->also('?z');
+		$graphBuilder->where('?a', '?b', '?z');
 
-		$this->assertEquals( ' ?a ?b ?c , ?z ; ?x ?y , ?z .', $graphBuilder->getSPARQL() );
+		$this->assertEquals(' ?a ?b ?c , ?z ; ?x ?y , ?z .', $graphBuilder->getSPARQL());
 	}
 
 }

tests/unit/ExpressionValidatorTest.php

Spacing +54 added lines, -54 removed lines

@@ -15,84 +15,84 @@
 	/**
 	 * @dataProvider provideValidExpressions
 	 */
-	public function testValidate_validExpressions( $expression, $options ) {
+	public function testValidate_validExpressions($expression, $options) {
 		$expressionValidator = new ExpressionValidator();
-		$expressionValidator->validate( $expression, $options );
+		$expressionValidator->validate($expression, $options);
 
-		$this->assertTrue( true );
+		$this->assertTrue(true);
 	}
 
 	public function provideValidExpressions() {
 		return array(
-			array( '?a', ExpressionValidator::VALIDATE_VARIABLE ),
-			array( '$b', ExpressionValidator::VALIDATE_VARIABLE ),
-			array( 'http://www.example.com/test#', ExpressionValidator::VALIDATE_IRI ),
-			array( 'abc', ExpressionValidator::VALIDATE_PREFIX ),
-			array( 'test:FooBar', ExpressionValidator::VALIDATE_PREFIXED_IRI ),
-			array( '<http://www.example.com/test#>', ExpressionValidator::VALIDATE_PREFIXED_IRI ),
-			array( '123', ExpressionValidator::VALIDATE_NATIVE ),
-			array( '"Foo bar"', ExpressionValidator::VALIDATE_NATIVE ),
-			array( 'foaf:knows/foaf:name', ExpressionValidator::VALIDATE_PATH ),
-			array( 'foaf:knows/foaf:knows/foaf:name', ExpressionValidator::VALIDATE_PATH ),
-			array( 'foaf:knows/^foaf:knows', ExpressionValidator::VALIDATE_PATH ),
-			array( 'foaf:knows+/foaf:name', ExpressionValidator::VALIDATE_PATH ),
-			array( '(ex:motherOf|ex:fatherOf)+', ExpressionValidator::VALIDATE_PATH ),
-			array( 'rdf:type/rdfs:subClassOf*', ExpressionValidator::VALIDATE_PATH ),
-			array( '^rdf:type', ExpressionValidator::VALIDATE_PATH ),
-			array( '!(rdf:type|^rdf:type)', ExpressionValidator::VALIDATE_PATH ),
-			array( 'CONTAINS (?x, "test"^^xsd:string)', ExpressionValidator::VALIDATE_FUNCTION ),
-			array( '?abc', ExpressionValidator::VALIDATE_FUNCTION ),
-			array( '?x + ?y > ?z', ExpressionValidator::VALIDATE_FUNCTION ),
-			array( '?x * ?x < ?y', ExpressionValidator::VALIDATE_FUNCTION ),
-			array( 'CONTAINS (?x, ")))"^^xsd:string)', ExpressionValidator::VALIDATE_FUNCTION ),
-			array( '<http://www.example.com/test#nyan> ?p ?q', ExpressionValidator::VALIDATE_FUNCTION ),
-			array( '(COUNT (?x) AS ?count)', ExpressionValidator::VALIDATE_FUNCTION_AS ),
+			array('?a', ExpressionValidator::VALIDATE_VARIABLE),
+			array('$b', ExpressionValidator::VALIDATE_VARIABLE),
+			array('http://www.example.com/test#', ExpressionValidator::VALIDATE_IRI),
+			array('abc', ExpressionValidator::VALIDATE_PREFIX),
+			array('test:FooBar', ExpressionValidator::VALIDATE_PREFIXED_IRI),
+			array('<http://www.example.com/test#>', ExpressionValidator::VALIDATE_PREFIXED_IRI),
+			array('123', ExpressionValidator::VALIDATE_NATIVE),
+			array('"Foo bar"', ExpressionValidator::VALIDATE_NATIVE),
+			array('foaf:knows/foaf:name', ExpressionValidator::VALIDATE_PATH),
+			array('foaf:knows/foaf:knows/foaf:name', ExpressionValidator::VALIDATE_PATH),
+			array('foaf:knows/^foaf:knows', ExpressionValidator::VALIDATE_PATH),
+			array('foaf:knows+/foaf:name', ExpressionValidator::VALIDATE_PATH),
+			array('(ex:motherOf|ex:fatherOf)+', ExpressionValidator::VALIDATE_PATH),
+			array('rdf:type/rdfs:subClassOf*', ExpressionValidator::VALIDATE_PATH),
+			array('^rdf:type', ExpressionValidator::VALIDATE_PATH),
+			array('!(rdf:type|^rdf:type)', ExpressionValidator::VALIDATE_PATH),
+			array('CONTAINS (?x, "test"^^xsd:string)', ExpressionValidator::VALIDATE_FUNCTION),
+			array('?abc', ExpressionValidator::VALIDATE_FUNCTION),
+			array('?x + ?y > ?z', ExpressionValidator::VALIDATE_FUNCTION),
+			array('?x * ?x < ?y', ExpressionValidator::VALIDATE_FUNCTION),
+			array('CONTAINS (?x, ")))"^^xsd:string)', ExpressionValidator::VALIDATE_FUNCTION),
+			array('<http://www.example.com/test#nyan> ?p ?q', ExpressionValidator::VALIDATE_FUNCTION),
+			array('(COUNT (?x) AS ?count)', ExpressionValidator::VALIDATE_FUNCTION_AS),
 		);
 	}
 
 	/**
 	 * @dataProvider provideInvalidExpressions
 	 */
-	public function testValidate_invalidExpressions( $expression, $options, $errorMessage ) {
+	public function testValidate_invalidExpressions($expression, $options, $errorMessage) {
 		$expressionValidator = new ExpressionValidator();
-		$this->setExpectedException( 'InvalidArgumentException', $errorMessage );
+		$this->setExpectedException('InvalidArgumentException', $errorMessage);
 
-		$expressionValidator->validate( $expression, $options );
+		$expressionValidator->validate($expression, $options);
 	}
 
 	public function provideInvalidExpressions() {
 		return array(
-			array( 'nyan', ExpressionValidator::VALIDATE_VARIABLE, 'variable' ),
-			array( '<http://www.example.com/test#>', ExpressionValidator::VALIDATE_IRI, 'IRI' ),
-			array( 'http://www.example.com/test#> foo bar', ExpressionValidator::VALIDATE_IRI, 'IRI' ),
-			array( '<abc><>', ExpressionValidator::VALIDATE_IRI, 'IRI' ),
-			array( 'http://www.example.com/te st#', ExpressionValidator::VALIDATE_IRI, 'IRI' ),
-			array( 'http://www.example.com/test#ab\cd', ExpressionValidator::VALIDATE_IRI, 'IRI' ),
-			array( 'http://www.example.com/test#ab|cd', ExpressionValidator::VALIDATE_IRI, 'IRI' ),
-			array( 'ab:cd', ExpressionValidator::VALIDATE_PREFIX, 'prefix' ),
-			array( 'ab/cd', ExpressionValidator::VALIDATE_PREFIX, 'prefix' ),
-			array( 'ab cd', ExpressionValidator::VALIDATE_PREFIX, 'prefix' ),
-			array( 'foobar', ExpressionValidator::VALIDATE_PREFIXED_IRI, 'prefixed IRI' ),
-			array( 'test:Foo:Bar', ExpressionValidator::VALIDATE_PREFIXED_IRI, 'prefixed IRI' ),
-			array( '"abc', ExpressionValidator::VALIDATE_NATIVE, 'native' ),
-			array( 'abc123', ExpressionValidator::VALIDATE_NATIVE, 'native' ),
-			array( 'foobar (?x > ?y)', ExpressionValidator::VALIDATE_FUNCTION, 'function' ),
-			array( '(RAND ())', ExpressionValidator::VALIDATE_FUNCTION, 'function' ),
-			array( 'COUNT (?x) + 5) * ?a', ExpressionValidator::VALIDATE_FUNCTION, 'function' ),
-			array( 'CONTAINS (?x, "test"^^xsd:string)', ExpressionValidator::VALIDATE_FUNCTION_AS, 'function with variable assignment' ),
-			array( '?x + ?y > ?z', ExpressionValidator::VALIDATE_FUNCTION_AS, 'function with variable assignment' ),
-			array( ' AS ?abc', ExpressionValidator::VALIDATE_FUNCTION_AS, 'function with variable assignment' ),
-			array( 'COUNT (?x) AS ?count', ExpressionValidator::VALIDATE_FUNCTION_AS, 'function with variable assignment' ),
-			array( '', ExpressionValidator::VALIDATE_ALL, 'or a' ),
-			array( '     ', ExpressionValidator::VALIDATE_ALL, 'or a' ),
+			array('nyan', ExpressionValidator::VALIDATE_VARIABLE, 'variable'),
+			array('<http://www.example.com/test#>', ExpressionValidator::VALIDATE_IRI, 'IRI'),
+			array('http://www.example.com/test#> foo bar', ExpressionValidator::VALIDATE_IRI, 'IRI'),
+			array('<abc><>', ExpressionValidator::VALIDATE_IRI, 'IRI'),
+			array('http://www.example.com/te st#', ExpressionValidator::VALIDATE_IRI, 'IRI'),
+			array('http://www.example.com/test#ab\cd', ExpressionValidator::VALIDATE_IRI, 'IRI'),
+			array('http://www.example.com/test#ab|cd', ExpressionValidator::VALIDATE_IRI, 'IRI'),
+			array('ab:cd', ExpressionValidator::VALIDATE_PREFIX, 'prefix'),
+			array('ab/cd', ExpressionValidator::VALIDATE_PREFIX, 'prefix'),
+			array('ab cd', ExpressionValidator::VALIDATE_PREFIX, 'prefix'),
+			array('foobar', ExpressionValidator::VALIDATE_PREFIXED_IRI, 'prefixed IRI'),
+			array('test:Foo:Bar', ExpressionValidator::VALIDATE_PREFIXED_IRI, 'prefixed IRI'),
+			array('"abc', ExpressionValidator::VALIDATE_NATIVE, 'native'),
+			array('abc123', ExpressionValidator::VALIDATE_NATIVE, 'native'),
+			array('foobar (?x > ?y)', ExpressionValidator::VALIDATE_FUNCTION, 'function'),
+			array('(RAND ())', ExpressionValidator::VALIDATE_FUNCTION, 'function'),
+			array('COUNT (?x) + 5) * ?a', ExpressionValidator::VALIDATE_FUNCTION, 'function'),
+			array('CONTAINS (?x, "test"^^xsd:string)', ExpressionValidator::VALIDATE_FUNCTION_AS, 'function with variable assignment'),
+			array('?x + ?y > ?z', ExpressionValidator::VALIDATE_FUNCTION_AS, 'function with variable assignment'),
+			array(' AS ?abc', ExpressionValidator::VALIDATE_FUNCTION_AS, 'function with variable assignment'),
+			array('COUNT (?x) AS ?count', ExpressionValidator::VALIDATE_FUNCTION_AS, 'function with variable assignment'),
+			array('', ExpressionValidator::VALIDATE_ALL, 'or a'),
+			array('     ', ExpressionValidator::VALIDATE_ALL, 'or a'),
 		);
 	}
 
 	public function testValidate_invalidArgument() {
 		$expressionValidator = new ExpressionValidator();
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException('InvalidArgumentException');
 
-		$expressionValidator->validate( null, ExpressionValidator::VALIDATE_ALL );
+		$expressionValidator->validate(null, ExpressionValidator::VALIDATE_ALL);
 	}
 
 }