analogueorm / analogue

src/Drivers/DBAdapter.php

Indentation +39 added lines, -39 removed lines

@@ -4,48 +4,48 @@
 
 interface DBAdapter
 {
-    /**
-     * Return's Driver specific Query Implementation.
-     *
-     * @return \Illuminate\Database\Query\Builder
-     */
-    public function getQuery();
+	/**
+	 * Return's Driver specific Query Implementation.
+	 *
+	 * @return \Illuminate\Database\Query\Builder
+	 */
+	public function getQuery();
 
-    /**
-     * Return the Date format used on this adapter.
-     *
-     * @return string
-     */
-    public function getDateFormat(): string;
+	/**
+	 * Return the Date format used on this adapter.
+	 *
+	 * @return string
+	 */
+	public function getDateFormat(): string;
 
-    /**
-     * Start a DB transaction on driver that supports it.
-     *
-     * @return void
-     */
-    public function beginTransaction();
+	/**
+	 * Start a DB transaction on driver that supports it.
+	 *
+	 * @return void
+	 */
+	public function beginTransaction();
 
-    /**
-     * Commit a DB transaction on driver that supports it.
-     *
-     * @return void
-     */
-    public function commit();
+	/**
+	 * Commit a DB transaction on driver that supports it.
+	 *
+	 * @return void
+	 */
+	public function commit();
 
-    /**
-     * Rollback a DB transaction on driver that supports it.
-     *
-     * @return void
-     */
-    public function rollback();
+	/**
+	 * Rollback a DB transaction on driver that supports it.
+	 *
+	 * @return void
+	 */
+	public function rollback();
 
-    /**
-     * Parse result from database and return an array of results
-     * casted to analogue compatible values.
-     *
-     * @param array $rows
-     *
-     * @return array
-     */
-    public function fromDatabase(array $rows): array;
+	/**
+	 * Parse result from database and return an array of results
+	 * casted to analogue compatible values.
+	 *
+	 * @param array $rows
+	 *
+	 * @return array
+	 */
+	public function fromDatabase(array $rows): array;
 }

src/Drivers/IlluminateDriver.php

Indentation +30 added lines, -30 removed lines

