darya / framework

src/Darya/Service/Facade.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		}
 		
 		if (!method_exists($instance, $method)) {
-			throw new RuntimeException('Call to non-existent method "' . $method . '" on facade instance');
+			throw new RuntimeException('Call to non-existent method "'.$method.'" on facade instance');
 		}
 		
 		return static::$serviceContainer->call(array($instance, $method), $parameters);

src/Darya/Routing/Router.php

Spacing +13 added lines, -13 removed lines

@@ -78,7 +78,7 @@ 
 			$path = preg_replace($pattern, $replacement, $path);

 		}

 		

-		return '#/?^' . $path . '/?$#';

+		return '#/?^'.$path.'/?$#';

 	}

 	

 	/**

@@ -96,9 +96,9 @@ 
 			return $controller;

 		}

 		

-		return preg_replace_callback('/^(.)|-(.)/', function ($matches) {

+		return preg_replace_callback('/^(.)|-(.)/', function($matches) {

 			return strtoupper($matches[1] ?: $matches[2]);

-		}, $controller) . 'Controller';

+		}, $controller).'Controller';

 	}

 	

 	/**

@@ -111,7 +111,7 @@ 
 	 * @return string Action method name

 	 */

 	public static function prepareAction($action) {

-		return preg_replace_callback('/-(.)/', function ($matches) {

+		return preg_replace_callback('/-(.)/', function($matches) {

 			return strtoupper($matches[1]);

 		}, $action);

 	}

@@ -432,15 +432,15 @@ 
 			$controller = static::prepareController($route->controller);

 			

 			if ($route->namespace) {

-				$controller = $route->namespace . '\\' . $controller;

+				$controller = $route->namespace.'\\'.$controller;

 			}

 			

 			if (class_exists($controller)) {

 				$route->controller = $controller;

 			}

 		} else {

-			$namespace = $route->namespace ? $route->namespace . '\\' : '';

-			$route->controller = $namespace . $this->defaults['controller'];

+			$namespace = $route->namespace ? $route->namespace.'\\' : '';

+			$route->controller = $namespace.$this->defaults['controller'];

 		}

 		

 		return $route;

@@ -464,8 +464,8 @@ 
 			

 			if (method_exists($route->controller, $action)) {

 				$route->action = $action;

-			} else if (method_exists($route->controller, $action . 'Action')) {

-				$route->action = $action . 'Action';

+			} else if (method_exists($route->controller, $action.'Action')) {

+				$route->action = $action.'Action';

 			}

 		} else {

 			$route->action = $this->defaults['action'];

@@ -678,7 +678,7 @@ 
 			$response = $this->dispatchCallable($request, $response, $callable, $arguments);

 			$this->unsubscribe($controller);

 			

-			$response->header('X-Location: ' . $request->uri());

+			$response->header('X-Location: '.$request->uri());

 			

 			return $response;

 		}

@@ -712,11 +712,11 @@ 
 	 * @return string

 	 */

 	public function generate($path, array $parameters = array()) {

-		return preg_replace_callback('#/(:[A-Za-z0-9_-]+(\??))#', function ($match) use ($parameters) {

+		return preg_replace_callback('#/(:[A-Za-z0-9_-]+(\??))#', function($match) use ($parameters) {

 			$parameter = trim($match[1], '?:');

 			

 			if ($parameter && isset($parameters[$parameter])) {

-				return '/' . $parameters[$parameter];

+				return '/'.$parameters[$parameter];

 			}

 			

 			if ($parameter !== 'params' && $match[2] !== '?') {

@@ -761,7 +761,7 @@ 
 	 * @return string

 	 */

 	public function url($name, array $parameters = array()) {

-		return $this->base . $this->path($name, $parameters);

+		return $this->base.$this->path($name, $parameters);

 	}

 	

 }

src/Darya/View/Resolver.php

Spacing +1 added lines, -1 removed lines

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

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)
 	{

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/Model/TransformerTrait.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	 * @return mixed
 	 */
 	public function transform($value, $type = '') {
-		$method = 'transform' . ucfirst($type);
+		$method = 'transform'.ucfirst($type);
 		
 		if (method_exists($this, $method)) {
 			return $this->$method($value);

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/ORM/Relation.php

Spacing +4 added lines, -4 removed lines

@@ -199,8 +199,8 @@ 
 		$split = explode('\\', $class);
 		$class = end($split);
 		
-		return preg_replace_callback('/([A-Z])/', function ($matches) {
-			return '_' . strtolower($matches[1]);
+		return preg_replace_callback('/([A-Z])/', function($matches) {
+			return '_'.strtolower($matches[1]);
 		}, lcfirst($class));
 	}
 	
@@ -211,7 +211,7 @@ 
 	 * @return string
 	 */
 	protected function prepareForeignKey($class) {
-		return $this->delimitClass($class) . '_id';
+		return $this->delimitClass($class).'_id';
 	}
 	
 	/**
@@ -373,7 +373,7 @@ 
 		
 		foreach (static::arrayify($instances) as $instance) {
 			if (!$instance instanceof $class) {
-				throw new Exception('Related models must be an instance of ' . $class);
+				throw new Exception('Related models must be an instance of '.$class);
 			}
 		}
 	}

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