Merge branch 'master' of github.com:jenssegers/Laravel-MongoDB

src/Jenssegers/Mongodb/Auth/DatabaseReminderRepository.php

@@ -10,16 +10,16 @@ class DatabaseReminderRepository extends \Illuminate\Auth\Reminders\DatabaseRemi
 	 */
 	protected function reminderExpired($reminder)
 	{
-		// Convert to object so that we can pass it to the parent method
-		if (is_array($reminder))
+		// Convert to array so that we can pass it to the parent method
+		if (is_object($reminder))
 		{
-			$reminder = (object) $reminder;
+			$reminder = (array) $reminder;
 		}
 
 		// Convert the DateTime object that got saved to MongoDB
-		if (is_array($reminder->created_at))
+		if (is_array($reminder['created_at']))
 		{
-			$reminder->created_at = $reminder->created_at['date'] + $reminder->created_at['timezone'];
+			$reminder['created_at'] = $reminder['created_at']['date'] + $reminder['created_at']['timezone'];
 		}
 
 		return parent::reminderExpired($reminder);

src/Jenssegers/Mongodb/Relations/EmbedsMany.php

@@ -487,6 +487,7 @@ class EmbedsMany extends Relation {
 
             // Attatch the parent relation to the embedded model.
             $model->setRelation($this->foreignKey, $this->parent);
+            $model->setHidden(array_merge($model->getHidden(), array($this->foreignKey)));
 
             $models[] = $model;
         }

tests/RelationsTest.php

@@ -337,6 +337,7 @@ class RelationsTest extends TestCase {
         $this->assertInstanceOf('DateTime', $address->created_at);
         $this->assertInstanceOf('DateTime', $address->updated_at);
         $this->assertInstanceOf('User', $address->user);
+        $this->assertEmpty($address->relationsToArray()); // prevent infinite loop
 
         $user = User::find($user->_id);
         $user->addresses()->save(new Address(array('city' => 'Bruxelles')));