Skip to content

Commit

Permalink
Merge pull request #1550 from rappasoft/development
Browse files Browse the repository at this point in the history
v8.3.0
  • Loading branch information
rappasoft authored Sep 22, 2021
2 parents c712c52 + 75d4f00 commit 971b58c
Show file tree
Hide file tree
Showing 55 changed files with 1,986 additions and 1,524 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [8.3.0] - 2021-09-22

### Changed

- Updated composer/yarn lock files
- Updated to Laravel commit: 4f8a0f35fabd8603fb756122bf820719a259ac9b

## [8.2.2] - 2021-07-10

### Changed
Expand Down Expand Up @@ -472,7 +479,8 @@ Started from scratch with a blank Laravel 7.* installation. This release is not
- Fix yarn tests
- Fix: Socially logged in users get assigned the default role

[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.2.2...development
[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.3.0...development
[8.3.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.2.2...v8.3.0
[8.2.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.2.1...v8.2.2
[8.2.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.2.0...v8.2.1
[8.2.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.1.0...v8.2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ trait AnnouncementScope
{
/**
* @param $query
*
* @return mixed
*/
public function scopeEnabled($query)
Expand All @@ -20,7 +19,6 @@ public function scopeEnabled($query)
/**
* @param $query
* @param $area
*
* @return mixed
*/
public function scopeForArea($query, $area)
Expand All @@ -33,7 +31,6 @@ public function scopeForArea($query, $area)

/**
* @param $query
*
* @return mixed
*/
public function scopeInTimeFrame($query)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public function create()

/**
* @param StoreRoleRequest $request
*
* @return mixed
*
* @throws \App\Exceptions\GeneralException
* @throws \Throwable
*/
Expand All @@ -72,7 +72,6 @@ public function store(StoreRoleRequest $request)
/**
* @param EditRoleRequest $request
* @param Role $role
*
* @return mixed
*/
public function edit(EditRoleRequest $request, Role $role)
Expand All @@ -87,8 +86,8 @@ public function edit(EditRoleRequest $request, Role $role)
/**
* @param UpdateRoleRequest $request
* @param Role $role
*
* @return mixed
*
* @throws \App\Exceptions\GeneralException
* @throws \Throwable
*/
Expand All @@ -102,8 +101,8 @@ public function update(UpdateRoleRequest $request, Role $role)
/**
* @param DeleteRoleRequest $request
* @param Role $role
*
* @return mixed
*
* @throws \Exception
*/
public function destroy(DeleteRoleRequest $request, Role $role)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ public function index()
* @param Request $request
* @param User $user
* @param $status
*
* @return mixed
*
* @throws \App\Exceptions\GeneralException
*/
public function update(Request $request, User $user, $status)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public function index()

/**
* @param User $deletedUser
*
* @return mixed
*
* @throws \App\Exceptions\GeneralException
*/
public function update(User $deletedUser)
Expand All @@ -48,8 +48,8 @@ public function update(User $deletedUser)

/**
* @param User $deletedUser
*
* @return mixed
*
* @throws \App\Exceptions\GeneralException
*/
public function destroy(User $deletedUser)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public function create()

/**
* @param StoreUserRequest $request
*
* @return mixed
*
* @throws \App\Exceptions\GeneralException
* @throws \Throwable
*/
Expand All @@ -80,7 +80,6 @@ public function store(StoreUserRequest $request)

/**
* @param User $user
*
* @return mixed
*/
public function show(User $user)
Expand All @@ -92,7 +91,6 @@ public function show(User $user)
/**
* @param EditUserRequest $request
* @param User $user
*
* @return mixed
*/
public function edit(EditUserRequest $request, User $user)
Expand All @@ -108,8 +106,8 @@ public function edit(EditUserRequest $request, User $user)
/**
* @param UpdateUserRequest $request
* @param User $user
*
* @return mixed
*
* @throws \Throwable
*/
public function update(UpdateUserRequest $request, User $user)
Expand All @@ -122,8 +120,8 @@ public function update(UpdateUserRequest $request, User $user)
/**
* @param DeleteUserRequest $request
* @param User $user
*
* @return mixed
*
* @throws \App\Exceptions\GeneralException
*/
public function destroy(DeleteUserRequest $request, User $user)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public function __construct(UserService $userService)
/**
* @param EditUserPasswordRequest $request
* @param User $user
*
* @return mixed
*/
public function edit(EditUserPasswordRequest $request, User $user)
Expand All @@ -42,8 +41,8 @@ public function edit(EditUserPasswordRequest $request, User $user)
/**
* @param UpdateUserPasswordRequest $request
* @param User $user
*
* @return mixed
*
* @throws \Throwable
*/
public function update(UpdateUserPasswordRequest $request, User $user)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class UserSessionController
/**
* @param ClearUserSessionRequest $request
* @param User $user
*
* @return mixed
*/
public function update(ClearUserSessionRequest $request, User $user)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public function show()

/**
* @param DisableTwoFactorAuthenticationRequest $request
*
* @return mixed
*/
public function destroy(DisableTwoFactorAuthenticationRequest $request)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ protected function attemptLogin(Request $request)
*
* @param Request $request
* @param $user
*
* @return mixed
*/
protected function authenticated(Request $request, $user)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public function expired()
/**
* @param UpdatePasswordRequest $request
* @param UserService $userService
*
* @return mixed
*
* @throws \Throwable
*/
public function update(UpdatePasswordRequest $request, UserService $userService)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ protected function validator(array $data)
* Create a new user instance after a valid registration.
*
* @param array $data
*
* @return \App\Domains\Auth\Models\User|mixed
*
* @throws \App\Domains\Auth\Exceptions\RegisterException
*/
protected function create(array $data)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class SocialController
{
/**
* @param $provider
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function redirect($provider)
Expand All @@ -24,8 +23,8 @@ public function redirect($provider)
/**
* @param $provider
* @param UserService $userService
*
* @return \Illuminate\Http\RedirectResponse
*
* @throws \App\Exceptions\GeneralException
*/
public function callback($provider, UserService $userService)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class TwoFactorAuthenticationController
{
/**
* @param Request $request
*
* @return mixed
*/
public function create(Request $request)
Expand All @@ -25,7 +24,6 @@ public function create(Request $request)

/**
* @param Request $request
*
* @return mixed
*/
public function show(Request $request)
Expand All @@ -36,7 +34,6 @@ public function show(Request $request)

/**
* @param Request $request
*
* @return mixed
*/
public function update(Request $request)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class UpdatePasswordController
/**
* ChangePasswordController constructor.
*
* @param UserService $userService
* @param UserService $userService
*/
public function __construct(UserService $userService)
{
Expand All @@ -27,8 +27,8 @@ public function __construct(UserService $userService)

/**
* @param UpdatePasswordRequest $request
*
* @return mixed
*
* @throws \Throwable
*/
public function update(UpdatePasswordRequest $request)
Expand Down
1 change: 0 additions & 1 deletion app/Domains/Auth/Http/Middleware/AdminCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class AdminCheck
/**
* @param $request
* @param Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
Expand Down
2 changes: 1 addition & 1 deletion app/Domains/Auth/Http/Middleware/PasswordExpires.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class PasswordExpires
/**
* @param $request
* @param Closure $next
*
* @return \Illuminate\Http\RedirectResponse|mixed
*
* @throws \Exception
*/
public function handle($request, Closure $next)
Expand Down
1 change: 0 additions & 1 deletion app/Domains/Auth/Http/Middleware/SuperAdminCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class SuperAdminCheck
/**
* @param $request
* @param Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
Expand Down
5 changes: 2 additions & 3 deletions app/Domains/Auth/Http/Middleware/ToBeLoggedOut.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
class ToBeLoggedOut
{
/**
* @param $request
* @param Closure $next
*
* @param $request
* @param Closure $next
* @return \Illuminate\Http\RedirectResponse|mixed
*/
public function handle($request, Closure $next)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class TwoFactorAuthenticationStatus
* @param $request
* @param Closure $next
* @param string $status
*
* @return mixed
*/
public function handle($request, Closure $next, $status = 'enabled')
Expand Down
1 change: 0 additions & 1 deletion app/Domains/Auth/Http/Middleware/UserCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class UserCheck
/**
* @param $request
* @param Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
Expand Down
1 change: 0 additions & 1 deletion app/Domains/Auth/Http/Middleware/UserTypeCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class UserTypeCheck
* @param $request
* @param Closure $next
* @param $type
*
* @return mixed
*/
public function handle($request, Closure $next, $type)
Expand Down
2 changes: 1 addition & 1 deletion app/Domains/Auth/Listeners/RoleEventListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function onDeleted($event)
/**
* Register the listeners for the subscriber.
*
* @param \Illuminate\Events\Dispatcher $events
* @param \Illuminate\Events\Dispatcher $events
*/
public function subscribe($events)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Domains/Auth/Listeners/UserEventListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function onStatusChanged($event)
/**
* Register the listeners for the subscriber.
*
* @param \Illuminate\Events\Dispatcher $events
* @param \Illuminate\Events\Dispatcher $events
*/
public function subscribe($events)
{
Expand Down
3 changes: 1 addition & 2 deletions app/Domains/Auth/Models/Traits/Method/UserMethod.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ public function hasAllAccess(): bool

/**
* @param $type
*
* @return bool
*/
public function isType($type): bool
Expand Down Expand Up @@ -93,8 +92,8 @@ public function getPermissionDescriptions(): Collection

/**
* @param bool $size
*
* @return mixed|string
*
* @throws \Creativeorange\Gravatar\Exceptions\InvalidEmailException
*/
public function getAvatar($size = null)
Expand Down
Loading

0 comments on commit 971b58c

Please sign in to comment.