analogueorm / analogue

src/Plugins/SoftDeletes/SoftDeletesPlugin.php

Indentation +66 added lines, -66 removed lines

@@ -13,80 +13,80 @@
  */
 class SoftDeletesPlugin extends AnaloguePlugin
 {
-    /**
-     * Register the plugin
-     *
-     * @throws \Exception
-     * @return void
-     */
-    public function register()
-    {
-        $host = $this;
-
-        // Hook any mapper init and check the mapping include soft deletes.
-        $this->manager->registerGlobalEvent('initialized', function (Mapper $mapper) use ($host) {
-            $entityMap = $mapper->getEntityMap();
-
-            if ($entityMap->usesSoftDeletes()) {
-                $host->registerSoftDelete($mapper);
-            }
-
-        });
-    }
-
-    /**
-     * By hooking to the mapper initialization event, we can extend it
-     * with the softDelete capacity.
-     *
-     * @param  \Analogue\ORM\System\Mapper $mapper
-     * @throws \Analogue\ORM\Exceptions\MappingException
-     * @return bool|void
-     */
-    protected function registerSoftDelete(Mapper $mapper)
-    {
-        $entityMap = $mapper->getEntityMap();
-
-        // Add Scopes
-        $mapper->addGlobalScope(new SoftDeletingScope);
-
-        $host = $this;
-
-        // Register 'deleting' events
-        $mapper->registerEvent('deleting', function ($entity) use ($entityMap, $host) {
+	/**
+	 * Register the plugin
+	 *
+	 * @throws \Exception
+	 * @return void
+	 */
+	public function register()
+	{
+		$host = $this;
+
+		// Hook any mapper init and check the mapping include soft deletes.
+		$this->manager->registerGlobalEvent('initialized', function (Mapper $mapper) use ($host) {
+			$entityMap = $mapper->getEntityMap();
+
+			if ($entityMap->usesSoftDeletes()) {
+				$host->registerSoftDelete($mapper);
+			}
+
+		});
+	}
+
+	/**
+	 * By hooking to the mapper initialization event, we can extend it
+	 * with the softDelete capacity.
+	 *
+	 * @param  \Analogue\ORM\System\Mapper $mapper
+	 * @throws \Analogue\ORM\Exceptions\MappingException
+	 * @return bool|void
+	 */
+	protected function registerSoftDelete(Mapper $mapper)
+	{
+		$entityMap = $mapper->getEntityMap();
+
+		// Add Scopes
+		$mapper->addGlobalScope(new SoftDeletingScope);
+
+		$host = $this;
+
+		// Register 'deleting' events
+		$mapper->registerEvent('deleting', function ($entity) use ($entityMap, $host) {
             
-            // Convert Entity into an EntityWrapper
-            $factory = new Factory;
+			// Convert Entity into an EntityWrapper
+			$factory = new Factory;
 
-            $wrappedEntity = $factory->make($entity);
+			$wrappedEntity = $factory->make($entity);
 
-            $deletedAtField = $entityMap->getQualifiedDeletedAtColumn();
+			$deletedAtField = $entityMap->getQualifiedDeletedAtColumn();
 
-            if (!is_null($wrappedEntity->getEntityAttribute($deletedAtField))) {
-                return true;
-            } else {
-                $time = new Carbon;
+			if (!is_null($wrappedEntity->getEntityAttribute($deletedAtField))) {
+				return true;
+			} else {
+				$time = new Carbon;
 
-                $wrappedEntity->setEntityAttribute($deletedAtField, $time);
+				$wrappedEntity->setEntityAttribute($deletedAtField, $time);
 
-                $plainObject = $wrappedEntity->getObject();
-                $host->manager->mapper(get_class($plainObject))->store($plainObject);
+				$plainObject = $wrappedEntity->getObject();
+				$host->manager->mapper(get_class($plainObject))->store($plainObject);
 
-                return false;
-            }
+				return false;
+			}
 
-        });
+		});
 
-        // Register RestoreCommand
-        $mapper->addCustomCommand('Analogue\ORM\Plugins\SoftDeletes\Restore');
-    }
+		// Register RestoreCommand
+		$mapper->addCustomCommand('Analogue\ORM\Plugins\SoftDeletes\Restore');
+	}
 
-    /**
-     * Get custom events provided by the plugin
-     *
-     * @return string[]
-     */
-    public function getCustomEvents()
-    {
-        return ['restoring', 'restored'];
-    }
+	/**
+	 * Get custom events provided by the plugin
+	 *
+	 * @return string[]
+	 */
+	public function getCustomEvents()
+	{
+		return ['restoring', 'restored'];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
         $host = $this;
 
         // Hook any mapper init and check the mapping include soft deletes.
-        $this->manager->registerGlobalEvent('initialized', function (Mapper $mapper) use ($host) {
+        $this->manager->registerGlobalEvent('initialized', function(Mapper $mapper) use ($host) {
             $entityMap = $mapper->getEntityMap();
 
             if ($entityMap->usesSoftDeletes()) {
@@ -52,7 +52,7 @@ 
         $host = $this;
 
         // Register 'deleting' events
-        $mapper->registerEvent('deleting', function ($entity) use ($entityMap, $host) {
+        $mapper->registerEvent('deleting', function($entity) use ($entityMap, $host) {
             
             // Convert Entity into an EntityWrapper
             $factory = new Factory;

src/Plugins/Timestamps/TimestampsPlugin.php

Indentation +39 added lines, -39 removed lines

@@ -12,55 +12,55 @@
  */
 class TimestampsPlugin extends AnaloguePlugin
 {
-    /**
-     * Register the plugin
-     *
-     * @throws \Exception
-     * @return void
-     */
-    public function register()
-    {
-        $this->manager->registerGlobalEvent('initialized', function (Mapper $mapper) {
-            $entityMap = $mapper->getEntityMap();
+	/**
+	 * Register the plugin
+	 *
+	 * @throws \Exception
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->manager->registerGlobalEvent('initialized', function (Mapper $mapper) {
+			$entityMap = $mapper->getEntityMap();
 
-            if ($entityMap->usesTimestamps()) {
-                $mapper->registerEvent('creating', function ($entity) use ($entityMap) {
+			if ($entityMap->usesTimestamps()) {
+				$mapper->registerEvent('creating', function ($entity) use ($entityMap) {
 
-                    $factory = new Factory;
-                    $wrappedEntity = $factory->make($entity);
+					$factory = new Factory;
+					$wrappedEntity = $factory->make($entity);
 
-                    $createdAtField = $entityMap->getCreatedAtColumn();
-                    $updatedAtField = $entityMap->getUpdatedAtColumn();
+					$createdAtField = $entityMap->getCreatedAtColumn();
+					$updatedAtField = $entityMap->getUpdatedAtColumn();
 
-                    $time = new Carbon;
+					$time = new Carbon;
 
-                    $wrappedEntity->setEntityAttribute($createdAtField, $time);
-                    $wrappedEntity->setEntityAttribute($updatedAtField, $time);
+					$wrappedEntity->setEntityAttribute($createdAtField, $time);
+					$wrappedEntity->setEntityAttribute($updatedAtField, $time);
 
-                });
+				});
 
-                $mapper->registerEvent('updating', function ($entity) use ($entityMap) {
+				$mapper->registerEvent('updating', function ($entity) use ($entityMap) {
 
-                    $factory = new Factory;
-                    $wrappedEntity = $factory->make($entity);
+					$factory = new Factory;
+					$wrappedEntity = $factory->make($entity);
 
-                    $updatedAtField = $entityMap->getUpdatedAtColumn();
+					$updatedAtField = $entityMap->getUpdatedAtColumn();
 
-                    $time = new Carbon;
+					$time = new Carbon;
 
-                    $wrappedEntity->setEntityAttribute($updatedAtField, $time);
-                });
-            }
-        });
-    }
+					$wrappedEntity->setEntityAttribute($updatedAtField, $time);
+				});
+			}
+		});
+	}
 
-    /**
-     * Get custom events provided by the plugin
-     *
-     * @return array
-     */
-    public function getCustomEvents()
-    {
-        return [];
-    }
+	/**
+	 * Get custom events provided by the plugin
+	 *
+	 * @return array
+	 */
+	public function getCustomEvents()
+	{
+		return [];
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -20,11 +20,11 @@ 
      */
     public function register()
     {
-        $this->manager->registerGlobalEvent('initialized', function (Mapper $mapper) {
+        $this->manager->registerGlobalEvent('initialized', function(Mapper $mapper) {
             $entityMap = $mapper->getEntityMap();
 
             if ($entityMap->usesTimestamps()) {
-                $mapper->registerEvent('creating', function ($entity) use ($entityMap) {
+                $mapper->registerEvent('creating', function($entity) use ($entityMap) {
 
                     $factory = new Factory;
                     $wrappedEntity = $factory->make($entity);
@@ -39,7 +39,7 @@ 
 
                 });
 
-                $mapper->registerEvent('updating', function ($entity) use ($entityMap) {
+                $mapper->registerEvent('updating', function($entity) use ($entityMap) {
 
                     $factory = new Factory;
                     $wrappedEntity = $factory->make($entity);

src/Plugins/AnaloguePlugin.php

Indentation +26 added lines, -26 removed lines

@@ -6,33 +6,33 @@
 
 abstract class AnaloguePlugin implements AnaloguePluginInterface
 {
-    /**
-     * Manager instance
-     *
-     * @var Manager
-     */
-    protected $manager;
+	/**
+	 * Manager instance
+	 *
+	 * @var Manager
+	 */
+	protected $manager;
 
-    /**
-     * AnaloguePlugin constructor.
-     * @param Manager $manager
-     */
-    public function __construct(Manager $manager)
-    {
-        $this->manager = $manager;
-    }
+	/**
+	 * AnaloguePlugin constructor.
+	 * @param Manager $manager
+	 */
+	public function __construct(Manager $manager)
+	{
+		$this->manager = $manager;
+	}
 
-    /**
-     * Boot the plugin
-     *
-     * @return void
-     */
-    abstract public function register();
+	/**
+	 * Boot the plugin
+	 *
+	 * @return void
+	 */
+	abstract public function register();
 
-    /**
-     * Get custom events provided by the plugin
-     *
-     * @return array
-     */
-    abstract public function getCustomEvents();
+	/**
+	 * Get custom events provided by the plugin
+	 *
+	 * @return array
+	 */
+	abstract public function getCustomEvents();
 }

src/Repository.php

Indentation +116 added lines, -116 removed lines

@@ -15,129 +15,129 @@
  */
 class Repository
 {
-    /**
-     * The mapper object for the corresponding entity
-     *
-     * @var \Analogue\ORM\System\Mapper
-     */
-    protected $mapper;
+	/**
+	 * The mapper object for the corresponding entity
+	 *
+	 * @var \Analogue\ORM\System\Mapper
+	 */
+	protected $mapper;
 
-    /**
-     * To build a repository, either provide :
-     *
-     * - Mappable object's class name as a string
-     * - Mappable object instance
-     * - Instance of mapper
-     *
-     * @param  Mapper         $mapper
-     * @param  EntityMap|null $entityMap (optional)
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     */
-    public function __construct($mapper, EntityMap $entityMap = null)
-    {
-        if ($mapper instanceof Mappable || is_string($mapper)) {
-            $this->mapper = Manager::getMapper($mapper, $entityMap);
-        } elseif ($mapper instanceof Mapper) {
-            $this->mapper = $mapper;
-        } else {
-            new InvalidArgumentException('Repository class constructor need a valid Mapper or Mappable object.');
-        }
-    }
+	/**
+	 * To build a repository, either provide :
+	 *
+	 * - Mappable object's class name as a string
+	 * - Mappable object instance
+	 * - Instance of mapper
+	 *
+	 * @param  Mapper         $mapper
+	 * @param  EntityMap|null $entityMap (optional)
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 */
+	public function __construct($mapper, EntityMap $entityMap = null)
+	{
+		if ($mapper instanceof Mappable || is_string($mapper)) {
+			$this->mapper = Manager::getMapper($mapper, $entityMap);
+		} elseif ($mapper instanceof Mapper) {
+			$this->mapper = $mapper;
+		} else {
+			new InvalidArgumentException('Repository class constructor need a valid Mapper or Mappable object.');
+		}
+	}
 
-    /**
-     * Return all Entities from database
-     *
-     * @return \Analogue\ORM\EntityCollection
-     */
-    public function all()
-    {
-        return $this->mapper->get();
-    }
+	/**
+	 * Return all Entities from database
+	 *
+	 * @return \Analogue\ORM\EntityCollection
+	 */
+	public function all()
+	{
+		return $this->mapper->get();
+	}
     
-    /**
-     * Fetch a record from the database
-     * @param  integer $id
-     * @return \Analogue\ORM\Mappable
-     */
-    public function find($id)
-    {
-        return $this->mapper->find($id);
-    }
+	/**
+	 * Fetch a record from the database
+	 * @param  integer $id
+	 * @return \Analogue\ORM\Mappable
+	 */
+	public function find($id)
+	{
+		return $this->mapper->find($id);
+	}
 
-    /**
-     * Get the first entity matching the given attributes.
-     *
-     * @param  array  $attributes
-     * @return \Analogue\ORM\Mappable|null
-     */
-    public function firstMatching(array $attributes)
-    {
-        return $this->mapper->where($attributes)->first();
-    }
+	/**
+	 * Get the first entity matching the given attributes.
+	 *
+	 * @param  array  $attributes
+	 * @return \Analogue\ORM\Mappable|null
+	 */
+	public function firstMatching(array $attributes)
+	{
+		return $this->mapper->where($attributes)->first();
+	}
 
-    /**
-     * Return all the entities matching the given attributes
-     *
-     * @param array $attributes
-     * @return \Analogue\ORM\EntityCollection
-     */
-    public function allMatching(array $attributes)
-    {
-        return $this->mapper->where($attributes)->get();
-    }
+	/**
+	 * Return all the entities matching the given attributes
+	 *
+	 * @param array $attributes
+	 * @return \Analogue\ORM\EntityCollection
+	 */
+	public function allMatching(array $attributes)
+	{
+		return $this->mapper->where($attributes)->get();
+	}
 
-    /**
-     * Return a paginator instance on the EntityCollection
-     *
-     * @param int|null $perPage number of item per page (fallback on default setup in entity map)
-     * @return \Illuminate\Pagination\LengthAwarePaginator
-     */
-    public function paginate($perPage = null)
-    {
-        return $this->mapper->paginate($perPage);
-    }
+	/**
+	 * Return a paginator instance on the EntityCollection
+	 *
+	 * @param int|null $perPage number of item per page (fallback on default setup in entity map)
+	 * @return \Illuminate\Pagination\LengthAwarePaginator
+	 */
+	public function paginate($perPage = null)
+	{
+		return $this->mapper->paginate($perPage);
+	}
 
-    /**
-     * Delete an entity or an entity collection from the database
-     *
-     * @param  Mappable|EntityCollection $entity
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     * @return \Illuminate\Support\Collection|null
-     */
-    public function delete($entity)
-    {
-        return $this->mapper->delete($entity);
-    }
+	/**
+	 * Delete an entity or an entity collection from the database
+	 *
+	 * @param  Mappable|EntityCollection $entity
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 * @return \Illuminate\Support\Collection|null
+	 */
+	public function delete($entity)
+	{
+		return $this->mapper->delete($entity);
+	}
 
-    /**
-     * Persist an entity or an entity collection in the database.
-     *
-     * @param  Mappable|EntityCollection|array $entity
-     * @throws MappingException
-     * @throws \InvalidArgumentException
-     * @return Mappable|EntityCollection|array
-     */
-    public function store($entity)
-    {
-        return $this->mapper->store($entity);
-    }
+	/**
+	 * Persist an entity or an entity collection in the database.
+	 *
+	 * @param  Mappable|EntityCollection|array $entity
+	 * @throws MappingException
+	 * @throws \InvalidArgumentException
+	 * @return Mappable|EntityCollection|array
+	 */
+	public function store($entity)
+	{
+		return $this->mapper->store($entity);
+	}
 
-    /**
-     * Make custom mapper custom commands available in repository
-     *
-     * @param  string $method
-     * @param  array  $parameters
-     * @throws Exception
-     * @return mixed
-     */
-    public function __call($method, $parameters)
-    {
-        if ($this->mapper->hasCustomCommand($method)) {
-            call_user_func_array([$this->mapper, $method], $parameters);
-        } else {
-            throw new Exception("No method $method on " . get_class($this));
-        }
-    }
+	/**
+	 * Make custom mapper custom commands available in repository
+	 *
+	 * @param  string $method
+	 * @param  array  $parameters
+	 * @throws Exception
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		if ($this->mapper->hasCustomCommand($method)) {
+			call_user_func_array([$this->mapper, $method], $parameters);
+		} else {
+			throw new Exception("No method $method on " . get_class($this));
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
         if ($this->mapper->hasCustomCommand($method)) {
             call_user_func_array([$this->mapper, $method], $parameters);
         } else {
-            throw new Exception("No method $method on " . get_class($this));
+            throw new Exception("No method $method on ".get_class($this));
         }
     }
 }

src/MappableTrait.php

Indentation +55 added lines, -55 removed lines

@@ -8,63 +8,63 @@
  */
 trait MappableTrait
 {
-    /**
-     * The Entity's Attributes
-     * @var array
-     */
-    protected $attributes = [];
+	/**
+	 * The Entity's Attributes
+	 * @var array
+	 */
+	protected $attributes = [];
 
-    /**
-     * 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 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()
-    {
-        return $this->attributes;
-    }
+	/**
+	 * Method used by the mapper to get the
+	 * raw object's values.
+	 *
+	 * @return array
+	 */
+	public function getEntityAttributes()
+	{
+		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 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 (array_key_exists($key, $this->attributes)) {
-            return $this->attributes[$key];
-        } else {
-            return null;
-        }
-    }
+	/**
+	 * Method used by the mapper to get single
+	 * key-value pair
+	 *
+	 * @param  string $key
+	 * @return mixed|null
+	 */
+	public function getEntityAttribute($key)
+	{
+		if (array_key_exists($key, $this->attributes)) {
+			return $this->attributes[$key];
+		} else {
+			return null;
+		}
+	}
 }

src/Exceptions/EntityNotFoundException.php

Indentation +27 added lines, -27 removed lines

@@ -6,35 +6,35 @@
 
 class EntityNotFoundException extends RuntimeException
 {
-    /**
-     * Name of the affected Entity Map.
-     *
-     * @var string
-     */
-    protected $entity;
+	/**
+	 * Name of the affected Entity Map.
+	 *
+	 * @var string
+	 */
+	protected $entity;
 
-    /**
-     * Set the affected Entity Map.
-     *
-     * @param  string   $entity
-     * @return $this
-     */
-    public function setEntity($entity)
-    {
-        $this->entity = $entity;
+	/**
+	 * Set the affected Entity Map.
+	 *
+	 * @param  string   $entity
+	 * @return $this
+	 */
+	public function setEntity($entity)
+	{
+		$this->entity = $entity;
 
-        $this->message = "No query results for entity [{$entity}].";
+		$this->message = "No query results for entity [{$entity}].";
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Get the affected Entity.
-     *
-     * @return string
-     */
-    public function getEntity()
-    {
-        return $this->entity;
-    }
+	/**
+	 * Get the affected Entity.
+	 *
+	 * @return string
+	 */
+	public function getEntity()
+	{
+		return $this->entity;
+	}
 }

src/EntityMap.php

Spacing +14 added lines, -14 removed lines

@@ -393,7 +393,7 @@ 
         if (!is_null($this->sequence)) {
             return $this->sequence;
         } else {
-            return $this->getTable() . '_id_seq';
+            return $this->getTable().'_id_seq';
         }
     }
 
@@ -563,7 +563,7 @@ 
      */
     public function getQualifiedKeyName()
     {
-        return $this->getTable() . '.' . $this->getKeyName();
+        return $this->getTable().'.'.$this->getKeyName();
     }
 
     /**
@@ -644,7 +644,7 @@ 
      */
     public function getForeignKey()
     {
-        return snake_case(class_basename($this->getClass())) . '_id';
+        return snake_case(class_basename($this->getClass())).'_id';
     }
 
     /**
@@ -667,7 +667,7 @@ 
 
         $localKey = $localKey ?: $this->getKeyName();
 
-        return new HasOne($relatedMapper, $entity, $relatedMap->getTable() . '.' . $foreignKey, $localKey);
+        return new HasOne($relatedMapper, $entity, $relatedMap->getTable().'.'.$foreignKey, $localKey);
     }
 
     /**
@@ -692,7 +692,7 @@ 
 
         $table = $relatedMapper->getEntityMap()->getTable();
         
-        return new MorphOne($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
+        return new MorphOne($relatedMapper, $entity, $table.'.'.$type, $table.'.'.$id, $localKey);
     }
 
     /**
@@ -721,7 +721,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';
         }
 
         $relatedMapper = $this->manager->mapper($related);
@@ -798,7 +798,7 @@ 
 
         $relatedMapper = $this->manager->mapper($related);
 
-        $table = $relatedMapper->getEntityMap()->getTable() . '.' . $foreignKey;
+        $table = $relatedMapper->getEntityMap()->getTable().'.'.$foreignKey;
 
         $localKey = $localKey ?: $this->getKeyName();
 
@@ -856,7 +856,7 @@ 
 
         $localKey = $localKey ?: $this->getKeyName();
         
-        return new MorphMany($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
+        return new MorphMany($relatedMapper, $entity, $table.'.'.$type, $table.'.'.$id, $localKey);
     }
 
     /**
@@ -921,7 +921,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 = $this->manager->mapper($related);
 
@@ -951,7 +951,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);
     }
@@ -965,7 +965,7 @@ 
     {
         $self = __FUNCTION__;
 
-        $caller = array_first(debug_backtrace(false), function ($key, $trace) use ($self) {
+        $caller = array_first(debug_backtrace(false), function($key, $trace) use ($self) {
             $caller = $trace['function'];
 
             return (!in_array($caller, EntityMap::$manyMethods) && $caller != $self);
@@ -1009,9 +1009,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];
     }
@@ -1176,7 +1176,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.

Doc Comments +4 added lines, -4 removed lines

@@ -777,7 +777,7 @@ 
     /**
      * Define a polymorphic one-to-one relationship.
      *
-     * @param  mixed       $entity
+     * @param  \AnalogueTest\App\Avatar       $entity
      * @param  string      $related
      * @param  string      $name
      * @param  string|null $type
@@ -838,7 +838,7 @@ 
     /**
      * Define a polymorphic, inverse one-to-one or many relationship.
      *
-     * @param  mixed       $entity
+     * @param  \AnalogueTest\App\Image       $entity
      * @param  string|null $name
      * @param  string|null $type
      * @param  string|null $id
@@ -940,7 +940,7 @@ 
     /**
      * Define a polymorphic one-to-many relationship.
      *
-     * @param  mixed       $entity
+     * @param  \AnalogueTest\App\Resource       $entity
      * @param  string      $related
      * @param  string      $name
      * @param  string|null $type
@@ -1040,7 +1040,7 @@ 
     /**
      * Define a polymorphic, inverse many-to-many relationship.
      *
-     * @param  mixed       $entity
+     * @param  \AnalogueTest\App\Resource       $entity
      * @param  string      $related
      * @param  string      $name
      * @param  string|null $table

Indentation +1268 added lines, -1268 removed lines

@@ -23,1272 +23,1272 @@
  */
 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 property that should
-     * contain the attributes, when $mapToProperties is false
-     * 
-     * @var string
-     */
-    protected $arrayName = 'attributes';
-
-    /**
-     * Array containing a list of class attributes. Mandatory if the
-     * mapped entity is a Plain PHP Object.
-     *
-     * @var array
-     */
-    protected $attributes = [];
-
-    /**
-     * Indicate if the entity's attributes should be mapped to the object's
-     * properties. If set to false, attributes will be assigned to an array
-     * defined by the $arrayName property of the EntityMap
-     * 
-     * @var boolean
-     */
-    protected $mapToProperties = false;
-
-    /**
-     * Attributes that should be casted to a specific type, like a Carbon date
-     * JSON, or a custom Value Object
-     * 
-     * @var array
-     */
-    protected $casts = [];
-
-    /**
-     * The Custom Domain Class to use with this mapping
-     *
-     * @var string|null
-     */
-    protected $class = null;
-
-    /**
-     * Attributes that should be treated as Value Objects
-     *
-     * @deprecated 5.3 use $casts property instead
-     * 
-     * @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 = [];
-
-    /**
-     * 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 = [];
-
-    /**
-     * 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 many to many relationship methods.
-     *
-     * @var array
-     */
-    protected static $manyMethods = ['belongsToMany', 'morphToMany', 'morphedByMany'];
-
-    /**
-     * The 'Many' relationships classes, which related Entity attribute should be
-     * an array/entityCollection
-     *
-     * @var array
-     */
-    protected static $manyClasses = ['BelongsToMany', 'HasMany', 'HasManyThrough', 'MorphMany', 'MorphToMany'];
-
-    /**
-     * The 'Single' relationships classes, which related Entity attribute should be
-     * another Entity.
-     *
-     * @var array
-     */
-    protected static $singleClasses = ['BelongsTo', 'HasOne', 'MorphOne', 'MorphTo'];
-
-    /**
-     * Relationships with a pivot record
-     *
-     * @var array
-     */
-    protected static $pivotClasses = ['BelongsToMany', 'MorphToMany'];
-
-    /**
-     * Relationships on which key is stored in the Entity itself
-     *
-     * @var array
-     */
-    protected static $localClasses = ['BelongsTo', 'MorphTo'];
-
-    /**
-     * Relationships on which key is stored in the related Entity record or in a pivot record
-     *
-     * @var array
-     */
-    protected static $foreignClasses = [
-        'BelongsToMany',
-        'HasMany',
-        'HasManyThrough',
-        'MorphMany',
-        'MorphToMany',
-        'HasOne',
-        'MorphOne',
-    ];
-
-    /**
-     * The date format to use with the current database connection
-     *
-     * @var string
-     */
-    protected $dateFormat;
-
-    /**
-     * The Analogue's manager instance.
-     *
-     * @var \Analogue\ORM\System\Manager
-     */
-    private $manager;
-
-    /**
-     * 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 = [];
-
-    /**
-     * Set the Manager that will be used for relationship's mapper instantiations.
-     *
-     * @param Manager $manager
-     */
-    public function setManager(Manager $manager)
-    {
-        $this->manager = $manager;
-    }
-
-    /**
-     * Return Domain class attributes, useful when mapping to a Plain PHP Object
-     *
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * Set the domain class attributes
-     *
-     * @param array $attributeNames
-     */
-    public function setAttributes(array $attributeNames)
-    {
-        $this->attributes = $attributeNames;
-    }
-
-    /**
-     * Get all the attribute names for the class, including relationships, embeddables and primary key.
-     *
-     * @return array
-     */
-    public function getCompiledAttributes()
-    {
-        $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()
-    {
-        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()
-    {
-        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
-     */
-    public function getConnection()
-    {
-        return $this->connection;
-    }
-
-    /**
-     * Get the table associated with the entity.
-     *
-     * @return string
-     */
-    public function getTable()
-    {
-        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()
-    {
-        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()
-    {
-        return isset($this->class) ? $this->class : null;
-    }
-
-    /**
-     * Set the custom entity class
-     *
-     * @param string $class namespaced class name
-     */
-    public function setClass($class)
-    {
-        // Throw exception if class not exists
-
-        $this->class = $class;
-    }
-
-    /**
-     * Get the embedded Value Objects
-     *
-     * @return array
-     */
-    public function getEmbeddables()
-    {
-        return $this->embeddables;
-    }
-
-    /**
-     * 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()
-    {
-        return $this->relationships;
-    }
-
-    /**
-     * Relationships of the Entity type
-     *
-     * @return array
-     */
-    public function getSingleRelationships()
-    {
-        return $this->singleRelations;
-    }
-
-    /**
-     * Relationships of type Collection
-     *
-     * @return array
-     */
-    public function getManyRelationships()
-    {
-        return $this->manyRelations;
-    }
-
-    /**
-     * Relationships with foreign key in the mapped entity record.
-     *
-     * @return array
-     */
-    public function getLocalRelationships()
-    {
-        return $this->localRelations;
-    }
-
-    /**
-     * Relationships with foreign key in the related Entity record
-     *
-     * @return array
-     */
-    public function getForeignRelationships()
-    {
-        return $this->foreignRelations;
-    }
-
-    /**
-     * Relationships which keys are stored in a pivot record
-     *
-     * @return array
-     */
-    public function getPivotRelationships()
-    {
-        return $this->pivotRelations;
-    }
-
-    /**
-     * 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()
-    {
-        return array_keys($this->dynamicRelationships);
-    }
-
-    /**
-     * Get the relationships that have to be eager loaded
-     * on each request.
-     *
-     * @return array
-     */
-    public function getEagerloadedRelationships()
-    {
-        return $this->with;
-    }
-
-    /**
-     * Get the primary key for the entity.
-     *
-     * @return string
-     */
-    public function getKeyName()
-    {
-        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()
-    {
-        return $this->getTable() . '.' . $this->getKeyName();
-    }
-
-    /**
-     * Get the number of models to return per page.
-     *
-     * @return int
-     */
-    public function getPerPage()
-    {
-        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()
-    {
-        return $this->timestamps;
-    }
-
-    /**
-     * Determine if the entity uses soft deletes
-     *
-     * @return bool
-     */
-    public function usesSoftDeletes()
-    {
-        return $this->softDeletes;
-    }
-
-    /**
-     * Get the 'created_at' column name
-     *
-     * @return string
-     */
-    public function getCreatedAtColumn()
-    {
-        return $this->createdAtColumn;
-    }
-
-    /**
-     * Get the 'updated_at' column name
-     *
-     * @return string
-     */
-    public function getUpdatedAtColumn()
-    {
-        return $this->updatedAtColumn;
-    }
-
-    /**
-     * Get the deleted_at column
-     *
-     * @return string
-     */
-    public function getQualifiedDeletedAtColumn()
-    {
-        return $this->deletedAtColumn;
-    }
-
-    /**
-     * Get the default foreign key name for the model.
-     *
-     * @return string
-     */
-    public function getForeignKey()
-    {
-        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()
-    {
-        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()
-    {
-        return $this->discriminatorColumnMap;
-    }
-
-    /**
-     * Return true if the entity should be instanciated using
-     * the IoC Container
-     * 
-     * @return boolean
-     */
-    public function useDependencyInjection()
-    {
-        return $this->dependencyInjection;
-    }
-
-    /**
-     * Define a one-to-one relationship.
-     *
-     * @param         $entity
-     * @param  string $relatedClass entity class
-     * @param  string $foreignKey
-     * @param  string $localKey
-     * @throws MappingException
-     * @return \Analogue\ORM\Relationships\HasOne
-     */
-    public function hasOne($entity, $relatedClass, $foreignKey = null, $localKey = null)
-    {
-        $foreignKey = $foreignKey ?: $this->getForeignKey();
-
-        $relatedMapper = $this->manager->mapper($relatedClass);
-
-        $relatedMap = $relatedMapper->getEntityMap();
-
-        $localKey = $localKey ?: $this->getKeyName();
-
-        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 = $this->manager->mapper($related);
-
-        $table = $relatedMapper->getEntityMap()->getTable();
-
-        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, $relation = null)
-    {
-        // If no relation name was given, we will use this debug backtrace to extract
-        // the calling method's name and use that as the relationship name as most
-        // of the time this will be what we desire to use for the relationships.
-        if (is_null($relation)) {
-            list(, $caller) = debug_backtrace(false);
-
-            $relation = $caller['function'];
-        }
-
-        // 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';
-        }
-
-        $relatedMapper = $this->manager->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']);
-        }
-
-        list($type, $id) = $this->getMorphs($name, $type, $id);
-
-        $mapper = $this->manager->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 = $this->manager->getInverseMorphMap($class);
-            $relatedMapper = $this->manager->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 = $this->manager->mapper($related);
-
-        $table = $relatedMapper->getEntityMap()->getTable() . '.' . $foreignKey;
-
-        $localKey = $localKey ?: $this->getKeyName();
-
-        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 = $this->manager->mapper($related);
-
-        $throughMapper = $this->manager->mapper($through);
-
-
-        $firstKey = $firstKey ?: $this->getForeignKey();
-
-        $throughMap = $throughMapper->getEntityMap();
-
-        $secondKey = $secondKey ?: $throughMap->getForeignKey();
-
-        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 = $this->manager->mapper($related);
-
-        $table = $relatedMapper->getEntityMap()->getTable();
-
-        $localKey = $localKey ?: $this->getKeyName();
-
-        return new MorphMany($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
-    }
-
-    /**
-     * Define a many-to-many relationship.
-     *
-     * @param  mixed       $entity
-     * @param  string      $related
-     * @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, $relation = null)
-    {
-        // If no relationship name was passed, we will pull backtraces to get the
-        // name of the calling function. We will use that function name as the
-        // title of this relation since that is a great convention to apply.
-        if (is_null($relation)) {
-            $relation = $this->getBelongsToManyCaller();
-        }
-
-        // 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 = $this->manager->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)
-    {
-        $caller = $this->getBelongsToManyCaller();
-
-        // 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 = $this->manager->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)
-    {
-        $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 relationship name of the belongs to many.
-     *
-     * @return string
-     */
-    protected function getBelongsToManyCaller()
-    {
-        $self = __FUNCTION__;
-
-        $caller = array_first(debug_backtrace(false), function ($key, $trace) use ($self) {
-            $caller = $trace['function'];
-
-            return (!in_array($caller, EntityMap::$manyMethods) && $caller != $self);
-        });
-
-        return !is_null($caller) ? $caller['function'] : null;
-    }
-
-    /**
-     * 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 = $this->manager->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
-     *
-     * @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) {
-            $relationObject = $this->$relation($entity);
-
-            $class = class_basename(get_class($relationObject));
-
-            if (in_array($class, static::$singleClasses)) {
-                $this->singleRelations[] = $relation;
-            }
-
-            if (in_array($class, static::$manyClasses)) {
-                $this->manyRelations[] = $relation;
-            }
-
-            if (in_array($class, static::$localClasses)) {
-                $this->localRelations[] = $relation;
-            }
-
-            if (in_array($class, static::$foreignClasses)) {
-                $this->foreignRelations[] = $relation;
-            }
-
-            if (in_array($class, static::$pivotClasses)) {
-                $this->pivotRelations[] = $relation;
-            }
-        }
-    }
-
-    /**
-     * Override this method for custom entity instantiation
-     *
-     * @return null
-     */
-    public function activator()
-    {
-        return null;
-    }
-
-    /**
-     * Call dynamic relationship, if it exists
-     *
-     * @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]);
-    }
+	/**
+	 * 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 property that should
+	 * contain the attributes, when $mapToProperties is false
+	 * 
+	 * @var string
+	 */
+	protected $arrayName = 'attributes';
+
+	/**
+	 * Array containing a list of class attributes. Mandatory if the
+	 * mapped entity is a Plain PHP Object.
+	 *
+	 * @var array
+	 */
+	protected $attributes = [];
+
+	/**
+	 * Indicate if the entity's attributes should be mapped to the object's
+	 * properties. If set to false, attributes will be assigned to an array
+	 * defined by the $arrayName property of the EntityMap
+	 * 
+	 * @var boolean
+	 */
+	protected $mapToProperties = false;
+
+	/**
+	 * Attributes that should be casted to a specific type, like a Carbon date
+	 * JSON, or a custom Value Object
+	 * 
+	 * @var array
+	 */
+	protected $casts = [];
+
+	/**
+	 * The Custom Domain Class to use with this mapping
+	 *
+	 * @var string|null
+	 */
+	protected $class = null;
+
+	/**
+	 * Attributes that should be treated as Value Objects
+	 *
+	 * @deprecated 5.3 use $casts property instead
+	 * 
+	 * @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 = [];
+
+	/**
+	 * 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 = [];
+
+	/**
+	 * 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 many to many relationship methods.
+	 *
+	 * @var array
+	 */
+	protected static $manyMethods = ['belongsToMany', 'morphToMany', 'morphedByMany'];
+
+	/**
+	 * The 'Many' relationships classes, which related Entity attribute should be
+	 * an array/entityCollection
+	 *
+	 * @var array
+	 */
+	protected static $manyClasses = ['BelongsToMany', 'HasMany', 'HasManyThrough', 'MorphMany', 'MorphToMany'];
+
+	/**
+	 * The 'Single' relationships classes, which related Entity attribute should be
+	 * another Entity.
+	 *
+	 * @var array
+	 */
+	protected static $singleClasses = ['BelongsTo', 'HasOne', 'MorphOne', 'MorphTo'];
+
+	/**
+	 * Relationships with a pivot record
+	 *
+	 * @var array
+	 */
+	protected static $pivotClasses = ['BelongsToMany', 'MorphToMany'];
+
+	/**
+	 * Relationships on which key is stored in the Entity itself
+	 *
+	 * @var array
+	 */
+	protected static $localClasses = ['BelongsTo', 'MorphTo'];
+
+	/**
+	 * Relationships on which key is stored in the related Entity record or in a pivot record
+	 *
+	 * @var array
+	 */
+	protected static $foreignClasses = [
+		'BelongsToMany',
+		'HasMany',
+		'HasManyThrough',
+		'MorphMany',
+		'MorphToMany',
+		'HasOne',
+		'MorphOne',
+	];
+
+	/**
+	 * The date format to use with the current database connection
+	 *
+	 * @var string
+	 */
+	protected $dateFormat;
+
+	/**
+	 * The Analogue's manager instance.
+	 *
+	 * @var \Analogue\ORM\System\Manager
+	 */
+	private $manager;
+
+	/**
+	 * 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 = [];
+
+	/**
+	 * Set the Manager that will be used for relationship's mapper instantiations.
+	 *
+	 * @param Manager $manager
+	 */
+	public function setManager(Manager $manager)
+	{
+		$this->manager = $manager;
+	}
+
+	/**
+	 * Return Domain class attributes, useful when mapping to a Plain PHP Object
+	 *
+	 * @return array
+	 */
+	public function getAttributes()
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * Set the domain class attributes
+	 *
+	 * @param array $attributeNames
+	 */
+	public function setAttributes(array $attributeNames)
+	{
+		$this->attributes = $attributeNames;
+	}
+
+	/**
+	 * Get all the attribute names for the class, including relationships, embeddables and primary key.
+	 *
+	 * @return array
+	 */
+	public function getCompiledAttributes()
+	{
+		$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()
+	{
+		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()
+	{
+		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
+	 */
+	public function getConnection()
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * Get the table associated with the entity.
+	 *
+	 * @return string
+	 */
+	public function getTable()
+	{
+		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()
+	{
+		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()
+	{
+		return isset($this->class) ? $this->class : null;
+	}
+
+	/**
+	 * Set the custom entity class
+	 *
+	 * @param string $class namespaced class name
+	 */
+	public function setClass($class)
+	{
+		// Throw exception if class not exists
+
+		$this->class = $class;
+	}
+
+	/**
+	 * Get the embedded Value Objects
+	 *
+	 * @return array
+	 */
+	public function getEmbeddables()
+	{
+		return $this->embeddables;
+	}
+
+	/**
+	 * 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()
+	{
+		return $this->relationships;
+	}
+
+	/**
+	 * Relationships of the Entity type
+	 *
+	 * @return array
+	 */
+	public function getSingleRelationships()
+	{
+		return $this->singleRelations;
+	}
+
+	/**
+	 * Relationships of type Collection
+	 *
+	 * @return array
+	 */
+	public function getManyRelationships()
+	{
+		return $this->manyRelations;
+	}
+
+	/**
+	 * Relationships with foreign key in the mapped entity record.
+	 *
+	 * @return array
+	 */
+	public function getLocalRelationships()
+	{
+		return $this->localRelations;
+	}
+
+	/**
+	 * Relationships with foreign key in the related Entity record
+	 *
+	 * @return array
+	 */
+	public function getForeignRelationships()
+	{
+		return $this->foreignRelations;
+	}
+
+	/**
+	 * Relationships which keys are stored in a pivot record
+	 *
+	 * @return array
+	 */
+	public function getPivotRelationships()
+	{
+		return $this->pivotRelations;
+	}
+
+	/**
+	 * 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()
+	{
+		return array_keys($this->dynamicRelationships);
+	}
+
+	/**
+	 * Get the relationships that have to be eager loaded
+	 * on each request.
+	 *
+	 * @return array
+	 */
+	public function getEagerloadedRelationships()
+	{
+		return $this->with;
+	}
+
+	/**
+	 * Get the primary key for the entity.
+	 *
+	 * @return string
+	 */
+	public function getKeyName()
+	{
+		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()
+	{
+		return $this->getTable() . '.' . $this->getKeyName();
+	}
+
+	/**
+	 * Get the number of models to return per page.
+	 *
+	 * @return int
+	 */
+	public function getPerPage()
+	{
+		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()
+	{
+		return $this->timestamps;
+	}
+
+	/**
+	 * Determine if the entity uses soft deletes
+	 *
+	 * @return bool
+	 */
+	public function usesSoftDeletes()
+	{
+		return $this->softDeletes;
+	}
+
+	/**
+	 * Get the 'created_at' column name
+	 *
+	 * @return string
+	 */
+	public function getCreatedAtColumn()
+	{
+		return $this->createdAtColumn;
+	}
+
+	/**
+	 * Get the 'updated_at' column name
+	 *
+	 * @return string
+	 */
+	public function getUpdatedAtColumn()
+	{
+		return $this->updatedAtColumn;
+	}
+
+	/**
+	 * Get the deleted_at column
+	 *
+	 * @return string
+	 */
+	public function getQualifiedDeletedAtColumn()
+	{
+		return $this->deletedAtColumn;
+	}
+
+	/**
+	 * Get the default foreign key name for the model.
+	 *
+	 * @return string
+	 */
+	public function getForeignKey()
+	{
+		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()
+	{
+		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()
+	{
+		return $this->discriminatorColumnMap;
+	}
+
+	/**
+	 * Return true if the entity should be instanciated using
+	 * the IoC Container
+	 * 
+	 * @return boolean
+	 */
+	public function useDependencyInjection()
+	{
+		return $this->dependencyInjection;
+	}
+
+	/**
+	 * Define a one-to-one relationship.
+	 *
+	 * @param         $entity
+	 * @param  string $relatedClass entity class
+	 * @param  string $foreignKey
+	 * @param  string $localKey
+	 * @throws MappingException
+	 * @return \Analogue\ORM\Relationships\HasOne
+	 */
+	public function hasOne($entity, $relatedClass, $foreignKey = null, $localKey = null)
+	{
+		$foreignKey = $foreignKey ?: $this->getForeignKey();
+
+		$relatedMapper = $this->manager->mapper($relatedClass);
+
+		$relatedMap = $relatedMapper->getEntityMap();
+
+		$localKey = $localKey ?: $this->getKeyName();
+
+		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 = $this->manager->mapper($related);
+
+		$table = $relatedMapper->getEntityMap()->getTable();
+
+		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, $relation = null)
+	{
+		// If no relation name was given, we will use this debug backtrace to extract
+		// the calling method's name and use that as the relationship name as most
+		// of the time this will be what we desire to use for the relationships.
+		if (is_null($relation)) {
+			list(, $caller) = debug_backtrace(false);
+
+			$relation = $caller['function'];
+		}
+
+		// 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';
+		}
+
+		$relatedMapper = $this->manager->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']);
+		}
+
+		list($type, $id) = $this->getMorphs($name, $type, $id);
+
+		$mapper = $this->manager->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 = $this->manager->getInverseMorphMap($class);
+			$relatedMapper = $this->manager->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 = $this->manager->mapper($related);
+
+		$table = $relatedMapper->getEntityMap()->getTable() . '.' . $foreignKey;
+
+		$localKey = $localKey ?: $this->getKeyName();
+
+		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 = $this->manager->mapper($related);
+
+		$throughMapper = $this->manager->mapper($through);
+
+
+		$firstKey = $firstKey ?: $this->getForeignKey();
+
+		$throughMap = $throughMapper->getEntityMap();
+
+		$secondKey = $secondKey ?: $throughMap->getForeignKey();
+
+		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 = $this->manager->mapper($related);
+
+		$table = $relatedMapper->getEntityMap()->getTable();
+
+		$localKey = $localKey ?: $this->getKeyName();
+
+		return new MorphMany($relatedMapper, $entity, $table . '.' . $type, $table . '.' . $id, $localKey);
+	}
+
+	/**
+	 * Define a many-to-many relationship.
+	 *
+	 * @param  mixed       $entity
+	 * @param  string      $related
+	 * @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, $relation = null)
+	{
+		// If no relationship name was passed, we will pull backtraces to get the
+		// name of the calling function. We will use that function name as the
+		// title of this relation since that is a great convention to apply.
+		if (is_null($relation)) {
+			$relation = $this->getBelongsToManyCaller();
+		}
+
+		// 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 = $this->manager->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)
+	{
+		$caller = $this->getBelongsToManyCaller();
+
+		// 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 = $this->manager->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)
+	{
+		$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 relationship name of the belongs to many.
+	 *
+	 * @return string
+	 */
+	protected function getBelongsToManyCaller()
+	{
+		$self = __FUNCTION__;
+
+		$caller = array_first(debug_backtrace(false), function ($key, $trace) use ($self) {
+			$caller = $trace['function'];
+
+			return (!in_array($caller, EntityMap::$manyMethods) && $caller != $self);
+		});
+
+		return !is_null($caller) ? $caller['function'] : null;
+	}
+
+	/**
+	 * 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 = $this->manager->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
+	 *
+	 * @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) {
+			$relationObject = $this->$relation($entity);
+
+			$class = class_basename(get_class($relationObject));
+
+			if (in_array($class, static::$singleClasses)) {
+				$this->singleRelations[] = $relation;
+			}
+
+			if (in_array($class, static::$manyClasses)) {
+				$this->manyRelations[] = $relation;
+			}
+
+			if (in_array($class, static::$localClasses)) {
+				$this->localRelations[] = $relation;
+			}
+
+			if (in_array($class, static::$foreignClasses)) {
+				$this->foreignRelations[] = $relation;
+			}
+
+			if (in_array($class, static::$pivotClasses)) {
+				$this->pivotRelations[] = $relation;
+			}
+		}
+	}
+
+	/**
+	 * Override this method for custom entity instantiation
+	 *
+	 * @return null
+	 */
+	public function activator()
+	{
+		return null;
+	}
+
+	/**
+	 * Call dynamic relationship, if it exists
+	 *
+	 * @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]);
+	}
 }

src/System/ScopeInterface.php

Indentation +14 added lines, -14 removed lines

@@ -4,19 +4,19 @@
 
 interface ScopeInterface
 {
-    /**
-     * Apply the scope to a given Query builder.
-     *
-     * @param  \Analogue\ORM\System\Query $builder
-     * @return void
-     */
-    public function apply(Query $builder);
+	/**
+	 * Apply the scope to a given Query builder.
+	 *
+	 * @param  \Analogue\ORM\System\Query $builder
+	 * @return void
+	 */
+	public function apply(Query $builder);
 
-    /**
-     * Remove the scope from the Query builder.
-     *
-     * @param  \Analogue\ORM\System\Query $builder
-     * @return void
-     */
-    public function remove(Query $builder);
+	/**
+	 * Remove the scope from the Query builder.
+	 *
+	 * @param  \Analogue\ORM\System\Query $builder
+	 * @return void
+	 */
+	public function remove(Query $builder);
 }

src/System/CachedRelationship.php

Indentation +58 added lines, -58 removed lines

@@ -8,68 +8,68 @@
  */
 class CachedRelationship
 {
-    /**
-     * The Hash of the related entity
-     *
-     * @var string
-     */
-    protected $hash;
+	/**
+	 * The Hash of the related entity
+	 *
+	 * @var string
+	 */
+	protected $hash;
 
-    /**
-     * Pivot attributes, if any
-     *
-     * @var array
-     */
-    protected $pivotAttributes;
+	/**
+	 * Pivot attributes, if any
+	 *
+	 * @var array
+	 */
+	protected $pivotAttributes;
 
-    /**
-     * CachedRelationship constructor.
-     * @param $hash
-     * @param array $pivotAttributes
-     */
-    public function __construct($hash, $pivotAttributes = [])
-    {
-        $this->hash = $hash;
-        $this->pivotAttributes = $pivotAttributes;
-    }
+	/**
+	 * CachedRelationship constructor.
+	 * @param $hash
+	 * @param array $pivotAttributes
+	 */
+	public function __construct($hash, $pivotAttributes = [])
+	{
+		$this->hash = $hash;
+		$this->pivotAttributes = $pivotAttributes;
+	}
 
-    /**
-     * Return true if any pivot attributes are present
-     *
-     * @return boolean
-     */
-    public function hasPivotAttributes()
-    {
-        return count($this->pivotAttributes) > 0;
-    }
+	/**
+	 * Return true if any pivot attributes are present
+	 *
+	 * @return boolean
+	 */
+	public function hasPivotAttributes()
+	{
+		return count($this->pivotAttributes) > 0;
+	}
 
-    /**
-     * Returns the hash of the related entity
-     *
-     * @return string
-     */
-    public function getHash()
-    {
-        return $this->hash;
-    }
+	/**
+	 * Returns the hash of the related entity
+	 *
+	 * @return string
+	 */
+	public function getHash()
+	{
+		return $this->hash;
+	}
 
-    /**
-     * Get the cached values for the pivot attributes
-     *
-     * @return array
-     */
-    public function getPivotAttributes()
-    {
-        return $this->pivotAttributes;
-    }
+	/**
+	 * Get the cached values for the pivot attributes
+	 *
+	 * @return array
+	 */
+	public function getPivotAttributes()
+	{
+		return $this->pivotAttributes;
+	}
 
-    /**
-     * Access to the hash for fast cache comparison
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->hash;
-    }
+	/**
+	 * Access to the hash for fast cache comparison
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->hash;
+	}
 }