SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Users/Services/UserService.php

Indentation +374 added lines, -374 removed lines

@@ -10,382 +10,382 @@
 
 class UserService extends BaseService
 {
-    /**
-     * @var PermissionService
-     */
-    protected $permissionService;
-
-    /**
-     * @var LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * @var NotificationService
-     */
-    protected $notificationService;
-
-    /**
-     * @var OauthClientService
-     */
-    protected $oauthClientService;
-
-    /**
-     * Init new object.
-     *
-     * @param   UserRepository       $repo
-     * @param   PermissionService    $permissionService
-     * @param   LoginProxy           $loginProxy
-     * @param   NotificationService  $notificationService
-     * @param   OauthClientService   $oauthClientService
-     * @return  void
-     */
-    public function __construct(
-        UserRepository $repo, 
-        PermissionService $permissionService, 
-        LoginProxy $loginProxy, 
-        NotificationService $notificationService,
-        OauthClientService $oauthClientService)
-    {
-        $this->permissionService   = $permissionService;
-        $this->loginProxy          = $loginProxy;
-        $this->notificationService = $notificationService;
-        $this->oauthClientService  = $oauthClientService;
-        parent::__construct($repo);
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = ['roles.permissions'])
-    {
-        $permissions = [];
-        $user        = $this->repo->find(\Auth::id(), $relations);
-        foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[$permission->repo][$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 $permissionName
-     * @param  string $model
-     * @param  mixed  $userId
-     * @return boolean
-     */
-    public function can($permissionName, $model, $userId = false)
-    {
-        $permission = $this->permissionService->first([
-            'and' => [
-                'model' => $model,
-                'name'  => $permissionName,
-                'roles' => [
-                    'op' => 'has',
-                    'val' => [
-                        'users' => [
-                            'op' => 'has',
-                            'val' => [
-                                'users.id' => $userId ?: \Auth::id()
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]);
-
-        return $permission ? true : false;
-    }
-
-    /**
-     * Check if the logged in or the given user has the given role.
-     *
-     * @param  string[] $roles
-     * @param  mixed    $user
-     * @return boolean
-     */
-    public function hasRoles($roles, $user = false)
-    {
-        return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
-    }
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $roleIds
-     * @return object
-     */
-    public function assignRoles($userId, $roleIds)
-    {
-        $user = false;
-        \DB::transaction(function () use ($userId, $permissionIds, &$user) {
-            $user = $this->repo->find($userId);
-            $this->repo->detachPermissions($userId);
-            $this->repo->attachPermissions($userId, $roleIds);
-        });
-
-        return $user;
-    }
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @param  boolean $adminLogin
-     * @return object
-     */
-    public function login($email, $password, $adminLogin = false)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \Errors::loginFailed();
-        } elseif ($adminLogin && ! $this->hasRoles(['Admin'], $user)) {
-            \Errors::loginFailed();
-        } elseif (! $adminLogin && $this->hasRoles(['Admin'], $user)) {
-            \Errors::loginFailed();
-        } elseif ($user->blocked) {
-            \Errors::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
-            \Errors::emailNotConfirmed();
-        }
-
-        return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
-    }
-
-    /**
-     * 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) {
-            \Errors::noSocialEmail();
-        }
-
-        if (! $this->repo->first(['email' => $user->email])) {
-            $this->register(['email' => $user->email, 'password' => ''], true);
-        }
-
-        return $this->loginProxy->login($user->email, config('skeleton.social_pass'));
-    }
+	/**
+	 * @var PermissionService
+	 */
+	protected $permissionService;
+
+	/**
+	 * @var LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * @var NotificationService
+	 */
+	protected $notificationService;
+
+	/**
+	 * @var OauthClientService
+	 */
+	protected $oauthClientService;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserRepository       $repo
+	 * @param   PermissionService    $permissionService
+	 * @param   LoginProxy           $loginProxy
+	 * @param   NotificationService  $notificationService
+	 * @param   OauthClientService   $oauthClientService
+	 * @return  void
+	 */
+	public function __construct(
+		UserRepository $repo, 
+		PermissionService $permissionService, 
+		LoginProxy $loginProxy, 
+		NotificationService $notificationService,
+		OauthClientService $oauthClientService)
+	{
+		$this->permissionService   = $permissionService;
+		$this->loginProxy          = $loginProxy;
+		$this->notificationService = $notificationService;
+		$this->oauthClientService  = $oauthClientService;
+		parent::__construct($repo);
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = ['roles.permissions'])
+	{
+		$permissions = [];
+		$user        = $this->repo->find(\Auth::id(), $relations);
+		foreach ($user->roles as $role) {
+			$role->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[$permission->repo][$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 $permissionName
+	 * @param  string $model
+	 * @param  mixed  $userId
+	 * @return boolean
+	 */
+	public function can($permissionName, $model, $userId = false)
+	{
+		$permission = $this->permissionService->first([
+			'and' => [
+				'model' => $model,
+				'name'  => $permissionName,
+				'roles' => [
+					'op' => 'has',
+					'val' => [
+						'users' => [
+							'op' => 'has',
+							'val' => [
+								'users.id' => $userId ?: \Auth::id()
+							]
+						]
+					]
+				]
+			]
+		]);
+
+		return $permission ? true : false;
+	}
+
+	/**
+	 * Check if the logged in or the given user has the given role.
+	 *
+	 * @param  string[] $roles
+	 * @param  mixed    $user
+	 * @return boolean
+	 */
+	public function hasRoles($roles, $user = false)
+	{
+		return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
+	}
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $roleIds
+	 * @return object
+	 */
+	public function assignRoles($userId, $roleIds)
+	{
+		$user = false;
+		\DB::transaction(function () use ($userId, $permissionIds, &$user) {
+			$user = $this->repo->find($userId);
+			$this->repo->detachPermissions($userId);
+			$this->repo->attachPermissions($userId, $roleIds);
+		});
+
+		return $user;
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @param  boolean $adminLogin
+	 * @return object
+	 */
+	public function login($email, $password, $adminLogin = false)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\Errors::loginFailed();
+		} elseif ($adminLogin && ! $this->hasRoles(['Admin'], $user)) {
+			\Errors::loginFailed();
+		} elseif (! $adminLogin && $this->hasRoles(['Admin'], $user)) {
+			\Errors::loginFailed();
+		} elseif ($user->blocked) {
+			\Errors::userIsBlocked();
+		} elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+			\Errors::emailNotConfirmed();
+		}
+
+		return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
+	}
+
+	/**
+	 * 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) {
+			\Errors::noSocialEmail();
+		}
+
+		if (! $this->repo->first(['email' => $user->email])) {
+			$this->register(['email' => $user->email, 'password' => ''], true);
+		}
+
+		return $this->loginProxy->login($user->email, config('skeleton.social_pass'));
+	}
     
-    /**
-     * Handle a registration request.
-     *
-     * @param  string  $name
-     * @param  string  $email
-     * @param  string  $password
-     * @param  boolean $skipConfirmEmail
-     * @return array
-     */
-    public function register($name, $email, $password, $skipConfirmEmail = false)
-    {
-        $user = $this->repo->save([
-            'name'      => $name,
-            'email'     => $email,
-            'password'  => $password,
-            'confirmed' => $skipConfirmEmail
-        ]);
-
-        if (! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  string  $name
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @param  boolean $skipConfirmEmail
+	 * @return array
+	 */
+	public function register($name, $email, $password, $skipConfirmEmail = false)
+	{
+		$user = $this->repo->save([
+			'name'      => $name,
+			'email'     => $email,
+			'password'  => $password,
+			'confirmed' => $skipConfirmEmail
+		]);
+
+		if (! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (\Auth::id() == $userId || $this->hasRoles(['Admin'], $user) !== false) {
-            \Errors::noPermissions();
-        }
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (\Auth::id() == $userId || $this->hasRoles(['Admin'], $user) !== false) {
+			\Errors::noPermissions();
+		}
         
-        return $this->repo->save(['id' => $userId, 'blocked' => 1]);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        return $this->repo->save(['id' => $userId, 'blocked' => 0]);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \Errors::notFound('email');
-        }
-
-        $token = \Password::getService()->create($user);
-        $this->notificationService->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param   string  $email
-     * @param   string  $password
-     * @param   string  $passwordConfirmation
-     * @param   string  $token
-     * @return string|void
-     */
-    public function resetPassword($email, $password, $passwordConfirmation, $token)
-    {
-        $response = \Password::reset([
-            'email'                 => $email, 
-            'password'              => $password, 
-            'password_confirmation' => $passwordConfirmation, 
-            'token'                 => $token
-        ], function ($user, $password) {
-            $this->repo->save(['id' => $user->id, 'password' => $password]);
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-                break;
-
-            case \Password::INVALID_TOKEN:
-                \Errors::invalidResetToken('token');
-                break;
-
-            case \Password::INVALID_PASSWORD:
-                \Errors::invalidResetPassword('email');
-                break;
-
-            case \Password::INVALID_USER:
-                \Errors::notFound('user');
-                break;
-
-            default:
-                \Errors::generalError();
-                break;
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  string  $password
-     * @param  string  $oldPassword
-     * @return void
-     */
-    public function changePassword($password, $oldPassword)
-    {
-        $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
-            \Errors::invalidOldPassword();
-        }
-
-        $this->repo->save(['id' => $user->id, 'password' => $password]);
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
-            \Errors::invalidConfirmationCode();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->repo->first(['email' => $email]);
-        if ($user->confirmed) {
-            \Errors::emailAlreadyConfirmed();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
-        $this->notificationService->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  string $name
-     * @param  string $email
-     * @param  string $profilePicture
-     * @return void
-     */
-    public function saveProfile($name, $email, $profilePicture = false)
-    {
-        if ($profilePicture) {
-            $data['profile_picture'] = \Media::uploadImageBas64($profilePicture, 'admins/profile_pictures');
-        }
+		return $this->repo->save(['id' => $userId, 'blocked' => 1]);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		return $this->repo->save(['id' => $userId, 'blocked' => 0]);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\Errors::notFound('email');
+		}
+
+		$token = \Password::getService()->create($user);
+		$this->notificationService->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param   string  $email
+	 * @param   string  $password
+	 * @param   string  $passwordConfirmation
+	 * @param   string  $token
+	 * @return string|void
+	 */
+	public function resetPassword($email, $password, $passwordConfirmation, $token)
+	{
+		$response = \Password::reset([
+			'email'                 => $email, 
+			'password'              => $password, 
+			'password_confirmation' => $passwordConfirmation, 
+			'token'                 => $token
+		], function ($user, $password) {
+			$this->repo->save(['id' => $user->id, 'password' => $password]);
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+				break;
+
+			case \Password::INVALID_TOKEN:
+				\Errors::invalidResetToken('token');
+				break;
+
+			case \Password::INVALID_PASSWORD:
+				\Errors::invalidResetPassword('email');
+				break;
+
+			case \Password::INVALID_USER:
+				\Errors::notFound('user');
+				break;
+
+			default:
+				\Errors::generalError();
+				break;
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  string  $password
+	 * @param  string  $oldPassword
+	 * @return void
+	 */
+	public function changePassword($password, $oldPassword)
+	{
+		$user = \Auth::user();
+		if (! \Hash::check($oldPassword, $user->password)) {
+			\Errors::invalidOldPassword();
+		}
+
+		$this->repo->save(['id' => $user->id, 'password' => $password]);
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+			\Errors::invalidConfirmationCode();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->repo->first(['email' => $email]);
+		if ($user->confirmed) {
+			\Errors::emailAlreadyConfirmed();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
+		$this->notificationService->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  string $name
+	 * @param  string $email
+	 * @param  string $profilePicture
+	 * @return void
+	 */
+	public function saveProfile($name, $email, $profilePicture = false)
+	{
+		if ($profilePicture) {
+			$data['profile_picture'] = \Media::uploadImageBas64($profilePicture, 'admins/profile_pictures');
+		}
         
-        $data['id'] = \Auth::id();
-        return $this->repo->save([
-            'id'             => \Auth::id(),
-            'name'           => $name,
-            'email'          => $email,
-            'profilePicture' => $profilePicture,
-        ]);
-    }
-
-    /**
-     * Logs out the user, revoke access token and refresh token.
-     *
-     * @return void
-     */
-    public function logout()
-    {
-        $this->oauthClientService->revokeAccessToken(\Auth::user()->token());
-    }
-
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken($refreshToken)
-    {
-        return $this->loginProxy->refreshToken($refreshToken);
-    }
+		$data['id'] = \Auth::id();
+		return $this->repo->save([
+			'id'             => \Auth::id(),
+			'name'           => $name,
+			'email'          => $email,
+			'profilePicture' => $profilePicture,
+		]);
+	}
+
+	/**
+	 * Logs out the user, revoke access token and refresh token.
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->oauthClientService->revokeAccessToken(\Auth::user()->token());
+	}
+
+	/**
+	 * Attempt to refresh the access token using the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken($refreshToken)
+	{
+		return $this->loginProxy->refreshToken($refreshToken);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -65,7 +65,7 @@ 
         $permissions = [];
         $user        = $this->repo->find(\Auth::id(), $relations);
         foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
+            $role->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->repo][$permission->id] = $permission->name;
             });
         }
@@ -128,7 +128,7 @@ 
     public function assignRoles($userId, $roleIds)
     {
         $user = false;
-        \DB::transaction(function () use ($userId, $permissionIds, &$user) {
+        \DB::transaction(function() use ($userId, $permissionIds, &$user) {
             $user = $this->repo->find($userId);
             $this->repo->detachPermissions($userId);
             $this->repo->attachPermissions($userId, $roleIds);
@@ -147,15 +147,15 @@ 
      */
     public function login($email, $password, $adminLogin = false)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::loginFailed();
         } elseif ($adminLogin && ! $this->hasRoles(['Admin'], $user)) {
             \Errors::loginFailed();
-        } elseif (! $adminLogin && $this->hasRoles(['Admin'], $user)) {
+        } elseif ( ! $adminLogin && $this->hasRoles(['Admin'], $user)) {
             \Errors::loginFailed();
         } elseif ($user->blocked) {
             \Errors::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
             \Errors::emailNotConfirmed();
         }
 
@@ -175,11 +175,11 @@ 
         $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) {
             \Errors::noSocialEmail();
         }
 
-        if (! $this->repo->first(['email' => $user->email])) {
+        if ( ! $this->repo->first(['email' => $user->email])) {
             $this->register(['email' => $user->email, 'password' => ''], true);
         }
 
@@ -204,7 +204,7 @@ 
             'confirmed' => $skipConfirmEmail
         ]);
 
-        if (! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
+        if ( ! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -245,7 +245,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::notFound('email');
         }
 
@@ -269,7 +269,7 @@ 
             'password'              => $password, 
             'password_confirmation' => $passwordConfirmation, 
             'token'                 => $token
-        ], function ($user, $password) {
+        ], function($user, $password) {
             $this->repo->save(['id' => $user->id, 'password' => $password]);
         });
 
@@ -306,7 +306,7 @@ 
     public function changePassword($password, $oldPassword)
     {
         $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
+        if ( ! \Hash::check($oldPassword, $user->password)) {
             \Errors::invalidOldPassword();
         }
 
@@ -321,7 +321,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
             \Errors::invalidConfirmationCode();
         }
 

src/Modules/Reporting/Report.php

Indentation +24 added lines, -24 removed lines

@@ -7,32 +7,32 @@
 class Report extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'reports';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['report_name', 'view_name'];
-    public $searchable  = ['report_name', 'view_name'];
+	use SoftDeletes;
+	protected $table    = 'reports';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['report_name', 'view_name'];
+	public $searchable  = ['report_name', 'view_name'];
 
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        Report::observe(ReportObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Report::observe(ReportObserver::class);
+	}
 }

src/Modules/Reporting/ModelObservers/ReportObserver.php

Indentation +49 added lines, -49 removed lines

@@ -6,53 +6,53 @@
 class ReportObserver
 {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        //
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    public function deleting($model)
-    {
-        //
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
-
-    public function restoring($model)
-    {
-        //
-    }
-
-    public function restored($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		//
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	public function deleting($model)
+	{
+		//
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
+
+	public function restoring($model)
+	{
+		//
+	}
+
+	public function restored($model)
+	{
+		//
+	}
 }

src/Modules/Reporting/Services/ReportService.php

Indentation +41 added lines, -41 removed lines

@@ -6,49 +6,49 @@
 
 class ReportService extends BaseService
 {
-    /**
-     * @var UserService
-     */
-    protected $userService;
+	/**
+	 * @var UserService
+	 */
+	protected $userService;
 
-    /**
-     * Init new object.
-     *
-     * @param   ReportRepository $repo
-     * @return  void
-     */
-    public function __construct(ReportRepository $repo, UserService $userService)
-    {
-        $this->userService = $userService;
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   ReportRepository $repo
+	 * @return  void
+	 */
+	public function __construct(ReportRepository $repo, UserService $userService)
+	{
+		$this->userService = $userService;
+		parent::__construct($repo);
+	}
 
-    /**
-     * Render the given report db view based on the given
-     * condition.
-     *
-     * @param  string  $reportName
-     * @param  array   $conditions
-     * @param  integer $perPage
-     * @param  boolean $skipPermission
-     * @return object
-     */
-    public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false)
-    {
-        /**
-         * Fetch the report from db.
-         */
-        $report = $this->repo->first(['report_name' => $reportName]);
+	/**
+	 * Render the given report db view based on the given
+	 * condition.
+	 *
+	 * @param  string  $reportName
+	 * @param  array   $conditions
+	 * @param  integer $perPage
+	 * @param  boolean $skipPermission
+	 * @return object
+	 */
+	public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false)
+	{
+		/**
+		 * Fetch the report from db.
+		 */
+		$report = $this->repo->first(['report_name' => $reportName]);
 
-        /**
-         * Check report existance and permission.
-         */
-        if (! $report) {
-            \Errors::notFound('report');
-        } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) {
-            \Errors::noPermissions();
-        }
+		/**
+		 * Check report existance and permission.
+		 */
+		if (! $report) {
+			\Errors::notFound('report');
+		} elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) {
+			\Errors::noPermissions();
+		}
 
-       return $this->repo->renderReport($report, $conditions, $perPage);
-    }
+	   return $this->repo->renderReport($report, $conditions, $perPage);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
         /**
          * Check report existance and permission.
          */
-        if (! $report) {
+        if ( ! $report) {
             \Errors::notFound('report');
-        } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) {
+        } elseif ( ! $skipPermission && ! $this->userService->can($report->view_name, 'report')) {
             \Errors::noPermissions();
         }
 

src/ApiSkeletonServiceProvider.php

Indentation +36 added lines, -36 removed lines

@@ -6,42 +6,42 @@
 

 class ApiSkeletonServiceProvider extends ServiceProvider

 {

-    /**

-     * Perform post-registration booting of services.

-     *

-     * @return void

-     */

-    public function boot()

-    {

-        $this->publishes([

-            __DIR__.'/Modules'                               => app_path('Modules'),

-            __DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),

-            __DIR__.'/../lang'                               => base_path('resources/lang'),

-            __DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),

-            __DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),

-            __DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),

-            __DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),

-            __DIR__.'/../files/HttpKernel.php'               => app_path('Http/Kernel.php'),

-            __DIR__.'/../files/channels.php'                 => base_path('routes/channels.php'),

-            __DIR__.'/../phpcs.xml'                          => base_path('/phpcs.xml'),

-        ]);

+	/**

+	 * Perform post-registration booting of services.

+	 *

+	 * @return void

+	 */

+	public function boot()

+	{

+		$this->publishes([

+			__DIR__.'/Modules'                               => app_path('Modules'),

+			__DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),

+			__DIR__.'/../lang'                               => base_path('resources/lang'),

+			__DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),

+			__DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),

+			__DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),

+			__DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),

+			__DIR__.'/../files/HttpKernel.php'               => app_path('Http/Kernel.php'),

+			__DIR__.'/../files/channels.php'                 => base_path('routes/channels.php'),

+			__DIR__.'/../phpcs.xml'                          => base_path('/phpcs.xml'),

+		]);

 

-        $this->publishes([

-            __DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),

-            __DIR__.'/../files/auth.php'      => config_path('auth.php'),

-        ], 'config');

-    }

+		$this->publishes([

+			__DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),

+			__DIR__.'/../files/auth.php'      => config_path('auth.php'),

+		], 'config');

+	}

 

-    /**

-     * Register any package services.

-     *

-     * @return void

-     */

-    public function register()

-    {

-        $this->mergeConfigFrom(

-            __DIR__.'/../config/skeleton.php',

-            'skeleton'

-        );

-    }

+	/**

+	 * Register any package services.

+	 *

+	 * @return void

+	 */

+	public function register()

+	{

+		$this->mergeConfigFrom(

+			__DIR__.'/../config/skeleton.php',

+			'skeleton'

+		);

+	}

 }

lang/en/passwords.php

Indentation +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Password Reset Language Lines

     |--------------------------------------------------------------------------

@@ -13,10 +13,10 @@ 
     |

     */

 

-    'password' => 'Passwords must be at least six characters and match the confirmation.',

-    'reset' => 'Your password has been reset!',

-    'sent' => 'We have e-mailed your password reset link!',

-    'token' => 'This password reset token is invalid.',

-    'user' => "We can't find a user with that e-mail address.",

+	'password' => 'Passwords must be at least six characters and match the confirmation.',

+	'reset' => 'Your password has been reset!',

+	'sent' => 'We have e-mailed your password reset link!',

+	'token' => 'This password reset token is invalid.',

+	'user' => "We can't find a user with that e-mail address.",

 

 ];

lang/en/pagination.php

Indentation +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Pagination Language Lines

     |--------------------------------------------------------------------------

@@ -13,7 +13,7 @@ 
     |

     */

 

-    'previous' => '« Previous',

-    'next'     => 'Next »',

+	'previous' => '« Previous',

+	'next'     => 'Next »',

 

 ];

lang/en/auth.php

Indentation +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Authentication Language Lines

     |--------------------------------------------------------------------------

@@ -13,7 +13,7 @@ 
     |

     */

 

-    'failed' => 'These credentials do not match our records.',

-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',

+	'failed' => 'These credentials do not match our records.',

+	'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',

 

 ];

