darya / framework

src/Darya/Foundation/Providers/HttpService.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	public function register(Container $container)
 	{
 		$container->register(array(
-			'Darya\Http\Request' => function ($container) {
+			'Darya\Http\Request' => function($container) {
 				return Request::createFromGlobals($container->resolve('Darya\Http\Session'));
 			},
 			'Darya\Http\Response' => new Response,

src/Darya/Foundation/Providers/SmartyViewService.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	public function register(Container $container)
 	{
 		$container->register(array(
-			'Darya\Smarty\ViewResolver' => function ($container) {
+			'Darya\Smarty\ViewResolver' => function($container) {
 				$basePath = $container->get('path');
 				$realBasePath = realpath("{$basePath}/views/smarty");
 				

src/Darya/Storage/Filterer.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 	{
 		$filterer = $this;
 		
-		return function ($row) use ($filterer, $filter, $or) {
+		return function($row) use ($filterer, $filter, $or) {
 			return $filterer->matches($row, $filter, $or);
 		};
 	}
@@ -480,7 +480,7 @@ 
 	{
 		$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);
 	}

src/Darya/Routing/Router.php

Spacing +13 added lines, -13 removed lines

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

 		}

 		

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

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

 	}

 	

 	/**

@@ -114,9 +114,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';

 	}

 	

 	/**

@@ -130,7 +130,7 @@ 
 	 */

 	public static function prepareAction($action)

 	{

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

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

 			return strtoupper($matches[1]);

 		}, $action);

 	}

@@ -471,15 +471,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;

@@ -504,8 +504,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'];

@@ -726,7 +726,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;

 		}

@@ -762,11 +762,11 @@ 
 	 */

 	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] !== '?') {

@@ -813,6 +813,6 @@ 
 	 */

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

 	{

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

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

 	}

 }

src/Darya/View/AbstractView.php

Spacing +3 added lines, -3 removed lines

@@ -105,8 +105,8 @@ 
 	 */
 	public static function registerExtensions($extensions)
 	{
-		$extensions = array_map(function ($extension) {
-			return '.' . ltrim(trim($extension), '.');
+		$extensions = array_map(function($extension) {
+			return '.'.ltrim(trim($extension), '.');
 		}, (array) $extensions);
 		
 		static::$extensions = array_merge(static::$extensions, $extensions);
@@ -222,7 +222,7 @@ 
 		
 		foreach ($extensions as $extension) {
 			if (static::$basePath) {
-				$paths[] = static::$basePath . "/$path$extension";
+				$paths[] = static::$basePath."/$path$extension";
 			}
 			
 			$paths[] = "$path$extension";

src/Darya/ORM/Model/TransformerTrait.php

Spacing +1 added lines, -1 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	 * options.
 	 * 
 	 * @param string       $table
-	 * @param array|string $columns
+	 * @param string $columns
 	 * @param string       $joins     [optional]
 	 * @param string       $where     [optional]
 	 * @param string       $order     [optional]

src/Darya/ORM/Record.php

Spacing +9 added lines, -9 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function get($attribute)
 	{
-		list($attribute, $subattribute) = array_pad(explode('.',  $attribute, 2), 2, null);
+		list($attribute, $subattribute) = array_pad(explode('.', $attribute, 2), 2, null);
 		
 		if ($this->hasRelation($attribute)) {
 			$related = $this->related($attribute);
@@ -155,9 +155,9 @@ 
 		$split = explode('\\', get_class($this));
 		$class = end($split);
 		
-		return preg_replace_callback('/([A-Z])/', function ($matches) {
-			return '_' . strtolower($matches[1]);
-		}, lcfirst($class)) . 's';
+		return preg_replace_callback('/([A-Z])/', function($matches) {
+			return '_'.strtolower($matches[1]);
+		}, lcfirst($class)).'s';
 	}
 	
 	/**
@@ -411,7 +411,7 @@ 
 		$storage = $instance->storage();
 		
 		if (!$storage instanceof Searchable) {
-			throw new Exception(get_class($instance) . ' storage is not searchable');
+			throw new Exception(get_class($instance).' storage is not searchable');
 		}
 		
 		$attributes = $attributes ?: $instance->defaultSearchAttributes();
@@ -476,13 +476,13 @@ 
 		$storage = $instance->storage();
 		
 		if (!$storage instanceof Queryable) {
-			throw new Exception(get_class($instance) . ' storage is not queryable');
+			throw new Exception(get_class($instance).' storage is not queryable');
 		}
 		
 		$query = new Query($instance->table());
 		$builder = new Builder($query, $storage);
 		
-		$builder->callback(function ($result) use ($instance) {
+		$builder->callback(function($result) use ($instance) {
 			return $instance::hydrate($result->data);
 		});
 		
@@ -563,7 +563,7 @@ 
 		
 		// Storage must be modifiable in order to save
 		if (!$storage instanceof Modifiable) {
-			throw new Exception($class . ' storage is not modifiable');
+			throw new Exception($class.' storage is not modifiable');
 		}
 		
 		// Create or update the model in storage
@@ -797,6 +797,6 @@ 
 			return $this->relation($method);
 		}
 		
-		throw new Exception('Call to undefined method ' . get_class($this) . '::' . $method . '()');
+		throw new Exception('Call to undefined method '.get_class($this).'::'.$method.'()');
 	}
 }

src/Darya/ORM/Relation.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 namespace Darya\ORM;
 
 use Darya\ORM\Record;
-use Darya\Storage\Readable;
-use Darya\Storage\Modifiable;
 use Darya\Storage\Queryable;
 use Darya\Storage\Query\Builder;
 use Exception;

Spacing +7 added lines, -7 removed lines

@@ -247,8 +247,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));
 	}
 	
@@ -260,7 +260,7 @@ 
 	 */
 	protected function prepareForeignKey($class)
 	{
-		return $this->delimitClass($class) . '_id';
+		return $this->delimitClass($class).'_id';
 	}
 	
 	/**
@@ -428,7 +428,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);
 			}
 		}
 	}
@@ -578,7 +578,7 @@ 
 			->filters($this->filter())
 			->orders($this->order());
 
-		$builder->callback(function ($result) use ($class) {
+		$builder->callback(function($result) use ($class) {
 			return $class::hydrate($result->data);
 		});
 
@@ -788,7 +788,7 @@ 
 		
 		// Filter the IDs to associate and dissociate if any have been given
 		if (!empty($ids)) {
-			$filter = function ($instance) use ($ids) {
+			$filter = function($instance) use ($ids) {
 				return in_array($instance->id(), $ids);
 			};
 			
@@ -802,7 +802,7 @@ 
 		}
 		
 		// Dissociate, then associate
-		if  (!empty($detached)) {
+		if (!empty($detached)) {
 			$this->dissociate($detached);
 		}