Fix to prevent double hydration

src/Collection/AbstractTitleCollection.php

@@ -148,6 +148,18 @@ public function hasCustomFields()
         return false;
     }
 
+    /**
+     * Determine if all items in the collection are fully hydrated
+     *
+     * @return bool
+     */
+    public function isHydrated()
+    {
+        return $this->reduce(function ($carry, $item) {
+            return $carry && $item->hydrated;
+        }, true);
+    }
+
     /**
      * {@inheritdoc}
      */

src/Hydrator/AbstractHydrator.php

@@ -73,5 +73,7 @@ public function preload(array $entryIds)
     /**
      * {@inheritdoc}
      */
-    abstract public function hydrate(AbstractEntity $entity, AbstractProperty $property);
+    public function hydrate(AbstractEntity $entity, AbstractProperty $property) {
+        $entity->hydrated = true;
+    }
 }

src/Hydrator/AssetsHydrator.php

@@ -98,6 +98,8 @@ public function preload(array $entryIds)
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         if (isset($this->selections[$entity->getType()][$entity->getId()][$property->getId()])) {
             $value = $this->selections[$entity->getType()][$entity->getId()][$property->getId()];
         } else {

src/Hydrator/DateHydrator.php

@@ -23,6 +23,8 @@ class DateHydrator extends AbstractHydrator
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $value = $entity->getAttribute($property->getIdentifier());
 
         $value = $value ? Carbon::createFromFormat('U', $value) : null;

src/Hydrator/ExplodeHydrator.php

@@ -22,6 +22,8 @@ class ExplodeHydrator extends AbstractHydrator
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $value = $entity->getAttribute($property->getIdentifier());
 
         $value = $value ? explode("\n", $value) : null;

src/Hydrator/FileHydrator.php

@@ -97,6 +97,8 @@ public function preload(array $entryIds)
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $value = $entity->getAttribute($property->getIdentifier());
 
         $value = $value && isset($this->files[$value]) ? $this->files[$value] : null;

src/Hydrator/GridHydrator.php

@@ -123,6 +123,8 @@ public function preload(array $entryIds)
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $value = isset($this->sortedRows[$entity->getId()][$property->getId()]) ? $this->sortedRows[$entity->getId()][$property->getId()] : new GridRowCollection();
 
         $entity->setAttribute($property->getName(), $value);

src/Hydrator/MatrixHydrator.php

@@ -115,6 +115,8 @@ public function preload(array $entryIds)
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $value = isset($this->sortedRows[$entity->getId()][$property->getId()]) ? $this->sortedRows[$entity->getId()][$property->getId()] : new MatrixRowCollection();
 
         $entity->setAttribute($property->getName(), $value);

src/Hydrator/ParentsHydrator.php

@@ -61,6 +61,8 @@ public function __construct(ConnectionInterface $db, EntryCollection $collection
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $entries = isset($this->entries[$entity->getId()]) ? $this->entries[$entity->getId()] : array();
 
         $value = $this->relationshipCollection->createChildCollection($entries);

src/Hydrator/PipeHydrator.php

@@ -22,6 +22,8 @@ class PipeHydrator extends AbstractHydrator
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $value = $entity->getAttribute($property->getIdentifier());
 
         $value = $value ? explode("|", $value) : null;

src/Hydrator/PlayaHydrator.php

@@ -78,6 +78,8 @@ public function __construct(ConnectionInterface $db, EntryCollection $collection
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $entries = isset($this->entries[$entity->getType()][$entity->getId()][$property->getId()])
             ? $this->entries[$entity->getType()][$entity->getId()][$property->getId()] : array();
 

src/Hydrator/RelationshipHydrator.php

@@ -65,6 +65,8 @@ public function __construct(ConnectionInterface $db, EntryCollection $collection
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $entries = isset($this->entries[$entity->getType()][$entity->getId()][$property->getId()])
             ? $this->entries[$entity->getType()][$entity->getId()][$property->getId()] : array();
 

src/Hydrator/SiblingsHydrator.php

@@ -61,6 +61,8 @@ public function __construct(ConnectionInterface $db, EntryCollection $collection
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $value = isset($this->entries[$entity->getId()]) ? $this->entries[$entity->getId()] : array();
 
         $value = $this->relationshipCollection->createChildCollection($entries);

src/Hydrator/WysiwygHydrator.php

@@ -59,6 +59,8 @@ public function __construct(ConnectionInterface $db, EntryCollection $collection
      */
     public function hydrate(AbstractEntity $entity, AbstractProperty $property)
     {
+        parent::hydrate($entity, $property);
+
         $value = $this->parse($entity->getAttribute($property->getIdentifier()));
 
         $entity->setAttribute($property->getName(), $value);

src/Model/AbstractEntity.php

@@ -14,6 +14,13 @@
  */
 abstract class AbstractEntity extends Model
 {
+
+    /**
+     * Entity hydration state
+     * @var bool
+     */
+    protected $hydrated = false;
+
     /**
      * Get the entity ID (eg. entry_id or row_id)
      * @return string|int

src/Model/Entry.php

@@ -67,7 +67,7 @@ public function newCollection(array $models = array())
 
         $collection = call_user_func($method, $models, self::$channelRepository, self::$fieldRepository);
 
-        if ($models) {
+        if ($models && !$collection->isHydrated()) {
             $this->hydrateCollection($collection);
         }
 

src/Model/Title.php

@@ -267,7 +267,7 @@ public function newCollection(array $models = array())
 
     /**
      * Loop through all the hydrators to set Entry custom field attributes
-     * @param  \rsanchez\Deep\Collection\TitleCollection $collection
+     * @param  \rsanchez\Deep\Collection\AbstractTitleCollection $collection
      * @return void
      */
     public function hydrateCollection(AbstractTitleCollection $collection)