lang/en/validation.php

Indentation +75 added lines, -75 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Validation Language Lines

     |--------------------------------------------------------------------------

@@ -13,74 +13,74 @@ 
     |

     */

 

-    'accepted'             => 'The :attribute must be accepted.',

-    'active_url'           => 'The :attribute is not a valid URL.',

-    'after'                => 'The :attribute must be a date after :date.',

-    'alpha'                => 'The :attribute may only contain letters.',

-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',

-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',

-    'array'                => 'The :attribute must be an array.',

-    'before'               => 'The :attribute must be a date before :date.',

-    'between'              => [

-        'numeric' => 'The :attribute must be between :min and :max.',

-        'file'    => 'The :attribute must be between :min and :max kilobytes.',

-        'string'  => 'The :attribute must be between :min and :max characters.',

-        'array'   => 'The :attribute must have between :min and :max items.',

-    ],

-    'boolean'              => 'The :attribute field must be true or false.',

-    'confirmed'            => 'The :attribute confirmation does not match.',

-    'date'                 => 'The :attribute is not a valid date.',

-    'date_format'          => 'The :attribute does not match the format :format.',

-    'different'            => 'The :attribute and :other must be different.',

-    'digits'               => 'The :attribute must be :digits digits.',

-    'digits_between'       => 'The :attribute must be between :min and :max digits.',

