Benestar / asparagus

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);
 	}
 
 }

tests/unit/QueryPrefixBuilderTest.php

Spacing +7 added lines, -7 removed lines

@@ -19,25 +19,25 @@
 	);
 
 	public function testConstructor() {
-		$prefixBuilder = new QueryPrefixBuilder( self::$prefixes, new UsageValidator() );
+		$prefixBuilder = new QueryPrefixBuilder(self::$prefixes, new UsageValidator());
 
-		$this->assertEquals( self::$prefixes, $prefixBuilder->getPrefixes() );
+		$this->assertEquals(self::$prefixes, $prefixBuilder->getPrefixes());
 	}
 
 	public function testConstructor_invalidIRI() {
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException('InvalidArgumentException');
 
-		new QueryPrefixBuilder( array( 'bar' => null ), new UsageValidator() );
+		new QueryPrefixBuilder(array('bar' => null), new UsageValidator());
 	}
 
 	public function testConstructor_invalidPrefix() {
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$this->setExpectedException('InvalidArgumentException');
 
-		new QueryPrefixBuilder( array( 4 => 'http://foo.bar.com/nyan#' ), new UsageValidator() );
+		new QueryPrefixBuilder(array(4 => 'http://foo.bar.com/nyan#'), new UsageValidator());
 	}
 
 	public function testGetSPARQL() {
-		$prefixBuilder = new QueryPrefixBuilder( self::$prefixes, new UsageValidator() );
+		$prefixBuilder = new QueryPrefixBuilder(self::$prefixes, new UsageValidator());
 
 		$this->assertEquals(
 			'PREFIX test: <http://www.example.com/test#> PREFIX foo: <http://www.foo.org/bar#> ',

tests/unit/QueryModifierBuilderTest.php

Spacing +36 added lines, -36 removed lines

@@ -14,87 +14,87 @@
 class QueryModifierBuilderTest extends \PHPUnit_Framework_TestCase {
 
 	public function testGroupByModifier() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$queryBuilder->groupBy( array( '?test' ) );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$queryBuilder->groupBy(array('?test'));
 
-		$this->assertEquals( ' GROUP BY ?test', $queryBuilder->getSPARQL() );
+		$this->assertEquals(' GROUP BY ?test', $queryBuilder->getSPARQL());
 	}
 
 	public function testGroupByModifier_invalidArgument() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$queryBuilder->groupBy( array( null ) );
+		$queryBuilder->groupBy(array(null));
 	}
 
 	public function testHavingModifier() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$queryBuilder->having( '?test' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$queryBuilder->having('?test');
 
-		$this->assertEquals( ' HAVING (?test)', $queryBuilder->getSPARQL() );
+		$this->assertEquals(' HAVING (?test)', $queryBuilder->getSPARQL());
 	}
 
 	public function testHavingModifier_invalidArgument() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$queryBuilder->having( null );
+		$queryBuilder->having(null);
 	}
 
 	public function testOrderByModifier() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$queryBuilder->orderBy( '?test' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$queryBuilder->orderBy('?test');
 
-		$this->assertEquals( ' ORDER BY ASC (?test)', $queryBuilder->getSPARQL() );
+		$this->assertEquals(' ORDER BY ASC (?test)', $queryBuilder->getSPARQL());
 	}
 
 	public function testOrderByDescModifier() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$queryBuilder->orderBy( '?test', 'DESC' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$queryBuilder->orderBy('?test', 'DESC');
 
-		$this->assertEquals( ' ORDER BY DESC (?test)', $queryBuilder->getSPARQL() );
+		$this->assertEquals(' ORDER BY DESC (?test)', $queryBuilder->getSPARQL());
 	}
 
 	public function testOrderByModifier_invalidArgument() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$queryBuilder->orderBy( null );
+		$queryBuilder->orderBy(null);
 	}
 
 	public function testOrderByModifier_invalidDirection() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$queryBuilder->orderBy( '?test', 'FOO' );
+		$queryBuilder->orderBy('?test', 'FOO');
 	}
 
 	public function testLimitModifier() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$queryBuilder->limit( 42 );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$queryBuilder->limit(42);
 
-		$this->assertEquals( ' LIMIT 42', $queryBuilder->getSPARQL() );
+		$this->assertEquals(' LIMIT 42', $queryBuilder->getSPARQL());
 	}
 
 	public function testLimitModifier_invalidArgument() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$queryBuilder->limit( null );
+		$queryBuilder->limit(null);
 	}
 
 	public function testOffsetModifier() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$queryBuilder->offset( 42 );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$queryBuilder->offset(42);
 
-		$this->assertEquals( ' OFFSET 42', $queryBuilder->getSPARQL() );
+		$this->assertEquals(' OFFSET 42', $queryBuilder->getSPARQL());
 	}
 
 	public function testOffsetModifier_invalidArgument() {
-		$queryBuilder = new QueryModifierBuilder( new UsageValidator() );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$queryBuilder = new QueryModifierBuilder(new UsageValidator());
+		$this->setExpectedException('InvalidArgumentException');
 
-		$queryBuilder->offset( null );
+		$queryBuilder->offset(null);
 	}
 
 }

