kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

Merge branch 'main' into #20-vacation-requests

Browse Source 
# Conflicts:
#	app/Architecture/Providers/ObserverServiceProvider.php
#	app/Domain/Role.php
#	app/Domain/Rules/ApprovedVacationDaysInSameRange.php
#	app/Domain/Rules/DoesNotExceedLimitRule.php
#	app/Domain/Rules/MinimumOneVacationDayRule.php
#	app/Domain/Rules/PendingVacationRequestInSameRange.php
#	app/Domain/Rules/UsedVacationDaysInSameRange.php
#	app/Domain/Rules/VacationRequestRule.php
#	app/Domain/VacationRequestState.php
#	app/Domain/VacationRequestStateManager.php
#	app/Domain/VacationRequestValidator.php
#	app/Domain/VacationType.php
#	app/Domain/VacationTypeConfigRetriever.php
#	app/Eloquent/Models/User.php
#	app/Infrastructure/Http/Controllers/UserController.php
#	app/Infrastructure/Http/Kernel.php
#	app/Infrastructure/Http/Requests/UserRequest.php
#	database/factories/UserFactory.php
#	database/seeders/DatabaseSeeder.php
#	routes/web.php
#	tests/Feature/UserTest.php
This commit is contained in:
Adrian Hopek
2022-02-01 11:10:59 +01:00
parent fc84efd95f f6d59f8bfb
commit 3ebc391b83
106 changed files with 333 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/app.php
View File

@@ -37,11 +37,11 @@ return [
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
Toby\Providers\AppServiceProvider::class,
Toby\Providers\AuthServiceProvider::class,
Toby\Providers\EventServiceProvider::class,
Toby\Providers\RouteServiceProvider::class,
Toby\Providers\TelescopeServiceProvider::class,
Toby\Providers\ObserverServiceProvider::class,
Toby\Architecture\Providers\AppServiceProvider::class,
Toby\Architecture\Providers\AuthServiceProvider::class,
Toby\Architecture\Providers\EventServiceProvider::class,
Toby\Architecture\Providers\RouteServiceProvider::class,
Toby\Architecture\Providers\TelescopeServiceProvider::class,
Toby\Architecture\Providers\ObserverServiceProvider::class,
],
];

2
config/auth.php
View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
use Toby\Models\User;
use Toby\Eloquent\Models\User;
return [
"defaults" => [

4
config/vacation_types.php
View File

@@ -2,8 +2,8 @@
declare(strict_types=1);
use Toby\Enums\VacationType;
use Toby\Helpers\VacationTypeConfigRetriever;
use Toby\Domain\Enums\VacationType;
use Toby\Domain\VacationTypeConfigRetriever;
return [
VacationType::VACATION->value => [