-    'distinct'             => 'The :attribute field has a duplicate value.',

-    'email'                => 'The :attribute must be a valid email address.',

-    'exists'               => 'The selected :attribute is invalid.',

-    'filled'               => 'The :attribute field is required.',

-    'image'                => 'The :attribute must be an image.',

-    'in'                   => 'The selected :attribute is invalid.',

-    'in_array'             => 'The :attribute field does not exist in :other.',

-    'integer'              => 'The :attribute must be an integer.',

-    'ip'                   => 'The :attribute must be a valid IP address.',

-    'json'                 => 'The :attribute must be a valid JSON string.',

-    'max'                  => [

-        'numeric' => 'The :attribute may not be greater than :max.',

-        'file'    => 'The :attribute may not be greater than :max kilobytes.',

-        'string'  => 'The :attribute may not be greater than :max characters.',

-        'array'   => 'The :attribute may not have more than :max items.',

-    ],

-    'mimes'                => 'The :attribute must be a file of type: :values.',

-    'min'                  => [

-        'numeric' => 'The :attribute must be at least :min.',

-        'file'    => 'The :attribute must be at least :min kilobytes.',

-        'string'  => 'The :attribute must be at least :min characters.',

-        'array'   => 'The :attribute must have at least :min items.',

-    ],

