Skip to content

Commit

Permalink
Merge pull request #141 from KKSzymanowski/3.2
Browse files Browse the repository at this point in the history
Fix return type hints
  • Loading branch information
santigarcor committed May 31, 2017
2 parents c844cce + da48b22 commit 96ada16
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/Laratrust/Contracts/LaratrustPermissionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function roles();
* Morph by Many relationship between the role and the one of the possible user models
*
* @param string $relationship
* @return Illuminate\Database\Eloquent\Relations\MorphToMany
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
public function getMorphByUserRelation($relationship);
}
2 changes: 1 addition & 1 deletion src/Laratrust/Contracts/LaratrustRoleInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface LaratrustRoleInterface
* Morph by Many relationship between the role and the one of the possible user models
*
* @param string $relationship
* @return Illuminate\Database\Eloquent\Relations\MorphToMany
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
public function getMorphByUserRelation($relationship);

Expand Down
2 changes: 1 addition & 1 deletion src/Laratrust/Traits/LaratrustPermissionTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function roles()
* Morph by Many relationship between the role and the one of the possible user models
*
* @param string $relationship
* @return Illuminate\Database\Eloquent\Relations\MorphToMany
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
public function getMorphByUserRelation($relationship)
{
Expand Down
24 changes: 12 additions & 12 deletions src/Laratrust/Traits/LaratrustUserTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ trait LaratrustUserTrait
* Tries to return all the cached roles of the user
* and if it can't bring the roles from the cache,
* it would bring them back from the DB
* @return Illuminate\Database\Eloquent\Collection
* @return \Illuminate\Database\Eloquent\Collection
*/
public function cachedRoles()
{
Expand All @@ -35,7 +35,7 @@ public function cachedRoles()
* Tries to return all the cached permissions of the user
* and if it can't bring the permissions from the cache,
* it would bring them back from the DB
* @return Illuminate\Database\Eloquent\Collection
* @return \Illuminate\Database\Eloquent\Collection
*/
public function cachedPermissions()
{
Expand Down Expand Up @@ -285,7 +285,7 @@ public function ability($roles, $permissions, $options = [])
* Alias to eloquent many-to-many relation's attach() method.
*
* @param mixed $role
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function attachRole($role)
{
Expand All @@ -299,7 +299,7 @@ public function attachRole($role)
* Alias to eloquent many-to-many relation's detach() method.
*
* @param mixed $role
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function detachRole($role)
{
Expand All @@ -313,7 +313,7 @@ public function detachRole($role)
* Attach multiple roles to a user
*
* @param mixed $roles
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function attachRoles($roles)
{
Expand All @@ -328,7 +328,7 @@ public function attachRoles($roles)
* Detach multiple roles from a user
*
* @param mixed $roles
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function detachRoles($roles = null)
{
Expand All @@ -346,7 +346,7 @@ public function detachRoles($roles = null)
/**
* Sync roles to the user
* @param array $roles
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function syncRoles($roles = [])
{
Expand All @@ -360,7 +360,7 @@ public function syncRoles($roles = [])
* Alias to eloquent many-to-many relation's attach() method.
*
* @param mixed $permission
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function attachPermission($permission)
{
Expand All @@ -374,7 +374,7 @@ public function attachPermission($permission)
* Alias to eloquent many-to-many relation's detach() method.
*
* @param mixed $permission
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function detachPermission($permission)
{
Expand All @@ -388,7 +388,7 @@ public function detachPermission($permission)
* Attach multiple permissions to a user
*
* @param mixed $permissions
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function attachPermissions($permissions)
{
Expand All @@ -403,7 +403,7 @@ public function attachPermissions($permissions)
* Detach multiple permissions from a user
*
* @param mixed $permissions
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function detachPermissions($permissions = null)
{
Expand All @@ -421,7 +421,7 @@ public function detachPermissions($permissions = null)
/**
* Sync roles to the user
* @param array $permissions
* @return Illuminate\Database\Eloquent\Model
* @return static
*/
public function syncPermissions($permissions = [])
{
Expand Down

0 comments on commit 96ada16

Please sign in to comment.