tests/unit/QueryFormatterTest.php

Spacing +8 added lines, -8 removed lines

@@ -15,20 +15,20 @@
 	/**
 	 * @dataProvider provideTestFormat
 	 */
-	public function testFormat( $expected, $input ) {
+	public function testFormat($expected, $input) {
 		$formatter = new QueryFormatter();
 
-		$this->assertEquals( $expected, $formatter->format( $input ) );
+		$this->assertEquals($expected, $formatter->format($input));
 	}
 
 	public function provideTestFormat() {
 		return array(
-			'new line before prefix' => array( "PREFIX abc\nPREFIX\n", 'PREFIX abc PREFIX' ),
-			'new lines before select' => array( "foobar\n\nSELECT xyz\n", 'foobar SELECT xyz' ),
-			'new line after brackets' => array( "abc {\n}\ndef\n", 'abc { } def' ),
-			'indentation by brackets' => array( "{\n\t{\n\t\tfoobar .\n\t}\n\tnyan .\n}\n", '{ { foobar . } nyan . }' ),
-			'strings get escaped' => array( '"abc { def } hij" <abc { xyy > <"a{2>' . "\n", '"abc { def } hij" <abc { xyy > <"a{2>' ),
-			'spaces before characters' => array( "a .\nb =c (d <e {\n\tf ?g \$h\n", 'a.b=c(d<e{f?g$h' )
+			'new line before prefix' => array("PREFIX abc\nPREFIX\n", 'PREFIX abc PREFIX'),
+			'new lines before select' => array("foobar\n\nSELECT xyz\n", 'foobar SELECT xyz'),
+			'new line after brackets' => array("abc {\n}\ndef\n", 'abc { } def'),
+			'indentation by brackets' => array("{\n\t{\n\t\tfoobar .\n\t}\n\tnyan .\n}\n", '{ { foobar . } nyan . }'),
+			'strings get escaped' => array('"abc { def } hij" <abc { xyy > <"a{2>' . "\n", '"abc { def } hij" <abc { xyy > <"a{2>'),
+			'spaces before characters' => array("a .\nb =c (d <e {\n\tf ?g \$h\n", 'a.b=c(d<e{f?g$h')
 		);
 	}
 

src/Http.php

Spacing +13 added lines, -13 removed lines

@@ -20,15 +20,15 @@ 
 	/**
 	 * @param string $userAgent
 	 */
-	public function __construct( $userAgent ) {
+	public function __construct($userAgent) {
 		$this->ch = curl_init();
-		curl_setopt( $this->ch, CURLOPT_USERAGENT, $userAgent );
-		curl_setopt( $this->ch, CURLOPT_RETURNTRANSFER, true );
-		curl_setopt( $this->ch, CURLOPT_FOLLOWLOCATION, true );
+		curl_setopt($this->ch, CURLOPT_USERAGENT, $userAgent);
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($this->ch, CURLOPT_FOLLOWLOCATION, true);
 	}
 
 	public function __destruct() {
-		curl_close( $this->ch );
+		curl_close($this->ch);
 	}
 
 	/**
@@ -37,16 +37,16 @@ 
 	 * @return string
 	 * @throws RuntimeException
 	 */
-	public function request( $url, array $params = array() ) {
-		curl_setopt( $this->ch, CURLOPT_URL, $url . '?' . http_build_query( $params ) );
-		curl_setopt( $this->ch, CURLOPT_HTTPGET, true );
+	public function request($url, array $params = array()) {
+		curl_setopt($this->ch, CURLOPT_URL, $url . '?' . http_build_query($params));
+		curl_setopt($this->ch, CURLOPT_HTTPGET, true);
 
-		$response = curl_exec( $this->ch );
+		$response = curl_exec($this->ch);
 
-		if ( curl_errno( $this->ch ) ) {
-			throw new RuntimeException( curl_error( $this->ch ), curl_errno( $this->ch ) );
-		} else if ( curl_getinfo( $this->ch, CURLINFO_HTTP_CODE ) >= 400 ) {
-			throw new RuntimeException( 'HTTP error: ' . $url, curl_getinfo( $this->ch, CURLINFO_HTTP_CODE ) );
+		if (curl_errno($this->ch)) {
+			throw new RuntimeException(curl_error($this->ch), curl_errno($this->ch));
+		} else if (curl_getinfo($this->ch, CURLINFO_HTTP_CODE) >= 400) {
+			throw new RuntimeException('HTTP error: ' . $url, curl_getinfo($this->ch, CURLINFO_HTTP_CODE));
 		}
 
 		return $response;

src/QueryModifierBuilder.php

Spacing +27 added lines, -27 removed lines

@@ -27,7 +27,7 @@ 
 	 */
 	private $usageValidator;
 
-	public function __construct( UsageValidator $usageValidator ) {
+	public function __construct(UsageValidator $usageValidator) {
 		$this->expressionValidator = new ExpressionValidator();
 		$this->usageValidator = $usageValidator;
 	}
@@ -37,16 +37,16 @@ 
 	 *
 	 * @param string[] $expressions
 	 */
-	public function groupBy( array $expressions )  {
-		foreach ( $expressions as $expression ) {
-			$this->expressionValidator->validate( $expression,
+	public function groupBy(array $expressions) {
+		foreach ($expressions as $expression) {
+			$this->expressionValidator->validate($expression,
 				ExpressionValidator::VALIDATE_VARIABLE | ExpressionValidator::VALIDATE_FUNCTION_AS
 			);
 		}
 
-		$expression = implode( ' ', $expressions );
-		$this->usageValidator->trackUsedPrefixes( $expression );
-		$this->usageValidator->trackUsedVariables( $expression );
+		$expression = implode(' ', $expressions);
+		$this->usageValidator->trackUsedPrefixes($expression);
+		$this->usageValidator->trackUsedVariables($expression);
 		$this->modifiers['GROUP BY'] = $expression;
 	}
 
@@ -55,11 +55,11 @@ 
 	 *
 	 * @param string $expression
 	 */
-	public function having( $expression ) {
-		$this->expressionValidator->validate( $expression, ExpressionValidator::VALIDATE_FUNCTION );
+	public function having($expression) {
+		$this->expressionValidator->validate($expression, ExpressionValidator::VALIDATE_FUNCTION);
 
-		$this->usageValidator->trackUsedPrefixes( $expression );
-		$this->usageValidator->trackUsedVariables( $expression );
+		$this->usageValidator->trackUsedPrefixes($expression);
+		$this->usageValidator->trackUsedVariables($expression);
 		$this->modifiers['HAVING'] = '(' . $expression . ')';
 	}
 
@@ -70,18 +70,18 @@ 
 	 * @param string $direction one of ASC or DESC
 	 * @throws InvalidArgumentException
 	 */
-	public function orderBy( $expression, $direction = 'ASC' ) {
-		$direction = strtoupper( $direction );
-		if ( !in_array( $direction, array( 'ASC', 'DESC' ) ) ) {
-			throw new InvalidArgumentException( '$direction has to be either ASC or DESC' );
+	public function orderBy($expression, $direction = 'ASC') {
+		$direction = strtoupper($direction);
+		if (!in_array($direction, array('ASC', 'DESC'))) {
+			throw new InvalidArgumentException('$direction has to be either ASC or DESC');
 		}
 
-		$this->expressionValidator->validate( $expression,
+		$this->expressionValidator->validate($expression,
 			ExpressionValidator::VALIDATE_VARIABLE | ExpressionValidator::VALIDATE_FUNCTION
 		);
 
-		$this->usageValidator->trackUsedPrefixes( $expression );
-		$this->usageValidator->trackUsedVariables( $expression );
+		$this->usageValidator->trackUsedPrefixes($expression);
+		$this->usageValidator->trackUsedVariables($expression);
 		$this->modifiers['ORDER BY'] = $direction . ' (' . $expression . ')';
 	}
 
@@ -91,9 +91,9 @@ 
 	 * @param int $limit
 	 * @throws InvalidArgumentException
 	 */
-	public function limit( $limit ) {
-		if ( !is_int( $limit ) ) {
-			throw new InvalidArgumentException( '$limit has to be an integer' );
+	public function limit($limit) {
+		if (!is_int($limit)) {
+			throw new InvalidArgumentException('$limit has to be an integer');
 		}
 
 		$this->modifiers['LIMIT'] = $limit;
@@ -105,9 +105,9 @@ 
 	 * @param int $offset
 	 * @throws InvalidArgumentException
 	 */
-	public function offset( $offset ) {
-		if ( !is_int( $offset ) ) {
-			throw new InvalidArgumentException( '$offset has to be an integer' );
+	public function offset($offset) {
+		if (!is_int($offset)) {
+			throw new InvalidArgumentException('$offset has to be an integer');
 		}
 
 		$this->modifiers['OFFSET'] = $offset;
@@ -120,11 +120,11 @@ 
 	 */
 	public function getSPARQL() {
 		$modifiers = $this->modifiers;
-		return implode( array_map( function( $key ) use ( $modifiers ) {
-			if ( isset( $modifiers[$key] ) ) {
+		return implode(array_map(function($key) use ($modifiers) {
+			if (isset($modifiers[$key])) {
 				return ' ' . $key . ' ' . $modifiers[$key];
 			}
-		}, array( 'GROUP BY', 'HAVING', 'ORDER BY', 'LIMIT', 'OFFSET' ) ) );
+		}, array('GROUP BY', 'HAVING', 'ORDER BY', 'LIMIT', 'OFFSET')));
 	}
 
 }