-    'not_in'               => 'The selected :attribute is invalid.',

-    'numeric'              => 'The :attribute must be a number.',

-    'present'              => 'The :attribute field must be present.',

-    'regex'                => 'The :attribute format is invalid.',

-    'required'             => 'The :attribute field is required.',

-    'required_if'          => 'The :attribute field is required when :other is :value.',

-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',

-    'required_with'        => 'The :attribute field is required when :values is present.',

-    'required_with_all'    => 'The :attribute field is required when :values is present.',

-    'required_without'     => 'The :attribute field is required when :values is not present.',

-    'required_without_all' => 'The :attribute field is required when none of :values are present.',

-    'same'                 => 'The :attribute and :other must match.',

-    'size'                 => [

-        'numeric' => 'The :attribute must be :size.',

-        'file'    => 'The :attribute must be :size kilobytes.',

-        'string'  => 'The :attribute must be :size characters.',

-        'array'   => 'The :attribute must contain :size items.',

-    ],

-    'string'               => 'The :attribute must be a string.',

-    'timezone'             => 'The :attribute must be a valid zone.',

-    'unique'               => 'The :attribute has already been taken.',

-    'url'                  => 'The :attribute format is invalid.',

+	'accepted'             => 'The :attribute must be accepted.',

+	'active_url'           => 'The :attribute is not a valid URL.',

