SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/Repositories/GroupRepository.php

Indentation +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 			$group->permissions()->attach($permission_ids);
 		});
 
-        return \Core::groups()->find($group_id);
+		return \Core::groups()->find($group_id);
 	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 */
 	public function assignPermissions($group_id, $permission_ids)
 	{
-		\DB::transaction(function () use ($group_id, $permission_ids) {
+		\DB::transaction(function() use ($group_id, $permission_ids) {
 			$group = \Core::groups()->find($group_id);
 			$group->permissions()->detach();
 			$group->permissions()->attach($permission_ids);

src/Modules/V1/Acl/AclPermission.php

Indentation +27 added lines, -27 removed lines

@@ -5,36 +5,36 @@
 
 class AclPermission extends Model {
 
-    use SoftDeletes;
-    protected $table    = 'permissions';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name', 'model'];
+	use SoftDeletes;
+	protected $table    = 'permissions';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name', 'model'];
 
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
     
-    public function groups()
-    {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclPermissionObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclPermissionObserver'));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     
     public function groups()
     {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup', 'groups_permissions', 'permission_id', 'group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
     }
 
     public static function boot()

src/Modules/V1/Acl/Http/Controllers/PermissionsController.php

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
 
 class PermissionsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model = 'permissions';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'permissions';
 }

src/Modules/V1/Acl/Http/Controllers/GroupsController.php

Spacing +2 added lines, -2 removed lines

@@ -13,14 +13,14 @@
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'groups';
+    protected $model = 'groups';
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
     'name' => 'required|string|max:100|unique:groups,name,{id}'
     ];
 

Indentation +28 added lines, -28 removed lines

@@ -8,35 +8,35 @@
 
 class GroupsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'groups';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'groups';
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-    'name' => 'required|string|max:100|unique:groups,name,{id}'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+	'name' => 'required|string|max:100|unique:groups,name,{id}'
+	];
 
-    /**
-     * Handle an assign permissions to group request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assignpermissions(Request $request)
-    {
-        $this->validate($request, [
-            'permission_ids' => 'required|exists:permissions,id', 
-            'group_id'       => 'required|exists:groups,id'
-            ]);
+	/**
+	 * Handle an assign permissions to group request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assignpermissions(Request $request)
+	{
+		$this->validate($request, [
+			'permission_ids' => 'required|exists:permissions,id', 
+			'group_id'       => 'required|exists:groups,id'
+			]);
 
-        return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
-    }
+		return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
+	}
 }

src/Modules/V1/Acl/Repositories/UserRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
      * Reset the given user's password.
      *
      * @param  array  $credentials
-     * @return integer
+     * @return false|null
      */
     public function resetPassword($credentials)
     {

Spacing +5 added lines, -5 removed lines

@@ -23,11 +23,11 @@ 
      * @param  boolean $user
      * @return boolean
      */
-    public function can($nameOfPermission, $model, $user = false )
+    public function can($nameOfPermission, $model, $user = false)
     {       
         $user        = $user ?: \JWTAuth::parseToken()->authenticate();
         $permissions = [];
-        \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){
+        \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function($permission) use (&$permissions, $model){
             $permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); 
         });
         
@@ -55,7 +55,7 @@ 
      */
     public function assignGroups($user_id, $group_ids)
     {
-        \DB::transaction(function () use ($user_id, $group_ids) {
+        \DB::transaction(function() use ($user_id, $group_ids) {
             $user = \Core::users()->find($user_id);
             $user->groups()->detach();
             $user->groups()->attach($group_ids);
@@ -187,7 +187,7 @@ 
      */
     public function sendReset($email)
     {
-        $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) {
+        $response = \Password::sendResetLink($email, function(\Illuminate\Mail\Message $message) {
             $message->subject('Your Password Reset Link');
         });
 
@@ -207,7 +207,7 @@ 
     public function resetPassword($credentials)
     {
         $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+        $response = \Password::reset($credentials, function($user, $password) use (&$token) {
             $user->password = $password;
             $user->save();
 

Indentation +233 added lines, -233 removed lines

@@ -4,244 +4,244 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\AclUser';
-    }
-
-    /**
-     * Check if the logged in user or the given user 
-     * has the given permissions on the given model.
-     * 
-     * @param  string  $nameOfPermission
-     * @param  string  $model            
-     * @param  boolean $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false )
-    {       
-        $user        = $user ?: \JWTAuth::parseToken()->authenticate();
-        $permissions = [];
-        \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){
-            $permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); 
-        });
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Acl\AclUser';
+	}
+
+	/**
+	 * Check if the logged in user or the given user 
+	 * has the given permissions on the given model.
+	 * 
+	 * @param  string  $nameOfPermission
+	 * @param  string  $model            
+	 * @param  boolean $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false )
+	{       
+		$user        = $user ?: \JWTAuth::parseToken()->authenticate();
+		$permissions = [];
+		\Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){
+			$permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); 
+		});
         
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given group.
-     * 
-     * @param  string  $groupName
-     * @return boolean
-     */
-    public function hasGroup($groupName)
-    {
-        $groups = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id)->groups;
-        return $groups->lists('name')->search($groupName, true) === false ? false : true;
-    }
-
-    /**
-     * Assign the given group ids to the given user.
-     * 
-     * @param  integer $user_id    
-     * @param  array   $group_ids
-     * @return object
-     */
-    public function assignGroups($user_id, $group_ids)
-    {
-        \DB::transaction(function () use ($user_id, $group_ids) {
-            $user = \Core::users()->find($user_id);
-            $user->groups()->detach();
-            $user->groups()->attach($group_ids);
-        });
-
-        return \Core::users()->find($user_id);
-    }
-
-    /**
-     * Handle a login request to the application.
-     * 
-     * @param  array   $credentials    
-     * @param  boolean $adminLogin
-     * @return string
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if ( ! $user = \Core::users()->first(['email' => $credentials['email']])) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
-        {
-            \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
-        {
-            return $token;
-        }
-        else
-        {
-            \ErrorHandler::loginFailed();
-        }
-    }
-
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return string
-     */
-    public function register($credentials)
-    {
-        return \JWTAuth::fromUser(\Core::users()->model->create($credentials));
-    }
-
-    /**
-     * Logout the user.
-     * 
-     * @return boolean
-     */
-    public function logout()
-    {
-        return \JWTAuth::invalidate(\JWTAuth::getToken());
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function block($user_id)
-    {
-        if ( ! $user = \Core::users()->find($user_id)) 
-        {
-            \ErrorHandler::notFound('user');
-        }
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->lists('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 * 
+	 * @param  string  $groupName
+	 * @return boolean
+	 */
+	public function hasGroup($groupName)
+	{
+		$groups = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id)->groups;
+		return $groups->lists('name')->search($groupName, true) === false ? false : true;
+	}
+
+	/**
+	 * Assign the given group ids to the given user.
+	 * 
+	 * @param  integer $user_id    
+	 * @param  array   $group_ids
+	 * @return object
+	 */
+	public function assignGroups($user_id, $group_ids)
+	{
+		\DB::transaction(function () use ($user_id, $group_ids) {
+			$user = \Core::users()->find($user_id);
+			$user->groups()->detach();
+			$user->groups()->attach($group_ids);
+		});
+
+		return \Core::users()->find($user_id);
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 * 
+	 * @param  array   $credentials    
+	 * @param  boolean $adminLogin
+	 * @return string
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if ( ! $user = \Core::users()->first(['email' => $credentials['email']])) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($user->blocked)
+		{
+			\ErrorHandler::userIsBlocked();
+		}
+		else if ($token = \JWTAuth::attempt($credentials))
+		{
+			return $token;
+		}
+		else
+		{
+			\ErrorHandler::loginFailed();
+		}
+	}
+
+	/**
+	 * Handle a registration request.
+	 * 
+	 * @param  array $credentials
+	 * @return string
+	 */
+	public function register($credentials)
+	{
+		return \JWTAuth::fromUser(\Core::users()->model->create($credentials));
+	}
+
+	/**
+	 * Logout the user.
+	 * 
+	 * @return boolean
+	 */
+	public function logout()
+	{
+		return \JWTAuth::invalidate(\JWTAuth::getToken());
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function block($user_id)
+	{
+		if ( ! $user = \Core::users()->find($user_id)) 
+		{
+			\ErrorHandler::notFound('user');
+		}
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if ($user->groups->lists('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function unblock($user_id)
-    {
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = \Core::users()->find($user_id);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Handle the editing of the user profile.
-     * 
-     * @param  array $profile
-     * @return object
-     */
-    public function editProfile($profile)
-    {
-        unset($profile['email']);
-        unset($profile['password']);
-        $profile['id'] = \JWTAuth::parseToken()->authenticate()->id;
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function unblock($user_id)
+	{
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = \Core::users()->find($user_id);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Handle the editing of the user profile.
+	 * 
+	 * @param  array $profile
+	 * @return object
+	 */
+	public function editProfile($profile)
+	{
+		unset($profile['email']);
+		unset($profile['password']);
+		$profile['id'] = \JWTAuth::parseToken()->authenticate()->id;
         
-        return $this->save($profile);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $url
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email, $url)
-    {
-        view()->composer('auth.emails.password', function($view) use ($url) {
-            $view->with(['url' => $url]);
-        });
-
-        $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) {
-            $message->subject('Your Password Reset Link');
-        });
-
-        switch ($response) 
-        {
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('email');
-        }
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return integer
-     */
-    public function resetPassword($credentials)
-    {
-        $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
-            $user->password = bcrypt($password);
-            $user->save();
-
-            $token = \JWTAuth::fromUser($user);
-        });
-
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return $token;
+		return $this->save($profile);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $url
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email, $url)
+	{
+		view()->composer('auth.emails.password', function($view) use ($url) {
+			$view->with(['url' => $url]);
+		});
+
+		$response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) {
+			$message->subject('Your Password Reset Link');
+		});
+
+		switch ($response) 
+		{
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('email');
+		}
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return integer
+	 */
+	public function resetPassword($credentials)
+	{
+		$token    = false;
+		$response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+			$user->password = bcrypt($password);
+			$user->save();
+
+			$token = \JWTAuth::fromUser($user);
+		});
+
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return $token;
                 
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
 
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
 
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
 
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
 }

Braces +7 added lines, -14 removed lines

@@ -76,24 +76,19 @@ 
         if ( ! $user = \Core::users()->first(['email' => $credentials['email']])) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) 
+        } else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) 
+        } else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
+        } else if ($user->blocked)
         {
             \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
+        } else if ($token = \JWTAuth::attempt($credentials))
         {
             return $token;
-        }
-        else
+        } else
         {
             \ErrorHandler::loginFailed();
         }
@@ -135,12 +130,10 @@ 
         if ( ! $this->hasGroup('Admin'))
         {
             \ErrorHandler::noPermissions();
-        }
-        else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
+        } else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
         {
             \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->lists('name')->search('Admin', true) !== false) 
+        } else if ($user->groups->lists('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::noPermissions();
         }

src/Modules/V1/Core/Utl/ErrorHandler.php

Indentation +65 added lines, -65 removed lines

@@ -2,81 +2,81 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => 'Please login before any action'];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => 'Please login before any action'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function tokenExpired()
-    {
-        $error = ['status' => 403, 'message' => 'Login token expired'];
-        abort($error['status'], $error['message']);
-    }
+	public function tokenExpired()
+	{
+		$error = ['status' => 403, 'message' => 'Login token expired'];
+		abort($error['status'], $error['message']);
+	}
 
-     public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => 'No permissions'];
-        abort($error['status'], $error['message']);
-    }
+	 public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => 'No permissions'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => 'Wrong mail or password'];
-        abort($error['status'], $error['message']);
-    }
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => 'Wrong mail or password'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
-        abort($error['status'], $error['message']);
-    }
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => 'Please check the given inputes'];
-        abort($error['status'], $error['message']);
-    }
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => 'Please check the given inputes'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => 'Can\'t create setting'];
-        abort($error['status'], $error['message']);
-    }
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => 'Can\'t create setting'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => 'Can\'t update setting key'];
-        abort($error['status'], $error['message']);
-    }
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => 'Can\'t update setting key'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => 'You have been blocked'];
-        abort($error['status'], $error['message']);
-    }
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => 'You have been blocked'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => 'Reset password token is invalid'];
-        abort($error['status'], $error['message']);
-    }
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => 'Reset password token is invalid'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => 'Reset password is invalid'];
-        abort($error['status'], $error['message']);
-    }
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => 'Reset password is invalid'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
-        abort($error['status'], $error['message']);
-    }
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function generalError()
-    {
-        $error = ['status' => 404, 'message' => 'Something went wrong'];
-        abort($error['status'], $error['message']);
-    }
+	public function generalError()
+	{
+		$error = ['status' => 404, 'message' => 'Something went wrong'];
+		abort($error['status'], $error['message']);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
     public function notFound($text)
     {
-        $error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+        $error = ['status' => 404, 'message' => 'The requested '.$text.' not found'];
         abort($error['status'], $error['message']);
     }
 

src/Modules/V1/Acl/Http/Controllers/UsersController.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'users';
+    protected $model = 'users';
 
     /**
      * List of all route actions that the base api controller
@@ -26,14 +26,14 @@ 
      * will skip login check for them.
      * @var array
      */
-    protected $skipLoginCheck      = ['login', 'register', 'sendreset', 'resetpassword'];
+    protected $skipLoginCheck = ['login', 'register', 'sendreset', 'resetpassword'];
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules     = [
+    protected $validationRules = [
     'email'    => 'required|email|unique:users,email,{id}',
     'password' => 'min:6'
     ];

Indentation +164 added lines, -164 removed lines

@@ -7,168 +7,168 @@
 
 class UsersController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'users';
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'block', 'unblock', 'editprofile', 'sendreset'];
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck      = ['login', 'register', 'sendreset', 'resetpassword'];
-
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules     = [
-    'email'    => 'required|email|unique:users,email,{id}',
-    'password' => 'min:6'
-    ];
-
-    /**
-     * Return the logged in user account.
-     * 
-     * @return \Illuminate\Http\Response
-     */
-    public function account()
-    {
-       $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
-       return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return \Response::json(\Core::users()->block($id), 200);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return \Response::json(\Core::users()->unblock($id), 200);
-    }
-
-    /**
-     * Logout the user.
-     * 
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return \Response::json(\Core::users()->logout(), 200);
-    }
-
-    /**
-     * Handle a registration request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'email|unique:users,email,{id}', 
-            'password' => 'min:6'
-            ]);
-
-        return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
-    }
-
-    /**
-     * Handle a login request of the none admin to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'required|email', 
-            'password' => 'required|min:6',
-            'admin'    => 'boolean'
-            ]);
-
-        return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
-    }
-
-    /**
-     * Handle an assign groups to user request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assigngroups(Request $request)
-    {
-        $this->validate($request, [
-            'group_ids' => 'required|exists:groups,id', 
-            'user_id'   => 'required|exists:users,id'
-            ]);
-
-        return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
-    }
-
-    /**
-     * Handle the editing of the user profile.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function editprofile(Request $request)
-    {
-        return \Response::json(\Core::users()->editProfile($request->all()), 200);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendreset(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email', 'url' => 'required|url']);
-
-        return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetpassword(Request $request)
-    {
-        $this->validate($request, [
-            'token'                 => 'required',
-            'email'                 => 'required|email',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
-
-        return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
-    }
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'users';
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'block', 'unblock', 'editprofile', 'sendreset'];
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck      = ['login', 'register', 'sendreset', 'resetpassword'];
+
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules     = [
+	'email'    => 'required|email|unique:users,email,{id}',
+	'password' => 'min:6'
+	];
+
+	/**
+	 * Return the logged in user account.
+	 * 
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account()
+	{
+	   $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
+	   return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return \Response::json(\Core::users()->block($id), 200);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return \Response::json(\Core::users()->unblock($id), 200);
+	}
+
+	/**
+	 * Logout the user.
+	 * 
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return \Response::json(\Core::users()->logout(), 200);
+	}
+
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'email|unique:users,email,{id}', 
+			'password' => 'min:6'
+			]);
+
+		return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
+	}
+
+	/**
+	 * Handle a login request of the none admin to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'required|email', 
+			'password' => 'required|min:6',
+			'admin'    => 'boolean'
+			]);
+
+		return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
+	}
+
+	/**
+	 * Handle an assign groups to user request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assigngroups(Request $request)
+	{
+		$this->validate($request, [
+			'group_ids' => 'required|exists:groups,id', 
+			'user_id'   => 'required|exists:users,id'
+			]);
+
+		return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
+	}
+
+	/**
+	 * Handle the editing of the user profile.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function editprofile(Request $request)
+	{
+		return \Response::json(\Core::users()->editProfile($request->all()), 200);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendreset(Request $request)
+	{
+		$this->validate($request, ['email' => 'required|email', 'url' => 'required|url']);
+
+		return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetpassword(Request $request)
+	{
+		$this->validate($request, [
+			'token'                 => 'required',
+			'email'                 => 'required|email',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
+
+		return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
+	}
 }

src/Modules/V1/Acl/Database/Migrations/2015_12_20_124154_password_resets.php

Indentation +22 added lines, -22 removed lines

@@ -5,27 +5,27 @@
 
 class PasswordResets extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->string('email')->index();
-            $table->string('token')->index();
-            $table->timestamp('created_at');
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('password_resets', function (Blueprint $table) {
+			$table->string('email')->index();
+			$table->string('token')->index();
+			$table->timestamp('created_at');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('password_resets');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('password_resets');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create('password_resets', function (Blueprint $table) {
+        Schema::create('password_resets', function(Blueprint $table) {
             $table->string('email')->index();
             $table->string('token')->index();
             $table->timestamp('created_at');

src/Modules/V1/Acl/Database/Migrations/2015_12_20_124153_users.php

Indentation +9 added lines, -9 removed lines

@@ -13,15 +13,15 @@
 	public function up()
 	{
 		Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100)->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60);
-            $table->boolean('blocked', 0);
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('name',100)->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60);
+			$table->boolean('blocked', 0);
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 	}
 
 	/**

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 	 */
 	public function up()
 	{
-		Schema::create('users', function (Blueprint $table) {
+		Schema::create('users', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('name',100)->nullable();
+            $table->string('name', 100)->nullable();
             $table->string('email')->unique();
             $table->string('password', 60);
             $table->boolean('blocked', 0);