namespaces refactoring

src/App/Console/Commands/SetupDevEnvironment.php

@@ -1,16 +1,16 @@
 <?php
 namespace App\Console\Commands;
 
+use Illuminate\Support\Str;
+use Illuminate\Console\Command;
 use Domain\Settings\Models\File;
 use Domain\Settings\Models\User;
 use Domain\Settings\Models\Share;
 use Domain\Settings\Models\Folder;
 use Domain\Settings\Models\Setting;
-use Illuminate\Support\Str;
-use Domain\SetupWizard\Services\SetupService;
-use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Foundation\Testing\WithFaker;
+use Domain\SetupWizard\Services\SetupService;
 
 class SetupDevEnvironment extends Command
 {

src/App/Console/Commands/SetupProdEnvironment.php

@@ -1,10 +1,10 @@
 <?php
 namespace App\Console\Commands;
 
+use Illuminate\Console\Command;
 use Domain\Settings\Models\User;
 use Domain\Settings\Models\Setting;
 use Domain\SetupWizard\Services\SetupService;
-use Illuminate\Console\Command;
 
 class SetupProdEnvironment extends Command
 {

src/App/Console/Kernel.php

@@ -1,10 +1,10 @@
 <?php
 namespace App\Console;
 
-use Domain\SetupWizard\Services\SchedulerService;
 use Illuminate\Console\Scheduling\Schedule;
 use App\Console\Commands\SetupDevEnvironment;
 use App\Console\Commands\SetupProdEnvironment;
+use Domain\SetupWizard\Services\SchedulerService;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel

src/App/Http/Kernel.php

@@ -15,11 +15,11 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
-        \App\Http\Middleware\TrustProxies::class,
+        \Support\Middleware\TrustProxies::class,
         \Fruitcake\Cors\HandleCors::class,
-        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
+        \Support\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
+        \Support\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
@@ -30,12 +30,12 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
+            \Support\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            \Support\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -55,11 +55,11 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth'             => \App\Http\Middleware\Authenticate::class,
+        'auth'             => \Support\Middleware\Authenticate::class,
         'auth.basic'       => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'cache.headers'    => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can'              => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest'            => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest'            => \Support\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed'           => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle'         => \Illuminate\Routing\Middleware\ThrottleRequests::class,

src/App/Providers/AuthServiceProvider.php

@@ -4,8 +4,6 @@ namespace App\Providers;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
-//use Laravel\Passport\Passport;
-
 class AuthServiceProvider extends ServiceProvider
 {
     /**

src/App/Providers/FortifyServiceProvider.php

@@ -4,11 +4,11 @@ namespace App\Providers;
 use Illuminate\Http\Request;
 use Laravel\Fortify\Fortify;
 use Illuminate\Support\ServiceProvider;
+use App\Users\Actions\ResetUserPassword;
 use Illuminate\Cache\RateLimiting\Limit;
-use App\Actions\Fortify\ResetUserPassword;
-use App\Actions\Fortify\UpdateUserPassword;
+use App\Users\Actions\UpdateUserPassword;
 use Illuminate\Support\Facades\RateLimiter;
-use App\Actions\Fortify\UpdateUserProfileInformation;
+use App\Users\Actions\UpdateUserProfileInformation;
 
 class FortifyServiceProvider extends ServiceProvider
 {

src/App/Users/Actions/CreateNewUserAction.php

@@ -1,14 +1,14 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Setting;
-use Domain\Settings\Models\UserSettings;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Validation\Rule;
+use Domain\Settings\Models\User;
+use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Events\Registered;
+use Domain\Settings\Models\UserSettings;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Contracts\Auth\StatefulGuard;
 

src/App/Users/Actions/PasswordValidationRules.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
 use Laravel\Fortify\Rules\Password;
 

src/App/Users/Actions/ResetUserPassword.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\ResetsUserPasswords;

src/App/Users/Actions/UpdateUserPassword.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;

src/App/Users/Actions/UpdateUserProfileInformation.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Actions\Fortify;
+namespace App\Users\Actions;
 
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Validator;

src/App/Users/Controllers/AccountController.php

@@ -1,31 +1,28 @@
 <?php
-namespace App\Http\Controllers\User;
+namespace App\Users\Controllers;
 
-use Domain\Settings\Models\User;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
 use Illuminate\Http\Response;
+use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\UserResource;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\RedirectResponse;
+use Domain\Admin\Resources\UserResource;
 use Laravel\Sanctum\PersonalAccessToken;
-use App\Http\Resources\InvoiceCollection;
 use Illuminate\Support\Facades\Validator;
-use App\Http\Resources\UserStorageResource;
+use Domain\SetupWizard\Services\DemoService;
+use Domain\Admin\Resources\InvoiceCollection;
+use Domain\Admin\Resources\UserStorageResource;
+use App\Users\Requests\UpdateUserPasswordRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use App\Http\Requests\User\UpdateUserPasswordRequest;
-use App\Http\Requests\User\UserCreateAccessTokenRequest;
+use App\Users\Requests\UserCreateAccessTokenRequest;
 
 class AccountController extends Controller
 {
-    /**
-     * AccountController constructor.
-     */
-    public function __construct()
-    {
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        public DemoService $demo,
+    ) {
     }
 
     /**

src/App/Users/Controllers/AuthController.php

@@ -1,9 +1,9 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Auth\CheckAccountRequest;
+use App\Users\Requests\CheckAccountRequest;
 
 class AuthController extends Controller
 {

src/App/Users/Controllers/ConfirmPasswordController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

src/App/Users/Controllers/ForgotPasswordController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

src/App/Users/Controllers/LoginController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

src/App/Users/Controllers/ResetPasswordController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

src/App/Users/Controllers/VerificationController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Auth;
+namespace App\Users\Controllers;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

src/App/Users/Models/User.php

@@ -1,18 +1,18 @@
 <?php
-namespace App\Models;
+namespace App\Users\Models;
 
 use ByteUnits\Metric;
 use Illuminate\Support\Str;
 use Laravel\Cashier\Billable;
-use Domain\SetupWizard\Services\HelperService;
-use Domain\SetupWizard\Services\StripeService;
 use Laravel\Sanctum\HasApiTokens;
 use Kyslik\ColumnSortable\Sortable;
-use App\Notifications\ResetPassword;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Fortify\TwoFactorAuthenticatable;
+use Domain\SetupWizard\Services\HelperService;
+use Domain\SetupWizard\Services\StripeService;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Domain\Sharing\Notifications\ResetPassword;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 

src/App/Users/Models/UserSettings.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Models;
+namespace App\Users\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;

src/App/Users/Notifications/ResetPassword.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Notifications;
+namespace App\Users\Notifications;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;

src/App/Users/Requests/CheckAccountRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Auth;
+namespace App\Users\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/App/Users/Requests/UpdateUserPasswordRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\User;
+namespace App\Users\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/App/Users/Requests/UserCreateAccessTokenRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\User;
+namespace App\Users\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/App/Users/Resources/UserResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace App\Users\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/App/Users/Resources/UserStorageResource.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Http\Resources;
+namespace App\Users\Resources;
 
-use Domain\Settings\Models\File;
 use ByteUnits\Metric;
+use Domain\Settings\Models\File;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserStorageResource extends JsonResource

src/App/Users/Resources/UserSubscription.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace App\Users\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/App/Users/Resources/UsersCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace App\Users\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Admin/Controllers/DashboardController.php

@@ -1,21 +1,20 @@
 <?php
-namespace App\Http\Controllers\Admin;
+namespace Domain\Admin\Controllers;
 
 use Domain\Settings\Models\User;
 use ByteUnits\Metric;
 use Domain\SetupWizard\Services\StripeService;
 use Laravel\Cashier\Subscription;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\UsersCollection;
+use Domain\Admin\Resources\UsersCollection;
 
 class DashboardController extends Controller
 {
-    private StripeService $stripe;
+    ;
 
-    public function __construct(StripeService $stripe)
-    {
-        $this->stripe = $stripe;
-    }
+    public function __construct(
+        private StripeService $stripe
+    ) {}
 
     /**
      * Get data for dashboard

src/Domain/Admin/Controllers/InvoiceController.php

@@ -1,19 +1,17 @@
 <?php
-namespace App\Http\Controllers\Admin;
+namespace Domain\Admin\Controllers;
 
 use Domain\Settings\Models\Invoice;
-use Domain\SetupWizard\Services\StripeService;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\InvoiceResource;
-use App\Http\Resources\InvoiceAdminCollection;
+use Domain\Admin\Resources\InvoiceResource;
+use Domain\SetupWizard\Services\StripeService;
+use Domain\Admin\Resources\InvoiceAdminCollection;
 
 class InvoiceController extends Controller
 {
-    private StripeService $stripe;
-
-    public function __construct(StripeService $stripe)
-    {
-        $this->stripe = $stripe;
+    public function __construct(
+        private StripeService $stripe
+    ) {
     }
 
     /**

src/Domain/Admin/Controllers/UserController.php

@@ -1,33 +1,31 @@
 <?php
-namespace App\Http\Controllers\Admin;
+namespace Domain\Admin\Controllers;
 
 use Storage;
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\UserSettings;
 use Illuminate\Http\Response;
-use Domain\SetupWizard\Services\StripeService;
+use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\UserResource;
 use Illuminate\Support\Facades\Auth;
-use App\Http\Resources\UsersCollection;
-use App\Http\Resources\UserSubscription;
+use Domain\Admin\Resources\UserResource;
+use Domain\Settings\Models\UserSettings;
 use Illuminate\Support\Facades\Password;
-use App\Http\Resources\InvoiceCollection;
-use App\Http\Resources\UserStorageResource;
-use App\Http\Requests\Admin\ChangeRoleRequest;
-use App\Http\Requests\Admin\CreateUserByAdmin;
-use App\Http\Requests\Admin\DeleteUserRequest;
+use Domain\Admin\Resources\UsersCollection;
+use Domain\Admin\Requests\ChangeRoleRequest;
+use Domain\Admin\Requests\CreateUserByAdmin;
+use Domain\Admin\Requests\DeleteUserRequest;
+use Domain\Admin\Resources\UserSubscription;
+use Domain\Admin\Resources\InvoiceCollection;
+use Domain\SetupWizard\Services\StripeService;
+use Domain\Admin\Resources\UserStorageResource;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use App\Http\Requests\Admin\ChangeStorageCapacityRequest;
+use Domain\Admin\Requests\ChangeStorageCapacityRequest;
 
 class UserController extends Controller
 {
-    private StripeService $stripe;
-
-    public function __construct(StripeService $stripe)
-    {
-        $this->stripe = $stripe;
+    public function __construct(
+        private StripeService $stripe
+    ) {
     }
 
     /**

src/Domain/Admin/Requests/ChangeRoleRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Admin;
+namespace Domain\Admin\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Admin/Requests/ChangeStorageCapacityRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Admin;
+namespace Domain\Admin\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Admin/Requests/CreateUserByAdmin.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Admin;
+namespace Domain\Admin\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Admin/Requests/DeleteUserRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Admin;
+namespace Domain\Admin\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Admin/Resources/InvoiceAdminCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Admin\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Admin/Resources/InvoiceAdminResource.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Admin\Resources;
 
-use Domain\Settings\Models\User;
 use Laravel\Cashier\Cashier;
+use Domain\Settings\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class InvoiceAdminResource extends JsonResource

src/Domain/Admin/Rules/DisabledMimetypes.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Rules;
+namespace Domain\Admin\Rules;
 
 use Illuminate\Contracts\Validation\Rule;
 

src/Domain/Browsing/Controllers/BrowseController.php

@@ -1,15 +1,15 @@
 <?php
-namespace App\Http\Controllers\FileManager;
+namespace Domain\Browsing\Controllers;
 
+use Illuminate\Http\Request;
 use Domain\Settings\Models\File;
 use Domain\Settings\Models\User;
 use Domain\Settings\Models\Share;
 use Domain\Settings\Models\Folder;
-use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use App\Http\Requests\FileBrowser\SearchRequest;
+use Domain\Items\Requests\SearchRequest;
 
 class BrowseController extends Controller
 {

src/Domain/Files/Controllers/FileAccessController.php

@@ -1,21 +1,19 @@
 <?php
-namespace App\Http\Controllers\FileManager;
+namespace Domain\Files\Controllers;
 
-use Domain\Settings\Models\Zip;
 use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\HelperService;
-use Domain\Settings\Models\File as UserFile;
+use Domain\Settings\Models\Zip;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
+use Domain\Settings\Models\File as UserFile;
+use Domain\SetupWizard\Services\HelperService;
 
 class FileAccessController extends Controller
 {
-    private $helper;
-
-    public function __construct()
-    {
-        $this->helper = resolve(HelperService::class);
+    public function __construct(
+        public HelperService $helper,
+    ) {
     }
 
     /**

src/Domain/Files/Models/File.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Models;
+namespace Domain\Files\Models;
 
 use ByteUnits\Metric;
 use Illuminate\Support\Str;

src/Domain/Files/Requests/UploadRequest.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Http\Requests\FileFunctions;
+namespace Domain\Files\Requests;
 
-use App\Rules\DisabledMimetypes;
+use Domain\Admin\Rules\DisabledMimetypes;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UploadRequest extends FormRequest

src/Domain/Files/Resources/FileResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Files\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Folders/Controllers/FavouriteController.php

@@ -1,21 +1,21 @@
 <?php
-namespace App\Http\Controllers\FileManager;
+namespace Domain\Folders\Controllers;
 
-use Domain\Settings\Models\Folder;
 use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
+use Domain\Settings\Models\Folder;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
+use Domain\SetupWizard\Services\DemoService;
 
 class FavouriteController extends Controller
 {
     /**
      * FavouriteController constructor.
      */
-    public function __construct()
-    {
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        public DemoService $demo,
+    ) {
     }
 
     /**

src/Domain/Folders/Models/Folder.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Models;
+namespace Domain\Folders\Models;
 
 use Illuminate\Support\Str;
 use Laravel\Scout\Searchable;

src/Domain/Folders/Requests/CreateFolderRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\FileFunctions;
+namespace Domain\Folders\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Homepage/Controllers/AppFunctionsController.php

@@ -1,25 +1,24 @@
 <?php
-namespace App\Http\Controllers\App;
+namespace Domain\Homepage\Controllers;
 
-use Domain\Settings\Models\Page;
-use Domain\Settings\Models\Share;
-use Domain\Settings\Models\Setting;
-use Domain\Settings\Models\Language;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Domain\SetupWizard\Services\StripeService;
+use Domain\Pages\Models\Page;
+use Domain\Sharing\Models\Share;
+use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\PageResource;
+use Domain\Languages\Models\Language;
 use Illuminate\Support\Facades\Mail;
-use App\Http\Mail\SendContactMessage;
 use Illuminate\Support\Facades\Cache;
 use Doctrine\DBAL\Driver\PDOException;
 use Illuminate\Database\QueryException;
-use App\Http\Resources\PricingCollection;
-use Illuminate\Database\Eloquent\Collection;
+use Domain\Pages\Resources\PageResource;
+use Domain\Homepage\Mail\SendContactMessage;
+use Domain\Subscriptions\Resources\PricingCollection;
+use Domain\SetupWizard\Services\StripeService;
 use Illuminate\Contracts\Routing\ResponseFactory;
+use Domain\Homepage\Requests\SendContactMessageRequest;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use App\Http\Requests\PublicPages\SendContactMessageRequest;
 
 class AppFunctionsController extends Controller
 {
@@ -33,11 +32,9 @@ class AppFunctionsController extends Controller
         'license',
     ];
 
-    private StripeService $stripe;
-
-    public function __construct(StripeService $stripe)
-    {
-        $this->stripe = $stripe;
+    public function __construct(
+        private StripeService $stripe
+    ) {
     }
 
     /**

src/Domain/Homepage/Mail/SendContactMessage.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Mail;
+namespace Domain\Homepage\Mail;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;

src/Domain/Homepage/Requests/SendContactMessageRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\PublicPages;
+namespace Domain\Homepage\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Items/Controllers/EditItemsController.php

@@ -1,34 +1,30 @@
 <?php
-namespace App\Http\Controllers\FileManager;
+namespace Domain\Items\Controllers;
 
 use Exception;
+use Illuminate\Http\Request;
 use Domain\Settings\Models\File;
 use Domain\Settings\Models\Folder;
-use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\SetupWizard\Services\HelperService;
 use App\Http\Controllers\Controller;
-use Domain\SetupWizard\Services\FileManagerService;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Database\Eloquent\Model;
+use Domain\Files\Requests\UploadRequest;
+use Domain\Files\Requests\MoveItemRequest;
+use Domain\Files\Requests\DeleteItemRequest;
+use Domain\Files\Requests\RenameItemRequest;
+use Domain\SetupWizard\Services\DemoService;
+use Domain\Files\Requests\CreateFolderRequest;
+use Domain\SetupWizard\Services\HelperService;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use App\Http\Requests\FileFunctions\UploadRequest;
-use App\Http\Requests\FileFunctions\MoveItemRequest;
-use App\Http\Requests\FileFunctions\DeleteItemRequest;
-use App\Http\Requests\FileFunctions\RenameItemRequest;
-use App\Http\Requests\FileFunctions\CreateFolderRequest;
+use Domain\SetupWizard\Services\FileManagerService;
 
 class EditItemsController extends Controller
 {
-    private $filemanager;
-    private $helper;
-    private $demo;
-
-    public function __construct()
-    {
-        $this->filemanager = resolve(FileManagerService::class);
-        $this->helper = resolve(HelperService::class);
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        private FileManagerService $filemanager,
+        private HelperService $helper,
+        private DemoService $demo,
+    ) {
     }
 
     /**

src/Domain/Items/Requests/DeleteItemRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\FileFunctions;
+namespace Domain\Items\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Items/Requests/MoveItemRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\FileFunctions;
+namespace Domain\Items\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Items/Requests/RenameItemRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\FileFunctions;
+namespace Domain\Items\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Items/Requests/SearchRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\FileBrowser;
+namespace Domain\Items\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Languages/Controllers/LanguageController.php

@@ -1,17 +1,17 @@
 <?php
-namespace App\Http\Controllers\Admin;
+namespace Domain\Languages\Controllers;
 
-use Domain\Settings\Models\Setting;
-use Domain\Settings\Models\Language;
 use Illuminate\Http\Response;
+use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\LanguageResource;
-use App\Http\Resources\LanguageCollection;
+use Domain\Settings\Models\Language;
+use Domain\Admin\Resources\LanguageResource;
+use Domain\Admin\Resources\LanguageCollection;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use App\Http\Requests\Languages\UpdateStringRequest;
-use App\Http\Requests\Languages\CreateLanguageRequest;
-use App\Http\Requests\Languages\UpdateLanguageRequest;
+use Domain\Languages\Requests\UpdateStringRequest;
+use Domain\Languages\Requests\CreateLanguageRequest;
+use Domain\Languages\Requests\UpdateLanguageRequest;
 
 class LanguageController extends Controller
 {

src/Domain/Languages/Models/Language.php

@@ -1,11 +1,11 @@
 <?php
-namespace App\Models;
+namespace Domain\Languages\Models;
 
 use Illuminate\Support\Str;
-use Domain\SetupWizard\Services\LanguageService;
 use Illuminate\Support\Facades\DB;
 use Kyslik\ColumnSortable\Sortable;
 use Illuminate\Database\Eloquent\Model;
+use Domain\SetupWizard\Services\LanguageService;
 
 /**
  * @method static whereLocale(string $param)

src/Domain/Languages/Models/LanguageTranslation.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Models;
+namespace Domain\Languages\Models;
 
 use Illuminate\Database\Eloquent\Model;
 

src/Domain/Languages/Requests/CreateLanguageRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Languages;
+namespace Domain\Languages\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Languages/Requests/UpdateLanguageRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Languages;
+namespace Domain\Languages\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Languages/Requests/UpdateStringRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Languages;
+namespace Domain\Languages\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Languages/Resources/LanguageCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Languages\Resources;
 
 use Domain\Settings\Models\Language;
 use Illuminate\Http\Resources\Json\ResourceCollection;

src/Domain/Languages/Resources/LanguageResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Languages\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Languages/Services/LanguageService.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Services;
+namespace Domain\Languages\Services;
 
 use DB;
 use Domain\Settings\Models\Language;

src/Domain/Maintenance/Controllers/MaintenanceController.php

@@ -1,12 +1,12 @@
 <?php
-namespace App\Http\Controllers\App;
+namespace Domain\Maintenance\Controllers;
 
 use Gate;
 use Artisan;
-use Domain\Settings\Models\Language;
 use Illuminate\Http\Response;
-use Domain\SetupWizard\Services\LanguageService;
 use App\Http\Controllers\Controller;
+use Domain\Settings\Models\Language;
+use Domain\SetupWizard\Services\LanguageService;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
 

src/Domain/Pages/Controllers/PagesController.php

@@ -1,22 +1,20 @@
 <?php
-namespace App\Http\Controllers\Admin;
+namespace Domain\Pages\Controllers;
 
-use Domain\Settings\Models\Page;
 use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
 use Illuminate\Http\Response;
+use Domain\Settings\Models\Page;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\PageResource;
-use App\Http\Resources\PageCollection;
+use Domain\Admin\Resources\PageResource;
+use Domain\Admin\Resources\PageCollection;
+use Domain\SetupWizard\Services\DemoService;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
 class PagesController extends Controller
 {
-    private $demo;
-
-    public function __construct()
-    {
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        private DemoService $demo,
+    ) {
     }
 
     /**

src/Domain/Pages/Models/Page.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Models;
+namespace Domain\Pages\Models;
 
 use Kyslik\ColumnSortable\Sortable;
 use Illuminate\Database\Eloquent\Model;

src/Domain/Pages/Resources/PageCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Pages\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Pages/Resources/PageResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Pages\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Plans/Controllers/PlansController.php

@@ -1,31 +1,27 @@
 <?php
-namespace App\Http\Controllers\Admin;
+namespace Domain\Plans\Controllers;
 
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Domain\Settings\Models\Plan;
 use Domain\Settings\Models\User;
-use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
-use Illuminate\Http\Response;
-use Domain\SetupWizard\Services\StripeService;
 use Laravel\Cashier\Subscription;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\PlanResource;
 use Illuminate\Support\Facades\Cache;
-use App\Http\Resources\PlanCollection;
-use App\Http\Resources\UsersCollection;
+use Domain\Admin\Resources\PlanResource;
+use Domain\Admin\Resources\PlanCollection;
+use Domain\Admin\Resources\UsersCollection;
+use Domain\SetupWizard\Services\DemoService;
+use Domain\SetupWizard\Services\StripeService;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
 class PlansController extends Controller
 {
-    private StripeService $stripe;
-
-    private DemoService $demo;
-
-    public function __construct()
-    {
-        $this->stripe = resolve(StripeService::class);
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        private StripeService $stripe,
+        private DemoService $demo,
+    ) {
     }
 
     /**

src/Domain/Settings/Controllers/SettingController.php

@@ -1,22 +1,20 @@
 <?php
-namespace App\Http\Controllers\Admin;
+namespace Domain\Settings\Controllers;
 
 use Stripe;
 use Artisan;
-use Domain\Settings\Models\Setting;
 use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
+use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
+use Domain\SetupWizard\Services\DemoService;
 use Cartalyst\Stripe\Exception\UnauthorizedException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class SettingController extends Controller
 {
-    private $demo;
-
-    public function __construct()
-    {
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        private DemoService $demo
+    ) {
     }
 
     /**

src/Domain/Settings/Models/Traffic.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Models;
+namespace Domain\Settings\Models;
 
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;

src/Domain/SetupWizard/Controllers/SetupWizardController.php

@@ -1,41 +1,40 @@
 <?php
-namespace App\Http\Controllers\App;
+namespace Domain\SetupWizard\Controllers;
 
 use Schema;
 use Stripe;
 use Artisan;
-use Domain\Settings\Models\User;
-use Domain\Settings\Models\Setting;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Domain\SetupWizard\Services\SetupService;
-use Domain\SetupWizard\Services\StripeService;
+use Domain\Settings\Models\User;
 use Illuminate\Support\Facades\DB;
+use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Http;
 use Doctrine\DBAL\Driver\PDOException;
+use Domain\SetupWizard\Services\SetupService;
+use Domain\SetupWizard\Services\StripeService;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Cartalyst\Stripe\Exception\UnauthorizedException;
-use App\Http\Requests\SetupWizard\StoreAppSetupRequest;
+use Domain\SetupWizard\Requests\StoreAppSetupRequest;
+use Domain\SetupWizard\Requests\StoreStripePlansRequest;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use App\Http\Requests\SetupWizard\StoreStripePlansRequest;
-use App\Http\Requests\SetupWizard\StoreStripeBillingRequest;
-use App\Http\Requests\SetupWizard\StoreEnvironmentSetupRequest;
-use App\Http\Requests\SetupWizard\StoreStripeCredentialsRequest;
-use App\Http\Requests\SetupWizard\StoreDatabaseCredentialsRequest;
+use Domain\SetupWizard\Requests\StoreStripeBillingRequest;
+use Domain\SetupWizard\Requests\StoreEnvironmentSetupRequest;
+use Domain\SetupWizard\Requests\StoreStripeCredentialsRequest;
+use Domain\SetupWizard\Requests\StoreDatabaseCredentialsRequest;
 
 class SetupWizardController extends Controller
 {
     /**
      * Inject Stripe Service
      */
-    public function __construct()
-    {
-        $this->stripe = resolve(StripeService::class);
-        $this->setup = resolve(SetupService::class);
-
+    public function __construct(
+        public StripeService $stripe,
+        public SetupService $setup,
+    ) {
         $this->check_setup_status();
     }
 

src/Domain/SetupWizard/Requests/StoreAppSetupRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\SetupWizard;
+namespace Domain\SetupWizard\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/SetupWizard/Requests/StoreDatabaseCredentialsRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\SetupWizard;
+namespace Domain\SetupWizard\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/SetupWizard/Requests/StoreEnvironmentSetupRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\SetupWizard;
+namespace Domain\SetupWizard\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/SetupWizard/Requests/StoreStripeBillingRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\SetupWizard;
+namespace Domain\SetupWizard\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/SetupWizard/Requests/StoreStripeCredentialsRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\SetupWizard;
+namespace Domain\SetupWizard\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/SetupWizard/Requests/StoreStripePlansRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\SetupWizard;
+namespace Domain\SetupWizard\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Sharing/Controllers/BrowseShareController.php

@@ -1,27 +1,25 @@
 <?php
-namespace App\Http\Controllers\Sharing;
+namespace Domain\Sharing\Controllers;
 
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
 use Domain\Settings\Models\File;
 use Domain\Settings\Models\Share;
 use Domain\Settings\Models\Folder;
-use Illuminate\Support\Arr;
-use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\HelperService;
 use Illuminate\Support\Collection;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\FileResource;
 use Illuminate\Support\Facades\Hash;
-use App\Http\Resources\ShareResource;
 use Illuminate\Support\Facades\Storage;
-use App\Http\Requests\Share\AuthenticateShareRequest;
+use Domain\Admin\Resources\FileResource;
+use Domain\Admin\Resources\ShareResource;
+use Domain\SetupWizard\Services\HelperService;
+use Domain\Sharing\Requests\AuthenticateShareRequest;
 
 class BrowseShareController extends Controller
 {
-    private $helper;
-
-    public function __construct()
-    {
-        $this->helper = resolve(HelperService::class);
+    public function __construct(
+        private HelperService $helper,
+    ) {
     }
 
     /**

src/Domain/Sharing/Controllers/FileSharedAccessController.php

@@ -1,20 +1,18 @@
 <?php
-namespace App\Http\Controllers\Sharing;
+namespace Domain\Sharing\Controllers;
 
 use Domain\Settings\Models\Zip;
 use Domain\Settings\Models\Share;
-use Domain\SetupWizard\Services\HelperService;
-use Domain\Settings\Models\File as UserFile;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Storage;
+use Domain\Settings\Models\File as UserFile;
+use Domain\SetupWizard\Services\HelperService;
 
 class FileSharedAccessController extends Controller
 {
-    private $helper;
-
-    public function __construct()
-    {
-        $this->helper = resolve(HelperService::class);
+    public function __construct(
+        private HelperService $helper,
+    ) {
     }
 
     /**

src/Domain/Sharing/Controllers/ManipulateShareItemsController.php

@@ -1,32 +1,29 @@
 <?php
-namespace App\Http\Controllers\Sharing;
+namespace Domain\Sharing\Controllers;
 
+use Illuminate\Http\Request;
 use Domain\Settings\Models\File;
 use Domain\Settings\Models\Share;
 use Domain\Settings\Models\Folder;
-use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\SetupWizard\Services\HelperService;
 use App\Http\Controllers\Controller;
-use Domain\SetupWizard\Services\FileManagerService;
 use Illuminate\Database\Eloquent\Model;
+use Domain\Files\Requests\UploadRequest;
+use Domain\Files\Requests\MoveItemRequest;
+use Domain\Files\Requests\DeleteItemRequest;
+use Domain\Files\Requests\RenameItemRequest;
+use Domain\SetupWizard\Services\DemoService;
+use Domain\Files\Requests\CreateFolderRequest;
+use Domain\SetupWizard\Services\HelperService;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use App\Http\Requests\FileFunctions\UploadRequest;
-use App\Http\Requests\FileFunctions\MoveItemRequest;
-use App\Http\Requests\FileFunctions\DeleteItemRequest;
-use App\Http\Requests\FileFunctions\RenameItemRequest;
-use App\Http\Requests\FileFunctions\CreateFolderRequest;
+use Domain\SetupWizard\Services\FileManagerService;
 
 class ManipulateShareItemsController extends Controller
 {
-    private $filemanager;
-    private $helper;
-
-    public function __construct()
-    {
-        $this->filemanager = resolve(FileManagerService::class);
-        $this->helper = resolve(HelperService::class);
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        private FileManagerService $filemanager,
+        private HelperService $helper,
+        private DemoService $demo,
+    ) {
     }
 
     /**

src/Domain/Sharing/Controllers/ShareController.php

@@ -1,18 +1,18 @@
 <?php
-namespace App\Http\Controllers\FileManager;
+namespace Domain\Sharing\Controllers;
 
 use Validator;
+use Illuminate\Http\Request;
 use Domain\Settings\Models\Zip;
 use Domain\Settings\Models\Share;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use App\Http\Resources\ShareResource;
-use App\Notifications\SharedSendViaEmail;
+use Domain\Admin\Resources\ShareResource;
 use Illuminate\Support\Facades\Notification;
-use App\Http\Requests\Share\CreateShareRequest;
-use App\Http\Requests\Share\UpdateShareRequest;
+use Domain\Sharing\Requests\CreateShareRequest;
+use Domain\Sharing\Requests\UpdateShareRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;
+use Domain\Sharing\Notifications\SharedSendViaEmail;
 
 class ShareController extends Controller
 {

src/Domain/Sharing/Models/Share.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Models;
+namespace Domain\Sharing\Models;
 
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;

src/Domain/Sharing/Notifications/SharedSendViaEmail.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Notifications;
+namespace Domain\Sharing\Notifications;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Support\Facades\Auth;

src/Domain/Sharing/Requests/AuthenticateShareRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Share;
+namespace Domain\Sharing\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Sharing/Requests/CreateShareRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Share;
+namespace Domain\Sharing\Requests;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Foundation\Http\FormRequest;

src/Domain/Sharing/Requests/UpdateShareRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Share;
+namespace Domain\Sharing\Requests;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Foundation\Http\FormRequest;

src/Domain/Sharing/Resources/ShareResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Sharing\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Subscriptions/Controllers/PaymentMethodsController.php

@@ -1,28 +1,24 @@
 <?php
-namespace App\Http\Controllers\User;
+namespace Domain\Subscriptions\Controllers;
 
 use Auth;
 use Illuminate\Http\Request;
-use Domain\SetupWizard\Services\DemoService;
-use Domain\SetupWizard\Services\StripeService;
 use Laravel\Cashier\PaymentMethod;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
-use App\Http\Resources\PaymentCardResource;
-use App\Http\Resources\PaymentCardCollection;
-use App\Http\Resources\PaymentDefaultCardResource;
-use App\Http\Requests\Payments\RegisterNewPaymentMethodRequest;
+use Domain\SetupWizard\Services\DemoService;
+use Domain\SetupWizard\Services\StripeService;
+use Domain\Admin\Resources\PaymentCardResource;
+use Domain\Admin\Resources\PaymentCardCollection;
+use Domain\Admin\Resources\PaymentDefaultCardResource;
+use Domain\Subscriptions\Requests\RegisterNewPaymentMethodRequest;
 
 class PaymentMethodsController extends Controller
 {
-    private StripeService $stripe;
-
-    private DemoService $demo;
-
-    public function __construct(StripeService $stripe)
-    {
-        $this->stripe = $stripe;
-        $this->demo = resolve(DemoService::class);
+    public function __construct(
+        private StripeService $stripe,
+        private DemoService $demo,
+    ) {
     }
 
     /**

src/Domain/Subscriptions/Controllers/StripeWebhookController.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Controllers\Subscription;
+namespace Domain\Subscriptions\Controllers;
 
 use Domain\Settings\Models\User;
 use Domain\SetupWizard\Services\StripeService;
@@ -7,9 +7,9 @@ use Laravel\Cashier\Http\Controllers\WebhookController as CashierController;
 
 class StripeWebhookController extends CashierController
 {
-    public function __construct()
-    {
-        $this->stripe = resolve(StripeService::class);
+    public function __construct(
+        public StripeService $stripe
+    ) {
     }
 
     /**

src/Domain/Subscriptions/Controllers/SubscriptionController.php

@@ -1,28 +1,25 @@
 <?php
-namespace App\Http\Controllers\User;
+namespace Domain\Subscriptions\Controllers;
 
 use Auth;
-use Domain\Settings\Models\User;
 use Stripe\SetupIntent;
-use Domain\SetupWizard\Services\DemoService;
 use Illuminate\Http\Response;
-use Domain\SetupWizard\Services\StripeService;
+use Domain\Settings\Models\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
-use App\Http\Resources\UserSubscription;
+use Domain\Admin\Resources\UserSubscription;
+use Domain\SetupWizard\Services\DemoService;
+use Domain\SetupWizard\Services\StripeService;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use App\Http\Requests\Subscription\StoreUpgradeAccountRequest;
+use Domain\Subscriptions\Requests\StoreUpgradeAccountRequest;
 
 class SubscriptionController extends Controller
 {
-    private $stripe;
-    private $demo;
-
-    public function __construct()
-    {
-        $this->stripe = resolve(StripeService::class);
-        $this->demo = DemoService::class;
+    public function __construct(
+        private StripeService $stripe,
+        private DemoService $demo,
+    ) {
     }
 
     /**

src/Domain/Subscriptions/Notifications/ConfirmPayment.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Notifications;
+namespace Domain\Subscriptions\Notifications;
 
 use Laravel\Cashier\Payment;
 use Illuminate\Bus\Queueable;

src/Domain/Subscriptions/Requests/RegisterNewPaymentMethodRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Payments;
+namespace Domain\Subscriptions\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Subscriptions/Requests/StoreUpgradeAccountRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Requests\Subscription;
+namespace Domain\Subscriptions\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/Domain/Subscriptions/Resources/InvoiceCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Subscriptions\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Subscriptions/Resources/InvoiceResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Subscriptions\Resources;
 
 use Domain\Settings\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;

src/Domain/Subscriptions/Resources/PaymentCardCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Subscriptions\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 

src/Domain/Subscriptions/Resources/PaymentCardResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Subscriptions\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Subscriptions/Resources/PaymentDefaultCardResource.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Subscriptions\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

src/Domain/Subscriptions/Resources/PlanCollection.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Resources;
+namespace Domain\Subscriptions\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;