Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
Mulkave committed Feb 22, 2015
2 parents 48112c0 + b8c0ba1 commit 3ff41e2
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions src/Vinelab/NeoEloquent/Eloquent/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public function setLabel($label)
}

/**
* @override
* Get the node label for this model.
*
* @return string|array
Expand All @@ -42,6 +43,7 @@ public function getLabel()
}

/**
* @override
* Create a new Eloquent query builder for the model.
*
* @param Vinelab\NeoEloquent\Query\Builder $query
Expand All @@ -53,6 +55,7 @@ public function newEloquentBuilder($query)
}

/**
* @override
* Get a new query builder instance for the connection.
*
* @return Vinelab\NeoEloquent\Query\Builder
Expand All @@ -67,6 +70,7 @@ protected function newBaseQueryBuilder()
}

/**
* @override
* Get the format for database stored dates.
*
* @return string
Expand Down Expand Up @@ -111,6 +115,7 @@ public function getDefaultNodeLabel()
}

/**
* @override
* Get the table associated with the model.
*
* @return string
Expand All @@ -121,6 +126,7 @@ public function getTable()
}

/**
* @override
* Define an inverse one-to-one or many relationship.
*
* @param string $related
Expand Down Expand Up @@ -162,6 +168,7 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
}

/**
* @override
* Define a one-to-one relationship.
*
* @param string $related
Expand Down Expand Up @@ -202,6 +209,7 @@ public function hasOne($related, $foreignKey = null, $otherKey = null, $relation
}

/**
* @override
* Define a one-to-many relationship.
*
* @param string $related
Expand Down Expand Up @@ -232,6 +240,7 @@ public function hasMany($related, $type = null, $key = null, $relation = null)
}

/**
* @override
* Define a many-to-many relationship.
*
* @param string $related
Expand Down Expand Up @@ -281,6 +290,7 @@ public function belongsToMany($related, $table = null, $foreignKey = null, $othe
}

/**
* @override
* Create a new HyperMorph relationship.
*
* @param \Vinelab\NeoEloquent\Eloquent\Model $model
Expand Down Expand Up @@ -325,6 +335,7 @@ public function hyperMorph($model, $related, $type = null, $morphType = null, $r
}

/**
* @override
* Define a many-to-many relationship.
*
* @param string $related
Expand Down Expand Up @@ -375,6 +386,7 @@ public function morphMany($related, $name, $type = null, $id = null, $localKey =
}

/**
* @override
* Create an inverse one-to-one polymorphic relationship with specified model and relation.
*
* @param \Vinelab\NeoEloquent\Eloquent\Model $related
Expand Down Expand Up @@ -417,6 +429,7 @@ public function morphedByOne($related, $type, $key = null, $relation = null)
}

/**
* @override
* Define a polymorphic, inverse one-to-one or many relationship.
*
* @param string $name
Expand Down Expand Up @@ -497,6 +510,7 @@ protected function getMorphs($name, $type, $id)
}

/**
* @override
* Get the table qualified key name.
*
* @return string
Expand All @@ -506,11 +520,22 @@ public function getQualifiedKeyName()
return $this->getKeyName();
}

/**
* Add timestamps to this model.
*
* @return void
*/
public function addTimestamps()
{
$this->updateTimestamps();
}

/**
* @override
* Get the attributes that have been changed since last sync.
*
* @return array
*/
public function getDirty()
{
$dirty = parent::getDirty();
Expand Down

0 comments on commit 3ff41e2

Please sign in to comment.