Sync master

CHANGELOG.md

@@ -1,8 +1,52 @@
 # Changelog
 
-## Analogue 5.3
+#### Version 5.6
+- Laravel 5.6 support
+- Bring back ability to map DB columns that name are not equals to the name of the attribute.
+- Add ability to map DB snake case columns to camel case properties on entities.
 
-- It is now possible to for the mapper to use IoC when instantiating entities.
-- Native implementation of Single Table Inheritance pattern.
+#### Version 5.5
+- Laravel 5.5 support
+- Pushed miminum requirements to PHP7
+- Complete support of Plain PHP objects via reflection based hydration/dehydration
+- Improved Lazy-loading proxies.
+- New, more flexible Value Object implementation, that can now be defined as `embedsOne()`, `embedsMany()` relationships
+- Embedded value object can now be stored as a mysql JSON field
+- Analogue entities can now be instantiated using laravel's `IoC Container` or any PSR-11 compatible container. 
+- Added [MongoDB](https://github.com/analogueorm/mongodb) driver.
+- Package auto discovery (L5.5)
+
+#### Version 5.4
+- Illuminate 5.4 Compatibility.
+- Add Abillity to map DB columns that name are not equals to the name of the attribute.
+
+#### Version 5.3
+- Illuminate 5.3 Compatibility. 
+- Now fully support Single Table Inheritance.
 - EntityCollection is now correctly keyed by id
 
+#### Version 5.1
+- Illuminate 5.1 + 5.2 Compatibility. 
+
+#### Version 5.0
+- Analogue version now mirrors illuminate version. 
+
+#### Version 2.1.3
+- Mutator feature in base Entity class.
+- Ability to add entities to a proxy collection without lazyloading it.
+
+### Version 2.1
+
+- Package is now framework agnostic.
+- Now support any plain object that implements Mappable interface.
+- Introducing a MappableTrait for quick implementation. 
+- Queries can now be run directly on the mapper Object. 
+- Store/Delete methods now accept a array and collections as argument.
+- EntityMap are now autodected when in the same namespace as the entity.
+- Base Entity class Supports hidden attributes.
+- Many workflow related improvements.
+
+### Version 2.0
+
+- Laravel 5 Support.
+

composer.json

@@ -35,7 +35,7 @@
         "mockery/mockery": "0.9.*",
         "symfony/css-selector": "2.8.*|3.0.*|4.0.*",
         "symfony/dom-crawler": "2.8.*|3.0.*|4.0.*",
-        "analogue/factory": "dev-master",
+        "analogue/factory": "1.2.*|1.3.*",
         "laravel/browser-kit-testing": "^1.0"
     },
     "suggest": {

readme.md

@@ -1,3 +1,5 @@
+(this project is looking for a new maintainer)
+
 # Analogue ORM 
 [![Latest Stable Version](https://poser.pugx.org/analogue/orm/v/stable)](https://packagist.org/packages/analogue/orm)
 [![Latest Unstable Version](https://poser.pugx.org/analogue/orm/v/unstable)](https://packagist.org/packages/analogue/orm)
@@ -122,6 +124,8 @@ Check the [Documentation](https://github.com/analogueorm/analogue/wiki) for more
 
 #### Version 5.6
 - Laravel 5.6 support
+- Bring back ability to map DB columns that name are not equals to the name of the attribute.
+- Add ability to map DB snake case columns to camel case properties on entities.
 
 #### Version 5.5
 - Laravel 5.5 support
@@ -136,7 +140,7 @@ Check the [Documentation](https://github.com/analogueorm/analogue/wiki) for more
 
 #### Version 5.4
 - Illuminate 5.4 Compatibility.
-- Add Abillity to map DB columns that name are not equals to the name of the attribute.
+- Add Ability to map DB columns that name are not equals to the name of the attribute.
 
 #### Version 5.3
 - Illuminate 5.3 Compatibility. 

src/AnalogueServiceProvider.php

@@ -56,6 +56,7 @@ public function register()
 
             // If the cache is pre laravel 5.5, it doesn't implements PSR-16, so we'll skip it.
             $cache = $app->make(CacheRepository::class);
+
             if ($cache instanceof CacheInterface) {
                 $manager->setCache($cache);
             }

src/Entity.php

@@ -130,12 +130,7 @@ public function toArray()
     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;
-            }
+            $this->{$key} = $attribute;
         }
     }
 }

src/EntityCollection.php

@@ -139,27 +139,6 @@ public function offsetSet($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.
      *
@@ -427,23 +406,6 @@ 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.
      *

src/EntityMap.php

@@ -292,6 +292,14 @@ class EntityMap
      */
     private $isBooted = false;
 
+    /**
+     * Set this property to true if you wish to use camel case
+     * properties.
+     *
+     * @var bool
+     */
+    protected $camelCaseHydratation = false;
+
     /**
      * Return Domain class attributes, useful when mapping to a Plain PHP Object.
      *
@@ -1223,21 +1231,29 @@ public function morphTo($entity, string $name = null, string $type = null, strin
 
         if (is_null($class = $wrapper->getEntityAttribute($type))) {
             return new MorphTo(
-                $mapper, $entity, $id, null, $type, $name
+                $mapper,
+                $entity,
+                $id,
+                null,
+                $type,
+                $name
             );
-        }
-
-        // If we are not eager loading the relationship we will essentially treat this
-        // as a belongs-to style relationship since morph-to extends that class and
-        // we will pass in the appropriate values so that it behaves as expected.
-        else {
+        } else {
+            // If we are not eager loading the relationship we will essentially treat this
+            // as a belongs-to style relationship since morph-to extends that class and
+            // we will pass in the appropriate values so that it behaves as expected.
             $class = Manager::getInstance()->getInverseMorphMap($class);
             $relatedMapper = Manager::getInstance()->mapper($class);
 
             $foreignKey = $relatedMapper->getEntityMap()->getKeyName();
 
             return new MorphTo(
-                $relatedMapper, $entity, $id, $foreignKey, $type, $name
+                $relatedMapper,
+                $entity,
+                $id,
+                $foreignKey,
+                $type,
+                $name
             );
         }
     }
@@ -1556,7 +1572,10 @@ public function getMorphClass(): string
      */
     public function newCollection(array $entities = []): EntityCollection
     {
-        return new EntityCollection($entities);
+        $collection = new EntityCollection($entities);
+        $keyName = $this->getAttributeNameForColumn($this->getKeyName());
+
+        return $collection->keyBy($keyName);
     }
 
     /**
@@ -1704,4 +1723,96 @@ public function __call(string $method, array $parameters)
 
         return  call_user_func_array($this->dynamicRelationships[$method], $parameters);
     }
+
+    /**
+     * Maps the names of the column names to the appropriate attributes
+     * of an entity if the $attributes property of an EntityMap is an
+     * associative array.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    public function getAttributeNamesFromColumns($array)
+    {
+        if (!empty($this->mappings)) {
+            $newArray = [];
+            foreach ($array as $key => $value) {
+                $attributeName = isset($this->mappings[$key]) ? $this->mappings[$key] : $key;
+                $newArray[$attributeName] = $value;
+            }
+
+            return $newArray;
+        }
+        if ($this->camelCaseHydratation) {
+            foreach ($array as $key => $value) {
+                $attributeName = camel_case($key);
+                $newArray[$attributeName] = $value;
+            }
+
+            return $newArray;
+        }
+
+        return $array;
+    }
+
+    /**
+     * Gets the entity attribute name of a given column in a table.
+     *
+     * @param string $columnName
+     *
+     * @return string
+     */
+    public function getAttributeNameForColumn($columnName)
+    {
+        if (!empty($this->mappings)) {
+            if (isset($this->mappings[$columnName])) {
+                return $this->mappings[$columnName];
+            }
+        }
+
+        return $columnName;
+    }
+
+    /**
+     * Maps the attribute names of an entity to the appropriate
+     * column names in the database if the $attributes property of
+     * an EntityMap is an associative array.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    public function getColumnNamesFromAttributes($array)
+    {
+        if (!empty($this->mappings)) {
+            $newArray = [];
+            $flipped = array_flip($this->mappings);
+            foreach ($array as $key => $value) {
+                $attributeName = isset($flipped[$key]) ? $flipped[$key] : $key;
+                $newArray[$attributeName] = $value;
+            }
+
+            return $newArray;
+        }
+        if ($this->camelCaseHydratation) {
+            foreach ($array as $key => $value) {
+                $attributeName = snake_case($key);
+                $newArray[$attributeName] = $value;
+            }
+
+            return $newArray;
+        }
+
+        return $array;
+    }
+
+    public function hasAttribute($attribute)
+    {
+        if (!empty($this->mappings)) {
+            return in_array($attribute, array_values($this->mappings));
+        }
+
+        return in_array($attribute, $attributes);
+    }
 }

src/LengthAwareEntityPaginator.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Analogue\ORM;
+
+use Illuminate\Pagination\LengthAwarePaginator;
+
+class LengthAwareEntityPaginator extends LengthAwarePaginator
+{
+    /**
+     * Paginator constructor.
+     *
+     * @param mixed $items
+     * @param int   $total
+     * @param int   $perPage
+     * @param null  $currentPage
+     * @param array $options
+     */
+    public function __construct($items, $total, $perPage, $currentPage = null, array $options = [])
+    {
+        $items = $items instanceof EntityCollection ? $items : EntityCollection::make($items);
+
+        parent::__construct($items, $total, $perPage, $currentPage, $options);
+    }
+}

src/Plugins/SoftDeletes/Events/Restored.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Analogue\ORM\Plugins\SoftDeletes\Events;
+
+use Analogue\ORM\Events\Event;
+
+class Restored extends Event
+{
+}

src/Plugins/SoftDeletes/Events/Restoring.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Analogue\ORM\Plugins\SoftDeletes\Events;
+
+use Analogue\ORM\Events\Event;
+
+class Restoring extends Event
+{
+}