SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/Database/Factories/UserFactory.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\V1\Acl\AclUser::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\V1\Acl\AclUser::class, function(Faker\Generator $faker) {
     return [
 		'profile_picture' => 'http://lorempixel.com/400/200/',
 		'name'            => $faker->name(),

Indentation +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 
 $factory->define(App\Modules\V1\Acl\AclUser::class, function (Faker\Generator $faker) {
-    return [
+	return [
 		'profile_picture' => 'http://lorempixel.com/400/200/',
 		'name'            => $faker->name(),
 		'email'           => $faker->safeEmail(),
 		'password'        => 123456,
 		'created_at'      => $faker->dateTimeBetween('-1 years', 'now'),
 		'updated_at'      => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	];
 });

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

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
         $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()); 
         });
         
@@ -81,7 +81,7 @@ 
      */
     public function assignGroups($user_id, $group_ids)
     {
-        \DB::transaction(function () use ($user_id, $group_ids) {
+        \DB::transaction(function() use ($user_id, $group_ids) {
             $user = $this->find($user_id);
             $user->groups()->detach();
             $user->groups()->attach($group_ids);
@@ -248,7 +248,7 @@ 
      */
     public function resetPassword($credentials)
     {
-        $response = \Password::reset($credentials, function ($user, $password) {
+        $response = \Password::reset($credentials, function($user, $password) {
             $user->password = $password;
             $user->save();
         });

Doc Comments +3 added lines, -4 removed lines

@@ -61,8 +61,8 @@ 
     /**
      * Check if the logged in user has the given group.
      * 
-     * @param  string  $groupName
-     * @param  integer $userId
+     * @param  integer $user
+     * @param string[] $groups
      * @return boolean
      */
     public function hasGroup($groups, $user = false)
@@ -244,7 +244,7 @@ 
      * Reset the given user's password.
      *
      * @param  array  $credentials
-     * @return array
+     * @return string|null
      */
     public function resetPassword($credentials)
     {
@@ -361,7 +361,6 @@ 
     /**
      * Save the given data to the logged in user.
      *
-     * @param  array $credentials
      * @return void
      */
     public function saveProfile($data) 

Braces +7 added lines, -14 removed lines

@@ -102,20 +102,16 @@ 
         if ( ! $user = $this->first(['email' => $credentials['email']])) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
+        } else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
+        } else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
+        } else if ($user->blocked)
         {
             \ErrorHandler::userIsBlocked();
-        }
-        else if ( ! $user->confirmed)
+        } else if ( ! $user->confirmed)
         {
             \ErrorHandler::emailNotConfirmed();
         }
@@ -143,8 +139,7 @@ 
         {
             $data = ['email' => $user->email, 'password' => ''];
             return $this->register($data);
-        }
-        else
+        } else
         {
             if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
             {
@@ -187,12 +182,10 @@ 
         if ( ! $this->hasGroup(['Admin']))
         {
             \ErrorHandler::noPermissions();
-        }
-        else if (\Auth::id() == $user_id)
+        } else if (\Auth::id() == $user_id)
         {
             \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::noPermissions();
         }

Indentation +382 added lines, -382 removed lines

@@ -5,394 +5,394 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\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  boolean $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\V1\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  boolean $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  $groupName
-     * @param  integer $userId
-     * @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 $user_id    
-     * @param  array   $group_ids
-     * @return object
-     */
-    public function assignGroups($user_id, $group_ids)
-    {
-        \DB::transaction(function () use ($user_id, $group_ids) {
-            $user = $this->find($user_id);
-            $user->groups()->detach();
-            $user->groups()->attach($group_ids);
-        });
-
-        return $this->find($user_id);
-    }
-
-
-    /**
-     * 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();
-        }
-        else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
-        {
-            \ErrorHandler::userIsBlocked();
-        }
-        else if ( ! $user->confirmed)
-        {
-            \ErrorHandler::emailNotConfirmed();
-        }
-
-        return $user;
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     * 
-     * @param  array   $credentials
-     * @return array
-     */
-    public function loginSocial($credentials)
-    {
-        $access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
-        $user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
-
-        if ( ! $user->email)
-        {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
-        {
-            $data = ['email' => $user->email, 'password' => ''];
-            return $this->register($data);
-        }
-        else
-        {
-            if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
-            {
-                \ErrorHandler::userAlreadyRegistered();
-            }
-
-            $loginProxy = \App::make('App\Modules\V1\Acl\Proxy\LoginProxy');
-            return $loginProxy->login(['email' => $registeredUser->email, 'password' => ''], 0);
-        }
-    }
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 * 
+	 * @param  string  $groupName
+	 * @param  integer $userId
+	 * @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 $user_id    
+	 * @param  array   $group_ids
+	 * @return object
+	 */
+	public function assignGroups($user_id, $group_ids)
+	{
+		\DB::transaction(function () use ($user_id, $group_ids) {
+			$user = $this->find($user_id);
+			$user->groups()->detach();
+			$user->groups()->attach($group_ids);
+		});
+
+		return $this->find($user_id);
+	}
+
+
+	/**
+	 * 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();
+		}
+		else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($user->blocked)
+		{
+			\ErrorHandler::userIsBlocked();
+		}
+		else if ( ! $user->confirmed)
+		{
+			\ErrorHandler::emailNotConfirmed();
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 * 
+	 * @param  array   $credentials
+	 * @return array
+	 */
+	public function loginSocial($credentials)
+	{
+		$access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
+		$user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
+
+		if ( ! $user->email)
+		{
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
+		{
+			$data = ['email' => $user->email, 'password' => ''];
+			return $this->register($data);
+		}
+		else
+		{
+			if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
+			{
+				\ErrorHandler::userAlreadyRegistered();
+			}
+
+			$loginProxy = \App::make('App\Modules\V1\Acl\Proxy\LoginProxy');
+			return $loginProxy->login(['email' => $registeredUser->email, 'password' => ''], 0);
+		}
+	}
     
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return array
-     */
-    public function register($credentials)
-    {
-        $user = $this->save($credentials);
-
-        if ( ! env('DISABLE_CONFIRM_EMAIL')) 
-        {
-            $this->sendConfirmationEmail($user->email);
-        }
-    }
+	/**
+	 * Handle a registration request.
+	 * 
+	 * @param  array $credentials
+	 * @return array
+	 */
+	public function register($credentials)
+	{
+		$user = $this->save($credentials);
+
+		if ( ! env('DISABLE_CONFIRM_EMAIL')) 
+		{
+			$this->sendConfirmationEmail($user->email);
+		}
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function block($user_id)
-    {
-        if ( ! $user = $this->find($user_id)) 
-        {
-            \ErrorHandler::notFound('user');
-        }
-        if ( ! $this->hasGroup(['Admin']))
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if (\Auth::id() == $user_id)
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function block($user_id)
+	{
+		if ( ! $user = $this->find($user_id)) 
+		{
+			\ErrorHandler::notFound('user');
+		}
+		if ( ! $this->hasGroup(['Admin']))
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if (\Auth::id() == $user_id)
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function unblock($user_id)
-    {
-        if ( ! $this->hasGroup(['Admin']))
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($user_id);
-        $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 array
-     */
-    public function resetPassword($credentials)
-    {
-        $response = \Password::reset($credentials, function ($user, $password) {
-            $user->password = $password;
-            $user->save();
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function unblock($user_id)
+	{
+		if ( ! $this->hasGroup(['Admin']))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($user_id);
+		$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 array
+	 */
+	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');
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-
-            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)
-    {
-        $user                    = $this->first(['confirmation_code' => $confirmationCode]);
-        $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);
-        });
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+
+			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)
+	{
+		$user                    = $this->first(['confirmation_code' => $confirmationCode]);
+		$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 $credentials
-     * @return void
-     */
-    public function saveProfile($data) 
-    {
-        if (array_key_exists('profile_picture', $data)) 
-        {
-            $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 $credentials
+	 * @return void
+	 */
+	public function saveProfile($data) 
+	{
+		if (array_key_exists('profile_picture', $data)) 
+		{
+			$data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
+		}
         
-        $data['id'] = \Auth::id();
-        $this->save($data);
-    }
-
-    /**
-     * Ensure access token hasn't expired or revoked.
-     * 
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-
-        $accessTokenRepository = \App::make('League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface');
-        $data = new ValidationData();
-        $data->setCurrentTime(time());
-
-        if ($accessToken->validate($data) === false || $accessTokenRepository->isAccessTokenRevoked($accessToken->getClaim('jti'))) 
-        {
-            return true;
-        }
-
-        return false;
-    }
+		$data['id'] = \Auth::id();
+		$this->save($data);
+	}
+
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 * 
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+
+		$accessTokenRepository = \App::make('League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface');
+		$data = new ValidationData();
+		$data->setCurrentTime(time());
+
+		if ($accessToken->validate($data) === false || $accessTokenRepository->isAccessTokenRevoked($accessToken->getClaim('jti'))) 
+		{
+			return true;
+		}
+
+		return false;
+	}
 }

src/Modules/V1/Core/Providers/ModuleServiceProvider.php

Indentation +64 added lines, -64 removed lines

@@ -7,75 +7,75 @@
 class ModuleServiceProvider extends ServiceProvider
 {
 	/**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
 
-        $factory = app('Illuminate\Database\Eloquent\Factory');
-        $factory->load(__DIR__.'/../Database/Factories');
-    }
+		$factory = app('Illuminate\Database\Eloquent\Factory');
+		$factory->load(__DIR__.'/../Database/Factories');
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //Bind Core Facade to the IoC Container
-        \App::bind('Core', function()
-        {
-            return new \App\Modules\V1\Core\Core;
-        });
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//Bind Core Facade to the IoC Container
+		\App::bind('Core', function()
+		{
+			return new \App\Modules\V1\Core\Core;
+		});
 
-        //Bind ErrorHandler Facade to the IoC Container
-        \App::bind('ErrorHandler', function()
-        {
-            return new \App\Modules\V1\Core\Utl\ErrorHandler;
-        });
+		//Bind ErrorHandler Facade to the IoC Container
+		\App::bind('ErrorHandler', function()
+		{
+			return new \App\Modules\V1\Core\Utl\ErrorHandler;
+		});
 
-        //Bind CoreConfig Facade to the IoC Container
-        \App::bind('CoreConfig', function()
-        {
-            return new \App\Modules\V1\Core\Utl\CoreConfig;
-        });
+		//Bind CoreConfig Facade to the IoC Container
+		\App::bind('CoreConfig', function()
+		{
+			return new \App\Modules\V1\Core\Utl\CoreConfig;
+		});
 
-        //Bind Mpgs Facade to the IoC Container
-        \App::bind('Media', function()
-        {
-            return new \App\Modules\V1\Core\Utl\Media;
-        });
+		//Bind Mpgs Facade to the IoC Container
+		\App::bind('Media', function()
+		{
+			return new \App\Modules\V1\Core\Utl\Media;
+		});
 
-        \Validator::extend('base64image', function ($attribute, $value, $parameters, $validator) {
-            $explode = explode(',', $value);
-            $allow   = ['png', 'jpg', 'svg'];
-            $format  = str_replace(
-                [
-                    'data:image/',
-                    ';',
-                    'base64',
-                ],
-                [
-                    '', '', '',
-                ],
-                $explode[0]
-            );
-            // check file format
-            if (!in_array($format, $allow)) {
-                return false;
-            }
-            // check base64 format
-            if (!preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $explode[1])) {
-                return false;
-            }
-            return true;
-        });
+		\Validator::extend('base64image', function ($attribute, $value, $parameters, $validator) {
+			$explode = explode(',', $value);
+			$allow   = ['png', 'jpg', 'svg'];
+			$format  = str_replace(
+				[
+					'data:image/',
+					';',
+					'base64',
+				],
+				[
+					'', '', '',
+				],
+				$explode[0]
+			);
+			// check file format
+			if (!in_array($format, $allow)) {
+				return false;
+			}
+			// check base64 format
+			if (!preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $explode[1])) {
+				return false;
+			}
+			return true;
+		});
         
-        $this->app->register(RouteServiceProvider::class);
-    }
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
             return new \App\Modules\V1\Core\Utl\Media;
         });
 
-        \Validator::extend('base64image', function ($attribute, $value, $parameters, $validator) {
+        \Validator::extend('base64image', function($attribute, $value, $parameters, $validator) {
             $explode = explode(',', $value);
             $allow   = ['png', 'jpg', 'svg'];
             $format  = str_replace(
@@ -66,11 +66,11 @@ 
                 $explode[0]
             );
             // check file format
-            if (!in_array($format, $allow)) {
+            if ( ! in_array($format, $allow)) {
                 return false;
             }
             // check base64 format
-            if (!preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $explode[1])) {
+            if ( ! preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $explode[1])) {
                 return false;
             }
             return true;

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

Indentation +4 added lines, -4 removed lines

@@ -2,9 +2,9 @@ 
 
 class CoreConfig
 {
-    public function getConfig()
-    {
-        return [
+	public function getConfig()
+	{
+		return [
 			/**
 			 * Specify what relations should be used for every model.
 			 */
@@ -133,5 +133,5 @@ 
 				]
 			]
 		];
-    }
+	}
 }
\ No newline at end of file

src/Modules/V1/Notifications/Notifications/ConfirmEmail.php

Indentation +34 added lines, -34 removed lines

@@ -10,41 +10,41 @@
 
 class ConfirmEmail extends Notification implements ShouldQueue
 {
-    use Queueable;
+	use Queueable;
 
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
+	/**
+	 * Create a new notification instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		//
+	}
 
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['mail'];
-    }
+	/**
+	 * Get the notification's delivery channels.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return array
+	 */
+	public function via($notifiable)
+	{
+		return ['mail'];
+	}
 
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->subject('Email verification')
-            ->line('Email verification')
-            ->line('To validate your email click on the button below')
-            ->action('Verify your email', env('CONFIRM_EMAIL_URL') . '/' . $notifiable->confirmation_code));
-    }
+	/**
+	 * Get the mail representation of the notification.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return \Illuminate\Notifications\Messages\MailMessage
+	 */
+	public function toMail($notifiable)
+	{
+		return (new MailMessage)
+			->subject('Email verification')
+			->line('Email verification')
+			->line('To validate your email click on the button below')
+			->action('Verify your email', env('CONFIRM_EMAIL_URL') . '/' . $notifiable->confirmation_code));
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -45,6 +45,6 @@
             ->subject('Email verification')
             ->line('Email verification')
             ->line('To validate your email click on the button below')
-            ->action('Verify your email', env('CONFIRM_EMAIL_URL') . '/' . $notifiable->confirmation_code));
+            ->action('Verify your email', env('CONFIRM_EMAIL_URL').'/'.$notifiable->confirmation_code));
     }
 }
\ No newline at end of file

src/Modules/V1/Core/Repositories/SettingRepository.php

Indentation +15 added lines, -15 removed lines

@@ -14,19 +14,19 @@
 		return 'App\Modules\V1\Core\Settings';
 	}
 
-    /**
-     * Save list of settings.
-     *
-     * @param  array   $data
-     * @return void
-     */
-    public function saveMany(array $data)
-    {
-    	\DB::transaction(function () use ($data) {
-    		foreach ($data as $key => $value) 
-    		{
-    			$this->save($value);
-    		}
-    	});
-    }
+	/**
+	 * Save list of settings.
+	 *
+	 * @param  array   $data
+	 * @return void
+	 */
+	public function saveMany(array $data)
+	{
+		\DB::transaction(function () use ($data) {
+			foreach ($data as $key => $value) 
+			{
+				$this->save($value);
+			}
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function saveMany(array $data)
     {
-    	\DB::transaction(function () use ($data) {
+    	\DB::transaction(function() use ($data) {
     		foreach ($data as $key => $value) 
     		{
     			$this->save($value);

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

Indentation +55 added lines, -55 removed lines

@@ -2,67 +2,67 @@
 
 class Media
 {
-    /**
-     * Upload the given image.
-     * 
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    public function uploadImage($image, $dir) 
-    {
-       $response        = [];
-       $image           = $image;
-       $imageName       =  str_slug('image' . uniqid() . time() . '_' . $image->getClientOriginalName());
-       $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+	/**
+	 * Upload the given image.
+	 * 
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	public function uploadImage($image, $dir) 
+	{
+	   $response        = [];
+	   $image           = $image;
+	   $imageName       =  str_slug('image' . uniqid() . time() . '_' . $image->getClientOriginalName());
+	   $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
 
-       ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
-       $image->move($destinationPath, $imageName);
+	   ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
+	   $image->move($destinationPath, $imageName);
 
-       return url($destinationPath . $imageName);
-    }
+	   return url($destinationPath . $imageName);
+	}
 
-    /**
-     * Upload the given image.
-     * 
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    public function uploadImageBas64($image, $dir) 
-    {
-        if (! strlen($image)) 
-        {
-            return null;
-        }
+	/**
+	 * Upload the given image.
+	 * 
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	public function uploadImageBas64($image, $dir) 
+	{
+		if (! strlen($image)) 
+		{
+			return null;
+		}
         
-        $response        = [];
-        $image           = $image;
-        $imageName       = 'image' . uniqid() . time() . '.jpg';
-        $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+		$response        = [];
+		$image           = $image;
+		$imageName       = 'image' . uniqid() . time() . '.jpg';
+		$destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
 
-        ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
+		! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
 
-        $base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
-        $image = \Image::make($base)->save($destinationPath . $imageName);
+		$base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
+		$image = \Image::make($base)->save($destinationPath . $imageName);
 
-        return url($destinationPath . $imageName);
-    }
+		return url($destinationPath . $imageName);
+	}
 
-    /**
-     * Delete the given image.
-     * 
-     * @param  object  $path
-     * @param  string  $dir
-     * @return void
-     */
-    public function deleteImage($path, $dir) 
-    {   
-        $arr      = explode('/', $path);
-        $path     = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . end($arr);
-        if (\File::exists($path)) 
-        {
-            \File::delete($path);
-        }
-    }
+	/**
+	 * Delete the given image.
+	 * 
+	 * @param  object  $path
+	 * @param  string  $dir
+	 * @return void
+	 */
+	public function deleteImage($path, $dir) 
+	{   
+		$arr      = explode('/', $path);
+		$path     = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . end($arr);
+		if (\File::exists($path)) 
+		{
+			\File::delete($path);
+		}
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@ 
     {
        $response        = [];
        $image           = $image;
-       $imageName       =  str_slug('image' . uniqid() . time() . '_' . $image->getClientOriginalName());
-       $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+       $imageName       = str_slug('image'.uniqid().time().'_'.$image->getClientOriginalName());
+       $destinationPath = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
 
        ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
        $image->move($destinationPath, $imageName);
 
-       return url($destinationPath . $imageName);
+       return url($destinationPath.$imageName);
     }
 
     /**
@@ -31,22 +31,22 @@ 
      */
     public function uploadImageBas64($image, $dir) 
     {
-        if (! strlen($image)) 
+        if ( ! strlen($image)) 
         {
             return null;
         }
         
         $response        = [];
         $image           = $image;
-        $imageName       = 'image' . uniqid() . time() . '.jpg';
-        $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+        $imageName       = 'image'.uniqid().time().'.jpg';
+        $destinationPath = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
 
         ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
 
         $base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
-        $image = \Image::make($base)->save($destinationPath . $imageName);
+        $image = \Image::make($base)->save($destinationPath.$imageName);
 
-        return url($destinationPath . $imageName);
+        return url($destinationPath.$imageName);
     }
 
     /**
@@ -59,7 +59,7 @@ 
     public function deleteImage($path, $dir) 
     {   
         $arr      = explode('/', $path);
-        $path     = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . end($arr);
+        $path     = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.end($arr);
         if (\File::exists($path)) 
         {
             \File::delete($path);

src/Modules/V1/Core/Database/Seeds/SettingsTableSeeder.php

Indentation +72 added lines, -72 removed lines

@@ -6,76 +6,76 @@
 
 class SettingsTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-    	/**
-         * Insert the permissions related to settings table.
-         */
-        \DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Settings model permissions.
-        		 */
-	        	[
-	        	'name'       => 'save',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'saveMany',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	]
-        	]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to settings table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Settings model permissions.
+				 */
+				[
+				'name'       => 'save',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'saveMany',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

src/Modules/V1/Core/Traits/Translatable.php

Indentation +41 added lines, -41 removed lines

@@ -2,51 +2,51 @@
 
 trait Translatable  
 {
-    /**
-     * Create a new model instance that is existing.
-     *
-     * @param  array  $attributes
-     * @param  string|null  $connection
-     * @return static
-     */
-    public function newFromBuilder($attributes = [], $connection = null)
-    {
-        $model = parent::newFromBuilder($attributes, $connection);
+	/**
+	 * Create a new model instance that is existing.
+	 *
+	 * @param  array  $attributes
+	 * @param  string|null  $connection
+	 * @return static
+	 */
+	public function newFromBuilder($attributes = [], $connection = null)
+	{
+		$model = parent::newFromBuilder($attributes, $connection);
 
-        foreach ($model->attributes AS $key => $value)
-        {
-            if (isset($this->translatable) && in_array($key, $this->translatable)) 
-            {
-                $model->$key = $this->getTranslatedAttribute($key, $value);
-            }
-        }
+		foreach ($model->attributes AS $key => $value)
+		{
+			if (isset($this->translatable) && in_array($key, $this->translatable)) 
+			{
+				$model->$key = $this->getTranslatedAttribute($key, $value);
+			}
+		}
 
-        return $model;
-    }
+		return $model;
+	}
 
-    /**
-     * Returns a translatable model attribute based on the application's locale settings.
-     *
-     * @param $key
-     * @param $values
-     * @return string
-     */
-    protected function getTranslatedAttribute($key, $values)
-    {
-        $values         = json_decode($values);
-        $primaryLocale  = \Session::get('locale');
-        $fallbackLocale = 'en';
+	/**
+	 * Returns a translatable model attribute based on the application's locale settings.
+	 *
+	 * @param $key
+	 * @param $values
+	 * @return string
+	 */
+	protected function getTranslatedAttribute($key, $values)
+	{
+		$values         = json_decode($values);
+		$primaryLocale  = \Session::get('locale');
+		$fallbackLocale = 'en';
 
-        if ($primaryLocale == 'all') 
-        {
-            return $values;
-        }
+		if ($primaryLocale == 'all') 
+		{
+			return $values;
+		}
 
-        if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) 
-        {
-            return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
-        }
+		if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) 
+		{
+			return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
+		}
 
-        return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
-    }
+		return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
+	}
 }
\ No newline at end of file