darya / framework

src/Darya/Foundation/Autoloader.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	public function basePath($basePath = null)
 	{
-		$this->basePath = $basePath ?: realpath(__DIR__ . '/../../');
+		$this->basePath = $basePath ?: realpath(__DIR__.'/../../');
 		
 		return $this->basePath;
 	}
@@ -131,19 +131,19 @@ 
 				$nsBasePaths = array('');
 				
 				if ($this->basePath) {
-					$nsBasePaths[] = $this->basePath . '/';
+					$nsBasePaths[] = $this->basePath.'/';
 				}
 				
 				foreach ($nsBasePaths as $nsBasePath) {
 					if ($class === $ns) {
 						array_push($paths, "$nsBasePath$nsPath");
 						array_push($paths, "$nsBasePath$nsPath/$className.php");
-						array_push($paths, "$nsBasePath" . strtolower($nsPath) . "/$className.php");
+						array_push($paths, "$nsBasePath".strtolower($nsPath)."/$className.php");
 					}
 					
 					if (strpos($class, $ns) === 0) {
 						array_push($paths, "$nsBasePath$nsPath/$dir/$className.php");
-						array_push($paths, "$nsBasePath" . strtolower("$nsPath/$dir") . "/$className.php");
+						array_push($paths, "$nsBasePath".strtolower("$nsPath/$dir")."/$className.php");
 						
 						$nsRemain = str_replace('\\', '/', substr($class, strlen($ns)));
 						array_push($paths, "$nsBasePath$nsPath/$nsRemain.php");
@@ -151,32 +151,32 @@ 
 						
 						$nsRemainDir = dirname($nsRemain);
 						$nsRemainFile = basename($nsRemain);
-						array_push($paths, "$nsBasePath$nsPath/" . strtolower($nsRemainDir) . "/$nsRemainFile.php");
+						array_push($paths, "$nsBasePath$nsPath/".strtolower($nsRemainDir)."/$nsRemainFile.php");
 					}
 				}
 			}
 		}
 		
 		// Try using the namespace as an exact directory mapping
-		array_push($paths, $this->basePath . "/$dir/$className.php");
+		array_push($paths, $this->basePath."/$dir/$className.php");
 		
 		// Try using the namespace in lowercase as a directory mapping, with
 		// only the class name in its original case
 		$dirLowercase = strtolower($dir);
-		array_push($paths, $this->basePath . "/$dirLowercase/$className.php");
+		array_push($paths, $this->basePath."/$dirLowercase/$className.php");
 		
 		// Last try using the last part of the namespace as a subdirectory, with
 		// and without a trailing 's', as well as any common subdirectory names
 		$subdirs = array_merge($this->commonSubdirs, array(
 			$className,
-			$className . 's',
+			$className.'s',
 		));
 		
 		foreach ($subdirs as $subdir) {
-			array_push($paths, $this->basePath . "/$dir/$subdir/$className.php");
+			array_push($paths, $this->basePath."/$dir/$subdir/$className.php");
 			
 			$subdirLowercase = strtolower($subdir);
-			array_push($paths, $this->basePath . "/$dirLowercase/$subdirLowercase/$className.php");
+			array_push($paths, $this->basePath."/$dirLowercase/$subdirLowercase/$className.php");
 		}
 		
 		// Finally, attempt to find the class

src/Darya/ORM/Relation/BelongsToMany.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 		$names = array($parent, $target);
 		sort($names);
 		
