Benestar / asparagus

src/QueryFormatter.php

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

Spacing +49 added lines, -49 removed lines

@@ -67,7 +67,7 @@ 
 	 * @param UsageValidator $usageValidator
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( UsageValidator $usageValidator ) {
+	public function __construct(UsageValidator $usageValidator) {
 		$this->expressionValidator = new ExpressionValidator();
 		$this->usageValidator = $usageValidator;
 	}
@@ -81,19 +81,19 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function where( $subject, $predicate, $object ) {
-		$this->expressionValidator->validate( $subject,
+	public function where($subject, $predicate, $object) {
+		$this->expressionValidator->validate($subject,
 			ExpressionValidator::VALIDATE_VARIABLE | ExpressionValidator::VALIDATE_PREFIXED_IRI
 		);
-		$this->expressionValidator->validate( $predicate,
+		$this->expressionValidator->validate($predicate,
 			ExpressionValidator::VALIDATE_VARIABLE | ExpressionValidator::VALIDATE_PATH
 		);
-		$this->expressionValidator->validate( $object,
+		$this->expressionValidator->validate($object,
 			ExpressionValidator::VALIDATE_VARIABLE | ExpressionValidator::VALIDATE_PREFIXED_IRI | ExpressionValidator::VALIDATE_NATIVE
 		);
 
-		$this->usageValidator->trackUsedPrefixes(  $subject . ' ' . $predicate . ' ' . $object );
-		$this->usageValidator->trackDefinedVariables( $subject  . ' ' . $predicate . ' ' . $object );
+		$this->usageValidator->trackUsedPrefixes($subject . ' ' . $predicate . ' ' . $object);
+		$this->usageValidator->trackDefinedVariables($subject . ' ' . $predicate . ' ' . $object);
 
 		$this->currentSubject = $subject;
 		$this->currentPredicate = $predicate;
@@ -112,13 +112,13 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function also( $subject, $predicate = null, $object = null ) {
-		if ( $predicate === null ) {
-			$this->where( $this->currentSubject, $this->currentPredicate, $subject );
-		} else if ( $object === null ) {
-			$this->where( $this->currentSubject, $subject, $predicate );
+	public function also($subject, $predicate = null, $object = null) {
+		if ($predicate === null) {
+			$this->where($this->currentSubject, $this->currentPredicate, $subject);
+		} else if ($object === null) {
+			$this->where($this->currentSubject, $subject, $predicate);
 		} else {
-			$this->where( $subject, $predicate, $object );
+			$this->where($subject, $predicate, $object);
 		}
 
 		return $this;
@@ -131,11 +131,11 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function filter( $expression ) {
-		$this->expressionValidator->validate( $expression, ExpressionValidator::VALIDATE_FUNCTION );
+	public function filter($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->filters[] = '(' . $expression . ')';
 
@@ -151,8 +151,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function filterExists( $subject, $predicate = null, $object = null ) {
-		$graphBuilder = $this->getGraphBuilder( $subject, $predicate, $object );
+	public function filterExists($subject, $predicate = null, $object = null) {
+		$graphBuilder = $this->getGraphBuilder($subject, $predicate, $object);
 		$this->filters[] = 'EXISTS {' . $graphBuilder->getSPARQL() . ' }';
 
 		return $this;
@@ -167,8 +167,8 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function filterNotExists( $subject, $predicate = null, $object = null ) {
-		$graphBuilder = $this->getGraphBuilder( $subject, $predicate, $object );
+	public function filterNotExists($subject, $predicate = null, $object = null) {
+		$graphBuilder = $this->getGraphBuilder($subject, $predicate, $object);
 		$this->filters[] = 'NOT EXISTS {' . $graphBuilder->getSPARQL() . ' }';
 
 		return $this;
@@ -183,19 +183,19 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function optional( $subject, $predicate = null, $object = null ) {
-		$graphBuilder = $this->getGraphBuilder( $subject, $predicate, $object );
+	public function optional($subject, $predicate = null, $object = null) {
+		$graphBuilder = $this->getGraphBuilder($subject, $predicate, $object);
 		$this->optionals[] = $graphBuilder->getSPARQL();
 		return $this;
 	}
 
-	private function getGraphBuilder( $subject, $predicate, $object ) {
-		if ( $subject instanceof GraphBuilder ) {
+	private function getGraphBuilder($subject, $predicate, $object) {
+		if ($subject instanceof GraphBuilder) {
 			return $subject;
 		}
 
-		$graphBuilder = new GraphBuilder( $this->usageValidator );
-		return $graphBuilder->where( $subject, $predicate, $object );
+		$graphBuilder = new GraphBuilder($this->usageValidator);
+		return $graphBuilder->where($subject, $predicate, $object);
 	}
 
 	/**
@@ -205,12 +205,12 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function union( $graphs /* graphs ... */ ) {
-		$graphs = is_array( $graphs ) ? $graphs : func_get_args();
+	public function union($graphs /* graphs ... */) {
+		$graphs = is_array($graphs) ? $graphs : func_get_args();
 
-		$this->unions[] = implode( ' UNION', array_map( function( GraphBuilder $graph ) {
+		$this->unions[] = implode(' UNION', array_map(function(GraphBuilder $graph) {
 			return ' {' . $graph->getSPARQL() . ' }';
-		}, $graphs ) );
+		}, $graphs));
 
 		return $this;
 	}
@@ -222,14 +222,14 @@ 
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public function subquery( QueryBuilder $queryBuilder ) {
-		$this->subqueries[] = $queryBuilder->getSPARQL( false );
-		$this->usageValidator->trackDefinedVariables( implode( ' ', $queryBuilder->getSelects() ) );
+	public function subquery(QueryBuilder $queryBuilder) {
+		$this->subqueries[] = $queryBuilder->getSPARQL(false);
+		$this->usageValidator->trackDefinedVariables(implode(' ', $queryBuilder->getSelects()));
 
 		// @todo temp hack to add AS definitions to defined variables
 		$regexHelper = new RegexHelper();
-		$matches = $regexHelper->getMatches( 'AS \{variable}', implode( ' ', $queryBuilder->getSelects() ) );
-		$this->usageValidator->trackDefinedVariables( $matches );
+		$matches = $regexHelper->getMatches('AS \{variable}', implode(' ', $queryBuilder->getSelects()));
+		$this->usageValidator->trackDefinedVariables($matches);
 
 		return $this;
 	}
@@ -244,9 +244,9 @@ 
 		// add subqueries to the beginning because they are logically evaluated first
 		$sparql = $this->formatSubqueries();
 
-		foreach ( $this->conditions as $subject => $predicates ) {
+		foreach ($this->conditions as $subject => $predicates) {
 			$sparql .= ' ' . $subject;
-			$sparql .= $this->formatPredicates( $predicates ) . ' .';
+			$sparql .= $this->formatPredicates($predicates) . ' .';
 		}
 
 		$sparql .= $this->formatOptionals();
@@ -256,32 +256,32 @@ 
 		return $sparql;
 	}
 
-	private function formatPredicates( array $predicates ) {
-		return implode( ' ;', array_map( function( $predicate, $objects ) {
-			return ' ' . $predicate . ' ' . implode( ' , ', $objects );
-		}, array_keys( $predicates ), $predicates ) );
+	private function formatPredicates(array $predicates) {
+		return implode(' ;', array_map(function($predicate, $objects) {
+			return ' ' . $predicate . ' ' . implode(' , ', $objects);
+		}, array_keys($predicates), $predicates));
 	}
 
 	private function formatOptionals() {
-		return implode( array_map( function( $optional ) {
+		return implode(array_map(function($optional) {
 			return ' OPTIONAL {' . $optional . ' }';
-		}, $this->optionals ) );
+		}, $this->optionals));
 	}
 
 	private function formatFilters() {
-		return implode( array_map( function( $filter ) {
+		return implode(array_map(function($filter) {
 			return ' FILTER ' . $filter;
-		}, $this->filters ) );
+		}, $this->filters));
 	}
 
 	private function formatUnions() {
-		return implode( $this->unions );
+		return implode($this->unions);
 	}
 
 	private function formatSubqueries() {
-		return implode( array_map( function( $subquery ) {
+		return implode(array_map(function($subquery) {
 			return ' { ' . $subquery . ' }';
-		}, $this->subqueries ) );
+		}, $this->subqueries));
 	}
 
 }

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":{"bindings":"~=[,,_,,]:3"}}' ) );
+			->will($this->returnValue('{"results":{"bindings":"~=[,,_,,]: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);
 	}
 
 }