SherifElfadaly / Laravel-Api-Skeleton

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

Doc Comments +1 added lines, -1 removed lines

@@ -268,7 +268,7 @@
      * @param  string $groupName The name of the requested group.
      * @param  integer $perPage  Number of rows per page default 15.
      * @param  string  $sortBy   The name of the column to sort by.
-     * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc     Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)

Indentation +280 added lines, -280 removed lines

@@ -11,285 +11,285 @@
 
 class UsersController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile', 'account'];
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
-
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules = [
-        'name'     => 'nullable|string',
-        'email'    => 'required|email|unique:users,email,{id}',
-        'password' => 'nullable|min:6'
-    ];
-
-    /**
-     * The loginProxy implementation.
-     *
-     * @var \App\Modules\Acl\Proxy\LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * Init new object.
-     *
-     * @param   LoginProxy     $loginProxy
-     * @param   UserRepository $repo
-     * @param   CoreConfig     $config
-     * @return  void
-     */
-    public function __construct(LoginProxy $loginProxy, UserRepository $repo, CoreConfig $config)
-    {
-        $this->loginProxy = $loginProxy;
-        parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclUser');
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function account()
-    {
-        return new $this->modelResource($this->repo->account($this->relations));
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return new $this->modelResource($this->repo->block($id));
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return new $this->modelResource($this->repo->unblock($id));
-    }
-
-    /**
-     * Logout the user.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return new GeneralResource($this->loginProxy->logout());
-    }
-
-    /**
-     * Handle a registration request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Request $request)
-    {
-        $this->validate($request, [
-            'name'     => 'nullable|string',
-            'email'    => 'required|email|unique:users,email,{id}',
-            'password' => 'required|min:6'
-            ]);
-
-        return new $this->modelResource($this->repo->register($request->only('name', 'email', 'password')));
-    }
-
-    /**
-     * Handle a login request 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'    => 'nullable|boolean'
-            ]);
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile', 'account'];
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
+
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules = [
+		'name'     => 'nullable|string',
+		'email'    => 'required|email|unique:users,email,{id}',
+		'password' => 'nullable|min:6'
+	];
+
+	/**
+	 * The loginProxy implementation.
+	 *
+	 * @var \App\Modules\Acl\Proxy\LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   LoginProxy     $loginProxy
+	 * @param   UserRepository $repo
+	 * @param   CoreConfig     $config
+	 * @return  void
+	 */
+	public function __construct(LoginProxy $loginProxy, UserRepository $repo, CoreConfig $config)
+	{
+		$this->loginProxy = $loginProxy;
+		parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclUser');
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account()
+	{
+		return new $this->modelResource($this->repo->account($this->relations));
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return new $this->modelResource($this->repo->block($id));
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return new $this->modelResource($this->repo->unblock($id));
+	}
+
+	/**
+	 * Logout the user.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return new GeneralResource($this->loginProxy->logout());
+	}
+
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Request $request)
+	{
+		$this->validate($request, [
+			'name'     => 'nullable|string',
+			'email'    => 'required|email|unique:users,email,{id}',
+			'password' => 'required|min:6'
+			]);
+
+		return new $this->modelResource($this->repo->register($request->only('name', 'email', 'password')));
+	}
+
+	/**
+	 * Handle a login request 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'    => 'nullable|boolean'
+			]);
         
-        $result = $this->loginProxy->login($request->only('email', 'password'), $request->get('admin'));
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(Request $request)
-    {
-        $this->validate($request, [
-            'auth_code'    => 'required_without:access_token',
-            'access_token' => 'required_without:auth_code',
-            'type'         => 'required|in:facebook,google'
-            ]);
-
-        $result = $this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Assign the given groups to the given user.
-     *
-     * @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 new $this->modelResource($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')));
-    }
-
-    /**
-     * 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']);
-
-        return new GeneralResource($this->repo->sendReset($request->get('email')));
-    }
-
-    /**
-     * 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 new GeneralResource($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')));
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(Request $request)
-    {
-        $this->validate($request, [
-            'old_password'          => 'required',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
-
-        return new GeneralResource($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')));
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmail(Request $request)
-    {
-        $this->validate($request, [
-            'confirmation_code' => 'required|string'
-        ]);
-
-        return new GeneralResource($this->repo->confirmEmail($request->only('confirmation_code')));
-    }
-
-    /**
-     * Resend the email confirmation mail.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resendEmailConfirmation(Request $request)
-    {
-        $this->validate($request, [
-            'email' => 'required|exists:users,email'
-        ]);
-
-        return new GeneralResource($this->repo->sendConfirmationEmail($request->get('email')));
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshtoken(Request $request)
-    {
-        $this->validate($request, [
-            'refreshtoken' => 'required',
-        ]);
-
-        return new GeneralResource($this->loginProxy->refreshtoken($request->get('refreshtoken')));
-    }
-
-    /**
-     * Paginate all users with in the given group.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string $groupName The name of the requested group.
-     * @param  integer $perPage  Number of rows per page default 15.
-     * @param  string  $sortBy   The name of the column to sort by.
-     * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc));
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(Request $request)
-    {
-        $this->validate($request, [
-            'profile_picture' => 'nullable|string',
-            'name'            => 'nullable|string',
-            'email'           => 'required|email|unique:users,email,'.\Auth::id()
-        ]);
-
-        return new $this->modelResource($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')));
-    }
+		$result = $this->loginProxy->login($request->only('email', 'password'), $request->get('admin'));
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(Request $request)
+	{
+		$this->validate($request, [
+			'auth_code'    => 'required_without:access_token',
+			'access_token' => 'required_without:auth_code',
+			'type'         => 'required|in:facebook,google'
+			]);
+
+		$result = $this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Assign the given groups to the given user.
+	 *
+	 * @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 new $this->modelResource($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')));
+	}
+
+	/**
+	 * 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']);
+
+		return new GeneralResource($this->repo->sendReset($request->get('email')));
+	}
+
+	/**
+	 * 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 new GeneralResource($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')));
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(Request $request)
+	{
+		$this->validate($request, [
+			'old_password'          => 'required',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
+
+		return new GeneralResource($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')));
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmail(Request $request)
+	{
+		$this->validate($request, [
+			'confirmation_code' => 'required|string'
+		]);
+
+		return new GeneralResource($this->repo->confirmEmail($request->only('confirmation_code')));
+	}
+
+	/**
+	 * Resend the email confirmation mail.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resendEmailConfirmation(Request $request)
+	{
+		$this->validate($request, [
+			'email' => 'required|exists:users,email'
+		]);
+
+		return new GeneralResource($this->repo->sendConfirmationEmail($request->get('email')));
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshtoken(Request $request)
+	{
+		$this->validate($request, [
+			'refreshtoken' => 'required',
+		]);
+
+		return new GeneralResource($this->loginProxy->refreshtoken($request->get('refreshtoken')));
+	}
+
+	/**
+	 * Paginate all users with in the given group.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string $groupName The name of the requested group.
+	 * @param  integer $perPage  Number of rows per page default 15.
+	 * @param  string  $sortBy   The name of the column to sort by.
+	 * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc));
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(Request $request)
+	{
+		$this->validate($request, [
+			'profile_picture' => 'nullable|string',
+			'name'            => 'nullable|string',
+			'email'           => 'required|email|unique:users,email,'.\Auth::id()
+		]);
+
+		return new $this->modelResource($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')));
+	}
 }

src/Modules/Acl/Repositories/UserRepository.php

Doc Comments +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
      *
      * @param  array   $credentials
      * @param  boolean $skipConfirmEmail
-     * @return array
+     * @return boolean
      */
     public function register($credentials, $skipConfirmEmail = false)
     {
@@ -344,7 +344,7 @@ 
      * Save the given data to the logged in user.
      *
      * @param  array $data
-     * @return void
+     * @return boolean
      */
     public function saveProfile($data)
     {

Indentation +379 added lines, -379 removed lines

@@ -6,391 +6,391 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     *
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\Acl\AclUser';
-    }
-
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = \Core::users()->find(\Auth::id(), $relations);
-        foreach ($user->groups()->get() as $group) {
-            $group->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
-        $user->permissions = $permissions;
-
-        return $user;
-    }
-
-    /**
-     * 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  mixed  $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false)
-    {
-        $user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
-        $permissions = [];
-
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
-            $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
-        });
+	/**
+	 * Return the model full namespace.
+	 *
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\Acl\AclUser';
+	}
+
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = \Core::users()->find(\Auth::id(), $relations);
+		foreach ($user->groups()->get() as $group) {
+			$group->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
+		$user->permissions = $permissions;
+
+		return $user;
+	}
+
+	/**
+	 * 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  mixed  $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false)
+	{
+		$user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
+		$permissions = [];
+
+		$user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
+		});
         
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given group.
-     *
-     * @param  string[] $groups
-     * @param  mixed $user
-     * @return boolean
-     */
-    public function hasGroup($groups, $user = false)
-    {
-        $user = $user ?: $this->find(\Auth::id());
-        return $user->groups->whereIn('name', $groups)->count() ? true : false;
-    }
-
-    /**
-     * Assign the given group ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $groupIds
-     * @return object
-     */
-    public function assignGroups($userId, $groupIds)
-    {
-        \DB::transaction(function () use ($userId, $groupIds) {
-            $user = $this->find($userId);
-            $user->groups()->detach();
-            $user->groups()->attach($groupIds);
-        });
-
-        return $this->find($userId);
-    }
-
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return object
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
-            \ErrorHandler::loginFailed();
-        } elseif ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) {
-            \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) {
-            \ErrorHandler::loginFailed();
-        } elseif ($user->blocked) {
-            \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
-            \ErrorHandler::emailNotConfirmed();
-        }
-
-        return $user;
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @param  string $type
-     * @return array
-     */
-    public function loginSocial($authCode, $accessToken, $type)
-    {
-        $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user         = \Socialite::driver($type)->userFromToken($access_token);
-
-        if (! $user->email) {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if ( ! $this->model->where('email', $user->email)->first()) {
-            $this->register(['email' => $user->email, 'password' => ''], true);
-        }
-
-        $loginProxy = \App::make('App\Modules\Acl\Proxy\LoginProxy');
-        return $loginProxy->login(['email' => $user->email, 'password' => config('skeleton.social_pass')], 0);
-    }
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 *
+	 * @param  string[] $groups
+	 * @param  mixed $user
+	 * @return boolean
+	 */
+	public function hasGroup($groups, $user = false)
+	{
+		$user = $user ?: $this->find(\Auth::id());
+		return $user->groups->whereIn('name', $groups)->count() ? true : false;
+	}
+
+	/**
+	 * Assign the given group ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $groupIds
+	 * @return object
+	 */
+	public function assignGroups($userId, $groupIds)
+	{
+		\DB::transaction(function () use ($userId, $groupIds) {
+			$user = $this->find($userId);
+			$user->groups()->detach();
+			$user->groups()->attach($groupIds);
+		});
+
+		return $this->find($userId);
+	}
+
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return object
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if (! $user = $this->first(['email' => $credentials['email']])) {
+			\ErrorHandler::loginFailed();
+		} elseif ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) {
+			\ErrorHandler::loginFailed();
+		} elseif (! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) {
+			\ErrorHandler::loginFailed();
+		} elseif ($user->blocked) {
+			\ErrorHandler::userIsBlocked();
+		} elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+			\ErrorHandler::emailNotConfirmed();
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @param  string $type
+	 * @return array
+	 */
+	public function loginSocial($authCode, $accessToken, $type)
+	{
+		$access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user         = \Socialite::driver($type)->userFromToken($access_token);
+
+		if (! $user->email) {
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if ( ! $this->model->where('email', $user->email)->first()) {
+			$this->register(['email' => $user->email, 'password' => ''], true);
+		}
+
+		$loginProxy = \App::make('App\Modules\Acl\Proxy\LoginProxy');
+		return $loginProxy->login(['email' => $user->email, 'password' => config('skeleton.social_pass')], 0);
+	}
     
-    /**
-     * Handle a registration request.
-     *
-     * @param  array   $credentials
-     * @param  boolean $skipConfirmEmail
-     * @return array
-     */
-    public function register($credentials, $skipConfirmEmail = false)
-    {
-        $user = $this->save($credentials);
-
-        if ($skipConfirmEmail) {
-            $user->confirmed = 1;
-            $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $skipConfirmEmail
+	 * @return array
+	 */
+	public function register($credentials, $skipConfirmEmail = false)
+	{
+		$user = $this->save($credentials);
+
+		if ($skipConfirmEmail) {
+			$user->confirmed = 1;
+			$user->save();
+		} elseif (! config('skeleton.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (! $user = $this->find($userId)) {
-            \ErrorHandler::notFound('user');
-        }
-        if (! $this->hasGroup(['Admin'])) {
-            \ErrorHandler::noPermissions();
-        } elseif (\Auth::id() == $userId) {
-            \ErrorHandler::noPermissions();
-        } elseif ($user->groups->pluck('name')->search('Admin', true) !== false) {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (! $user = $this->find($userId)) {
+			\ErrorHandler::notFound('user');
+		}
+		if (! $this->hasGroup(['Admin'])) {
+			\ErrorHandler::noPermissions();
+		} elseif (\Auth::id() == $userId) {
+			\ErrorHandler::noPermissions();
+		} elseif ($user->groups->pluck('name')->search('Admin', true) !== false) {
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        if (! $this->hasGroup(['Admin'])) {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($userId);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (! $user = $this->model->where('email', $email)->first()) {
-            \ErrorHandler::notFound('email');
-        }
-
-        $token = \Password::getRepository()->create($user);
-        \Core::notifications()->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return string|null
-     */
-    public function resetPassword($credentials)
-    {
-        $response = \Password::reset($credentials, function ($user, $password) {
-            $user->password = $password;
-            $user->save();
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
-                //no break
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-                //no break
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-                //no break
-
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  array  $credentials
-     * @return void
-     */
-    public function changePassword($credentials)
-    {
-        $user = \Auth::user();
-        if (! \Hash::check($credentials['old_password'], $user->password)) {
-            \ErrorHandler::invalidOldPassword();
-        }
-
-        $user->password = $credentials['password'];
-        $user->save();
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
-            \ErrorHandler::invalidConfirmationCode();
-        }
-
-        $user->confirmed         = 1;
-        $user->confirmation_code = null;
-        $user->save();
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->first(['email' => $email]);
-        if ($user->confirmed) {
-            \ErrorHandler::emailAlreadyConfirmed();
-        }
-
-        $user->confirmed         = 0;
-        $user->confirmation_code = sha1(microtime());
-        $user->save();
-        \Core::notifications()->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Paginate all users in the given group based on the given conditions.
-     *
-     * @param  string  $groupName
-     * @param  array   $relations
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = call_user_func_array("{$this->getModel()}::with", array($relations));
-
-        $model->whereHas('groups', function ($q) use ($groupName) {
-            $q->where('name', $groupName);
-        });
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		if (! $this->hasGroup(['Admin'])) {
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($userId);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (! $user = $this->model->where('email', $email)->first()) {
+			\ErrorHandler::notFound('email');
+		}
+
+		$token = \Password::getRepository()->create($user);
+		\Core::notifications()->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return string|null
+	 */
+	public function resetPassword($credentials)
+	{
+		$response = \Password::reset($credentials, function ($user, $password) {
+			$user->password = $password;
+			$user->save();
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+				//no break
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+				//no break
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+				//no break
+
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  array  $credentials
+	 * @return void
+	 */
+	public function changePassword($credentials)
+	{
+		$user = \Auth::user();
+		if (! \Hash::check($credentials['old_password'], $user->password)) {
+			\ErrorHandler::invalidOldPassword();
+		}
+
+		$user->password = $credentials['password'];
+		$user->save();
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+			\ErrorHandler::invalidConfirmationCode();
+		}
+
+		$user->confirmed         = 1;
+		$user->confirmation_code = null;
+		$user->save();
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->first(['email' => $email]);
+		if ($user->confirmed) {
+			\ErrorHandler::emailAlreadyConfirmed();
+		}
+
+		$user->confirmed         = 0;
+		$user->confirmation_code = sha1(microtime());
+		$user->save();
+		\Core::notifications()->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Paginate all users in the given group based on the given conditions.
+	 *
+	 * @param  string  $groupName
+	 * @param  array   $relations
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = call_user_func_array("{$this->getModel()}::with", array($relations));
+
+		$model->whereHas('groups', function ($q) use ($groupName) {
+			$q->where('name', $groupName);
+		});
 
         
-        if (count($conditions['conditionValues'])) {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        if ($perPage) {
-            return $model->orderBy($sortBy, $sort)->paginate($perPage);
-        }
-
-        return $model->orderBy($sortBy, $sort)->get();
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function saveProfile($data)
-    {
-        if (Arr::has($data, 'profile_picture')) {
-            $data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
-        }
+		if (count($conditions['conditionValues'])) {
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		if ($perPage) {
+			return $model->orderBy($sortBy, $sort)->paginate($perPage);
+		}
+
+		return $model->orderBy($sortBy, $sort)->get();
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return void
+	 */
+	public function saveProfile($data)
+	{
+		if (Arr::has($data, 'profile_picture')) {
+			$data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
+		}
         
-        $data['id'] = \Auth::id();
-        return $this->save($data);
-    }
-
-    /**
-     * Ensure access token hasn't expired or revoked.
-     *
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        $accessTokenId = json_decode($accessToken, true)['id'];
-        $accessToken   = \DB::table('oauth_access_tokens')
-                ->where('id', $accessTokenId)
-                ->first();
+		$data['id'] = \Auth::id();
+		return $this->save($data);
+	}
+
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 *
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		$accessTokenId = json_decode($accessToken, true)['id'];
+		$accessToken   = \DB::table('oauth_access_tokens')
+				->where('id', $accessTokenId)
+				->first();
         
-        if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Revoke the given access token and all
-     * associated refresh tokens.
-     *
-     * @param  oject $accessToken
-     * @return void
-     */
-    public function revokeAccessToken($accessToken)
-    {
-        \DB::table('oauth_refresh_tokens')
-            ->where('access_token_id', $accessToken->id)
-            ->update([
-                'revoked' => true
-            ]);
-
-        $accessToken->revoke();
-    }
+		if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Revoke the given access token and all
+	 * associated refresh tokens.
+	 *
+	 * @param  oject $accessToken
+	 * @return void
+	 */
+	public function revokeAccessToken($accessToken)
+	{
+		\DB::table('oauth_refresh_tokens')
+			->where('access_token_id', $accessToken->id)
+			->update([
+				'revoked' => true
+			]);
+
+		$accessToken->revoke();
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -28,7 +28,7 @@ 
         $permissions = [];
         $user        = \Core::users()->find(\Auth::id(), $relations);
         foreach ($user->groups()->get() as $group) {
-            $group->permissions->each(function ($permission) use (&$permissions) {
+            $group->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }
@@ -51,7 +51,7 @@ 
         $user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
         $permissions = [];
 
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+        $user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model) {
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
         });
         
@@ -80,7 +80,7 @@ 
      */
     public function assignGroups($userId, $groupIds)
     {
-        \DB::transaction(function () use ($userId, $groupIds) {
+        \DB::transaction(function() use ($userId, $groupIds) {
             $user = $this->find($userId);
             $user->groups()->detach();
             $user->groups()->attach($groupIds);
@@ -99,15 +99,15 @@ 
      */
     public function login($credentials, $adminLogin = false)
     {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
+        if ( ! $user = $this->first(['email' => $credentials['email']])) {
             \ErrorHandler::loginFailed();
         } elseif ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) {
+        } elseif ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
         } elseif ($user->blocked) {
             \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
             \ErrorHandler::emailNotConfirmed();
         }
 
@@ -127,7 +127,7 @@ 
         $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user         = \Socialite::driver($type)->userFromToken($access_token);
 
-        if (! $user->email) {
+        if ( ! $user->email) {
             \ErrorHandler::noSocialEmail();
         }
 
@@ -153,7 +153,7 @@ 
         if ($skipConfirmEmail) {
             $user->confirmed = 1;
             $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
+        } elseif ( ! config('skeleton.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -168,10 +168,10 @@ 
      */
     public function block($userId)
     {
-        if (! $user = $this->find($userId)) {
+        if ( ! $user = $this->find($userId)) {
             \ErrorHandler::notFound('user');
         }
-        if (! $this->hasGroup(['Admin'])) {
+        if ( ! $this->hasGroup(['Admin'])) {
             \ErrorHandler::noPermissions();
         } elseif (\Auth::id() == $userId) {
             \ErrorHandler::noPermissions();
@@ -193,7 +193,7 @@ 
      */
     public function unblock($userId)
     {
-        if (! $this->hasGroup(['Admin'])) {
+        if ( ! $this->hasGroup(['Admin'])) {
             \ErrorHandler::noPermissions();
         }
 
@@ -212,7 +212,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->model->where('email', $email)->first()) {
+        if ( ! $user = $this->model->where('email', $email)->first()) {
             \ErrorHandler::notFound('email');
         }
 
@@ -228,7 +228,7 @@ 
      */
     public function resetPassword($credentials)
     {
-        $response = \Password::reset($credentials, function ($user, $password) {
+        $response = \Password::reset($credentials, function($user, $password) {
             $user->password = $password;
             $user->save();
         });
@@ -263,7 +263,7 @@ 
     public function changePassword($credentials)
     {
         $user = \Auth::user();
-        if (! \Hash::check($credentials['old_password'], $user->password)) {
+        if ( ! \Hash::check($credentials['old_password'], $user->password)) {
             \ErrorHandler::invalidOldPassword();
         }
 
@@ -279,7 +279,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) {
             \ErrorHandler::invalidConfirmationCode();
         }
 
@@ -324,7 +324,7 @@ 
         $sort       = $desc ? 'desc' : 'asc';
         $model      = call_user_func_array("{$this->getModel()}::with", array($relations));
 
-        $model->whereHas('groups', function ($q) use ($groupName) {
+        $model->whereHas('groups', function($q) use ($groupName) {
             $q->where('name', $groupName);
         });
 

src/Modules/Core/Http/Controllers/BaseApiController.php

Doc Comments +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
      * Init new object.
      *
      * @param   mixed      $repo
-     * @param   CoreConfig $config
+     * @param   \App\Modules\Core\Utl\CoreConfig $config
      * @param   string     $modelResource
      * @return  void
      */
@@ -59,7 +59,7 @@ 
      * Fetch all records with relations from storage.
      *
      * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc   Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function index($sortBy = 'created_at', $desc = 1)
@@ -85,7 +85,7 @@ 
      * @param  string  $query   The search text.
      * @param  integer $perPage Number of rows per page default 15.
      * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc    Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1)
@@ -99,7 +99,7 @@ 
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc   Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function findby(Request $request, $sortBy = 'created_at', $desc = 1)
@@ -124,7 +124,7 @@ 
      *
      * @param  integer $perPage Number of rows per page default 15.
      * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc    Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1)
@@ -139,7 +139,7 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @param  integer $perPage Number of rows per page default 15.
      * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc    Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
@@ -189,7 +189,7 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @param  integer $perPage Number of rows per page default 15.
      * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc    Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)

Indentation +297 added lines, -297 removed lines

@@ -9,303 +9,303 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The config implementation.
-     *
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * The relations implementation.
-     *
-     * @var array
-     */
-    protected $relations;
-
-    /**
-     * The repo implementation.
-     *
-     * @var object
-     */
-    protected $repo;
-
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $repo
-     * @param   CoreConfig $config
-     * @param   string     $modelResource
-     * @return  void
-     */
-    public function __construct($repo, $config, $modelResource)
-    {
-        $this->repo = $repo;
-        $this->modelResource = $modelResource;
-        $this->config = $config->getConfig();
-        $this->modelName = explode('\\', get_called_class());
-        $this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
-        $this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
-        $this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-        $route = explode('@', \Route::currentRouteAction())[1];
-
-        $this->setSessions();
-        $this->checkPermission($route);
-        $this->setRelations($route);
-    }
-
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function index($sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->all($this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function find($id)
-    {
-        return new $this->modelResource($this->repo->find($id, $this->relations));
-    }
-
-    /**
-     * Paginate all records with relations from storage
-     * that matche the given query.
-     *
-     * @param  string  $query   The search text.
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function findby(Request $request, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function first(Request $request)
-    {
-        return new $this->modelResource($this->repo->first($request->all(), $this->relations));
-    }
-
-    /**
-     * Paginate all records with relations from storage.
-     *
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->paginate($perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Save the given model to storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function save(Request $request)
-    {
-        foreach ($this->validationRules as &$rule) {
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) {
-                $rule .= ',deleted_at,NULL';
-            }
-
-            if ($request->has('id')) {
-                $rule = str_replace('{id}', $request->get('id'), $rule);
-            } else {
-                $rule = str_replace(',{id}', '', $rule);
-            }
-        }
+	/**
+	 * The config implementation.
+	 *
+	 * @var array
+	 */
+	protected $config;
+
+	/**
+	 * The relations implementation.
+	 *
+	 * @var array
+	 */
+	protected $relations;
+
+	/**
+	 * The repo implementation.
+	 *
+	 * @var object
+	 */
+	protected $repo;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $repo
+	 * @param   CoreConfig $config
+	 * @param   string     $modelResource
+	 * @return  void
+	 */
+	public function __construct($repo, $config, $modelResource)
+	{
+		$this->repo = $repo;
+		$this->modelResource = $modelResource;
+		$this->config = $config->getConfig();
+		$this->modelName = explode('\\', get_called_class());
+		$this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
+		$this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
+		$this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
+		$route = explode('@', \Route::currentRouteAction())[1];
+
+		$this->setSessions();
+		$this->checkPermission($route);
+		$this->setRelations($route);
+	}
+
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index($sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->all($this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function find($id)
+	{
+		return new $this->modelResource($this->repo->find($id, $this->relations));
+	}
+
+	/**
+	 * Paginate all records with relations from storage
+	 * that matche the given query.
+	 *
+	 * @param  string  $query   The search text.
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function findby(Request $request, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function first(Request $request)
+	{
+		return new $this->modelResource($this->repo->first($request->all(), $this->relations));
+	}
+
+	/**
+	 * Paginate all records with relations from storage.
+	 *
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->paginate($perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Save the given model to storage.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function save(Request $request)
+	{
+		foreach ($this->validationRules as &$rule) {
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) {
+				$rule .= ',deleted_at,NULL';
+			}
+
+			if ($request->has('id')) {
+				$rule = str_replace('{id}', $request->get('id'), $rule);
+			} else {
+				$rule = str_replace(',{id}', '', $rule);
+			}
+		}
         
-        $this->validate($request, $this->validationRules);
-
-        return $this->modelResource::collection($this->repo->save($request->all()));
-    }
-
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id)
-    {
-        return new GeneralResource($this->repo->delete($id));
-    }
-
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->deleted($request->all(), $perPage, $sortBy, $desc));
-    }
-
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->repo->restore($id));
-    }
-
-    /**
-     * Check if the logged in user can do the given permission.
-     *
-     * @param  string $permission
-     * @return void
-     */
-    private function checkPermission($permission)
-    {
-        \Auth::shouldUse('api');
-        $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
+		$this->validate($request, $this->validationRules);
+
+		return $this->modelResource::collection($this->repo->save($request->all()));
+	}
+
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id)
+	{
+		return new GeneralResource($this->repo->delete($id));
+	}
+
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->deleted($request->all(), $perPage, $sortBy, $desc));
+	}
+
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->repo->restore($id));
+	}
+
+	/**
+	 * Check if the logged in user can do the given permission.
+	 *
+	 * @param  string $permission
+	 * @return void
+	 */
+	private function checkPermission($permission)
+	{
+		\Auth::shouldUse('api');
+		$this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
-            $user             = \Auth::user();
-            $permission       = $permission !== 'index' ? $permission : 'list';
-            $isPasswordClient = $user->token()->client->password_client;
-            $this->updateLocaleAndTimezone($user);
-
-            if ($user->blocked) {
-                \ErrorHandler::userIsBlocked();
-            }
-
-            if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
-            } else {
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
-
-    /**
-     * Set sessions based on the given headers in the request.
-     *
-     * @return void
-     */
-    private function setSessions()
-    {
-        \Session::put('time-zone', \Request::header('time-zone') ?: 0);
-
-        $locale = \Request::header('locale');
-        switch ($locale) {
-            case 'en':
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-
-            case 'ar':
-                \App::setLocale('ar');
-                \Session::put('locale', 'ar');
-                break;
-
-            case 'all':
-                \App::setLocale('en');
-                \Session::put('locale', 'all');
-                break;
-
-            default:
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-        }
-    }
-
-    /**
-     * Set relation based on the called api.
-     *
-     * @param  string $route
-     * @return void
-     */
-    private function setRelations($route)
-    {
-        $route           = $route !== 'index' ? $route : 'list';
-        $relations       = Arr::get($this->config['relations'], $this->modelName, false);
-        $this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
-    }
-
-    /**
-     * Update the logged in user locale and time zone.
-     *
-     * @param  object $user
-     * @return void
-     */
-    private function updateLocaleAndTimezone($user)
-    {
-        $update   = false;
-        $locale   = \Session::get('locale');
-        $timezone = \Session::get('time-zone');
-        if ($locale && $locale !== 'all' && $locale !== $user->locale) {
-            $user->locale = $locale;
-            $update       = true;
-        }
-
-        if ($timezone && $timezone !== $user->timezone) {
-            $user->timezone = $timezone;
-            $update       = true;
-        }
-
-        if ($update) {
-            $user->save();
-        }
-    }
+		if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+			$user             = \Auth::user();
+			$permission       = $permission !== 'index' ? $permission : 'list';
+			$isPasswordClient = $user->token()->client->password_client;
+			$this->updateLocaleAndTimezone($user);
+
+			if ($user->blocked) {
+				\ErrorHandler::userIsBlocked();
+			}
+
+			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
+			} elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+			} else {
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
+
+	/**
+	 * Set sessions based on the given headers in the request.
+	 *
+	 * @return void
+	 */
+	private function setSessions()
+	{
+		\Session::put('time-zone', \Request::header('time-zone') ?: 0);
+
+		$locale = \Request::header('locale');
+		switch ($locale) {
+			case 'en':
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+
+			case 'ar':
+				\App::setLocale('ar');
+				\Session::put('locale', 'ar');
+				break;
+
+			case 'all':
+				\App::setLocale('en');
+				\Session::put('locale', 'all');
+				break;
+
+			default:
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+		}
+	}
+
+	/**
+	 * Set relation based on the called api.
+	 *
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = Arr::get($this->config['relations'], $this->modelName, false);
+		$this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	}
+
+	/**
+	 * Update the logged in user locale and time zone.
+	 *
+	 * @param  object $user
+	 * @return void
+	 */
+	private function updateLocaleAndTimezone($user)
+	{
+		$update   = false;
+		$locale   = \Session::get('locale');
+		$timezone = \Session::get('time-zone');
+		if ($locale && $locale !== 'all' && $locale !== $user->locale) {
+			$user->locale = $locale;
+			$update       = true;
+		}
+
+		if ($timezone && $timezone !== $user->timezone) {
+			$user->timezone = $timezone;
+			$update       = true;
+		}
+
+		if ($update) {
+			$user->save();
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -219,7 +219,7 @@ 
         \Auth::shouldUse('api');
         $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+        if ( ! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
             $user             = \Auth::user();
             $permission       = $permission !== 'index' ? $permission : 'list';
             $isPasswordClient = $user->token()->client->password_client;
@@ -230,7 +230,7 @@ 
             }
 
             if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+            } elseif ( ! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
             } else {
                 \ErrorHandler::noPermissions();
             }
@@ -301,7 +301,7 @@ 
 
         if ($timezone && $timezone !== $user->timezone) {
             $user->timezone = $timezone;
-            $update       = true;
+            $update = true;
         }
 
         if ($update) {

src/Modules/Reporting/Http/Controllers/ReportsController.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $reportName Name of the requested report
      * @param  integer $perPage    Number of rows per page default all data.
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function getReport(Request $request, $reportName, $perPage = 0)
     {

Indentation +29 added lines, -29 removed lines

@@ -9,35 +9,35 @@
 
 class ReportsController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['getReport'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['getReport'];
 
-    /**
-     * Init new object.
-     *
-     * @param   ReportRepository $repo
-     * @param   CoreConfig       $config
-     * @return  void
-     */
-    public function __construct(ReportRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Reporting\Http\Resources\Report');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   ReportRepository $repo
+	 * @param   CoreConfig       $config
+	 * @return  void
+	 */
+	public function __construct(ReportRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Reporting\Http\Resources\Report');
+	}
 
-    /**
-     * Render the given report name with the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $reportName Name of the requested report
-     * @param  integer $perPage    Number of rows per page default all data.
-     * @return \Illuminate\Http\Response
-     */
-    public function getReport(Request $request, $reportName, $perPage = 0)
-    {
-        return \Response::json($this->repo->getReport($reportName, $request->all(), $perPage), 200);
-    }
+	/**
+	 * Render the given report name with the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $reportName Name of the requested report
+	 * @param  integer $perPage    Number of rows per page default all data.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getReport(Request $request, $reportName, $perPage = 0)
+	{
+		return \Response::json($this->repo->getReport($reportName, $request->all(), $perPage), 200);
+	}
 }

files/Handler.php

Indentation +59 added lines, -59 removed lines

@@ -7,67 +7,67 @@
 
 class Handler extends ExceptionHandler
 {
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        \League\OAuth2\Server\Exception\OAuthServerException::class,
-    ];
+	/**
+	 * A list of the exception types that are not reported.
+	 *
+	 * @var array
+	 */
+	protected $dontReport = [
+		\League\OAuth2\Server\Exception\OAuthServerException::class,
+	];
 
-    /**
-     * A list of the inputs that are never flashed for validation exceptions.
-     *
-     * @var array
-     */
-    protected $dontFlash = [
-        'password',
-        'password_confirmation',
-    ];
+	/**
+	 * A list of the inputs that are never flashed for validation exceptions.
+	 *
+	 * @var array
+	 */
+	protected $dontFlash = [
+		'password',
+		'password_confirmation',
+	];
 
-    /**
-     * Report or log an exception.
-     *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param  \Exception  $exception
-     * @return void
-     */
-    public function report(Exception $exception)
-    {
-        parent::report($exception);
-    }
+	/**
+	 * Report or log an exception.
+	 *
+	 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+	 *
+	 * @param  \Exception  $exception
+	 * @return void
+	 */
+	public function report(Exception $exception)
+	{
+		parent::report($exception);
+	}
 
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $exception)
-    {
-        if ($request->wantsJson()) {
-            if ($exception instanceof \Illuminate\Auth\AuthenticationException) {
-                \ErrorHandler::unAuthorized();
-            }
-            if ($exception instanceof \Illuminate\Database\QueryException) {
-                \ErrorHandler::dbQueryError();
-            } elseif ($exception instanceof \predis\connection\connectionexception) {
-                \ErrorHandler::redisNotRunning();
-            } elseif ($exception instanceof \GuzzleHttp\Exception\ClientException) {
-                \ErrorHandler::connectionError();
-            } elseif ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {
-                $errors = $exception->getStatusCode() === 404 ? 'not found' : $exception->getMessage();
-                return \Response::json(['errors' => [$errors]], $exception->getStatusCode());
-            } elseif ($exception instanceof \Illuminate\Validation\ValidationException) {
-                return \Response::json(['errors' => $exception->errors()], 422);
-            } elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {
-                return parent::render($request, $exception);
-            }
-        }
+	/**
+	 * Render an exception into an HTTP response.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Exception  $exception
+	 * @return \Illuminate\Http\Response
+	 */
+	public function render($request, Exception $exception)
+	{
+		if ($request->wantsJson()) {
+			if ($exception instanceof \Illuminate\Auth\AuthenticationException) {
+				\ErrorHandler::unAuthorized();
+			}
+			if ($exception instanceof \Illuminate\Database\QueryException) {
+				\ErrorHandler::dbQueryError();
+			} elseif ($exception instanceof \predis\connection\connectionexception) {
+				\ErrorHandler::redisNotRunning();
+			} elseif ($exception instanceof \GuzzleHttp\Exception\ClientException) {
+				\ErrorHandler::connectionError();
+			} elseif ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {
+				$errors = $exception->getStatusCode() === 404 ? 'not found' : $exception->getMessage();
+				return \Response::json(['errors' => [$errors]], $exception->getStatusCode());
+			} elseif ($exception instanceof \Illuminate\Validation\ValidationException) {
+				return \Response::json(['errors' => $exception->errors()], 422);
+			} elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {
+				return parent::render($request, $exception);
+			}
+		}
         
-        return parent::render($request, $exception);
-    }
+		return parent::render($request, $exception);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                 return \Response::json(['errors' => [$errors]], $exception->getStatusCode());
             } elseif ($exception instanceof \Illuminate\Validation\ValidationException) {
                 return \Response::json(['errors' => $exception->errors()], 422);
-            } elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {
+            } elseif ( ! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {
                 return parent::render($request, $exception);
             }
         }

src/Modules/Notifications/Routes/api.php

Indentation +20 added lines, -20 removed lines

@@ -13,27 +13,27 @@
 
 Route::group(['prefix' => 'notifications'], function () {
 
-    Route::group(['prefix' => 'notifications'], function () {
+	Route::group(['prefix' => 'notifications'], function () {
         
-        Route::get('list/{perPage?}', 'NotificationsController@list');
-        Route::get('unread/{perPage?}', 'NotificationsController@unread');
-        Route::get('markAsRead/{id}', 'NotificationsController@markAsRead');
-        Route::get('markAllAsRead', 'NotificationsController@markAllAsRead');
-    });
+		Route::get('list/{perPage?}', 'NotificationsController@list');
+		Route::get('unread/{perPage?}', 'NotificationsController@unread');
+		Route::get('markAsRead/{id}', 'NotificationsController@markAsRead');
+		Route::get('markAllAsRead', 'NotificationsController@markAllAsRead');
+	});
 
-    Route::group(['prefix' => 'push_notification_devices'], function () {
+	Route::group(['prefix' => 'push_notification_devices'], function () {
         
-        Route::get('list/{sortBy?}/{desc?}', 'PushNotificationDevicesController@index');
-        Route::get('find/{id}', 'PushNotificationDevicesController@find');
-        Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'PushNotificationDevicesController@search');
-        Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'PushNotificationDevicesController@paginate');
-        Route::get('delete/{id}', 'PushNotificationDevicesController@delete');
-        Route::get('restore/{id}', 'PushNotificationDevicesController@restore');
-        Route::post('first', 'PushNotificationDevicesController@first');
-        Route::post('findby/{sortBy?}/{desc?}', 'PushNotificationDevicesController@findby');
-        Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'PushNotificationDevicesController@paginateby');
-        Route::post('save', 'PushNotificationDevicesController@save');
-        Route::post('deleted/{perPage?}/{sortBy?}/{desc?}', 'PushNotificationDevicesController@deleted');
-        Route::post('register/device', 'PushNotificationDevicesController@registerDevice');
-    });
+		Route::get('list/{sortBy?}/{desc?}', 'PushNotificationDevicesController@index');
+		Route::get('find/{id}', 'PushNotificationDevicesController@find');
+		Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'PushNotificationDevicesController@search');
+		Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'PushNotificationDevicesController@paginate');
+		Route::get('delete/{id}', 'PushNotificationDevicesController@delete');
+		Route::get('restore/{id}', 'PushNotificationDevicesController@restore');
+		Route::post('first', 'PushNotificationDevicesController@first');
+		Route::post('findby/{sortBy?}/{desc?}', 'PushNotificationDevicesController@findby');
+		Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'PushNotificationDevicesController@paginateby');
+		Route::post('save', 'PushNotificationDevicesController@save');
+		Route::post('deleted/{perPage?}/{sortBy?}/{desc?}', 'PushNotificationDevicesController@deleted');
+		Route::post('register/device', 'PushNotificationDevicesController@registerDevice');
+	});
 });

Spacing +3 added lines, -3 removed lines

@@ -11,9 +11,9 @@ 
 |
 */
 
-Route::group(['prefix' => 'notifications'], function () {
+Route::group(['prefix' => 'notifications'], function() {
 
-    Route::group(['prefix' => 'notifications'], function () {
+    Route::group(['prefix' => 'notifications'], function() {
         
         Route::get('list/{perPage?}', 'NotificationsController@list');
         Route::get('unread/{perPage?}', 'NotificationsController@unread');
@@ -21,7 +21,7 @@ 
         Route::get('markAllAsRead', 'NotificationsController@markAllAsRead');
     });
 
-    Route::group(['prefix' => 'push_notification_devices'], function () {
+    Route::group(['prefix' => 'push_notification_devices'], function() {
         
         Route::get('list/{sortBy?}/{desc?}', 'PushNotificationDevicesController@index');
         Route::get('find/{id}', 'PushNotificationDevicesController@find');

src/Modules/Notifications/Database/Migrations/2016_01_24_111942_push_notification_devices.php

Indentation +26 added lines, -26 removed lines

@@ -5,31 +5,31 @@
 
 class PushNotificationsDevices extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('push_notification_devices', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('device_token');
-            $table->integer('user_id');
-            $table->text('access_token')->nullable();
-            $table->unique(array('device_token', 'user_id'));
-            $table->softDeletes();
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('push_notification_devices', function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('device_token');
+			$table->integer('user_id');
+			$table->text('access_token')->nullable();
+			$table->unique(array('device_token', 'user_id'));
+			$table->softDeletes();
+			$table->timestamps();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('push_notifications_devices');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('push_notifications_devices');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create('push_notification_devices', function (Blueprint $table) {
+        Schema::create('push_notification_devices', function(Blueprint $table) {
             $table->increments('id');
             $table->string('device_token');
             $table->integer('user_id');

src/Modules/Notifications/Http/Resources/Notification.php

Indentation +17 added lines, -17 removed lines

@@ -6,21 +6,21 @@
 
 class Notification extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'type' => $this->type,
-            'data' => $this->data,
-            'readAt' => $this->read_at,
-            'createdAt' => $this->created_at,
-            'updatedAt' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'type' => $this->type,
+			'data' => $this->data,
+			'readAt' => $this->read_at,
+			'createdAt' => $this->created_at,
+			'updatedAt' => $this->updated_at,
+		];
+	}
 }

src/Modules/Notifications/Http/Resources/PushNotificationDevice.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
 
 class PushNotificationDevice extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'deviceToken' => $this->device_token,
-            'accessToken' => $this->access_token,
-            'user' => new UserResource($this->whenLoaded('user')),
-            'timeZone' => $this->time_zone,
-            'createdAt' => $this->created_at,
-            'updatedAt' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'deviceToken' => $this->device_token,
+			'accessToken' => $this->access_token,
+			'user' => new UserResource($this->whenLoaded('user')),
+			'timeZone' => $this->time_zone,
+			'createdAt' => $this->created_at,
+			'updatedAt' => $this->updated_at,
+		];
+	}
 }