Commit e2bc57c3 authored by Jens Segers's avatar Jens Segers

Merge #383

parent e0a3cda2
......@@ -4,6 +4,7 @@ use DateTime;
use MongoId;
use MongoDate;
use Carbon\Carbon;
use ReflectionMethod;
use Illuminate\Database\Eloquent\Relations\Relation;
use Jenssegers\Mongodb\Eloquent\Builder;
use Jenssegers\Mongodb\Relations\EmbedsOneOrMany;
......@@ -233,22 +234,28 @@ abstract class Model extends \Jenssegers\Eloquent\Model {
// is handled by the parent method.
if (method_exists($this, $camelKey))
{
$relations = $this->$camelKey();
$method = new ReflectionMethod(get_called_class(), $camelKey);
// This attribute matches an embedsOne or embedsMany relation so we need
// to return the relation results instead of the interal attributes.
if ($relations instanceof EmbedsOneOrMany)
// Ensure the method is not static to avoid conflicting with Eloquent methods.
if ( ! $method->isStatic())
{
// If the key already exists in the relationships array, it just means the
// relationship has already been loaded, so we'll just return it out of
// here because there is no need to query within the relations twice.
if (array_key_exists($key, $this->relations))
$relations = $this->$camelKey();
// This attribute matches an embedsOne or embedsMany relation so we need
// to return the relation results instead of the interal attributes.
if ($relations instanceof EmbedsOneOrMany)
{
return $this->relations[$key];
// If the key already exists in the relationships array, it just means the
// relationship has already been loaded, so we'll just return it out of
// here because there is no need to query within the relations twice.
if (array_key_exists($key, $this->relations))
{
return $this->relations[$key];
}
// Get the relation results.
return $this->getRelationshipFromMethod($key, $camelKey);
}
// Get the relation results.
return $this->getRelationshipFromMethod($key, $camelKey);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment