analogueorm / analogue

src/helpers.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 use Analogue\ORM\System\Manager;
 
-if (! function_exists('analogue')) {
+if (!function_exists('analogue')) {
 
     /**
      * Return analogue's manager instance
@@ -17,7 +17,7 @@ 
 }
 
 
-if (! function_exists('mapper')) {
+if (!function_exists('mapper')) {
 
     /**
      * Create a mapper for a given entity (static alias)

Indentation +20 added lines, -20 removed lines

@@ -4,29 +4,29 @@
 
 if (! function_exists('analogue')) {
 
-    /**
-     * Return analogue's manager instance
-     * 
-     * @return \Analogue\ORM\System\Manager
-     */
-    function analogue()
-    {
-        return Manager::getInstance();
-    }
+	/**
+	 * Return analogue's manager instance
+	 * 
+	 * @return \Analogue\ORM\System\Manager
+	 */
+	function analogue()
+	{
+		return Manager::getInstance();
+	}
 }
 
 
 if (! function_exists('mapper')) {
 
-    /**
-     * Create a mapper for a given entity (static alias)
-     * 
-     * @param \Analogue\ORM\Mappable|string $entity
-     * @param mixed $entityMap 
-     * @return Mapper
-     */
-    function mapper($entity, $entityMap = null)
-    {
-        return Manager::getMapper($entity, $entityMap);
-    }
+	/**
+	 * Create a mapper for a given entity (static alias)
+	 * 
+	 * @param \Analogue\ORM\Mappable|string $entity
+	 * @param mixed $entityMap 
+	 * @return Mapper
+	 */
+	function mapper($entity, $entityMap = null)
+	{
+		return Manager::getMapper($entity, $entityMap);
+	}
 }

src/System/Wrappers/Wrapper.php

Indentation +113 added lines, -113 removed lines

@@ -11,117 +11,117 @@
  */
 abstract class Wrapper implements InternallyMappable
 {
-    /**
-     * Original Entity Object
-     *
-     * @var mixed
-     */
-    protected $entity;
-
-    /**
-     * Corresponding EntityMap
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $entityMap;
-
-    /**
-     * Wrapper constructor.
-     * @param $entity
-     * @param $entityMap
-     */
-    public function __construct($entity, $entityMap)
-    {
-        $this->entity = $entity;
-        $this->entityMap = $entityMap;
-    }
-
-    /**
-     * Return the wrapped entity class
-     *
-     * @return mixed
-     */
-    public function getEntityClass()
-    {
-        return get_class($this->entity);
-    }
-
-    /**
-     * Returns the wrapped entity
-     *
-     * @return mixed
-     */
-    public function getObject()
-    {
-        return $this->entity;
-    }
-
-    /**
-     * Returns the wrapped entity's map
-     *
-     * @return mixed
-     */
-    public function getMap()
-    {
-        return $this->entityMap;
-    }
-
-    /**
-     * Set the lazyloading proxies on the wrapped entity objet
-     *
-     * @return void
-     */
-    public function setProxies()
-    {
-        $attributes = $this->getEntityAttributes();
-        $singleRelations = $this->entityMap->getSingleRelationships();
-        $manyRelations = $this->entityMap->getManyRelationships();
-
-        $proxies = [];
-
-        foreach ($this->entityMap->getRelationships() as $relation) {
-            if (!array_key_exists($relation, $attributes) || is_null($attributes[$relation])) {
-                if (in_array($relation, $singleRelations)) {
-                    $proxies[$relation] = new EntityProxy($this->getObject(), $relation);
-                }
-                if (in_array($relation, $manyRelations)) {
-                    $proxies[$relation] = new CollectionProxy($this->getObject(), $relation);
-                }
-            }
-        }
-
-        foreach ($proxies as $key => $value) {
-            $this->setEntityAttribute($key, $value);
-        }
-    }
-
-    /**
-     * @param string $key
-     * @param string $value
-     * @return mixed
-     */
-    abstract public function setEntityAttribute($key, $value);
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    abstract public function getEntityAttribute($key);
-
-    /**
-     * @param array $attributes
-     * @return mixed
-     */
-    abstract public function setEntityAttributes(array $attributes);
-
-    /**
-     * @return mixed
-     */
-    abstract public function getEntityAttributes();
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    abstract public function hasAttribute($key);
+	/**
+	 * Original Entity Object
+	 *
+	 * @var mixed
+	 */
+	protected $entity;
+
+	/**
+	 * Corresponding EntityMap
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $entityMap;
+
+	/**
+	 * Wrapper constructor.
+	 * @param $entity
+	 * @param $entityMap
+	 */
+	public function __construct($entity, $entityMap)
+	{
+		$this->entity = $entity;
+		$this->entityMap = $entityMap;
+	}
+
+	/**
+	 * Return the wrapped entity class
+	 *
+	 * @return mixed
+	 */
+	public function getEntityClass()
+	{
+		return get_class($this->entity);
+	}
+
+	/**
+	 * Returns the wrapped entity
+	 *
+	 * @return mixed
+	 */
+	public function getObject()
+	{
+		return $this->entity;
+	}
+
+	/**
+	 * Returns the wrapped entity's map
+	 *
+	 * @return mixed
+	 */
+	public function getMap()
+	{
+		return $this->entityMap;
+	}
+
+	/**
+	 * Set the lazyloading proxies on the wrapped entity objet
+	 *
+	 * @return void
+	 */
+	public function setProxies()
+	{
+		$attributes = $this->getEntityAttributes();
+		$singleRelations = $this->entityMap->getSingleRelationships();
+		$manyRelations = $this->entityMap->getManyRelationships();
+
+		$proxies = [];
+
+		foreach ($this->entityMap->getRelationships() as $relation) {
+			if (!array_key_exists($relation, $attributes) || is_null($attributes[$relation])) {
+				if (in_array($relation, $singleRelations)) {
+					$proxies[$relation] = new EntityProxy($this->getObject(), $relation);
+				}
+				if (in_array($relation, $manyRelations)) {
+					$proxies[$relation] = new CollectionProxy($this->getObject(), $relation);
+				}
+			}
+		}
+
+		foreach ($proxies as $key => $value) {
+			$this->setEntityAttribute($key, $value);
+		}
+	}
+
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return mixed
+	 */
+	abstract public function setEntityAttribute($key, $value);
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	abstract public function getEntityAttribute($key);
+
+	/**
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	abstract public function setEntityAttributes(array $attributes);
+
+	/**
+	 * @return mixed
+	 */
+	abstract public function getEntityAttributes();
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	abstract public function hasAttribute($key);
 }

src/Drivers/IlluminateDBAdapter.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     /**
      * Return a new Query instance for this driver
      *
-     * @return QueryAdapter
+     * @return IlluminateQueryBuilder
      */
     public function getQuery()
     {

Indentation +56 added lines, -56 removed lines

@@ -10,68 +10,68 @@
  */
 class IlluminateDBAdapter implements DBAdapter
 {
-    /**
-     * @var Connection
-     */
-    protected $connection;
+	/**
+	 * @var Connection
+	 */
+	protected $connection;
 
-    /**
-     * IlluminateDBAdapter constructor.
-     * @param Connection $connection
-     */
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-    }
+	/**
+	 * IlluminateDBAdapter constructor.
+	 * @param Connection $connection
+	 */
+	public function __construct(Connection $connection)
+	{
+		$this->connection = $connection;
+	}
 
-    /**
-     * Return a new Query instance for this driver
-     *
-     * @return QueryAdapter
-     */
-    public function getQuery()
-    {
-        $connection = $this->connection;
+	/**
+	 * Return a new Query instance for this driver
+	 *
+	 * @return QueryAdapter
+	 */
+	public function getQuery()
+	{
+		$connection = $this->connection;
 
-        $grammar = $connection->getQueryGrammar();
+		$grammar = $connection->getQueryGrammar();
 
-        return new IlluminateQueryBuilder($connection, $grammar, $connection->getPostProcessor());
-    }
+		return new IlluminateQueryBuilder($connection, $grammar, $connection->getPostProcessor());
+	}
 
-    /**
-     * Get the date format supported by the current connection
-     *
-     * @return string
-     */
-    public function getDateFormat()
-    {
-        return $this->connection->getQueryGrammar()->getDateFormat();
-    }
+	/**
+	 * Get the date format supported by the current connection
+	 *
+	 * @return string
+	 */
+	public function getDateFormat()
+	{
+		return $this->connection->getQueryGrammar()->getDateFormat();
+	}
 
-    /**
-     * Start a DB transaction on driver that supports it.
-     * @return void
-     */
-    public function beginTransaction()
-    {
-        $this->connection->beginTransaction();
-    }
+	/**
+	 * Start a DB transaction on driver that supports it.
+	 * @return void
+	 */
+	public function beginTransaction()
+	{
+		$this->connection->beginTransaction();
+	}
 
-    /**
-     * Commit a DB transaction on driver that supports it.
-     * @return void
-     */
-    public function commit()
-    {
-        $this->connection->commit();
-    }
+	/**
+	 * Commit a DB transaction on driver that supports it.
+	 * @return void
+	 */
+	public function commit()
+	{
+		$this->connection->commit();
+	}
 
-    /**
-     * Rollback a DB transaction
-     * @return void
-     */
-    public function rollback()
-    {
-        $this->connection->rollBack();
-    }
+	/**
+	 * Rollback a DB transaction
+	 * @return void
+	 */
+	public function rollback()
+	{
+		$this->connection->rollBack();
+	}
 }

src/System/Mapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
     /**
      * Get a the Underlying QueryAdapter.
      *
-     * @return \Analogue\ORM\Drivers\QueryAdapter
+     * @return \Illuminate\Database\Query\Builder
      */
     public function newQueryBuilder()
     {

Indentation +550 added lines, -550 removed lines

@@ -25,555 +25,555 @@
  */
 class Mapper
 {
-    /**
-     * The Manager instance
-     *
-     * @var \Analogue\ORM\System\Manager
-     */
-    protected $manager;
-
-    /**
-     * Instance of EntityMapper Object
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $entityMap;
-
-    /**
-     * The instance of db adapter
-     *
-     * @var \Analogue\ORM\Drivers\DBAdapter
-     */
-    protected $adapter;
-
-
-    /**
-     * Event dispatcher instance
-     *
-     * @var \Illuminate\Contracts\Events\Dispatcher
-     */
-    protected $dispatcher;
-
-    /**
-     * Entity Cache
-     *
-     * @var  \Analogue\ORM\System\EntityCache
-     */
-    protected $cache;
-
-    /**
-     * Global scopes
-     *
-     * @var array
-     */
-    protected $globalScopes = [];
-
-    /**
-     * Custom Commands
-     *
-     * @var array
-     */
-    protected $customCommands = [];
-
-    /**
-     * @param EntityMap  $entityMap
-     * @param DBAdapter  $adapter
-     * @param Dispatcher $dispatcher
-     * @param Manager    $manager
-     */
-    public function __construct(EntityMap $entityMap, DBAdapter $adapter, Dispatcher $dispatcher, Manager $manager)
-    {
-        $this->entityMap = $entityMap;
-
-        $this->adapter = $adapter;
-
-        $this->dispatcher = $dispatcher;
-
-        $this->manager = $manager;
-
-        $this->cache = new EntityCache($entityMap);
-    }
-
-    /**
-     * Persist an entity or an entity collection into the database
-     *
-     * @param  Mappable|\Traversable|array $entity
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     * @return Mappable|\Traversable|array
-     */
-    public function store($entity)
-    {
-        if ($this->manager->isTraversable($entity)) {
-            return $this->storeCollection($entity);
-        } else {
-            return $this->storeEntity($entity);
-        }
-    }
-
-    /**
-     * Store an entity collection inside a single DB Transaction
-     *
-     * @param  \Traversable|array $entities
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     * @return \Traversable|array
-     */
-    protected function storeCollection($entities)
-    {
-        $this->adapter->beginTransaction();
-
-        foreach ($entities as $entity) {
-            $this->storeEntity($entity);
-        }
-
-        $this->adapter->commit();
-
-        return $entities;
-    }
-
-    /**
-     * Store a single entity into the database
-     *
-     * @param  Mappable $entity
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     * @return \Analogue\ORM\Entity
-     */
-    protected function storeEntity($entity)
-    {
-        $this->checkEntityType($entity);
-
-        $store = new Store($this->aggregate($entity), $this->newQueryBuilder());
-
-        return $store->execute();
-    }
-
-    /**
-     * Check that the entity correspond to the current mapper.
-     *
-     * @param  mixed $entity
-     * @throws InvalidArgumentException
-     * @return void
-     */
-    protected function checkEntityType($entity)
-    {
-        if (get_class($entity) != $this->entityMap->getClass()) {
-            $expected = $this->entityMap->getClass();
-            $actual = get_class($entity);
-            throw new InvalidArgumentException("Expected : $expected, got $actual.");
-        }
-    }
-
-    /**
-     * Convert an entity into an aggregate root
-     *
-     * @param  mixed $entity
-     * @throws MappingException
-     * @return \Analogue\ORM\System\Aggregate
-     */
-    protected function aggregate($entity)
-    {
-        return new Aggregate($entity);
-    }
-
-    /**
-     * Get a the Underlying QueryAdapter.
-     *
-     * @return \Analogue\ORM\Drivers\QueryAdapter
-     */
-    public function newQueryBuilder()
-    {
-        return $this->adapter->getQuery();
-    }
-
-    /**
-     * Delete an entity or an entity collection from the database
-     *
-     * @param  Mappable|\Traversable|array
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     * @return \Traversable|array
-     */
-    public function delete($entity)
-    {
-        if ($this->manager->isTraversable($entity)) {
-            return $this->deleteCollection($entity);
-        } else {
-            $this->deleteEntity($entity);
-        }
-    }
-
-    /**
-     * Delete an Entity Collection inside a single db transaction
-     *
-     * @param  \Traversable|array $entities
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     * @return \Traversable|array
-     */
-    protected function deleteCollection($entities)
-    {
-        $this->adapter->beginTransaction();
-
-        foreach ($entities as $entity) {
-            $this->deleteEntity($entity);
-        }
-
-        $this->adapter->commit();
-
-        return $entities;
-    }
-
-    /**
-     * Delete a single entity from the database.
-     *
-     * @param  Mappable $entity
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     * @return void
-     */
-    protected function deleteEntity($entity)
-    {
-        $this->checkEntityType($entity);
-
-        $delete = new Delete($this->aggregate($entity), $this->newQueryBuilder());
-
-        $delete->execute();
-    }
-
-    /**
-     * Return the entity map for this mapper
-     *
-     * @return EntityMap
-     */
-    public function getEntityMap()
-    {
-        return $this->entityMap;
-    }
-
-    /**
-     * Get the entity cache for the current mapper
-     *
-     * @return EntityCache  $entityCache
-     */
-    public function getEntityCache()
-    {
-        return $this->cache;
-    }
-
-    /**
-     * Fire the given event for the entity
-     *
-     * @param  string               $event
-     * @param  \Analogue\ORM\Entity $entity
-     * @param  bool                 $halt
-     * @throws InvalidArgumentException
-     * @return mixed
-     */
-    public function fireEvent($event, $entity, $halt = true)
-    {
-        if ($entity instanceof Wrapper) {
-            throw new InvalidArgumentException('Fired Event with invalid Entity Object');
-        }
-
-        $event = "analogue.{$event}." . $this->entityMap->getClass();
-
-        $method = $halt ? 'until' : 'fire';
-
-        return $this->dispatcher->$method($event, $entity);
-    }
-
-    /**
-     * Register an entity event with the dispatcher.
-     *
-     * @param  string   $event
-     * @param  \Closure $callback
-     * @return void
-     */
-    public function registerEvent($event, $callback)
-    {
-        $name = $this->entityMap->getClass();
-
-        $this->dispatcher->listen("analogue.{$event}.{$name}", $callback);
-    }
-
-    /**
-     * Add a global scope to this mapper query builder
-     *
-     * @param  ScopeInterface $scope
-     * @return void
-     */
-    public function addGlobalScope(ScopeInterface $scope)
-    {
-        $this->globalScopes[get_class($scope)] = $scope;
-    }
-
-    /**
-     * Determine if the mapper has a global scope.
-     *
-     * @param  \Analogue\ORM\System\ScopeInterface $scope
-     * @return bool
-     */
-    public function hasGlobalScope($scope)
-    {
-        return !is_null($this->getGlobalScope($scope));
-    }
-
-    /**
-     * Get a global scope registered with the modal.
-     *
-     * @param  \Analogue\ORM\System\ScopeInterface $scope
-     * @return \Analogue\ORM\System\ScopeInterface|null
-     */
-    public function getGlobalScope($scope)
-    {
-        return array_first($this->globalScopes, function ($key, $value) use ($scope) {
-            return $scope instanceof $value;
-        });
-    }
-
-    /**
-     * Get a new query instance without a given scope.
-     *
-     * @param  \Analogue\ORM\System\ScopeInterface $scope
-     * @return \Analogue\ORM\System\Query
-     */
-    public function newQueryWithoutScope($scope)
-    {
-        $this->getGlobalScope($scope)->remove($query = $this->getQuery(), $this);
-
-        return $query;
-    }
-
-    /**
-     * Get the Analogue Query Builder for this instance
-     *
-     * @return \Analogue\ORM\System\Query
-     */
-    public function getQuery()
-    {
-        $query = new Query($this, $this->adapter);
-
-        return $this->applyGlobalScopes($query);
-    }
-
-    /**
-     * Apply all of the global scopes to an Analogue Query builder.
-     *
-     * @param Query $query
-     * @return \Analogue\ORM\System\Query
-     */
-    public function applyGlobalScopes($query)
-    {
-        foreach ($this->getGlobalScopes() as $scope) {
-            $scope->apply($query, $this);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Get the global scopes for this class instance.
-     *
-     * @return \Analogue\ORM\System\ScopeInterface
-     */
-    public function getGlobalScopes()
-    {
-        return $this->globalScopes;
-    }
-
-    /**
-     * Add a dynamic method that extends the mapper/repository
-     *
-     * @param string $command
-     */
-    public function addCustomCommand($command)
-    {
-        $name = lcfirst(class_basename($command));
-
-        $this->customCommands[$name] = $command;
-    }
-
-    /**
-     * Create a new instance of the mapped entity class
-     *
-     * @return mixed
-     */
-    public function newInstance()
-    {
-        $class = $this->entityMap->getClass();
-
-        if($this->entityMap->useDependencyInjection()) {
-            return $this->newInstanceUsingDependencyInjection($class);
-        } 
+	/**
+	 * The Manager instance
+	 *
+	 * @var \Analogue\ORM\System\Manager
+	 */
+	protected $manager;
+
+	/**
+	 * Instance of EntityMapper Object
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $entityMap;
+
+	/**
+	 * The instance of db adapter
+	 *
+	 * @var \Analogue\ORM\Drivers\DBAdapter
+	 */
+	protected $adapter;
+
+
+	/**
+	 * Event dispatcher instance
+	 *
+	 * @var \Illuminate\Contracts\Events\Dispatcher
+	 */
+	protected $dispatcher;
+
+	/**
+	 * Entity Cache
+	 *
+	 * @var  \Analogue\ORM\System\EntityCache
+	 */
+	protected $cache;
+
+	/**
+	 * Global scopes
+	 *
+	 * @var array
+	 */
+	protected $globalScopes = [];
+
+	/**
+	 * Custom Commands
+	 *
+	 * @var array
+	 */
+	protected $customCommands = [];
+
+	/**
+	 * @param EntityMap  $entityMap
+	 * @param DBAdapter  $adapter
+	 * @param Dispatcher $dispatcher
+	 * @param Manager    $manager
+	 */
+	public function __construct(EntityMap $entityMap, DBAdapter $adapter, Dispatcher $dispatcher, Manager $manager)
+	{
+		$this->entityMap = $entityMap;
+
+		$this->adapter = $adapter;
+
+		$this->dispatcher = $dispatcher;
+
+		$this->manager = $manager;
+
+		$this->cache = new EntityCache($entityMap);
+	}
+
+	/**
+	 * Persist an entity or an entity collection into the database
+	 *
+	 * @param  Mappable|\Traversable|array $entity
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 * @return Mappable|\Traversable|array
+	 */
+	public function store($entity)
+	{
+		if ($this->manager->isTraversable($entity)) {
+			return $this->storeCollection($entity);
+		} else {
+			return $this->storeEntity($entity);
+		}
+	}
+
+	/**
+	 * Store an entity collection inside a single DB Transaction
+	 *
+	 * @param  \Traversable|array $entities
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 * @return \Traversable|array
+	 */
+	protected function storeCollection($entities)
+	{
+		$this->adapter->beginTransaction();
+
+		foreach ($entities as $entity) {
+			$this->storeEntity($entity);
+		}
+
+		$this->adapter->commit();
+
+		return $entities;
+	}
+
+	/**
+	 * Store a single entity into the database
+	 *
+	 * @param  Mappable $entity
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Entity
+	 */
+	protected function storeEntity($entity)
+	{
+		$this->checkEntityType($entity);
+
+		$store = new Store($this->aggregate($entity), $this->newQueryBuilder());
+
+		return $store->execute();
+	}
+
+	/**
+	 * Check that the entity correspond to the current mapper.
+	 *
+	 * @param  mixed $entity
+	 * @throws InvalidArgumentException
+	 * @return void
+	 */
+	protected function checkEntityType($entity)
+	{
+		if (get_class($entity) != $this->entityMap->getClass()) {
+			$expected = $this->entityMap->getClass();
+			$actual = get_class($entity);
+			throw new InvalidArgumentException("Expected : $expected, got $actual.");
+		}
+	}
+
+	/**
+	 * Convert an entity into an aggregate root
+	 *
+	 * @param  mixed $entity
+	 * @throws MappingException
+	 * @return \Analogue\ORM\System\Aggregate
+	 */
+	protected function aggregate($entity)
+	{
+		return new Aggregate($entity);
+	}
+
+	/**
+	 * Get a the Underlying QueryAdapter.
+	 *
+	 * @return \Analogue\ORM\Drivers\QueryAdapter
+	 */
+	public function newQueryBuilder()
+	{
+		return $this->adapter->getQuery();
+	}
+
+	/**
+	 * Delete an entity or an entity collection from the database
+	 *
+	 * @param  Mappable|\Traversable|array
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 * @return \Traversable|array
+	 */
+	public function delete($entity)
+	{
+		if ($this->manager->isTraversable($entity)) {
+			return $this->deleteCollection($entity);
+		} else {
+			$this->deleteEntity($entity);
+		}
+	}
+
+	/**
+	 * Delete an Entity Collection inside a single db transaction
+	 *
+	 * @param  \Traversable|array $entities
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 * @return \Traversable|array
+	 */
+	protected function deleteCollection($entities)
+	{
+		$this->adapter->beginTransaction();
+
+		foreach ($entities as $entity) {
+			$this->deleteEntity($entity);
+		}
+
+		$this->adapter->commit();
+
+		return $entities;
+	}
+
+	/**
+	 * Delete a single entity from the database.
+	 *
+	 * @param  Mappable $entity
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 * @return void
+	 */
+	protected function deleteEntity($entity)
+	{
+		$this->checkEntityType($entity);
+
+		$delete = new Delete($this->aggregate($entity), $this->newQueryBuilder());
+
+		$delete->execute();
+	}
+
+	/**
+	 * Return the entity map for this mapper
+	 *
+	 * @return EntityMap
+	 */
+	public function getEntityMap()
+	{
+		return $this->entityMap;
+	}
+
+	/**
+	 * Get the entity cache for the current mapper
+	 *
+	 * @return EntityCache  $entityCache
+	 */
+	public function getEntityCache()
+	{
+		return $this->cache;
+	}
+
+	/**
+	 * Fire the given event for the entity
+	 *
+	 * @param  string               $event
+	 * @param  \Analogue\ORM\Entity $entity
+	 * @param  bool                 $halt
+	 * @throws InvalidArgumentException
+	 * @return mixed
+	 */
+	public function fireEvent($event, $entity, $halt = true)
+	{
+		if ($entity instanceof Wrapper) {
+			throw new InvalidArgumentException('Fired Event with invalid Entity Object');
+		}
+
+		$event = "analogue.{$event}." . $this->entityMap->getClass();
+
+		$method = $halt ? 'until' : 'fire';
+
+		return $this->dispatcher->$method($event, $entity);
+	}
+
+	/**
+	 * Register an entity event with the dispatcher.
+	 *
+	 * @param  string   $event
+	 * @param  \Closure $callback
+	 * @return void
+	 */
+	public function registerEvent($event, $callback)
+	{
+		$name = $this->entityMap->getClass();
+
+		$this->dispatcher->listen("analogue.{$event}.{$name}", $callback);
+	}
+
+	/**
+	 * Add a global scope to this mapper query builder
+	 *
+	 * @param  ScopeInterface $scope
+	 * @return void
+	 */
+	public function addGlobalScope(ScopeInterface $scope)
+	{
+		$this->globalScopes[get_class($scope)] = $scope;
+	}
+
+	/**
+	 * Determine if the mapper has a global scope.
+	 *
+	 * @param  \Analogue\ORM\System\ScopeInterface $scope
+	 * @return bool
+	 */
+	public function hasGlobalScope($scope)
+	{
+		return !is_null($this->getGlobalScope($scope));
+	}
+
+	/**
+	 * Get a global scope registered with the modal.
+	 *
+	 * @param  \Analogue\ORM\System\ScopeInterface $scope
+	 * @return \Analogue\ORM\System\ScopeInterface|null
+	 */
+	public function getGlobalScope($scope)
+	{
+		return array_first($this->globalScopes, function ($key, $value) use ($scope) {
+			return $scope instanceof $value;
+		});
+	}
+
+	/**
+	 * Get a new query instance without a given scope.
+	 *
+	 * @param  \Analogue\ORM\System\ScopeInterface $scope
+	 * @return \Analogue\ORM\System\Query
+	 */
+	public function newQueryWithoutScope($scope)
+	{
+		$this->getGlobalScope($scope)->remove($query = $this->getQuery(), $this);
+
+		return $query;
+	}
+
+	/**
+	 * Get the Analogue Query Builder for this instance
+	 *
+	 * @return \Analogue\ORM\System\Query
+	 */
+	public function getQuery()
+	{
+		$query = new Query($this, $this->adapter);
+
+		return $this->applyGlobalScopes($query);
+	}
+
+	/**
+	 * Apply all of the global scopes to an Analogue Query builder.
+	 *
+	 * @param Query $query
+	 * @return \Analogue\ORM\System\Query
+	 */
+	public function applyGlobalScopes($query)
+	{
+		foreach ($this->getGlobalScopes() as $scope) {
+			$scope->apply($query, $this);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Get the global scopes for this class instance.
+	 *
+	 * @return \Analogue\ORM\System\ScopeInterface
+	 */
+	public function getGlobalScopes()
+	{
+		return $this->globalScopes;
+	}
+
+	/**
+	 * Add a dynamic method that extends the mapper/repository
+	 *
+	 * @param string $command
+	 */
+	public function addCustomCommand($command)
+	{
+		$name = lcfirst(class_basename($command));
+
+		$this->customCommands[$name] = $command;
+	}
+
+	/**
+	 * Create a new instance of the mapped entity class
+	 *
+	 * @return mixed
+	 */
+	public function newInstance()
+	{
+		$class = $this->entityMap->getClass();
+
+		if($this->entityMap->useDependencyInjection()) {
+			return $this->newInstanceUsingDependencyInjection($class);
+		} 
         
-        return $this->newInstanceUsingInstantiator($class);
-    }
-
-    /**
-     * Return a new object instance using dependency injection
-     *
-     * @param  string  $class
-     * @return mixed
-     */
-    protected function newInstanceUsingDependencyInjection($class)
-    {
-        if(! class_exists(Container::class)) {
-            throw new ErrorException("Illuminate\Container\Container is required to use Dependency Injection");
-        }
-
-        return Container::getInstance()->make($class);
-    }
-
-    /**
-     * Return a new object instance using doctrine's instantiator
-     *
-     * @param  string  $class
-     * @return mixed
-     */
-    protected function newInstanceUsingInstantiator($class)
-    {
-        $instantiator = new \Doctrine\Instantiator\Instantiator();
-
-        return $instantiator->instantiate($class);
-    }
-
-    /**
-     * Get an unscoped Analogue Query Builder for this instance
-     *
-     * @return \Analogue\ORM\System\Query
-     */
-    public function globalQuery()
-    {
-        return $this->newQueryWithoutScopes();
-    }
-
-    /**
-     * Get a new query builder that doesn't have any global scopes.
-     *
-     * @return Query
-     */
-    public function newQueryWithoutScopes()
-    {
-        return $this->removeGlobalScopes($this->getQuery());
-    }
-
-    /**
-     * Remove all of the global scopes from an Analogue Query builder.
-     *
-     * @param Query $query
-     * @return \Analogue\ORM\System\Query
-     */
-    public function removeGlobalScopes($query)
-    {
-        foreach ($this->getGlobalScopes() as $scope) {
-            $scope->remove($query, $this);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Return the manager instance
-     *
-     * @return \Analogue\ORM\System\Manager
-     */
-    public function getManager()
-    {
-        return $this->manager;
-    }
-
-    /**
-     * Dynamically handle calls to custom commands, or Redirects to query()
-     *
-     * @param  string $method
-     * @param  array  $parameters
-     * @throws \Exception
-     * @return mixed
-     */
-    public function __call($method, $parameters)
-    {
-        // Check if method is a custom command on the mapper
-        if ($this->hasCustomCommand($method)) {
-            if (count($parameters) == 0) {
-                throw new \Exception("$method must at least have 1 argument");
-            }
-
-            return $this->executeCustomCommand($method, $parameters[0]);
-        }
-
-        // Redirect call on a new query instance
-        return call_user_func_array([$this->query(), $method], $parameters);
-    }
-
-    /**
-     * Check if this mapper supports this command
-     * @param  string $command
-     * @return boolean
-     */
-    public function hasCustomCommand($command)
-    {
-        return in_array($command, $this->getCustomCommands());
-    }
-
-    /**
-     * Get all the custom commands registered on this mapper
-     *
-     * @return array
-     */
-    public function getCustomCommands()
-    {
-        return array_keys($this->customCommands);
-    }
-
-    /**
-     * Execute a custom command on an Entity
-     *
-     * @param  string                 $command
-     * @param  mixed|Collection|array $entity
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     * @return mixed
-     */
-    public function executeCustomCommand($command, $entity)
-    {
-        $commandClass = $this->customCommands[$command];
-
-        if ($this->manager->isTraversable($entity)) {
-            foreach ($entity as $instance) {
-                $this->executeSingleCustomCommand($commandClass, $instance);
-            }
-        } else {
-            return $this->executeSingleCustomCommand($commandClass, $entity);
-        }
-    }
-
-    /**
-     * Execute a single command instance
-     *
-     * @param  string $commandClass
-     * @param  mixed  $entity
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     * @return mixed
-     */
-    protected function executeSingleCustomCommand($commandClass, $entity)
-    {
-        $this->checkEntityType($entity);
-
-        $instance = new $commandClass($this->aggregate($entity), $this->newQueryBuilder());
-
-        return $instance->execute();
-    }
-
-    /**
-     * Get the Analogue Query Builder for this instance
-     *
-     * @return \Analogue\ORM\System\Query
-     */
-    public function query()
-    {
-        return $this->getQuery();
-    }
+		return $this->newInstanceUsingInstantiator($class);
+	}
+
+	/**
+	 * Return a new object instance using dependency injection
+	 *
+	 * @param  string  $class
+	 * @return mixed
+	 */
+	protected function newInstanceUsingDependencyInjection($class)
+	{
+		if(! class_exists(Container::class)) {
+			throw new ErrorException("Illuminate\Container\Container is required to use Dependency Injection");
+		}
+
+		return Container::getInstance()->make($class);
+	}
+
+	/**
+	 * Return a new object instance using doctrine's instantiator
+	 *
+	 * @param  string  $class
+	 * @return mixed
+	 */
+	protected function newInstanceUsingInstantiator($class)
+	{
+		$instantiator = new \Doctrine\Instantiator\Instantiator();
+
+		return $instantiator->instantiate($class);
+	}
+
+	/**
+	 * Get an unscoped Analogue Query Builder for this instance
+	 *
+	 * @return \Analogue\ORM\System\Query
+	 */
+	public function globalQuery()
+	{
+		return $this->newQueryWithoutScopes();
+	}
+
+	/**
+	 * Get a new query builder that doesn't have any global scopes.
+	 *
+	 * @return Query
+	 */
+	public function newQueryWithoutScopes()
+	{
+		return $this->removeGlobalScopes($this->getQuery());
+	}
+
+	/**
+	 * Remove all of the global scopes from an Analogue Query builder.
+	 *
+	 * @param Query $query
+	 * @return \Analogue\ORM\System\Query
+	 */
+	public function removeGlobalScopes($query)
+	{
+		foreach ($this->getGlobalScopes() as $scope) {
+			$scope->remove($query, $this);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Return the manager instance
+	 *
+	 * @return \Analogue\ORM\System\Manager
+	 */
+	public function getManager()
+	{
+		return $this->manager;
+	}
+
+	/**
+	 * Dynamically handle calls to custom commands, or Redirects to query()
+	 *
+	 * @param  string $method
+	 * @param  array  $parameters
+	 * @throws \Exception
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		// Check if method is a custom command on the mapper
+		if ($this->hasCustomCommand($method)) {
+			if (count($parameters) == 0) {
+				throw new \Exception("$method must at least have 1 argument");
+			}
+
+			return $this->executeCustomCommand($method, $parameters[0]);
+		}
+
+		// Redirect call on a new query instance
+		return call_user_func_array([$this->query(), $method], $parameters);
+	}
+
+	/**
+	 * Check if this mapper supports this command
+	 * @param  string $command
+	 * @return boolean
+	 */
+	public function hasCustomCommand($command)
+	{
+		return in_array($command, $this->getCustomCommands());
+	}
+
+	/**
+	 * Get all the custom commands registered on this mapper
+	 *
+	 * @return array
+	 */
+	public function getCustomCommands()
+	{
+		return array_keys($this->customCommands);
+	}
+
+	/**
+	 * Execute a custom command on an Entity
+	 *
+	 * @param  string                 $command
+	 * @param  mixed|Collection|array $entity
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 * @return mixed
+	 */
+	public function executeCustomCommand($command, $entity)
+	{
+		$commandClass = $this->customCommands[$command];
+
+		if ($this->manager->isTraversable($entity)) {
+			foreach ($entity as $instance) {
+				$this->executeSingleCustomCommand($commandClass, $instance);
+			}
+		} else {
+			return $this->executeSingleCustomCommand($commandClass, $entity);
+		}
+	}
+
+	/**
+	 * Execute a single command instance
+	 *
+	 * @param  string $commandClass
+	 * @param  mixed  $entity
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 * @return mixed
+	 */
+	protected function executeSingleCustomCommand($commandClass, $entity)
+	{
+		$this->checkEntityType($entity);
+
+		$instance = new $commandClass($this->aggregate($entity), $this->newQueryBuilder());
+
+		return $instance->execute();
+	}
+
+	/**
+	 * Get the Analogue Query Builder for this instance
+	 *
+	 * @return \Analogue\ORM\System\Query
+	 */
+	public function query()
+	{
+		return $this->getQuery();
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -277,7 +277,7 @@ 
             throw new InvalidArgumentException('Fired Event with invalid Entity Object');
         }
 
-        $event = "analogue.{$event}." . $this->entityMap->getClass();
+        $event = "analogue.{$event}.".$this->entityMap->getClass();
 
         $method = $halt ? 'until' : 'fire';
 
@@ -328,7 +328,7 @@ 
      */
     public function getGlobalScope($scope)
     {
-        return array_first($this->globalScopes, function ($key, $value) use ($scope) {
+        return array_first($this->globalScopes, function($key, $value) use ($scope) {
             return $scope instanceof $value;
         });
     }
@@ -404,7 +404,7 @@ 
     {
         $class = $this->entityMap->getClass();
 
-        if($this->entityMap->useDependencyInjection()) {
+        if ($this->entityMap->useDependencyInjection()) {
             return $this->newInstanceUsingDependencyInjection($class);
         } 
         
@@ -419,7 +419,7 @@ 
      */
     protected function newInstanceUsingDependencyInjection($class)
     {
-        if(! class_exists(Container::class)) {
+        if (!class_exists(Container::class)) {
             throw new ErrorException("Illuminate\Container\Container is required to use Dependency Injection");
         }
 

src/Commands/Command.php

Indentation +23 added lines, -23 removed lines

@@ -7,31 +7,31 @@
 
 abstract class Command
 {
-    /**
-     * The aggregated entity on which the command is executed
-     *
-     * @var \Analogue\ORM\System\Aggregate
-     */
-    protected $aggregate;
+	/**
+	 * The aggregated entity on which the command is executed
+	 *
+	 * @var \Analogue\ORM\System\Aggregate
+	 */
+	protected $aggregate;
 
-    /**
-     * Query Builder instance
-     *
-     * @var \Illuminate\Database\Query\Builder
-     */
-    protected $query;
+	/**
+	 * Query Builder instance
+	 *
+	 * @var \Illuminate\Database\Query\Builder
+	 */
+	protected $query;
 
-    /**
-     * Command constructor.
-     * @param Aggregate $aggregate
-     * @param QueryAdapter|\Analogue\ORM\Drivers\IlluminateQueryAdapter $query
-     */
-    public function __construct(Aggregate $aggregate, Builder $query)
-    {
-        $this->aggregate = $aggregate;
+	/**
+	 * Command constructor.
+	 * @param Aggregate $aggregate
+	 * @param QueryAdapter|\Analogue\ORM\Drivers\IlluminateQueryAdapter $query
+	 */
+	public function __construct(Aggregate $aggregate, Builder $query)
+	{
+		$this->aggregate = $aggregate;
 
-        $this->query = $query->from($aggregate->getEntityMap()->getTable());
-    }
+		$this->query = $query->from($aggregate->getEntityMap()->getTable());
+	}
 
-    abstract public function execute();
+	abstract public function execute();
 }

src/Commands/Store.php

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
             $this->insert();
 
             $mapper->fireEvent('created', $entity, false);
-        }
-        else if ($this->aggregate->isDirty()) {
+        } else if ($this->aggregate->isDirty()) {
             if ($mapper->fireEvent('updating', $entity) === false) {
                 return false;
             }

Indentation +220 added lines, -220 removed lines

@@ -14,237 +14,237 @@
  */
 class Store extends Command
 {
-    /**
-     * Persist the entity in the database
-     *
-     * @throws \InvalidArgumentException
-     * @return false|mixed
-     */
-    public function execute()
-    {
-        $entity = $this->aggregate->getEntityObject();
-
-        $mapper = $this->aggregate->getMapper();
-
-        if ($mapper->fireEvent('storing', $entity) === false) {
-            return false;
-        }
-
-        $this->preStoreProcess();
-
-        /**
-         * We will test the entity for existence
-         * and run a creation if it doesn't exists
-         */
-        if (!$this->aggregate->exists()) {
-            if ($mapper->fireEvent('creating', $entity) === false) {
-                return false;
-            }
-
-            $this->insert();
-
-            $mapper->fireEvent('created', $entity, false);
-        }
-        else if ($this->aggregate->isDirty()) {
-            if ($mapper->fireEvent('updating', $entity) === false) {
-                return false;
-            }
-            $this->update();
-
-            $mapper->fireEvent('updated', $entity, false);
-        }
-
-        $this->postStoreProcess();
-
-        $mapper->fireEvent('stored', $entity, false);
-
-        return $entity;
-    }
-
-    /**
-     * Run all operations that have to occur before actually
-     * storing the entity
-     *
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    protected function preStoreProcess()
-    {
-        // Create any related object that doesn't exist in the database.
-        $localRelationships = $this->aggregate->getEntityMap()->getLocalRelationships();
-
-        $this->createRelatedEntities($localRelationships);
-
-        // Now we can sync the related collections
-        $this->aggregate->syncRelationships($localRelationships);
-    }
-
-    /**
-     * Check for existence and create non-existing related entities
-     *
-     * @param  array
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    protected function createRelatedEntities($relations)
-    {
-        $entitiesToCreate = $this->aggregate->getNonExistingRelated($relations);
-
-        foreach ($entitiesToCreate as $aggregate) {
-            $this->createStoreCommand($aggregate)->execute();
-        }
+	/**
+	 * Persist the entity in the database
+	 *
+	 * @throws \InvalidArgumentException
+	 * @return false|mixed
+	 */
+	public function execute()
+	{
+		$entity = $this->aggregate->getEntityObject();
+
+		$mapper = $this->aggregate->getMapper();
+
+		if ($mapper->fireEvent('storing', $entity) === false) {
+			return false;
+		}
+
+		$this->preStoreProcess();
+
+		/**
+		 * We will test the entity for existence
+		 * and run a creation if it doesn't exists
+		 */
+		if (!$this->aggregate->exists()) {
+			if ($mapper->fireEvent('creating', $entity) === false) {
+				return false;
+			}
+
+			$this->insert();
+
+			$mapper->fireEvent('created', $entity, false);
+		}
+		else if ($this->aggregate->isDirty()) {
+			if ($mapper->fireEvent('updating', $entity) === false) {
+				return false;
+			}
+			$this->update();
+
+			$mapper->fireEvent('updated', $entity, false);
+		}
+
+		$this->postStoreProcess();
+
+		$mapper->fireEvent('stored', $entity, false);
+
+		return $entity;
+	}
+
+	/**
+	 * Run all operations that have to occur before actually
+	 * storing the entity
+	 *
+	 * @throws \InvalidArgumentException
+	 * @return void
+	 */
+	protected function preStoreProcess()
+	{
+		// Create any related object that doesn't exist in the database.
+		$localRelationships = $this->aggregate->getEntityMap()->getLocalRelationships();
+
+		$this->createRelatedEntities($localRelationships);
+
+		// Now we can sync the related collections
+		$this->aggregate->syncRelationships($localRelationships);
+	}
+
+	/**
+	 * Check for existence and create non-existing related entities
+	 *
+	 * @param  array
+	 * @throws \InvalidArgumentException
+	 * @return void
+	 */
+	protected function createRelatedEntities($relations)
+	{
+		$entitiesToCreate = $this->aggregate->getNonExistingRelated($relations);
+
+		foreach ($entitiesToCreate as $aggregate) {
+			$this->createStoreCommand($aggregate)->execute();
+		}
         
-    }
-
-    /**
-     * Create a new store command
-     *
-     * @param  Aggregate $aggregate
-     * @return Store
-     */
-    protected function createStoreCommand(Aggregate $aggregate)
-    {
-        // We gotta retrieve the corresponding query adapter to use.
-        $mapper = $aggregate->getMapper();
-
-        return new Store($aggregate, $mapper->newQueryBuilder());
-    }
-
-    /**
-     * Run all operations that have to occur after the entity
-     * is stored.
-     *
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    protected function postStoreProcess()
-    {
-        $aggregate = $this->aggregate;
-
-        // Create any related object that doesn't exist in the database.
-        $foreignRelationships = $aggregate->getEntityMap()->getForeignRelationships();
-        $this->createRelatedEntities($foreignRelationships);
-
-        // Update any pivot tables that has been modified.
-        $aggregate->updatePivotRecords();
-
-        // Update any dirty relationship. This include relationships that already exists, have
-        // dirty attributes / newly created related entities / dirty related entities.
-        $dirtyRelatedAggregates = $aggregate->getDirtyRelationships();
+	}
+
+	/**
+	 * Create a new store command
+	 *
+	 * @param  Aggregate $aggregate
+	 * @return Store
+	 */
+	protected function createStoreCommand(Aggregate $aggregate)
+	{
+		// We gotta retrieve the corresponding query adapter to use.
+		$mapper = $aggregate->getMapper();
+
+		return new Store($aggregate, $mapper->newQueryBuilder());
+	}
+
+	/**
+	 * Run all operations that have to occur after the entity
+	 * is stored.
+	 *
+	 * @throws \InvalidArgumentException
+	 * @return void
+	 */
+	protected function postStoreProcess()
+	{
+		$aggregate = $this->aggregate;
+
+		// Create any related object that doesn't exist in the database.
+		$foreignRelationships = $aggregate->getEntityMap()->getForeignRelationships();
+		$this->createRelatedEntities($foreignRelationships);
+
+		// Update any pivot tables that has been modified.
+		$aggregate->updatePivotRecords();
+
+		// Update any dirty relationship. This include relationships that already exists, have
+		// dirty attributes / newly created related entities / dirty related entities.
+		$dirtyRelatedAggregates = $aggregate->getDirtyRelationships();
         
-        foreach ($dirtyRelatedAggregates as $related) {
-            $this->createStoreCommand($related)->execute();
-        }
-
-        // Now we can sync the related collections
-        if ($this->aggregate->exists()) {
-            $this->aggregate->syncRelationships($foreignRelationships);
-        }
+		foreach ($dirtyRelatedAggregates as $related) {
+			$this->createStoreCommand($related)->execute();
+		}
+
+		// Now we can sync the related collections
+		if ($this->aggregate->exists()) {
+			$this->aggregate->syncRelationships($foreignRelationships);
+		}
         
-        // TODO be move it to the wrapper class
-        // so it's the same code for the entity builder
-        $aggregate->setProxies();
-
-        // Update Entity Cache
-        $aggregate->getMapper()->getEntityCache()->refresh($aggregate);
-    }
-
-    /**
-     * Update Related Entities which attributes have
-     * been modified.
-     *
-     * @return void
-     */
-    protected function updateDirtyRelated()
-    {
-        $relations = $this->entityMap->getRelationships();
-        $attributes = $this->getAttributes();
-
-        foreach ($relations as $relation) {
-            if (!array_key_exists($relation, $attributes)) {
-                continue;
-            }
-
-            $value = $attributes[$relation];
-
-            if ($value == null) {
-                continue;
-            }
-
-            if ($value instanceof EntityProxy) {
-                continue;
-            }
-
-            if ($value instanceof CollectionProxy && $value->isLoaded()) {
-                $value = $value->getUnderlyingCollection();
-            }
-            if ($value instanceof CollectionProxy && !$value->isLoaded()) {
-                foreach ($value->getAddedItems() as $entity) {
-                    $this->updateEntityIfDirty($entity);
-                }
-                continue;
-            }
-
-            if ($value instanceof EntityCollection) {
-                foreach ($value as $entity) {
-                    if (!$this->createEntityIfNotExists($entity)) {
-                        $this->updateEntityIfDirty($entity);
-                    }
-                }
-                continue;
-            }
-            if ($value instanceof Mappable) {
-                $this->updateEntityIfDirty($value);
-                continue;
-            }
-        }
-    }
-
-    /**
-     * Execute an insert statement on the database
-     *
-     * @return void
-     */
-    protected function insert()
-    {
-        $aggregate = $this->aggregate;
-
-        $attributes = $aggregate->getRawAttributes();
+		// TODO be move it to the wrapper class
+		// so it's the same code for the entity builder
+		$aggregate->setProxies();
+
+		// Update Entity Cache
+		$aggregate->getMapper()->getEntityCache()->refresh($aggregate);
+	}
+
+	/**
+	 * Update Related Entities which attributes have
+	 * been modified.
+	 *
+	 * @return void
+	 */
+	protected function updateDirtyRelated()
+	{
+		$relations = $this->entityMap->getRelationships();
+		$attributes = $this->getAttributes();
+
+		foreach ($relations as $relation) {
+			if (!array_key_exists($relation, $attributes)) {
+				continue;
+			}
+
+			$value = $attributes[$relation];
+
+			if ($value == null) {
+				continue;
+			}
+
+			if ($value instanceof EntityProxy) {
+				continue;
+			}
+
+			if ($value instanceof CollectionProxy && $value->isLoaded()) {
+				$value = $value->getUnderlyingCollection();
+			}
+			if ($value instanceof CollectionProxy && !$value->isLoaded()) {
+				foreach ($value->getAddedItems() as $entity) {
+					$this->updateEntityIfDirty($entity);
+				}
+				continue;
+			}
+
+			if ($value instanceof EntityCollection) {
+				foreach ($value as $entity) {
+					if (!$this->createEntityIfNotExists($entity)) {
+						$this->updateEntityIfDirty($entity);
+					}
+				}
+				continue;
+			}
+			if ($value instanceof Mappable) {
+				$this->updateEntityIfDirty($value);
+				continue;
+			}
+		}
+	}
+
+	/**
+	 * Execute an insert statement on the database
+	 *
+	 * @return void
+	 */
+	protected function insert()
+	{
+		$aggregate = $this->aggregate;
+
+		$attributes = $aggregate->getRawAttributes();
         
-        $keyName = $aggregate->getEntityMap()->getKeyName();
+		$keyName = $aggregate->getEntityMap()->getKeyName();
 
-        // Check if the primary key is defined in the attributes
-        if (array_key_exists($keyName, $attributes) && $attributes[$keyName] != null) {
-            $this->query->insert($attributes);
-        } else {
-            $sequence = $aggregate->getEntityMap()->getSequence();
+		// Check if the primary key is defined in the attributes
+		if (array_key_exists($keyName, $attributes) && $attributes[$keyName] != null) {
+			$this->query->insert($attributes);
+		} else {
+			$sequence = $aggregate->getEntityMap()->getSequence();
 
-            $id = $this->query->insertGetId($attributes, $sequence);
+			$id = $this->query->insertGetId($attributes, $sequence);
 
-            $aggregate->setEntityAttribute($keyName, $id);
-        }
+			$aggregate->setEntityAttribute($keyName, $id);
+		}
 
-    }
+	}
 
-    /**
-     * Run an update statement on the entity
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    protected function update()
-    {
-        $query = $this->query;
+	/**
+	 * Run an update statement on the entity
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return void
+	 */
+	protected function update()
+	{
+		$query = $this->query;
 
-        $keyName = $this->aggregate->getEntityKey();
+		$keyName = $this->aggregate->getEntityKey();
 
-        $query = $query->where($keyName, '=', $this->aggregate->getEntityId());
+		$query = $query->where($keyName, '=', $this->aggregate->getEntityId());
 
-        $dirtyAttributes = $this->aggregate->getDirtyRawAttributes();
+		$dirtyAttributes = $this->aggregate->getDirtyRawAttributes();
 
-        if (count($dirtyAttributes) > 0) {
-            $query->update($dirtyAttributes);
-        }
-    }
+		if (count($dirtyAttributes) > 0) {
+			$query->update($dirtyAttributes);
+		}
+	}
 }

src/Drivers/IlluminateQueryBuilder.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 
 class EntityMapNotFoundException extends RuntimeException
 {
-    //
+	//
 }

src/Entity.php

Indentation +116 added lines, -116 removed lines

@@ -6,133 +6,133 @@
 
 class Entity extends ValueObject
 {
-    /**
-     * Entities Hidden Attributes, that will be discarded when converting
-     * the entity to Array/Json
-     * (can include any embedded object's attribute)
-     *
-     * @var array
-     */
-    protected $hidden = [];
+	/**
+	 * Entities Hidden Attributes, that will be discarded when converting
+	 * the entity to Array/Json
+	 * (can include any embedded object's attribute)
+	 *
+	 * @var array
+	 */
+	protected $hidden = [];
 
-    /**
-     * Return the entity's attribute
-     * @param  string $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        if ($this->hasGetMutator($key)) {
-            $method = 'get' . $this->getMutatorMethod($key);
+	/**
+	 * Return the entity's attribute
+	 * @param  string $key
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		if ($this->hasGetMutator($key)) {
+			$method = 'get' . $this->getMutatorMethod($key);
 
-            $attribute = null;
+			$attribute = null;
 
-            if (isset($this->attributes[$key])) {
-                $attribute = $this->attributes[$key];
-            }
+			if (isset($this->attributes[$key])) {
+				$attribute = $this->attributes[$key];
+			}
 
-            return $this->$method($attribute);
-        }
-        if (!array_key_exists($key, $this->attributes)) {
-            return null;
-        }
-        if ($this->attributes[$key] instanceof EntityProxy) {
-            $this->attributes[$key] = $this->attributes[$key]->load();
-        }
-        return $this->attributes[$key];
-    }
+			return $this->$method($attribute);
+		}
+		if (!array_key_exists($key, $this->attributes)) {
+			return null;
+		}
+		if ($this->attributes[$key] instanceof EntityProxy) {
+			$this->attributes[$key] = $this->attributes[$key]->load();
+		}
+		return $this->attributes[$key];
+	}
 
-    /**
-     * Dynamically set attributes on the entity.
-     *
-     * @param  string $key
-     * @param  mixed  $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        if ($this->hasSetMutator($key)) {
-            $method = 'set' . $this->getMutatorMethod($key);
+	/**
+	 * Dynamically set attributes on the entity.
+	 *
+	 * @param  string $key
+	 * @param  mixed  $value
+	 * @return void
+	 */
+	public function __set($key, $value)
+	{
+		if ($this->hasSetMutator($key)) {
+			$method = 'set' . $this->getMutatorMethod($key);
 
-            $this->$method($value);
-        } else {
-            $this->attributes[$key] = $value;
-        }
-    }
+			$this->$method($value);
+		} else {
+			$this->attributes[$key] = $value;
+		}
+	}
 
-    /**
-     * Is a getter method defined ?
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    protected function hasGetMutator($key)
-    {
-        return method_exists($this, 'get' . $this->getMutatorMethod($key)) ? true : false;
-    }
+	/**
+	 * Is a getter method defined ?
+	 *
+	 * @param  string $key
+	 * @return boolean
+	 */
+	protected function hasGetMutator($key)
+	{
+		return method_exists($this, 'get' . $this->getMutatorMethod($key)) ? true : false;
+	}
 
-    /**
-     * Is a setter method defined ?
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    protected function hasSetMutator($key)
-    {
-        return method_exists($this, 'set' . $this->getMutatorMethod($key)) ? true : false;
-    }
+	/**
+	 * Is a setter method defined ?
+	 *
+	 * @param  string $key
+	 * @return boolean
+	 */
+	protected function hasSetMutator($key)
+	{
+		return method_exists($this, 'set' . $this->getMutatorMethod($key)) ? true : false;
+	}
 
-    /**
-     * @param $key
-     * @return string
-     */
-    protected function getMutatorMethod($key)
-    {
-        $key = ucwords(str_replace(['-', '_'], ' ', $key));
-        return str_replace(' ', '', $key) . "Attribute";
-    }
+	/**
+	 * @param $key
+	 * @return string
+	 */
+	protected function getMutatorMethod($key)
+	{
+		$key = ucwords(str_replace(['-', '_'], ' ', $key));
+		return str_replace(' ', '', $key) . "Attribute";
+	}
 
-    /**
-     * Convert every attributes to value / arrays
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        // First, call the trait method before filtering
-        // with Entity specific methods
-        $attributes = $this->attributesToArray($this->attributes);
+	/**
+	 * Convert every attributes to value / arrays
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		// First, call the trait method before filtering
+		// with Entity specific methods
+		$attributes = $this->attributesToArray($this->attributes);
 
-        foreach ($this->attributes as $key => $attribute) {
-            if (in_array($key, $this->hidden)) {
-                unset($attributes[$key]);
-                continue;
-            }
-            if ($this->hasGetMutator($key)) {
-                $method = 'get' . $this->getMutatorMethod($key);
-                $attributes[$key] = $this->$method($attribute);
-            }
-        }
-        return $attributes;
-    }
+		foreach ($this->attributes as $key => $attribute) {
+			if (in_array($key, $this->hidden)) {
+				unset($attributes[$key]);
+				continue;
+			}
+			if ($this->hasGetMutator($key)) {
+				$method = 'get' . $this->getMutatorMethod($key);
+				$attributes[$key] = $this->$method($attribute);
+			}
+		}
+		return $attributes;
+	}
 
-    /**
-     * Fill an entity with key-value pairs
-     * 
-     * @param  array  $attributes 
-     * @return void
-     */
-    public function fill(array $attributes)
-    {
-        foreach ($attributes as $key => $attribute) {
+	/**
+	 * Fill an entity with key-value pairs
+	 * 
+	 * @param  array  $attributes 
+	 * @return void
+	 */
+	public function fill(array $attributes)
+	{
+		foreach ($attributes as $key => $attribute) {
             
-            if ($this->hasSetMutator($key)) {
-                $method = 'set' . $this->getMutatorMethod($key);
-                $this->attributes[$key] = $this->$method($attribute);
-            }
-            else {
-                $this->attributes[$key] = $attribute;
-            }
-        }
-    }
+			if ($this->hasSetMutator($key)) {
+				$method = 'set' . $this->getMutatorMethod($key);
+				$this->attributes[$key] = $this->$method($attribute);
+			}
+			else {
+				$this->attributes[$key] = $attribute;
+			}
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
     public function __get($key)
     {
         if ($this->hasGetMutator($key)) {
-            $method = 'get' . $this->getMutatorMethod($key);
+            $method = 'get'.$this->getMutatorMethod($key);
 
             $attribute = null;
 
@@ -52,7 +52,7 @@ 
     public function __set($key, $value)
     {
         if ($this->hasSetMutator($key)) {
-            $method = 'set' . $this->getMutatorMethod($key);
+            $method = 'set'.$this->getMutatorMethod($key);
 
             $this->$method($value);
         } else {
@@ -68,7 +68,7 @@ 
      */
     protected function hasGetMutator($key)
     {
-        return method_exists($this, 'get' . $this->getMutatorMethod($key)) ? true : false;
+        return method_exists($this, 'get'.$this->getMutatorMethod($key)) ? true : false;
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     protected function hasSetMutator($key)
     {
-        return method_exists($this, 'set' . $this->getMutatorMethod($key)) ? true : false;
+        return method_exists($this, 'set'.$this->getMutatorMethod($key)) ? true : false;
     }
 
     /**
@@ -89,7 +89,7 @@ 
     protected function getMutatorMethod($key)
     {
         $key = ucwords(str_replace(['-', '_'], ' ', $key));
-        return str_replace(' ', '', $key) . "Attribute";
+        return str_replace(' ', '', $key)."Attribute";
     }
 
     /**
@@ -109,7 +109,7 @@ 
                 continue;
             }
             if ($this->hasGetMutator($key)) {
-                $method = 'get' . $this->getMutatorMethod($key);
+                $method = 'get'.$this->getMutatorMethod($key);
                 $attributes[$key] = $this->$method($attribute);
             }
         }
@@ -127,7 +127,7 @@ 
         foreach ($attributes as $key => $attribute) {
             
             if ($this->hasSetMutator($key)) {
-                $method = 'set' . $this->getMutatorMethod($key);
+                $method = 'set'.$this->getMutatorMethod($key);
                 $this->attributes[$key] = $this->$method($attribute);
             }
             else {

Braces +1 added lines, -2 removed lines

@@ -129,8 +129,7 @@
             if ($this->hasSetMutator($key)) {
                 $method = 'set' . $this->getMutatorMethod($key);
                 $this->attributes[$key] = $this->$method($attribute);
-            }
-            else {
+            } else {
                 $this->attributes[$key] = $attribute;
             }
         }

oldtests/AnalogueTest/App/Avatar.php

Doc Comments +3 added lines

@@ -6,6 +6,9 @@
 
 class Avatar extends Entity
 {
+    /**
+     * @param string $name
+     */
     public function __construct($name, User $user = null)
     {
         $this->name = $name;

Indentation +9 added lines, -9 removed lines

@@ -6,14 +6,14 @@
 
 class Avatar extends Entity
 {
-    public function __construct($name, User $user = null)
-    {
-        $this->name = $name;
-        $this->user = $user;
-    }
+	public function __construct($name, User $user = null)
+	{
+		$this->name = $name;
+		$this->user = $user;
+	}
 
-    public function getPathAttribute()
-    {
-        return $this->image->path;
-    }
+	public function getPathAttribute()
+	{
+		return $this->image->path;
+	}
 }