diff --git a/src/Jenssegers/Mongodb/Auth/DatabaseReminderRepository.php b/src/Jenssegers/Mongodb/Auth/DatabaseReminderRepository.php index d771e509faf02dbe0b52bafa8e8bf56c3ab489d1..eda5ef5b2ce90b90bd06313a7d85d74062ded035 100644 --- a/src/Jenssegers/Mongodb/Auth/DatabaseReminderRepository.php +++ b/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); diff --git a/src/Jenssegers/Mongodb/Relations/EmbedsMany.php b/src/Jenssegers/Mongodb/Relations/EmbedsMany.php index 18392c0adc7d9edf7e7f0b2c8fd192fb45e3c3c4..130c6c5860286a50025c5a7b0cb10717fbb18afc 100644 --- a/src/Jenssegers/Mongodb/Relations/EmbedsMany.php +++ b/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; } diff --git a/tests/RelationsTest.php b/tests/RelationsTest.php index c32c610ba08d757f44f0b221f68a62ae23efd354..7f43f0b458037945f379874011dcbdc4b5a3b5b1 100644 --- a/tests/RelationsTest.php +++ b/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')));