analogueorm / analogue

src/Plugins/SoftDeletes/SoftDeletingScope.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
      */
     protected function addWithTrashed(Query $query)
     {
-        $query->macro('withTrashed', function (Query $query) {
+        $query->macro('withTrashed', function(Query $query) {
             $this->remove($query);
 
             return $query;
@@ -88,7 +88,7 @@ 
      */
     protected function addOnlyTrashed(Query $query)
     {
-        $query->macro('onlyTrashed', function (Query $query) {
+        $query->macro('onlyTrashed', function(Query $query) {
             $this->remove($query);
 
             $query->getQuery()->whereNotNull($query->getMapper()->getEntityMap()->getQualifiedDeletedAtColumn());

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     /**
      * Remove the scope from the given Analogue query builder.
      *
-     * @param mixed $query
+     * @param Query $query
      *
      * @return void
      */

Indentation +108 added lines, -108 removed lines

@@ -7,112 +7,112 @@
 
 class SoftDeletingScope implements ScopeInterface
 {
-    /**
-     * All of the extensions to be added to the builder.
-     *
-     * @var array
-     */
-    protected $extensions = ['WithTrashed', 'OnlyTrashed'];
-
-    /**
-     * Apply the scope to a given Analogue query builder.
-     *
-     * @param \Analogue\ORM\System\Query $query
-     *
-     * @return void
-     */
-    public function apply(Query $query)
-    {
-        $entityMap = $query->getMapper()->getEntityMap();
-
-        $query->whereNull($entityMap->getQualifiedDeletedAtColumn());
-
-        $this->extend($query);
-    }
-
-    /**
-     * Remove the scope from the given Analogue query builder.
-     *
-     * @param mixed $query
-     *
-     * @return void
-     */
-    public function remove(Query $query)
-    {
-        $column = $query->getMapper()->getEntityMap()->getQualifiedDeletedAtColumn();
-
-        $query = $query->getQuery();
-
-        foreach ((array) $query->wheres as $key => $where) {
-            // If the where clause is a soft delete date constraint, we will remove it from
-            // the query and reset the keys on the wheres. This allows this developer to
-            // include deleted model in a relationship result set that is lazy loaded.
-            if ($this->isSoftDeleteConstraint($where, $column)) {
-                unset($query->wheres[$key]);
-
-                $query->wheres = array_values($query->wheres);
-            }
-        }
-    }
-
-    /**
-     * Extend the query builder with the needed functions.
-     *
-     * @param \Analogue\ORM\System\Query $query
-     *
-     * @return void
-     */
-    public function extend(Query $query)
-    {
-        foreach ($this->extensions as $extension) {
-            $this->{"add{$extension}"}($query);
-        }
-    }
-
-    /**
-     * Add the with-trashed extension to the builder.
-     *
-     * @param \Analogue\ORM\System\Query $query
-     *
-     * @return void
-     */
-    protected function addWithTrashed(Query $query)
-    {
-        $query->macro('withTrashed', function (Query $query) {
-            $this->remove($query);
-
-            return $query;
-        });
-    }
-
-    /**
-     * Add the only-trashed extension to the builder.
-     *
-     * @param \Analogue\ORM\System\Query $query
-     *
-     * @return void
-     */
-    protected function addOnlyTrashed(Query $query)
-    {
-        $query->macro('onlyTrashed', function (Query $query) {
-            $this->remove($query);
-
-            $query->getQuery()->whereNotNull($query->getMapper()->getEntityMap()->getQualifiedDeletedAtColumn());
-
-            return $query;
-        });
-    }
-
-    /**
-     * Determine if the given where clause is a soft delete constraint.
-     *
-     * @param array  $where
-     * @param string $column
-     *
-     * @return bool
-     */
-    protected function isSoftDeleteConstraint(array $where, $column)
-    {
-        return $where['type'] == 'Null' && $where['column'] == $column;
-    }
+	/**
+	 * All of the extensions to be added to the builder.
+	 *
+	 * @var array
+	 */
+	protected $extensions = ['WithTrashed', 'OnlyTrashed'];
+
+	/**
+	 * Apply the scope to a given Analogue query builder.
+	 *
+	 * @param \Analogue\ORM\System\Query $query
+	 *
+	 * @return void
+	 */
+	public function apply(Query $query)
+	{
+		$entityMap = $query->getMapper()->getEntityMap();
+
+		$query->whereNull($entityMap->getQualifiedDeletedAtColumn());
+
+		$this->extend($query);
+	}
+
+	/**
+	 * Remove the scope from the given Analogue query builder.
+	 *
+	 * @param mixed $query
+	 *
+	 * @return void
+	 */
+	public function remove(Query $query)
+	{
+		$column = $query->getMapper()->getEntityMap()->getQualifiedDeletedAtColumn();
+
+		$query = $query->getQuery();
+
+		foreach ((array) $query->wheres as $key => $where) {
+			// If the where clause is a soft delete date constraint, we will remove it from
+			// the query and reset the keys on the wheres. This allows this developer to
+			// include deleted model in a relationship result set that is lazy loaded.
+			if ($this->isSoftDeleteConstraint($where, $column)) {
+				unset($query->wheres[$key]);
+
+				$query->wheres = array_values($query->wheres);
+			}
+		}
+	}
+
+	/**
+	 * Extend the query builder with the needed functions.
+	 *
+	 * @param \Analogue\ORM\System\Query $query
+	 *
+	 * @return void
+	 */
+	public function extend(Query $query)
+	{
+		foreach ($this->extensions as $extension) {
+			$this->{"add{$extension}"}($query);
+		}
+	}
+
+	/**
+	 * Add the with-trashed extension to the builder.
+	 *
+	 * @param \Analogue\ORM\System\Query $query
+	 *
+	 * @return void
+	 */
+	protected function addWithTrashed(Query $query)
+	{
+		$query->macro('withTrashed', function (Query $query) {
+			$this->remove($query);
+
+			return $query;
+		});
+	}
+
+	/**
+	 * Add the only-trashed extension to the builder.
+	 *
+	 * @param \Analogue\ORM\System\Query $query
+	 *
+	 * @return void
+	 */
+	protected function addOnlyTrashed(Query $query)
+	{
+		$query->macro('onlyTrashed', function (Query $query) {
+			$this->remove($query);
+
+			$query->getQuery()->whereNotNull($query->getMapper()->getEntityMap()->getQualifiedDeletedAtColumn());
+
+			return $query;
+		});
+	}
+
+	/**
+	 * Determine if the given where clause is a soft delete constraint.
+	 *
+	 * @param array  $where
+	 * @param string $column
+	 *
+	 * @return bool
+	 */
+	protected function isSoftDeleteConstraint(array $where, $column)
+	{
+		return $where['type'] == 'Null' && $where['column'] == $column;
+	}
 }

src/Exceptions/EntityMapNotFoundException.php

Indentation +1 added lines, -1 removed lines

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

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 +630 added lines, -630 removed lines

@@ -25,634 +25,634 @@
  */
 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);
-    }
-
-    /**
-     * Map results to a Collection.
-     *
-     * @param array|Collection $results
-     *
-     * @return Collection
-     */
-    public function map($results, array $eagerLoads = []) : Collection
-    {
-        $builder = new ResultBuilder($this);
-
-        if ($results instanceof collection) {
-            // Get underlying collection array
-            $results = $results->all();
-        }
-
-        if (!is_array($results)) {
-            throw new InvalidArgumentException("'results' should be an array or collection.");
-        }
-
-        // First, we'll cast every single result to array
-        $results = array_map(function ($item) {
-            return (array) $item;
-        }, $results);
-
-        // Then, we'll cache every single results as raw attributes, before
-        // adding relationships, which will be cached when the relationship's
-        // query takes place.
-        $this->getEntityCache()->add($results);
-
-        $entities = $builder->build($results, $eagerLoads);
-
-        return $this->entityMap->newCollection($entities);
-    }
-
-    /**
-     * Return all records for a mapped object.
-     *
-     * @return EntityCollection
-     */
-    public function all()
-    {
-        return $this->query()->get();
-    }
-
-    /**
-     * 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() && !is_subclass_of($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 bool
-     */
-    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();
-    }
+	/**
+	 * 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);
+	}
+
+	/**
+	 * Map results to a Collection.
+	 *
+	 * @param array|Collection $results
+	 *
+	 * @return Collection
+	 */
+	public function map($results, array $eagerLoads = []) : Collection
+	{
+		$builder = new ResultBuilder($this);
+
+		if ($results instanceof collection) {
+			// Get underlying collection array
+			$results = $results->all();
+		}
+
+		if (!is_array($results)) {
+			throw new InvalidArgumentException("'results' should be an array or collection.");
+		}
+
+		// First, we'll cast every single result to array
+		$results = array_map(function ($item) {
+			return (array) $item;
+		}, $results);
+
+		// Then, we'll cache every single results as raw attributes, before
+		// adding relationships, which will be cached when the relationship's
+		// query takes place.
+		$this->getEntityCache()->add($results);
+
+		$entities = $builder->build($results, $eagerLoads);
+
+		return $this->entityMap->newCollection($entities);
+	}
+
+	/**
+	 * Return all records for a mapped object.
+	 *
+	 * @return EntityCollection
+	 */
+	public function all()
+	{
+		return $this->query()->get();
+	}
+
+	/**
+	 * 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() && !is_subclass_of($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 bool
+	 */
+	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 +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
         }
 
         // First, we'll cast every single result to array
-        $results = array_map(function ($item) {
+        $results = array_map(function($item) {
             return (array) $item;
         }, $results);
 
@@ -394,7 +394,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;
         });
     }

src/ValueObject.php

Indentation +4 added lines, -4 removed lines

@@ -9,9 +9,9 @@
 
 class ValueObject implements Mappable, ArrayAccess, Jsonable, JsonSerializable, Arrayable
 {
-    use MappableTrait;
-    use MagicGetters;
-    use MagicSetters;
-    use MagicCasting;
+	use MappableTrait;
+	use MagicGetters;
+	use MagicSetters;
+	use MagicCasting;
 }
 

src/ValueMap.php

Doc Comments +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
     }
 
     /**
-     * @param $class
+     * @param string $class
      */
     public function setClass($class)
     {
@@ -79,7 +79,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getClass()
     {

Indentation +80 added lines, -80 removed lines

@@ -4,97 +4,97 @@
 
 class ValueMap
 {
-    /**
-     * @var string
-     */
-    protected $name;
+	/**
+	 * @var string
+	 */
+	protected $name;
 
-    /**
-     * @var string
-     */
-    protected $class;
+	/**
+	 * @var string
+	 */
+	protected $class;
 
-    /**
-     * @var array
-     */
-    protected $embeddables = [];
+	/**
+	 * @var array
+	 */
+	protected $embeddables = [];
 
-    /**
-     * @var array
-     */
-    protected $attributes = [];
+	/**
+	 * @var array
+	 */
+	protected $attributes = [];
 
-    /**
-     * @var array
-     */
-    protected $properties = [];
+	/**
+	 * @var array
+	 */
+	protected $properties = [];
 
-    protected $arrayName = null;
+	protected $arrayName = null;
 
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
+	/**
+	 * @return array
+	 */
+	public function getAttributes()
+	{
+		return $this->attributes;
+	}
 
-    /**
-     * [getAttributesArrayName description].
-     *
-     * @return [type] [description]
-     */
-    public function getAttributesArrayName()
-    {
-        return $this->arrayName;
-    }
+	/**
+	 * [getAttributesArrayName description].
+	 *
+	 * @return [type] [description]
+	 */
+	public function getAttributesArrayName()
+	{
+		return $this->arrayName;
+	}
 
-    public function usesAttributesArray()
-    {
-        return $this->arrayName != null;
-    }
+	public function usesAttributesArray()
+	{
+		return $this->arrayName != null;
+	}
 
-    /**
-     * @return array
-     */
-    public function getProperties()
-    {
-        return $this->properties;
-    }
+	/**
+	 * @return array
+	 */
+	public function getProperties()
+	{
+		return $this->properties;
+	}
 
-    /**
-     * @return array
-     */
-    public function getEmbeddables()
-    {
-        return $this->embeddables;
-    }
+	/**
+	 * @return array
+	 */
+	public function getEmbeddables()
+	{
+		return $this->embeddables;
+	}
 
-    /**
-     * @param $class
-     */
-    public function setClass($class)
-    {
-        $this->class = $class;
-    }
+	/**
+	 * @param $class
+	 */
+	public function setClass($class)
+	{
+		$this->class = $class;
+	}
 
-    /**
-     * @return mixed
-     */
-    public function getClass()
-    {
-        return $this->class;
-    }
+	/**
+	 * @return mixed
+	 */
+	public function getClass()
+	{
+		return $this->class;
+	}
 
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        if (isset($this->name)) {
-            return $this->name;
-        } else {
-            return class_basename($this);
-        }
-    }
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		if (isset($this->name)) {
+			return $this->name;
+		} else {
+			return class_basename($this);
+		}
+	}
 }

src/Relationships/HasMany.php

Doc Comments +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
      *
      * @param  $relation
      *
-     * @return mixed
+     * @return \Analogue\ORM\EntityCollection
      */
     public function getResults($relation)
     {
@@ -23,7 +23,7 @@ 
     /**
      * Match the eagerly loaded results to their parents.
      *
-     * @param array  $$results
+     * @param array  $results
      * @param string $relation
      *
      * @return array

Indentation +25 added lines, -25 removed lines

@@ -4,32 +4,32 @@
 
 class HasMany extends HasOneOrMany
 {
-    /**
-     * Lazy-Load the results of the relationship.
-     *
-     * @param  $relation
-     *
-     * @return mixed
-     */
-    public function getResults($relation)
-    {
-        $results = $this->query->get();
+	/**
+	 * Lazy-Load the results of the relationship.
+	 *
+	 * @param  $relation
+	 *
+	 * @return mixed
+	 */
+	public function getResults($relation)
+	{
+		$results = $this->query->get();
 
-        $this->cacheRelation($results, $relation);
+		$this->cacheRelation($results, $relation);
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * Match the eagerly loaded results to their parents.
-     *
-     * @param array  $$results
-     * @param string $relation
-     *
-     * @return array
-     */
-    public function match(array $results, $relation)
-    {
-        return $this->matchMany($results, $relation);
-    }
+	/**
+	 * Match the eagerly loaded results to their parents.
+	 *
+	 * @param array  $$results
+	 * @param string $relation
+	 *
+	 * @return array
+	 */
+	public function match(array $results, $relation)
+	{
+		return $this->matchMany($results, $relation);
+	}
 }

src/Relationships/HasManyThrough.php

Doc Comments -1 removed lines

@@ -291,7 +291,6 @@
      * Run synchronization content if needed by the
      * relation type.
      *
-     * @param array $actualContent
      *
      * @return void
      */

Indentation +290 added lines, -290 removed lines

@@ -9,294 +9,294 @@
 
 class HasManyThrough extends Relationship
 {
-    /**
-     * The distance parent Entity instance.
-     *
-     * @var \Analogue\ORM\Entity
-     */
-    protected $farParent;
-
-    /**
-     * The far parent map instance.
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $farParentMap;
-
-    /**
-     * The near key on the relationship.
-     *
-     * @var string
-     */
-    protected $firstKey;
-
-    /**
-     * The far key on the relationship.
-     *
-     * @var string
-     */
-    protected $secondKey;
-
-    /**
-     * Create a new has many relationship instance.
-     *
-     * @param Mapper                  $mapper
-     * @param \Analogue\ORM\Mappable  $farParent
-     * @param \Analogue\ORM\EntityMap $parentMap
-     * @param string                  $firstKey
-     * @param string                  $secondKey
-     *
-     * @throws \Analogue\ORM\Exceptions\MappingException
-     */
-    public function __construct(Mapper $mapper, $farParent, $parentMap, $firstKey, $secondKey)
-    {
-        $this->firstKey = $firstKey;
-        $this->secondKey = $secondKey;
-        $this->farParent = $farParent;
-
-        $this->farParentMap = $mapper->getManager()->mapper($farParent)->getEntityMap();
-        $parentInstance = $mapper->getManager()->mapper($parentMap->getClass())->newInstance();
-
-        parent::__construct($mapper, $parentInstance);
-    }
-
-    /**
-     * Set the base constraints on the relation query.
-     *
-     * @return void
-     */
-    public function addConstraints()
-    {
-        $parentTable = $this->parentMap->getTable();
-
-        $this->setJoin();
-
-        if (static::$constraints) {
-            $farParentKeyName = $this->farParentMap->getKeyName();
-
-            $this->query->where(
-                $parentTable.'.'.$this->firstKey,
-                '=',
-                $this->farParent->getEntityAttribute($farParentKeyName)
-            );
-        }
-    }
-
-    /**
-     * Add the constraints for a relationship count query.
-     *
-     * @param Query $query
-     * @param Query $parent
-     *
-     * @return Query
-     */
-    public function getRelationCountQuery(Query $query, Query $parent)
-    {
-        $parentTable = $this->parentMap->getTable();
-
-        $this->setJoin($query);
-
-        $query->select(new Expression('count(*)'));
-
-        $key = $this->wrap($parentTable.'.'.$this->firstKey);
-
-        return $query->where($this->getHasCompareKey(), '=', new Expression($key));
-    }
-
-    /**
-     * Set the join clause on the query.
-     *
-     * @param null|Query $query
-     *
-     * @return void
-     */
-    protected function setJoin(Query $query = null)
-    {
-        $query = $query ?: $this->query;
-
-        $foreignKey = $this->relatedMap->getTable().'.'.$this->secondKey;
-
-        $query->join($this->parentMap->getTable(), $this->getQualifiedParentKeyName(), '=', $foreignKey);
-    }
-
-    /**
-     * Set the constraints for an eager load of the relation.
-     *
-     * @param array $results
-     *
-     * @return void
-     */
-    public function addEagerConstraints(array $results)
-    {
-        $table = $this->parentMap->getTable();
-
-        $this->query->whereIn($table.'.'.$this->firstKey, $this->getKeysFromResults($results));
-    }
-
-    /**
-     * Match eagerly loaded relationship to a result set.
-     *
-     * @param array  $results
-     * @param string $relation
-     *
-     * @return array
-     */
-    public function match(array $results, $relation)
-    {
-        $entities = $this->getEager();
-
-        $dictionary = $this->buildDictionary($entities);
-
-        $relatedKey = $this->relatedMap->getKeyName();
-
-        $cache = $this->parentMapper->getEntityCache();
-
-        $host = $this;
-
-        // Once we have the dictionary we can simply spin through the parent entities to
-        // link them up with their children using the keyed dictionary to make the
-        // matching very convenient and easy work. Then we'll just return them.
-        return array_map(function ($result) use ($relation, $relatedKey, $dictionary, $cache, $host) {
-            $key = $result[$relatedKey];
-
-            if (isset($dictionary[$key])) {
-                $value = $host->relatedMap->newCollection($dictionary[$key]);
-
-                $result[$relation] = $value;
-
-                $cache->cacheLoadedRelationResult($key, $relation, $value, $this);
-            }
-
-            return $result;
-        }, $results);
-    }
-
-    /**
-     * Build model dictionary keyed by the relation's foreign key.
-     *
-     * @param EntityCollection $results
-     *
-     * @return array
-     */
-    protected function buildDictionary(EntityCollection $results)
-    {
-        $dictionary = [];
-
-        $foreign = $this->firstKey;
-
-        // First we will create a dictionary of entities keyed by the foreign key of the
-        // relationship as this will allow us to quickly access all of the related
-        // entities without having to do nested looping which will be quite slow.
-        foreach ($results as $result) {
-            $dictionary[$result->{$foreign}][] = $result;
-        }
-
-        return $dictionary;
-    }
-
-    /**
-     * Get the results of the relationship.
-     *
-     * @param  $relation
-     *
-     * @return EntityCollection
-     */
-    public function getResults($relation)
-    {
-        $results = $this->query->get();
-
-        $this->cacheRelation($results, $relation);
-
-        return $results;
-    }
-
-    /**
-     * Execute the query as a "select" statement.
-     *
-     * @param array $columns
-     *
-     * @return EntityCollection
-     */
-    public function get($columns = ['*'])
-    {
-        // First we'll add the proper select columns onto the query so it is run with
-        // the proper columns. Then, we will get the results and hydrate out pivot
-        // entities with the result of those columns as a separate model relation.
-        $select = $this->getSelectColumns($columns);
-
-        $entities = $this->query->addSelect($select)->getEntities();
-
-        // If we actually found entities we will also eager load any relationships that
-        // have been specified as needing to be eager loaded. This will solve the
-        // n + 1 query problem for the developer and also increase performance.
-        if (count($entities) > 0) {
-            $entities = $this->query->eagerLoadRelations($entities);
-        }
-
-        return $this->relatedMap->newCollection($entities);
-    }
-
-    /**
-     * Set the select clause for the relation query.
-     *
-     * @param array $columns
-     *
-     * @return BelongsToMany
-     */
-    protected function getSelectColumns(array $columns = ['*'])
-    {
-        if ($columns == ['*']) {
-            $columns = [$this->relatedMap->getTable().'.*'];
-        }
-
-        return array_merge($columns, [$this->parentMap->getTable().'.'.$this->firstKey]);
-    }
-
-    /**
-     * Get a paginator for the "select" statement.
-     *
-     * @param int   $perPage
-     * @param array $columns
-     *
-     * @return \Illuminate\Pagination\LengthAwarePaginator
-     */
-    public function paginate($perPage = null, $columns = ['*'])
-    {
-        $this->query->addSelect($this->getSelectColumns($columns));
-
-        return $this->query->paginate($perPage, $columns);
-    }
-
-    /**
-     * Get the key name of the parent model.
-     *
-     * @return string
-     */
-    protected function getQualifiedParentKeyName()
-    {
-        return $this->parentMap->getQualifiedKeyName();
-    }
-
-    /**
-     * Get the key for comparing against the parent key in "has" query.
-     *
-     * @return string
-     */
-    public function getHasCompareKey()
-    {
-        return $this->farParentMap->getQualifiedKeyName();
-    }
-
-    /**
-     * Run synchronization content if needed by the
-     * relation type.
-     *
-     * @param array $actualContent
-     *
-     * @return void
-     */
-    public function sync(array $entities)
-    {
-        // N/A
-    }
+	/**
+	 * The distance parent Entity instance.
+	 *
+	 * @var \Analogue\ORM\Entity
+	 */
+	protected $farParent;
+
+	/**
+	 * The far parent map instance.
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $farParentMap;
+
+	/**
+	 * The near key on the relationship.
+	 *
+	 * @var string
+	 */
+	protected $firstKey;
+
+	/**
+	 * The far key on the relationship.
+	 *
+	 * @var string
+	 */
+	protected $secondKey;
+
+	/**
+	 * Create a new has many relationship instance.
+	 *
+	 * @param Mapper                  $mapper
+	 * @param \Analogue\ORM\Mappable  $farParent
+	 * @param \Analogue\ORM\EntityMap $parentMap
+	 * @param string                  $firstKey
+	 * @param string                  $secondKey
+	 *
+	 * @throws \Analogue\ORM\Exceptions\MappingException
+	 */
+	public function __construct(Mapper $mapper, $farParent, $parentMap, $firstKey, $secondKey)
+	{
+		$this->firstKey = $firstKey;
+		$this->secondKey = $secondKey;
+		$this->farParent = $farParent;
+
+		$this->farParentMap = $mapper->getManager()->mapper($farParent)->getEntityMap();
+		$parentInstance = $mapper->getManager()->mapper($parentMap->getClass())->newInstance();
+
+		parent::__construct($mapper, $parentInstance);
+	}
+
+	/**
+	 * Set the base constraints on the relation query.
+	 *
+	 * @return void
+	 */
+	public function addConstraints()
+	{
+		$parentTable = $this->parentMap->getTable();
+
+		$this->setJoin();
+
+		if (static::$constraints) {
+			$farParentKeyName = $this->farParentMap->getKeyName();
+
+			$this->query->where(
+				$parentTable.'.'.$this->firstKey,
+				'=',
+				$this->farParent->getEntityAttribute($farParentKeyName)
+			);
+		}
+	}
+
+	/**
+	 * Add the constraints for a relationship count query.
+	 *
+	 * @param Query $query
+	 * @param Query $parent
+	 *
+	 * @return Query
+	 */
+	public function getRelationCountQuery(Query $query, Query $parent)
+	{
+		$parentTable = $this->parentMap->getTable();
+
+		$this->setJoin($query);
+
+		$query->select(new Expression('count(*)'));
+
+		$key = $this->wrap($parentTable.'.'.$this->firstKey);
+
+		return $query->where($this->getHasCompareKey(), '=', new Expression($key));
+	}
+
+	/**
+	 * Set the join clause on the query.
+	 *
+	 * @param null|Query $query
+	 *
+	 * @return void
+	 */
+	protected function setJoin(Query $query = null)
+	{
+		$query = $query ?: $this->query;
+
+		$foreignKey = $this->relatedMap->getTable().'.'.$this->secondKey;
+
+		$query->join($this->parentMap->getTable(), $this->getQualifiedParentKeyName(), '=', $foreignKey);
+	}
+
+	/**
+	 * Set the constraints for an eager load of the relation.
+	 *
+	 * @param array $results
+	 *
+	 * @return void
+	 */
+	public function addEagerConstraints(array $results)
+	{
+		$table = $this->parentMap->getTable();
+
+		$this->query->whereIn($table.'.'.$this->firstKey, $this->getKeysFromResults($results));
+	}
+
+	/**
+	 * Match eagerly loaded relationship to a result set.
+	 *
+	 * @param array  $results
+	 * @param string $relation
+	 *
+	 * @return array
+	 */
+	public function match(array $results, $relation)
+	{
+		$entities = $this->getEager();
+
+		$dictionary = $this->buildDictionary($entities);
+
+		$relatedKey = $this->relatedMap->getKeyName();
+
+		$cache = $this->parentMapper->getEntityCache();
+
+		$host = $this;
+
+		// Once we have the dictionary we can simply spin through the parent entities to
+		// link them up with their children using the keyed dictionary to make the
+		// matching very convenient and easy work. Then we'll just return them.
+		return array_map(function ($result) use ($relation, $relatedKey, $dictionary, $cache, $host) {
+			$key = $result[$relatedKey];
+
+			if (isset($dictionary[$key])) {
+				$value = $host->relatedMap->newCollection($dictionary[$key]);
+
+				$result[$relation] = $value;
+
+				$cache->cacheLoadedRelationResult($key, $relation, $value, $this);
+			}
+
+			return $result;
+		}, $results);
+	}
+
+	/**
+	 * Build model dictionary keyed by the relation's foreign key.
+	 *
+	 * @param EntityCollection $results
+	 *
+	 * @return array
+	 */
+	protected function buildDictionary(EntityCollection $results)
+	{
+		$dictionary = [];
+
+		$foreign = $this->firstKey;
+
+		// First we will create a dictionary of entities keyed by the foreign key of the
+		// relationship as this will allow us to quickly access all of the related
+		// entities without having to do nested looping which will be quite slow.
+		foreach ($results as $result) {
+			$dictionary[$result->{$foreign}][] = $result;
+		}
+
+		return $dictionary;
+	}
+
+	/**
+	 * Get the results of the relationship.
+	 *
+	 * @param  $relation
+	 *
+	 * @return EntityCollection
+	 */
+	public function getResults($relation)
+	{
+		$results = $this->query->get();
+
+		$this->cacheRelation($results, $relation);
+
+		return $results;
+	}
+
+	/**
+	 * Execute the query as a "select" statement.
+	 *
+	 * @param array $columns
+	 *
+	 * @return EntityCollection
+	 */
+	public function get($columns = ['*'])
+	{
+		// First we'll add the proper select columns onto the query so it is run with
+		// the proper columns. Then, we will get the results and hydrate out pivot
+		// entities with the result of those columns as a separate model relation.
+		$select = $this->getSelectColumns($columns);
+
+		$entities = $this->query->addSelect($select)->getEntities();
+
+		// If we actually found entities we will also eager load any relationships that
+		// have been specified as needing to be eager loaded. This will solve the
+		// n + 1 query problem for the developer and also increase performance.
+		if (count($entities) > 0) {
+			$entities = $this->query->eagerLoadRelations($entities);
+		}
+
+		return $this->relatedMap->newCollection($entities);
+	}
+
+	/**
+	 * Set the select clause for the relation query.
+	 *
+	 * @param array $columns
+	 *
+	 * @return BelongsToMany
+	 */
+	protected function getSelectColumns(array $columns = ['*'])
+	{
+		if ($columns == ['*']) {
+			$columns = [$this->relatedMap->getTable().'.*'];
+		}
+
+		return array_merge($columns, [$this->parentMap->getTable().'.'.$this->firstKey]);
+	}
+
+	/**
+	 * Get a paginator for the "select" statement.
+	 *
+	 * @param int   $perPage
+	 * @param array $columns
+	 *
+	 * @return \Illuminate\Pagination\LengthAwarePaginator
+	 */
+	public function paginate($perPage = null, $columns = ['*'])
+	{
+		$this->query->addSelect($this->getSelectColumns($columns));
+
+		return $this->query->paginate($perPage, $columns);
+	}
+
+	/**
+	 * Get the key name of the parent model.
+	 *
+	 * @return string
+	 */
+	protected function getQualifiedParentKeyName()
+	{
+		return $this->parentMap->getQualifiedKeyName();
+	}
+
+	/**
+	 * Get the key for comparing against the parent key in "has" query.
+	 *
+	 * @return string
+	 */
+	public function getHasCompareKey()
+	{
+		return $this->farParentMap->getQualifiedKeyName();
+	}
+
+	/**
+	 * Run synchronization content if needed by the
+	 * relation type.
+	 *
+	 * @param array $actualContent
+	 *
+	 * @return void
+	 */
+	public function sync(array $entities)
+	{
+		// N/A
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
         // Once we have the dictionary we can simply spin through the parent entities to
         // link them up with their children using the keyed dictionary to make the
         // matching very convenient and easy work. Then we'll just return them.
-        return array_map(function ($result) use ($relation, $relatedKey, $dictionary, $cache, $host) {
+        return array_map(function($result) use ($relation, $relatedKey, $dictionary, $cache, $host) {
             $key = $result[$relatedKey];
 
             if (isset($dictionary[$key])) {

src/System/Manager.php

Doc Comments +3 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
      * Create a mapper for a given entity.
      *
      * @param \Analogue\ORM\Mappable|string|array|\Traversable $entity
-     * @param mixed                                            $entityMap
+     * @param null|EntityMap                                            $entityMap
      *
      * @throws MappingException
      * @throws \InvalidArgumentException
@@ -251,7 +251,7 @@ 
     /**
      * Check if the entity is already registered.
      *
-     * @param string|Entity $entity
+     * @param string $entity
      *
      * @return bool
      */
@@ -333,7 +333,7 @@ 
     /**
      * Register an entity.
      *
-     * @param string|\Analogue\ORM\Mappable $entity    entity's class name
+     * @param string $entity    entity's class name
      * @param string|EntityMap              $entityMap map's class name
      *
      * @throws MappingException

Indentation +689 added lines, -689 removed lines

@@ -21,693 +21,693 @@
  */
 class Manager
 {
-    /**
-     * Manager instance.
-     *
-     * @var Manager
-     */
-    protected static $instance;
-
-    /**
-     * Driver Manager.
-     *
-     * @var \Analogue\ORM\Drivers\Manager
-     */
-    protected $drivers;
-
-    /**
-     * Registered entity classes and corresponding map objects.
-     *
-     * @var array
-     */
-    protected $entityClasses = [];
-
-    /**
-     * Key value store of ValueObject Classes and corresponding map classes.
-     *
-     * @var array|ValueMap[]
-     */
-    protected $valueClasses = [];
-
-    /**
-     * Morph map.
-     */
-    protected $morphMap = [];
-
-    /**
-     * Loaded Mappers.
-     *
-     * @var array
-     */
-    protected $mappers = [];
-
-    /**
-     * Loaded Repositories.
-     *
-     * @var array
-     */
-    protected $repositories = [];
-
-    /**
-     * Event dispatcher instance.
-     *
-     * @var \Illuminate\Contracts\Events\Dispatcher
-     */
-    protected $eventDispatcher;
-
-    /**
-     * Available Analogue Events.
-     *
-     * @var array
-     */
-    protected $events = [
-        'initializing',
-        'initialized',
-        'store',
-        'stored',
-        'creating',
-        'created',
-        'updating',
-        'updated',
-        'deleting',
-        'deleted',
-    ];
-
-    /**
-     * If strictMode is set to true, Manager will throw
-     * an exception if no entityMap class are registered
-     * for a given entity class.
-     *
-     * @var bool
-     */
-    protected $strictMode = true;
-
-    /**
-     * We can add namespaces in this array where the manager
-     * will look for when auto registering entityMaps.
-     *
-     * @var array
-     */
-    protected $customMapNamespaces = [];
-
-    /**
-     * @param \Analogue\ORM\Drivers\Manager $driverManager
-     * @param Dispatcher                    $event
-     */
-    public function __construct(DriverManager $driverManager, Dispatcher $event)
-    {
-        $this->drivers = $driverManager;
-
-        $this->eventDispatcher = $event;
-
-        static::$instance = $this;
-    }
-
-    /**
-     * Create a mapper for a given entity (static alias).
-     *
-     * @param \Analogue\ORM\Mappable|string $entity
-     * @param null|EntityMap                $entityMap
-     *
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     *
-     * @return Mapper
-     */
-    public static function getMapper($entity, $entityMap = null)
-    {
-        return static::$instance->mapper($entity, $entityMap);
-    }
-
-    /**
-     * Create a mapper for a given entity.
-     *
-     * @param \Analogue\ORM\Mappable|string|array|\Traversable $entity
-     * @param mixed                                            $entityMap
-     *
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     *
-     * @return Mapper
-     */
-    public function mapper($entity, $entityMap = null)
-    {
-        if ($entity instanceof Wrapper) {
-            throw new MappingException('Tried to instantiate mapper on wrapped Entity');
-        }
-
-        $entity = $this->resolveEntityClass($entity);
-
-        $entity = $this->getInverseMorphMap($entity);
-
-        // Return existing mapper instance if exists.
-        if (array_key_exists($entity, $this->mappers)) {
-            return $this->mappers[$entity];
-        } else {
-            return $this->buildMapper($entity, $entityMap);
-        }
-    }
-
-    /**
-     * This method resolve entity class from mappable instances or iterators.
-     *
-     * @param \Analogue\ORM\Mappable|string|array|\Traversable $entity
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return string
-     */
-    protected function resolveEntityClass($entity)
-    {
-        // We first check if the entity is traversable and we'll resolve
-        // the entity based on the first item of the object.
-        if ($this->isTraversable($entity)) {
-            if (!count($entity)) {
-                throw new \InvalidArgumentException('Length of Entity collection must be greater than 0');
-            }
-
-            $firstEntityItem = ($entity instanceof \Iterator)
-                ? $entity->current()
-                : current($entity);
-
-            return $this->resolveEntityClass($firstEntityItem);
-        }
-
-        if (is_object($entity)) {
-            return get_class($entity);
-        }
-
-        if (is_string($entity)) {
-            return $entity;
-        }
-
-        throw new \InvalidArgumentException('Invalid entity type');
-    }
-
-    /**
-     * @param string $key
-     *
-     * @return string
-     */
-    public function getInverseMorphMap($key)
-    {
-        return array_key_exists($key, $this->morphMap) ? $this->morphMap[$key] : $key;
-    }
-
-    /**
-     * Build a new Mapper instance for a given Entity.
-     *
-     * @param string $entity
-     * @param        $entityMap
-     *
-     * @throws MappingException
-     *
-     * @return Mapper
-     */
-    protected function buildMapper($entity, $entityMap)
-    {
-        // If an EntityMap hasn't been manually registered by the user
-        // register it at runtime.
-        if (!$this->isRegisteredEntity($entity)) {
-            $this->register($entity, $entityMap);
-        }
-
-        $entityMap = $this->entityClasses[$entity];
-
-        $factory = new MapperFactory($this->drivers, $this->eventDispatcher, $this);
-
-        $mapper = $factory->make($entity, $entityMap);
-
-        $this->mappers[$entity] = $mapper;
-
-        // At this point we can safely call the boot() method on the entityMap as
-        // the mapper is now instantiated & registered within the manager.
-
-        $mapper->getEntityMap()->boot();
-
-        return $mapper;
-    }
-
-    /**
-     * Check if the entity is already registered.
-     *
-     * @param string|Entity $entity
-     *
-     * @return bool
-     */
-    public function isRegisteredEntity($entity)
-    {
-        if (!is_string($entity)) {
-            $entity = get_class($entity);
-        }
-
-        return array_key_exists($entity, $this->entityClasses);
-    }
-
-    /**
-     * Return an array containing registered entities & entityMap instances.
-     *
-     * @return array
-     */
-    public function getRegisteredEntities()
-    {
-        return $this->entityClasses;
-    }
-
-    /**
-     * Check if a value class is already registered.
-     *
-     * @param string|sdtClass $object
-     *
-     * @return bool
-     */
-    public function isRegisteredValueObject($object)
-    {
-        if (!is_string($object)) {
-            $object = get_class($object);
-        }
-
-        return array_key_exists($object, $this->valueClasses);
-    }
-
-    /**
-     * Return true if an object is an array or iterator.
-     *
-     * @param mixed $argument
-     *
-     * @return bool
-     */
-    public function isTraversable($argument)
-    {
-        return $argument instanceof \Traversable || is_array($argument);
-    }
-
-    /**
-     * Set strict mode for entityMap instantiation.
-     *
-     * @param bool $mode
-     */
-    public function setStrictMode($mode)
-    {
-        $this->strictMode = $mode;
-    }
-
-    /**
-     * Register a namespace in where Analogue
-     * will scan for EntityMaps & ValueMaps.
-     *
-     * @param string $namespace
-     *
-     * @return void
-     */
-    public function registerMapNamespace($namespace)
-    {
-        // Add a trailing antislash to namespace if not present
-        if (substr('testers', -1) != '\\') {
-            $namespace = $namespace.'\\';
-        }
-
-        $this->customMapNamespaces[] = $namespace;
-    }
-
-    /**
-     * Register an entity.
-     *
-     * @param string|\Analogue\ORM\Mappable $entity    entity's class name
-     * @param string|EntityMap              $entityMap map's class name
-     *
-     * @throws MappingException
-     *
-     * @return void
-     */
-    public function register($entity, $entityMap = null)
-    {
-        // If an object is provider, get the class name from it
-        if (!is_string($entity)) {
-            $entity = get_class($entity);
-        }
-
-        if ($this->isRegisteredEntity($entity)) {
-            throw new MappingException("Entity $entity is already registered.");
-        }
-
-        if (!class_exists($entity)) {
-            throw new MappingException("Class $entity does not exists");
-        }
-
-        if ($entityMap === null) {
-            $entityMap = $this->getEntityMapInstanceFor($entity);
-        }
-
-        if (is_string($entityMap)) {
-            $entityMap = new $entityMap();
-        }
-
-        if (!$entityMap instanceof EntityMap) {
-            throw new MappingException(get_class($entityMap).' must be an instance of EntityMap.');
-        }
-
-        $entityMap->setClass($entity);
-
-        $this->entityClasses[$entity] = $entityMap;
-    }
-
-    /**
-     * Get the entity map instance for a custom entity.
-     *
-     * @param string $entity
-     *
-     * @return \Analogue\ORM\EntityMap
-     */
-    protected function getEntityMapInstanceFor($entity)
-    {
-        if (class_exists($entity.'Map')) {
-            $map = $entity.'Map';
-            $map = new $map();
-
-            return $map;
-        }
-
-        if ($map = $this->getMapFromNamespaces($entity)) {
-            return $map;
-        }
-
-        if ($this->strictMode) {
-            throw new EntityMapNotFoundException("No Map registered for $entity");
-        }
-
-        $map = $this->getNewEntityMap();
-
-        return $map;
-    }
-
-    /**
-     * Scan through registered custom namespace
-     * for an Entity/ValueMap.
-     *
-     * @param string $class
-     *
-     * @return ValueMap|EntityMap|bool
-     */
-    protected function getMapFromNamespaces($class)
-    {
-        foreach ($this->customMapNamespaces as $namespace) {
-            if ($map = $this->findMapInNamespace($class, $namespace)) {
-                return $map;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Look in a custom namespace for an Entity/ValueMap.
-     *
-     * @param string $class
-     * @param string $namespace
-     *
-     * @return ValueMap|EntityMap|bool
-     */
-    protected function findMapInNamespace($class, $namespace)
-    {
-        $parts = explode('\\', $class);
-
-        $baseClass = $parts[count($parts) - 1];
-
-        $expectedClass = $namespace.$baseClass.'Map';
-
-        if (class_exists($expectedClass)) {
-            return new $expectedClass();
-        }
-
-        return false;
-    }
-
-    /**
-     * Dynamically create an entity map for a custom entity class.
-     *
-     * @return EntityMap
-     */
-    protected function getNewEntityMap()
-    {
-        return new EntityMap();
-    }
-
-    /**
-     * Return the Singleton instance of the manager.
-     *
-     * @return Manager
-     */
-    public static function getInstance()
-    {
-        return static::$instance;
-    }
-
-    /**
-     * Return the Driver Manager's instance.
-     *
-     * @return \Analogue\ORM\Drivers\Manager
-     */
-    public function getDriverManager()
-    {
-        return $this->drivers;
-    }
-
-    /**
-     * Get the Repository instance for the given Entity.
-     *
-     * @param \Analogue\ORM\Mappable|string $entity
-     *
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     *
-     * @return \Analogue\ORM\Repository
-     */
-    public function repository($entity)
-    {
-        if (!is_string($entity)) {
-            $entity = get_class($entity);
-        }
-
-        // First we check if the repository is not already created.
-        if (array_key_exists($entity, $this->repositories)) {
-            return $this->repositories[$entity];
-        }
-
-        $this->repositories[$entity] = new Repository($this->mapper($entity));
-
-        return $this->repositories[$entity];
-    }
-
-    /**
-     * Return true is the object is registered as value object.
-     *
-     * @param mixed $object
-     *
-     * @return bool
-     */
-    public function isValueObject($object)
-    {
-        if (!is_string($object)) {
-            $object = get_class($object);
-        }
-
-        return array_key_exists($object, $this->valueClasses);
-    }
-
-    /**
-     * Get the Value Map for a given Value Object Class.
-     *
-     * @param string $valueObject
-     *
-     * @throws MappingException
-     *
-     * @return \Analogue\ORM\ValueMap
-     */
-    public function getValueMap($valueObject)
-    {
-        if (!is_string($valueObject)) {
-            $valueObject = get_class($valueObject);
-        }
-
-        if (!array_key_exists($valueObject, $this->valueClasses)) {
-            $this->registerValueObject($valueObject);
-        }
-
-        /** @var ValueMap $valueMap */
-        $valueMap = new $this->valueClasses[$valueObject]();
-
-        $valueMap->setClass($valueObject);
-
-        return $valueMap;
-    }
-
-    /**
-     * Register a Value Object.
-     *
-     * @param string $valueObject
-     * @param string $valueMap
-     *
-     * @throws MappingException
-     *
-     * @return void
-     */
-    public function registerValueObject($valueObject, $valueMap = null)
-    {
-        if (!is_string($valueObject)) {
-            $valueObject = get_class($valueObject);
-        }
-
-        if ($valueMap === null) {
-
-            // First, we'll look into registered namespaces for Entity Maps,
-            // if any. Then we'll fallback to the same namespace of the object
-            if (!$valueMap = $this->getMapFromNamespaces($valueObject)) {
-                $valueMap = $valueObject.'Map';
-            } else {
-                $valueMap = get_class($valueMap);
-            }
-        }
-
-        if (!class_exists($valueMap)) {
-            throw new MappingException("$valueMap doesn't exists");
-        }
-
-        $this->valueClasses[$valueObject] = $valueMap;
-    }
-
-    /**
-     * Instantiate a new Value Object instance.
-     *
-     * @param string $valueObject
-     *
-     * @return \Analogue\ORM\ValueObject
-     */
-    public function getValueObjectInstance($valueObject)
-    {
-        $prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($valueObject), $valueObject));
-
-        return $prototype;
-    }
-
-    /**
-     * Register Analogue Plugin.
-     *
-     * @param string $plugin class
-     *
-     * @return void
-     */
-    public function registerPlugin($plugin)
-    {
-        /** @var AnaloguePluginInterface $plugin */
-        $plugin = new $plugin($this);
-
-        $this->events = array_merge($this->events, $plugin->getCustomEvents());
-
-        $plugin->register();
-    }
-
-    /**
-     * Register event listeners that will be fired regardless the type
-     * of the entity.
-     *
-     * @param string   $event
-     * @param \Closure $callback
-     *
-     * @throws \LogicException
-     *
-     * @return void
-     */
-    public function registerGlobalEvent($event, $callback)
-    {
-        if (!in_array($event, $this->events, false)) {
-            throw new \LogicException("Analogue : Event $event doesn't exist");
-        }
-
-        $this->eventDispatcher->listen("analogue.{$event}.*", $callback);
-    }
-
-    /**
-     * Shortcut to Mapper store.
-     *
-     * @param mixed $entity
-     *
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     *
-     * @return mixed
-     */
-    public function store($entity)
-    {
-        return $this->mapper($entity)->store($entity);
-    }
-
-    /**
-     * Shortcut to Mapper delete.
-     *
-     * @param mixed $entity
-     *
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     *
-     * @return \Illuminate\Support\Collection|null
-     */
-    public function delete($entity)
-    {
-        return $this->mapper($entity)->delete($entity);
-    }
-
-    /**
-     * Shortcut to Mapper query.
-     *
-     * @param mixed $entity
-     *
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     *
-     * @return Query
-     */
-    public function query($entity)
-    {
-        return $this->mapper($entity)->query();
-    }
-
-    /**
-     * Shortcut to Mapper Global Query.
-     *
-     * @param mixed $entity
-     *
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     *
-     * @return Query
-     */
-    public function globalQuery($entity)
-    {
-        return $this->mapper($entity)->globalQuery();
-    }
-
-    /**
-     * @param array $morphMap
-     *
-     * @return $this
-     */
-    public function morphMap(array $morphMap)
-    {
-        $this->morphMap = $morphMap;
-
-        return $this;
-    }
-
-    /**
-     * @param string $class
-     *
-     * @return mixed
-     */
-    public function getMorphMap($class)
-    {
-        $key = array_search($class, $this->morphMap, false);
-
-        return $key !== false ? $key : $class;
-    }
+	/**
+	 * Manager instance.
+	 *
+	 * @var Manager
+	 */
+	protected static $instance;
+
+	/**
+	 * Driver Manager.
+	 *
+	 * @var \Analogue\ORM\Drivers\Manager
+	 */
+	protected $drivers;
+
+	/**
+	 * Registered entity classes and corresponding map objects.
+	 *
+	 * @var array
+	 */
+	protected $entityClasses = [];
+
+	/**
+	 * Key value store of ValueObject Classes and corresponding map classes.
+	 *
+	 * @var array|ValueMap[]
+	 */
+	protected $valueClasses = [];
+
+	/**
+	 * Morph map.
+	 */
+	protected $morphMap = [];
+
+	/**
+	 * Loaded Mappers.
+	 *
+	 * @var array
+	 */
+	protected $mappers = [];
+
+	/**
+	 * Loaded Repositories.
+	 *
+	 * @var array
+	 */
+	protected $repositories = [];
+
+	/**
+	 * Event dispatcher instance.
+	 *
+	 * @var \Illuminate\Contracts\Events\Dispatcher
+	 */
+	protected $eventDispatcher;
+
+	/**
+	 * Available Analogue Events.
+	 *
+	 * @var array
+	 */
+	protected $events = [
+		'initializing',
+		'initialized',
+		'store',
+		'stored',
+		'creating',
+		'created',
+		'updating',
+		'updated',
+		'deleting',
+		'deleted',
+	];
+
+	/**
+	 * If strictMode is set to true, Manager will throw
+	 * an exception if no entityMap class are registered
+	 * for a given entity class.
+	 *
+	 * @var bool
+	 */
+	protected $strictMode = true;
+
+	/**
+	 * We can add namespaces in this array where the manager
+	 * will look for when auto registering entityMaps.
+	 *
+	 * @var array
+	 */
+	protected $customMapNamespaces = [];
+
+	/**
+	 * @param \Analogue\ORM\Drivers\Manager $driverManager
+	 * @param Dispatcher                    $event
+	 */
+	public function __construct(DriverManager $driverManager, Dispatcher $event)
+	{
+		$this->drivers = $driverManager;
+
+		$this->eventDispatcher = $event;
+
+		static::$instance = $this;
+	}
+
+	/**
+	 * Create a mapper for a given entity (static alias).
+	 *
+	 * @param \Analogue\ORM\Mappable|string $entity
+	 * @param null|EntityMap                $entityMap
+	 *
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return Mapper
+	 */
+	public static function getMapper($entity, $entityMap = null)
+	{
+		return static::$instance->mapper($entity, $entityMap);
+	}
+
+	/**
+	 * Create a mapper for a given entity.
+	 *
+	 * @param \Analogue\ORM\Mappable|string|array|\Traversable $entity
+	 * @param mixed                                            $entityMap
+	 *
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return Mapper
+	 */
+	public function mapper($entity, $entityMap = null)
+	{
+		if ($entity instanceof Wrapper) {
+			throw new MappingException('Tried to instantiate mapper on wrapped Entity');
+		}
+
+		$entity = $this->resolveEntityClass($entity);
+
+		$entity = $this->getInverseMorphMap($entity);
+
+		// Return existing mapper instance if exists.
+		if (array_key_exists($entity, $this->mappers)) {
+			return $this->mappers[$entity];
+		} else {
+			return $this->buildMapper($entity, $entityMap);
+		}
+	}
+
+	/**
+	 * This method resolve entity class from mappable instances or iterators.
+	 *
+	 * @param \Analogue\ORM\Mappable|string|array|\Traversable $entity
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return string
+	 */
+	protected function resolveEntityClass($entity)
+	{
+		// We first check if the entity is traversable and we'll resolve
+		// the entity based on the first item of the object.
+		if ($this->isTraversable($entity)) {
+			if (!count($entity)) {
+				throw new \InvalidArgumentException('Length of Entity collection must be greater than 0');
+			}
+
+			$firstEntityItem = ($entity instanceof \Iterator)
+				? $entity->current()
+				: current($entity);
+
+			return $this->resolveEntityClass($firstEntityItem);
+		}
+
+		if (is_object($entity)) {
+			return get_class($entity);
+		}
+
+		if (is_string($entity)) {
+			return $entity;
+		}
+
+		throw new \InvalidArgumentException('Invalid entity type');
+	}
+
+	/**
+	 * @param string $key
+	 *
+	 * @return string
+	 */
+	public function getInverseMorphMap($key)
+	{
+		return array_key_exists($key, $this->morphMap) ? $this->morphMap[$key] : $key;
+	}
+
+	/**
+	 * Build a new Mapper instance for a given Entity.
+	 *
+	 * @param string $entity
+	 * @param        $entityMap
+	 *
+	 * @throws MappingException
+	 *
+	 * @return Mapper
+	 */
+	protected function buildMapper($entity, $entityMap)
+	{
+		// If an EntityMap hasn't been manually registered by the user
+		// register it at runtime.
+		if (!$this->isRegisteredEntity($entity)) {
+			$this->register($entity, $entityMap);
+		}
+
+		$entityMap = $this->entityClasses[$entity];
+
+		$factory = new MapperFactory($this->drivers, $this->eventDispatcher, $this);
+
+		$mapper = $factory->make($entity, $entityMap);
+
+		$this->mappers[$entity] = $mapper;
+
+		// At this point we can safely call the boot() method on the entityMap as
+		// the mapper is now instantiated & registered within the manager.
+
+		$mapper->getEntityMap()->boot();
+
+		return $mapper;
+	}
+
+	/**
+	 * Check if the entity is already registered.
+	 *
+	 * @param string|Entity $entity
+	 *
+	 * @return bool
+	 */
+	public function isRegisteredEntity($entity)
+	{
+		if (!is_string($entity)) {
+			$entity = get_class($entity);
+		}
+
+		return array_key_exists($entity, $this->entityClasses);
+	}
+
+	/**
+	 * Return an array containing registered entities & entityMap instances.
+	 *
+	 * @return array
+	 */
+	public function getRegisteredEntities()
+	{
+		return $this->entityClasses;
+	}
+
+	/**
+	 * Check if a value class is already registered.
+	 *
+	 * @param string|sdtClass $object
+	 *
+	 * @return bool
+	 */
+	public function isRegisteredValueObject($object)
+	{
+		if (!is_string($object)) {
+			$object = get_class($object);
+		}
+
+		return array_key_exists($object, $this->valueClasses);
+	}
+
+	/**
+	 * Return true if an object is an array or iterator.
+	 *
+	 * @param mixed $argument
+	 *
+	 * @return bool
+	 */
+	public function isTraversable($argument)
+	{
+		return $argument instanceof \Traversable || is_array($argument);
+	}
+
+	/**
+	 * Set strict mode for entityMap instantiation.
+	 *
+	 * @param bool $mode
+	 */
+	public function setStrictMode($mode)
+	{
+		$this->strictMode = $mode;
+	}
+
+	/**
+	 * Register a namespace in where Analogue
+	 * will scan for EntityMaps & ValueMaps.
+	 *
+	 * @param string $namespace
+	 *
+	 * @return void
+	 */
+	public function registerMapNamespace($namespace)
+	{
+		// Add a trailing antislash to namespace if not present
+		if (substr('testers', -1) != '\\') {
+			$namespace = $namespace.'\\';
+		}
+
+		$this->customMapNamespaces[] = $namespace;
+	}
+
+	/**
+	 * Register an entity.
+	 *
+	 * @param string|\Analogue\ORM\Mappable $entity    entity's class name
+	 * @param string|EntityMap              $entityMap map's class name
+	 *
+	 * @throws MappingException
+	 *
+	 * @return void
+	 */
+	public function register($entity, $entityMap = null)
+	{
+		// If an object is provider, get the class name from it
+		if (!is_string($entity)) {
+			$entity = get_class($entity);
+		}
+
+		if ($this->isRegisteredEntity($entity)) {
+			throw new MappingException("Entity $entity is already registered.");
+		}
+
+		if (!class_exists($entity)) {
+			throw new MappingException("Class $entity does not exists");
+		}
+
+		if ($entityMap === null) {
+			$entityMap = $this->getEntityMapInstanceFor($entity);
+		}
+
+		if (is_string($entityMap)) {
+			$entityMap = new $entityMap();
+		}
+
+		if (!$entityMap instanceof EntityMap) {
+			throw new MappingException(get_class($entityMap).' must be an instance of EntityMap.');
+		}
+
+		$entityMap->setClass($entity);
+
+		$this->entityClasses[$entity] = $entityMap;
+	}
+
+	/**
+	 * Get the entity map instance for a custom entity.
+	 *
+	 * @param string $entity
+	 *
+	 * @return \Analogue\ORM\EntityMap
+	 */
+	protected function getEntityMapInstanceFor($entity)
+	{
+		if (class_exists($entity.'Map')) {
+			$map = $entity.'Map';
+			$map = new $map();
+
+			return $map;
+		}
+
+		if ($map = $this->getMapFromNamespaces($entity)) {
+			return $map;
+		}
+
+		if ($this->strictMode) {
+			throw new EntityMapNotFoundException("No Map registered for $entity");
+		}
+
+		$map = $this->getNewEntityMap();
+
+		return $map;
+	}
+
+	/**
+	 * Scan through registered custom namespace
+	 * for an Entity/ValueMap.
+	 *
+	 * @param string $class
+	 *
+	 * @return ValueMap|EntityMap|bool
+	 */
+	protected function getMapFromNamespaces($class)
+	{
+		foreach ($this->customMapNamespaces as $namespace) {
+			if ($map = $this->findMapInNamespace($class, $namespace)) {
+				return $map;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Look in a custom namespace for an Entity/ValueMap.
+	 *
+	 * @param string $class
+	 * @param string $namespace
+	 *
+	 * @return ValueMap|EntityMap|bool
+	 */
+	protected function findMapInNamespace($class, $namespace)
+	{
+		$parts = explode('\\', $class);
+
+		$baseClass = $parts[count($parts) - 1];
+
+		$expectedClass = $namespace.$baseClass.'Map';
+
+		if (class_exists($expectedClass)) {
+			return new $expectedClass();
+		}
+
+		return false;
+	}
+
+	/**
+	 * Dynamically create an entity map for a custom entity class.
+	 *
+	 * @return EntityMap
+	 */
+	protected function getNewEntityMap()
+	{
+		return new EntityMap();
+	}
+
+	/**
+	 * Return the Singleton instance of the manager.
+	 *
+	 * @return Manager
+	 */
+	public static function getInstance()
+	{
+		return static::$instance;
+	}
+
+	/**
+	 * Return the Driver Manager's instance.
+	 *
+	 * @return \Analogue\ORM\Drivers\Manager
+	 */
+	public function getDriverManager()
+	{
+		return $this->drivers;
+	}
+
+	/**
+	 * Get the Repository instance for the given Entity.
+	 *
+	 * @param \Analogue\ORM\Mappable|string $entity
+	 *
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 *
+	 * @return \Analogue\ORM\Repository
+	 */
+	public function repository($entity)
+	{
+		if (!is_string($entity)) {
+			$entity = get_class($entity);
+		}
+
+		// First we check if the repository is not already created.
+		if (array_key_exists($entity, $this->repositories)) {
+			return $this->repositories[$entity];
+		}
+
+		$this->repositories[$entity] = new Repository($this->mapper($entity));
+
+		return $this->repositories[$entity];
+	}
+
+	/**
+	 * Return true is the object is registered as value object.
+	 *
+	 * @param mixed $object
+	 *
+	 * @return bool
+	 */
+	public function isValueObject($object)
+	{
+		if (!is_string($object)) {
+			$object = get_class($object);
+		}
+
+		return array_key_exists($object, $this->valueClasses);
+	}
+
+	/**
+	 * Get the Value Map for a given Value Object Class.
+	 *
+	 * @param string $valueObject
+	 *
+	 * @throws MappingException
+	 *
+	 * @return \Analogue\ORM\ValueMap
+	 */
+	public function getValueMap($valueObject)
+	{
+		if (!is_string($valueObject)) {
+			$valueObject = get_class($valueObject);
+		}
+
+		if (!array_key_exists($valueObject, $this->valueClasses)) {
+			$this->registerValueObject($valueObject);
+		}
+
+		/** @var ValueMap $valueMap */
+		$valueMap = new $this->valueClasses[$valueObject]();
+
+		$valueMap->setClass($valueObject);
+
+		return $valueMap;
+	}
+
+	/**
+	 * Register a Value Object.
+	 *
+	 * @param string $valueObject
+	 * @param string $valueMap
+	 *
+	 * @throws MappingException
+	 *
+	 * @return void
+	 */
+	public function registerValueObject($valueObject, $valueMap = null)
+	{
+		if (!is_string($valueObject)) {
+			$valueObject = get_class($valueObject);
+		}
+
+		if ($valueMap === null) {
+
+			// First, we'll look into registered namespaces for Entity Maps,
+			// if any. Then we'll fallback to the same namespace of the object
+			if (!$valueMap = $this->getMapFromNamespaces($valueObject)) {
+				$valueMap = $valueObject.'Map';
+			} else {
+				$valueMap = get_class($valueMap);
+			}
+		}
+
+		if (!class_exists($valueMap)) {
+			throw new MappingException("$valueMap doesn't exists");
+		}
+
+		$this->valueClasses[$valueObject] = $valueMap;
+	}
+
+	/**
+	 * Instantiate a new Value Object instance.
+	 *
+	 * @param string $valueObject
+	 *
+	 * @return \Analogue\ORM\ValueObject
+	 */
+	public function getValueObjectInstance($valueObject)
+	{
+		$prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($valueObject), $valueObject));
+
+		return $prototype;
+	}
+
+	/**
+	 * Register Analogue Plugin.
+	 *
+	 * @param string $plugin class
+	 *
+	 * @return void
+	 */
+	public function registerPlugin($plugin)
+	{
+		/** @var AnaloguePluginInterface $plugin */
+		$plugin = new $plugin($this);
+
+		$this->events = array_merge($this->events, $plugin->getCustomEvents());
+
+		$plugin->register();
+	}
+
+	/**
+	 * Register event listeners that will be fired regardless the type
+	 * of the entity.
+	 *
+	 * @param string   $event
+	 * @param \Closure $callback
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return void
+	 */
+	public function registerGlobalEvent($event, $callback)
+	{
+		if (!in_array($event, $this->events, false)) {
+			throw new \LogicException("Analogue : Event $event doesn't exist");
+		}
+
+		$this->eventDispatcher->listen("analogue.{$event}.*", $callback);
+	}
+
+	/**
+	 * Shortcut to Mapper store.
+	 *
+	 * @param mixed $entity
+	 *
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return mixed
+	 */
+	public function store($entity)
+	{
+		return $this->mapper($entity)->store($entity);
+	}
+
+	/**
+	 * Shortcut to Mapper delete.
+	 *
+	 * @param mixed $entity
+	 *
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return \Illuminate\Support\Collection|null
+	 */
+	public function delete($entity)
+	{
+		return $this->mapper($entity)->delete($entity);
+	}
+
+	/**
+	 * Shortcut to Mapper query.
+	 *
+	 * @param mixed $entity
+	 *
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return Query
+	 */
+	public function query($entity)
+	{
+		return $this->mapper($entity)->query();
+	}
+
+	/**
+	 * Shortcut to Mapper Global Query.
+	 *
+	 * @param mixed $entity
+	 *
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return Query
+	 */
+	public function globalQuery($entity)
+	{
+		return $this->mapper($entity)->globalQuery();
+	}
+
+	/**
+	 * @param array $morphMap
+	 *
+	 * @return $this
+	 */
+	public function morphMap(array $morphMap)
+	{
+		$this->morphMap = $morphMap;
+
+		return $this;
+	}
+
+	/**
+	 * @param string $class
+	 *
+	 * @return mixed
+	 */
+	public function getMorphMap($class)
+	{
+		$key = array_search($class, $this->morphMap, false);
+
+		return $key !== false ? $key : $class;
+	}
 }

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Analogue\ORM\Repository;
 use Analogue\ORM\System\Wrappers\Wrapper;
 use Analogue\ORM\ValueMap;
-use Exception;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Support\Collection;
 

src/System/ResultBuilder.php

Doc Comments -1 removed lines

@@ -38,7 +38,6 @@
 
     /**
      * @param Mapper $defaultMapper
-     * @param array  $eagerLoads
      */
     public function __construct(Mapper $defaultMapper)
     {

Indentation +340 added lines, -340 removed lines

@@ -7,344 +7,344 @@
 
 class ResultBuilder
 {
-    /**
-     * The default mapper used to build entities with.
-     *
-     * @var \Analogue\ORM\System\Mapper
-     */
-    protected $defaultMapper;
-
-    /**
-     * Relations that will be eager loaded on this query.
-     *
-     * @var array
-     */
-    protected $eagerLoads;
-
-    /**
-     * The Entity Map for the entity to build.
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $entityMap;
-
-    /**
-     * An array of builders used by this class to build necessary
-     * entities for each result type.
-     *
-     * @var array
-     */
-    protected $builders = [];
-
-    /**
-     * @param Mapper $defaultMapper
-     * @param array  $eagerLoads
-     */
-    public function __construct(Mapper $defaultMapper)
-    {
-        $this->defaultMapper = $defaultMapper;
-        $this->entityMap = $defaultMapper->getEntityMap();
-    }
-
-    /**
-     * Convert a result set into an array of entities.
-     *
-     * @param array $results
-     * @param array $eagerLoads name of the relation to be eager loaded on the Entities
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function build(array $results, array $eagerLoads)
-    {
-        // Parse embedded relations and build corresponding entities using the default
-        // mapper.
-        $results = $this->buildEmbeddedRelationships($results);
-
-        // Launch the queries related to eager loads, and match the
-        // current result set to these loaded relationships.
-        $results = $this->queryEagerLoadedRelationships($results, $eagerLoads);
-
-        // Note : Maybe we could use a PolymorphicResultBuilder, which would
-        // be shared by both STI and polymorphic relations, as they share the
-        // same process.
-
-        switch ($this->entityMap->getInheritanceType()) {
-            case 'single_table':
-                return $this->buildUsingSingleTableInheritance($results);
-                break;
-
-            default:
-                return $this->buildWithDefaultMapper($results);
-                break;
-        }
-    }
-
-    /**
-     * Build embedded objects and match them to the result set.
-     *
-     * @param array $results
-     *
-     * @return array
-     */
-    protected function buildEmbeddedRelationships(array $results) : array
-    {
-        $entityMap = $this->entityMap;
-        $instance = $this->defaultMapper->newInstance();
-        $embeddeds = $entityMap->getEmbeddedRelationships();
-
-        foreach ($embeddeds as $embedded) {
-            $results = $entityMap->$embedded($instance)->match($results, $embedded);
-        }
-
-        return $results;
-    }
-
-    /**
-     * Launch queries on eager loaded relationships.
-     *
-     * @return array
-     */
-    protected function queryEagerLoadedRelationships(array $results, array $eagerLoads) : array
-    {
-        $this->eagerLoads = $this->parseRelations($eagerLoads);
-
-        return $this->eagerLoadRelations($results);
-    }
-
-    /**
-     * Parse a list of relations into individuals.
-     *
-     * @param array $relations
-     *
-     * @return array
-     */
-    protected function parseRelations(array $relations)
-    {
-        $results = [];
-
-        foreach ($relations as $name => $constraints) {
-            // If the "relation" value is actually a numeric key, we can assume that no
-            // constraints have been specified for the eager load and we'll just put
-            // an empty Closure with the loader so that we can treat all the same.
-            if (is_numeric($name)) {
-                $f = function () {
-                };
-
-                list($name, $constraints) = [$constraints, $f];
-            }
-
-            // We need to separate out any nested includes. Which allows the developers
-            // to load deep relationships using "dots" without stating each level of
-            // the relationship with its own key in the array of eager load names.
-            $results = $this->parseNested($name, $results);
-
-            $results[$name] = $constraints;
-        }
-
-        return $results;
-    }
-
-    /**
-     * Parse the nested relationships in a relation.
-     *
-     * @param string $name
-     * @param array  $results
-     *
-     * @return array
-     */
-    protected function parseNested($name, $results)
-    {
-        $progress = [];
-
-        // If the relation has already been set on the result array, we will not set it
-        // again, since that would override any constraints that were already placed
-        // on the relationships. We will only set the ones that are not specified.
-        foreach (explode('.', $name) as $segment) {
-            $progress[] = $segment;
-
-            if (!isset($results[$last = implode('.', $progress)])) {
-                $results[$last] = function () {
-                };
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Eager load the relationships on a result set.
-     *
-     * @param array $results
-     *
-     * @return array
-     */
-    public function eagerLoadRelations(array $results)
-    {
-        foreach ($this->eagerLoads as $name => $constraints) {
-
-            // For nested eager loads we'll skip loading them here and they will be set as an
-            // eager load on the query to retrieve the relation so that they will be eager
-            // loaded on that query, because that is where they get hydrated as models.
-            if (strpos($name, '.') === false) {
-                $results = $this->loadRelation($results, $name, $constraints);
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Eagerly load the relationship on a set of entities.
-     *
-     * @param array    $results
-     * @param string   $name
-     * @param \Closure $constraints
-     *
-     * @return array
-     */
-    protected function loadRelation(array $results, $name, Closure $constraints) : array
-    {
-        // First we will "back up" the existing where conditions on the query so we can
-        // add our eager constraints. Then we will merge the wheres that were on the
-        // query back to it in order that any where conditions might be specified.
-        $relation = $this->getRelation($name);
-
-        $relation->addEagerConstraints($results);
-
-        call_user_func($constraints, $relation);
-
-        // Once we have the results, we just match those back up to their parent models
-        // using the relationship instance. Then we just return the finished arrays
-        // of models which have been eagerly hydrated and are readied for return.
-
-        return $relation->match($results, $name);
-    }
-
-    /**
-     * Get the relation instance for the given relation name.
-     *
-     * @param string $relation
-     *
-     * @return \Analogue\ORM\Relationships\Relationship
-     */
-    public function getRelation($relation)
-    {
-        // We want to run a relationship query without any constrains so that we will
-        // not have to remove these where clauses manually which gets really hacky
-        // and is error prone while we remove the developer's own where clauses.
-        $query = Relationship::noConstraints(function () use ($relation) {
-            return $this->entityMap->$relation($this->defaultMapper->newInstance());
-        });
-
-        $nested = $this->nestedRelations($relation);
-
-        // If there are nested relationships set on the query, we will put those onto
-        // the query instances so that they can be handled after this relationship
-        // is loaded. In this way they will all trickle down as they are loaded.
-        if (count($nested) > 0) {
-            $query->getQuery()->with($nested);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Get the deeply nested relations for a given top-level relation.
-     *
-     * @param string $relation
-     *
-     * @return array
-     */
-    protected function nestedRelations($relation)
-    {
-        $nested = [];
-
-        // We are basically looking for any relationships that are nested deeper than
-        // the given top-level relationship. We will just check for any relations
-        // that start with the given top relations and adds them to our arrays.
-        foreach ($this->eagerLoads as $name => $constraints) {
-            if ($this->isNested($name, $relation)) {
-                $nested[substr($name, strlen($relation.'.'))] = $constraints;
-            }
-        }
-
-        return $nested;
-    }
-
-    /**
-     * Determine if the relationship is nested.
-     *
-     * @param string $name
-     * @param string $relation
-     *
-     * @return bool
-     */
-    protected function isNested($name, $relation)
-    {
-        $dots = str_contains($name, '.');
-
-        return $dots && starts_with($name, $relation.'.');
-    }
-
-    /**
-     * Build an entity from results, using the default mapper on this builder.
-     * This is the default build plan when no table inheritance is being used.
-     *
-     * @param array $results
-     *
-     * @return Collection
-     */
-    protected function buildWithDefaultMapper(array $results)
-    {
-        $builder = new EntityBuilder($this->defaultMapper, array_keys($this->eagerLoads));
-
-        return collect($results)->map(function ($item, $key) use ($builder) {
-            return $builder->build($item);
-        })->all();
-    }
-
-    /**
-     * Build an entity from results, using single table inheritance.
-     *
-     * @param array $results
-     *
-     * @return Collection
-     */
-    protected function buildUsingSingleTableInheritance(array $results)
-    {
-        return collect($results)->map(function ($item, $key) {
-            $builder = $this->builderForResult($item);
-
-            return $builder->build($item);
-        })->all();
-    }
-
-    /**
-     * Given a result array, return the entity builder needed to correctly
-     * build the result into an entity. If no getDiscriminatorColumnMap property
-     * has been defined on the EntityMap, we'll assume that the value stored in
-     * the $type column is the fully qualified class name of the entity and
-     * we'll use it instead.
-     *
-     * @param array $result
-     *
-     * @return EntityBuilder
-     */
-    protected function builderForResult(array $result)
-    {
-        $type = $result[$this->entityMap->getDiscriminatorColumn()];
-
-        $columnMap = $this->entityMap->getDiscriminatorColumnMap();
-
-        $class = isset($columnMap[$type]) ? $columnMap[$type] : $type;
-
-        if (!isset($this->builders[$type])) {
-            $this->builders[$type] = new EntityBuilder(
-                Manager::getInstance()->mapper($class),
-                array_keys($this->eagerLoads)
-            );
-        }
-
-        return $this->builders[$type];
-    }
+	/**
+	 * The default mapper used to build entities with.
+	 *
+	 * @var \Analogue\ORM\System\Mapper
+	 */
+	protected $defaultMapper;
+
+	/**
+	 * Relations that will be eager loaded on this query.
+	 *
+	 * @var array
+	 */
+	protected $eagerLoads;
+
+	/**
+	 * The Entity Map for the entity to build.
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $entityMap;
+
+	/**
+	 * An array of builders used by this class to build necessary
+	 * entities for each result type.
+	 *
+	 * @var array
+	 */
+	protected $builders = [];
+
+	/**
+	 * @param Mapper $defaultMapper
+	 * @param array  $eagerLoads
+	 */
+	public function __construct(Mapper $defaultMapper)
+	{
+		$this->defaultMapper = $defaultMapper;
+		$this->entityMap = $defaultMapper->getEntityMap();
+	}
+
+	/**
+	 * Convert a result set into an array of entities.
+	 *
+	 * @param array $results
+	 * @param array $eagerLoads name of the relation to be eager loaded on the Entities
+	 *
+	 * @return \Illuminate\Support\Collection
+	 */
+	public function build(array $results, array $eagerLoads)
+	{
+		// Parse embedded relations and build corresponding entities using the default
+		// mapper.
+		$results = $this->buildEmbeddedRelationships($results);
+
+		// Launch the queries related to eager loads, and match the
+		// current result set to these loaded relationships.
+		$results = $this->queryEagerLoadedRelationships($results, $eagerLoads);
+
+		// Note : Maybe we could use a PolymorphicResultBuilder, which would
+		// be shared by both STI and polymorphic relations, as they share the
+		// same process.
+
+		switch ($this->entityMap->getInheritanceType()) {
+			case 'single_table':
+				return $this->buildUsingSingleTableInheritance($results);
+				break;
+
+			default:
+				return $this->buildWithDefaultMapper($results);
+				break;
+		}
+	}
+
+	/**
+	 * Build embedded objects and match them to the result set.
+	 *
+	 * @param array $results
+	 *
+	 * @return array
+	 */
+	protected function buildEmbeddedRelationships(array $results) : array
+	{
+		$entityMap = $this->entityMap;
+		$instance = $this->defaultMapper->newInstance();
+		$embeddeds = $entityMap->getEmbeddedRelationships();
+
+		foreach ($embeddeds as $embedded) {
+			$results = $entityMap->$embedded($instance)->match($results, $embedded);
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Launch queries on eager loaded relationships.
+	 *
+	 * @return array
+	 */
+	protected function queryEagerLoadedRelationships(array $results, array $eagerLoads) : array
+	{
+		$this->eagerLoads = $this->parseRelations($eagerLoads);
+
+		return $this->eagerLoadRelations($results);
+	}
+
+	/**
+	 * Parse a list of relations into individuals.
+	 *
+	 * @param array $relations
+	 *
+	 * @return array
+	 */
+	protected function parseRelations(array $relations)
+	{
+		$results = [];
+
+		foreach ($relations as $name => $constraints) {
+			// If the "relation" value is actually a numeric key, we can assume that no
+			// constraints have been specified for the eager load and we'll just put
+			// an empty Closure with the loader so that we can treat all the same.
+			if (is_numeric($name)) {
+				$f = function () {
+				};
+
+				list($name, $constraints) = [$constraints, $f];
+			}
+
+			// We need to separate out any nested includes. Which allows the developers
+			// to load deep relationships using "dots" without stating each level of
+			// the relationship with its own key in the array of eager load names.
+			$results = $this->parseNested($name, $results);
+
+			$results[$name] = $constraints;
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Parse the nested relationships in a relation.
+	 *
+	 * @param string $name
+	 * @param array  $results
+	 *
+	 * @return array
+	 */
+	protected function parseNested($name, $results)
+	{
+		$progress = [];
+
+		// If the relation has already been set on the result array, we will not set it
+		// again, since that would override any constraints that were already placed
+		// on the relationships. We will only set the ones that are not specified.
+		foreach (explode('.', $name) as $segment) {
+			$progress[] = $segment;
+
+			if (!isset($results[$last = implode('.', $progress)])) {
+				$results[$last] = function () {
+				};
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Eager load the relationships on a result set.
+	 *
+	 * @param array $results
+	 *
+	 * @return array
+	 */
+	public function eagerLoadRelations(array $results)
+	{
+		foreach ($this->eagerLoads as $name => $constraints) {
+
+			// For nested eager loads we'll skip loading them here and they will be set as an
+			// eager load on the query to retrieve the relation so that they will be eager
+			// loaded on that query, because that is where they get hydrated as models.
+			if (strpos($name, '.') === false) {
+				$results = $this->loadRelation($results, $name, $constraints);
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Eagerly load the relationship on a set of entities.
+	 *
+	 * @param array    $results
+	 * @param string   $name
+	 * @param \Closure $constraints
+	 *
+	 * @return array
+	 */
+	protected function loadRelation(array $results, $name, Closure $constraints) : array
+	{
+		// First we will "back up" the existing where conditions on the query so we can
+		// add our eager constraints. Then we will merge the wheres that were on the
+		// query back to it in order that any where conditions might be specified.
+		$relation = $this->getRelation($name);
+
+		$relation->addEagerConstraints($results);
+
+		call_user_func($constraints, $relation);
+
+		// Once we have the results, we just match those back up to their parent models
+		// using the relationship instance. Then we just return the finished arrays
+		// of models which have been eagerly hydrated and are readied for return.
+
+		return $relation->match($results, $name);
+	}
+
+	/**
+	 * Get the relation instance for the given relation name.
+	 *
+	 * @param string $relation
+	 *
+	 * @return \Analogue\ORM\Relationships\Relationship
+	 */
+	public function getRelation($relation)
+	{
+		// We want to run a relationship query without any constrains so that we will
+		// not have to remove these where clauses manually which gets really hacky
+		// and is error prone while we remove the developer's own where clauses.
+		$query = Relationship::noConstraints(function () use ($relation) {
+			return $this->entityMap->$relation($this->defaultMapper->newInstance());
+		});
+
+		$nested = $this->nestedRelations($relation);
+
+		// If there are nested relationships set on the query, we will put those onto
+		// the query instances so that they can be handled after this relationship
+		// is loaded. In this way they will all trickle down as they are loaded.
+		if (count($nested) > 0) {
+			$query->getQuery()->with($nested);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Get the deeply nested relations for a given top-level relation.
+	 *
+	 * @param string $relation
+	 *
+	 * @return array
+	 */
+	protected function nestedRelations($relation)
+	{
+		$nested = [];
+
+		// We are basically looking for any relationships that are nested deeper than
+		// the given top-level relationship. We will just check for any relations
+		// that start with the given top relations and adds them to our arrays.
+		foreach ($this->eagerLoads as $name => $constraints) {
+			if ($this->isNested($name, $relation)) {
+				$nested[substr($name, strlen($relation.'.'))] = $constraints;
+			}
+		}
+
+		return $nested;
+	}
+
+	/**
+	 * Determine if the relationship is nested.
+	 *
+	 * @param string $name
+	 * @param string $relation
+	 *
+	 * @return bool
+	 */
+	protected function isNested($name, $relation)
+	{
+		$dots = str_contains($name, '.');
+
+		return $dots && starts_with($name, $relation.'.');
+	}
+
+	/**
+	 * Build an entity from results, using the default mapper on this builder.
+	 * This is the default build plan when no table inheritance is being used.
+	 *
+	 * @param array $results
+	 *
+	 * @return Collection
+	 */
+	protected function buildWithDefaultMapper(array $results)
+	{
+		$builder = new EntityBuilder($this->defaultMapper, array_keys($this->eagerLoads));
+
+		return collect($results)->map(function ($item, $key) use ($builder) {
+			return $builder->build($item);
+		})->all();
+	}
+
+	/**
+	 * Build an entity from results, using single table inheritance.
+	 *
+	 * @param array $results
+	 *
+	 * @return Collection
+	 */
+	protected function buildUsingSingleTableInheritance(array $results)
+	{
+		return collect($results)->map(function ($item, $key) {
+			$builder = $this->builderForResult($item);
+
+			return $builder->build($item);
+		})->all();
+	}
+
+	/**
+	 * Given a result array, return the entity builder needed to correctly
+	 * build the result into an entity. If no getDiscriminatorColumnMap property
+	 * has been defined on the EntityMap, we'll assume that the value stored in
+	 * the $type column is the fully qualified class name of the entity and
+	 * we'll use it instead.
+	 *
+	 * @param array $result
+	 *
+	 * @return EntityBuilder
+	 */
+	protected function builderForResult(array $result)
+	{
+		$type = $result[$this->entityMap->getDiscriminatorColumn()];
+
+		$columnMap = $this->entityMap->getDiscriminatorColumnMap();
+
+		$class = isset($columnMap[$type]) ? $columnMap[$type] : $type;
+
+		if (!isset($this->builders[$type])) {
+			$this->builders[$type] = new EntityBuilder(
+				Manager::getInstance()->mapper($class),
+				array_keys($this->eagerLoads)
+			);
+		}
+
+		return $this->builders[$type];
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -127,7 +127,7 @@ 
             // constraints have been specified for the eager load and we'll just put
             // an empty Closure with the loader so that we can treat all the same.
             if (is_numeric($name)) {
-                $f = function () {
+                $f = function() {
                 };
 
                 list($name, $constraints) = [$constraints, $f];
@@ -163,7 +163,7 @@ 
             $progress[] = $segment;
 
             if (!isset($results[$last = implode('.', $progress)])) {
-                $results[$last] = function () {
+                $results[$last] = function() {
                 };
             }
         }
@@ -232,7 +232,7 @@ 
         // We want to run a relationship query without any constrains so that we will
         // not have to remove these where clauses manually which gets really hacky
         // and is error prone while we remove the developer's own where clauses.
-        $query = Relationship::noConstraints(function () use ($relation) {
+        $query = Relationship::noConstraints(function() use ($relation) {
             return $this->entityMap->$relation($this->defaultMapper->newInstance());
         });
 
@@ -298,7 +298,7 @@ 
     {
         $builder = new EntityBuilder($this->defaultMapper, array_keys($this->eagerLoads));
 
-        return collect($results)->map(function ($item, $key) use ($builder) {
+        return collect($results)->map(function($item, $key) use ($builder) {
             return $builder->build($item);
         })->all();
     }
@@ -312,7 +312,7 @@ 
      */
     protected function buildUsingSingleTableInheritance(array $results)
     {
-        return collect($results)->map(function ($item, $key) {
+        return collect($results)->map(function($item, $key) {
             $builder = $this->builderForResult($item);
 
             return $builder->build($item);