analogueorm / analogue

src/Plugins/SoftDeletes/SoftDeletesPlugin.php

Indentation +77 added lines, -77 removed lines

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

src/Entity.php

Indentation +137 added lines, -137 removed lines

@@ -6,141 +6,141 @@
 
 class Entity extends ValueObject
 {
-    /**
-     * Entities Hidden Attributes, that will be discarded when converting
-     * the entity to Array/Json
-     * (can include any embedded object's attribute).
-     *
-     * @var array
-     */
-    protected $hidden = [];
-
-    /**
-     * Return the entity's attribute.
-     *
-     * @param string $key
-     *
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        if ($this->hasGetMutator($key)) {
-            $method = 'get'.$this->getMutatorMethod($key);
-
-            $attribute = null;
-
-            if (isset($this->attributes[$key])) {
-                $attribute = $this->attributes[$key];
-            }
-
-            return $this->$method($attribute);
-        }
-        if (!array_key_exists($key, $this->attributes)) {
-            return;
-        }
-        if ($this->attributes[$key] instanceof EntityProxy) {
-            $this->attributes[$key] = $this->attributes[$key]->load();
-        }
-
-        return $this->attributes[$key];
-    }
-
-    /**
-     * Dynamically set attributes on the entity.
-     *
-     * @param string $key
-     * @param mixed  $value
-     *
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        if ($this->hasSetMutator($key)) {
-            $method = 'set'.$this->getMutatorMethod($key);
-
-            $this->$method($value);
-        } else {
-            $this->attributes[$key] = $value;
-        }
-    }
-
-    /**
-     * Is a getter method defined ?
-     *
-     * @param string $key
-     *
-     * @return bool
-     */
-    protected function hasGetMutator($key)
-    {
-        return method_exists($this, 'get'.$this->getMutatorMethod($key)) ? true : false;
-    }
-
-    /**
-     * Is a setter method defined ?
-     *
-     * @param string $key
-     *
-     * @return bool
-     */
-    protected function hasSetMutator($key)
-    {
-        return method_exists($this, 'set'.$this->getMutatorMethod($key)) ? true : false;
-    }
-
-    /**
-     * @param $key
-     *
-     * @return string
-     */
-    protected function getMutatorMethod($key)
-    {
-        $key = ucwords(str_replace(['-', '_'], ' ', $key));
-
-        return str_replace(' ', '', $key).'Attribute';
-    }
-
-    /**
-     * Convert every attributes to value / arrays.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        // First, call the trait method before filtering
-        // with Entity specific methods
-        $attributes = $this->attributesToArray($this->attributes);
-
-        foreach ($this->attributes as $key => $attribute) {
-            if (in_array($key, $this->hidden)) {
-                unset($attributes[$key]);
-                continue;
-            }
-            if ($this->hasGetMutator($key)) {
-                $method = 'get'.$this->getMutatorMethod($key);
-                $attributes[$key] = $this->$method($attribute);
-            }
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * Fill an entity with key-value pairs.
-     *
-     * @param array $attributes
-     *
-     * @return void
-     */
-    public function fill(array $attributes)
-    {
-        foreach ($attributes as $key => $attribute) {
-            if ($this->hasSetMutator($key)) {
-                $method = 'set'.$this->getMutatorMethod($key);
-                $this->attributes[$key] = $this->$method($attribute);
-            } else {
-                $this->attributes[$key] = $attribute;
-            }
-        }
-    }
+	/**
+	 * Entities Hidden Attributes, that will be discarded when converting
+	 * the entity to Array/Json
+	 * (can include any embedded object's attribute).
+	 *
+	 * @var array
+	 */
+	protected $hidden = [];
+
+	/**
+	 * Return the entity's attribute.
+	 *
+	 * @param string $key
+	 *
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		if ($this->hasGetMutator($key)) {
+			$method = 'get'.$this->getMutatorMethod($key);
+
+			$attribute = null;
+
+			if (isset($this->attributes[$key])) {
+				$attribute = $this->attributes[$key];
+			}
+
+			return $this->$method($attribute);
+		}
+		if (!array_key_exists($key, $this->attributes)) {
+			return;
+		}
+		if ($this->attributes[$key] instanceof EntityProxy) {
+			$this->attributes[$key] = $this->attributes[$key]->load();
+		}
+
+		return $this->attributes[$key];
+	}
+
+	/**
+	 * Dynamically set attributes on the entity.
+	 *
+	 * @param string $key
+	 * @param mixed  $value
+	 *
+	 * @return void
+	 */
+	public function __set($key, $value)
+	{
+		if ($this->hasSetMutator($key)) {
+			$method = 'set'.$this->getMutatorMethod($key);
+
+			$this->$method($value);
+		} else {
+			$this->attributes[$key] = $value;
+		}
+	}
+
+	/**
+	 * Is a getter method defined ?
+	 *
+	 * @param string $key
+	 *
+	 * @return bool
+	 */
+	protected function hasGetMutator($key)
+	{
+		return method_exists($this, 'get'.$this->getMutatorMethod($key)) ? true : false;
+	}
+
+	/**
+	 * Is a setter method defined ?
+	 *
+	 * @param string $key
+	 *
+	 * @return bool
+	 */
+	protected function hasSetMutator($key)
+	{
+		return method_exists($this, 'set'.$this->getMutatorMethod($key)) ? true : false;
+	}
+
+	/**
+	 * @param $key
+	 *
+	 * @return string
+	 */
+	protected function getMutatorMethod($key)
+	{
+		$key = ucwords(str_replace(['-', '_'], ' ', $key));
+
+		return str_replace(' ', '', $key).'Attribute';
+	}
+
+	/**
+	 * Convert every attributes to value / arrays.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		// First, call the trait method before filtering
+		// with Entity specific methods
+		$attributes = $this->attributesToArray($this->attributes);
+
+		foreach ($this->attributes as $key => $attribute) {
+			if (in_array($key, $this->hidden)) {
+				unset($attributes[$key]);
+				continue;
+			}
+			if ($this->hasGetMutator($key)) {
+				$method = 'get'.$this->getMutatorMethod($key);
+				$attributes[$key] = $this->$method($attribute);
+			}
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 * Fill an entity with key-value pairs.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return void
+	 */
+	public function fill(array $attributes)
+	{
+		foreach ($attributes as $key => $attribute) {
+			if ($this->hasSetMutator($key)) {
+				$method = 'set'.$this->getMutatorMethod($key);
+				$this->attributes[$key] = $this->$method($attribute);
+			} else {
+				$this->attributes[$key] = $attribute;
+			}
+		}
+	}
 }