@@ -4,38 +4,38 @@
 
 class IlluminateDriver implements DriverInterface
 {
-    /**
-     * The Illuminate Connection Provider.
-     *
-     * @var CapsuleConnectionProvider|IlluminateConnectionProvider
-     */
-    protected $connectionProvider;
+	/**
+	 * The Illuminate Connection Provider.
+	 *
+	 * @var CapsuleConnectionProvider|IlluminateConnectionProvider
+	 */
+	protected $connectionProvider;
 
-    /**
-     * IlluminateDriver constructor.
-     *
-     * @param $connectionProvider
-     */
-    public function __construct($connectionProvider)
-    {
-        $this->connectionProvider = $connectionProvider;
-    }
+	/**
+	 * IlluminateDriver constructor.
+	 *
+	 * @param $connectionProvider
+	 */
+	public function __construct($connectionProvider)
+	{
+		$this->connectionProvider = $connectionProvider;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName(): string
-    {
-        return 'illuminate';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getName(): string
+	{
+		return 'illuminate';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAdapter(string $connection = null): DBAdapter
-    {
-        $connection = $this->connectionProvider->connection($connection);
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAdapter(string $connection = null): DBAdapter
+	{
+		$connection = $this->connectionProvider->connection($connection);
 
-        return new IlluminateDBAdapter($connection);
-    }
+		return new IlluminateDBAdapter($connection);
+	}
 }

src/Drivers/Manager.php

Indentation +31 added lines, -31 removed lines

@@ -4,37 +4,37 @@
 
 class Manager
 {
-    /**
-     * Drivers.
-     *
-     * @var DriverInterface[]
-     */
-    protected $drivers = [];
+	/**
+	 * Drivers.
+	 *
+	 * @var DriverInterface[]
+	 */
+	protected $drivers = [];
 
-    /**
-     * Add a Mapping Driver.
-     *
-     * @param DriverInterface $driver
-     *
-     * @return void
-     */
-    public function addDriver(DriverInterface $driver)
-    {
-        $this->drivers[$driver->getName()] = $driver;
-    }
+	/**
+	 * Add a Mapping Driver.
+	 *
+	 * @param DriverInterface $driver
+	 *
+	 * @return void
+	 */
+	public function addDriver(DriverInterface $driver)
+	{
+		$this->drivers[$driver->getName()] = $driver;
+	}
 
-    /**
-     * Get the DBAdapter.
-     *
-     * @param string $driver
-     * @param string $connection connection name for drivers supporting multiple connection.
-     *
-     * @return DBAdapter
-     */
-    public function getAdapter(string $driver, string $connection = null)
-    {
-        if (array_key_exists($driver, $this->drivers)) {
-            return $this->drivers[$driver]->getAdapter($connection);
-        }
-    }
+	/**
+	 * Get the DBAdapter.
+	 *
+	 * @param string $driver
+	 * @param string $connection connection name for drivers supporting multiple connection.
+	 *
+	 * @return DBAdapter
+	 */
+	public function getAdapter(string $driver, string $connection = null)
+	{
+		if (array_key_exists($driver, $this->drivers)) {
+			return $this->drivers[$driver]->getAdapter($connection);
+		}
+	}
 }

src/Relationships/Pivot.php

Indentation +158 added lines, -158 removed lines

@@ -6,162 +6,162 @@
 
 class Pivot extends Entity
 {
-    /**
-     * @var bool
-     */
-    protected $exists;
-
-    /**
-     * Pivot's table.
-     *
-     * @var string
-     */
-    protected $table;
-
-    /**
-     * The parent entity of the relationship.
-     *
-     * @var object
-     */
-    protected $parent;
-
-    /**
-     * The parent entity of the relationship.
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $parentMap;
-
-    /**
-     * We may define a pivot mapping to deal with
-     * soft deletes, timestamps, etc.
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $pivotMap;
-
-    /**
-     * The name of the foreign key column.
-     *
-     * @var string
-     */
-    protected $foreignKey;
-
-    /**
-     * The name of the "other key" column.
-     *
-     * @var string
-     */
-    protected $otherKey;
-
-    /**
-     * The attributes that aren't mass assignable.
-     *
-     * @var array
-     */
-    protected $guarded = [];
-
-    /**
-     * Pivot uses timestamps ?
-     *
-     * @var bool
-     */
-    protected $timestamps;
-
-    /**
-     * Create a new pivot model instance.
-     *
-     * @param \Analogue\ORM\System\InternallyMappable $parent
-     * @param \Analogue\ORM\EntityMap                 $parentMap
-     * @param array                                   $attributes
-     * @param string                                  $table
-     * @param bool                                    $exists
-     */
-    public function __construct($parent, $parentMap, $attributes, $table, $exists = false)
-    {
-        // The pivot model is a "dynamic" model since we will set the tables dynamically
-        // for the instance. This allows it work for any intermediate tables for the
-        // many to many relationship that are defined by this developer's classes.
-        $this->setEntityAttributes($attributes);
-
-        $this->table = $table;
-
-        // We store off the parent instance so we will access the timestamp column names
-        // for the model, since the pivot model timestamps aren't easily configurable
-        // from the developer's point of view. We can use the parents to get these.
-        $this->parent = $parent;
-
-        $this->parentMap = $parentMap;
-
-        $this->exists = $exists;
-
-        $this->timestamps = $this->hasTimestampAttributes();
-    }
-
-    /**
-     * Get the foreign key column name.
-     *
-     * @return string
-     */
-    public function getForeignKey()
-    {
-        return $this->foreignKey;
-    }
-
-    /**
-     * Get the "other key" column name.
-     *
-     * @return string
-     */
-    public function getOtherKey()
-    {
-        return $this->otherKey;
-    }
-
-    /**
-     * Set the key names for the pivot model instance.
-     *
-     * @param string $foreignKey
-     * @param string $otherKey
-     *
-     * @return $this
-     */
-    public function setPivotKeys($foreignKey, $otherKey)
-    {
-        $this->foreignKey = $foreignKey;
-
-        $this->otherKey = $otherKey;
-
-        return $this;
-    }
-
-    /**
-     * Determine if the pivot model has timestamp attributes.
-     *
-     * @return bool
-     */
-    public function hasTimestampAttributes()
-    {
-        return array_key_exists($this->getCreatedAtColumn(), $this->attributes);
-    }
-
-    /**
-     * Get the name of the "created at" column.
-     *
-     * @return string
-     */
-    public function getCreatedAtColumn()
-    {
-        return $this->parentMap->getCreatedAtColumn();
-    }
-
-    /**
-     * Get the name of the "updated at" column.
-     *
-     * @return string
-     */
-    public function getUpdatedAtColumn()
-    {
-        return $this->parentMap->getUpdatedAtColumn();
-    }
+	/**
+	 * @var bool
+	 */
+	protected $exists;
+
+	/**
+	 * Pivot's table.
+	 *
+	 * @var string
+	 */
+	protected $table;
+
+	/**
+	 * The parent entity of the relationship.
+	 *
+	 * @var object
+	 */
+	protected $parent;
+
+	/**
+	 * The parent entity of the relationship.
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $parentMap;
+
+	/**
+	 * We may define a pivot mapping to deal with
+	 * soft deletes, timestamps, etc.
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $pivotMap;
+
+	/**
+	 * The name of the foreign key column.
+	 *
+	 * @var string
+	 */
+	protected $foreignKey;
+
+	/**
+	 * The name of the "other key" column.
+	 *
+	 * @var string
+	 */
+	protected $otherKey;
+
+	/**
+	 * The attributes that aren't mass assignable.
+	 *
+	 * @var array
+	 */
+	protected $guarded = [];
+
+	/**
+	 * Pivot uses timestamps ?
+	 *
+	 * @var bool
+	 */
+	protected $timestamps;
+
+	/**
+	 * Create a new pivot model instance.
+	 *
+	 * @param \Analogue\ORM\System\InternallyMappable $parent
+	 * @param \Analogue\ORM\EntityMap                 $parentMap
+	 * @param array                                   $attributes
+	 * @param string                                  $table
+	 * @param bool                                    $exists
+	 */
+	public function __construct($parent, $parentMap, $attributes, $table, $exists = false)
+	{
+		// The pivot model is a "dynamic" model since we will set the tables dynamically
+		// for the instance. This allows it work for any intermediate tables for the
+		// many to many relationship that are defined by this developer's classes.
+		$this->setEntityAttributes($attributes);
+
+		$this->table = $table;
+
+		// We store off the parent instance so we will access the timestamp column names
+		// for the model, since the pivot model timestamps aren't easily configurable
+		// from the developer's point of view. We can use the parents to get these.
+		$this->parent = $parent;
+
+		$this->parentMap = $parentMap;
+
+		$this->exists = $exists;
+
+		$this->timestamps = $this->hasTimestampAttributes();
+	}
+
+	/**
+	 * Get the foreign key column name.
+	 *
+	 * @return string
+	 */
+	public function getForeignKey()
+	{
+		return $this->foreignKey;
+	}
+
+	/**
+	 * Get the "other key" column name.
+	 *
+	 * @return string
+	 */
+	public function getOtherKey()
+	{
+		return $this->otherKey;
+	}
+
+	/**
+	 * Set the key names for the pivot model instance.
+	 *
+	 * @param string $foreignKey
+	 * @param string $otherKey
+	 *
+	 * @return $this
+	 */
+	public function setPivotKeys($foreignKey, $otherKey)
+	{
+		$this->foreignKey = $foreignKey;
+
+		$this->otherKey = $otherKey;
+
+		return $this;
+	}
+
+	/**
+	 * Determine if the pivot model has timestamp attributes.
+	 *
+	 * @return bool
+	 */
+	public function hasTimestampAttributes()
+	{
+		return array_key_exists($this->getCreatedAtColumn(), $this->attributes);
+	}
+
+	/**
+	 * Get the name of the "created at" column.
+	 *
+	 * @return string
+	 */
+	public function getCreatedAtColumn()
+	{
+		return $this->parentMap->getCreatedAtColumn();
+	}
+
+	/**
+	 * Get the name of the "updated at" column.
+	 *
+	 * @return string
+	 */
+	public function getUpdatedAtColumn()
+	{
+		return $this->parentMap->getUpdatedAtColumn();
+	}
 }

src/Relationships/HasMany.php

Indentation +25 added lines, -25 removed lines

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

src/Relationships/EmbedsMany.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      */
     protected function buildEmbeddedCollection(array $rows): Collection
     {
-        return collect($rows)->map(function ($attributes) {
+        return collect($rows)->map(function($attributes) {
             return $this->buildEmbeddedObject($attributes);
         });
     }

Indentation +120 added lines, -120 removed lines

@@ -7,124 +7,124 @@
 
 class EmbedsMany extends EmbedsOne
 {
-    /**
-     * Match a single database row's attributes to a single
-     * object, and return the updated attributes.
-     *
-     * @param array $attributes
-     *
-     * @throws MappingException
-     *
-     * @return array
-     */
-    public function matchSingleResult(array $attributes) : array
-    {
-        $column = $this->relation;
-
-        if (!$this->asArray) {
-            throw new MappingException("column '$column' should be of type array or json");
-        }
-
-        return $this->matchAsArray($attributes);
-    }
-
-    /**
-     * Match array attribute from parent to an embedded object,
-     * and return the updated attributes.
-     *
-     * @param array $attributes
-     *
-     * @throws MappingException
-     *
-     * @return array
-     */
-    protected function matchAsArray(array $attributes) : array
-    {
-        // Extract the attributes with the key of the relation,
-        // which should be an array.
-        $key = $this->relation;
-
-        if (!array_key_exists($key, $attributes)) {
-            $attributes[$key] = $this->asJson ? json_encode([]) : [];
-        }
-
-        if ($this->asJson) {
-            $attributes[$key] = json_decode($attributes[$key], true);
-        }
-
-        if (!is_array($attributes[$key])) {
-            throw new MappingException("'$key' column should be an array, actual :".$attributes[$key]);
-        }
-
-        $attributes[$key] = $this->buildEmbeddedCollection($attributes[$key]);
-
-        return $attributes;
-    }
-
-    /**
-     * Build an embedded collection and returns it.
-     *
-     * @param array $rows
-     *
-     * @return Collection
-     */
-    protected function buildEmbeddedCollection(array $rows): Collection
-    {
-        return collect($rows)->map(function ($attributes) {
-            return $this->buildEmbeddedObject($attributes);
-        });
-    }
-
-    /**
-     * Transform embedded object into db column(s).
-     *
-     * @param mixed $objects
-     *
-     * @throws MappingException
-     *
-     * @return array $columns
-     */
-    public function normalize($objects) : array
-    {
-        if (!$this->asArray) {
-            throw new MappingException('Cannot normalize an embedsMany relation as row columns');
-        }
-
-        return $this->normalizeAsArray($objects);
-    }
-
-    /**
-     * Normalize object as array containing raw attributes.
-     *
-     * @param mixed $objects
-     *
-     * @throws MappingException
-     *
-     * @return array
-     */
-    protected function normalizeAsArray($objects) : array
-    {
-        $key = $this->relation;
-
-        if (!is_array($objects) && !$objects instanceof Collection) {
-            throw new MappingException("column '$key' should be of type array or collection");
-        }
-
-        if ($objects instanceof Collection) {
-            $objects = $objects->all();
-        }
-
-        $normalizedObjects = [];
-
-        foreach ($objects as $object) {
-            $wrapper = $this->factory->make($object);
-            $normalizedObjects[] = $wrapper->getEntityAttributes();
-        }
-
-        if ($this->asJson) {
-            $normalizedObjects = json_encode($normalizedObjects);
-        }
-
-        return [$key => $normalizedObjects];
-    }
+	/**
+	 * Match a single database row's attributes to a single
+	 * object, and return the updated attributes.
+	 *
+	 * @param array $attributes
+	 *
+	 * @throws MappingException
+	 *
+	 * @return array
+	 */
+	public function matchSingleResult(array $attributes) : array
+	{
+		$column = $this->relation;
+
+		if (!$this->asArray) {
+			throw new MappingException("column '$column' should be of type array or json");
+		}
+
+		return $this->matchAsArray($attributes);
+	}
+
+	/**
+	 * Match array attribute from parent to an embedded object,
+	 * and return the updated attributes.
+	 *
+	 * @param array $attributes
+	 *
+	 * @throws MappingException
+	 *
+	 * @return array
+	 */
+	protected function matchAsArray(array $attributes) : array
+	{
+		// Extract the attributes with the key of the relation,
+		// which should be an array.
+		$key = $this->relation;
+
+		if (!array_key_exists($key, $attributes)) {
+			$attributes[$key] = $this->asJson ? json_encode([]) : [];
+		}
+
+		if ($this->asJson) {
+			$attributes[$key] = json_decode($attributes[$key], true);
+		}
+
+		if (!is_array($attributes[$key])) {
+			throw new MappingException("'$key' column should be an array, actual :".$attributes[$key]);
+		}
+
+		$attributes[$key] = $this->buildEmbeddedCollection($attributes[$key]);
+
+		return $attributes;
+	}
+
+	/**
+	 * Build an embedded collection and returns it.
+	 *
+	 * @param array $rows
+	 *
+	 * @return Collection
+	 */
+	protected function buildEmbeddedCollection(array $rows): Collection
+	{
+		return collect($rows)->map(function ($attributes) {
+			return $this->buildEmbeddedObject($attributes);
+		});
+	}
+
+	/**
+	 * Transform embedded object into db column(s).
+	 *
+	 * @param mixed $objects
+	 *
+	 * @throws MappingException
+	 *
+	 * @return array $columns
+	 */
+	public function normalize($objects) : array
+	{
+		if (!$this->asArray) {
+			throw new MappingException('Cannot normalize an embedsMany relation as row columns');
+		}
+
+		return $this->normalizeAsArray($objects);
+	}
+
+	/**
+	 * Normalize object as array containing raw attributes.
+	 *
+	 * @param mixed $objects
+	 *
+	 * @throws MappingException
+	 *
+	 * @return array
+	 */
+	protected function normalizeAsArray($objects) : array
+	{
+		$key = $this->relation;
+
+		if (!is_array($objects) && !$objects instanceof Collection) {
+			throw new MappingException("column '$key' should be of type array or collection");
+		}
+
+		if ($objects instanceof Collection) {
+			$objects = $objects->all();
+		}
+
+		$normalizedObjects = [];
+
+		foreach ($objects as $object) {
+			$wrapper = $this->factory->make($object);
+			$normalizedObjects[] = $wrapper->getEntityAttributes();
+		}
+
+		if ($this->asJson) {
+			$normalizedObjects = json_encode($normalizedObjects);
+		}
+
+		return [$key => $normalizedObjects];
+	}
 }

src/Relationships/Relationship.php

Indentation +431 added lines, -431 removed lines

@@ -19,435 +19,435 @@
  */
 abstract class Relationship
 {
-    /**
-     * The mapper instance for the related entity.
-     *
-     * @var Mapper
-     */
-    protected $relatedMapper;
-
-    /**
-     * The Analogue Query Builder instance.
-     *
-     * @var Query
-     */
-    protected $query;
-
-    /**
-     * The parent entity proxy instance.
-     *
-     * @var InternallyMappable
-     */
-    protected $parent;
-
-    /**
-     * The parent entity map.
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $parentMap;
-
-    /**
-     * The Parent Mapper instance.
-     *
-     * @var Mapper
-     */
-    protected $parentMapper;
-
-    /**
-     * The related entity instance.
-     *
-     * @var object
-     */
-    protected $related;
-
-    /**
-     * The related entity Map.
-     *
-     * @var \Analogue\ORM\EntityMap
-     */
-    protected $relatedMap;
-
-    /**
-     * Indicate if the relationships use a pivot table.*.
-     *
-     * @var bool
-     */
-    protected static $hasPivot = false;
-
-    /**
-     * Indicates if the relation is adding constraints.
-     *
-     * @var bool
-     */
-    protected static $constraints = true;
-
-    /**
-     * Wrapper factory.
-     *
-     * @var \Analogue\ORM\System\Wrappers\Factory
-     */
-    protected $factory;
-
-    /**
-     * Create a new relation instance.
-     *
-     * @param Mapper $mapper
-     * @param mixed  $parent
-     *
-     * @throws \Analogue\ORM\Exceptions\MappingException
-     */
-    public function __construct(Mapper $mapper, $parent)
-    {
-        $this->relatedMapper = $mapper;
-
-        $this->query = $mapper->getQuery();
-
-        $this->factory = new Factory();
-
-        $this->parent = $this->factory->make($parent);
-
-        $this->parentMapper = $mapper->getManager()->getMapper($parent);
-
-        $this->parentMap = $this->parentMapper->getEntityMap();
-
-        $this->related = $mapper->newInstance();
-
-        $this->relatedMap = $mapper->getEntityMap();
-
-        $this->addConstraints();
-    }
-
-    /**
-     * Indicate if the relationship uses a pivot table.
-     *
-     * @return bool
-     */
-    public function hasPivot()
-    {
-        return static::$hasPivot;
-    }
-
-    /**
-     * Set the base constraints on the relation query.
-     *
-     * @return void
-     */
-    abstract public function addConstraints();
-
-    /**
-     * Set the constraints for an eager load of the relation.
-     *
-     * @param array $results
-     *
-     * @return void
-     */
-    abstract public function addEagerConstraints(array $results);
-
-    /**
-     * Match the eagerly loaded results to their parents, then return
-     * updated results.
-     *
-     * @param array  $results
-     * @param string $relation
-     *
-     * @return array
-     */
-    abstract public function match(array $results, $relation);
-
-    /**
-     * Get the results of the relationship.
-     *
-     * @param string $relation relation name in parent's entity map
-     *
-     * @return mixed
-     */
-    abstract public function getResults($relation);
-
-    /**
-     * Get the relationship for eager loading.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function getEager()
-    {
-        return $this->get();
-    }
-
-    /**
-     * Add the constraints for a relationship count query.
-     *
-     * @param Query $query
-     * @param Query $parent
-     *
-     * @return Query
-     */
-    public function getRelationCountQuery(Query $query, Query $parent)
-    {
-        $query->select(new Expression('count(*)'));
-
-        $key = $this->wrap($this->getQualifiedParentKeyName());
-
-        return $query->where($this->getHasCompareKey(), '=', new Expression($key));
-    }
-
-    /**
-     * Run a callback with constraints disabled on the relation.
-     *
-     * @param Closure $callback
-     *
-     * @return mixed
-     */
-    public static function noConstraints(Closure $callback)
-    {
-        static::$constraints = false;
-
-        // When resetting the relation where clause, we want to shift the first element
-        // off of the bindings, leaving only the constraints that the developers put
-        // as "extra" on the relationships, and not original relation constraints.
-        $results = call_user_func($callback);
-
-        static::$constraints = true;
-
-        return $results;
-    }
-
-    /**
-     * Get all of the primary keys for an array of entities.
-     *
-     * @param array  $entities
-     * @param string $key
-     *
-     * @return array
-     */
-    protected function getKeys(array $entities, $key = null)
-    {
-        if (is_null($key)) {
-            $key = $this->relatedMap->getKeyName();
-        }
-
-        $host = $this;
-
-        return array_unique(array_values(array_map(function ($value) use ($key, $host) {
-            if (!$value instanceof InternallyMappable) {
-                $value = $host->factory->make($value);
-            }
-
-            return $value->getEntityAttribute($key);
-        }, $entities)));
-    }
-
-    /**
-     * Get all the keys from a result set.
-     *
-     * @param array  $results
-     * @param string $key
-     *
-     * @return array
-     */
-    protected function getKeysFromResults(array $results, $key = null)
-    {
-        if (is_null($key)) {
-            $key = $this->parentMap->getKeyName();
-        }
-
-        return array_unique(array_values(array_map(function ($value) use ($key) {
-            return $value[$key];
-        }, $results)));
-    }
-
-    /**
-     * Get the underlying query for the relation.
-     *
-     * @return Query
-     */
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
-    /**
-     * Get the base query builder.
-     *
-     * @return \Illuminate\Database\Query\Builder
-     */
-    public function getBaseQuery()
-    {
-        return $this->query->getQuery();
-    }
-
-    /**
-     * Get the parent model of the relation.
-     *
-     * @return InternallyMappable
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Set the parent model of the relation.
-     *
-     * @param InternallyMappable $parent
-     *
-     * @return void
-     */
-    public function setParent(InternallyMappable $parent)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Get the fully qualified parent key name.
-     *
-     * @return string
-     */
-    protected function getQualifiedParentKeyName()
-    {
-        return $this->parent->getQualifiedKeyName();
-    }
-
-    /**
-     * Get the related entity of the relation.
-     *
-     * @return \Analogue\ORM\Entity
-     */
-    public function getRelated()
-    {
-        return $this->related;
-    }
-
-    /**
-     * Get the related mapper for the relation.
-     *
-     * @return Mapper
-     */
-    public function getRelatedMapper()
-    {
-        return $this->relatedMapper;
-    }
-
-    /**
-     * Get the name of the "created at" column.
-     *
-     * @return string
-     */
-    public function createdAt()
-    {
-        return $this->parentMap->getCreatedAtColumn();
-    }
-
-    /**
-     * Get the name of the "updated at" column.
-     *
-     * @return string
-     */
-    public function updatedAt()
-    {
-        return $this->parentMap->getUpdatedAtColumn();
-    }
-
-    /**
-     * Get the name of the related model's "updated at" column.
-     *
-     * @return string
-     */
-    public function relatedUpdatedAt()
-    {
-        return $this->related->getUpdatedAtColumn();
-    }
-
-    /**
-     * Wrap the given value with the parent query's grammar.
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    public function wrap($value)
-    {
-        return $this->parentMapper->getQuery()->getQuery()->getGrammar()->wrap($value);
-    }
-
-    /**
-     * Get a fresh timestamp.
-     *
-     * @return Carbon
-     */
-    protected function freshTimestamp()
-    {
-        return new Carbon();
-    }
-
-    /**
-     * Cache the link between parent and related
-     * into the mapper's Entity Cache.
-     *
-     * @param EntityCollection|Mappable $results  result of the relation query
-     * @param string                    $relation name of the relation method on the parent entity
-     *
-     * @return void
-     */
-    protected function cacheRelation($results, $relation)
-    {
-        $cache = $this->parentMapper->getEntityCache();
-
-        $cache->cacheLoadedRelationResult($this->parent->getEntityKeyName(), $relation, $results, $this);
-    }
-
-    /**
-     * Return Pivot attributes when available on a relationship.
-     *
-     * @return array
-     */
-    public function getPivotAttributes()
-    {
-        return [];
-    }
-
-    /**
-     * Get a combo type.primaryKey.
-     *
-     * @param Mappable $entity
-     *
-     * @return string
-     */
-    protected function getEntityHash(Mappable $entity)
-    {
-        $class = get_class($entity);
-
-        $keyName = Mapper::getMapper($class)->getEntityMap()->getKeyName();
-
-        return $class.'.'.$entity->getEntityAttribute($keyName);
-    }
-
-    /**
-     * Run synchronization content if needed by the
-     * relation type.
-     *
-     * @param array $actualContent
-     *
-     * @return void
-     */
-    abstract public function sync(array $actualContent);
-
-    /**
-     * Handle dynamic method calls to the relationship.
-     *
-     * @param string $method
-     * @param array  $parameters
-     *
-     * @return mixed
-     */
-    public function __call($method, $parameters)
-    {
-        $result = call_user_func_array([$this->query, $method], $parameters);
-
-        if ($result === $this->query) {
-            return $this;
-        }
-
-        return $result;
-    }
+	/**
+	 * The mapper instance for the related entity.
+	 *
+	 * @var Mapper
+	 */
+	protected $relatedMapper;
+
+	/**
+	 * The Analogue Query Builder instance.
+	 *
+	 * @var Query
+	 */
+	protected $query;
+
+	/**
+	 * The parent entity proxy instance.
+	 *
+	 * @var InternallyMappable
+	 */
+	protected $parent;
+
+	/**
+	 * The parent entity map.
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $parentMap;
+
+	/**
+	 * The Parent Mapper instance.
+	 *
+	 * @var Mapper
+	 */
+	protected $parentMapper;
+
+	/**
+	 * The related entity instance.
+	 *
+	 * @var object
+	 */
+	protected $related;
+
+	/**
+	 * The related entity Map.
+	 *
+	 * @var \Analogue\ORM\EntityMap
+	 */
+	protected $relatedMap;
+
+	/**
+	 * Indicate if the relationships use a pivot table.*.
+	 *
+	 * @var bool
+	 */
+	protected static $hasPivot = false;
+
+	/**
+	 * Indicates if the relation is adding constraints.
+	 *
+	 * @var bool
+	 */
+	protected static $constraints = true;
+
+	/**
+	 * Wrapper factory.
+	 *
+	 * @var \Analogue\ORM\System\Wrappers\Factory
+	 */
+	protected $factory;
+
+	/**
+	 * Create a new relation instance.
+	 *
+	 * @param Mapper $mapper
+	 * @param mixed  $parent
+	 *
+	 * @throws \Analogue\ORM\Exceptions\MappingException
+	 */
+	public function __construct(Mapper $mapper, $parent)
+	{
+		$this->relatedMapper = $mapper;
+
+		$this->query = $mapper->getQuery();
+
+		$this->factory = new Factory();
+
+		$this->parent = $this->factory->make($parent);
+
+		$this->parentMapper = $mapper->getManager()->getMapper($parent);
+
+		$this->parentMap = $this->parentMapper->getEntityMap();
+
+		$this->related = $mapper->newInstance();
+
+		$this->relatedMap = $mapper->getEntityMap();
+
+		$this->addConstraints();
+	}
+
+	/**
+	 * Indicate if the relationship uses a pivot table.
+	 *
+	 * @return bool
+	 */
+	public function hasPivot()
+	{
+		return static::$hasPivot;
+	}
+
+	/**
+	 * Set the base constraints on the relation query.
+	 *
+	 * @return void
+	 */
+	abstract public function addConstraints();
+
+	/**
+	 * Set the constraints for an eager load of the relation.
+	 *
+	 * @param array $results
+	 *
+	 * @return void
+	 */
+	abstract public function addEagerConstraints(array $results);
+
+	/**
+	 * Match the eagerly loaded results to their parents, then return
+	 * updated results.
+	 *
+	 * @param array  $results
+	 * @param string $relation
+	 *
+	 * @return array
+	 */
+	abstract public function match(array $results, $relation);
+
+	/**
+	 * Get the results of the relationship.
+	 *
+	 * @param string $relation relation name in parent's entity map
+	 *
+	 * @return mixed
+	 */
+	abstract public function getResults($relation);
+
+	/**
+	 * Get the relationship for eager loading.
+	 *
+	 * @return \Illuminate\Support\Collection
+	 */
+	public function getEager()
+	{
+		return $this->get();
+	}
+
+	/**
+	 * Add the constraints for a relationship count query.
+	 *
+	 * @param Query $query
+	 * @param Query $parent
+	 *
+	 * @return Query
+	 */
+	public function getRelationCountQuery(Query $query, Query $parent)
+	{
+		$query->select(new Expression('count(*)'));
+
+		$key = $this->wrap($this->getQualifiedParentKeyName());
+
+		return $query->where($this->getHasCompareKey(), '=', new Expression($key));
+	}
+
+	/**
+	 * Run a callback with constraints disabled on the relation.
+	 *
+	 * @param Closure $callback
+	 *
+	 * @return mixed
+	 */
+	public static function noConstraints(Closure $callback)
+	{
+		static::$constraints = false;
+
+		// When resetting the relation where clause, we want to shift the first element
+		// off of the bindings, leaving only the constraints that the developers put
+		// as "extra" on the relationships, and not original relation constraints.
+		$results = call_user_func($callback);
+
+		static::$constraints = true;
+
+		return $results;
+	}
+
+	/**
+	 * Get all of the primary keys for an array of entities.
+	 *
+	 * @param array  $entities
+	 * @param string $key
+	 *
+	 * @return array
+	 */
+	protected function getKeys(array $entities, $key = null)
+	{
+		if (is_null($key)) {
+			$key = $this->relatedMap->getKeyName();
+		}
+
+		$host = $this;
+
+		return array_unique(array_values(array_map(function ($value) use ($key, $host) {
+			if (!$value instanceof InternallyMappable) {
+				$value = $host->factory->make($value);
+			}
+
+			return $value->getEntityAttribute($key);
+		}, $entities)));
+	}
+
+	/**
+	 * Get all the keys from a result set.
+	 *
+	 * @param array  $results
+	 * @param string $key
+	 *
+	 * @return array
+	 */
+	protected function getKeysFromResults(array $results, $key = null)
+	{
+		if (is_null($key)) {
+			$key = $this->parentMap->getKeyName();
+		}
+
+		return array_unique(array_values(array_map(function ($value) use ($key) {
+			return $value[$key];
+		}, $results)));
+	}
+
+	/**
+	 * Get the underlying query for the relation.
+	 *
+	 * @return Query
+	 */
+	public function getQuery()
+	{
+		return $this->query;
+	}
+
+	/**
+	 * Get the base query builder.
+	 *
+	 * @return \Illuminate\Database\Query\Builder
+	 */
+	public function getBaseQuery()
+	{
+		return $this->query->getQuery();
+	}
+
+	/**
+	 * Get the parent model of the relation.
+	 *
+	 * @return InternallyMappable
+	 */
+	public function getParent()
+	{
+		return $this->parent;
+	}
+
+	/**
+	 * Set the parent model of the relation.
+	 *
+	 * @param InternallyMappable $parent
+	 *
+	 * @return void
+	 */
+	public function setParent(InternallyMappable $parent)
+	{
+		$this->parent = $parent;
+	}
+
+	/**
+	 * Get the fully qualified parent key name.
+	 *
+	 * @return string
+	 */
+	protected function getQualifiedParentKeyName()
+	{
+		return $this->parent->getQualifiedKeyName();
+	}
+
+	/**
+	 * Get the related entity of the relation.
+	 *
+	 * @return \Analogue\ORM\Entity
+	 */
+	public function getRelated()
+	{
+		return $this->related;
+	}
+
+	/**
+	 * Get the related mapper for the relation.
+	 *
+	 * @return Mapper
+	 */
+	public function getRelatedMapper()
+	{
+		return $this->relatedMapper;
+	}
+
+	/**
+	 * Get the name of the "created at" column.
+	 *
+	 * @return string
+	 */
+	public function createdAt()
+	{
+		return $this->parentMap->getCreatedAtColumn();
+	}
+
+	/**
+	 * Get the name of the "updated at" column.
+	 *
+	 * @return string
+	 */
+	public function updatedAt()
+	{
+		return $this->parentMap->getUpdatedAtColumn();
+	}
+
+	/**
+	 * Get the name of the related model's "updated at" column.
+	 *
+	 * @return string
+	 */
+	public function relatedUpdatedAt()
+	{
+		return $this->related->getUpdatedAtColumn();
+	}
+
+	/**
+	 * Wrap the given value with the parent query's grammar.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public function wrap($value)
+	{
+		return $this->parentMapper->getQuery()->getQuery()->getGrammar()->wrap($value);
+	}
+
+	/**
+	 * Get a fresh timestamp.
+	 *
+	 * @return Carbon
+	 */
+	protected function freshTimestamp()
+	{
+		return new Carbon();
+	}
+
+	/**
+	 * Cache the link between parent and related
+	 * into the mapper's Entity Cache.
+	 *
+	 * @param EntityCollection|Mappable $results  result of the relation query
+	 * @param string                    $relation name of the relation method on the parent entity
+	 *
+	 * @return void
+	 */
+	protected function cacheRelation($results, $relation)
+	{
+		$cache = $this->parentMapper->getEntityCache();
+
+		$cache->cacheLoadedRelationResult($this->parent->getEntityKeyName(), $relation, $results, $this);
+	}
+
+	/**
+	 * Return Pivot attributes when available on a relationship.
+	 *
+	 * @return array
+	 */
+	public function getPivotAttributes()
+	{
+		return [];
+	}
+
+	/**
+	 * Get a combo type.primaryKey.
+	 *
+	 * @param Mappable $entity
+	 *
+	 * @return string
+	 */
+	protected function getEntityHash(Mappable $entity)
+	{
+		$class = get_class($entity);
+
+		$keyName = Mapper::getMapper($class)->getEntityMap()->getKeyName();
+
+		return $class.'.'.$entity->getEntityAttribute($keyName);
+	}
+
+	/**
+	 * Run synchronization content if needed by the
+	 * relation type.
+	 *
+	 * @param array $actualContent
+	 *
+	 * @return void
+	 */
+	abstract public function sync(array $actualContent);
+
+	/**
+	 * Handle dynamic method calls to the relationship.
+	 *
+	 * @param string $method
+	 * @param array  $parameters
+	 *
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		$result = call_user_func_array([$this->query, $method], $parameters);
+
+		if ($result === $this->query) {
+			return $this;
+		}
+
+		return $result;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -228,7 +228,7 @@ 
 
         $host = $this;
 
-        return array_unique(array_values(array_map(function ($value) use ($key, $host) {
+        return array_unique(array_values(array_map(function($value) use ($key, $host) {
             if (!$value instanceof InternallyMappable) {
                 $value = $host->factory->make($value);
             }
@@ -251,7 +251,7 @@ 
             $key = $this->parentMap->getKeyName();
         }
 
-        return array_unique(array_values(array_map(function ($value) use ($key) {
+        return array_unique(array_values(array_map(function($value) use ($key) {
             return $value[$key];
         }, $results)));
     }

src/System/MapperFactory.php

Indentation +76 added lines, -76 removed lines

@@ -13,80 +13,80 @@
  */
 class MapperFactory
 {
-    /**
-     * Manager instance.
-     *
-     * @var \Analogue\ORM\System\Manager
-     */
-    protected $manager;
-
-    /**
-     * DriverManager instance.
-     *
-     * @var \Analogue\ORM\Drivers\Manager
-     */
-    protected $drivers;
-
-    /**
-     * Event dispatcher instance.
-     *
-     * @var \Illuminate\Contracts\Events\Dispatcher
-     */
-    protected $dispatcher;
-
-    /**
-     * MapperFactory constructor.
-     *
-     * @param DriverManager $drivers
-     * @param Dispatcher    $dispatcher
-     * @param Manager       $manager
-     */
-    public function __construct(DriverManager $drivers, Dispatcher $dispatcher, Manager $manager)
-    {
-        $this->drivers = $drivers;
-
-        $this->dispatcher = $dispatcher;
-
-        $this->manager = $manager;
-    }
-
-    /**
-     * Return a new Mapper instance.
-     *
-     * @param string    $entityClass
-     * @param EntityMap $entityMap
-     *
-     * @return Mapper
-     */
-    public function make($entityClass, EntityMap $entityMap)
-    {
-        $driver = $entityMap->getDriver();
-
-        $connection = $entityMap->getConnection();
-
-        $adapter = $this->drivers->getAdapter($driver, $connection);
-
-        $entityMap->setDateFormat($adapter->getDateFormat());
-
-        $mapper = new Mapper($entityMap, $adapter, $this->dispatcher, $this->manager);
-
-        // Fire Initializing Event
-        $mapper->fireEvent('initializing', $mapper);
-
-        // Proceed necessary parsing on the EntityMap object
-        if (!$entityMap->isBooted()) {
-            $entityMap->initialize();
-        }
-
-        // Apply Inheritance scope, if necessary
-        if ($entityMap->getInheritanceType() == 'single_table') {
-            $scope = new SingleTableInheritanceScope($entityMap);
-            $mapper->addGlobalScope($scope);
-        }
-
-        // Fire Initialized Event
-        $mapper->fireEvent('initialized', $mapper);
-
-        return $mapper;
-    }
+	/**
+	 * Manager instance.
+	 *
+	 * @var \Analogue\ORM\System\Manager
+	 */
+	protected $manager;
+
+	/**
+	 * DriverManager instance.
+	 *
+	 * @var \Analogue\ORM\Drivers\Manager
+	 */
+	protected $drivers;
+
+	/**
+	 * Event dispatcher instance.
+	 *
+	 * @var \Illuminate\Contracts\Events\Dispatcher
+	 */
+	protected $dispatcher;
+
+	/**
+	 * MapperFactory constructor.
+	 *
+	 * @param DriverManager $drivers
+	 * @param Dispatcher    $dispatcher
+	 * @param Manager       $manager
+	 */
+	public function __construct(DriverManager $drivers, Dispatcher $dispatcher, Manager $manager)
+	{
+		$this->drivers = $drivers;
+
+		$this->dispatcher = $dispatcher;
+
+		$this->manager = $manager;
+	}
+
+	/**
+	 * Return a new Mapper instance.
+	 *
+	 * @param string    $entityClass
+	 * @param EntityMap $entityMap
+	 *
+	 * @return Mapper
+	 */
+	public function make($entityClass, EntityMap $entityMap)
+	{
+		$driver = $entityMap->getDriver();
+
+		$connection = $entityMap->getConnection();
+
+		$adapter = $this->drivers->getAdapter($driver, $connection);
+
+		$entityMap->setDateFormat($adapter->getDateFormat());
+
+		$mapper = new Mapper($entityMap, $adapter, $this->dispatcher, $this->manager);
+
+		// Fire Initializing Event
+		$mapper->fireEvent('initializing', $mapper);
+
+		// Proceed necessary parsing on the EntityMap object
+		if (!$entityMap->isBooted()) {
+			$entityMap->initialize();
+		}
+
+		// Apply Inheritance scope, if necessary
+		if ($entityMap->getInheritanceType() == 'single_table') {
+			$scope = new SingleTableInheritanceScope($entityMap);
+			$mapper->addGlobalScope($scope);
+		}
+
+		// Fire Initialized Event
+		$mapper->fireEvent('initialized', $mapper);
+
+		return $mapper;
+	}
 }

src/System/Proxies/ProxyFactory.php

Indentation +41 added lines, -41 removed lines

@@ -15,56 +15,56 @@
  */
 class ProxyFactory
 {
-    public function make($entity, $relation, $class)
-    {
-        $entityMap = Manager::getMapper($entity)->getEntityMap();
+	public function make($entity, $relation, $class)
+	{
+		$entityMap = Manager::getMapper($entity)->getEntityMap();
 
-        $singleRelations = $entityMap->getSingleRelationships();
-        $manyRelations = $entityMap->getManyRelationships();
+		$singleRelations = $entityMap->getSingleRelationships();
+		$manyRelations = $entityMap->getManyRelationships();
 
-        if (in_array($relation, $singleRelations)) {
-            return $this->makeEntityProxy($entity, $relation, $class);
-        }
+		if (in_array($relation, $singleRelations)) {
+			return $this->makeEntityProxy($entity, $relation, $class);
+		}
 
-        if (in_array($relation, $manyRelations)) {
-            return new CollectionProxy($entity, $relation);
-        }
+		if (in_array($relation, $manyRelations)) {
+			return new CollectionProxy($entity, $relation);
+		}
 
-        throw new MappingException("Could not identify relation '$relation'");
-    }
+		throw new MappingException("Could not identify relation '$relation'");
+	}
 
-    /**
-     * Create an instance of a proxy object, extending the actual
-     * related class.
-     *
-     * @param mixed  $entity   parent object
-     * @param string $relation the name of the relationship method
-     * @param string $class    the class name of the related object
-     *
-     * @return mixed
-     */
-    protected function makeEntityProxy($entity, $relation, $class)
-    {
-        $proxyPath = Manager::getInstance()->getProxyPath();
+	/**
+	 * Create an instance of a proxy object, extending the actual
+	 * related class.
+	 *
+	 * @param mixed  $entity   parent object
+	 * @param string $relation the name of the relationship method
+	 * @param string $class    the class name of the related object
+	 *
+	 * @return mixed
+	 */
+	protected function makeEntityProxy($entity, $relation, $class)
+	{
+		$proxyPath = Manager::getInstance()->getProxyPath();
 
-        if ($proxyPath !== null) {
-            $proxyConfig = new Configuration();
-            $proxyConfig->setProxiesTargetDir($proxyPath);
+		if ($proxyPath !== null) {
+			$proxyConfig = new Configuration();
+			$proxyConfig->setProxiesTargetDir($proxyPath);
 
-            $factory = new LazyLoadingValueHolderFactory($proxyConfig);
-        } else {
-            $factory = new LazyLoadingValueHolderFactory();
-        }
+			$factory = new LazyLoadingValueHolderFactory($proxyConfig);
+		} else {
+			$factory = new LazyLoadingValueHolderFactory();
+		}
 
-        $initializer = function (&$wrappedObject, LazyLoadingInterface $proxy, $method, array $parameters, &$initializer) use ($entity, $relation) {
-            $entityMap = Manager::getMapper($entity)->getEntityMap();
+		$initializer = function (&$wrappedObject, LazyLoadingInterface $proxy, $method, array $parameters, &$initializer) use ($entity, $relation) {
+			$entityMap = Manager::getMapper($entity)->getEntityMap();
 
-            $wrappedObject = $entityMap->$relation($entity)->getResults($relation);
+			$wrappedObject = $entityMap->$relation($entity)->getResults($relation);
 
-            $initializer = null; // disable initialization
-            return true; // confirm that initialization occurred correctly
-        };
+			$initializer = null; // disable initialization
+			return true; // confirm that initialization occurred correctly
+		};
 
-        return $factory->createProxy($class, $initializer);
-    }
+		return $factory->createProxy($class, $initializer);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             $factory = new LazyLoadingValueHolderFactory();
         }
 
-        $initializer = function (&$wrappedObject, LazyLoadingInterface $proxy, $method, array $parameters, &$initializer) use ($entity, $relation) {
+        $initializer = function(&$wrappedObject, LazyLoadingInterface $proxy, $method, array $parameters, &$initializer) use ($entity, $relation) {
             $entityMap = Manager::getMapper($entity)->getEntityMap();
 
             $wrappedObject = $entityMap->$relation($entity)->getResults($relation);