Merge pull request #6 from sparkeleven/master

Support for Laravel 4.2 SoftDeleteTrait and models using UUID primary keys

Author: tbarbugli

src/GetStream/StreamLaravel/Enrich.php

@@ -17,11 +17,11 @@ public function fromDb($model, $ids, $with=array())
         $results = array();
         $pkName = (new $model())->getKeyName();
         $query = $model::with($with)->whereIn($pkName, $ids);
-        if (property_exists($model, 'withTrashed') && $this->withTrashed)
+        if (in_array('Illuminate\Database\Eloquent\SoftDeletingTrait', class_uses(get_class($model))) && $this->withTrashed) // previous withTrash method deprecated in Laravel 4.2
             $query = $query->withTrashed();
         $objects = $query->get();
         foreach ($objects as $object) {
-            $results[$object->id] = $object;
+            $results[$object->getKey()] = $object; // support for non-default UUID keys
         }
         return $results;
     }