src/Exceptions/EntityNotFoundException.php

Indentation +28 added lines, -28 removed lines

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

src/EntityCollection.php

Indentation +445 added lines, -445 removed lines

@@ -10,449 +10,449 @@
 
 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);
-    }
-
-    /**
-     * 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 self
-     */
-    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 self
-     */
-    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));
-    }
-
-    /**
-     * 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);
+	}
+
+	/**
+	 * 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 self
+	 */
+	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 self
+	 */
+	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));
+	}
+
+	/**
+	 * 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 +4 added lines, -4 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);
     }
@@ -164,7 +164,7 @@ 
      */
     public function getEntityHashes()
     {
-        return array_map(function ($entity) {
+        return array_map(function($entity) {
             $class = get_class($entity);
 
             $mapper = Manager::getMapper($class);
@@ -357,7 +357,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) ?
@@ -376,7 +376,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)

src/Analogue.php

Indentation +114 added lines, -114 removed lines

@@ -17,118 +17,118 @@
  */
 class Analogue
 {
-    /**
-     * @var self
-     */
-    protected static $instance;
-
-    /**
-     * @var Manager
-     */
-    protected static $manager;
-
-    /**
-     * @var Capsule
-     */
-    protected static $capsule;
-
-    /**
-     * @var bool
-     */
-    protected static $booted = false;
-
-    /**
-     * Analogue constructor.
-     *
-     * @param array $connection
-     */
-    public function __construct(array $connection)
-    {
-        if (!static::$booted) {
-            static::$capsule = new Capsule();
-
-            $this->addConnection($connection);
-
-            $this->boot();
-        }
-    }
-
-    /**
-     * Boot Analogue.
-     *
-     * @return Analogue
-     */
-    public function boot()
-    {
-        if (static::$booted) {
-            return $this;
-        }
-
-        $dispatcher = new Dispatcher();
-
-        $connectionProvider = new CapsuleConnectionProvider(static::$capsule);
-
-        $illuminate = new IlluminateDriver($connectionProvider);
-
-        $driverManager = new DriverManager();
-
-        $driverManager->addDriver($illuminate);
-
-        static::$manager = new Manager($driverManager, $dispatcher);
-
-        static::$instance = $this;
-
-        static::$booted = true;
-
-        return $this;
-    }
-
-    /**
-     * Add a connection array to Capsule.
-     *
-     * @param array  $config
-     * @param string $name
-     */
-    public function addConnection($config, $name = 'default')
-    {
-        static::$capsule->addConnection($config, $name);
-    }
-
-    /**
-     * Get a Database connection object.
-     *
-     * @param  $name
-     *
-     * @return \Illuminate\Database\Connection
-     */
-    public function connection($name = null)
-    {
-        return static::$capsule->getConnection($name);
-    }
-
-    /**
-     * Dynamically handle static calls to the instance, Facade Style.
-     *
-     * @param string $method
-     * @param array  $parameters
-     *
-     * @return mixed
-     */
-    public static function __callStatic($method, $parameters)
-    {
-        return call_user_func_array([static::$instance, $method], $parameters);
-    }
-
-    /**
-     * Dynamically handle calls to the Analogue Manager instance.
-     *
-     * @param string $method
-     * @param array  $parameters
-     *
-     * @return mixed
-     */
-    public function __call($method, $parameters)
-    {
-        return call_user_func_array([static::$manager, $method], $parameters);
-    }
+	/**
+	 * @var self
+	 */
+	protected static $instance;
+
+	/**
+	 * @var Manager
+	 */
+	protected static $manager;
+
+	/**
+	 * @var Capsule
+	 */
+	protected static $capsule;
+
+	/**
+	 * @var bool
+	 */
+	protected static $booted = false;
+
+	/**
+	 * Analogue constructor.
+	 *
+	 * @param array $connection
+	 */
+	public function __construct(array $connection)
+	{
+		if (!static::$booted) {
+			static::$capsule = new Capsule();
+
+			$this->addConnection($connection);
+
+			$this->boot();
+		}
+	}
+
+	/**
+	 * Boot Analogue.
+	 *
+	 * @return Analogue
+	 */
+	public function boot()
+	{
+		if (static::$booted) {
+			return $this;
+		}
+
+		$dispatcher = new Dispatcher();
+
+		$connectionProvider = new CapsuleConnectionProvider(static::$capsule);
+
+		$illuminate = new IlluminateDriver($connectionProvider);
+
+		$driverManager = new DriverManager();
+
+		$driverManager->addDriver($illuminate);
+
+		static::$manager = new Manager($driverManager, $dispatcher);
+
+		static::$instance = $this;
+
+		static::$booted = true;
+
+		return $this;
+	}
+
+	/**
+	 * Add a connection array to Capsule.
+	 *
+	 * @param array  $config
+	 * @param string $name
+	 */
+	public function addConnection($config, $name = 'default')
+	{
+		static::$capsule->addConnection($config, $name);
+	}
+
+	/**
+	 * Get a Database connection object.
+	 *
+	 * @param  $name
+	 *
+	 * @return \Illuminate\Database\Connection
+	 */
+	public function connection($name = null)
+	{
+		return static::$capsule->getConnection($name);
+	}
+
+	/**
+	 * Dynamically handle static calls to the instance, Facade Style.
+	 *
+	 * @param string $method
+	 * @param array  $parameters
+	 *
+	 * @return mixed
+	 */
+	public static function __callStatic($method, $parameters)
+	{
+		return call_user_func_array([static::$instance, $method], $parameters);
+	}
+
+	/**
+	 * Dynamically handle calls to the Analogue Manager instance.
+	 *
+	 * @param string $method
+	 * @param array  $parameters
+	 *
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		return call_user_func_array([static::$manager, $method], $parameters);
+	}
 }

src/Repository.php

Indentation +128 added lines, -128 removed lines

@@ -15,141 +15,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         $mapper
-     * @param EntityMap|null $entityMap (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @throws MappingException
-     */
-    public function __construct($mapper, EntityMap $entityMap = null)
-    {
-        if ($mapper instanceof Mappable || is_string($mapper)) {
-            $this->mapper = Manager::getMapper($mapper, $entityMap);
-        } elseif ($mapper instanceof Mapper) {
-            $this->mapper = $mapper;
-        } else {
-            new InvalidArgumentException('Repository class constructor need a valid Mapper or Mappable object.');
-        }
-    }
+	/**
+	 * To build a repository, either provide :.
+	 *
+	 * - Mappable object's class name as a string
+	 * - Mappable object instance
+	 * - Instance of mapper
+	 *
+	 * @param Mapper         $mapper
+	 * @param EntityMap|null $entityMap (optional)
+	 *
+	 * @throws \InvalidArgumentException
+	 * @throws MappingException
+	 */
+	public function __construct($mapper, EntityMap $entityMap = null)
+	{
+		if ($mapper instanceof Mappable || is_string($mapper)) {
+			$this->mapper = Manager::getMapper($mapper, $entityMap);
+		} elseif ($mapper instanceof Mapper) {
+			$this->mapper = $mapper;
+		} else {
+			new InvalidArgumentException('Repository class constructor need a valid Mapper or Mappable object.');
+		}
+	}
 
-    /**
-     * Return all Entities from database.
-     *
-     * @return \Analogue\ORM\EntityCollection
-     */
-    public function all()
-    {
-        return $this->mapper->get();
-    }
+	/**
+	 * Return all Entities from database.
+	 *
+	 * @return \Analogue\ORM\EntityCollection
+	 */
+	public function all()
+	{
+		return $this->mapper->get();
+	}
 
-    /**
-     * Fetch a record from the database.
-     *
-     * @param 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/helpers.php

Indentation +21 added lines, -21 removed lines

@@ -5,29 +5,29 @@
 
 if (!function_exists('analogue')) {
 
-    /**
-     * Return analogue's manager instance.
-     *
-     * @return \Analogue\ORM\System\Manager
-     */
-    function analogue()
-    {
-        return Manager::getInstance();
-    }
+	/**
+	 * Return analogue's manager instance.
+	 *
+	 * @return \Analogue\ORM\System\Manager
+	 */
+	function analogue()
+	{
+		return Manager::getInstance();
+	}
 }
 
 if (!function_exists('mapper')) {
 
-    /**
-     * Create a mapper for a given entity (static alias).
-     *
-     * @param \Analogue\ORM\Mappable|string $entity
-     * @param mixed                         $entityMap
-     *
-     * @return Mapper
-     */
-    function mapper($entity, $entityMap = null)
-    {
-        return Manager::getMapper($entity, $entityMap);
-    }
+	/**
+	 * Create a mapper for a given entity (static alias).
+	 *
+	 * @param \Analogue\ORM\Mappable|string $entity
+	 * @param mixed                         $entityMap
+	 *
+	 * @return Mapper
+	 */
+	function mapper($entity, $entityMap = null)
+	{
+		return Manager::getMapper($entity, $entityMap);
+	}
 }

src/Drivers/DriverInterface.php

Indentation +14 added lines, -14 removed lines

@@ -4,19 +4,19 @@
 
 interface DriverInterface
 {
-    /**
-     * Return the name of the driver.
-     *
-     * @return string
-     */
-    public function getName();
+	/**
+	 * Return the name of the driver.
+	 *
+	 * @return string
+	 */
+	public function getName();
 
-    /**
-     * Get Analogue DB Adapter.
-     *
-     * @param string $connection connection name for drivers supporting multiple connections
-     *
-     * @return \Analogue\ORM\Drivers\DBAdapter
-     */
-    public function getAdapter($connection = null);
+	/**
+	 * Get Analogue DB Adapter.
+	 *
+	 * @param string $connection connection name for drivers supporting multiple connections
+	 *
+	 * @return \Analogue\ORM\Drivers\DBAdapter
+	 */
+	public function getAdapter($connection = null);
 }

src/Drivers/IlluminateConnectionProvider.php

Indentation +24 added lines, -24 removed lines

@@ -6,30 +6,30 @@
 
 class IlluminateConnectionProvider
 {
-    /**
-     * @var DatabaseManager
-     */
-    protected $db;
+	/**
+	 * @var DatabaseManager
+	 */
+	protected $db;
 
-    /**
-     * IlluminateConnectionProvider constructor.
-     *
-     * @param DatabaseManager $db
-     */
-    public function __construct(DatabaseManager $db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * IlluminateConnectionProvider constructor.
+	 *
+	 * @param DatabaseManager $db
+	 */
+	public function __construct(DatabaseManager $db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     * Get a Database connection object.
-     *
-     * @param  $name
-     *
-     * @return \Illuminate\Database\Connection
-     */
-    public function connection($name = null)
-    {
-        return $this->db->connection($name);
-    }
+	/**
+	 * Get a Database connection object.
+	 *
+	 * @param  $name
+	 *
+	 * @return \Illuminate\Database\Connection
+	 */
+	public function connection($name = null)
+	{
+		return $this->db->connection($name);
+	}
 }