+	'after'                => 'The :attribute must be a date after :date.',

+	'alpha'                => 'The :attribute may only contain letters.',

+	'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',

+	'alpha_num'            => 'The :attribute may only contain letters and numbers.',

+	'array'                => 'The :attribute must be an array.',

+	'before'               => 'The :attribute must be a date before :date.',

+	'between'              => [

+		'numeric' => 'The :attribute must be between :min and :max.',

+		'file'    => 'The :attribute must be between :min and :max kilobytes.',

+		'string'  => 'The :attribute must be between :min and :max characters.',

+		'array'   => 'The :attribute must have between :min and :max items.',

+	],

+	'boolean'              => 'The :attribute field must be true or false.',

+	'confirmed'            => 'The :attribute confirmation does not match.',

+	'date'                 => 'The :attribute is not a valid date.',

+	'date_format'          => 'The :attribute does not match the format :format.',

+	'different'            => 'The :attribute and :other must be different.',

+	'digits'               => 'The :attribute must be :digits digits.',

+	'digits_between'       => 'The :attribute must be between :min and :max digits.',

+	'distinct'             => 'The :attribute field has a duplicate value.',

+	'email'                => 'The :attribute must be a valid email address.',

+	'exists'               => 'The selected :attribute is invalid.',

+	'filled'               => 'The :attribute field is required.',

