Benestar / asparagus

src/QueryBuilder.php

Doc Comments +10 added lines, -7 removed lines

@@ -83,7 +83,7 @@ 
 	/**
 	 * Specifies the expressions to select.
 	 *
-	 * @param string|string[] $expressions
+	 * @param string $expressions
 	 * @return self
 	 * @throws InvalidArgumentException
 	 * @throws RuntimeException
@@ -102,7 +102,7 @@ 
 	 *
 	 * @since 0.3
 	 *
-	 * @param string|string[] $expressions
+	 * @param string $expressions
 	 * @return self
 	 * @throws InvalidArgumentException
 	 * @throws RuntimeException
@@ -122,7 +122,7 @@ 
 	 *
 	 * @since 0.3
 	 *
-	 * @param string|string[] $expressions
+	 * @param string $expressions
 	 * @return self
 	 * @throws InvalidArgumentException
 	 * @throws RuntimeException
@@ -142,7 +142,7 @@ 
 	 *
 	 * @since 0.4
 	 *
-	 * @param string|string[] $expressions
+	 * @param string $expressions
 	 * @return self
 	 * @throws InvalidArgumentException
 	 * @throws RuntimeException
@@ -160,6 +160,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $queryForm
+	 */
 	private function setQueryForm( $queryForm ) {
 		if ( $this->queryForm !== null ) {
 			throw new RuntimeException( 'Query type is already set to ' . $this->queryForm );
@@ -251,7 +254,7 @@ 
 	 *
 	 * @since 0.3
 	 *
-	 * @param string|GraphBuilder $subject
+	 * @param GraphBuilder $subject
 	 * @param string|null $predicate
 	 * @param string|null $object
 	 * @return self
@@ -283,7 +286,7 @@ 
 	 *
 	 * @since 0.3
 	 *
-	 * @param GraphBuilder|GraphBuilder[] $graphs
+	 * @param GraphBuilder $graphs
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
@@ -327,7 +330,7 @@ 
 	/**
 	 * Sets the GROUP BY modifier.
 	 *
-	 * @param string|string[] $expressions
+	 * @param string $expressions
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */

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/QueryExecuter.php

Doc Comments +3 added lines

@@ -68,6 +68,9 @@
 		return $result['results'];
 	}
 
+	/**
+	 * @param string $query
+	 */
 	private function getResult( $query ) {
 		$result = $this->http->request( $this->url, array(
 			$this->options['queryParam'] => $query,

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

src/QueryFormatter.php

Doc Comments +3 added lines

@@ -58,6 +58,9 @@
 		return strtr( implode( $this->formattedParts ), $this->replacements );
 	}
 
+	/**
+	 * @param string $string
+	 */
 	private function split( $string ) {
 		return preg_split(
 			'/(\W)/',

Spacing +30 added lines, -30 removed lines

@@ -34,31 +34,31 @@ 
 	 * @param string $sparql
 	 * @return string
 	 */
-	public function format( $sparql ) {
+	public function format($sparql) {
 		$this->formattedParts = array();
 		$this->indentationLevel = 0;
 		$this->replacements = array();
 
 		$regexHelper = new RegexHelper();
-		$sparql = $regexHelper->escapeSequences( $sparql, $this->replacements );
+		$sparql = $regexHelper->escapeSequences($sparql, $this->replacements);
 
-		foreach ( $this->split( $sparql ) as $part ) {
-			if ( !empty( $this->formattedParts ) ) {
-				$this->before( $part );
+		foreach ($this->split($sparql) as $part) {
+			if (!empty($this->formattedParts)) {
+				$this->before($part);
 			}
 
-			$this->indentation( $part );
-			$this->append( $part );
-			$this->after( $part );
+			$this->indentation($part);
+			$this->append($part);
+			$this->after($part);
 		}
 
 		$this->trimEnd();
 		$this->formattedParts[] = "\n";
 
-		return strtr( implode( $this->formattedParts ), $this->replacements );
+		return strtr(implode($this->formattedParts), $this->replacements);
 	}
 
-	private function split( $string ) {
+	private function split($string) {
 		return preg_split(
 			'/(\W)/',
 			$string,
@@ -67,64 +67,64 @@ 
 		);
 	}
 
-	private function before( $part ) {
-		if ( in_array( $part, array( 'PREFIX', 'FILTER', 'OPTIONAL', 'LIMIT', 'GROUP', 'ORDER', 'HAVING', '}' ) ) ) {
+	private function before($part) {
+		if (in_array($part, array('PREFIX', 'FILTER', 'OPTIONAL', 'LIMIT', 'GROUP', 'ORDER', 'HAVING', '}'))) {
 			$this->trimEnd();
 			$this->formattedParts[] = "\n";
 		}
 
-		if ( $part === 'SELECT' && $this->indentationLevel === 0 ) {
+		if ($part === 'SELECT' && $this->indentationLevel === 0) {
 			$this->trimEnd();
 			$this->formattedParts[] = "\n\n";
 		}
 
 		// UNION is the only part we want to have in-line with "}", ie. } UNION {
-		if ( $part === 'UNION' || end( $this->formattedParts ) !== "\n" &&
-			in_array( $part, array( '.', '=', '(', '<', '{', '?', '$' ) )
+		if ($part === 'UNION' || end($this->formattedParts) !== "\n" &&
+			in_array($part, array('.', '=', '(', '<', '{', '?', '$'))
 		) {
 			$this->trimEnd();
-			$this->append( ' ' );
+			$this->append(' ');
 		}
 	}
 
-	private function indentation( $part ) {
-		if ( $part === '}' ) {
+	private function indentation($part) {
+		if ($part === '}') {
 			$this->indentationLevel--;
 		}
 
-		if ( !ctype_space( $part ) && substr( end( $this->formattedParts ), 0, 1 ) === "\n" ) {
-			$this->formattedParts[] = str_repeat( "\t", $this->indentationLevel );
+		if (!ctype_space($part) && substr(end($this->formattedParts), 0, 1) === "\n") {
+			$this->formattedParts[] = str_repeat("\t", $this->indentationLevel);
 		}
 
-		if ( $part === '{' ) {
+		if ($part === '{') {
 			$this->indentationLevel++;
 		}
 	}
 
-	private function append( $part ) {
-		if ( !ctype_space( $part ) ) {
+	private function append($part) {
+		if (!ctype_space($part)) {
 			$this->formattedParts[] = $part;
 		} else if ( // ctype_space( $part ) &&
-			!ctype_space( end( $this->formattedParts ) ) &&
-			end( $this->formattedParts ) !== '('
+			!ctype_space(end($this->formattedParts)) &&
+			end($this->formattedParts) !== '('
 		) {
 			$this->formattedParts[] = ' ';
 		}
 	}
 
-	private function after( $part ) {
-		if ( in_array( $part, array( '{', '}', '.' ) ) ) {
+	private function after($part) {
+		if (in_array($part, array('{', '}', '.'))) {
 			$this->formattedParts[] = "\n";
 		}
 
-		if ( $part === ';' ) {
+		if ($part === ';') {
 			$this->formattedParts[] = "\n\t";
 		}
 	}
 
 	private function trimEnd() {
-		while ( ctype_space( end( $this->formattedParts ) ) ) {
-			array_pop( $this->formattedParts );
+		while (ctype_space(end($this->formattedParts))) {
+			array_pop($this->formattedParts);
 		}
 	}
 

src/UsageValidator.php

Doc Comments +6 added lines

@@ -93,10 +93,16 @@
 		$this->definedPrefixes = array_merge( $this->definedPrefixes, $prefixes );
 	}
 
+	/**
+	 * @param string $expression
+	 */
 	private function matchVariables( $expression ) {
 		return $this->regexHelper->getMatches( '(^|\W)(?<!AS )\{variable}', $expression, 2 );
 	}
 
+	/**
+	 * @param string $expression
+	 */
 	private function matchPrefixes( $expression ) {
 		return $this->regexHelper->getMatches( '(^|\W)(\{prefix}):\{name}', $expression, 2 );
 	}

Spacing +26 added lines, -26 removed lines

@@ -46,12 +46,12 @@ 
 	 *
 	 * @param string[]|string $variables list of variables without prefixes
 	 */
-	public function trackUsedVariables( $variables ) {
-		if ( !is_array( $variables ) ) {
-			$variables = $this->matchVariables( $variables );
+	public function trackUsedVariables($variables) {
+		if (!is_array($variables)) {
+			$variables = $this->matchVariables($variables);
 		}
 
-		$this->usedVariables = array_unique( array_merge( $this->usedVariables, $variables ) );
+		$this->usedVariables = array_unique(array_merge($this->usedVariables, $variables));
 	}
 
 	/**
@@ -59,12 +59,12 @@ 
 	 *
 	 * @param string[]|string $variables list of variables without prefixes
 	 */
-	public function trackDefinedVariables( $variables )  {
-		if ( !is_array( $variables ) ) {
-			$variables = $this->matchVariables( $variables );
+	public function trackDefinedVariables($variables) {
+		if (!is_array($variables)) {
+			$variables = $this->matchVariables($variables);
 		}
 
-		$this->definedVariables = array_unique( array_merge( $this->definedVariables, $variables ) );
+		$this->definedVariables = array_unique(array_merge($this->definedVariables, $variables));
 	}
 
 	/**
@@ -72,12 +72,12 @@ 
 	 *
 	 * @param string[]|string $prefixes list of prefixes
 	 */
-	public function trackUsedPrefixes( $prefixes )  {
-		if ( !is_array( $prefixes ) ) {
-			$prefixes = $this->matchPrefixes( $prefixes );
+	public function trackUsedPrefixes($prefixes) {
+		if (!is_array($prefixes)) {
+			$prefixes = $this->matchPrefixes($prefixes);
 		}
 
-		$this->usedPrefixes = array_merge( $this->usedPrefixes, $prefixes );
+		$this->usedPrefixes = array_merge($this->usedPrefixes, $prefixes);
 	}
 
 	/**
@@ -85,20 +85,20 @@ 
 	 *
 	 * @param string[]|string $prefixes list of prefixes
 	 */
-	public function trackDefinedPrefixes( $prefixes )  {
-		if ( !is_array( $prefixes ) ) {
-			$prefixes = $this->matchPrefixes( $prefixes );
+	public function trackDefinedPrefixes($prefixes) {
+		if (!is_array($prefixes)) {
+			$prefixes = $this->matchPrefixes($prefixes);
 		}
 
-		$this->definedPrefixes = array_merge( $this->definedPrefixes, $prefixes );
+		$this->definedPrefixes = array_merge($this->definedPrefixes, $prefixes);
 	}
 
-	private function matchVariables( $expression ) {
-		return $this->regexHelper->getMatches( '(^|\W)(?<!AS )\{variable}', $expression, 2 );
+	private function matchVariables($expression) {
+		return $this->regexHelper->getMatches('(^|\W)(?<!AS )\{variable}', $expression, 2);
 	}
 
-	private function matchPrefixes( $expression ) {
-		return $this->regexHelper->getMatches( '(^|\W)(\{prefix}):\{name}', $expression, 2 );
+	private function matchPrefixes($expression) {
+		return $this->regexHelper->getMatches('(^|\W)(\{prefix}):\{name}', $expression, 2);
 	}
 
 	/**
@@ -112,16 +112,16 @@ 
 	}
 
 	private function validatePrefixes() {
-		$diff = array_diff( $this->usedPrefixes, $this->definedPrefixes );
-		if ( !empty( $diff ) ) {
-			throw new RangeException( 'The prefixes ' . implode( ', ', $diff ) . ' aren\'t defined for this query.' );
+		$diff = array_diff($this->usedPrefixes, $this->definedPrefixes);
+		if (!empty($diff)) {
+			throw new RangeException('The prefixes ' . implode(', ', $diff) . ' aren\'t defined for this query.');
 		}
 	}
 
 	private function validateVariables() {
-		$diff = array_diff( $this->usedVariables, $this->definedVariables );
-		if ( !empty( $diff ) ) {
-			throw new RangeException( 'The variables ?' . implode( ', ?', $diff ) . ' don\'t occur in this query.' );
+		$diff = array_diff($this->usedVariables, $this->definedVariables);
+		if (!empty($diff)) {
+			throw new RangeException('The variables ?' . implode(', ?', $diff) . ' don\'t occur in this query.');
 		}
 	}
 

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/QueryExecuterTest.php

Spacing +26 added lines, -26 removed lines

@@ -13,67 +13,67 @@
  */
 class QueryExecuterTest extends \PHPUnit_Framework_TestCase {
 
-	private function getHttpMock( $params ) {
-		$http = $this->getMockBuilder( 'Asparagus\Http' )
+	private function getHttpMock($params) {
+		$http = $this->getMockBuilder('Asparagus\Http')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$http->expects( $this->once() )
-			->method( 'request' )
+		$http->expects($this->once())
+			->method('request')
 			->with(
-				$this->equalTo( 'test.example.com' ),
-				$this->equalTo( $params )
+				$this->equalTo('test.example.com'),
+				$this->equalTo($params)
 			)
-			->will( $this->returnValue( '{"results":"~=[,,_,,]:3"}' ) );
+			->will($this->returnValue('{"results":"~=[,,_,,]:3"}'));
 
 		return $http;
 	}
 
 	public function testExecute() {
-		$http = $this->getHttpMock( array(
+		$http = $this->getHttpMock(array(
 			'query' => 'FooBar',
 			'format' => 'json'
-		) );
+		));
 
-		$queryExecuter = new QueryExecuter( 'test.example.com', array(), $http );
-		$result = $queryExecuter->execute( 'FooBar' );
+		$queryExecuter = new QueryExecuter('test.example.com', array(), $http);
+		$result = $queryExecuter->execute('FooBar');
 
-		$this->assertEquals( '~=[,,_,,]:3', $result );
+		$this->assertEquals('~=[,,_,,]:3', $result);
 	}
 
 	public function testExecuteCustomParams() {
-		$http = $this->getHttpMock( array(
+		$http = $this->getHttpMock(array(
 			'fancy-query' => 'FooBar',
 			'format-nyan' => 'json'
-		) );
+		));
 
-		$queryExecuter = new QueryExecuter( 'test.example.com', array(
+		$queryExecuter = new QueryExecuter('test.example.com', array(
 			'queryParam' => 'fancy-query',
 			'formatParam' => 'format-nyan'
-		), $http );
+		), $http);
 
-		$result = $queryExecuter->execute( 'FooBar' );
+		$result = $queryExecuter->execute('FooBar');
 
-		$this->assertEquals( '~=[,,_,,]:3', $result );
+		$this->assertEquals('~=[,,_,,]:3', $result);
 	}
 
 	public function testExecuteQueryBuilder() {
-		$http = $this->getHttpMock( array(
+		$http = $this->getHttpMock(array(
 			'query' => 'SELECT * WHERE { }',
 			'format' => 'json'
-		) );
+		));
 
-		$queryExecuter = new QueryExecuter( 'test.example.com', array(), $http );
-		$result = $queryExecuter->execute( new QueryBuilder() );
+		$queryExecuter = new QueryExecuter('test.example.com', array(), $http);
+		$result = $queryExecuter->execute(new QueryBuilder());
 
-		$this->assertEquals( '~=[,,_,,]:3', $result );
+		$this->assertEquals('~=[,,_,,]:3', $result);
 	}
 
 	public function testExecuteInvalidArgument() {
-		$queryExecuter = new QueryExecuter( 'test.example.com' );
-		$this->setExpectedException( 'InvalidArgumentException' );
+		$queryExecuter = new QueryExecuter('test.example.com');
+		$this->setExpectedException('InvalidArgumentException');
 
-		$queryExecuter->execute( null );
+		$queryExecuter->execute(null);
 	}
 
 }