Merge branch 'master' of https://git.mcnd.ca/mcndave/ulmus

src/EntityTrait.php

@@ -325,9 +325,9 @@ trait EntityTrait {
     /**
      * @Ignore
      */
-    public function toCollection() : array
+    public function toCollection() : EntityCollection
     {
-        return new EntityCollection($this->toArray());
+        return static::entityCollection([ $this->toArray() ]);
     }
     
     /**
@@ -381,7 +381,10 @@ trait EntityTrait {
      */
     public static function entityCollection(...$arguments) : EntityCollection
     {
-        return new EntityCollection(...$arguments);
+        $collection = new EntityCollection(...$arguments);
+        $collection->entityClass = static::class;
+        
+        return $collection;
     }
 
     /**