+	'image'                => 'The :attribute must be an image.',

+	'in'                   => 'The selected :attribute is invalid.',

+	'in_array'             => 'The :attribute field does not exist in :other.',

+	'integer'              => 'The :attribute must be an integer.',

+	'ip'                   => 'The :attribute must be a valid IP address.',

+	'json'                 => 'The :attribute must be a valid JSON string.',

+	'max'                  => [

+		'numeric' => 'The :attribute may not be greater than :max.',

+		'file'    => 'The :attribute may not be greater than :max kilobytes.',

+		'string'  => 'The :attribute may not be greater than :max characters.',

+		'array'   => 'The :attribute may not have more than :max items.',

+	],

+	'mimes'                => 'The :attribute must be a file of type: :values.',

+	'min'                  => [

+		'numeric' => 'The :attribute must be at least :min.',

+		'file'    => 'The :attribute must be at least :min kilobytes.',

+		'string'  => 'The :attribute must be at least :min characters.',

+		'array'   => 'The :attribute must have at least :min items.',

+	],

+	'not_in'               => 'The selected :attribute is invalid.',

+	'numeric'              => 'The :attribute must be a number.',

+	'present'              => 'The :attribute field must be present.',

+	'regex'                => 'The :attribute format is invalid.',

+	'required'             => 'The :attribute field is required.',

