darya / framework

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