-		$this->table = implode('_', $names) . 's';
+		$this->table = implode('_', $names).'s';
 	}
 	
 	/**

src/Darya/Storage/Sorter.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 			$item = array($index++, $item);
 		}
 		
-		usort($data, function ($a, $b) use ($order) {
+		usort($data, function($a, $b) use ($order) {
 			foreach ($order as $field => $direction) {
 				if (!isset($a[1][$field]) || !isset($b[1][$field])) {
 					continue;

src/Darya/Storage/AbstractResult.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 	 */
 	protected static function snakeToCamel($string)
 	{
-		return preg_replace_callback('/_(.)/', function ($matches) {
+		return preg_replace_callback('/_(.)/', function($matches) {
 			return strtoupper($matches[1]);
 		}, $string);
 	}

src/Darya/Events/Dispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	{
 		$this->touch($event);
 		
-		$this->listeners[$event] = array_filter($this->listeners[$event], function ($value) use ($callable) {
+		$this->listeners[$event] = array_filter($this->listeners[$event], function($value) use ($callable) {
 			return $value !== $callable;
 		});
 	}

src/Darya/ORM/Model.php

Spacing +1 added lines, -1 removed lines

@@ -391,7 +391,7 @@
 	 */
 	public function setMany($values)
 	{
-		foreach ((array) $values as $attribute => $value){
+		foreach ((array) $values as $attribute => $value) {
 			$this->set($attribute, $value);
 		}
 	}

src/Darya/View/Resolver.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	 * Normalise the given path.
 	 * 
 	 * @param string $path
-	 * @return path
+	 * @return string
 	 */
 	public static function normalise($path)
 	{

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 	public function registerExtensions($extensions)
 	{
 		foreach ((array) $extensions as $extension) {
-			$this->extensions[] = '.' . ltrim($extension, '.');
+			$this->extensions[] = '.'.ltrim($extension, '.');
 		}
 	}
 	

src/Darya/Database/Query/AbstractSqlTranslator.php

Spacing +12 added lines, -12 removed lines

@@ -45,7 +45,7 @@ 
 	 */
 	protected static function concatenate($strings, $delimiter = ' ')
 	{
-		$strings = array_filter($strings, function ($value) {
+		$strings = array_filter($strings, function($value) {
 			return !empty($value);
 		});
 		
@@ -78,7 +78,7 @@ 
 	{
 		$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'");
@@ -248,7 +248,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) {
@@ -259,7 +259,7 @@ 
 			return $this->translate($query);
 		}
 		
-		throw new InvalidArgumentException("Cannot translate query of type '" . get_class($query) . "'");
+		throw new InvalidArgumentException("Cannot translate query of type '".get_class($query)."'");
 	}
 	
 	/**
@@ -442,7 +442,7 @@ 
 	protected function prepareJoinType($type)
 	{
 		if (in_array($type, array('left', 'right'))) {
-			return strtoupper($type) . ' JOIN';
+			return strtoupper($type).' JOIN';
 		}
 		
 		return 'JOIN';
@@ -573,7 +573,7 @@ 
 		}
 		
 		if (is_array($value)) {
-			$value = "(" . implode(", ", $value) . ")";
+			$value = "(".implode(", ", $value).")";
 		}
 		
 		return "$column $operator $value";
@@ -593,7 +593,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);
 			}
@@ -672,7 +672,7 @@ 
 			}
 		}
 		
-		return count($conditions) ? 'ORDER BY ' . implode(', ', $conditions) : null;
+		return count($conditions) ? 'ORDER BY '.implode(', ', $conditions) : null;
 	}
 	
 	/**
@@ -692,7 +692,7 @@ 
 	 */
 	protected function prepareGroupBy(array $groupings)
 	{
-		return count($groupings) ? 'GROUP BY ' . implode(', ', $this->identifier($groupings)) : null;
+		return count($groupings) ? 'GROUP BY '.implode(', ', $this->identifier($groupings)) : null;
 	}
 	
 	/**
@@ -757,8 +757,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));
 	}
@@ -778,7 +778,7 @@ 
 		
 		if (!empty($columns)) {
 			$columns = $this->identifier($columns);
-			$columns = "(" . implode(", ", $columns) . ")";
+			$columns = "(".implode(", ", $columns).")";
 		}
 		
 		$subquery = (string) $this->translate($subquery);

Doc Comments +2 added lines, -2 removed lines

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

src/Darya/Database/Query/Translator/MySql.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 			$query .= "$offset, ";
 		}
 		
-		return $query . $limit;
+		return $query.$limit;
 	}
 	
 	/**