analogueorm / analogue

src/Relationships/HasMany.php

Doc Comments +2 added lines, -2 removed lines

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

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace Analogue\ORM\Relationships;
 
-use Analogue\ORM\EntityCollection;
-
 class HasMany extends HasOneOrMany
 {
     /**

Indentation +24 added lines, -24 removed lines

@@ -6,31 +6,31 @@
 
 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/System/EntityCache.php

Doc Comments +2 added lines, -2 removed lines

@@ -188,7 +188,7 @@ 
     /**
      * Cache a many relationship
      *
-     * @param                  $parentKey
+     * @param                  string $parentKey
      * @param string           $relation
      * @param EntityCollection $results
      * @param Relationship     $relationship
@@ -210,7 +210,7 @@ 
     /**
      * Cache a single relationship
      *
-     * @param              $parentKey
+     * @param              string $parentKey
      * @param string       $relation
      * @param Mappable     $result
      * @param Relationship $relationship

Indentation +319 added lines, -319 removed lines

@@ -15,324 +15,324 @@
  */
 class EntityCache
 {
-    /**
-     * Entity's raw attributes/relationships
-     *
-     * @var array
-     */
-    protected $cache = [];
-
-    /**
-     * Entity Map for the current Entity Type
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $entityMap;
-
-    /**
-     * Wrapper factory
-     *
-     * @var \Analogue\ORM\System\Wrappers\Factory
-     */
-    protected $factory;
-
-    /**
-     * Associative array containing list of pivot attributes per relationship
-     * so we don't have to call relationship method on refresh.
-     *
-     * @var array
-     */
-    protected $pivotAttributes = [];
-
-    /**
-     * EntityCache constructor.
-     * @param EntityMap $entityMap
-     */
-    public function __construct(EntityMap $entityMap)
-    {
-        $this->entityMap = $entityMap;
-
-        $this->factory = new Factory;
-    }
-
-    /**
-     * Add an array of key=>attributes representing
-     * the initial state of loaded entities.
-     *
-     * @param array $results
-     */
-    public function add(array $results)
-    {
-        $cachedResults = [];
-
-        $keyColumn = $this->entityMap->getKeyName();
-
-        foreach($results as $result) {
-            $id = $result[$keyColumn];
-
-            // Forget the ID field from the cache attributes
-            // to prevent any side effect.
-            unset($result[$keyColumn]);
-            $cachedResults[$id] = $result;
-        }
-
-        if (count($this->cache) == 0) {
-            $this->cache = $cachedResults;
-        } else {
-            $this->mergeCacheResults($cachedResults);
-        }
-    }
-
-    /**
-     * Retrieve initial attributes for a single entity
-     *
-     * @param  string $id
-     * @return array
-     */
-    public function get($id)
-    {
-        if ($this->has($id)) {
-            return $this->cache[$id];
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * Check if a record for this id exists.
-     *
-     * @param  string  $id
-     * @return boolean
-     */
-    public function has($id)
-    {
-        return array_key_exists($id, $this->cache);
-    }
-
-    /**
-     * Combine new result set with existing attributes in
-     * cache.
-     *
-     * @param  array $entities
-     * @return void
-     */
-    protected function mergeCacheResults($entities)
-    {
-        foreach ($entities as $key => $entity) {
-            $this->cache[$key] = $entity;
-        }
-    }
-
-    /**
-     * Cache Relation's query result for an entity
-     *
-     * @param  string       $key  primary key of the cached entity
-     * @param  string       $relation name of the relation
-     * @param  mixed        $results  results of the relationship's query
-     * @param  Relationship $relationship
-     * @throws MappingException
-     * @return void
-     */
-    public function cacheLoadedRelationResult($key, $relation, $results, Relationship $relationship)
-    {   
-        if ($results instanceof EntityCollection) {
-            $this->cacheManyRelationResults($key, $relation, $results, $relationship);
-        }
-
-        // TODO : As we support popo Entities, Maybe this check isn't needed anymore, 
-        // or we have to check that $result is an object instead
-        if ($results instanceof Mappable) {
-            $this->cacheSingleRelationResult($key, $relation, $results, $relationship);
-        }
-    }
-
-    /**
-     * Create a cachedRelationship instance which will hold related entity's hash and pivot attributes, if any.
-     *
-     * @param  string       $parentKey
-     * @param  string       $relation
-     * @param  array        $result
-     * @param  Relationship $relationship
-     * @throws MappingException
-     * @return CachedRelationship
-     */
-    protected function getCachedRelationship($parentKey, $relation, $result, Relationship $relationship)
-    {
-        $pivotColumns = $relationship->getPivotAttributes();
-
-        if (!array_key_exists($relation, $this->pivotAttributes)) {
-            $this->pivotAttributes[$relation] = $pivotColumns;
-        }
-
-        $wrapper = $this->factory->make($result);
-
-        $hash = $wrapper->getEntityHash();
-
-        if (count($pivotColumns) > 0) {
-            $pivotAttributes = [];
-            foreach ($pivotColumns as $column) {
-                $pivot = $wrapper->getEntityAttribute('pivot');
-
-                $pivotWrapper = $this->factory->make($pivot);
-
-                $pivotAttributes[$column] = $pivotWrapper->getEntityAttribute($column);
-            }
-
-            $cachedRelationship = new CachedRelationship($hash, $pivotAttributes);
-        } else {
-            $cachedRelationship = new CachedRelationship($hash);
-        }
-
-        return $cachedRelationship;
-    }
-
-    /**
-     * Cache a many relationship
-     *
-     * @param                  $parentKey
-     * @param string           $relation
-     * @param EntityCollection $results
-     * @param Relationship     $relationship
-     * @throws MappingException
-     */
-    protected function cacheManyRelationResults($parentKey, $relation, $results, Relationship $relationship)
-    {
-        $this->cache[$parentKey][$relation] = [];
-
-        foreach ($results as $result) {
-            $cachedRelationship = $this->getCachedRelationship($parentKey, $relation, $result, $relationship);
-
-            $relatedHash = $cachedRelationship->getHash();
-
-            $this->cache[$parentKey][$relation][$relatedHash] = $cachedRelationship;
-        }
-    }
-
-    /**
-     * Cache a single relationship
-     *
-     * @param              $parentKey
-     * @param string       $relation
-     * @param Mappable     $result
-     * @param Relationship $relationship
-     * @throws MappingException
-     */
-    protected function cacheSingleRelationResult($parentKey, $relation, $result, Relationship $relationship)
-    {
-        $this->cache[$parentKey][$relation] = $this->getCachedRelationship($parentKey, $relation, $result, $relationship);
-    }
-
-    /**
-     * Get Entity's Hash
-     *
-     * @param  $entity
-     * @throws MappingException
-     * @return string
-     */
-    protected function getEntityHash(InternallyMappable $entity)
-    {
-        $class = $entity->getEntityClass();
-
-        $mapper = Manager::getMapper($class);
-
-        $keyName = $mapper->getEntityMap()->getKeyName();
-
-        return $class . '.' . $entity->getEntityAttribute($keyName);
-    }
-
-    /**
-     * Refresh the cache record for an aggregated entity after a write operation
-     * @param Aggregate $entity
-     */
-    public function refresh(Aggregate $entity)
-    {
-        $this->cache[$entity->getEntityId()] = $this->transform($entity);
-    }
-
-    /**
-     * Transform an Aggregated Entity into a cache record
-     *
-     * @param  Aggregate $aggregatedEntity
-     * @throws MappingException
-     * @return array
-     */
-    protected function transform(Aggregate $aggregatedEntity)
-    {
-        $baseAttributes = $aggregatedEntity->getRawAttributes();
-
-        $relationAttributes = [];
-
-        // First we'll handle each relationships that are a one to one
-        // relation, and which will be saved as a CachedRelationship
-        // object inside the cache.
-
-        // NOTE : storing localRelationships maybe useless has we store
-        // the foreign key in the attributes already.
-
-        foreach ($this->entityMap->getSingleRelationships() as $relation) {
-            $aggregates = $aggregatedEntity->getRelationship($relation);
+	/**
+	 * Entity's raw attributes/relationships
+	 *
+	 * @var array
+	 */
+	protected $cache = [];
+
+	/**
+	 * Entity Map for the current Entity Type
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $entityMap;
+
+	/**
+	 * Wrapper factory
+	 *
+	 * @var \Analogue\ORM\System\Wrappers\Factory
+	 */
+	protected $factory;
+
+	/**
+	 * Associative array containing list of pivot attributes per relationship
+	 * so we don't have to call relationship method on refresh.
+	 *
+	 * @var array
+	 */
+	protected $pivotAttributes = [];
+
+	/**
+	 * EntityCache constructor.
+	 * @param EntityMap $entityMap
+	 */
+	public function __construct(EntityMap $entityMap)
+	{
+		$this->entityMap = $entityMap;
+
+		$this->factory = new Factory;
+	}
+
+	/**
+	 * Add an array of key=>attributes representing
+	 * the initial state of loaded entities.
+	 *
+	 * @param array $results
+	 */
+	public function add(array $results)
+	{
+		$cachedResults = [];
+
+		$keyColumn = $this->entityMap->getKeyName();
+
+		foreach($results as $result) {
+			$id = $result[$keyColumn];
+
+			// Forget the ID field from the cache attributes
+			// to prevent any side effect.
+			unset($result[$keyColumn]);
+			$cachedResults[$id] = $result;
+		}
+
+		if (count($this->cache) == 0) {
+			$this->cache = $cachedResults;
+		} else {
+			$this->mergeCacheResults($cachedResults);
+		}
+	}
+
+	/**
+	 * Retrieve initial attributes for a single entity
+	 *
+	 * @param  string $id
+	 * @return array
+	 */
+	public function get($id)
+	{
+		if ($this->has($id)) {
+			return $this->cache[$id];
+		} else {
+			return [];
+		}
+	}
+
+	/**
+	 * Check if a record for this id exists.
+	 *
+	 * @param  string  $id
+	 * @return boolean
+	 */
+	public function has($id)
+	{
+		return array_key_exists($id, $this->cache);
+	}
+
+	/**
+	 * Combine new result set with existing attributes in
+	 * cache.
+	 *
+	 * @param  array $entities
+	 * @return void
+	 */
+	protected function mergeCacheResults($entities)
+	{
+		foreach ($entities as $key => $entity) {
+			$this->cache[$key] = $entity;
+		}
+	}
+
+	/**
+	 * Cache Relation's query result for an entity
+	 *
+	 * @param  string       $key  primary key of the cached entity
+	 * @param  string       $relation name of the relation
+	 * @param  mixed        $results  results of the relationship's query
+	 * @param  Relationship $relationship
+	 * @throws MappingException
+	 * @return void
+	 */
+	public function cacheLoadedRelationResult($key, $relation, $results, Relationship $relationship)
+	{   
+		if ($results instanceof EntityCollection) {
+			$this->cacheManyRelationResults($key, $relation, $results, $relationship);
+		}
+
+		// TODO : As we support popo Entities, Maybe this check isn't needed anymore, 
+		// or we have to check that $result is an object instead
+		if ($results instanceof Mappable) {
+			$this->cacheSingleRelationResult($key, $relation, $results, $relationship);
+		}
+	}
+
+	/**
+	 * Create a cachedRelationship instance which will hold related entity's hash and pivot attributes, if any.
+	 *
+	 * @param  string       $parentKey
+	 * @param  string       $relation
+	 * @param  array        $result
+	 * @param  Relationship $relationship
+	 * @throws MappingException
+	 * @return CachedRelationship
+	 */
+	protected function getCachedRelationship($parentKey, $relation, $result, Relationship $relationship)
+	{
+		$pivotColumns = $relationship->getPivotAttributes();
+
+		if (!array_key_exists($relation, $this->pivotAttributes)) {
+			$this->pivotAttributes[$relation] = $pivotColumns;
+		}
+
+		$wrapper = $this->factory->make($result);
+
+		$hash = $wrapper->getEntityHash();
+
+		if (count($pivotColumns) > 0) {
+			$pivotAttributes = [];
+			foreach ($pivotColumns as $column) {
+				$pivot = $wrapper->getEntityAttribute('pivot');
+
+				$pivotWrapper = $this->factory->make($pivot);
+
+				$pivotAttributes[$column] = $pivotWrapper->getEntityAttribute($column);
+			}
+
+			$cachedRelationship = new CachedRelationship($hash, $pivotAttributes);
+		} else {
+			$cachedRelationship = new CachedRelationship($hash);
+		}
+
+		return $cachedRelationship;
+	}
+
+	/**
+	 * Cache a many relationship
+	 *
+	 * @param                  $parentKey
+	 * @param string           $relation
+	 * @param EntityCollection $results
+	 * @param Relationship     $relationship
+	 * @throws MappingException
+	 */
+	protected function cacheManyRelationResults($parentKey, $relation, $results, Relationship $relationship)
+	{
+		$this->cache[$parentKey][$relation] = [];
+
+		foreach ($results as $result) {
+			$cachedRelationship = $this->getCachedRelationship($parentKey, $relation, $result, $relationship);
+
+			$relatedHash = $cachedRelationship->getHash();
+
+			$this->cache[$parentKey][$relation][$relatedHash] = $cachedRelationship;
+		}
+	}
+
+	/**
+	 * Cache a single relationship
+	 *
+	 * @param              $parentKey
+	 * @param string       $relation
+	 * @param Mappable     $result
+	 * @param Relationship $relationship
+	 * @throws MappingException
+	 */
+	protected function cacheSingleRelationResult($parentKey, $relation, $result, Relationship $relationship)
+	{
+		$this->cache[$parentKey][$relation] = $this->getCachedRelationship($parentKey, $relation, $result, $relationship);
+	}
+
+	/**
+	 * Get Entity's Hash
+	 *
+	 * @param  $entity
+	 * @throws MappingException
+	 * @return string
+	 */
+	protected function getEntityHash(InternallyMappable $entity)
+	{
+		$class = $entity->getEntityClass();
+
+		$mapper = Manager::getMapper($class);
+
+		$keyName = $mapper->getEntityMap()->getKeyName();
+
+		return $class . '.' . $entity->getEntityAttribute($keyName);
+	}
+
+	/**
+	 * Refresh the cache record for an aggregated entity after a write operation
+	 * @param Aggregate $entity
+	 */
+	public function refresh(Aggregate $entity)
+	{
+		$this->cache[$entity->getEntityId()] = $this->transform($entity);
+	}
+
+	/**
+	 * Transform an Aggregated Entity into a cache record
+	 *
+	 * @param  Aggregate $aggregatedEntity
+	 * @throws MappingException
+	 * @return array
+	 */
+	protected function transform(Aggregate $aggregatedEntity)
+	{
+		$baseAttributes = $aggregatedEntity->getRawAttributes();
+
+		$relationAttributes = [];
+
+		// First we'll handle each relationships that are a one to one
+		// relation, and which will be saved as a CachedRelationship
+		// object inside the cache.
+
+		// NOTE : storing localRelationships maybe useless has we store
+		// the foreign key in the attributes already.
+
+		foreach ($this->entityMap->getSingleRelationships() as $relation) {
+			$aggregates = $aggregatedEntity->getRelationship($relation);
             
-            if (count($aggregates) == 1) {
-                $related = $aggregates[0];
-                $relationAttributes[$relation] = new CachedRelationship($related->getEntityHash());
-            }
-            if (count($aggregates) > 1) {
-                throw new MappingException("Single Relationship '$relation' contains several related entities");
-            }
-        }
-
-        // Then we'll handle the 'many' relationships and store them as
-        // an array of CachedRelationship objects.
-
-        foreach ($this->entityMap->getManyRelationships() as $relation) {
-            $aggregates = $aggregatedEntity->getRelationship($relation);
-
-            $relationAttributes[$relation] = [];
-
-            foreach ($aggregates as $aggregate) {
-                $relationAttributes[$relation][] = new CachedRelationship(
-                    $aggregate->getEntityHash(),
-                    $aggregate->getPivotAttributes()
-                );
-            }
-        }
-
-        return $baseAttributes + $relationAttributes;
-    }
-
-    /**
-     * Get pivot attributes for a relation
-     * 
-     * @param  string             $relation
-     * @param  InternallyMappable $entity
-     * @return array
-     */
-    protected function getPivotValues($relation, InternallyMappable $entity)
-    {
-        $values = [];
-
-        $entityAttributes = $entity->getEntityAttributes();
-
-        if (array_key_exists($relation, $this->pivotAttributes)) {
-            foreach ($this->pivotAttributes[$relation] as $attribute) {
-                if (array_key_exists($attribute, $entityAttributes)) {
-                    $values[$attribute] = $entity->getEntityAttribute('pivot')->$attribute;
-                }
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Clear the entity Cache. Use with caution as it could result
-     * in impredictable behaviour if the cached entities are stored
-     * after the cache clear operation. 
-     * 
-     * @return void
-     */
-    public function clear()
-    {   
-        $this->cache = [];
-        $this->pivotAttributes = [];
-    }
+			if (count($aggregates) == 1) {
+				$related = $aggregates[0];
+				$relationAttributes[$relation] = new CachedRelationship($related->getEntityHash());
+			}
+			if (count($aggregates) > 1) {
+				throw new MappingException("Single Relationship '$relation' contains several related entities");
+			}
+		}
+
+		// Then we'll handle the 'many' relationships and store them as
+		// an array of CachedRelationship objects.
+
+		foreach ($this->entityMap->getManyRelationships() as $relation) {
+			$aggregates = $aggregatedEntity->getRelationship($relation);
+
+			$relationAttributes[$relation] = [];
+
+			foreach ($aggregates as $aggregate) {
+				$relationAttributes[$relation][] = new CachedRelationship(
+					$aggregate->getEntityHash(),
+					$aggregate->getPivotAttributes()
+				);
+			}
+		}
+
+		return $baseAttributes + $relationAttributes;
+	}
+
+	/**
+	 * Get pivot attributes for a relation
+	 * 
+	 * @param  string             $relation
+	 * @param  InternallyMappable $entity
+	 * @return array
+	 */
+	protected function getPivotValues($relation, InternallyMappable $entity)
+	{
+		$values = [];
+
+		$entityAttributes = $entity->getEntityAttributes();
+
+		if (array_key_exists($relation, $this->pivotAttributes)) {
+			foreach ($this->pivotAttributes[$relation] as $attribute) {
+				if (array_key_exists($attribute, $entityAttributes)) {
+					$values[$attribute] = $entity->getEntityAttribute('pivot')->$attribute;
+				}
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Clear the entity Cache. Use with caution as it could result
+	 * in impredictable behaviour if the cached entities are stored
+	 * after the cache clear operation. 
+	 * 
+	 * @return void
+	 */
+	public function clear()
+	{   
+		$this->cache = [];
+		$this->pivotAttributes = [];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 
         $keyColumn = $this->entityMap->getKeyName();
 
-        foreach($results as $result) {
+        foreach ($results as $result) {
             $id = $result[$keyColumn];
 
             // Forget the ID field from the cache attributes
@@ -236,7 +236,7 @@ 
 
         $keyName = $mapper->getEntityMap()->getKeyName();
 
-        return $class . '.' . $entity->getEntityAttribute($keyName);
+        return $class.'.'.$entity->getEntityAttribute($keyName);
     }
 
     /**

src/System/ResultBuilder.php

Doc Comments -1 removed lines

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

Indentation +316 added lines, -316 removed lines

@@ -7,320 +7,320 @@
 
 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)
-    {
-        // 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->defaultMapper->getEntityCache()->add($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;
-        }
-    }
-
-    /**  
-     * Launch queries on eager loaded relationships
-     * 
-     * @return array
-     */
-    protected function queryEagerLoadedRelationships(array $results, array $eagerLoads)
-    {
-        $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.
-
-        // Same, this step isn't necessary, as we take the inverse approach than Eloquent :
-        // filling the attributes before hydration, for more efficiency
-        //$relationshipResults = $relation->getEager();
-
-        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)
+	{
+		// 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->defaultMapper->getEntityCache()->add($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;
+		}
+	}
+
+	/**  
+	 * Launch queries on eager loaded relationships
+	 * 
+	 * @return array
+	 */
+	protected function queryEagerLoadedRelationships(array $results, array $eagerLoads)
+	{
+		$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.
+
+		// Same, this step isn't necessary, as we take the inverse approach than Eloquent :
+		// filling the attributes before hydration, for more efficiency
+		//$relationshipResults = $relation->getEager();
+
+		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];
+	}
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -110,7 +110,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];
             }
@@ -144,7 +144,7 @@ 
             $progress[] = $segment;
 
             if (!isset($results[$last = implode('.', $progress)])) {
-                $results[$last] = function () {};
+                $results[$last] = function() {};
             }
         }
 
@@ -213,7 +213,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());
         });
 
@@ -244,7 +244,7 @@ 
         // 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;
+                $nested[substr($name, strlen($relation.'.'))] = $constraints;
             }
         }
 
@@ -262,7 +262,7 @@ 
     {
         $dots = str_contains($name, '.');
 
-        return $dots && starts_with($name, $relation . '.');
+        return $dots && starts_with($name, $relation.'.');
     }
 
     /**
@@ -312,7 +312,7 @@ 
 
         $columnMap = $this->entityMap->getDiscriminatorColumnMap();
 
-        $class = isset($columnMap[$type]) ? $columnMap[$type]: $type;
+        $class = isset($columnMap[$type]) ? $columnMap[$type] : $type;
 
         if (!isset($this->builders[$type])) {
             $this->builders[$type] = new EntityBuilder(

src/System/Wrappers/Factory.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Analogue\ORM\System\Wrappers;
 
-use Analogue\ORM\Mappable;
 use Analogue\ORM\System\Manager;
 use GeneratedHydrator\Configuration;
 

Indentation +24 added lines, -24 removed lines

@@ -8,31 +8,31 @@
 
 class Factory
 {
-    /**
-     * Build the wrapper corresponding to the object's type
-     *
-     * @param  mixed $object
-     * @throws \Analogue\ORM\Exceptions\MappingException
-     * @return Wrapper
-     */
-    public function make($object)
-    {
-        $manager = Manager::getInstance();
+	/**
+	 * Build the wrapper corresponding to the object's type
+	 *
+	 * @param  mixed $object
+	 * @throws \Analogue\ORM\Exceptions\MappingException
+	 * @return Wrapper
+	 */
+	public function make($object)
+	{
+		$manager = Manager::getInstance();
 
-        // Instantiate hydrator. We'll need to optimize this and allow pre-generation
-        // of these hydrator, and get it, ideally, from the entityMap or the Mapper class,
-        // so it's only instantiated once
-        $config        = new Configuration(get_class($object));
-        $hydratorClass = $config->createFactory()->getHydratorClass();
-        $hydrator      = new $hydratorClass();
+		// Instantiate hydrator. We'll need to optimize this and allow pre-generation
+		// of these hydrator, and get it, ideally, from the entityMap or the Mapper class,
+		// so it's only instantiated once
+		$config        = new Configuration(get_class($object));
+		$hydratorClass = $config->createFactory()->getHydratorClass();
+		$hydrator      = new $hydratorClass();
         
-        if ($manager->isValueObject($object)) {
-            $entityMap = $manager->getValueMap($object);
-        } else {
-            $entityMap = $manager->mapper($object)->getEntityMap();
-        }
+		if ($manager->isValueObject($object)) {
+			$entityMap = $manager->getValueMap($object);
+		} else {
+			$entityMap = $manager->mapper($object)->getEntityMap();
+		}
 
-        // Build Wrapper
-        return new ObjectWrapper($object, $entityMap, $hydrator);
-    }
+		// Build Wrapper
+		return new ObjectWrapper($object, $entityMap, $hydrator);
+	}
 }

src/System/Wrappers/ObjectWrapper.php

Doc Comments -1 removed lines

@@ -35,7 +35,6 @@
     /**
      * Object Wrapper constructor
      * 
-     * @param mixed $object
      * @param Analogue\ORM\EntityMap $entityMap
      * 
      * @return  void

Indentation +202 added lines, -202 removed lines

@@ -10,219 +10,219 @@
  */
 class ObjectWrapper extends Wrapper
 {
-    /** 
-     * Internal Representation of analogue's entity attributes
-     * 
-     * @var  array
-     */
-    protected $attributes = [];
-
-    /** 
-     * Object properties that are not a part of the entity attributes,
-     * but which are needed to correctly hydrate the Object
-     * 
-     * @var array
-     */
-    protected $unmanagedProperties = [];
-
-    /**
-     * The hydrator for the wrapped object
-     * 
-     * @var  HydratorInterface
-     */
-    protected $hydrator;
-
-    /**
-     * Object Wrapper constructor
-     * 
-     * @param mixed $object
-     * @param Analogue\ORM\EntityMap $entityMap
-     * 
-     * @return  void
-     */
-    public function __construct($entity, $entityMap, HydratorInterface $hydrator)
-    {
-        $this->hydrator = $hydrator;
-        parent::__construct($entity, $entityMap);
-        $this->attributes = $this->dehydrate($entity);
-    }
-
-    /**
-     * Returns the wrapped entity
-     *
-     * @return mixed
-     */
-    public function getObject()
-    {   
-        $this->hydrate();
-        return $this->entity;
-    }
-
-    /**  
-     * Extract entity attributes / properties to an array of attributes
-     * 
-     * @param  mixed $entity 
-     * @return array
-     */
-    protected function dehydrate($entity) : array
-    {
-        $properties = $this->hydrator->extract($entity);
-
-        $this->unmanagedProperties = array_except($properties, $this->getManagedProperties());
-
-        return $this->attributesFromProperties($properties);
-    }
-
-    /**  
-     * Hydrate object's properties/attribute from the internal array representation
-     * 
-     * @return mixed
-     */
-    public function hydrate()
-    {
-        $properties = $this->propertiesFromAttributes($this->attributes) + $this->unmanagedProperties;
-        $this->hydrator->hydrate($properties, $this->entity);
-    }
-
-    /**  
-     * Return properties that will be extracted from the entity
-     * 
-     * @return array
-     */
-    protected function getManagedProperties() : array
-    {
-        $properties = $this->entityMap->getProperties();
-
-        $attributesName = $this->entityMap->getAttributesArrayName();
+	/** 
+	 * Internal Representation of analogue's entity attributes
+	 * 
+	 * @var  array
+	 */
+	protected $attributes = [];
+
+	/** 
+	 * Object properties that are not a part of the entity attributes,
+	 * but which are needed to correctly hydrate the Object
+	 * 
+	 * @var array
+	 */
+	protected $unmanagedProperties = [];
+
+	/**
+	 * The hydrator for the wrapped object
+	 * 
+	 * @var  HydratorInterface
+	 */
+	protected $hydrator;
+
+	/**
+	 * Object Wrapper constructor
+	 * 
+	 * @param mixed $object
+	 * @param Analogue\ORM\EntityMap $entityMap
+	 * 
+	 * @return  void
+	 */
+	public function __construct($entity, $entityMap, HydratorInterface $hydrator)
+	{
+		$this->hydrator = $hydrator;
+		parent::__construct($entity, $entityMap);
+		$this->attributes = $this->dehydrate($entity);
+	}
+
+	/**
+	 * Returns the wrapped entity
+	 *
+	 * @return mixed
+	 */
+	public function getObject()
+	{   
+		$this->hydrate();
+		return $this->entity;
+	}
+
+	/**  
+	 * Extract entity attributes / properties to an array of attributes
+	 * 
+	 * @param  mixed $entity 
+	 * @return array
+	 */
+	protected function dehydrate($entity) : array
+	{
+		$properties = $this->hydrator->extract($entity);
+
+		$this->unmanagedProperties = array_except($properties, $this->getManagedProperties());
+
+		return $this->attributesFromProperties($properties);
+	}
+
+	/**  
+	 * Hydrate object's properties/attribute from the internal array representation
+	 * 
+	 * @return mixed
+	 */
+	public function hydrate()
+	{
+		$properties = $this->propertiesFromAttributes($this->attributes) + $this->unmanagedProperties;
+		$this->hydrator->hydrate($properties, $this->entity);
+	}
+
+	/**  
+	 * Return properties that will be extracted from the entity
+	 * 
+	 * @return array
+	 */
+	protected function getManagedProperties() : array
+	{
+		$properties = $this->entityMap->getProperties();
+
+		$attributesName = $this->entityMap->getAttributesArrayName();
         
-        return $attributesName == null ? $properties : array_merge($properties, [$attributesName]);
-    }
-
-    /** 
-     * Convert object's properties to analogue's internal attributes representation
-     * 
-     * @param  array  $properties 
-     * @return array
-     */
-    protected function attributesFromProperties(array $properties) : array
-    {
-        // First, we'll only keep the entities that are part of the Entity's
-        // attributes
-        $managedProperties = $this->getManagedProperties();
-
-        $properties = array_only($properties, $managedProperties);
-
-        // If the entity does not uses the attributes array to store
-        // part of its attributes, we'll directly return the properties
-        if(! $this->entityMap->usesAttributesArray()) {
-            return $properties;
-        }
-
-        $arrayName = $this->entityMap->getAttributesArrayName();
+		return $attributesName == null ? $properties : array_merge($properties, [$attributesName]);
+	}
+
+	/** 
+	 * Convert object's properties to analogue's internal attributes representation
+	 * 
+	 * @param  array  $properties 
+	 * @return array
+	 */
+	protected function attributesFromProperties(array $properties) : array
+	{
+		// First, we'll only keep the entities that are part of the Entity's
+		// attributes
+		$managedProperties = $this->getManagedProperties();
+
+		$properties = array_only($properties, $managedProperties);
+
+		// If the entity does not uses the attributes array to store
+		// part of its attributes, we'll directly return the properties
+		if(! $this->entityMap->usesAttributesArray()) {
+			return $properties;
+		}
+
+		$arrayName = $this->entityMap->getAttributesArrayName();
         
-        if(! array_key_exists($arrayName, $properties)) {
-            throw new MappingException("Property $arrayName not set on object of type ".$this->getEntityClass());
-        }
+		if(! array_key_exists($arrayName, $properties)) {
+			throw new MappingException("Property $arrayName not set on object of type ".$this->getEntityClass());
+		}
 
-        if(! is_array($properties[$arrayName])) {
-            throw new MappingException("Property $arrayName should be an array.");
-        }
+		if(! is_array($properties[$arrayName])) {
+			throw new MappingException("Property $arrayName should be an array.");
+		}
 
-        $attributes = $properties[$arrayName];
+		$attributes = $properties[$arrayName];
 
-        unset($properties[$arrayName]);
+		unset($properties[$arrayName]);
 
-        return $properties + $attributes;
-    }
+		return $properties + $attributes;
+	}
 
-    /**  
-     * Convert internal representation of attributes to an array of properties
-     * that can hydrate the actual object.
-     * 
-     * @param  array  $attributes 
-     * @return array
-     */
-    protected function propertiesFromAttributes(array $attributes) : array
-    {
-        $attributes = $this->attributes;
+	/**  
+	 * Convert internal representation of attributes to an array of properties
+	 * that can hydrate the actual object.
+	 * 
+	 * @param  array  $attributes 
+	 * @return array
+	 */
+	protected function propertiesFromAttributes(array $attributes) : array
+	{
+		$attributes = $this->attributes;
 
-        // Get all managed properties 
-        $propertyNames = $this->entityMap->getProperties();
+		// Get all managed properties 
+		$propertyNames = $this->entityMap->getProperties();
 
-        $propertyAttributes = array_only($attributes, $propertyNames);
-        $attributesArray = array_except($attributes, $propertyNames);
+		$propertyAttributes = array_only($attributes, $propertyNames);
+		$attributesArray = array_except($attributes, $propertyNames);
 
-        $attributesArrayName = $this->entityMap->getAttributesArrayName();
+		$attributesArrayName = $this->entityMap->getAttributesArrayName();
 
-        if($attributesArrayName) {
-            $propertyAttributes[$attributesArrayName] = $attributesArray;
-        }
+		if($attributesArrayName) {
+			$propertyAttributes[$attributesArrayName] = $attributesArray;
+		}
 
-        return $propertyAttributes;
-    }
+		return $propertyAttributes;
+	}
     
-    /**
-     * Method used by the mapper to set the object
-     * attribute raw values (hydration)
-     *
-     * @param array $attributes
-     *
-     * @return void
-     */
-    public function setEntityAttributes(array $attributes)
-    {
-        $this->attributes = $attributes;
-    }
-
-    /**
-     * Method used by the mapper to get the
-     * raw object's values.
-     *
-     * @return array
-     */
-    public function getEntityAttributes() : array
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * Method used by the mapper to set raw
-     * key-value pair
-     *
-     * @param string $key
-     * @param string $value
-     *
-     * @return void
-     */
-    public function setEntityAttribute($key, $value)
-    {
-        $this->attributes[$key] = $value;
-    }
-
-    /**
-     * Method used by the mapper to get single
-     * key-value pair
-     *
-     * @param  string $key
-     * @return mixed|null
-     */
-    public function getEntityAttribute($key)
-    {
-        if ($this->hasAttribute($key)) {
-            return $this->attributes[$key];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Test if a given attribute exists
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function hasAttribute($key) : bool
-    {
-        return array_key_exists($key, $this->attributes) ? true : false;
-    }
+	/**
+	 * Method used by the mapper to set the object
+	 * attribute raw values (hydration)
+	 *
+	 * @param array $attributes
+	 *
+	 * @return void
+	 */
+	public function setEntityAttributes(array $attributes)
+	{
+		$this->attributes = $attributes;
+	}
+
+	/**
+	 * Method used by the mapper to get the
+	 * raw object's values.
+	 *
+	 * @return array
+	 */
+	public function getEntityAttributes() : array
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * Method used by the mapper to set raw
+	 * key-value pair
+	 *
+	 * @param string $key
+	 * @param string $value
+	 *
+	 * @return void
+	 */
+	public function setEntityAttribute($key, $value)
+	{
+		$this->attributes[$key] = $value;
+	}
+
+	/**
+	 * Method used by the mapper to get single
+	 * key-value pair
+	 *
+	 * @param  string $key
+	 * @return mixed|null
+	 */
+	public function getEntityAttribute($key)
+	{
+		if ($this->hasAttribute($key)) {
+			return $this->attributes[$key];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Test if a given attribute exists
+	 *
+	 * @param  string $key
+	 * @return boolean
+	 */
+	public function hasAttribute($key) : bool
+	{
+		return array_key_exists($key, $this->attributes) ? true : false;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -114,17 +114,17 @@ 
 
         // If the entity does not uses the attributes array to store
         // part of its attributes, we'll directly return the properties
-        if(! $this->entityMap->usesAttributesArray()) {
+        if (!$this->entityMap->usesAttributesArray()) {
             return $properties;
         }
 
         $arrayName = $this->entityMap->getAttributesArrayName();
         
-        if(! array_key_exists($arrayName, $properties)) {
+        if (!array_key_exists($arrayName, $properties)) {
             throw new MappingException("Property $arrayName not set on object of type ".$this->getEntityClass());
         }
 
-        if(! is_array($properties[$arrayName])) {
+        if (!is_array($properties[$arrayName])) {
             throw new MappingException("Property $arrayName should be an array.");
         }
 
@@ -154,7 +154,7 @@ 
 
         $attributesArrayName = $this->entityMap->getAttributesArrayName();
 
-        if($attributesArrayName) {
+        if ($attributesArrayName) {
             $propertyAttributes[$attributesArrayName] = $attributesArray;
         }
 

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/Commands/Store.php

Indentation +227 added lines, -227 removed lines

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

src/EntityMap.php

Indentation +1388 added lines, -1388 removed lines

@@ -23,1409 +23,1409 @@
  */
 class EntityMap
 {
-    /**
-     * The mapping driver to use with this entity
-     *
-     * @var  string
-     */
-    protected $driver = 'illuminate';
-
-    /**
-     * The Database Connection name for the model.
-     *
-     * @var string
-     */
-    protected $connection;
-
-    /**
-     * The table associated with the entity.
-     *
-     * @var string|null
-     */
-    protected $table = null;
-
-    /**
-     * The primary key for the model.
-     *
-     * @var string
-     */
-    protected $primaryKey = 'id';
-
-    /**
-     * Name of the entity's array property that should
-     * contain the attributes. 
-     * If set to null, analogue will only hydrate object's properties
-     * 
-     * @var string|null
-     */
-    protected $arrayName = 'attributes';
-
-    /**
-     * Array containing the list of database columns to be mapped
-     * in the attributes array of the entity. 
-     *
-     * @var array
-     */
-    protected $attributes = [];
-
-    /**
-     * Array containing the list of database columns to be mapped
-     * to the entity's class properties. 
-     *
-     * @var array
-     */
-    protected $properties = [];
-
-    /**
-     * The Custom Domain Class to use with this mapping
-     *
-     * @var string|null
-     */
-    protected $class = null;
-
-    /**
-     * Embedded Value Objects
-     * 
-     * @var array
-     */
-    protected $embeddables = [];
-
-    /**
-     * Determine the relationships method used on the entity.
-     * If not set, mapper will autodetect them
-     *
-     * @var array
-     */
-    private $relationships = [];
-
-    /**
-     * Relationships that should be treated as collection.
-     *
-     * @var array
-     */
-    private $manyRelations = [];
-
-    /**
-     * Relationships that should be treated as single entity.
-     *
-     * @var array
-     */
-    private $singleRelations = [];
-
-    /**
-     * Relationships for which the key is stored in the Entity itself
-     *
-     * @var array
-     */
-    private $localRelations = [];
-
-    /** 
-     * List of local keys associated to local relation methods
-     * 
-     * @var array
-     */
-    private $localForeignKeys = [];
-
-    /**
-     * Relationships for which the key is stored in the Related Entity
-     *
-     * @var array
-     */
-    private $foreignRelations = [];
-
-    /**
-     * Relationships which use a pivot record.
-     *
-     * @var array
-     */
-    private $pivotRelations = [];
-
-    /**
-     * Dynamic relationships
-     *
-     * @var array
-     */
-    private $dynamicRelationships = [];
-
-    /**
-     * Targetted class for the relationship method. value is set to `null` for
-     * polymorphic relations. 
-     * 
-     * @var array
-     */
-    private $relatedClasses = [];
-
-    /** 
-     * Some relation methods like embedded objects, or HasOne and MorphOne,
-     * will never have a proxy loaded on them. 
-     * 
-     * @var  array
-     */
-    private $nonProxyRelationships = [];
-
-    /**
-     * The number of models to return for pagination.
-     *
-     * @var int
-     */
-    protected $perPage = 15;
-
-    /**
-     * The relations to eager load on every query.
-     *
-     * @var array
-     */
-    protected $with = [];
-
-    /**
-     * The class name to be used in polymorphic relations.
-     *
-     * @var string
-     */
-    protected $morphClass;
-
-    /**
-     * Sequence name, to be used with postgreSql
-     * defaults to %table_name%_id_seq
-     *
-     * @var string|null
-     */
-    protected $sequence = null;
-
-    /**
-     * Indicates if the entity should be timestamped.
-     *
-     * @var bool
-     */
-    public $timestamps = false;
-
-    /**
-     * The name of the "created at" column.
-     *
-     * @var string
-     */
-    protected $createdAtColumn = 'created_at';
-
-    /**
-     * The name of the "updated at" column.
-     *
-     * @var string
-     */
-    protected $updatedAtColumn = 'updated_at';
-
-    /**
-     * Indicates if the entity uses softdeletes
-     *
-     * @var boolean
-     */
-    public $softDeletes = false;
-
-    /**
-     * The name of the "deleted at" column.
-     *
-     * @var string
-     */
-    protected $deletedAtColumn = 'deleted_at';
-
-    /**
-     * The date format to use with the current database connection
-     *
-     * @var string
-     */
-    protected $dateFormat;
-
-    /**
-     * Set this property to true if the entity should be instantiated
-     * using the IoC Container
-     * 
-     * @var boolean
-     */
-    protected $dependencyInjection = false;
-
-    /**
-     * Set the usage of inheritance, possible values are :
-     * "single_table"
-     * null
-     * 
-     * @var string | null
-     */
-    protected $inheritanceType = null;
-
-    /**
-     * Discriminator column name
-     * 
-     * @var string
-     */
-    protected $discriminatorColumn = "type";
-
-    /**
-     * Allow using a string to define which entity type should be instantiated.
-     * If not set, analogue will uses entity's FQDN
-     * 
-     * @var array
-     */
-    protected $discriminatorColumnMap = [];
-
-    /**
-     * Return Domain class attributes, useful when mapping to a Plain PHP Object
-     *
-     * @return array
-     */
-    public function getAttributes() : array
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * Set the domain class attributes
-     *
-     * @param array $attributeNames
-     */
-    public function setAttributes(array $attributeNames)
-    {
-        $this->attributes = $attributeNames;
-    }
-
-    /**  
-     * Return true if the Entity has an 'attributes' array property
-     * 
-     * @return boolean
-     */
-    public function usesAttributesArray() : bool
-    {
-        return $this->arrayName === null ? false : true;
-    }
-
-    /**  
-     * Return the name of the Entity's attributes property
-     * 
-     * @return string|null
-     */
-    public function getAttributesArrayName()
-    {
-        return $this->arrayName;
-    }
-
-    /**
-     * Get all the attribute names for the class, including relationships, embeddables and primary key.
-     *
-     * @return array
-     */
-    public function getCompiledAttributes() : array
-    {
-        $key = $this->getKeyName();
-
-        $embeddables = array_keys($this->getEmbeddables());
-
-        $relationships = $this->getRelationships();
-
-        $attributes = $this->getAttributes();
-
-        return array_merge([$key], $embeddables, $relationships, $attributes);
-    }
-
-    /**
-     * Set the date format to use with the current database connection
-     *
-     * @param string $format
-     */
-    public function setDateFormat($format)
-    {
-        $this->dateFormat = $format;
-    }
-
-    /**
-     * Get the date format to use with the current database connection
-     *
-     *  @return string
-     */
-    public function getDateFormat() : string
-    {
-        return $this->dateFormat;
-    }
-
-    /**
-     * Set the Driver for this mapping
-     *
-     * @param string $driver
-     */
-    public function setDriver($driver)
-    {
-        $this->driver = $driver;
-    }
-
-    /**
-     * Get the Driver for this mapping.
-     *
-     * @return string
-     */
-    public function getDriver() : string
-    {
-        return $this->driver;
-    }
-
-    /**
-     * Set the db connection to use on the table
-     *
-     * @param $connection
-     */
-    public function setConnection($connection)
-    {
-        $this->connection = $connection;
-    }
-
-    /**
-     * Get the Database connection the Entity is stored on.
-     *
-     * @return string | null
-     */
-    public function getConnection()
-    {
-        return $this->connection;
-    }
-
-    /**
-     * Get the table associated with the entity.
-     *
-     * @return string
-     */
-    public function getTable() : string
-    {
-        if (!is_null($this->table)) {
-            return $this->table;
-        }
-
-        return str_replace('\\', '', snake_case(str_plural(class_basename($this->getClass()))));
-    }
-
-    /**
-     * Set the database table name
-     *
-     * @param  string $table
-     */
-    public function setTable($table)
-    {
-        $this->table = $table;
-    }
-
-    /**
-     * Get the pgSql sequence name
-     *
-     * @return string
-     */
-    public function getSequence() : string
-    {
-        if (!is_null($this->sequence)) {
-            return $this->sequence;
-        } else {
-            return $this->getTable() . '_id_seq';
-        }
-    }
-
-    /**
-     * Get the custom entity class
-     *
-     * @return string namespaced class name
-     */
-    public function getClass() : string
-    {
-        return isset($this->class) ? $this->class : null;
-    }
-
-    /**
-     * Set the custom entity class
-     *
-     * @param string $class namespaced class name
-     */
-    public function setClass($class)
-    {
-        $this->class = $class;
-    }
-
-    /**
-     * Get the embedded Value Objects
-     *
-     * @return array
-     */
-    public function getEmbeddables() : array
-    {
-        return $this->embeddables;
-    }
-
-    /**  
-     * Return attributes that should be mapped to class properties
-     * 
-     * @return array
-     */
-    public function getProperties() : array
-    {
-        return $this->properties;
-    }
-
-    /**  
-     * Return the array property in which will be mapped all attributes
-     * that are not mapped to class properties.
-     * 
-     * @return string
-     */
-    public function getAttributesPropertyName() : string
-    {
-
-    }
-
-    /**
-     * Set the embedded Value Objects
-     *
-     * @param array $embeddables
-     */
-    public function setEmbeddables(array $embeddables)
-    {
-        $this->embeddables = $embeddables;
-    }
-
-    /**
-     * Get the relationships to map on a custom domain
-     * class.
-     *
-     * @return array
-     */
-    public function getRelationships() : array
-    {
-        return $this->relationships;
-    }
-
-    /**  
-     * Get the relationships that will not have a proxy
-     * set on them
-     * 
-     * @return array
-     */
-    public function getRelationshipsWithoutProxy() : array
-    {
-        return $this->nonProxyRelationships;
-    }
-
-    /**
-     * Relationships of the Entity type
-     *
-     * @return array
-     */
-    public function getSingleRelationships() : array
-    {
-        return $this->singleRelations;
-    }
-
-    /**
-     * Relationships of type Collection
-     *
-     * @return array
-     */
-    public function getManyRelationships() : array
-    {
-        return $this->manyRelations;
-    }
-
-    /**
-     * Relationships with foreign key in the mapped entity record.
-     *
-     * @return array
-     */
-    public function getLocalRelationships() : array
-    {
-        return $this->localRelations;
-    }
-
-    /**  
-     * Return the local keys associated to the relationship
-     * 
-     * @param  string $relation
-     * @return string | array | null
-     */
-    public function getLocalKeys($relation)
-    {
-        return isset($this->localForeignKeys[$relation]) ? $this->localForeignKeys[$relation] : null;
-    }
-
-    /**
-     * Relationships with foreign key in the related Entity record
-     *
-     * @return array
-     */
-    public function getForeignRelationships() : array
-    {
-        return $this->foreignRelations;
-    }
-
-    /**
-     * Relationships which keys are stored in a pivot record
-     *
-     * @return array
-     */
-    public function getPivotRelationships() : array
-    {
-        return $this->pivotRelations;
-    }
-
-    /**  
-     * Get the targetted type for a relationship. Return null if polymorphic
-     * 
-     * @param  string  $relation
-     * @return string | null
-     */
-    public function getTargettedClass($relation)
-    {
-        return $this->relatedClasses[$relation];
-    }
-
-    /**
-     * Add a Dynamic Relationship method at runtime. This has to be done
-     * by hooking the 'initializing' event, before entityMap is initialized.
-     *
-     * @param string  $name         Relation name
-     * @param \Closure $relationship
-     *
-     * @return void
-     */
-    public function addRelationshipMethod($name, \Closure $relationship)
-    {
-        $this->dynamicRelationships[$name] = $relationship;
-    }
-
-    /**
-     * Get the dynamic relationship method names.
-     *
-     * @return array
-     */
-    public function getDynamicRelationships() : array
-    {
-        return array_keys($this->dynamicRelationships);
-    }
-
-    /**
-     * Get the relationships that have to be eager loaded
-     * on each request.
-     *
-     * @return array
-     */
-    public function getEagerloadedRelationships() : array
-    {
-        return $this->with;
-    }
-
-    /**
-     * Get the primary key attribute for the entity.
-     *
-     * @return string
-     */
-    public function getKeyName() : string
-    {
-        return $this->primaryKey;
-    }
-
-    /**
-     * Set the primary key for the entity.
-     *
-     * @param $key
-     * @return void
-     */
-    public function setKeyName($key)
-    {
-        $this->primaryKey = $key;
-    }
-
-    /**
-     * Get the table qualified key name.
-     *
-     * @return string
-     */
-    public function getQualifiedKeyName() : string
-    {
-        return $this->getTable() . '.' . $this->getKeyName();
-    }
-
-    /**
-     * Get the number of models to return per page.
-     *
-     * @return int
-     */
-    public function getPerPage() : int
-    {
-        return $this->perPage;
-    }
-
-    /**
-     * Set the number of models to return per page.
-     *
-     * @param  int $perPage
-     * @return void
-     */
-    public function setPerPage($perPage)
-    {
-        $this->perPage = $perPage;
-    }
-
-    /**
-     * Determine if the entity uses get.
-     *
-     * @return bool
-     */
-    public function usesTimestamps() : bool
-    {
-        return $this->timestamps;
-    }
-
-    /**
-     * Determine if the entity uses soft deletes
-     *
-     * @return bool
-     */
-    public function usesSoftDeletes() : bool
-    {
-        return $this->softDeletes;
-    }
-
-    /**
-     * Get the 'created_at' column name
-     *
-     * @return string
-     */
-    public function getCreatedAtColumn() : string
-    {
-        return $this->createdAtColumn;
-    }
-
-    /**
-     * Get the 'updated_at' column name
-     *
-     * @return string
-     */
-    public function getUpdatedAtColumn() : string
-    {
-        return $this->updatedAtColumn;
-    }
-
-    /**
-     * Get the deleted_at column
-     *
-     * @return string
-     */
-    public function getQualifiedDeletedAtColumn() : string
-    {
-        return $this->deletedAtColumn;
-    }
-
-    /**
-     * Get the default foreign key name for the model.
-     *
-     * @return string
-     */
-    public function getForeignKey() : string
-    {
-        return snake_case(class_basename($this->getClass())) . '_id';
-    }
-
-    /**
-     * Return the inheritance type used by the entity.
-     *
-     * @return string|null
-     */
-    public function getInheritanceType()
-    {
-        return $this->inheritanceType;
-    }
-
-    /**
-     * Return the discriminator column name on the entity that's
-     * used for table inheritance.
-     *
-     * @return string
-     */
-    public function getDiscriminatorColumn() : string
-    {
-        return $this->discriminatorColumn;
-    }
-
-    /**
-     * Return the mapping of discriminator column values to
-     * entity class names that are used for table inheritance.
-     *
-     * @return array
-     */
-    public function getDiscriminatorColumnMap() : array
-    {
-        return $this->discriminatorColumnMap;
-    }
-
-    /**
-     * Return true if the entity should be instanciated using
-     * the IoC Container
-     * 
-     * @return boolean
-     */
-    public function useDependencyInjection() : bool
-    {
-        return $this->dependencyInjection;
-    }
-
-    /**  
-     * Add a single relation method name once
-     * 
-     * @param string  $relation
-     */
-    protected function addSingleRelation($relation)
-    {
-        if(! in_array($relation, $this->singleRelations)) {
-            $this->singleRelations[] = $relation;
-        }
-    }
-
-    /**  
-     * Add a foreign relation method name once
-     * 
-     * @param string  $relation
-     */
-    protected function addForeignRelation($relation)
-    {
-        if(! in_array($relation, $this->foreignRelations)) {
-            $this->foreignRelations[] = $relation;
-        }
-    }
-
-    /**  
-     * Add a non proxy relation method name once
-     * 
-     * @param string  $relation
-     */
-    protected function addNonProxyRelation($relation)
-    {
-        if(! in_array($relation, $this->nonProxyRelationships)) {
-            $this->nonProxyRelationships[] = $relation;
-        }
-    }
-
-    /**  
-     * Add a local relation method name once
-     * 
-     * @param string  $relation
-     */
-    protected function addLocalRelation($relation)
-    {
-        if(! in_array($relation, $this->localRelations)) {
-            $this->localRelations[] = $relation;
-        }
-    }
-
-     /**  
-     * Add a many relation method name once
-     * 
-     * @param string  $relation
-     */
-    protected function addManyRelation($relation)
-    {
-        if(! in_array($relation, $this->manyRelations)) {
-            $this->manyRelations[] = $relation;
-        }
-    }
-
-     /**  
-     * Add a pivot relation method name once
-     * 
-     * @param string  $relation
-     */
-    protected function addPivotRelation($relation)
-    {
-        if(! in_array($relation, $this->pivotRelations)) {
-            $this->pivotRelations[] = $relation;
-        }
-    }
-
-    /**
-     * Define a one-to-one relationship.
-     *
-     * @param  mixed  $entity
-     * @param  string $related entity class
-     * @param  string $foreignKey
-     * @param  string $localKey
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\HasOne
-     */
-    public function hasOne($entity, $related, $foreignKey = null, $localKey = null)
-    {
-        $foreignKey = $foreignKey ?: $this->getForeignKey();
-
-        $relatedMapper = Manager::getInstance()->mapper($related);
-
-        $relatedMap = $relatedMapper->getEntityMap();
-
-        $localKey = $localKey ?: $this->getKeyName();
-
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
+	/**
+	 * The mapping driver to use with this entity
+	 *
+	 * @var  string
+	 */
+	protected $driver = 'illuminate';
+
+	/**
+	 * The Database Connection name for the model.
+	 *
+	 * @var string
+	 */
+	protected $connection;
+
+	/**
+	 * The table associated with the entity.
+	 *
+	 * @var string|null
+	 */
+	protected $table = null;
+
+	/**
+	 * The primary key for the model.
+	 *
+	 * @var string
+	 */
+	protected $primaryKey = 'id';
+
+	/**
+	 * Name of the entity's array property that should
+	 * contain the attributes. 
+	 * If set to null, analogue will only hydrate object's properties
+	 * 
+	 * @var string|null
+	 */
+	protected $arrayName = 'attributes';
+
+	/**
+	 * Array containing the list of database columns to be mapped
+	 * in the attributes array of the entity. 
+	 *
+	 * @var array
+	 */
+	protected $attributes = [];
+
+	/**
+	 * Array containing the list of database columns to be mapped
+	 * to the entity's class properties. 
+	 *
+	 * @var array
+	 */
+	protected $properties = [];
+
+	/**
+	 * The Custom Domain Class to use with this mapping
+	 *
+	 * @var string|null
+	 */
+	protected $class = null;
+
+	/**
+	 * Embedded Value Objects
+	 * 
+	 * @var array
+	 */
+	protected $embeddables = [];
+
+	/**
+	 * Determine the relationships method used on the entity.
+	 * If not set, mapper will autodetect them
+	 *
+	 * @var array
+	 */
+	private $relationships = [];
+
+	/**
+	 * Relationships that should be treated as collection.
+	 *
+	 * @var array
+	 */
+	private $manyRelations = [];
+
+	/**
+	 * Relationships that should be treated as single entity.
+	 *
+	 * @var array
+	 */
+	private $singleRelations = [];
+
+	/**
+	 * Relationships for which the key is stored in the Entity itself
+	 *
+	 * @var array
+	 */
+	private $localRelations = [];
+
+	/** 
+	 * List of local keys associated to local relation methods
+	 * 
+	 * @var array
+	 */
+	private $localForeignKeys = [];
+
+	/**
+	 * Relationships for which the key is stored in the Related Entity
+	 *
+	 * @var array
+	 */
+	private $foreignRelations = [];
+
+	/**
+	 * Relationships which use a pivot record.
+	 *
+	 * @var array
+	 */
+	private $pivotRelations = [];
+
+	/**
+	 * Dynamic relationships
+	 *
+	 * @var array
+	 */
+	private $dynamicRelationships = [];
+
+	/**
+	 * Targetted class for the relationship method. value is set to `null` for
+	 * polymorphic relations. 
+	 * 
+	 * @var array
+	 */
+	private $relatedClasses = [];
+
+	/** 
+	 * Some relation methods like embedded objects, or HasOne and MorphOne,
+	 * will never have a proxy loaded on them. 
+	 * 
+	 * @var  array
+	 */
+	private $nonProxyRelationships = [];
+
+	/**
+	 * The number of models to return for pagination.
+	 *
+	 * @var int
+	 */
+	protected $perPage = 15;
+
+	/**
+	 * The relations to eager load on every query.
+	 *
+	 * @var array
+	 */
+	protected $with = [];
+
+	/**
+	 * The class name to be used in polymorphic relations.
+	 *
+	 * @var string
+	 */
+	protected $morphClass;
+
+	/**
+	 * Sequence name, to be used with postgreSql
+	 * defaults to %table_name%_id_seq
+	 *
+	 * @var string|null
+	 */
+	protected $sequence = null;
+
+	/**
+	 * Indicates if the entity should be timestamped.
+	 *
+	 * @var bool
+	 */
+	public $timestamps = false;
+
+	/**
+	 * The name of the "created at" column.
+	 *
+	 * @var string
+	 */
+	protected $createdAtColumn = 'created_at';
+
+	/**
+	 * The name of the "updated at" column.
+	 *
+	 * @var string
+	 */
+	protected $updatedAtColumn = 'updated_at';
+
+	/**
+	 * Indicates if the entity uses softdeletes
+	 *
+	 * @var boolean
+	 */
+	public $softDeletes = false;
+
+	/**
+	 * The name of the "deleted at" column.
+	 *
+	 * @var string
+	 */
+	protected $deletedAtColumn = 'deleted_at';
+
+	/**
+	 * The date format to use with the current database connection
+	 *
+	 * @var string
+	 */
+	protected $dateFormat;
+
+	/**
+	 * Set this property to true if the entity should be instantiated
+	 * using the IoC Container
+	 * 
+	 * @var boolean
+	 */
+	protected $dependencyInjection = false;
+
+	/**
+	 * Set the usage of inheritance, possible values are :
+	 * "single_table"
+	 * null
+	 * 
+	 * @var string | null
+	 */
+	protected $inheritanceType = null;
+
+	/**
+	 * Discriminator column name
+	 * 
+	 * @var string
+	 */
+	protected $discriminatorColumn = "type";
+
+	/**
+	 * Allow using a string to define which entity type should be instantiated.
+	 * If not set, analogue will uses entity's FQDN
+	 * 
+	 * @var array
+	 */
+	protected $discriminatorColumnMap = [];
+
+	/**
+	 * Return Domain class attributes, useful when mapping to a Plain PHP Object
+	 *
+	 * @return array
+	 */
+	public function getAttributes() : array
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * Set the domain class attributes
+	 *
+	 * @param array $attributeNames
+	 */
+	public function setAttributes(array $attributeNames)
+	{
+		$this->attributes = $attributeNames;
+	}
+
+	/**  
+	 * Return true if the Entity has an 'attributes' array property
+	 * 
+	 * @return boolean
+	 */
+	public function usesAttributesArray() : bool
+	{
+		return $this->arrayName === null ? false : true;
+	}
+
+	/**  
+	 * Return the name of the Entity's attributes property
+	 * 
+	 * @return string|null
+	 */
+	public function getAttributesArrayName()
+	{
+		return $this->arrayName;
+	}
+
+	/**
+	 * Get all the attribute names for the class, including relationships, embeddables and primary key.
+	 *
+	 * @return array
+	 */
+	public function getCompiledAttributes() : array
+	{
+		$key = $this->getKeyName();
+
+		$embeddables = array_keys($this->getEmbeddables());
+
+		$relationships = $this->getRelationships();
+
+		$attributes = $this->getAttributes();
+
+		return array_merge([$key], $embeddables, $relationships, $attributes);
+	}
+
+	/**
+	 * Set the date format to use with the current database connection
+	 *
+	 * @param string $format
+	 */
+	public function setDateFormat($format)
+	{
+		$this->dateFormat = $format;
+	}
+
+	/**
+	 * Get the date format to use with the current database connection
+	 *
+	 *  @return string
+	 */
+	public function getDateFormat() : string
+	{
+		return $this->dateFormat;
+	}
+
+	/**
+	 * Set the Driver for this mapping
+	 *
+	 * @param string $driver
+	 */
+	public function setDriver($driver)
+	{
+		$this->driver = $driver;
+	}
+
+	/**
+	 * Get the Driver for this mapping.
+	 *
+	 * @return string
+	 */
+	public function getDriver() : string
+	{
+		return $this->driver;
+	}
+
+	/**
+	 * Set the db connection to use on the table
+	 *
+	 * @param $connection
+	 */
+	public function setConnection($connection)
+	{
+		$this->connection = $connection;
+	}
+
+	/**
+	 * Get the Database connection the Entity is stored on.
+	 *
+	 * @return string | null
+	 */
+	public function getConnection()
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * Get the table associated with the entity.
+	 *
+	 * @return string
+	 */
+	public function getTable() : string
+	{
+		if (!is_null($this->table)) {
+			return $this->table;
+		}
+
+		return str_replace('\\', '', snake_case(str_plural(class_basename($this->getClass()))));
+	}
+
+	/**
+	 * Set the database table name
+	 *
+	 * @param  string $table
+	 */
+	public function setTable($table)
+	{
+		$this->table = $table;
+	}
+
+	/**
+	 * Get the pgSql sequence name
+	 *
+	 * @return string
+	 */
+	public function getSequence() : string
+	{
+		if (!is_null($this->sequence)) {
+			return $this->sequence;
+		} else {
+			return $this->getTable() . '_id_seq';
+		}
+	}
+
+	/**
+	 * Get the custom entity class
+	 *
+	 * @return string namespaced class name
+	 */
+	public function getClass() : string
+	{
+		return isset($this->class) ? $this->class : null;
+	}
+
+	/**
+	 * Set the custom entity class
+	 *
+	 * @param string $class namespaced class name
+	 */
+	public function setClass($class)
+	{
+		$this->class = $class;
+	}
+
+	/**
+	 * Get the embedded Value Objects
+	 *
+	 * @return array
+	 */
+	public function getEmbeddables() : array
+	{
+		return $this->embeddables;
+	}
+
+	/**  
+	 * Return attributes that should be mapped to class properties
+	 * 
+	 * @return array
+	 */
+	public function getProperties() : array
+	{
+		return $this->properties;
+	}
+
+	/**  
+	 * Return the array property in which will be mapped all attributes
+	 * that are not mapped to class properties.
+	 * 
+	 * @return string
+	 */
+	public function getAttributesPropertyName() : string
+	{
+
+	}
+
+	/**
+	 * Set the embedded Value Objects
+	 *
+	 * @param array $embeddables
+	 */
+	public function setEmbeddables(array $embeddables)
+	{
+		$this->embeddables = $embeddables;
+	}
+
+	/**
+	 * Get the relationships to map on a custom domain
+	 * class.
+	 *
+	 * @return array
+	 */
+	public function getRelationships() : array
+	{
+		return $this->relationships;
+	}
+
+	/**  
+	 * Get the relationships that will not have a proxy
+	 * set on them
+	 * 
+	 * @return array
+	 */
+	public function getRelationshipsWithoutProxy() : array
+	{
+		return $this->nonProxyRelationships;
+	}
+
+	/**
+	 * Relationships of the Entity type
+	 *
+	 * @return array
+	 */
+	public function getSingleRelationships() : array
+	{
+		return $this->singleRelations;
+	}
+
+	/**
+	 * Relationships of type Collection
+	 *
+	 * @return array
+	 */
+	public function getManyRelationships() : array
+	{
+		return $this->manyRelations;
+	}
+
+	/**
+	 * Relationships with foreign key in the mapped entity record.
+	 *
+	 * @return array
+	 */
+	public function getLocalRelationships() : array
+	{
+		return $this->localRelations;
+	}
+
+	/**  
+	 * Return the local keys associated to the relationship
+	 * 
+	 * @param  string $relation
+	 * @return string | array | null
+	 */
+	public function getLocalKeys($relation)
+	{
+		return isset($this->localForeignKeys[$relation]) ? $this->localForeignKeys[$relation] : null;
+	}
+
+	/**
+	 * Relationships with foreign key in the related Entity record
+	 *
+	 * @return array
+	 */
+	public function getForeignRelationships() : array
+	{
+		return $this->foreignRelations;
+	}
+
+	/**
+	 * Relationships which keys are stored in a pivot record
+	 *
+	 * @return array
+	 */
+	public function getPivotRelationships() : array
+	{
+		return $this->pivotRelations;
+	}
+
+	/**  
+	 * Get the targetted type for a relationship. Return null if polymorphic
+	 * 
+	 * @param  string  $relation
+	 * @return string | null
+	 */
+	public function getTargettedClass($relation)
+	{
+		return $this->relatedClasses[$relation];
+	}
+
+	/**
+	 * Add a Dynamic Relationship method at runtime. This has to be done
+	 * by hooking the 'initializing' event, before entityMap is initialized.
+	 *
+	 * @param string  $name         Relation name
+	 * @param \Closure $relationship
+	 *
+	 * @return void
+	 */
+	public function addRelationshipMethod($name, \Closure $relationship)
+	{
+		$this->dynamicRelationships[$name] = $relationship;
+	}
+
+	/**
+	 * Get the dynamic relationship method names.
+	 *
+	 * @return array
+	 */
+	public function getDynamicRelationships() : array
+	{
+		return array_keys($this->dynamicRelationships);
+	}
+
+	/**
+	 * Get the relationships that have to be eager loaded
+	 * on each request.
+	 *
+	 * @return array
+	 */
+	public function getEagerloadedRelationships() : array
+	{
+		return $this->with;
+	}
+
+	/**
+	 * Get the primary key attribute for the entity.
+	 *
+	 * @return string
+	 */
+	public function getKeyName() : string
+	{
+		return $this->primaryKey;
+	}
+
+	/**
+	 * Set the primary key for the entity.
+	 *
+	 * @param $key
+	 * @return void
+	 */
+	public function setKeyName($key)
+	{
+		$this->primaryKey = $key;
+	}
+
+	/**
+	 * Get the table qualified key name.
+	 *
+	 * @return string
+	 */
+	public function getQualifiedKeyName() : string
+	{
+		return $this->getTable() . '.' . $this->getKeyName();
+	}
+
+	/**
+	 * Get the number of models to return per page.
+	 *
+	 * @return int
+	 */
+	public function getPerPage() : int
+	{
+		return $this->perPage;
+	}
+
+	/**
+	 * Set the number of models to return per page.
+	 *
+	 * @param  int $perPage
+	 * @return void
+	 */
+	public function setPerPage($perPage)
+	{
+		$this->perPage = $perPage;
+	}
+
+	/**
+	 * Determine if the entity uses get.
+	 *
+	 * @return bool
+	 */
+	public function usesTimestamps() : bool
+	{
+		return $this->timestamps;
+	}
+
+	/**
+	 * Determine if the entity uses soft deletes
+	 *
+	 * @return bool
+	 */
+	public function usesSoftDeletes() : bool
+	{
+		return $this->softDeletes;
+	}
+
+	/**
+	 * Get the 'created_at' column name
+	 *
+	 * @return string
+	 */
+	public function getCreatedAtColumn() : string
+	{
+		return $this->createdAtColumn;
+	}
+
+	/**
+	 * Get the 'updated_at' column name
+	 *
+	 * @return string
+	 */
+	public function getUpdatedAtColumn() : string
+	{
+		return $this->updatedAtColumn;
+	}
+
+	/**
+	 * Get the deleted_at column
+	 *
+	 * @return string
+	 */
+	public function getQualifiedDeletedAtColumn() : string
+	{
+		return $this->deletedAtColumn;
+	}
+
+	/**
+	 * Get the default foreign key name for the model.
+	 *
+	 * @return string
+	 */
+	public function getForeignKey() : string
+	{
+		return snake_case(class_basename($this->getClass())) . '_id';
+	}
+
+	/**
+	 * Return the inheritance type used by the entity.
+	 *
+	 * @return string|null
+	 */
+	public function getInheritanceType()
+	{
+		return $this->inheritanceType;
+	}
+
+	/**
+	 * Return the discriminator column name on the entity that's
+	 * used for table inheritance.
+	 *
+	 * @return string
+	 */
+	public function getDiscriminatorColumn() : string
+	{
+		return $this->discriminatorColumn;
+	}
+
+	/**
+	 * Return the mapping of discriminator column values to
+	 * entity class names that are used for table inheritance.
+	 *
+	 * @return array
+	 */
+	public function getDiscriminatorColumnMap() : array
+	{
+		return $this->discriminatorColumnMap;
+	}
+
+	/**
+	 * Return true if the entity should be instanciated using
+	 * the IoC Container
+	 * 
+	 * @return boolean
+	 */
+	public function useDependencyInjection() : bool
+	{
+		return $this->dependencyInjection;
+	}
+
+	/**  
+	 * Add a single relation method name once
+	 * 
+	 * @param string  $relation
+	 */
+	protected function addSingleRelation($relation)
+	{
+		if(! in_array($relation, $this->singleRelations)) {
+			$this->singleRelations[] = $relation;
+		}
+	}
+
+	/**  
+	 * Add a foreign relation method name once
+	 * 
+	 * @param string  $relation
+	 */
+	protected function addForeignRelation($relation)
+	{
+		if(! in_array($relation, $this->foreignRelations)) {
+			$this->foreignRelations[] = $relation;
+		}
+	}
+
+	/**  
+	 * Add a non proxy relation method name once
+	 * 
+	 * @param string  $relation
+	 */
+	protected function addNonProxyRelation($relation)
+	{
+		if(! in_array($relation, $this->nonProxyRelationships)) {
+			$this->nonProxyRelationships[] = $relation;
+		}
+	}
+
+	/**  
+	 * Add a local relation method name once
+	 * 
+	 * @param string  $relation
+	 */
+	protected function addLocalRelation($relation)
+	{
+		if(! in_array($relation, $this->localRelations)) {
+			$this->localRelations[] = $relation;
+		}
+	}
+
+	 /**  
+	  * Add a many relation method name once
+	  * 
+	  * @param string  $relation
+	  */
+	protected function addManyRelation($relation)
+	{
+		if(! in_array($relation, $this->manyRelations)) {
+			$this->manyRelations[] = $relation;
+		}
+	}
+
+	 /**  
+	  * Add a pivot relation method name once
+	  * 
+	  * @param string  $relation
+	  */
+	protected function addPivotRelation($relation)
+	{
+		if(! in_array($relation, $this->pivotRelations)) {
+			$this->pivotRelations[] = $relation;
+		}
+	}
+
+	/**
+	 * Define a one-to-one relationship.
+	 *
+	 * @param  mixed  $entity
+	 * @param  string $related entity class
+	 * @param  string $foreignKey
+	 * @param  string $localKey
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\HasOne
+	 */
+	public function hasOne($entity, $related, $foreignKey = null, $localKey = null)
+	{
+		$foreignKey = $foreignKey ?: $this->getForeignKey();
+
+		$relatedMapper = Manager::getInstance()->mapper($related);
+
+		$relatedMap = $relatedMapper->getEntityMap();
+
+		$localKey = $localKey ?: $this->getKeyName();
+
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
         
-        $this->addSingleRelation($relation);
-        $this->addForeignRelation($relation);
-        $this->addNonProxyRelation($relation);
-
-        // This relationship will always be eager loaded, as proxying it would
-        // mean having an object that doesn't actually exists.
-        if(! in_array($relation, $this->with)) {
-            $this->with[] = $relation;
-        }
-
-        return new HasOne($relatedMapper, $entity, $relatedMap->getTable() . '.' . $foreignKey, $localKey);
-    }
-
-    /**
-     * Define a polymorphic one-to-one relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $related
-     * @param  string      $name
-     * @param  string|null $type
-     * @param  string|null $id
-     * @param  string|null $localKey
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\MorphOne
-     */
-    public function morphOne($entity, $related, $name, $type = null, $id = null, $localKey = null)
-    {
-        list($type, $id) = $this->getMorphs($name, $type, $id);
-
-        $localKey = $localKey ?: $this->getKeyName();
-
-        $relatedMapper = Manager::getInstance()->mapper($related);
-
-        $table = $relatedMapper->getEntityMap()->getTable();
-
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
+		$this->addSingleRelation($relation);
+		$this->addForeignRelation($relation);
+		$this->addNonProxyRelation($relation);
+
+		// This relationship will always be eager loaded, as proxying it would
+		// mean having an object that doesn't actually exists.
+		if(! in_array($relation, $this->with)) {
+			$this->with[] = $relation;
+		}
+
+		return new HasOne($relatedMapper, $entity, $relatedMap->getTable() . '.' . $foreignKey, $localKey);
+	}
+
+	/**
+	 * Define a polymorphic one-to-one relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $related
+	 * @param  string      $name
+	 * @param  string|null $type
+	 * @param  string|null $id
+	 * @param  string|null $localKey
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\MorphOne
+	 */
+	public function morphOne($entity, $related, $name, $type = null, $id = null, $localKey = null)
+	{
+		list($type, $id) = $this->getMorphs($name, $type, $id);
+
+		$localKey = $localKey ?: $this->getKeyName();
+
+		$relatedMapper = Manager::getInstance()->mapper($related);
+
+		$table = $relatedMapper->getEntityMap()->getTable();
+
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
         
-        $this->addSingleRelation($relation);
-        $this->addForeignRelation($relation);
-        $this->addNonProxyRelation($relation);
-
-        // This relationship will always be eager loaded, as proxying it would
-        // mean having an object that doesn't actually exists.
-        if(! in_array($relation, $this->with)) {
-            $this->with[] = $relation;
-        }
+		$this->addSingleRelation($relation);
+		$this->addForeignRelation($relation);
+		$this->addNonProxyRelation($relation);
+
+		// This relationship will always be eager loaded, as proxying it would
+		// mean having an object that doesn't actually exists.
+		if(! in_array($relation, $this->with)) {
+			$this->with[] = $relation;
+		}
         
-        return new MorphOne($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
-    }
-
-    /**
-     * Define an inverse one-to-one or many relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $related
-     * @param  string|null $foreignKey
-     * @param  string|null $otherKey
-     * @param  string|null $relation
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\BelongsTo
-     */
-    public function belongsTo($entity, $related, $foreignKey = null, $otherKey = null)
-    {
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
+		return new MorphOne($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
+	}
+
+	/**
+	 * Define an inverse one-to-one or many relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $related
+	 * @param  string|null $foreignKey
+	 * @param  string|null $otherKey
+	 * @param  string|null $relation
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\BelongsTo
+	 */
+	public function belongsTo($entity, $related, $foreignKey = null, $otherKey = null)
+	{
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
         
-        $this->addSingleRelation($relation);
-        $this->addLocalRelation($relation);
-
-        // If no foreign key was supplied, we can use a backtrace to guess the proper
-        // foreign key name by using the name of the relationship function, which
-        // when combined with an "_id" should conventionally match the columns.
-        if (is_null($foreignKey)) {
-            $foreignKey = snake_case($relation) . '_id';
-        }
-
-        $this->localForeignKeys[$relation] = $foreignKey;
-
-        $relatedMapper = Manager::getInstance()->mapper($related);
-
-        $otherKey = $otherKey ?: $relatedMapper->getEntityMap()->getKeyName();
-
-        return new BelongsTo($relatedMapper, $entity, $foreignKey, $otherKey, $relation);
-    }
-
-    /**
-     * Define a polymorphic, inverse one-to-one or many relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string|null $name
-     * @param  string|null $type
-     * @param  string|null $id
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\MorphTo
-     */
-    public function morphTo($entity, $name = null, $type = null, $id = null)
-    {
-        // If no name is provided, we will use the backtrace to get the function name
-        // since that is most likely the name of the polymorphic interface. We can
-        // use that to get both the class and foreign key that will be utilized.
-        if (is_null($name)) {
-            list(, $caller) = debug_backtrace(false);
-
-            $name = snake_case($caller['function']);
-        }
-        $this->addSingleRelations($name);
-        $this->addLocalRelation($name);
-        $this->addForeignRelations($name);
-        $this->relatedClass[$relation] = null;
-
-        list($type, $id) = $this->getMorphs($name, $type, $id);
-
-        // Store the foreign key in the entity map. 
-        // We might want to store the (key, type) as we might need it
-        // to build a MorphTo proxy
-        $this->localForeignKeys[$name] = [
-            "id" => $id,
-            "type" => $type
-        ];
+		$this->addSingleRelation($relation);
+		$this->addLocalRelation($relation);
+
+		// If no foreign key was supplied, we can use a backtrace to guess the proper
+		// foreign key name by using the name of the relationship function, which
+		// when combined with an "_id" should conventionally match the columns.
+		if (is_null($foreignKey)) {
+			$foreignKey = snake_case($relation) . '_id';
+		}
+
+		$this->localForeignKeys[$relation] = $foreignKey;
+
+		$relatedMapper = Manager::getInstance()->mapper($related);
+
+		$otherKey = $otherKey ?: $relatedMapper->getEntityMap()->getKeyName();
+
+		return new BelongsTo($relatedMapper, $entity, $foreignKey, $otherKey, $relation);
+	}
+
+	/**
+	 * Define a polymorphic, inverse one-to-one or many relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string|null $name
+	 * @param  string|null $type
+	 * @param  string|null $id
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\MorphTo
+	 */
+	public function morphTo($entity, $name = null, $type = null, $id = null)
+	{
+		// If no name is provided, we will use the backtrace to get the function name
+		// since that is most likely the name of the polymorphic interface. We can
+		// use that to get both the class and foreign key that will be utilized.
+		if (is_null($name)) {
+			list(, $caller) = debug_backtrace(false);
+
+			$name = snake_case($caller['function']);
+		}
+		$this->addSingleRelations($name);
+		$this->addLocalRelation($name);
+		$this->addForeignRelations($name);
+		$this->relatedClass[$relation] = null;
+
+		list($type, $id) = $this->getMorphs($name, $type, $id);
+
+		// Store the foreign key in the entity map. 
+		// We might want to store the (key, type) as we might need it
+		// to build a MorphTo proxy
+		$this->localForeignKeys[$name] = [
+			"id" => $id,
+			"type" => $type
+		];
         
 
-        $mapper = Manager::getInstance()->mapper(get_class($entity));
-
-        // If the type value is null it is probably safe to assume we're eager loading
-        // the relationship. When that is the case we will pass in a dummy query as
-        // there are multiple types in the morph and we can't use single queries.
-        $factory = new Factory;
-        $wrapper = $factory->make($entity);
-
-        if (is_null($class = $wrapper->getEntityAttribute($type))) {
-            return new MorphTo(
-                $mapper, $entity, $id, null, $type, $name
-            );
-        }
-
-        // If we are not eager loading the relationship we will essentially treat this
-        // as a belongs-to style relationship since morph-to extends that class and
-        // we will pass in the appropriate values so that it behaves as expected.
-        else {
-            $class = Manager::getInstance()->getInverseMorphMap($class);
-            $relatedMapper = Manager::getInstance()->mapper($class);
-
-            $foreignKey = $relatedMapper->getEntityMap()->getKeyName();
-
-            return new MorphTo(
-                $relatedMapper, $entity, $id, $foreignKey, $type, $name
-            );
-        }
-    }
-
-    /**
-     * Define a one-to-many relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $related
-     * @param  string|null $foreignKey
-     * @param  string|null $localKey
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\HasMany
-     */
-    public function hasMany($entity, $related, $foreignKey = null, $localKey = null)
-    {
-        $foreignKey = $foreignKey ?: $this->getForeignKey();
-
-        $relatedMapper = Manager::getInstance()->mapper($related);
-
-        $table = $relatedMapper->getEntityMap()->getTable() . '.' . $foreignKey;
-
-        $localKey = $localKey ?: $this->getKeyName();
-
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
+		$mapper = Manager::getInstance()->mapper(get_class($entity));
+
+		// If the type value is null it is probably safe to assume we're eager loading
+		// the relationship. When that is the case we will pass in a dummy query as
+		// there are multiple types in the morph and we can't use single queries.
+		$factory = new Factory;
+		$wrapper = $factory->make($entity);
+
+		if (is_null($class = $wrapper->getEntityAttribute($type))) {
+			return new MorphTo(
+				$mapper, $entity, $id, null, $type, $name
+			);
+		}
+
+		// If we are not eager loading the relationship we will essentially treat this
+		// as a belongs-to style relationship since morph-to extends that class and
+		// we will pass in the appropriate values so that it behaves as expected.
+		else {
+			$class = Manager::getInstance()->getInverseMorphMap($class);
+			$relatedMapper = Manager::getInstance()->mapper($class);
+
+			$foreignKey = $relatedMapper->getEntityMap()->getKeyName();
+
+			return new MorphTo(
+				$relatedMapper, $entity, $id, $foreignKey, $type, $name
+			);
+		}
+	}
+
+	/**
+	 * Define a one-to-many relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $related
+	 * @param  string|null $foreignKey
+	 * @param  string|null $localKey
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\HasMany
+	 */
+	public function hasMany($entity, $related, $foreignKey = null, $localKey = null)
+	{
+		$foreignKey = $foreignKey ?: $this->getForeignKey();
+
+		$relatedMapper = Manager::getInstance()->mapper($related);
+
+		$table = $relatedMapper->getEntityMap()->getTable() . '.' . $foreignKey;
+
+		$localKey = $localKey ?: $this->getKeyName();
+
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
         
-        $this->addManyRelation($relation);
-        $this->addForeignRelation($relation);
+		$this->addManyRelation($relation);
+		$this->addForeignRelation($relation);
 
-        return new HasMany($relatedMapper, $entity, $table, $localKey);
-    }
+		return new HasMany($relatedMapper, $entity, $table, $localKey);
+	}
 
-    /**
-     * Define a has-many-through relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $related
-     * @param  string      $through
-     * @param  string|null $firstKey
-     * @param  string|null $secondKey
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\HasManyThrough
-     */
-    public function hasManyThrough($entity, $related, $through, $firstKey = null, $secondKey = null)
-    {
-        $relatedMapper = Manager::getInstance()->mapper($related);
+	/**
+	 * Define a has-many-through relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $related
+	 * @param  string      $through
+	 * @param  string|null $firstKey
+	 * @param  string|null $secondKey
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\HasManyThrough
+	 */
+	public function hasManyThrough($entity, $related, $through, $firstKey = null, $secondKey = null)
+	{
+		$relatedMapper = Manager::getInstance()->mapper($related);
 
-        $throughMapper = Manager::getInstance()->mapper($through);
+		$throughMapper = Manager::getInstance()->mapper($through);
 
 
-        $firstKey = $firstKey ?: $this->getForeignKey();
+		$firstKey = $firstKey ?: $this->getForeignKey();
 
-        $throughMap = $throughMapper->getEntityMap();
+		$throughMap = $throughMapper->getEntityMap();
 
-        $secondKey = $secondKey ?: $throughMap->getForeignKey();
+		$secondKey = $secondKey ?: $throughMap->getForeignKey();
 
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
         
-        $this->addManyRelation($relation);
-        $this->addForeignRelation($relation);
-
-        return new HasManyThrough($relatedMapper, $entity, $throughMap, $firstKey, $secondKey);
-    }
-
-    /**
-     * Define a polymorphic one-to-many relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $related
-     * @param  string      $name
-     * @param  string|null $type
-     * @param  string|null $id
-     * @param  string|null $localKey
-     * @return \Analogue\ORM\Relationships\MorphMany
-     */
-    public function morphMany($entity, $related, $name, $type = null, $id = null, $localKey = null)
-    {
-        // Here we will gather up the morph type and ID for the relationship so that we
-        // can properly query the intermediate table of a relation. Finally, we will
-        // get the table and create the relationship instances for the developers.
-        list($type, $id) = $this->getMorphs($name, $type, $id);
-
-        $relatedMapper = Manager::getInstance()->mapper($related);
-
-        $table = $relatedMapper->getEntityMap()->getTable();
-
-        $localKey = $localKey ?: $this->getKeyName();
-
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
+		$this->addManyRelation($relation);
+		$this->addForeignRelation($relation);
+
+		return new HasManyThrough($relatedMapper, $entity, $throughMap, $firstKey, $secondKey);
+	}
+
+	/**
+	 * Define a polymorphic one-to-many relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $related
+	 * @param  string      $name
+	 * @param  string|null $type
+	 * @param  string|null $id
+	 * @param  string|null $localKey
+	 * @return \Analogue\ORM\Relationships\MorphMany
+	 */
+	public function morphMany($entity, $related, $name, $type = null, $id = null, $localKey = null)
+	{
+		// Here we will gather up the morph type and ID for the relationship so that we
+		// can properly query the intermediate table of a relation. Finally, we will
+		// get the table and create the relationship instances for the developers.
+		list($type, $id) = $this->getMorphs($name, $type, $id);
+
+		$relatedMapper = Manager::getInstance()->mapper($related);
+
+		$table = $relatedMapper->getEntityMap()->getTable();
+
+		$localKey = $localKey ?: $this->getKeyName();
+
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
         
-        $this->addManyRelation($relation);
-        $this->addForeignRelation($relation);
-
-        return new MorphMany($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
-    }
-
-    /**
-     * Define a many-to-many relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $relatedClass
-     * @param  string|null $table
-     * @param  string|null $foreignKey
-     * @param  string|null $otherKey
-     * @param  string|null $relation
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\BelongsToMany
-     */
-    public function belongsToMany($entity, $related, $table = null, $foreignKey = null, $otherKey = null)
-    {
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
-
-        $this->addManyRelation($relation);
-        $this->addForeignRelation($relation);
-        $this->addPivotRelation($relation);
-
-        // First, we'll need to determine the foreign key and "other key" for the
-        // relationship. Once we have determined the keys we'll make the query
-        // instances as well as the relationship instances we need for this.
-        $foreignKey = $foreignKey ?: $this->getForeignKey();
-
-        $relatedMapper = Manager::getInstance()->mapper($related);
-
-        $relatedMap = $relatedMapper->getEntityMap();
-
-        $otherKey = $otherKey ?: $relatedMap->getForeignKey();
-
-        // If no table name was provided, we can guess it by concatenating the two
-        // models using underscores in alphabetical order. The two model names
-        // are transformed to snake case from their default CamelCase also.
-        if (is_null($table)) {
-            $table = $this->joiningTable($relatedMap);
-        }
-
-        return new BelongsToMany($relatedMapper, $entity, $table, $foreignKey, $otherKey, $relation);
-    }
-
-    /**
-     * Define a polymorphic many-to-many relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $related
-     * @param  string      $name
-     * @param  string|null $table
-     * @param  string|null $foreignKey
-     * @param  string|null $otherKey
-     * @param  bool        $inverse
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\MorphToMany
-     */
-    public function morphToMany($entity, $related, $name, $table = null, $foreignKey = null, $otherKey = null, $inverse = false)
-    {
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
-
-        $this->addManyRelation($relation);
-        $this->addForeignRelation($relation);
-        $this->addPivotRelation($relation);
-
-        // First, we will need to determine the foreign key and "other key" for the
-        // relationship. Once we have determined the keys we will make the query
-        // instances, as well as the relationship instances we need for these.
-        $foreignKey = $foreignKey ?: $name . '_id';
-
-        $relatedMapper = Manager::getInstance()->mapper($related);
-
-        $otherKey = $otherKey ?: $relatedMapper->getEntityMap()->getForeignKey();
-
-        $table = $table ?: str_plural($name);
-
-        return new MorphToMany($relatedMapper, $entity, $name, $table, $foreignKey, $otherKey, $caller, $inverse);
-    }
-
-    /**
-     * Define a polymorphic, inverse many-to-many relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $related
-     * @param  string      $name
-     * @param  string|null $table
-     * @param  string|null $foreignKey
-     * @param  string|null $otherKey
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\MorphToMany
-     */
-    public function morphedByMany($entity, $related, $name, $table = null, $foreignKey = null, $otherKey = null)
-    {
-        // Add the relation to the definition in map
-        list(, $caller) = debug_backtrace(false);
-        $relation = $caller['function'];
-        $this->relatedClasses[$relation] = $related;
-
-        $this->addManyRelation($relation);
-        $this->addForeignRelation($relation);
-
-        $foreignKey = $foreignKey ?: $this->getForeignKey();
-
-        // For the inverse of the polymorphic many-to-many relations, we will change
-        // the way we determine the foreign and other keys, as it is the opposite
-        // of the morph-to-many method since we're figuring out these inverses.
-        $otherKey = $otherKey ?: $name . '_id';
-
-        return $this->morphToMany($entity, $related, $name, $table, $foreignKey, $otherKey, true);
-    }
-
-    /**
-     * Get the joining table name for a many-to-many relation.
-     *
-     * @param  EntityMap $relatedMap
-     * @return string
-     */
-    public function joiningTable($relatedMap)
-    {
-        // The joining table name, by convention, is simply the snake cased models
-        // sorted alphabetically and concatenated with an underscore, so we can
-        // just sort the models and join them together to get the table name.
-        $base = $this->getTable();
-
-        $related = $relatedMap->getTable();
-
-        $tables = [$related, $base];
-
-        // Now that we have the model names in an array we can just sort them and
-        // use the implode function to join them together with an underscores,
-        // which is typically used by convention within the database system.
-        sort($tables);
-
-        return strtolower(implode('_', $tables));
-    }
-
-    /**
-     * Get the polymorphic relationship columns.
-     *
-     * @param  string $name
-     * @param  string $type
-     * @param  string $id
-     * @return string[]
-     */
-    protected function getMorphs($name, $type, $id)
-    {
-        $type = $type ?: $name . '_type';
-
-        $id = $id ?: $name . '_id';
-
-        return [$type, $id];
-    }
-
-    /**
-     * Get the class name for polymorphic relations.
-     *
-     * @return string
-     */
-    public function getMorphClass()
-    {
-        $morphClass = Manager::getInstance()->getMorphMap($this->getClass());
-        return $this->morphClass ?: $morphClass;
-    }
-
-    /**
-     * Create a new Entity Collection instance.
-     *
-     * @param  array $entities
-     * @return \Analogue\ORM\EntityCollection
-     */
-    public function newCollection(array $entities = [])
-    {
-        $collection = new EntityCollection($entities, $this);
-        return $collection->keyBy($this->getKeyName());
-    }
-
-    /**
-     * Process EntityMap parsing at initialization time
-     *
-     * @return void
-     */
-    public function initialize()
-    {
-        $userMethods = $this->getCustomMethods();
-
-        // Parse EntityMap for method based relationship
-        if (count($userMethods) > 0) {
-            $this->relationships = $this->parseMethodsForRelationship($userMethods);
-        }
-
-        // Parse EntityMap for dynamic relationships
-        if (count($this->dynamicRelationships) > 0) {
-            $this->relationships = $this->relationships + $this->getDynamicRelationships();
-        }
-    }
-
-    /**
-     * Parse every relationships on the EntityMap and sort
-     * them by type.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        if (count($this->relationships > 0)) {
-            $this->sortRelationshipsByType();
-        }
-    }
-
-    /**
-     * Get Methods that has been added in the child class.
-     *
-     * @return array
-     */
-    protected function getCustomMethods()
-    {
-        $mapMethods = get_class_methods($this);
-
-        $parentsMethods = get_class_methods('Analogue\ORM\EntityMap');
-
-        return array_diff($mapMethods, $parentsMethods);
-    }
-
-    /**
-     * Parse user's class methods for relationships
-     *
-     * @param  array $customMethods
-     * @return array
-     */
-    protected function parseMethodsForRelationship(array $customMethods)
-    {
-        $relationships = [];
-
-        $class = new ReflectionClass(get_class($this));
-
-        // Get the mapped Entity class, as we will detect relationships
-        // methods by testing that the first argument is type-hinted to
-        // the same class as the mapped Entity.
-        $entityClass = $this->getClass();
-
-        foreach ($customMethods as $methodName) {
-            $method = $class->getMethod($methodName);
-
-            if ($method->getNumberOfParameters() > 0) {
-                $params = $method->getParameters();
-
-                if ($params[0]->getClass() && ($params[0]->getClass()->name == $entityClass || is_subclass_of($entityClass, $params[0]->getClass()->name))) {
-                    $relationships[] = $methodName;
-                }
-            }
-        }
-
-        return $relationships;
-    }
-
-    /**
-     * Sort Relationships methods by type
-     * 
-     * TODO : replace this by direclty setting these value
-     * in the corresponding methods, so we won't need
-     * the correpondancy tabble
-     * 
-     * @return void
-     */
-    protected function sortRelationshipsByType()
-    {
-        $entityClass = $this->getClass();
-
-        // Instantiate a dummy entity which we will pass to relationship methods.
-        $entity = unserialize(sprintf('O:%d:"%s":0:{}', strlen($entityClass), $entityClass));
-
-        foreach ($this->relationships as $relation) {
-            $this->$relation($entity);
-        }
-    }
-
-    /**
-     * Override this method for custom entity instantiation
-     *
-     * @return null
-     */
-    public function activator()
-    {
-        return null;
-    }
-
-    /**
-     * Magic call to dynamic relationships
-     *
-     * @param  string $method
-     * @param  array  $parameters
-     * @throws Exception
-     * @return mixed
-     */
-    public function __call($method, $parameters)
-    {
-        if (!array_key_exists($method, $this->dynamicRelationships)) {
-            throw new Exception(get_class($this) . " has no method $method");
-        }
-
-        // Add $this to parameters so the closure can call relationship method on the map.
-        $parameters[] = $this;
-
-        return  call_user_func_array([$this->dynamicRelationships[$method], $parameters]);
-    }
+		$this->addManyRelation($relation);
+		$this->addForeignRelation($relation);
+
+		return new MorphMany($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
+	}
+
+	/**
+	 * Define a many-to-many relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $relatedClass
+	 * @param  string|null $table
+	 * @param  string|null $foreignKey
+	 * @param  string|null $otherKey
+	 * @param  string|null $relation
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\BelongsToMany
+	 */
+	public function belongsToMany($entity, $related, $table = null, $foreignKey = null, $otherKey = null)
+	{
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
+
+		$this->addManyRelation($relation);
+		$this->addForeignRelation($relation);
+		$this->addPivotRelation($relation);
+
+		// First, we'll need to determine the foreign key and "other key" for the
+		// relationship. Once we have determined the keys we'll make the query
+		// instances as well as the relationship instances we need for this.
+		$foreignKey = $foreignKey ?: $this->getForeignKey();
+
+		$relatedMapper = Manager::getInstance()->mapper($related);
+
+		$relatedMap = $relatedMapper->getEntityMap();
+
+		$otherKey = $otherKey ?: $relatedMap->getForeignKey();
+
+		// If no table name was provided, we can guess it by concatenating the two
+		// models using underscores in alphabetical order. The two model names
+		// are transformed to snake case from their default CamelCase also.
+		if (is_null($table)) {
+			$table = $this->joiningTable($relatedMap);
+		}
+
+		return new BelongsToMany($relatedMapper, $entity, $table, $foreignKey, $otherKey, $relation);
+	}
+
+	/**
+	 * Define a polymorphic many-to-many relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $related
+	 * @param  string      $name
+	 * @param  string|null $table
+	 * @param  string|null $foreignKey
+	 * @param  string|null $otherKey
+	 * @param  bool        $inverse
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\MorphToMany
+	 */
+	public function morphToMany($entity, $related, $name, $table = null, $foreignKey = null, $otherKey = null, $inverse = false)
+	{
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
+
+		$this->addManyRelation($relation);
+		$this->addForeignRelation($relation);
+		$this->addPivotRelation($relation);
+
+		// First, we will need to determine the foreign key and "other key" for the
+		// relationship. Once we have determined the keys we will make the query
+		// instances, as well as the relationship instances we need for these.
+		$foreignKey = $foreignKey ?: $name . '_id';
+
+		$relatedMapper = Manager::getInstance()->mapper($related);
+
+		$otherKey = $otherKey ?: $relatedMapper->getEntityMap()->getForeignKey();
+
+		$table = $table ?: str_plural($name);
+
+		return new MorphToMany($relatedMapper, $entity, $name, $table, $foreignKey, $otherKey, $caller, $inverse);
+	}
+
+	/**
+	 * Define a polymorphic, inverse many-to-many relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $related
+	 * @param  string      $name
+	 * @param  string|null $table
+	 * @param  string|null $foreignKey
+	 * @param  string|null $otherKey
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\MorphToMany
+	 */
+	public function morphedByMany($entity, $related, $name, $table = null, $foreignKey = null, $otherKey = null)
+	{
+		// Add the relation to the definition in map
+		list(, $caller) = debug_backtrace(false);
+		$relation = $caller['function'];
+		$this->relatedClasses[$relation] = $related;
+
+		$this->addManyRelation($relation);
+		$this->addForeignRelation($relation);
+
+		$foreignKey = $foreignKey ?: $this->getForeignKey();
+
+		// For the inverse of the polymorphic many-to-many relations, we will change
+		// the way we determine the foreign and other keys, as it is the opposite
+		// of the morph-to-many method since we're figuring out these inverses.
+		$otherKey = $otherKey ?: $name . '_id';
+
+		return $this->morphToMany($entity, $related, $name, $table, $foreignKey, $otherKey, true);
+	}
+
+	/**
+	 * Get the joining table name for a many-to-many relation.
+	 *
+	 * @param  EntityMap $relatedMap
+	 * @return string
+	 */
+	public function joiningTable($relatedMap)
+	{
+		// The joining table name, by convention, is simply the snake cased models
+		// sorted alphabetically and concatenated with an underscore, so we can
+		// just sort the models and join them together to get the table name.
+		$base = $this->getTable();
+
+		$related = $relatedMap->getTable();
+
+		$tables = [$related, $base];
+
+		// Now that we have the model names in an array we can just sort them and
+		// use the implode function to join them together with an underscores,
+		// which is typically used by convention within the database system.
+		sort($tables);
+
+		return strtolower(implode('_', $tables));
+	}
+
+	/**
+	 * Get the polymorphic relationship columns.
+	 *
+	 * @param  string $name
+	 * @param  string $type
+	 * @param  string $id
+	 * @return string[]
+	 */
+	protected function getMorphs($name, $type, $id)
+	{
+		$type = $type ?: $name . '_type';
+
+		$id = $id ?: $name . '_id';
+
+		return [$type, $id];
+	}
+
+	/**
+	 * Get the class name for polymorphic relations.
+	 *
+	 * @return string
+	 */
+	public function getMorphClass()
+	{
+		$morphClass = Manager::getInstance()->getMorphMap($this->getClass());
+		return $this->morphClass ?: $morphClass;
+	}
+
+	/**
+	 * Create a new Entity Collection instance.
+	 *
+	 * @param  array $entities
+	 * @return \Analogue\ORM\EntityCollection
+	 */
+	public function newCollection(array $entities = [])
+	{
+		$collection = new EntityCollection($entities, $this);
+		return $collection->keyBy($this->getKeyName());
+	}
+
+	/**
+	 * Process EntityMap parsing at initialization time
+	 *
+	 * @return void
+	 */
+	public function initialize()
+	{
+		$userMethods = $this->getCustomMethods();
+
+		// Parse EntityMap for method based relationship
+		if (count($userMethods) > 0) {
+			$this->relationships = $this->parseMethodsForRelationship($userMethods);
+		}
+
+		// Parse EntityMap for dynamic relationships
+		if (count($this->dynamicRelationships) > 0) {
+			$this->relationships = $this->relationships + $this->getDynamicRelationships();
+		}
+	}
+
+	/**
+	 * Parse every relationships on the EntityMap and sort
+	 * them by type.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		if (count($this->relationships > 0)) {
+			$this->sortRelationshipsByType();
+		}
+	}
+
+	/**
+	 * Get Methods that has been added in the child class.
+	 *
+	 * @return array
+	 */
+	protected function getCustomMethods()
+	{
+		$mapMethods = get_class_methods($this);
+
+		$parentsMethods = get_class_methods('Analogue\ORM\EntityMap');
+
+		return array_diff($mapMethods, $parentsMethods);
+	}
+
+	/**
+	 * Parse user's class methods for relationships
+	 *
+	 * @param  array $customMethods
+	 * @return array
+	 */
+	protected function parseMethodsForRelationship(array $customMethods)
+	{
+		$relationships = [];
+
+		$class = new ReflectionClass(get_class($this));
+
+		// Get the mapped Entity class, as we will detect relationships
+		// methods by testing that the first argument is type-hinted to
+		// the same class as the mapped Entity.
+		$entityClass = $this->getClass();
+
+		foreach ($customMethods as $methodName) {
+			$method = $class->getMethod($methodName);
+
+			if ($method->getNumberOfParameters() > 0) {
+				$params = $method->getParameters();
+
+				if ($params[0]->getClass() && ($params[0]->getClass()->name == $entityClass || is_subclass_of($entityClass, $params[0]->getClass()->name))) {
+					$relationships[] = $methodName;
+				}
+			}
+		}
+
+		return $relationships;
+	}
+
+	/**
+	 * Sort Relationships methods by type
+	 * 
+	 * TODO : replace this by direclty setting these value
+	 * in the corresponding methods, so we won't need
+	 * the correpondancy tabble
+	 * 
+	 * @return void
+	 */
+	protected function sortRelationshipsByType()
+	{
+		$entityClass = $this->getClass();
+
+		// Instantiate a dummy entity which we will pass to relationship methods.
+		$entity = unserialize(sprintf('O:%d:"%s":0:{}', strlen($entityClass), $entityClass));
+
+		foreach ($this->relationships as $relation) {
+			$this->$relation($entity);
+		}
+	}
+
+	/**
+	 * Override this method for custom entity instantiation
+	 *
+	 * @return null
+	 */
+	public function activator()
+	{
+		return null;
+	}
+
+	/**
+	 * Magic call to dynamic relationships
+	 *
+	 * @param  string $method
+	 * @param  array  $parameters
+	 * @throws Exception
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		if (!array_key_exists($method, $this->dynamicRelationships)) {
+			throw new Exception(get_class($this) . " has no method $method");
+		}
+
+		// Add $this to parameters so the closure can call relationship method on the map.
+		$parameters[] = $this;
+
+		return  call_user_func_array([$this->dynamicRelationships[$method], $parameters]);
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -418,7 +418,7 @@ 
         if (!is_null($this->sequence)) {
             return $this->sequence;
         } else {
-            return $this->getTable() . '_id_seq';
+            return $this->getTable().'_id_seq';
         }
     }
 
@@ -640,7 +640,7 @@ 
      */
     public function getQualifiedKeyName() : string
     {
-        return $this->getTable() . '.' . $this->getKeyName();
+        return $this->getTable().'.'.$this->getKeyName();
     }
 
     /**
@@ -721,7 +721,7 @@ 
      */
     public function getForeignKey() : string
     {
-        return snake_case(class_basename($this->getClass())) . '_id';
+        return snake_case(class_basename($this->getClass())).'_id';
     }
 
     /**
@@ -774,7 +774,7 @@ 
      */
     protected function addSingleRelation($relation)
     {
-        if(! in_array($relation, $this->singleRelations)) {
+        if (!in_array($relation, $this->singleRelations)) {
             $this->singleRelations[] = $relation;
         }
     }
@@ -786,7 +786,7 @@ 
      */
     protected function addForeignRelation($relation)
     {
-        if(! in_array($relation, $this->foreignRelations)) {
+        if (!in_array($relation, $this->foreignRelations)) {
             $this->foreignRelations[] = $relation;
         }
     }
@@ -798,7 +798,7 @@ 
      */
     protected function addNonProxyRelation($relation)
     {
-        if(! in_array($relation, $this->nonProxyRelationships)) {
+        if (!in_array($relation, $this->nonProxyRelationships)) {
             $this->nonProxyRelationships[] = $relation;
         }
     }
@@ -810,7 +810,7 @@ 
      */
     protected function addLocalRelation($relation)
     {
-        if(! in_array($relation, $this->localRelations)) {
+        if (!in_array($relation, $this->localRelations)) {
             $this->localRelations[] = $relation;
         }
     }
@@ -822,7 +822,7 @@ 
      */
     protected function addManyRelation($relation)
     {
-        if(! in_array($relation, $this->manyRelations)) {
+        if (!in_array($relation, $this->manyRelations)) {
             $this->manyRelations[] = $relation;
         }
     }
@@ -834,7 +834,7 @@ 
      */
     protected function addPivotRelation($relation)
     {
-        if(! in_array($relation, $this->pivotRelations)) {
+        if (!in_array($relation, $this->pivotRelations)) {
             $this->pivotRelations[] = $relation;
         }
     }
@@ -870,11 +870,11 @@ 
 
         // This relationship will always be eager loaded, as proxying it would
         // mean having an object that doesn't actually exists.
-        if(! in_array($relation, $this->with)) {
+        if (!in_array($relation, $this->with)) {
             $this->with[] = $relation;
         }
 
-        return new HasOne($relatedMapper, $entity, $relatedMap->getTable() . '.' . $foreignKey, $localKey);
+        return new HasOne($relatedMapper, $entity, $relatedMap->getTable().'.'.$foreignKey, $localKey);
     }
 
     /**
@@ -910,11 +910,11 @@ 
 
         // This relationship will always be eager loaded, as proxying it would
         // mean having an object that doesn't actually exists.
-        if(! in_array($relation, $this->with)) {
+        if (!in_array($relation, $this->with)) {
             $this->with[] = $relation;
         }
         
-        return new MorphOne($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
+        return new MorphOne($relatedMapper, $entity, $table.'.'.$type, $table.'.'.$id, $localKey);
     }
 
     /**
@@ -942,7 +942,7 @@ 
         // foreign key name by using the name of the relationship function, which
         // when combined with an "_id" should conventionally match the columns.
         if (is_null($foreignKey)) {
-            $foreignKey = snake_case($relation) . '_id';
+            $foreignKey = snake_case($relation).'_id';
         }
 
         $this->localForeignKeys[$relation] = $foreignKey;
@@ -1035,7 +1035,7 @@ 
 
         $relatedMapper = Manager::getInstance()->mapper($related);
 
-        $table = $relatedMapper->getEntityMap()->getTable() . '.' . $foreignKey;
+        $table = $relatedMapper->getEntityMap()->getTable().'.'.$foreignKey;
 
         $localKey = $localKey ?: $this->getKeyName();
 
@@ -1117,7 +1117,7 @@ 
         $this->addManyRelation($relation);
         $this->addForeignRelation($relation);
 
-        return new MorphMany($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
+        return new MorphMany($relatedMapper, $entity, $table.'.'.$type, $table.'.'.$id, $localKey);
     }
 
     /**
@@ -1191,7 +1191,7 @@ 
         // First, we will need to determine the foreign key and "other key" for the
         // relationship. Once we have determined the keys we will make the query
         // instances, as well as the relationship instances we need for these.
-        $foreignKey = $foreignKey ?: $name . '_id';
+        $foreignKey = $foreignKey ?: $name.'_id';
 
         $relatedMapper = Manager::getInstance()->mapper($related);
 
@@ -1229,7 +1229,7 @@ 
         // For the inverse of the polymorphic many-to-many relations, we will change
         // the way we determine the foreign and other keys, as it is the opposite
         // of the morph-to-many method since we're figuring out these inverses.
-        $otherKey = $otherKey ?: $name . '_id';
+        $otherKey = $otherKey ?: $name.'_id';
 
         return $this->morphToMany($entity, $related, $name, $table, $foreignKey, $otherKey, true);
     }
@@ -1269,9 +1269,9 @@ 
      */
     protected function getMorphs($name, $type, $id)
     {
-        $type = $type ?: $name . '_type';
+        $type = $type ?: $name.'_type';
 
-        $id = $id ?: $name . '_id';
+        $id = $id ?: $name.'_id';
 
         return [$type, $id];
     }
@@ -1420,7 +1420,7 @@ 
     public function __call($method, $parameters)
     {
         if (!array_key_exists($method, $this->dynamicRelationships)) {
-            throw new Exception(get_class($this) . " has no method $method");
+            throw new Exception(get_class($this)." has no method $method");
         }
 
         // Add $this to parameters so the closure can call relationship method on the map.

src/System/EntityBuilder.php

Indentation +153 added lines, -153 removed lines

@@ -9,159 +9,159 @@
  */
 class EntityBuilder
 {
-    /**
-     * The mapper for the entity to build
-     * @var \Analogue\ORM\System\Mapper
-     */
-    protected $mapper;
-
-    /**
-     * The Entity Map for the entity to build.
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $entityMap;
-
-    /**
-     * Relations that are eager loaded on this query
-     *
-     * @var array
-     */
-    protected $eagerLoads;
-
-    /**
-     * Relations that will be lazy loaded on this query
-     *
-     * @var array
-     */
-    protected $lazyLoads;
-
-    /**
-     * @var array
-     */
-    protected $casts;
-
-    /**
-     * Entity Wrapper Factory
-     * @var \Analogue\ORM\System\Wrappers\Factory
-     */
-    protected $factory;
-
-    /**
-     * EntityBuilder constructor.
-     * 
-     * @param Mapper $mapper
-     * @param array  $eagerLoads
-     */
-    public function __construct(Mapper $mapper, array $eagerLoads)
-    {
-        $this->mapper = $mapper;
-
-        $this->entityMap = $mapper->getEntityMap();
-
-        $this->eagerLoads = $eagerLoads;
-
-        $this->lazyLoads = $this->getRelationshipsToProxy();
-
-        $this->factory = new Factory;
-    }
-
-    /**
-     * Convert an array of values into an entity.
-     *
-     * @param  array $result
-     * @return array
-     */
-    public function build(array $result)
-    {
-        $instance = $this->getWrapperInstance();
+	/**
+	 * The mapper for the entity to build
+	 * @var \Analogue\ORM\System\Mapper
+	 */
+	protected $mapper;
+
+	/**
+	 * The Entity Map for the entity to build.
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $entityMap;
+
+	/**
+	 * Relations that are eager loaded on this query
+	 *
+	 * @var array
+	 */
+	protected $eagerLoads;
+
+	/**
+	 * Relations that will be lazy loaded on this query
+	 *
+	 * @var array
+	 */
+	protected $lazyLoads;
+
+	/**
+	 * @var array
+	 */
+	protected $casts;
+
+	/**
+	 * Entity Wrapper Factory
+	 * @var \Analogue\ORM\System\Wrappers\Factory
+	 */
+	protected $factory;
+
+	/**
+	 * EntityBuilder constructor.
+	 * 
+	 * @param Mapper $mapper
+	 * @param array  $eagerLoads
+	 */
+	public function __construct(Mapper $mapper, array $eagerLoads)
+	{
+		$this->mapper = $mapper;
+
+		$this->entityMap = $mapper->getEntityMap();
+
+		$this->eagerLoads = $eagerLoads;
+
+		$this->lazyLoads = $this->getRelationshipsToProxy();
+
+		$this->factory = new Factory;
+	}
+
+	/**
+	 * Convert an array of values into an entity.
+	 *
+	 * @param  array $result
+	 * @return array
+	 */
+	public function build(array $result)
+	{
+		$instance = $this->getWrapperInstance();
         
-        // Hydrate any embedded Value Object
-        // 
-        // TODO Move this to the result builder instead,
-        // as we'll handle this the same way as they were
-        // eager loaded relationships. 
-        $this->hydrateValueObjects($result);
-
-        $instance->setEntityAttributes($result);
-
-        // Hydrate relationship attributes with lazyloading proxies
-        if (count($this->lazyLoads) > 0) {
-            $instance->setProxies($this->lazyLoads);
-        }
-
-        // Hydrate and return the instance
-        $instance->hydrate();
-        $entity = $instance->getObject();
-
-        return $entity;
-    }
-
-    /**
-     * Get the correct wrapper prototype corresponding to the object type
-     *
-     * @throws \Analogue\ORM\Exceptions\MappingException
-     * @return InternallyMappable
-     */
-    protected function getWrapperInstance()
-    {
-        return $this->factory->make($this->mapper->newInstance());
-    }
-
-    /**
-     * Hydrate value object embedded in this entity
-     *
-     * @param  array $attributes
-     * @throws \Analogue\ORM\Exceptions\MappingException
-     * @return void
-     */
-    protected function hydrateValueObjects(& $attributes)
-    {
-        foreach ($this->entityMap->getEmbeddables() as $localKey => $valueClass) {
-            $this->hydrateValueObject($attributes, $localKey, $valueClass);
-        }
-    }
-
-    /**
-     * Hydrate a single value object
-     *
-     * @param  array  $attributes
-     * @param  string $localKey
-     * @param  string $valueClass
-     * @throws \Analogue\ORM\Exceptions\MappingException
-     * @return void
-     */
-    protected function hydrateValueObject(& $attributes, $localKey, $valueClass)
-    {
-        $map = $this->mapper->getManager()->getValueMap($valueClass);
-
-        $embeddedAttributes = $map->getAttributes();
-
-        $valueObject = $this->mapper->getManager()->getValueObjectInstance($valueClass);
-        $voWrapper = $this->factory->make($valueObject);
-
-        foreach ($embeddedAttributes as $key) {
-
-            $prefix = snake_case(class_basename($valueClass)) . '_';
-
-            $voWrapper->setEntityAttribute($key, $attributes[$prefix . $key]);
-
-            unset($attributes[$prefix . $key]);
-        }
-
-        $attributes[$localKey] = $voWrapper->getObject();
-    }
-
-    /**
-     * Deduce the relationships for which we will build lazy loading proxies
-     *
-     * @return array
-     */
-    protected function getRelationshipsToProxy()
-    {
-        $relations = $this->entityMap->getRelationships();
-
-        return array_diff($relations, $this->eagerLoads);
-    }
+		// Hydrate any embedded Value Object
+		// 
+		// TODO Move this to the result builder instead,
+		// as we'll handle this the same way as they were
+		// eager loaded relationships. 
+		$this->hydrateValueObjects($result);
+
+		$instance->setEntityAttributes($result);
+
+		// Hydrate relationship attributes with lazyloading proxies
+		if (count($this->lazyLoads) > 0) {
+			$instance->setProxies($this->lazyLoads);
+		}
+
+		// Hydrate and return the instance
+		$instance->hydrate();
+		$entity = $instance->getObject();
+
+		return $entity;
+	}
+
+	/**
+	 * Get the correct wrapper prototype corresponding to the object type
+	 *
+	 * @throws \Analogue\ORM\Exceptions\MappingException
+	 * @return InternallyMappable
+	 */
+	protected function getWrapperInstance()
+	{
+		return $this->factory->make($this->mapper->newInstance());
+	}
+
+	/**
+	 * Hydrate value object embedded in this entity
+	 *
+	 * @param  array $attributes
+	 * @throws \Analogue\ORM\Exceptions\MappingException
+	 * @return void
+	 */
+	protected function hydrateValueObjects(& $attributes)
+	{
+		foreach ($this->entityMap->getEmbeddables() as $localKey => $valueClass) {
+			$this->hydrateValueObject($attributes, $localKey, $valueClass);
+		}
+	}
+
+	/**
+	 * Hydrate a single value object
+	 *
+	 * @param  array  $attributes
+	 * @param  string $localKey
+	 * @param  string $valueClass
+	 * @throws \Analogue\ORM\Exceptions\MappingException
+	 * @return void
+	 */
+	protected function hydrateValueObject(& $attributes, $localKey, $valueClass)
+	{
+		$map = $this->mapper->getManager()->getValueMap($valueClass);
+
+		$embeddedAttributes = $map->getAttributes();
+
+		$valueObject = $this->mapper->getManager()->getValueObjectInstance($valueClass);
+		$voWrapper = $this->factory->make($valueObject);
+
+		foreach ($embeddedAttributes as $key) {
+
+			$prefix = snake_case(class_basename($valueClass)) . '_';
+
+			$voWrapper->setEntityAttribute($key, $attributes[$prefix . $key]);
+
+			unset($attributes[$prefix . $key]);
+		}
+
+		$attributes[$localKey] = $voWrapper->getObject();
+	}
+
+	/**
+	 * Deduce the relationships for which we will build lazy loading proxies
+	 *
+	 * @return array
+	 */
+	protected function getRelationshipsToProxy()
+	{
+		$relations = $this->entityMap->getRelationships();
+
+		return array_diff($relations, $this->eagerLoads);
+	}
 
 }
\ No newline at end of file