+	'required_if'          => 'The :attribute field is required when :other is :value.',

+	'required_unless'      => 'The :attribute field is required unless :other is in :values.',

+	'required_with'        => 'The :attribute field is required when :values is present.',

+	'required_with_all'    => 'The :attribute field is required when :values is present.',

+	'required_without'     => 'The :attribute field is required when :values is not present.',

+	'required_without_all' => 'The :attribute field is required when none of :values are present.',

+	'same'                 => 'The :attribute and :other must match.',

+	'size'                 => [

+		'numeric' => 'The :attribute must be :size.',

+		'file'    => 'The :attribute must be :size kilobytes.',

+		'string'  => 'The :attribute must be :size characters.',

+		'array'   => 'The :attribute must contain :size items.',

+	],

+	'string'               => 'The :attribute must be a string.',

+	'timezone'             => 'The :attribute must be a valid zone.',

+	'unique'               => 'The :attribute has already been taken.',

+	'url'                  => 'The :attribute format is invalid.',

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Custom Validation Language Lines

     |--------------------------------------------------------------------------

@@ -91,13 +91,13 @@ 
     |

     */

 

-    'custom' => [

-        'attribute-name' => [

-            'rule-name' => 'custom-message',

-        ],

-    ],

+	'custom' => [

+		'attribute-name' => [

+			'rule-name' => 'custom-message',

+		],

+	],

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Custom Validation Attributes

     |--------------------------------------------------------------------------

@@ -108,6 +108,6 @@ 
     |

     */

 

-    'attributes' => [],

+	'attributes' => [],

 

 ];