analogueorm / analogue

src/Plugins/AnaloguePlugin.php

Indentation +15 added lines, -15 removed lines

@@ -6,20 +6,20 @@
 
 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;
+	}
 }

src/Plugins/AnaloguePluginInterface.php

Indentation +12 added lines, -12 removed lines

@@ -4,17 +4,17 @@
 
 interface AnaloguePluginInterface
 {
-    /**
-     * Boot the plugin.
-     *
-     * @return void
-     */
-    public function register();
+	/**
+	 * Boot the plugin.
+	 *
+	 * @return void
+	 */
+	public function register();
 
-    /**
-     * Get custom events provided by the plugin.
-     *
-     * @return array
-     */
-    public function getCustomEvents(): array;
+	/**
+	 * Get custom events provided by the plugin.
+	 *
+	 * @return array
+	 */
+	public function getCustomEvents(): array;
 }

src/EntityCollection.php

Indentation +478 added lines, -478 removed lines

@@ -10,482 +10,482 @@
 
 class EntityCollection extends Collection
 {
-    /**
-     * Wrapper Factory.
-     *
-     * @var \Analogue\ORM\System\Wrappers\Factory
-     */
-    protected $factory;
-
-    /**
-     * EntityCollection constructor.
-     *
-     * @param array|null $entities
-     */
-    public function __construct(array $entities = null)
-    {
-        $this->factory = new Factory();
-
-        parent::__construct($entities);
-    }
-
-    /**
-     * Find an entity in the collection by key.
-     *
-     * @param mixed $key
-     * @param mixed $default
-     *
-     * @throws MappingException
-     *
-     * @return \Analogue\ORM\Entity
-     */
-    public function find($key, $default = null)
-    {
-        if ($key instanceof Mappable) {
-            $key = $this->getEntityKey($key);
-        }
-
-        return array_first($this->items, function ($entity, $itemKey) use ($key) {
-            return $this->getEntityKey($entity) == $key;
-        }, $default);
-    }
-
-    /**
-     * Add an entity to the collection.
-     *
-     * @param Mappable $entity
-     *
-     * @return $this
-     */
-    public function add($entity)
-    {
-        $this->push($entity);
-
-        return $this;
-    }
-
-    /**
-     * Remove an entity from the collection.
-     *
-     * @param $entity
-     *
-     * @throws MappingException
-     *
-     * @return mixed
-     */
-    public function remove($entity)
-    {
-        $key = $this->getEntityKey($entity);
-
-        return $this->pull($key);
-    }
-
-    /**
-     * Get and remove an item from the collection.
-     *
-     * @param mixed $key
-     * @param mixed $default
-     *
-     * @return mixed
-     */
-    public function pull($key, $default = null)
-    {
-        $this->items = array_filter($this->items, function ($item) use ($key) {
-            $primaryKey = $this->getEntityKey($item);
-
-            return $primaryKey !== $key;
-        });
-    }
-
-    /**
-     * Push an item onto the end of the collection.
-     *
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function push($value)
-    {
-        $this->offsetSet(null, $value);
-    }
-
-    /**
-     * Put an item in the collection by key.
-     *
-     * @param mixed $key
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function put($key, $value)
-    {
-        $this->offsetSet($key, $value);
-    }
-
-    /**
-     * Set the item at a given offset.
-     *
-     * @param mixed $key
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function offsetSet($key, $value)
-    {
-        if (is_null($key)) {
-            $this->items[] = $value;
-        } else {
-            $this->items[$key] = $value;
-        }
-    }
-
-    /**
-     * Determine if a key exists in the collection.
-     *
-     * @param mixed      $key
-     * @param mixed|null $value
-     *
-     * @return bool
-     */
-    // public function contains($key, $value = null)
-    // {
-    //     if (func_num_args() == 2) {
-    //         return !$this->where($key, $value)->isEmpty();
-    //     }
-
-    //     if ($this->useAsCallable($key)) {
-    //         return !is_null($this->first($key));
-    //     }
-
-    //     return !is_null($this->find($key));
-    // }
-
-    /**
-     * Fetch a nested element of the collection.
-     *
-     * @param string $key
-     *
-     * @return self
-     */
-    public function fetch($key)
-    {
-        return new static(array_fetch($this->toArray(), $key));
-    }
-
-    /**
-     * Generic function for returning class.key value pairs.
-     *
-     * @throws MappingException
-     *
-     * @return string
-     */
-    public function getEntityHashes()
-    {
-        return array_map(function ($entity) {
-            $class = get_class($entity);
-
-            $mapper = Manager::getMapper($class);
-
-            $keyName = $mapper->getEntityMap()->getKeyName();
-
-            return $class.'.'.$entity->getEntityAttribute($keyName);
-        },
-        $this->items);
-    }
-
-    /**
-     * Get a subset of the collection from entity hashes.
-     *
-     * @param array $hashes
-     *
-     * @throws MappingException
-     *
-     * @return array
-     */
-    public function getSubsetByHashes(array $hashes)
-    {
-        $subset = [];
-
-        foreach ($this->items as $item) {
-            $class = get_class($item);
-
-            $mapper = Manager::getMapper($class);
-
-            $keyName = $mapper->getEntityMap()->getKeyName();
-
-            if (in_array($class.'.'.$item->$keyName, $hashes)) {
-                $subset[] = $item;
-            }
-        }
-
-        return $subset;
-    }
-
-    /**
-     * Merge the collection with the given items.
-     *
-     * @param array $items
-     *
-     * @throws MappingException
-     *
-     * @return self
-     */
-    public function merge($items)
-    {
-        $dictionary = $this->getDictionary();
-
-        foreach ($items as $item) {
-            $dictionary[$this->getEntityKey($item)] = $item;
-        }
-
-        return new static(array_values($dictionary));
-    }
-
-    /**
-     * Diff the collection with the given items.
-     *
-     * @param \ArrayAccess|array $items
-     *
-     * @return self
-     */
-    public function diff($items)
-    {
-        $diff = new static();
-
-        $dictionary = $this->getDictionary($items);
-
-        foreach ($this->items as $item) {
-            if (!isset($dictionary[$this->getEntityKey($item)])) {
-                $diff->add($item);
-            }
-        }
-
-        return $diff;
-    }
-
-    /**
-     * Intersect the collection with the given items.
-     *
-     * @param \ArrayAccess|array $items
-     *
-     * @throws MappingException
-     *
-     * @return self
-     */
-    public function intersect($items)
-    {
-        $intersect = new static();
-
-        $dictionary = $this->getDictionary($items);
-
-        foreach ($this->items as $item) {
-            if (isset($dictionary[$this->getEntityKey($item)])) {
-                $intersect->add($item);
-            }
-        }
-
-        return $intersect;
-    }
-
-    /**
-     * Returns only the models from the collection with the specified keys.
-     *
-     * @param mixed $keys
-     *
-     * @return self
-     */
-    public function only($keys)
-    {
-        $dictionary = array_only($this->getDictionary(), $keys);
-
-        return new static(array_values($dictionary));
-    }
-
-    /**
-     * Returns all models in the collection except the models with specified keys.
-     *
-     * @param mixed $keys
-     *
-     * @return self
-     */
-    public function except($keys)
-    {
-        $dictionary = array_except($this->getDictionary(), $keys);
-
-        return new static(array_values($dictionary));
-    }
-
-    /**
-     * Get a dictionary keyed by primary keys.
-     *
-     * @param \ArrayAccess|array $items
-     *
-     * @throws MappingException
-     *
-     * @return array
-     */
-    public function getDictionary($items = null)
-    {
-        $items = is_null($items) ? $this->items : $items;
-
-        $dictionary = [];
-
-        foreach ($items as $value) {
-            $dictionary[$this->getEntityKey($value)] = $value;
-        }
-
-        return $dictionary;
-    }
-
-    /**
-     * @throws MappingException
-     *
-     * @return array
-     */
-    public function getEntityKeys()
-    {
-        return array_keys($this->getDictionary());
-    }
-
-    /**
-     * @param $entity
-     *
-     * @throws MappingException
-     *
-     * @return mixed
-     */
-    protected function getEntityKey($entity)
-    {
-        $keyName = Manager::getMapper($entity)->getEntityMap()->getKeyName();
-
-        $wrapper = $this->factory->make($entity);
-
-        return $wrapper->getEntityAttribute($keyName);
-    }
-
-    /**
-     * Get the max value of a given key.
-     *
-     * @param string|null $key
-     *
-     * @throws MappingException
-     *
-     * @return mixed
-     */
-    public function max($key = null)
-    {
-        return $this->reduce(function ($result, $item) use ($key) {
-            $wrapper = $this->factory->make($item);
-
-            return (is_null($result) || $wrapper->getEntityAttribute($key) > $result) ?
-                $wrapper->getEntityAttribute($key) : $result;
-        });
-    }
-
-    /**
-     * Get the min value of a given key.
-     *
-     * @param string|null $key
-     *
-     * @throws MappingException
-     *
-     * @return mixed
-     */
-    public function min($key = null)
-    {
-        return $this->reduce(function ($result, $item) use ($key) {
-            $wrapper = $this->factory->make($item);
-
-            return (is_null($result) || $wrapper->getEntityAttribute($key) < $result)
-                ? $wrapper->getEntityAttribute($key) : $result;
-        });
-    }
-
-    /**
-     * Get an array with the values of a given key.
-     *
-     * @param string      $value
-     * @param string|null $key
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function pluck($value, $key = null)
-    {
-        return new Collection(Arr::pluck($this->items, $value, $key));
-    }
-
-    /**
-     * Alias for the "pluck" method.
-     *
-     * @param string      $value
-     * @param string|null $key
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function lists($value, $key = null)
-    {
-        return $this->pluck($value, $key);
-    }
-
-    /**
-     * Return only unique items from the collection.
-     *
-     * @param string|null $key
-     * @param bool        $strict
-     *
-     * @throws MappingException
-     *
-     * @return self
-     */
-    public function unique($key = null, $strict = false)
-    {
-        $dictionary = $this->getDictionary();
-
-        return new static(array_values($dictionary));
-    }
-
-    /**
-     * Unset the item at a given offset.
-     *
-     * @param string $key
-     *
-     * @return void
-     */
-    public function offsetUnset($key)
-    {
-        $this->items = array_filter($this->items, function ($item) use ($key) {
-            $primaryKey = $this->getEntityKey($item);
-
-            return $primaryKey !== $key;
-        });
-    }
-
-    /**
-     * Get a base Support collection instance from this collection.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function toBase()
-    {
-        return new Collection($this->items);
-    }
-
-    public function toArray()
-    {
-        return array_values(parent::toArray());
-    }
-
-    /**
-     * Get the collection of items as JSON.
-     *
-     * @param int $options
-     *
-     * @return string
-     */
-    public function toJson($options = 0)
-    {
-        $collection = new Collection(array_values($this->items));
-
-        return $collection->toJson($options);
-    }
+	/**
+	 * Wrapper Factory.
+	 *
+	 * @var \Analogue\ORM\System\Wrappers\Factory
+	 */
+	protected $factory;
+
+	/**
+	 * EntityCollection constructor.
+	 *
+	 * @param array|null $entities
+	 */
+	public function __construct(array $entities = null)
+	{
+		$this->factory = new Factory();
+
+		parent::__construct($entities);
+	}
+
+	/**
+	 * Find an entity in the collection by key.
+	 *
+	 * @param mixed $key
+	 * @param mixed $default
+	 *
+	 * @throws MappingException
+	 *
+	 * @return \Analogue\ORM\Entity
+	 */
+	public function find($key, $default = null)
+	{
+		if ($key instanceof Mappable) {
+			$key = $this->getEntityKey($key);
+		}
+
+		return array_first($this->items, function ($entity, $itemKey) use ($key) {
+			return $this->getEntityKey($entity) == $key;
+		}, $default);
+	}
+
+	/**
+	 * Add an entity to the collection.
+	 *
+	 * @param Mappable $entity
+	 *
+	 * @return $this
+	 */
+	public function add($entity)
+	{
+		$this->push($entity);
+
+		return $this;
+	}
+
+	/**
+	 * Remove an entity from the collection.
+	 *
+	 * @param $entity
+	 *
+	 * @throws MappingException
+	 *
+	 * @return mixed
+	 */
+	public function remove($entity)
+	{
+		$key = $this->getEntityKey($entity);
+
+		return $this->pull($key);
+	}
+
+	/**
+	 * Get and remove an item from the collection.
+	 *
+	 * @param mixed $key
+	 * @param mixed $default
+	 *
+	 * @return mixed
+	 */
+	public function pull($key, $default = null)
+	{
+		$this->items = array_filter($this->items, function ($item) use ($key) {
+			$primaryKey = $this->getEntityKey($item);
+
+			return $primaryKey !== $key;
+		});
+	}
+
+	/**
+	 * Push an item onto the end of the collection.
+	 *
+	 * @param mixed $value
+	 *
+	 * @return void
+	 */
+	public function push($value)
+	{
+		$this->offsetSet(null, $value);
+	}
+
+	/**
+	 * Put an item in the collection by key.
+	 *
+	 * @param mixed $key
+	 * @param mixed $value
+	 *
+	 * @return void
+	 */
+	public function put($key, $value)
+	{
+		$this->offsetSet($key, $value);
+	}
+
+	/**
+	 * Set the item at a given offset.
+	 *
+	 * @param mixed $key
+	 * @param mixed $value
+	 *
+	 * @return void
+	 */
+	public function offsetSet($key, $value)
+	{
+		if (is_null($key)) {
+			$this->items[] = $value;
+		} else {
+			$this->items[$key] = $value;
+		}
+	}
+
+	/**
+	 * Determine if a key exists in the collection.
+	 *
+	 * @param mixed      $key
+	 * @param mixed|null $value
+	 *
+	 * @return bool
+	 */
+	// public function contains($key, $value = null)
+	// {
+	//     if (func_num_args() == 2) {
+	//         return !$this->where($key, $value)->isEmpty();
+	//     }
+
+	//     if ($this->useAsCallable($key)) {
+	//         return !is_null($this->first($key));
+	//     }
+
+	//     return !is_null($this->find($key));
+	// }
+
+	/**
+	 * Fetch a nested element of the collection.
+	 *
+	 * @param string $key
+	 *
+	 * @return self
+	 */
+	public function fetch($key)
+	{
+		return new static(array_fetch($this->toArray(), $key));
+	}
+
+	/**
+	 * Generic function for returning class.key value pairs.
+	 *
+	 * @throws MappingException
+	 *
+	 * @return string
+	 */
+	public function getEntityHashes()
+	{
+		return array_map(function ($entity) {
+			$class = get_class($entity);
+
+			$mapper = Manager::getMapper($class);
+
+			$keyName = $mapper->getEntityMap()->getKeyName();
+
+			return $class.'.'.$entity->getEntityAttribute($keyName);
+		},
+		$this->items);
+	}
+
+	/**
+	 * Get a subset of the collection from entity hashes.
+	 *
+	 * @param array $hashes
+	 *
+	 * @throws MappingException
+	 *
+	 * @return array
+	 */
+	public function getSubsetByHashes(array $hashes)
+	{
+		$subset = [];
+
+		foreach ($this->items as $item) {
+			$class = get_class($item);
+
+			$mapper = Manager::getMapper($class);
+
+			$keyName = $mapper->getEntityMap()->getKeyName();
+
+			if (in_array($class.'.'.$item->$keyName, $hashes)) {
+				$subset[] = $item;
+			}
+		}
+
+		return $subset;
+	}
+
+	/**
+	 * Merge the collection with the given items.
+	 *
+	 * @param array $items
+	 *
+	 * @throws MappingException
+	 *
+	 * @return self
+	 */
+	public function merge($items)
+	{
+		$dictionary = $this->getDictionary();
+
+		foreach ($items as $item) {
+			$dictionary[$this->getEntityKey($item)] = $item;
+		}
+
+		return new static(array_values($dictionary));
+	}
+
+	/**
+	 * Diff the collection with the given items.
+	 *
+	 * @param \ArrayAccess|array $items
+	 *
+	 * @return self
+	 */
+	public function diff($items)
+	{
+		$diff = new static();
+
+		$dictionary = $this->getDictionary($items);
+
+		foreach ($this->items as $item) {
+			if (!isset($dictionary[$this->getEntityKey($item)])) {
+				$diff->add($item);
+			}
+		}
+
+		return $diff;
+	}
+
+	/**
+	 * Intersect the collection with the given items.
+	 *
+	 * @param \ArrayAccess|array $items
+	 *
+	 * @throws MappingException
+	 *
+	 * @return self
+	 */
+	public function intersect($items)
+	{
+		$intersect = new static();
+
+		$dictionary = $this->getDictionary($items);
+
+		foreach ($this->items as $item) {
+			if (isset($dictionary[$this->getEntityKey($item)])) {
+				$intersect->add($item);
+			}
+		}
+
+		return $intersect;
+	}
+
+	/**
+	 * Returns only the models from the collection with the specified keys.
+	 *
+	 * @param mixed $keys
+	 *
+	 * @return self
+	 */
+	public function only($keys)
+	{
+		$dictionary = array_only($this->getDictionary(), $keys);
+
+		return new static(array_values($dictionary));
+	}
+
+	/**
+	 * Returns all models in the collection except the models with specified keys.
+	 *
+	 * @param mixed $keys
+	 *
+	 * @return self
+	 */
+	public function except($keys)
+	{
+		$dictionary = array_except($this->getDictionary(), $keys);
+
+		return new static(array_values($dictionary));
+	}
+
+	/**
+	 * Get a dictionary keyed by primary keys.
+	 *
+	 * @param \ArrayAccess|array $items
+	 *
+	 * @throws MappingException
+	 *
+	 * @return array
+	 */
+	public function getDictionary($items = null)
+	{
+		$items = is_null($items) ? $this->items : $items;
+
+		$dictionary = [];
+
+		foreach ($items as $value) {
+			$dictionary[$this->getEntityKey($value)] = $value;
+		}
+
+		return $dictionary;
+	}
+
+	/**
+	 * @throws MappingException
+	 *
+	 * @return array
+	 */
+	public function getEntityKeys()
+	{
+		return array_keys($this->getDictionary());
+	}
+
+	/**
+	 * @param $entity
+	 *
+	 * @throws MappingException
+	 *
+	 * @return mixed
+	 */
+	protected function getEntityKey($entity)
+	{
+		$keyName = Manager::getMapper($entity)->getEntityMap()->getKeyName();
+
+		$wrapper = $this->factory->make($entity);
+
+		return $wrapper->getEntityAttribute($keyName);
+	}
+
+	/**
+	 * Get the max value of a given key.
+	 *
+	 * @param string|null $key
+	 *
+	 * @throws MappingException
+	 *
+	 * @return mixed
+	 */
+	public function max($key = null)
+	{
+		return $this->reduce(function ($result, $item) use ($key) {
+			$wrapper = $this->factory->make($item);
+
+			return (is_null($result) || $wrapper->getEntityAttribute($key) > $result) ?
+				$wrapper->getEntityAttribute($key) : $result;
+		});
+	}
+
+	/**
+	 * Get the min value of a given key.
+	 *
+	 * @param string|null $key
+	 *
+	 * @throws MappingException
+	 *
+	 * @return mixed
+	 */
+	public function min($key = null)
+	{
+		return $this->reduce(function ($result, $item) use ($key) {
+			$wrapper = $this->factory->make($item);
+
+			return (is_null($result) || $wrapper->getEntityAttribute($key) < $result)
+				? $wrapper->getEntityAttribute($key) : $result;
+		});
+	}
+
+	/**
+	 * Get an array with the values of a given key.
+	 *
+	 * @param string      $value
+	 * @param string|null $key
+	 *
+	 * @return \Illuminate\Support\Collection
+	 */
+	public function pluck($value, $key = null)
+	{
+		return new Collection(Arr::pluck($this->items, $value, $key));
+	}
+
+	/**
+	 * Alias for the "pluck" method.
+	 *
+	 * @param string      $value
+	 * @param string|null $key
+	 *
+	 * @return \Illuminate\Support\Collection
+	 */
+	public function lists($value, $key = null)
+	{
+		return $this->pluck($value, $key);
+	}
+
+	/**
+	 * Return only unique items from the collection.
+	 *
+	 * @param string|null $key
+	 * @param bool        $strict
+	 *
+	 * @throws MappingException
+	 *
+	 * @return self
+	 */
+	public function unique($key = null, $strict = false)
+	{
+		$dictionary = $this->getDictionary();
+
+		return new static(array_values($dictionary));
+	}
+
+	/**
+	 * Unset the item at a given offset.
+	 *
+	 * @param string $key
+	 *
+	 * @return void
+	 */
+	public function offsetUnset($key)
+	{
+		$this->items = array_filter($this->items, function ($item) use ($key) {
+			$primaryKey = $this->getEntityKey($item);
+
+			return $primaryKey !== $key;
+		});
+	}
+
+	/**
+	 * Get a base Support collection instance from this collection.
+	 *
+	 * @return \Illuminate\Support\Collection
+	 */
+	public function toBase()
+	{
+		return new Collection($this->items);
+	}
+
+	public function toArray()
+	{
+		return array_values(parent::toArray());
+	}
+
+	/**
+	 * Get the collection of items as JSON.
+	 *
+	 * @param int $options
+	 *
+	 * @return string
+	 */
+	public function toJson($options = 0)
+	{
+		$collection = new Collection(array_values($this->items));
+
+		return $collection->toJson($options);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
             $key = $this->getEntityKey($key);
         }
 
-        return array_first($this->items, function ($entity, $itemKey) use ($key) {
+        return array_first($this->items, function($entity, $itemKey) use ($key) {
             return $this->getEntityKey($entity) == $key;
         }, $default);
     }
@@ -90,7 +90,7 @@ 
      */
     public function pull($key, $default = null)
     {
-        $this->items = array_filter($this->items, function ($item) use ($key) {
+        $this->items = array_filter($this->items, function($item) use ($key) {
             $primaryKey = $this->getEntityKey($item);
 
             return $primaryKey !== $key;
@@ -181,7 +181,7 @@ 
      */
     public function getEntityHashes()
     {
-        return array_map(function ($entity) {
+        return array_map(function($entity) {
             $class = get_class($entity);
 
             $mapper = Manager::getMapper($class);
@@ -374,7 +374,7 @@ 
      */
     public function max($key = null)
     {
-        return $this->reduce(function ($result, $item) use ($key) {
+        return $this->reduce(function($result, $item) use ($key) {
             $wrapper = $this->factory->make($item);
 
             return (is_null($result) || $wrapper->getEntityAttribute($key) > $result) ?
@@ -393,7 +393,7 @@ 
      */
     public function min($key = null)
     {
-        return $this->reduce(function ($result, $item) use ($key) {
+        return $this->reduce(function($result, $item) use ($key) {
             $wrapper = $this->factory->make($item);
 
             return (is_null($result) || $wrapper->getEntityAttribute($key) < $result)
@@ -453,7 +453,7 @@ 
      */
     public function offsetUnset($key)
     {
-        $this->items = array_filter($this->items, function ($item) use ($key) {
+        $this->items = array_filter($this->items, function($item) use ($key) {
             $primaryKey = $this->getEntityKey($item);
 
             return $primaryKey !== $key;

src/ValueObject.php

Indentation +4 added lines, -4 removed lines

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

src/Repository.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      * - Mappable object instance
      * - Instance of mapper
      *
-     * @param Mapper|Mappable|string $mapper
+     * @param Mapper $mapper
      * @param EntityMap|null         $entityMap (optional)
      *
      * @throws \InvalidArgumentException

Indentation +128 added lines, -128 removed lines

@@ -17,141 +17,141 @@
  */
 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|Mappable|string $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|Mappable|string $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 \Illuminate\Support\Collection
-     */
-    public function all()
-    {
-        return $this->mapper->get();
-    }
+	/**
+	 * Return all Entities from database.
+	 *
+	 * @return \Illuminate\Support\Collection
+	 */
+	public function all()
+	{
+		return $this->mapper->get();
+	}
 
-    /**
-     * Fetch a record from the database.
-     *
-     * @param int $id
-     *
-     * @return \Analogue\ORM\Mappable
-     */
-    public function find($id)
-    {
-        return $this->mapper->find($id);
-    }
+	/**
+	 * Fetch a record from the database.
+	 *
+	 * @param int $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));
+		}
+	}
 }

src/System/Proxies/CollectionProxy.php

Indentation +1292 added lines, -1292 removed lines

@@ -11,1296 +11,1296 @@
 
 class CollectionProxy extends EntityCollection implements ProxyInterface
 {
-    /**
-     * Indicate if the relationship has been lazy loaded.
-     *
-     * @var bool
-     */
-    protected $relationshipLoaded = false;
-
-    /**
-     * Added items.
-     *
-     * @var array
-     */
-    protected $addedItems = [];
-
-    /**
-     * Parent entity.
-     *
-     * @var \Analogue\ORM\Mappable|string
-     */
-    protected $parentEntity;
-
-    /**
-     * Relationship.
-     *
-     * @var string
-     */
-    protected $relationshipMethod;
-
-    /**
-     * Create a new collection.
-     *
-     * @param mixed  $entity
-     * @param string $relation
-     */
-    public function __construct($entity, $relation)
-    {
-        $this->parentEntity = $entity;
-        $this->relationshipMethod = $relation;
-        parent::__construct();
-    }
-
-    /**
-     * Return Items that has been added without lazy loading
-     * the underlying collection.
-     *
-     * @return array
-     */
-    public function getAddedItems()
-    {
-        return $this->addedItems;
-    }
-
-    /**
-     * Force initialization of the proxy.
-     *
-     * @return bool true if the proxy could be initialized
-     */
-    public function initializeProxy() : bool
-    {
-        if ($this->isProxyInitialized()) {
-            return true;
-        }
-
-        $this->items = $this->getRelationshipInstance()
-            ->getResults($this->relationshipMethod)->all() + $this->addedItems;
-
-        $this->relationshipLoaded = true;
-
-        return true;
-    }
-
-    /**
-     * Return instance of the underlying relationship.
-     *
-     * @return Relationship
-     */
-    protected function getRelationshipInstance() : Relationship
-    {
-        $relation = $this->relationshipMethod;
-        $entity = $this->parentEntity;
-        $entityMap = Manager::getMapper($entity)->getEntityMap();
-
-        return $entityMap->$relation($entity);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isProxyInitialized() : bool
-    {
-        return $this->relationshipLoaded;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function toBaseCollection() : Collection
-    {
-        return new Collection($this->items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function all()
-    {
-        $this->initializeProxy();
-
-        return parent::all();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function avg($callback = null)
-    {
-        $this->initializeProxy();
-
-        return parent::avg($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function median($key = null)
-    {
-        $this->initializeProxy();
-
-        return parent::median($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function mode($key = null)
-    {
-        $this->initializeProxy();
-
-        return parent::mode($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collapse()
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->collapse();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function contains($key, $operator = null, $value = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        switch (func_num_args()) {
-            case 1:
-                return $parent->contains($key);
-            case 2:
-                return $parent->contains($key, $operator);
-            case 3:
-                return $parent->contains($key, $operator, $value);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function containsStrict($key, $value = null)
-    {
-        $this->initializeProxy();
-
-        switch (func_num_args()) {
-            case 1:
-                return parent::containsStrict($key);
-            case 2:
-                return parent::containsStrict($key, $value);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function diff($items)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->diff($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function diffUsing($items, callable $callback)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->diffUsing($items, $callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function diffAssocUsing($items, callable $callback)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->diffAssocUsing($items, $callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function diffKeys($items)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->diffKeys($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function diffKeysUsing($items, callable $callback)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->diffKeysUsing($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function each(callable $callback)
-    {
-        $this->initializeProxy();
-
-        return parent::each($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function every($key, $operator = null, $value = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        switch (func_num_args()) {
-            case 1:
-                return $parent->every($key);
-            case 2:
-                return $parent->every($key, $operator);
-            case 3:
-                return $parent->every($key, $operator, $value);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function except($keys)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->except($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function filter(callable $callback = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->filter($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function firstWhere($key, $operator, $value = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->filterWhere($key, $operator, $value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function where($key, $operator, $value = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->where($key, $operator, $value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function whereInstanceOf($type)
-    {
-        $this->initializeProxy();
-
-        return parent::whereInstanceOf($type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function whereNotIn($key, $values, $strict = false)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->whereNotIn($key, $values, $strict);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function whereStrict($key, $value)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->whereStrict($key, $value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function whereIn($key, $values, $strict = false)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->whereIn($key, $values, $strict);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function whereInStrict($key, $values)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->whereInStrict($key, $values);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function first(callable $callback = null, $default = null)
-    {
-        // TODO Consider partial loading
-        $this->initializeProxy();
-
-        return parent::first($callback, $default);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function flatten($depth = INF)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->flatten($depth);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function flip()
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->flip();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function forget($keys)
-    {
-        // TODO, we could consider these as
-        // 'pending deletion', the same way that
-        // we treat added items
-        $this->initializeProxy();
-
-        return parent::forget($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($key, $default = null)
-    {
-        // TODO : We could also consider partial loading
-        // here
-        $this->initializeProxy();
-
-        return parent::get($key, $default);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function groupBy($groupBy, $preserveKeys = false)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->groupBy($groupBy, $preserveKeys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function keyBy($keyBy)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->keyBy($keyBy);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($key)
-    {
-        // TODO : we could do automagic here by directly
-        // calling the database if the collection hasn't
-        // been initialized yet.
-        // Potential issue is that several calls to this
-        // could cause a lot queries vs a single get query.
-        $this->initializeProxy();
-
-        return parent::has($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function implode($value, $glue = null)
-    {
-        $this->initializeProxy();
-
-        return parent::implode($value, $glue);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function intersect($items)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->intersect($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function intersectByKeys($items)
-    {
-        $this->initializeProxy();
-
-        return parent::intersectByKeys($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isEmpty()
-    {
-        $this->initializeProxy();
-
-        return parent::isEmpty();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function keys()
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->keys();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function last(callable $callback = null, $default = null)
-    {
-        // TODO : we could do partial loading there as well
-        $this->initializeProxy();
-
-        return parent::last($callback, $default);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function pluck($value, $key = null)
-    {
-        // TODO : automagic call to QB if not initialized
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->pluck($value, $key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function map(callable $callback)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->map($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function mapInto($class)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->map($class);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function mapWithKeys(callable $callback)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->mapWithKeys($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function mapToDictionary(callable $callback)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->mapWithKeys($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function flatMap(callable $callback)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->flatMap($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function max($callback = null)
-    {
-        $this->initializeProxy();
-
-        return parent::max($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function merge($items)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->merge($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function pad($size, $value)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent($size, $value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function combine($values)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->combine($values);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function times($amount, callable $callback = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->times($amount, $callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function crossJoin(...$lists)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->times(func_num_args());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function diffAssoc($items)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->diffAssoc($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function intersectKey($items)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->intersectKey($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function union($items)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->union($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function min($callback = null)
-    {
-        // TODO : we could rely on the QB
-        // for this, if initialization has not
-        // take place yet
-        $this->initializeProxy();
-
-        return parent::min($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function nth($step, $offset = 0)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->nth($step, $offset);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function only($keys)
-    {
-        // TODO : we could rely on the QB if
-        // the collection hasn't been initialized yet
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->only($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function forPage($page, $perPage)
-    {
-        // TODO : check possibility of partial loading
-        // if not initialized
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->forPage($page, $perPage);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function partition($callback, $operator = null, $value = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        switch (func_num_args()) {
-            case 1:
-                return $parent->partition($callback);
-            case 2:
-                return $parent->partition($callback, $operator);
-            case 3:
-                return $parent->partition($callback, $operator, $value);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function pipe(callable $callback)
-    {
-        $this->initializeProxy();
-
-        return parent::pipe($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function pop()
-    {
-        $this->initializeProxy();
-
-        return parent::pop();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function prepend($value, $key = null)
-    {
-        // TODO : partial adding of values.
-        // we could have a $prepended , and $pushed arrays
-        // which we would combine at full initialization
-
-        $this->initializeProxy();
-
-        return parent::prepend($value, $key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function push($value)
-    {
-        // TODO : partial adding of values.
-        // we could have a $prepended , and $pushed arrays
-        // which we would combine at full initialization
-
-        $this->initializeProxy();
-
-        return parent::push($value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function pull($key, $default = null)
-    {
-        // TODO : QB query if the collection
-        // hasn't been initialized yet
-
-        $this->initializeProxy();
-
-        return parent::pull($key, $default);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function put($key, $value)
-    {
-        // TODO : Partial loading ?
-
-        $this->initializeProxy();
-
-        return parent::put($key, $value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function random($amount = null)
-    {
-        // TODO : we could optimize this by only
-        // fetching the keys from the database
-        // and performing partial loading
-
-        $this->initializeProxy();
-
-        return parent::random($amount);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reduce(callable $callback, $initial = null)
-    {
-        $this->initializeProxy();
-
-        return parent::reduce($callback, $initial);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reject($callback)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->reject($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reverse()
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->reverse();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function search($value, $strict = false)
-    {
-        $this->initializeProxy();
-
-        return parent::search($value, $strict);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function shift()
-    {
-        // Todo : Partial Removing
-        // we could have a pending removal array
-        $this->initializeProxy();
-
-        return parent::shift();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function shuffle($seed = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->shuffle($seed);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function slice($offset, $length = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->slice($offset, $length);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function split($numberOfGroups)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->split($numberOfGroups);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function chunk($size)
-    {
-        // TODO : partial loading ?
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->chunk($size);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function sort(callable $callback = null)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->sort($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function sortBy($callback, $options = SORT_REGULAR, $descending = false)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->sortBy($callback, $options, $descending);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function sortKeys($options = SORT_REGULAR, $descending = false)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->sortKeys($options, $descending);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function splice($offset, $length = null, $replacement = [])
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        switch (func_num_args()) {
-            case 1:
-                $parent->splice($offset);
-            case 2:
-                $parent->splice($offset, $length);
-            case 3:
-                $parent->splice($offset, $length, $replacement);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function sum($callback = null)
-    {
-        $this->initializeProxy();
-
-        return parent::sum($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function take($limit)
-    {
-        // TODO: partial loading
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->take($limit);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function tap(callable $callback)
-    {
-        $this->initializeProxy();
-
-        return parent::tap($this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function transform(callable $callback)
-    {
-        $this->initializeProxy();
-
-        return parent::transform($callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function unique($key = null, $strict = false)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->unique($key, $strict);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function values()
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->values();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function when($value, callable $callback, callable $default = null)
-    {
-        $this->initializeProxy();
-
-        return parent::when($value, $callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function zip($items)
-    {
-        $this->initializeProxy();
-
-        $parent = $this->toBaseCollection();
-
-        return $parent->zip($items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function toArray()
-    {
-        // If this is called on all subsequent proxy,
-        // this would eventually trigger all lazy loading,
-        // which is NOT what we would expect...
-        // TODO : must think of this.
-        $this->initializeProxy();
-
-        return parent::toArray();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function jsonSerialize()
-    {
-        // If this is called on all subsequent proxy,
-        // this would eventually trigger all lazy loading,
-        // which is NOT what we would expect...
-        // TODO : must think of this.
-        $this->initializeProxy();
-
-        return parent::jsonSerialize();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function toJson($options = 0)
-    {
-        // If this is called on all subsequent proxy,
-        // this would eventually trigger all lazy loading,
-        // which is NOT what we would expect...
-        // TODO : must think of this.
-        $this->initializeProxy();
-
-        return parent::toJson($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIterator()
-    {
-        $this->initializeProxy();
-
-        return parent::getIterator();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCachingIterator($flags = CachingIterator::CALL_TOSTRING)
-    {
-        $this->initializeProxy();
-
-        return parent::getCachingIterator($flags);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function count()
-    {
-        return $this->relationshipLoaded
-            ? parent::count()
-            : $this->countUsingDatabaseQuery();
-    }
-
-    /**
-     * Do a count query and return the result.
-     *
-     * @return int
-     */
-    protected function countUsingDatabaseQuery() : int
-    {
-        return $this->getRelationshipInstance()->count();
-    }
-
-    /**
-     * Get a base Support collection instance from this collection.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function toBase()
-    {
-        $this->initializeProxy();
-
-        return parent::toBase();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetExists($key)
-    {
-        // TODO rely on QB if no collection
-        // initialized
-        $this->initializeProxy();
-
-        return parent::offsetExists($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetGet($key)
-    {
-        // TODO rely on partial init if no collection
-        // initialized
-        $this->initializeProxy();
-
-        return parent::offsetGet($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetSet($key, $value)
-    {
-        // TODO : think of the use of it into a ProxyCollection
-        // context
-        $this->initializeProxy();
-
-        return parent::offsetSet($key, $value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetUnset($key)
-    {
-        // TODO : think of the use of it into a ProxyCollection
-        // context
-        $this->initializeProxy();
-
-        return parent::offsetUnset($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __get($key)
-    {
-        parent::__get($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __call($method, $parameters)
-    {
-        $this->initializeProxy();
-
-        return parent::__call($method, $parameters);
-    }
+	/**
+	 * Indicate if the relationship has been lazy loaded.
+	 *
+	 * @var bool
+	 */
+	protected $relationshipLoaded = false;
+
+	/**
+	 * Added items.
+	 *
+	 * @var array
+	 */
+	protected $addedItems = [];
+
+	/**
+	 * Parent entity.
+	 *
+	 * @var \Analogue\ORM\Mappable|string
+	 */
+	protected $parentEntity;
+
+	/**
+	 * Relationship.
+	 *
+	 * @var string
+	 */
+	protected $relationshipMethod;
+
+	/**
+	 * Create a new collection.
+	 *
+	 * @param mixed  $entity
+	 * @param string $relation
+	 */
+	public function __construct($entity, $relation)
+	{
+		$this->parentEntity = $entity;
+		$this->relationshipMethod = $relation;
+		parent::__construct();
+	}
+
+	/**
+	 * Return Items that has been added without lazy loading
+	 * the underlying collection.
+	 *
+	 * @return array
+	 */
+	public function getAddedItems()
+	{
+		return $this->addedItems;
+	}
+
+	/**
+	 * Force initialization of the proxy.
+	 *
+	 * @return bool true if the proxy could be initialized
+	 */
+	public function initializeProxy() : bool
+	{
+		if ($this->isProxyInitialized()) {
+			return true;
+		}
+
+		$this->items = $this->getRelationshipInstance()
+			->getResults($this->relationshipMethod)->all() + $this->addedItems;
+
+		$this->relationshipLoaded = true;
+
+		return true;
+	}
+
+	/**
+	 * Return instance of the underlying relationship.
+	 *
+	 * @return Relationship
+	 */
+	protected function getRelationshipInstance() : Relationship
+	{
+		$relation = $this->relationshipMethod;
+		$entity = $this->parentEntity;
+		$entityMap = Manager::getMapper($entity)->getEntityMap();
+
+		return $entityMap->$relation($entity);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isProxyInitialized() : bool
+	{
+		return $this->relationshipLoaded;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function toBaseCollection() : Collection
+	{
+		return new Collection($this->items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function all()
+	{
+		$this->initializeProxy();
+
+		return parent::all();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function avg($callback = null)
+	{
+		$this->initializeProxy();
+
+		return parent::avg($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function median($key = null)
+	{
+		$this->initializeProxy();
+
+		return parent::median($key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function mode($key = null)
+	{
+		$this->initializeProxy();
+
+		return parent::mode($key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function collapse()
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->collapse();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function contains($key, $operator = null, $value = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		switch (func_num_args()) {
+			case 1:
+				return $parent->contains($key);
+			case 2:
+				return $parent->contains($key, $operator);
+			case 3:
+				return $parent->contains($key, $operator, $value);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function containsStrict($key, $value = null)
+	{
+		$this->initializeProxy();
+
+		switch (func_num_args()) {
+			case 1:
+				return parent::containsStrict($key);
+			case 2:
+				return parent::containsStrict($key, $value);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function diff($items)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->diff($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function diffUsing($items, callable $callback)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->diffUsing($items, $callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function diffAssocUsing($items, callable $callback)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->diffAssocUsing($items, $callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function diffKeys($items)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->diffKeys($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function diffKeysUsing($items, callable $callback)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->diffKeysUsing($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function each(callable $callback)
+	{
+		$this->initializeProxy();
+
+		return parent::each($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function every($key, $operator = null, $value = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		switch (func_num_args()) {
+			case 1:
+				return $parent->every($key);
+			case 2:
+				return $parent->every($key, $operator);
+			case 3:
+				return $parent->every($key, $operator, $value);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function except($keys)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->except($keys);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function filter(callable $callback = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->filter($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function firstWhere($key, $operator, $value = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->filterWhere($key, $operator, $value);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function where($key, $operator, $value = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->where($key, $operator, $value);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function whereInstanceOf($type)
+	{
+		$this->initializeProxy();
+
+		return parent::whereInstanceOf($type);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function whereNotIn($key, $values, $strict = false)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->whereNotIn($key, $values, $strict);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function whereStrict($key, $value)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->whereStrict($key, $value);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function whereIn($key, $values, $strict = false)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->whereIn($key, $values, $strict);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function whereInStrict($key, $values)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->whereInStrict($key, $values);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function first(callable $callback = null, $default = null)
+	{
+		// TODO Consider partial loading
+		$this->initializeProxy();
+
+		return parent::first($callback, $default);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function flatten($depth = INF)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->flatten($depth);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function flip()
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->flip();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function forget($keys)
+	{
+		// TODO, we could consider these as
+		// 'pending deletion', the same way that
+		// we treat added items
+		$this->initializeProxy();
+
+		return parent::forget($keys);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($key, $default = null)
+	{
+		// TODO : We could also consider partial loading
+		// here
+		$this->initializeProxy();
+
+		return parent::get($key, $default);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function groupBy($groupBy, $preserveKeys = false)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->groupBy($groupBy, $preserveKeys);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function keyBy($keyBy)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->keyBy($keyBy);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function has($key)
+	{
+		// TODO : we could do automagic here by directly
+		// calling the database if the collection hasn't
+		// been initialized yet.
+		// Potential issue is that several calls to this
+		// could cause a lot queries vs a single get query.
+		$this->initializeProxy();
+
+		return parent::has($key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function implode($value, $glue = null)
+	{
+		$this->initializeProxy();
+
+		return parent::implode($value, $glue);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function intersect($items)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->intersect($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function intersectByKeys($items)
+	{
+		$this->initializeProxy();
+
+		return parent::intersectByKeys($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isEmpty()
+	{
+		$this->initializeProxy();
+
+		return parent::isEmpty();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function keys()
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->keys();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function last(callable $callback = null, $default = null)
+	{
+		// TODO : we could do partial loading there as well
+		$this->initializeProxy();
+
+		return parent::last($callback, $default);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function pluck($value, $key = null)
+	{
+		// TODO : automagic call to QB if not initialized
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->pluck($value, $key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function map(callable $callback)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->map($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function mapInto($class)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->map($class);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function mapWithKeys(callable $callback)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->mapWithKeys($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function mapToDictionary(callable $callback)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->mapWithKeys($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function flatMap(callable $callback)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->flatMap($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function max($callback = null)
+	{
+		$this->initializeProxy();
+
+		return parent::max($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function merge($items)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->merge($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function pad($size, $value)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent($size, $value);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function combine($values)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->combine($values);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function times($amount, callable $callback = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->times($amount, $callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function crossJoin(...$lists)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->times(func_num_args());
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function diffAssoc($items)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->diffAssoc($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function intersectKey($items)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->intersectKey($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function union($items)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->union($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function min($callback = null)
+	{
+		// TODO : we could rely on the QB
+		// for this, if initialization has not
+		// take place yet
+		$this->initializeProxy();
+
+		return parent::min($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function nth($step, $offset = 0)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->nth($step, $offset);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function only($keys)
+	{
+		// TODO : we could rely on the QB if
+		// the collection hasn't been initialized yet
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->only($keys);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function forPage($page, $perPage)
+	{
+		// TODO : check possibility of partial loading
+		// if not initialized
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->forPage($page, $perPage);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function partition($callback, $operator = null, $value = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		switch (func_num_args()) {
+			case 1:
+				return $parent->partition($callback);
+			case 2:
+				return $parent->partition($callback, $operator);
+			case 3:
+				return $parent->partition($callback, $operator, $value);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function pipe(callable $callback)
+	{
+		$this->initializeProxy();
+
+		return parent::pipe($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function pop()
+	{
+		$this->initializeProxy();
+
+		return parent::pop();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function prepend($value, $key = null)
+	{
+		// TODO : partial adding of values.
+		// we could have a $prepended , and $pushed arrays
+		// which we would combine at full initialization
+
+		$this->initializeProxy();
+
+		return parent::prepend($value, $key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function push($value)
+	{
+		// TODO : partial adding of values.
+		// we could have a $prepended , and $pushed arrays
+		// which we would combine at full initialization
+
+		$this->initializeProxy();
+
+		return parent::push($value);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function pull($key, $default = null)
+	{
+		// TODO : QB query if the collection
+		// hasn't been initialized yet
+
+		$this->initializeProxy();
+
+		return parent::pull($key, $default);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function put($key, $value)
+	{
+		// TODO : Partial loading ?
+
+		$this->initializeProxy();
+
+		return parent::put($key, $value);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function random($amount = null)
+	{
+		// TODO : we could optimize this by only
+		// fetching the keys from the database
+		// and performing partial loading
+
+		$this->initializeProxy();
+
+		return parent::random($amount);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function reduce(callable $callback, $initial = null)
+	{
+		$this->initializeProxy();
+
+		return parent::reduce($callback, $initial);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function reject($callback)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->reject($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function reverse()
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->reverse();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function search($value, $strict = false)
+	{
+		$this->initializeProxy();
+
+		return parent::search($value, $strict);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function shift()
+	{
+		// Todo : Partial Removing
+		// we could have a pending removal array
+		$this->initializeProxy();
+
+		return parent::shift();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function shuffle($seed = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->shuffle($seed);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function slice($offset, $length = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->slice($offset, $length);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function split($numberOfGroups)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->split($numberOfGroups);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function chunk($size)
+	{
+		// TODO : partial loading ?
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->chunk($size);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function sort(callable $callback = null)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->sort($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function sortBy($callback, $options = SORT_REGULAR, $descending = false)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->sortBy($callback, $options, $descending);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function sortKeys($options = SORT_REGULAR, $descending = false)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->sortKeys($options, $descending);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function splice($offset, $length = null, $replacement = [])
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		switch (func_num_args()) {
+			case 1:
+				$parent->splice($offset);
+			case 2:
+				$parent->splice($offset, $length);
+			case 3:
+				$parent->splice($offset, $length, $replacement);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function sum($callback = null)
+	{
+		$this->initializeProxy();
+
+		return parent::sum($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function take($limit)
+	{
+		// TODO: partial loading
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->take($limit);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function tap(callable $callback)
+	{
+		$this->initializeProxy();
+
+		return parent::tap($this);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function transform(callable $callback)
+	{
+		$this->initializeProxy();
+
+		return parent::transform($callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function unique($key = null, $strict = false)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->unique($key, $strict);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function values()
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->values();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function when($value, callable $callback, callable $default = null)
+	{
+		$this->initializeProxy();
+
+		return parent::when($value, $callback);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function zip($items)
+	{
+		$this->initializeProxy();
+
+		$parent = $this->toBaseCollection();
+
+		return $parent->zip($items);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function toArray()
+	{
+		// If this is called on all subsequent proxy,
+		// this would eventually trigger all lazy loading,
+		// which is NOT what we would expect...
+		// TODO : must think of this.
+		$this->initializeProxy();
+
+		return parent::toArray();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function jsonSerialize()
+	{
+		// If this is called on all subsequent proxy,
+		// this would eventually trigger all lazy loading,
+		// which is NOT what we would expect...
+		// TODO : must think of this.
+		$this->initializeProxy();
+
+		return parent::jsonSerialize();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function toJson($options = 0)
+	{
+		// If this is called on all subsequent proxy,
+		// this would eventually trigger all lazy loading,
+		// which is NOT what we would expect...
+		// TODO : must think of this.
+		$this->initializeProxy();
+
+		return parent::toJson($options);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getIterator()
+	{
+		$this->initializeProxy();
+
+		return parent::getIterator();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getCachingIterator($flags = CachingIterator::CALL_TOSTRING)
+	{
+		$this->initializeProxy();
+
+		return parent::getCachingIterator($flags);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function count()
+	{
+		return $this->relationshipLoaded
+			? parent::count()
+			: $this->countUsingDatabaseQuery();
+	}
+
+	/**
+	 * Do a count query and return the result.
+	 *
+	 * @return int
+	 */
+	protected function countUsingDatabaseQuery() : int
+	{
+		return $this->getRelationshipInstance()->count();
+	}
+
+	/**
+	 * Get a base Support collection instance from this collection.
+	 *
+	 * @return \Illuminate\Support\Collection
+	 */
+	public function toBase()
+	{
+		$this->initializeProxy();
+
+		return parent::toBase();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function offsetExists($key)
+	{
+		// TODO rely on QB if no collection
+		// initialized
+		$this->initializeProxy();
+
+		return parent::offsetExists($key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function offsetGet($key)
+	{
+		// TODO rely on partial init if no collection
+		// initialized
+		$this->initializeProxy();
+
+		return parent::offsetGet($key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function offsetSet($key, $value)
+	{
+		// TODO : think of the use of it into a ProxyCollection
+		// context
+		$this->initializeProxy();
+
+		return parent::offsetSet($key, $value);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function offsetUnset($key)
+	{
+		// TODO : think of the use of it into a ProxyCollection
+		// context
+		$this->initializeProxy();
+
+		return parent::offsetUnset($key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __get($key)
+	{
+		parent::__get($key);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __call($method, $parameters)
+	{
+		$this->initializeProxy();
+
+		return parent::__call($method, $parameters);
+	}
 }

src/System/Cache/AttributeCache.php

Indentation +360 added lines, -360 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     {
         return $result;
 
-        return array_filter($result, function ($attribute) {
+        return array_filter($result, function($attribute) {
             return !is_object($attribute);
         });
     }

src/Relationships/EmbeddedRelationship.php

Indentation +246 added lines, -246 removed lines

@@ -8,250 +8,250 @@
 
 abstract class EmbeddedRelationship
 {
-    /**
-     * The class that embeds the current relation.
-     *
-     * @var string
-     */
-    protected $parentClass;
-
-    /**
-     * The class of the embedded relation.
-     *
-     * @var string
-     */
-    protected $relatedClass;
-
-    /**
-     * The relation attribute on the parent object.
-     *
-     * @var string
-     */
-    protected $relation;
-
-    /**
-     * If set to true, embedded Object's attributes will
-     * be stored as a serialized array in a JSON Column.
-     *
-     * @var bool
-     */
-    protected $asArray = false;
-
-    /**
-     * If set to true, embedded Object's attributes will
-     * be json encoded before storing to database.
-     *
-     * @var bool
-     */
-    protected $asJson = false;
-
-    /**
-     * Prefix on which the object's attributes are saved into
-     * the parent's table. defaults to "<relatedClass>_".
-     *
-     * @var string
-     */
-    protected $prefix;
-
-    /**
-     * Attributes Map allow the calling EntityMap to overrides attributes
-     * on the embedded relation.
-     *
-     * @var array
-     */
-    protected $columnMap = [];
-
-    /**
-     * Wrapper factory.
-     *
-     * @var \Analogue\ORM\System\Wrappers\Factory
-     */
-    protected $factory;
-
-    public function __construct($parent, string $relatedClass, string $relation)
-    {
-        $this->parentClass = get_class($parent);
-        $this->relatedClass = $relatedClass;
-        $this->relation = $relation;
-        $this->prefix = $relation.'_';
-        $this->factory = new Factory();
-    }
-
-    /**
-     * Switch the 'store as array' feature.
-     *
-     * @param bool $storeAsArray
-     *
-     * @return static
-     */
-    public function asArray(bool $storeAsArray = true)
-    {
-        $this->asArray = $storeAsArray;
-
-        return $this;
-    }
-
-    /**
-     * Switch the 'store as json' feature.
-     *
-     * @param bool $storeAsJson
-     *
-     * @return static
-     */
-    public function asJson(bool $storeAsJson = true)
-    {
-        $this->asJson = $storeAsJson;
-
-        return $this->asArray();
-    }
-
-    /**
-     * Set the column map for the embedded relation.
-     *
-     * @param array $columns
-     *
-     * @return static
-     */
-    public function setColumnMap(array $columns)
-    {
-        $this->columnMap = $columns;
-
-        return $this;
-    }
-
-    /**
-     * Set parent's attribute prefix.
-     *
-     * @param string $prefix
-     *
-     * @return static
-     */
-    public function setPrefix(string $prefix)
-    {
-        $this->prefix = $prefix;
-
-        return $this;
-    }
-
-    /**
-     * Return parent's attribute prefix.
-     *
-     * @return string
-     */
-    public function getPrefix() : string
-    {
-        return $this->prefix;
-    }
-
-    /**
-     * Get the embedded object's attributes that will be
-     * hydrated using parent's entity attributes.
-     *
-     * @return array
-     */
-    protected function getEmbeddedObjectAttributes() : array
-    {
-        $entityMap = $this->getRelatedMapper()->getEntityMap();
-
-        $attributes = $entityMap->getAttributes();
-        $properties = $entityMap->getProperties();
-
-        return array_merge($attributes, $properties);
-    }
-
-    /**
-     * Get the corresponding attribute on parent's attributes.
-     *
-     * @param string $key
-     *
-     * @return string
-     */
-    protected function getParentAttributeKey($key) : string
-    {
-        return $this->getPrefixedAttributeKey($this->getMappedParentAttribute($key));
-    }
-
-    /**
-     * Get attribute name from the parent, if a map has been
-     * defined.
-     *
-     * @param string $key
-     *
-     * @return string
-     */
-    protected function getMappedParentAttribute(string $key) : string
-    {
-        if (array_key_exists($key, $this->columnMap)) {
-            return $this->columnMap[$key];
-        } else {
-            return $key;
-        }
-    }
-
-    /**
-     * Return the name of the attribute with key.
-     *
-     * @param string $attributeKey
-     *
-     * @return string
-     */
-    protected function getPrefixedAttributeKey(string $attributeKey) : string
-    {
-        return $this->prefix.$attributeKey;
-    }
-
-    /**
-     * Transform attributes into embedded object(s), and
-     * match it into the given resultset.
-     *
-     * @return array
-     */
-    abstract public function match(array $results) : array;
-
-    /**
-     * Build an embedded object instance.
-     *
-     * @param array $attributes
-     *
-     * @return mixed
-     */
-    protected function buildEmbeddedObject(array $attributes)
-    {
-        $resultBuilder = new ResultBuilder($this->getRelatedMapper());
-
-        // TODO : find a way to support eager load within an embedded
-        // object.
-        $eagerLoads = [];
-
-        return $resultBuilder->build([$attributes], $eagerLoads)[0];
-    }
-
-    /**
-     * Transform embedded object into db column(s).
-     *
-     * @param mixed $object
-     *
-     * @return array $columns
-     */
-    abstract public function normalize($object) : array;
-
-    /**
-     * Return parent mapper.
-     *
-     * @return \Analogue\ORM\System\Mapper
-     */
-    protected function getParentMapper()
-    {
-        return Manager::getInstance()->mapper($this->parentClass);
-    }
-
-    /**
-     * Return embedded relationship mapper.
-     *
-     * @return \Analogue\ORM\System\Mapper
-     */
-    protected function getRelatedMapper()
-    {
-        return Manager::getInstance()->mapper($this->relatedClass);
-    }
+	/**
+	 * The class that embeds the current relation.
+	 *
+	 * @var string
+	 */
+	protected $parentClass;
+
+	/**
+	 * The class of the embedded relation.
+	 *
+	 * @var string
+	 */
+	protected $relatedClass;
+
+	/**
+	 * The relation attribute on the parent object.
+	 *
+	 * @var string
+	 */
+	protected $relation;
+
+	/**
+	 * If set to true, embedded Object's attributes will
+	 * be stored as a serialized array in a JSON Column.
+	 *
+	 * @var bool
+	 */
+	protected $asArray = false;
+
+	/**
+	 * If set to true, embedded Object's attributes will
+	 * be json encoded before storing to database.
+	 *
+	 * @var bool
+	 */
+	protected $asJson = false;
+
+	/**
+	 * Prefix on which the object's attributes are saved into
+	 * the parent's table. defaults to "<relatedClass>_".
+	 *
+	 * @var string
+	 */
+	protected $prefix;
+
+	/**
+	 * Attributes Map allow the calling EntityMap to overrides attributes
+	 * on the embedded relation.
+	 *
+	 * @var array
+	 */
+	protected $columnMap = [];
+
+	/**
+	 * Wrapper factory.
+	 *
+	 * @var \Analogue\ORM\System\Wrappers\Factory
+	 */
+	protected $factory;
+
+	public function __construct($parent, string $relatedClass, string $relation)
+	{
+		$this->parentClass = get_class($parent);
+		$this->relatedClass = $relatedClass;
+		$this->relation = $relation;
+		$this->prefix = $relation.'_';
+		$this->factory = new Factory();
+	}
+
+	/**
+	 * Switch the 'store as array' feature.
+	 *
+	 * @param bool $storeAsArray
+	 *
+	 * @return static
+	 */
+	public function asArray(bool $storeAsArray = true)
+	{
+		$this->asArray = $storeAsArray;
+
+		return $this;
+	}
+
+	/**
+	 * Switch the 'store as json' feature.
+	 *
+	 * @param bool $storeAsJson
+	 *
+	 * @return static
+	 */
+	public function asJson(bool $storeAsJson = true)
+	{
+		$this->asJson = $storeAsJson;
+
+		return $this->asArray();
+	}
+
+	/**
+	 * Set the column map for the embedded relation.
+	 *
+	 * @param array $columns
+	 *
+	 * @return static
+	 */
+	public function setColumnMap(array $columns)
+	{
+		$this->columnMap = $columns;
+
+		return $this;
+	}
+
+	/**
+	 * Set parent's attribute prefix.
+	 *
+	 * @param string $prefix
+	 *
+	 * @return static
+	 */
+	public function setPrefix(string $prefix)
+	{
+		$this->prefix = $prefix;
+
+		return $this;
+	}
+
+	/**
+	 * Return parent's attribute prefix.
+	 *
+	 * @return string
+	 */
+	public function getPrefix() : string
+	{
+		return $this->prefix;
+	}
+
+	/**
+	 * Get the embedded object's attributes that will be
+	 * hydrated using parent's entity attributes.
+	 *
+	 * @return array
+	 */
+	protected function getEmbeddedObjectAttributes() : array
+	{
+		$entityMap = $this->getRelatedMapper()->getEntityMap();
+
+		$attributes = $entityMap->getAttributes();
+		$properties = $entityMap->getProperties();
+
+		return array_merge($attributes, $properties);
+	}
+
+	/**
+	 * Get the corresponding attribute on parent's attributes.
+	 *
+	 * @param string $key
+	 *
+	 * @return string
+	 */
+	protected function getParentAttributeKey($key) : string
+	{
+		return $this->getPrefixedAttributeKey($this->getMappedParentAttribute($key));
+	}
+
+	/**
+	 * Get attribute name from the parent, if a map has been
+	 * defined.
+	 *
+	 * @param string $key
+	 *
+	 * @return string
+	 */
+	protected function getMappedParentAttribute(string $key) : string
+	{
+		if (array_key_exists($key, $this->columnMap)) {
+			return $this->columnMap[$key];
+		} else {
+			return $key;
+		}
+	}
+
+	/**
+	 * Return the name of the attribute with key.
+	 *
+	 * @param string $attributeKey
+	 *
+	 * @return string
+	 */
+	protected function getPrefixedAttributeKey(string $attributeKey) : string
+	{
+		return $this->prefix.$attributeKey;
+	}
+
+	/**
+	 * Transform attributes into embedded object(s), and
+	 * match it into the given resultset.
+	 *
+	 * @return array
+	 */
+	abstract public function match(array $results) : array;
+
+	/**
+	 * Build an embedded object instance.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return mixed
+	 */
+	protected function buildEmbeddedObject(array $attributes)
+	{
+		$resultBuilder = new ResultBuilder($this->getRelatedMapper());
+
+		// TODO : find a way to support eager load within an embedded
+		// object.
+		$eagerLoads = [];
+
+		return $resultBuilder->build([$attributes], $eagerLoads)[0];
+	}
+
+	/**
+	 * Transform embedded object into db column(s).
+	 *
+	 * @param mixed $object
+	 *
+	 * @return array $columns
+	 */
+	abstract public function normalize($object) : array;
+
+	/**
+	 * Return parent mapper.
+	 *
+	 * @return \Analogue\ORM\System\Mapper
+	 */
+	protected function getParentMapper()
+	{
+		return Manager::getInstance()->mapper($this->parentClass);
+	}
+
+	/**
+	 * Return embedded relationship mapper.
+	 *
+	 * @return \Analogue\ORM\System\Mapper
+	 */
+	protected function getRelatedMapper()
+	{
+		return Manager::getInstance()->mapper($this->relatedClass);
+	}
 }

src/Relationships/EmbedsOne.php

Indentation +192 added lines, -192 removed lines

@@ -6,196 +6,196 @@
 
 class EmbedsOne extends EmbeddedRelationship
 {
-    /**
-     * The relation attribute on the parent object.
-     *
-     * @var string
-     */
-    protected $relation;
-
-    /**
-     * Transform attributes into embedded object(s), and
-     * match it into the given result set.
-     *
-     * @param array $results
-     *
-     * @return array
-     */
-    public function match(array $results) : array
-    {
-        return array_map([$this, 'matchSingleResult'], $results);
-    }
-
-    /**
-     * Match a single database row's attributes to a single
-     * object, and return the updated attributes.
-     *
-     * @param array $attributes
-     *
-     * @return array
-     */
-    public function matchSingleResult(array $attributes) : array
-    {
-        return $this->asArray ? $this->matchAsArray($attributes) : $this->matchAsAttributes($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) && !is_array($key)) {
-            throw new MappingException("'$key' column should be an array");
-        }
-
-        if ($this->asJson) {
-            $attributes[$key] = json_decode($attributes[$key], true);
-        }
-
-        $attributes[$key] = $this->buildEmbeddedObject($attributes[$key]);
-
-        return $attributes;
-    }
-
-    /**
-     * Transform attributes from the parent entity result into
-     * an embedded object, and return the updated attributes.
-     *
-     * @param array $attributes
-     *
-     * @return array
-     */
-    protected function matchAsAttributes(array $attributes) : array
-    {
-        $attributesMap = $this->getAttributesDictionnary();
-
-        // Get the subset that only the embedded object is concerned with and, convert it back
-        // to embedded object attributes keys
-        $originalAttributes = array_only($attributes, $attributesMap);
-
-        $embeddedAttributes = [];
-
-        foreach ($originalAttributes as $key => $value) {
-            $embeddedKey = array_search($key, $attributesMap);
-            $embeddedAttributes[$embeddedKey] = $value;
-        }
-
-        // Unset original attributes before, just in case one of the keys of the
-        // original attributes is equals the relation name.
-        foreach (array_keys($originalAttributes) as $key) {
-            unset($attributes[$key]);
-        }
-
-        // Build object
-        $attributes[$this->relation] = $this->buildEmbeddedObject($embeddedAttributes);
-
-        return $attributes;
-    }
-
-    /**
-     * Return a dictionary of attributes key on parent Entity.
-     *
-     * @return array
-     */
-    protected function getAttributesDictionnary() : array
-    {
-        // Get attributes that belongs to the embedded object
-        $embeddedAttributeKeys = $this->getEmbeddedObjectAttributes();
-
-        $attributesMap = [];
-
-        // Build a dictionary for corresponding object attributes => parent attributes
-        foreach ($embeddedAttributeKeys as $key) {
-            $attributesMap[$key] = $this->getParentAttributeKey($key);
-        }
-
-        return $attributesMap;
-    }
-
-    /**
-     * Transform embedded object into DB column(s).
-     *
-     * @param mixed $object
-     *
-     * @return array $columns
-     */
-    public function normalize($object) : array
-    {
-        return $this->asArray ? $this->normalizeAsArray($object) : $this->normalizeAsAttributes($object);
-    }
-
-    /**
-     * Normalize object an array containing raw attributes.
-     *
-     * @param mixed $object
-     *
-     * @return array
-     */
-    protected function normalizeAsArray($object) : array
-    {
-        $wrapper = $this->factory->make($object);
-
-        $value = $wrapper->getEntityAttributes();
-
-        if ($this->asJson) {
-            $value = json_encode($value);
-        }
-
-        return [$this->relation => $value];
-    }
-
-    /**
-     * Normalize object as parent's attributes.
-     *
-     * @param mixed $object
-     *
-     * @return array
-     */
-    protected function normalizeAsAttributes($object) : array
-    {
-        if (is_null($object)) {
-            return $this->nullObjectAttributes();
-        }
-
-        $attributesMap = $this->getAttributesDictionnary();
-
-        $wrapper = $this->factory->make($object);
-
-        $normalizedAttributes = [];
-
-        foreach ($attributesMap as $embedKey => $parentKey) {
-            $normalizedAttributes[$parentKey] = $wrapper->getEntityAttribute($embedKey);
-        }
-
-        return $normalizedAttributes;
-    }
-
-    /**
-     * Set all object attributes to null.
-     *
-     * @return array
-     */
-    protected function nullObjectAttributes() : array
-    {
-        $attributesMap = $this->getAttributesDictionnary();
-
-        $normalizedAttributes = [];
-
-        foreach ($attributesMap as $embedKey => $parentKey) {
-            $normalizedAttributes[$parentKey] = null;
-        }
-
-        return $normalizedAttributes;
-    }
+	/**
+	 * The relation attribute on the parent object.
+	 *
+	 * @var string
+	 */
+	protected $relation;
+
+	/**
+	 * Transform attributes into embedded object(s), and
+	 * match it into the given result set.
+	 *
+	 * @param array $results
+	 *
+	 * @return array
+	 */
+	public function match(array $results) : array
+	{
+		return array_map([$this, 'matchSingleResult'], $results);
+	}
+
+	/**
+	 * Match a single database row's attributes to a single
+	 * object, and return the updated attributes.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return array
+	 */
+	public function matchSingleResult(array $attributes) : array
+	{
+		return $this->asArray ? $this->matchAsArray($attributes) : $this->matchAsAttributes($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) && !is_array($key)) {
+			throw new MappingException("'$key' column should be an array");
+		}
+
+		if ($this->asJson) {
+			$attributes[$key] = json_decode($attributes[$key], true);
+		}
+
+		$attributes[$key] = $this->buildEmbeddedObject($attributes[$key]);
+
+		return $attributes;
+	}
+
+	/**
+	 * Transform attributes from the parent entity result into
+	 * an embedded object, and return the updated attributes.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return array
+	 */
+	protected function matchAsAttributes(array $attributes) : array
+	{
+		$attributesMap = $this->getAttributesDictionnary();
+
+		// Get the subset that only the embedded object is concerned with and, convert it back
+		// to embedded object attributes keys
+		$originalAttributes = array_only($attributes, $attributesMap);
+
+		$embeddedAttributes = [];
+
+		foreach ($originalAttributes as $key => $value) {
+			$embeddedKey = array_search($key, $attributesMap);
+			$embeddedAttributes[$embeddedKey] = $value;
+		}
+
+		// Unset original attributes before, just in case one of the keys of the
+		// original attributes is equals the relation name.
+		foreach (array_keys($originalAttributes) as $key) {
+			unset($attributes[$key]);
+		}
+
+		// Build object
+		$attributes[$this->relation] = $this->buildEmbeddedObject($embeddedAttributes);
+
+		return $attributes;
+	}
+
+	/**
+	 * Return a dictionary of attributes key on parent Entity.
+	 *
+	 * @return array
+	 */
+	protected function getAttributesDictionnary() : array
+	{
+		// Get attributes that belongs to the embedded object
+		$embeddedAttributeKeys = $this->getEmbeddedObjectAttributes();
+
+		$attributesMap = [];
+
+		// Build a dictionary for corresponding object attributes => parent attributes
+		foreach ($embeddedAttributeKeys as $key) {
+			$attributesMap[$key] = $this->getParentAttributeKey($key);
+		}
+
+		return $attributesMap;
+	}
+
+	/**
+	 * Transform embedded object into DB column(s).
+	 *
+	 * @param mixed $object
+	 *
+	 * @return array $columns
+	 */
+	public function normalize($object) : array
+	{
+		return $this->asArray ? $this->normalizeAsArray($object) : $this->normalizeAsAttributes($object);
+	}
+
+	/**
+	 * Normalize object an array containing raw attributes.
+	 *
+	 * @param mixed $object
+	 *
+	 * @return array
+	 */
+	protected function normalizeAsArray($object) : array
+	{
+		$wrapper = $this->factory->make($object);
+
+		$value = $wrapper->getEntityAttributes();
+
+		if ($this->asJson) {
+			$value = json_encode($value);
+		}
+
+		return [$this->relation => $value];
+	}
+
+	/**
+	 * Normalize object as parent's attributes.
+	 *
+	 * @param mixed $object
+	 *
+	 * @return array
+	 */
+	protected function normalizeAsAttributes($object) : array
+	{
+		if (is_null($object)) {
+			return $this->nullObjectAttributes();
+		}
+
+		$attributesMap = $this->getAttributesDictionnary();
+
+		$wrapper = $this->factory->make($object);
+
+		$normalizedAttributes = [];
+
+		foreach ($attributesMap as $embedKey => $parentKey) {
+			$normalizedAttributes[$parentKey] = $wrapper->getEntityAttribute($embedKey);
+		}
+
+		return $normalizedAttributes;
+	}
+
+	/**
+	 * Set all object attributes to null.
+	 *
+	 * @return array
+	 */
+	protected function nullObjectAttributes() : array
+	{
+		$attributesMap = $this->getAttributesDictionnary();
+
+		$normalizedAttributes = [];
+
+		foreach ($attributesMap as $embedKey => $parentKey) {
+			$normalizedAttributes[$parentKey] = null;
+		}
+
+		return $normalizedAttributes;
+	}
 }