Benestar / asparagus

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

src/QueryPrefixBuilder.php

Spacing +9 added lines, -9 removed lines

@@ -30,10 +30,10 @@ 
 	/**
 	 * @param string[] $prefixes
 	 */
-	public function __construct( array $prefixes, UsageValidator $usageValidator ) {
+	public function __construct(array $prefixes, UsageValidator $usageValidator) {
 		$this->expressionValidator = new ExpressionValidator();
 		$this->usageValidator = $usageValidator;
-		$this->setPrefixes( $prefixes );
+		$this->setPrefixes($prefixes);
 	}
 
 	/**
@@ -42,15 +42,15 @@ 
 	 * @param string[] $prefixes
 	 * @throws InvalidArgumentException
 	 */
-	private function setPrefixes( array $prefixes ) {
-		foreach ( $prefixes as $prefix => $iri ) {
-			$this->expressionValidator->validate( $prefix, ExpressionValidator::VALIDATE_PREFIX );
-			$this->expressionValidator->validate( $iri, ExpressionValidator::VALIDATE_IRI );
+	private function setPrefixes(array $prefixes) {
+		foreach ($prefixes as $prefix => $iri) {
+			$this->expressionValidator->validate($prefix, ExpressionValidator::VALIDATE_PREFIX);
+			$this->expressionValidator->validate($iri, ExpressionValidator::VALIDATE_IRI);
 
 			$this->prefixes[$prefix] = $iri;
 		}
 
-		$this->usageValidator->trackDefinedPrefixes( array_keys( $this->prefixes ) );
+		$this->usageValidator->trackDefinedPrefixes(array_keys($this->prefixes));
 	}
 
 	/**
@@ -66,9 +66,9 @@ 
 	 * @return string
 	 */
 	public function getSPARQL() {
-		return implode( array_map( function( $prefix, $iri ) {
+		return implode(array_map(function($prefix, $iri) {
 			return 'PREFIX ' . $prefix . ': <' . $iri . '> '; 
-		}, array_keys( $this->prefixes ), $this->prefixes ) );
+		}, array_keys($this->prefixes), $this->prefixes));
 	}
 
 }

src/QueryBuilder.php

Spacing +62 added lines, -62 removed lines

@@ -63,12 +63,12 @@ 
 	 * @var string[] $prefixes
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( array $prefixes = array() ) {
+	public function __construct(array $prefixes = array()) {
 		$this->expressionValidator = new ExpressionValidator();
 		$this->usageValidator = new UsageValidator();
-		$this->prefixBuilder = new QueryPrefixBuilder( $prefixes, $this->usageValidator );
-		$this->graphBuilder = new GraphBuilder( $this->usageValidator );
-		$this->modifierBuilder = new QueryModifierBuilder( $this->usageValidator );
+		$this->prefixBuilder = new QueryPrefixBuilder($prefixes, $this->usageValidator);
+		$this->graphBuilder = new GraphBuilder($this->usageValidator);
+		$this->modifierBuilder = new QueryModifierBuilder($this->usageValidator);
 	}
 
 	/**
@@ -88,11 +88,11 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws RuntimeException
 	 */
-	public function select( $expressions /* expressions ... */ ) {
-		$expressions = is_array( $expressions ) ? $expressions : func_get_args();
+	public function select($expressions /* expressions ... */) {
+		$expressions = is_array($expressions) ? $expressions : func_get_args();
 
-		$this->setQueryForm( 'SELECT' );
-		$this->addExpressions( $expressions );
+		$this->setQueryForm('SELECT');
+		$this->addExpressions($expressions);
 
 		return $this;
 	}
@@ -107,12 +107,12 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws RuntimeException
 	 */
-	public function selectDistinct( $expressions /* expressions ... */ ) {
-		$expressions = is_array( $expressions ) ? $expressions : func_get_args();
+	public function selectDistinct($expressions /* expressions ... */) {
+		$expressions = is_array($expressions) ? $expressions : func_get_args();
 
-		$this->setQueryForm( 'SELECT' );
+		$this->setQueryForm('SELECT');
 		$this->uniqueness = 'DISTINCT ';
-		$this->addExpressions( $expressions );
+		$this->addExpressions($expressions);
 
 		return $this;
 	}
@@ -127,12 +127,12 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws RuntimeException
 	 */
-	public function selectReduced( $expressions /* expressions ... */ ) {
-		$expressions = is_array( $expressions ) ? $expressions : func_get_args();
+	public function selectReduced($expressions /* expressions ... */) {
+		$expressions = is_array($expressions) ? $expressions : func_get_args();
 
-		$this->setQueryForm( 'SELECT' );
+		$this->setQueryForm('SELECT');
 		$this->uniqueness = 'REDUCED ';
-		$this->addExpressions( $expressions );
+		$this->addExpressions($expressions);
 
 		return $this;
 	}
@@ -147,10 +147,10 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws RuntimeException
 	 */
-	public function describe( $expressions /* expressions ... */ ) {
-		$expressions = is_array( $expressions ) ? $expressions : func_get_args();
+	public function describe($expressions /* expressions ... */) {
+		$expressions = is_array($expressions) ? $expressions : func_get_args();
 
-		$this->setQueryForm( 'DESCRIBE' );
+		$this->setQueryForm('DESCRIBE');
 		$this->addExpressions(
 			$expressions,
 			ExpressionValidator::VALIDATE_VARIABLE | ExpressionValidator::VALIDATE_FUNCTION_AS
@@ -160,16 +160,16 @@ 
 		return $this;
 	}
 
-	private function setQueryForm( $queryForm ) {
-		if ( $this->queryForm !== null ) {
-			throw new RuntimeException( 'Query type is already set to ' . $this->queryForm );
+	private function setQueryForm($queryForm) {
+		if ($this->queryForm !== null) {
+			throw new RuntimeException('Query type is already set to ' . $this->queryForm);
 		}
 
 		$this->queryForm = $queryForm;
 	}
 
-	private function addExpressions( array $expressions, $options = null ) {
-		foreach ( $expressions as $expression ) {
+	private function addExpressions(array $expressions, $options = null) {
+		foreach ($expressions as $expression) {
 			$this->expressionValidator->validate(
 				$expression,
 				$options ?: ExpressionValidator::VALIDATE_VARIABLE | ExpressionValidator::VALIDATE_FUNCTION_AS
@@ -177,12 +177,12 @@ 
 
 			// @todo temp hack to add AS definitions to defined variables
 			$regexHelper = new RegexHelper();
-			$matches = $regexHelper->getMatches( 'AS \{variable}', $expression );
-			$this->usageValidator->trackDefinedVariables( $matches );
+			$matches = $regexHelper->getMatches('AS \{variable}', $expression);
+			$this->usageValidator->trackDefinedVariables($matches);
 
 			// @todo detect functions and wrap with brackets automatically
-			$this->usageValidator->trackUsedVariables( $expression );
-			$this->usageValidator->trackUsedPrefixes( $expression );
+			$this->usageValidator->trackUsedVariables($expression);
+			$this->usageValidator->trackUsedPrefixes($expression);
 			$this->selects[] = $expression;
 		}
 	}
@@ -196,8 +196,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function where( $subject, $predicate, $object ) {
-		$this->graphBuilder->where( $subject, $predicate, $object );
+	public function where($subject, $predicate, $object) {
+		$this->graphBuilder->where($subject, $predicate, $object);
 		return $this;
 	}
 
@@ -211,8 +211,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function also( $subject, $predicate = null, $object = null ) {
-		$this->graphBuilder->also( $subject, $predicate, $object );
+	public function also($subject, $predicate = null, $object = null) {
+		$this->graphBuilder->also($subject, $predicate, $object);
 		return $this;
 	}
 
@@ -227,8 +227,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function optional( $subject, $predicate = null, $object = null ) {
-		$this->graphBuilder->optional( $subject, $predicate, $object );
+	public function optional($subject, $predicate = null, $object = null) {
+		$this->graphBuilder->optional($subject, $predicate, $object);
 		return $this;
 	}
 
@@ -241,8 +241,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function filter( $expression ) {
-		$this->graphBuilder->filter( $expression );
+	public function filter($expression) {
+		$this->graphBuilder->filter($expression);
 		return $this;
 	}
 
@@ -257,8 +257,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function filterExists( $subject, $predicate = null, $object = null ) {
-		$this->graphBuilder->filterExists( $subject, $predicate, $object );
+	public function filterExists($subject, $predicate = null, $object = null) {
+		$this->graphBuilder->filterExists($subject, $predicate, $object);
 		return $this;
 	}
 
@@ -273,8 +273,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function filterNotExists( $subject, $predicate = null, $object = null ) {
-		$this->graphBuilder->filterNotExists( $subject, $predicate, $object );
+	public function filterNotExists($subject, $predicate = null, $object = null) {
+		$this->graphBuilder->filterNotExists($subject, $predicate, $object);
 		return $this;
 	}
 
@@ -287,8 +287,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function union( $graphs /* graphs ... */ ) {
-		call_user_func_array( array( $this->graphBuilder, 'union' ), func_get_args() );
+	public function union($graphs /* graphs ... */) {
+		call_user_func_array(array($this->graphBuilder, 'union'), func_get_args());
 		return $this;
 	}
 
@@ -299,8 +299,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function subquery( QueryBuilder $query ) {
-		$this->graphBuilder->subquery( $query );
+	public function subquery(QueryBuilder $query) {
+		$this->graphBuilder->subquery($query);
 		return $this;
 	}
 
@@ -310,7 +310,7 @@ 
 	 * @return QueryBuilder
 	 */
 	public function newSubquery() {
-		return new QueryBuilder( $this->prefixBuilder->getPrefixes() );
+		return new QueryBuilder($this->prefixBuilder->getPrefixes());
 	}
 
 	/**
@@ -321,7 +321,7 @@ 
 	 * @return GraphBuilder
 	 */
 	public function newSubgraph() {
-		return new GraphBuilder( $this->usageValidator );
+		return new GraphBuilder($this->usageValidator);
 	}
 
 	/**
@@ -331,10 +331,10 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function groupBy( $expressions /* expressions ... */ )  {
-		$expressions = is_array( $expressions ) ? $expressions : func_get_args();
+	public function groupBy($expressions /* expressions ... */) {
+		$expressions = is_array($expressions) ? $expressions : func_get_args();
 
-		$this->modifierBuilder->groupBy( $expressions );
+		$this->modifierBuilder->groupBy($expressions);
 		return $this;
 	}
 
@@ -345,8 +345,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function having( $expression ) {
-		$this->modifierBuilder->having( $expression );
+	public function having($expression) {
+		$this->modifierBuilder->having($expression);
 		return $this;
 	}
 
@@ -358,8 +358,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function orderBy( $expression, $direction = 'ASC' ) {
-		$this->modifierBuilder->orderBy( $expression, $direction );
+	public function orderBy($expression, $direction = 'ASC') {
+		$this->modifierBuilder->orderBy($expression, $direction);
 		return $this;
 	}
 
@@ -370,8 +370,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function limit( $limit ) {
-		$this->modifierBuilder->limit( $limit );
+	public function limit($limit) {
+		$this->modifierBuilder->limit($limit);
 		return $this;
 	}
 
@@ -382,8 +382,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function offset( $offset ) {
-		$this->modifierBuilder->offset( $offset );
+	public function offset($offset) {
+		$this->modifierBuilder->offset($offset);
 		return $this;
 	}
 
@@ -395,9 +395,9 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws RangeException
 	 */
-	public function getSPARQL( $includePrefixes = true ) {
-		if ( !is_bool( $includePrefixes ) ) {
-			throw new InvalidArgumentException( '$includePrefixes has to be a bool' );
+	public function getSPARQL($includePrefixes = true) {
+		if (!is_bool($includePrefixes)) {
+			throw new InvalidArgumentException('$includePrefixes has to be a bool');
 		}
 
 		$this->usageValidator->validate();
@@ -413,7 +413,7 @@ 
 	}
 
 	private function formatSelects() {
-		return empty( $this->selects ) ? '*' : implode( ' ', $this->selects );
+		return empty($this->selects) ? '*' : implode(' ', $this->selects);
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 */
 	public function format() {
 		$formatter = new QueryFormatter();
-		return $formatter->format( $this->getSPARQL() );
+		return $formatter->format($this->getSPARQL());
 	}
 
 }

src/ExpressionValidator.php

Spacing +38 added lines, -38 removed lines

@@ -74,19 +74,19 @@ 
 	 * @param int $options
 	 * @throws InvalidArgumentException
 	 */
-	public function validate( $expression, $options ) {
-		if ( !is_string( $expression ) ) {
-			throw new InvalidArgumentException( '$expression has to be a string.' );
+	public function validate($expression, $options) {
+		if (!is_string($expression)) {
+			throw new InvalidArgumentException('$expression has to be a string.');
 		}
 
-		if ( !$this->matches( $expression, $options ) ) {
-			throw new InvalidArgumentException( '$expression has to be a ' .
-				implode( ' or a ', $this->getOptionNames( $options ) ) . ', got ' . $expression
+		if (!$this->matches($expression, $options)) {
+			throw new InvalidArgumentException('$expression has to be a ' .
+				implode(' or a ', $this->getOptionNames($options)) . ', got ' . $expression
 			);
 		}
 	}
 
-	private function getOptionNames( $options ) {
+	private function getOptionNames($options) {
 		$names = array(
 			'variable' => self::VALIDATE_VARIABLE,
 			'IRI' => self::VALIDATE_IRI,
@@ -98,69 +98,69 @@ 
 			'function with variable assignment' => self::VALIDATE_FUNCTION_AS
 		);
 
-		$names = array_filter( $names, function( $key ) use ( $options ) {
+		$names = array_filter($names, function($key) use ($options) {
 			return $options & $key;
 		} );
 
-		return array_keys( $names );
+		return array_keys($names);
 	}
 
-	private function matches( $expression, $options ) {
-		return $this->isVariable( $expression, $options ) ||
-			$this->isIRI( $expression, $options ) ||
-			$this->isPrefix( $expression, $options ) ||
-			$this->isPrefixedIri( $expression, $options ) ||
-			$this->isValue( $expression, $options ) ||
-			$this->isPath( $expression, $options ) ||
-			$this->isFunction( $expression, $options ) ||
-			$this->isFunctionAs( $expression, $options );
+	private function matches($expression, $options) {
+		return $this->isVariable($expression, $options) ||
+			$this->isIRI($expression, $options) ||
+			$this->isPrefix($expression, $options) ||
+			$this->isPrefixedIri($expression, $options) ||
+			$this->isValue($expression, $options) ||
+			$this->isPath($expression, $options) ||
+			$this->isFunction($expression, $options) ||
+			$this->isFunctionAs($expression, $options);
 	}
 
-	private function isVariable( $expression, $options ) {
+	private function isVariable($expression, $options) {
 		return $options & self::VALIDATE_VARIABLE &&
-			$this->regexHelper->matchesRegex( '\{variable}', $expression );
+			$this->regexHelper->matchesRegex('\{variable}', $expression);
 	}
 
-	private function isIRI( $expression, $options ) {
+	private function isIRI($expression, $options) {
 		return $options & self::VALIDATE_IRI &&
-			$this->regexHelper->matchesRegex( '\{iri}', $expression );
+			$this->regexHelper->matchesRegex('\{iri}', $expression);
 	}
 
-	private function isPrefix( $expression, $options ) {
+	private function isPrefix($expression, $options) {
 		return $options & self::VALIDATE_PREFIX &&
-			$this->regexHelper->matchesRegex( '\{prefix}', $expression );
+			$this->regexHelper->matchesRegex('\{prefix}', $expression);
 	}
 
-	private function isPrefixedIri( $expression, $options ) {
+	private function isPrefixedIri($expression, $options) {
 		return $options & self::VALIDATE_PREFIXED_IRI &&
-			$this->regexHelper->matchesRegex( '\{prefixed_iri}', $expression );
+			$this->regexHelper->matchesRegex('\{prefixed_iri}', $expression);
 	}
 
-	private function isValue( $expression, $options ) {
+	private function isValue($expression, $options) {
 		return $options & self::VALIDATE_NATIVE &&
-			$this->regexHelper->matchesRegex( '\{native}', $expression );
+			$this->regexHelper->matchesRegex('\{native}', $expression);
 	}
 
-	private function isPath( $expression, $options ) {
+	private function isPath($expression, $options) {
 		return $options & self::VALIDATE_PATH &&
-			$this->regexHelper->matchesRegex( '\{path}', $expression );
+			$this->regexHelper->matchesRegex('\{path}', $expression);
 	}
 
-	private function isFunction( $expression, $options ) {
+	private function isFunction($expression, $options) {
 		// @todo this might not be complete
 		return $options & self::VALIDATE_FUNCTION &&
-			$this->regexHelper->matchesRegex( '\{function}', $expression ) &&
-			$this->checkBrackets( $expression );
+			$this->regexHelper->matchesRegex('\{function}', $expression) &&
+			$this->checkBrackets($expression);
 	}
 
-	private function checkBrackets( $expression ) {
-		$expression = $this->regexHelper->escapeSequences( $expression );
-		return substr_count( $expression, '(' ) === substr_count( $expression, ')' );
+	private function checkBrackets($expression) {
+		$expression = $this->regexHelper->escapeSequences($expression);
+		return substr_count($expression, '(') === substr_count($expression, ')');
 	}
 
-	private function isFunctionAs( $expression, $options ) {
+	private function isFunctionAs($expression, $options) {
 		return $options & self::VALIDATE_FUNCTION_AS &&
-			$this->regexHelper->matchesRegex( '\(\{function} AS \{variable}\)', $expression );
+			$this->regexHelper->matchesRegex('\(\{function} AS \{variable}\)', $expression);
 	}
 
 }

src/QueryExecuter.php

Spacing +13 added lines, -13 removed lines

@@ -36,14 +36,14 @@ 
 	 * @param string[] $options one of queryParam, formatParam or userAgent
 	 * @param Http|null $http
 	 */
-	public function __construct( $url, array $options = array(), Http $http = null ) {
+	public function __construct($url, array $options = array(), Http $http = null) {
 		$this->url = $url;
-		$this->options = array_merge( array(
+		$this->options = array_merge(array(
 			'queryParam' => 'query',
 			'formatParam' => 'format',
 			'userAgent' => 'Asparagus/Asparagus 0.1'
-		), $options );
-		$this->http = $http ?: new Http( $this->options['userAgent'] );
+		), $options);
+		$this->http = $http ?: new Http($this->options['userAgent']);
 	}
 
 	/**
@@ -55,26 +55,26 @@ 
 	 * @throws RangeException
 	 * @throws RuntimeException
 	 */
-	public function execute( $query ) {
-		if ( $query instanceof QueryBuilder ) {
+	public function execute($query) {
+		if ($query instanceof QueryBuilder) {
 			$query = $query->getSPARQL();
 		}
 
-		if ( !is_string( $query ) ) {
-			throw new InvalidArgumentException( '$query has to be a string or an instance of QueryBuilder' );
+		if (!is_string($query)) {
+			throw new InvalidArgumentException('$query has to be a string or an instance of QueryBuilder');
 		}
 
-		$result = $this->getResult( $query );
+		$result = $this->getResult($query);
 		return $result['results'];
 	}
 
-	private function getResult( $query ) {
-		$result = $this->http->request( $this->url, array(
+	private function getResult($query) {
+		$result = $this->http->request($this->url, array(
 			$this->options['queryParam'] => $query,
 			$this->options['formatParam'] => 'json'
-		) );
+		));
 
-		return json_decode( $result, true );
+		return json_decode($result, true);
 	}
 
 }