darya / framework

src/Darya/Foundation/Providers/DatabaseConnectionService.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	public function register(Container $container)
 	{
 		$container->register(array(
-			'Darya\Database\Connection' => function ($container) {
+			'Darya\Database\Connection' => function($container) {
 				$config = $container->config;
 				
 				$connection = new MySql(

src/Darya/Foundation/Providers/RoutingService.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	public function register(Container $container)
 	{
 		$container->register(array(
-			'Darya\Routing\Router' => function ($container) {
+			'Darya\Routing\Router' => function($container) {
 				$config = $container->config;
 				
 				$routes = $config['routes'] ?: array(

src/Darya/Foundation/Providers/ConfigurationService.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	public function register(Container $container)
 	{
 		$container->register(array(
-			'Darya\Foundation\Configuration' => function (Application $application) {
+			'Darya\Foundation\Configuration' => function(Application $application) {
 				$basePath = $application->basePath();
 				
 				// Load the application's configuration

src/Darya/Foundation/Providers/DebugService.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 		
 		ini_set('display_errors', 1);
 		
-		$listener = function ($result) {
+		$listener = function($result) {
 			Chrome::log(array($result->query->string, json_encode($result->query->parameters)));
 			
 			if ($result->error) {

src/Darya/Database/Query/AbstractSqlTranslator.php

Doc Comments +2 added lines, -2 removed lines

@@ -483,7 +483,7 @@ 
 	/**
 	 * Prepare table joins.
 	 * 
-	 * @param array $joins
+	 * @param Join[] $joins
 	 * @return string
 	 */
 	protected function prepareJoins(array $joins) {
@@ -639,7 +639,7 @@ 
 	 *       translateRead().
 	 * 
 	 * @param string       $table
-	 * @param array|string $columns
+	 * @param string $columns
 	 * @param string       $joins    [optional]
 	 * @param string       $where    [optional]
 	 * @param string       $order    [optional]

Braces +3 added lines, -2 removed lines

@@ -823,8 +823,9 @@
 		
 		$joinParameters = array();
 		
-		if ($storageQuery instanceof Database\Storage\Query)
-			$joinParameters = $this->joinParameters($storageQuery->joins);
+		if ($storageQuery instanceof Database\Storage\Query) {
+					$joinParameters = $this->joinParameters($storageQuery->joins);
+		}
 		
 		$parameters = array_merge(
 			$parameters,

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
 	public function translate(Storage\Query $storageQuery) {
 		$type = $storageQuery->type;
 		
-		$method = 'translate' . ucfirst($type);
+		$method = 'translate'.ucfirst($type);
 		
 		if (!method_exists($this, $method)) {
 			throw new InvalidArgumentException("Could not translate query of unknown type '$type'");
@@ -228,7 +228,7 @@ 
 	 */
 	protected function translateTranslatable($query) {
 		if (!$this->translatable($query)) {
-			throw new InvalidArgumentException("Cannot translate query of type '" . get_class($query) . "'");
+			throw new InvalidArgumentException("Cannot translate query of type '".get_class($query)."'");
 		}
 		
 		if ($query instanceof Storage\Query\Builder) {
@@ -410,7 +410,7 @@ 
 	 */
 	protected function prepareJoinType($type) {
 		if (in_array($type, array('left', 'right'))) {
-			return strtoupper($type) . ' JOIN';
+			return strtoupper($type).' JOIN';
 		}
 		
 		return 'JOIN';
@@ -535,7 +535,7 @@ 
 		}
 		
 		if (is_array($value)) {
-			$value = "(" . implode(", ", $value) . ")";
+			$value = "(".implode(", ", $value).")";
 		}
 		
 		return "$column $operator $value";
@@ -554,7 +554,7 @@ 
 		
 		foreach ($filter as $column => $value) {
 			if (strtolower($column) == 'or') {
-				$conditions[] = '(' . $this->prepareWhere($value, 'OR', true) . ')';
+				$conditions[] = '('.$this->prepareWhere($value, 'OR', true).')';
 			} else {
 				$conditions[] = $this->prepareFilterCondition($column, $value);
 			}
@@ -630,7 +630,7 @@ 
 			}
 		}
 		
-		return count($conditions) ? 'ORDER BY ' . implode(', ', $conditions) : null;
+		return count($conditions) ? 'ORDER BY '.implode(', ', $conditions) : null;
 	}
 	
 	/**
@@ -674,8 +674,8 @@ 
 		$columns = $this->identifier(array_keys($data));
 		$values  = $this->value(array_values($data));
 		
-		$columns = "(" . implode(", ", $columns) . ")";
-		$values  = "(" . implode(", ", $values) . ")";
+		$columns = "(".implode(", ", $columns).")";
+		$values  = "(".implode(", ", $values).")";
 		
 		return static::concatenate(array('INSERT INTO', $table, $columns, 'VALUES', $values));
 	}
@@ -694,7 +694,7 @@ 
 		
 		if (!empty($columns)) {
 			$columns = $this->identifier($columns);
-			$columns = "(" . implode(", ", $columns) . ")";
+			$columns = "(".implode(", ", $columns).")";
 		}
 		
 		$subquery = (string) $this->translate($subquery);

src/Darya/Database/Storage/Query/Join.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 	 * Instantiate a new join.
 	 * 
 	 * @param string $type
-	 * @param string $to
+	 * @param string $resource
 	 */
 	public function __construct($type, $resource)
 	{

autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <?php
 // Composer's autoloader
-if (is_file(__DIR__ . '/../../autoload.php')) {
-	include __DIR__ . '/../../autoload.php';
+if (is_file(__DIR__.'/../../autoload.php')) {
+	include __DIR__.'/../../autoload.php';
 }
 
 // Darya's autoloader
-include __DIR__ . '/src/Darya/Foundation/Autoloader.php';
+include __DIR__.'/src/Darya/Foundation/Autoloader.php';
 
 use Darya\Foundation\Autoloader;
 
 // Base path wherever it's included from, absolute path to the framework
 $autoloader = new Autoloader(realpath('./'), array(
-	'Darya' => realpath(__DIR__ . '/src')
+	'Darya' => realpath(__DIR__.'/src')
 ));
 
 $autoloader->register();

src/Darya/Http/Request.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
 		$data['server']['request_method'] = strtoupper($method);
 		
 		if ($components['query']) {
-			$data['server']['request_uri'] .= '?' . $components['query'];
+			$data['server']['request_uri'] .= '?'.$components['query'];
 		}
 		
 		$request = new Request(

src/Darya/Storage/Filterer.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
 	public function closure(array $filter, $or = false) {
 		$filterer = $this;
 		
-		return function ($row) use ($filterer, $filter, $or) {
+		return function($row) use ($filterer, $filter, $or) {
 			return $filterer->matches($row, $filter, $or);
 		};
 	}
@@ -455,7 +455,7 @@ 
 	protected function like($actual, $value) {
 		$value = preg_quote($value, '/');
 		
-		$pattern = '/' . preg_replace(array('/([^\\\])?_/', '/([^\\\])?%/'), array('$1.', '$1.*'), $value) . '/i';
+		$pattern = '/'.preg_replace(array('/([^\\\])?_/', '/([^\\\])?%/'), array('$1.', '$1.*'), $value).'/i';
 		
 		return preg_match($pattern, $actual);
 	}