refactor(enums): reorganize namespaces and update flight/tour/user imports

This commit is contained in:
2026-08-20 13:01:03 +03:30
parent a45dc7b0fb
commit 8d0cd16384
20 changed files with 237 additions and 181 deletions
@@ -1,6 +1,6 @@
<?php
namespace App\Enums\Admin\Tour;
namespace App\Enums\Flight;
enum TourType:int
{
@@ -1,6 +1,6 @@
<?php
namespace App\Enums\Admin\Tour;
namespace App\Enums\Tour;
enum TourMode:int
{
@@ -1,6 +1,6 @@
<?php
namespace App\Enums\Admin\Tour;
namespace App\Enums\Tour;
enum TourScope:int
{
@@ -1,6 +1,6 @@
<?php
namespace App\Enums;
namespace App\Enums\User;
enum UserGender: int
{
@@ -1,6 +1,6 @@
<?php
namespace App\Enums;
namespace App\Enums\User;
enum UserMarital:int
{
@@ -1,6 +1,6 @@
<?php
namespace App\Enums;
namespace App\Enums\User;
enum UserStatus: int
{
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Admin;
use App\Enums\Admin\Tour\TourScope;
use App\Enums\Tour\TourScope;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\Tour\TourStoreRequest;
use App\Http\Requests\Admin\Tour\TourUpdateRequest;
@@ -14,7 +14,6 @@ use App\Models\TourDeparture;
use App\Models\TourImage;
use Hekmatinasser\Verta\Verta;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
@@ -2,15 +2,14 @@
namespace App\Http\Controllers\Auth;
use App\Enums\UserStatus;
use App\Enums\User\UserStatus;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\RegisterPostRequest;
use App\Models\File;
use App\Models\Province;
use App\Models\User;
use Illuminate\Support\Facades\DB;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Storage;
@@ -2,9 +2,9 @@
namespace App\Http\Requests\Admin\Tour;
use App\Enums\Admin\Tour\TourMode;
use App\Enums\Admin\Tour\TourScope;
use App\Enums\Admin\Tour\TourType;
use App\Enums\Flight\TourType;
use App\Enums\Tour\TourMode;
use App\Enums\Tour\TourScope;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
@@ -2,9 +2,9 @@
namespace App\Http\Requests\Admin\Tour;
use App\Enums\Admin\Tour\TourMode;
use App\Enums\Admin\Tour\TourScope;
use App\Enums\Admin\Tour\TourType;
use App\Enums\Flight\TourType;
use App\Enums\Tour\TourMode;
use App\Enums\Tour\TourScope;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
@@ -2,8 +2,8 @@
namespace App\Http\Requests\Auth;
use App\Enums\UserGender;
use App\Enums\UserMarital;
use App\Enums\User\UserGender;
use App\Enums\User\UserMarital;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
+4 -3
View File
@@ -6,9 +6,10 @@
namespace App\Models;
use App\Enums\Admin\Tour\TourMode;
use App\Enums\Admin\Tour\TourScope;
use App\Enums\Admin\Tour\TourType;
use App\Enums\Flight\TourType;
use App\Enums\Tour\TourMode;
use App\Enums\Tour\TourScope;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Attributes\Scope;
use Illuminate\Database\Eloquent\Builder;
+4 -4
View File
@@ -6,13 +6,13 @@
namespace App\Models;
use App\Enums\UserGender;
use App\Enums\UserMarital;
use App\Enums\UserStatus;
use App\Enums\User\UserGender;
use App\Enums\User\UserMarital;
use App\Enums\User\UserStatus;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Foundation\Auth\User as Authenticate;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Foundation\Auth\User as Authenticate;
/**
* Class User