diff --git a/app/.php-cs-fixer.php b/app/.php-cs-fixer.php index 76ec2f06..1ab60b82 100644 --- a/app/.php-cs-fixer.php +++ b/app/.php-cs-fixer.php @@ -8,7 +8,7 @@ require_once 'vendor/autoload.php'; $config = ConfigBuilder::createFromRuleSet(new DefaultSet(['static_lambda' => false])) - ->inDir(__DIR__ . '/app') + ->inDir(__DIR__ . '/src') ->inDir(__DIR__ . '/config') ->inDir(__DIR__ . '/database') ->inDir(__DIR__ . '/tests') diff --git a/app/app/Providers/BroadcastServiceProvider.php b/app/app/Providers/BroadcastServiceProvider.php deleted file mode 100644 index 027e187f..00000000 --- a/app/app/Providers/BroadcastServiceProvider.php +++ /dev/null @@ -1,21 +0,0 @@ -singleton( Illuminate\Contracts\Http\Kernel::class, - App\Http\Kernel::class + Laravel\Http\Kernel::class ); $app->singleton( Illuminate\Contracts\Console\Kernel::class, - App\Console\Kernel::class + Laravel\Console\Kernel::class ); $app->singleton( Illuminate\Contracts\Debug\ExceptionHandler::class, - App\Exceptions\Handler::class + Laravel\Exceptions\Handler::class ); /* @@ -47,7 +47,7 @@ |-------------------------------------------------------------------------- | | This script returns the application instance. The instance is given to -| the calling script so we can separate the building of the instances +| the calling script, so we can separate the building of the instances | from the actual running of the application and sending responses. | */ diff --git a/app/composer.json b/app/composer.json index 4095edc3..e7dbe5ff 100644 --- a/app/composer.json +++ b/app/composer.json @@ -5,6 +5,7 @@ "keywords": ["framework", "laravel"], "license": "MIT", "require": { + "ext-pdo": "*", "php": "^8.1", "guzzlehttp/guzzle": "^7.2", "laravel/framework": "^10.8", @@ -28,7 +29,10 @@ }, "autoload": { "psr-4": { - "App\\": "app/", + "Laravel\\": "src/Bridge/Laravel", + "Application\\": "src/Application", + "Domain\\": "src/Domain", + "Infrastructure\\": "src/Infrastructure", "Database\\Factories\\": "database/factories/", "Database\\Seeders\\": "database/seeders/" } diff --git a/app/composer.lock b/app/composer.lock index ad2bc214..08e65d98 100644 --- a/app/composer.lock +++ b/app/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "84b0c5db429b87d5e96752d2241fa94a", + "content-hash": "ea355fd61ff30c374caaa9cc4f079a3c", "packages": [ { "name": "brick/math", @@ -2702,23 +2702,23 @@ }, { "name": "php-http/message", - "version": "1.14.0", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b" + "reference": "2a1fbaa00cf5ffc82f379adf47388663bce8190d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b", - "reference": "2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b", + "url": "https://api.github.com/repos/php-http/message/zipball/2a1fbaa00cf5ffc82f379adf47388663bce8190d", + "reference": "2a1fbaa00cf5ffc82f379adf47388663bce8190d", "shasum": "" }, "require": { "clue/stream-filter": "^1.5", - "php": "^7.1 || ^8.0", + "php": "^7.2 || ^8.0", "php-http/message-factory": "^1.0.2", - "psr/http-message": "^1.0 || ^2.0" + "psr/http-message": "^1.1 || ^2.0" }, "provide": { "php-http/message-factory-implementation": "1.0" @@ -2726,8 +2726,8 @@ "require-dev": { "ergebnis/composer-normalize": "^2.6", "ext-zlib": "*", - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", + "guzzlehttp/psr7": "^1.0 || ^2.0", + "laminas/laminas-diactoros": "^2.0 || ^3.0", "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", "slim/slim": "^3.0" }, @@ -2765,9 +2765,9 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.14.0" + "source": "https://github.com/php-http/message/tree/1.15.0" }, - "time": "2023-04-14T14:26:18+00:00" + "time": "2023-05-10T08:19:58+00:00" }, { "name": "php-http/message-factory", @@ -9048,16 +9048,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.14", + "version": "1.10.15", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d232901b09e67538e5c86a724be841bea5768a7c" + "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d232901b09e67538e5c86a724be841bea5768a7c", - "reference": "d232901b09e67538e5c86a724be841bea5768a7c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/762c4dac4da6f8756eebb80e528c3a47855da9bd", + "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd", "shasum": "" }, "require": { @@ -9106,7 +9106,7 @@ "type": "tidelift" } ], - "time": "2023-04-19T13:47:27+00:00" + "time": "2023-05-09T15:28:01+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -11834,6 +11834,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { + "ext-pdo": "*", "php": "^8.1" }, "platform-dev": [], diff --git a/app/config/app.php b/app/config/app.php index 8395508d..2a713d64 100644 --- a/app/config/app.php +++ b/app/config/app.php @@ -7,155 +7,120 @@ return [ /* - |-------------------------------------------------------------------------- - | Application Name - |-------------------------------------------------------------------------- - | - | This value is the name of your application. This value is used when the - | framework needs to place the application's name in a notification or - | any other location as required by the application or its packages. - | - */ - + * Application Name + * + * This value is the name of your application. This value is used when the + * framework needs to place the application's name in a notification or + * any other location as required by the application or its packages. + * + */ 'name' => env('APP_NAME', 'Laravel'), /* - |-------------------------------------------------------------------------- - | Application Environment - |-------------------------------------------------------------------------- - | - | This value determines the "environment" your application is currently - | running in. This may determine how you prefer to configure various - | services the application utilizes. Set this in your ".env" file. - | - */ - + * Application Environment + * + * This value determines the "environment" your application is currently + * running in. This may determine how you prefer to configure various + * services the application utilizes. Set this in your ".env" file. + * + */ 'env' => env('APP_ENV', 'production'), /* - |-------------------------------------------------------------------------- - | Application Debug Mode - |-------------------------------------------------------------------------- - | - | When your application is in debug mode, detailed error messages with - | stack traces will be shown on every error that occurs within your - | application. If disabled, a simple generic error page is shown. - | - */ - + * Application Debug Mode + * + * When your application is in debug mode, detailed error messages with + * stack traces will be shown on every error that occurs within your + * application. If disabled, a simple generic error page is shown. + * + */ 'debug' => (bool) env('APP_DEBUG', false), /* - |-------------------------------------------------------------------------- - | Application URL - |-------------------------------------------------------------------------- - | - | This URL is used by the console to properly generate URLs when using - | the Artisan command line tool. You should set this to the root of - | your application so that it is used when running Artisan tasks. - | - */ - + * Application URL + * + * This URL is used by the console to properly generate URLs when using + * the Artisan command line tool. You should set this to the root of + * your application so that it is used when running Artisan tasks. + * + */ 'url' => env('APP_URL', 'http://localhost'), - 'asset_url' => env('ASSET_URL'), /* - |-------------------------------------------------------------------------- - | Application Timezone - |-------------------------------------------------------------------------- - | - | Here you may specify the default timezone for your application, which - | will be used by the PHP date and date-time functions. We have gone - | ahead and set this to a sensible default for you out of the box. - | - */ - - 'timezone' => 'UTC', + * Application Timezone + * + * Here you may specify the default timezone for your application, which + * will be used by the PHP date and date-time functions. We have gone + * ahead and set this to a sensible default for you out of the box. + * + */ + 'timezone' => env('APP_TIMEZONE', 'UTC'), /* - |-------------------------------------------------------------------------- - | Application Locale Configuration - |-------------------------------------------------------------------------- - | - | The application locale determines the default locale that will be used - | by the translation service provider. You are free to set this value - | to any of the locales which will be supported by the application. - | - */ - + * Application Locale Configuration + * + * The application locale determines the default locale that will be used + * by the translation service provider. You are free to set this value + * to any of the locales which will be supported by the application. + * + */ 'locale' => 'en', /* - |-------------------------------------------------------------------------- - | Application Fallback Locale - |-------------------------------------------------------------------------- - | - | The fallback locale determines the locale to use when the current one - | is not available. You may change the value to correspond to any of - | the language folders that are provided through your application. - | - */ - + * Application Fallback Locale + * + * The fallback locale determines the locale to use when the current one + * is not available. You may change the value to correspond to any of + * the language folders that are provided through your application. + * + */ 'fallback_locale' => 'en', /* - |-------------------------------------------------------------------------- - | Faker Locale - |-------------------------------------------------------------------------- - | - | This locale will be used by the Faker PHP library when generating fake - | data for your database seeds. For example, this will be used to get - | localized telephone numbers, street address information and more. - | - */ - + * Faker Locale + * + * This locale will be used by the Faker PHP library when generating fake + * data for your database seeds. For example, this will be used to get + * localized telephone numbers, street address information and more. + * + */ 'faker_locale' => 'en_US', /* - |-------------------------------------------------------------------------- - | Encryption Key - |-------------------------------------------------------------------------- - | - | This key is used by the Illuminate encrypter service and should be set - | to a random, 32 character string, otherwise these encrypted strings - | will not be safe. Please do this before deploying an application! - | - */ - + * Encryption Key + * + * This key is used by the Illuminate encrypter service and should be set + * to a random, 32 character string, otherwise these encrypted strings + * will not be safe. Please do this before deploying an application! + * + */ 'key' => env('APP_KEY'), - 'cipher' => 'AES-256-CBC', /* - |-------------------------------------------------------------------------- - | Maintenance Mode Driver - |-------------------------------------------------------------------------- - | - | These configuration options determine the driver used to determine and - | manage Laravel's "maintenance mode" status. The "cache" driver will - | allow maintenance mode to be controlled across multiple machines. - | - | Supported drivers: "file", "cache" - | - */ - + * Maintenance Mode Driver + * + * These configuration options determine the driver used to determine and + * manage Laravel's "maintenance mode" status. The "cache" driver will + * allow maintenance mode to be controlled across multiple machines. + * + * Supported drivers: "file", "cache" + * + */ 'maintenance' => [ 'driver' => 'file', // 'store' => 'redis', ], /* - |-------------------------------------------------------------------------- - | Autoloaded Service Providers - |-------------------------------------------------------------------------- - | - | The service providers listed here will be automatically loaded on the - | request to your application. Feel free to add your own services to - | this array to grant expanded functionality to your applications. - | - */ - + * Autoloaded Service Providers + * + * The service providers listed here will be automatically loaded on the + * request to your application. Feel free to add your own services to + * this array to grant expanded functionality to your applications. + * + */ 'providers' => ServiceProvider::defaultProviders()->merge([ /* * Package Service Providers... @@ -164,24 +129,20 @@ /* * Application Service Providers... */ - App\Providers\AppServiceProvider::class, - App\Providers\AuthServiceProvider::class, - // App\Providers\BroadcastServiceProvider::class, - App\Providers\EventServiceProvider::class, - App\Providers\RouteServiceProvider::class, + \Laravel\Providers\AppServiceProvider::class, + \Laravel\Providers\AuthServiceProvider::class, + \Laravel\Providers\EventServiceProvider::class, + \Laravel\Providers\RouteServiceProvider::class, ])->toArray(), /* - |-------------------------------------------------------------------------- - | Class Aliases - |-------------------------------------------------------------------------- - | - | This array of class aliases will be registered when this application - | is started. However, feel free to register as many as you wish as - | the aliases are "lazy" loaded so they don't hinder performance. - | - */ - + * Class Aliases + * + * This array of class aliases will be registered when this application + * is started. However, feel free to register as many as you wish as + * the aliases are "lazy" loaded, so they don't hinder performance. + * + */ 'aliases' => Facade::defaultAliases()->merge([ // 'Example' => App\Facades\Example::class, ])->toArray(), diff --git a/app/config/auth.php b/app/config/auth.php index 44b1f083..86165fd6 100644 --- a/app/config/auth.php +++ b/app/config/auth.php @@ -4,38 +4,31 @@ return [ /* - |-------------------------------------------------------------------------- - | Authentication Defaults - |-------------------------------------------------------------------------- - | - | This option controls the default authentication "guard" and password - | reset options for your application. You may change these defaults - | as required, but they're a perfect start for most applications. - | - */ - + * Authentication Defaults + * + * This option controls the default authentication "guard" and password + * reset options for your application. You may change these defaults + * as required, but they're a perfect start for most applications. + */ 'defaults' => [ 'guard' => 'web', 'passwords' => 'users', ], /* - |-------------------------------------------------------------------------- - | Authentication Guards - |-------------------------------------------------------------------------- - | - | Next, you may define every authentication guard for your application. - | Of course, a great default configuration has been defined for you - | here which uses session storage and the Eloquent user provider. - | - | All authentication drivers have a user provider. This defines how the - | users are actually retrieved out of your database or other storage - | mechanisms used by this application to persist your user's data. - | - | Supported: "session" - | - */ - + * Authentication Guards + * + * Next, you may define every authentication guard for your application. + * Of course, a great default configuration has been defined for you + * here which uses session storage and the Eloquent user provider. + * + * All authentication drivers have a user provider. This defines how the + * users are actually retrieved out of your database or other storage + * mechanisms used by this application to persist your user's data. + * + * Supported: "session" + * + */ 'guards' => [ 'web' => [ 'driver' => 'session', @@ -44,26 +37,23 @@ ], /* - |-------------------------------------------------------------------------- - | User Providers - |-------------------------------------------------------------------------- - | - | All authentication drivers have a user provider. This defines how the - | users are actually retrieved out of your database or other storage - | mechanisms used by this application to persist your user's data. - | - | If you have multiple user tables or models you may configure multiple - | sources which represent each model / table. These sources may then - | be assigned to any extra authentication guards you have defined. - | - | Supported: "database", "eloquent" - | - */ - + * User Providers + * + * All authentication drivers have a user provider. This defines how the + * users are actually retrieved out of your database or other storage + * mechanisms used by this application to persist your user's data. + * + * If you have multiple user tables or models you may configure multiple + * sources which represent each model / table. These sources may then + * be assigned to any extra authentication guards you have defined. + * + * Supported: "database", "eloquent" + * + */ 'providers' => [ 'users' => [ 'driver' => 'eloquent', - 'model' => App\Models\User::class, + 'model' => \Domain\User\Models\User::class, ], // 'users' => [ @@ -73,24 +63,21 @@ ], /* - |-------------------------------------------------------------------------- - | Resetting Passwords - |-------------------------------------------------------------------------- - | - | You may specify multiple password reset configurations if you have more - | than one user table or model in the application and you want to have - | separate password reset settings based on the specific user types. - | - | The expiry time is the number of minutes that each reset token will be - | considered valid. This security feature keeps tokens short-lived so - | they have less time to be guessed. You may change this as needed. - | - | The throttle setting is the number of seconds a user must wait before - | generating more password reset tokens. This prevents the user from - | quickly generating a very large amount of password reset tokens. - | - */ - + * Resetting Passwords + * + * You may specify multiple password reset configurations if you have more + * than one user table or model in the application, and you want to have + * separate password reset settings based on the specific user types. + * + * The expiry time is the number of minutes that each reset token will be + * considered valid. This security feature keeps tokens short-lived so + * they have less time to be guessed. You may change this as needed. + * + * The throttle setting is the number of seconds a user must wait before + * generating more password reset tokens. This prevents the user from + * quickly generating a very large amount of password reset tokens. + * + */ 'passwords' => [ 'users' => [ 'provider' => 'users', @@ -101,15 +88,12 @@ ], /* - |-------------------------------------------------------------------------- - | Password Confirmation Timeout - |-------------------------------------------------------------------------- - | - | Here you may define the amount of seconds before a password confirmation - | times out and the user is prompted to re-enter their password via the - | confirmation screen. By default, the timeout lasts for three hours. - | - */ - + * Password Confirmation Timeout + * + * Here you may define the amount of seconds before a password confirmation + * times out and the user is prompted to re-enter their password via the + * confirmation screen. By default, the timeout lasts for three hours. + * + */ 'password_timeout' => 10800, ]; diff --git a/app/config/broadcasting.php b/app/config/broadcasting.php deleted file mode 100644 index 741700cc..00000000 --- a/app/config/broadcasting.php +++ /dev/null @@ -1,68 +0,0 @@ - env('BROADCAST_DRIVER', 'null'), - - /* - |-------------------------------------------------------------------------- - | Broadcast Connections - |-------------------------------------------------------------------------- - | - | Here you may define all of the broadcast connections that will be used - | to broadcast events to other systems or over websockets. Samples of - | each available type of connection are provided inside this array. - | - */ - - 'connections' => [ - 'pusher' => [ - 'driver' => 'pusher', - 'key' => env('PUSHER_APP_KEY'), - 'secret' => env('PUSHER_APP_SECRET'), - 'app_id' => env('PUSHER_APP_ID'), - 'options' => [ - 'host' => env('PUSHER_HOST') ?: 'api-' . env('PUSHER_APP_CLUSTER', 'mt1') . '.pusher.com', - 'port' => env('PUSHER_PORT', 443), - 'scheme' => env('PUSHER_SCHEME', 'https'), - 'encrypted' => true, - 'useTLS' => env('PUSHER_SCHEME', 'https') === 'https', - ], - 'client_options' => [ - // Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html - ], - ], - - 'ably' => [ - 'driver' => 'ably', - 'key' => env('ABLY_KEY'), - ], - - 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - ], - - 'log' => [ - 'driver' => 'log', - ], - - 'null' => [ - 'driver' => 'null', - ], - ], -]; diff --git a/app/config/cache.php b/app/config/cache.php index f8993031..f6389615 100644 --- a/app/config/cache.php +++ b/app/config/cache.php @@ -6,32 +6,26 @@ return [ /* - |-------------------------------------------------------------------------- - | Default Cache Store - |-------------------------------------------------------------------------- - | - | This option controls the default cache connection that gets used while - | using this caching library. This connection is used when another is - | not explicitly specified when executing a given caching function. - | - */ - + * Default Cache Store + * + * This option controls the default cache connection that gets used while + * using this caching library. This connection is used when another is + * not explicitly specified when executing a given caching function. + * + */ 'default' => env('CACHE_DRIVER', 'file'), /* - |-------------------------------------------------------------------------- - | Cache Stores - |-------------------------------------------------------------------------- - | - | Here you may define all of the cache "stores" for your application as - | well as their drivers. You may even define multiple stores for the - | same cache driver to group types of items stored in your caches. - | - | Supported drivers: "apc", "array", "database", "file", - | "memcached", "redis", "dynamodb", "octane", "null" - | - */ - + * Cache Stores + * + * Here you may define all the cache "stores" for your application as + * well as their drivers. You may even define multiple stores for the + * same cache driver to group types of items stored in your caches. + * + * Supported drivers: "apc", "array", "database", "file", + * "memcached", "redis", "dynamodb", "octane", "null" + * + */ 'stores' => [ 'apc' => [ 'driver' => 'apc', @@ -94,15 +88,12 @@ ], /* - |-------------------------------------------------------------------------- - | Cache Key Prefix - |-------------------------------------------------------------------------- - | - | When utilizing the APC, database, memcached, Redis, or DynamoDB cache - | stores there might be other applications using the same cache. For - | that reason, you may prefix every cache key to avoid collisions. - | - */ - + * Cache Key Prefix + * + * When utilizing the APC, database, memcached, Redis, or DynamoDB cache + * stores there might be other applications using the same cache. For + * that reason, you may prefix every cache key to avoid collisions. + * + */ 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache_'), ]; diff --git a/app/config/cors.php b/app/config/cors.php index b7666ec4..a4f01b73 100644 --- a/app/config/cors.php +++ b/app/config/cors.php @@ -4,18 +4,15 @@ return [ /* - |-------------------------------------------------------------------------- - | Cross-Origin Resource Sharing (CORS) Configuration - |-------------------------------------------------------------------------- - | - | Here you may configure your settings for cross-origin resource sharing - | or "CORS". This determines what cross-origin operations may execute - | in web browsers. You are free to adjust these settings as needed. - | - | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS - | - */ - + * Cross-Origin Resource Sharing (CORS) Configuration + * + * Here you may configure your settings for cross-origin resource sharing + * or "CORS". This determines what cross-origin operations may execute + * in web browsers. You are free to adjust these settings as needed. + * + * To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS + * + */ 'paths' => ['api/*'], 'allowed_methods' => ['*'], diff --git a/app/config/database.php b/app/config/database.php index b7ebb90c..d36af59e 100644 --- a/app/config/database.php +++ b/app/config/database.php @@ -6,34 +6,28 @@ return [ /* - |-------------------------------------------------------------------------- - | Default Database Connection Name - |-------------------------------------------------------------------------- - | - | Here you may specify which of the database connections below you wish - | to use as your default connection for all database work. Of course - | you may use many connections at once using the Database library. - | - */ - + * Default Database Connection Name + * + * Here you may specify which of the database connections below you wish + * to use as your default connection for all database work. Of course + * you may use many connections at once using the Database library. + * + */ 'default' => env('DB_CONNECTION', 'mysql'), /* - |-------------------------------------------------------------------------- - | Database Connections - |-------------------------------------------------------------------------- - | - | Here are each of the database connections setup for your application. - | Of course, examples of configuring each database platform that is - | supported by Laravel is shown below to make development simple. - | - | - | All database work in Laravel is done through the PHP PDO facilities - | so make sure you have the driver for your particular database of - | choice installed on your machine before you begin development. - | - */ - + * Database Connections + * + * Here are each of the database connections setup for your application. + * Of course, examples of configuring each database platform that is + * supported by Laravel is shown below to make development simple. + * + * + * All database work in Laravel is done through the PHP PDO facilities + * so make sure you have the driver for your particular database of + * choice installed on your machine before you begin development. + * + */ 'connections' => [ 'sqlite' => [ 'driver' => 'sqlite', @@ -95,29 +89,23 @@ ], /* - |-------------------------------------------------------------------------- - | Migration Repository Table - |-------------------------------------------------------------------------- - | - | This table keeps track of all the migrations that have already run for - | your application. Using this information, we can determine which of - | the migrations on disk haven't actually been run in the database. - | - */ - + * Migration Repository Table + * + * This table keeps track of all the migrations that have already run for + * your application. Using this information, we can determine which of + * the migrations on disk haven't actually been run in the database. + * + */ 'migrations' => 'migrations', /* - |-------------------------------------------------------------------------- - | Redis Databases - |-------------------------------------------------------------------------- - | - | Redis is an open source, fast, and advanced key-value store that also - | provides a richer body of commands than a typical key-value system - | such as APC or Memcached. Laravel makes it easy to dig right in. - | - */ - + * Redis Databases + * + * Redis is an open source, fast, and advanced key-value store that also + * provides a richer body of commands than a typical key-value system + * such as APC or Memcached. Laravel makes it easy to dig right in. + * + */ 'redis' => [ 'client' => env('REDIS_CLIENT', 'phpredis'), diff --git a/app/config/filesystems.php b/app/config/filesystems.php index cd87122b..ecb066e3 100644 --- a/app/config/filesystems.php +++ b/app/config/filesystems.php @@ -4,31 +4,25 @@ return [ /* - |-------------------------------------------------------------------------- - | Default Filesystem Disk - |-------------------------------------------------------------------------- - | - | Here you may specify the default filesystem disk that should be used - | by the framework. The "local" disk, as well as a variety of cloud - | based disks are available to your application. Just store away! - | - */ - + * Default Filesystem Disk + * + * Here you may specify the default filesystem disk that should be used + * by the framework. The "local" disk, as well as a variety of cloud + * based disks are available to your application. Just store away! + * + */ 'default' => env('FILESYSTEM_DISK', 'local'), /* - |-------------------------------------------------------------------------- - | Filesystem Disks - |-------------------------------------------------------------------------- - | - | Here you may configure as many filesystem "disks" as you wish, and you - | may even configure multiple disks of the same driver. Defaults have - | been set up for each driver as an example of the required values. - | - | Supported Drivers: "local", "ftp", "sftp", "s3" - | - */ - + * Filesystem Disks + * + * Here you may configure as many filesystem "disks" as you wish, and you + * may even configure multiple disks of the same driver. Defaults have + * been set up for each driver as an example of the required values. + * + * Supported Drivers: "local", "ftp", "sftp", "s3" + * + */ 'disks' => [ 'local' => [ 'driver' => 'local', @@ -58,16 +52,13 @@ ], /* - |-------------------------------------------------------------------------- - | Symbolic Links - |-------------------------------------------------------------------------- - | - | Here you may configure the symbolic links that will be created when the - | `storage:link` Artisan command is executed. The array keys should be - | the locations of the links and the values should be their targets. - | - */ - + * Symbolic Links + * + * Here you may configure the symbolic links that will be created when the + * `storage:link` Artisan command is executed. The array keys should be + * the locations of the links and the values should be their targets. + * + */ 'links' => [ public_path('storage') => storage_path('app/public'), ], diff --git a/app/config/hashing.php b/app/config/hashing.php index c30682f2..1d93a4f0 100644 --- a/app/config/hashing.php +++ b/app/config/hashing.php @@ -4,46 +4,37 @@ return [ /* - |-------------------------------------------------------------------------- - | Default Hash Driver - |-------------------------------------------------------------------------- - | - | This option controls the default hash driver that will be used to hash - | passwords for your application. By default, the bcrypt algorithm is - | used; however, you remain free to modify this option if you wish. - | - | Supported: "bcrypt", "argon", "argon2id" - | - */ - + * Default Hash Driver + * + * This option controls the default hash driver that will be used to hash + * passwords for your application. By default, the bcrypt algorithm is + * used; however, you remain free to modify this option if you wish. + * + * Supported: "bcrypt", "argon", "argon2id" + * + */ 'driver' => 'bcrypt', /* - |-------------------------------------------------------------------------- - | Bcrypt Options - |-------------------------------------------------------------------------- - | - | Here you may specify the configuration options that should be used when - | passwords are hashed using the Bcrypt algorithm. This will allow you - | to control the amount of time it takes to hash the given password. - | - */ - + * Bcrypt Options + * + * Here you may specify the configuration options that should be used when + * passwords are hashed using the Bcrypt algorithm. This will allow you + * to control the amount of time it takes to hash the given password. + * + */ 'bcrypt' => [ 'rounds' => env('BCRYPT_ROUNDS', 10), ], /* - |-------------------------------------------------------------------------- - | Argon Options - |-------------------------------------------------------------------------- - | - | Here you may specify the configuration options that should be used when - | passwords are hashed using the Argon algorithm. These will allow you - | to control the amount of time it takes to hash the given password. - | - */ - + * Argon Options + * + * Here you may specify the configuration options that should be used when + * passwords are hashed using the Argon algorithm. These will allow you + * to control the amount of time it takes to hash the given password. + * + */ 'argon' => [ 'memory' => 65536, 'threads' => 1, diff --git a/app/config/logging.php b/app/config/logging.php index 333e35e6..8d3be7b0 100644 --- a/app/config/logging.php +++ b/app/config/logging.php @@ -9,49 +9,40 @@ return [ /* - |-------------------------------------------------------------------------- - | Default Log Channel - |-------------------------------------------------------------------------- - | - | This option defines the default log channel that gets used when writing - | messages to the logs. The name specified in this option should match - | one of the channels defined in the "channels" configuration array. - | - */ - + * Default Log Channel + * + * This option defines the default log channel that gets used when writing + * messages to the logs. The name specified in this option should match + * one of the channels defined in the "channels" configuration array. + * + */ 'default' => env('LOG_CHANNEL', 'stack'), /* - |-------------------------------------------------------------------------- - | Deprecations Log Channel - |-------------------------------------------------------------------------- - | - | This option controls the log channel that should be used to log warnings - | regarding deprecated PHP and library features. This allows you to get - | your application ready for upcoming major versions of dependencies. - | - */ - + * Deprecations Log Channel + * + * This option controls the log channel that should be used to log warnings + * regarding deprecated PHP and library features. This allows you to get + * your application ready for upcoming major versions of dependencies. + * + */ 'deprecations' => [ 'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'), 'trace' => false, ], /* - |-------------------------------------------------------------------------- - | Log Channels - |-------------------------------------------------------------------------- - | - | Here you may configure the log channels for your application. Out of - | the box, Laravel uses the Monolog PHP logging library. This gives - | you a variety of powerful log handlers / formatters to utilize. - | - | Available Drivers: "single", "daily", "slack", "syslog", - | "errorlog", "monolog", - | "custom", "stack" - | - */ - + * Log Channels + * + * Here you may configure the log channels for your application. Out of + * the box, Laravel uses the Monolog PHP logging library. This gives + * you a variety of powerful log handlers / formatters to utilize. + * + * Available Drivers: "single", "daily", "slack", "syslog", + * "errorlog", "monolog", + * "custom", "stack" + * + */ 'channels' => [ 'stack' => [ 'driver' => 'stack', diff --git a/app/config/mail.php b/app/config/mail.php index 0fc10359..6cd202f6 100644 --- a/app/config/mail.php +++ b/app/config/mail.php @@ -4,36 +4,30 @@ return [ /* - |-------------------------------------------------------------------------- - | Default Mailer - |-------------------------------------------------------------------------- - | - | This option controls the default mailer that is used to send any email - | messages sent by your application. Alternative mailers may be setup - | and used as needed; however, this mailer will be used by default. - | - */ - + * Default Mailer + * + * This option controls the default mailer that is used to send any email + * messages sent by your application. Alternative mailers may be setup + * and used as needed; however, this mailer will be used by default. + * + */ 'default' => env('MAIL_MAILER', 'smtp'), /* - |-------------------------------------------------------------------------- - | Mailer Configurations - |-------------------------------------------------------------------------- - | - | Here you may configure all of the mailers used by your application plus - | their respective settings. Several examples have been configured for - | you and you are free to add your own as your application requires. - | - | Laravel supports a variety of mail "transport" drivers to be used while - | sending an e-mail. You will specify which one you are using for your - | mailers below. You are free to add additional mailers as required. - | - | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", - | "postmark", "log", "array", "failover" - | - */ - + * Mailer Configurations + * + * Here you may configure all the mailers used by your application plus + * their respective settings. Several examples have been configured for + * you, and you are free to add your own as your application requires. + * + * Laravel supports a variety of mail "transport" drivers to be used while + * sending an e-mail. You will specify which one you are using for your + * mailers below. You are free to add additional mailers as required. + * + * Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", + * "postmark", "log", "array", "failover" + * + */ 'mailers' => [ 'smtp' => [ 'transport' => 'smtp', @@ -88,32 +82,26 @@ ], /* - |-------------------------------------------------------------------------- - | Global "From" Address - |-------------------------------------------------------------------------- - | - | You may wish for all e-mails sent by your application to be sent from - | the same address. Here, you may specify a name and address that is - | used globally for all e-mails that are sent by your application. - | - */ - + * Global "From" Address + * + * You may wish for all e-mails sent by your application to be sent from + * the same address. Here, you may specify a name and address that is + * used globally for all e-mails that are sent by your application. + * + */ 'from' => [ 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), 'name' => env('MAIL_FROM_NAME', 'Example'), ], /* - |-------------------------------------------------------------------------- - | Markdown Mail Settings - |-------------------------------------------------------------------------- - | - | If you are using Markdown based email rendering, you may configure your - | theme and component paths here, allowing you to customize the design - | of the emails. Or, you may simply stick with the Laravel defaults! - | - */ - + * Markdown Mail Settings + * + * If you are using Markdown based email rendering, you may configure your + * theme and component paths here, allowing you to customize the design + * of the emails. Or, you may simply stick with the Laravel defaults! + * + */ 'markdown' => [ 'theme' => 'default', diff --git a/app/config/queue.php b/app/config/queue.php index 584b937a..f36a4838 100644 --- a/app/config/queue.php +++ b/app/config/queue.php @@ -4,31 +4,25 @@ return [ /* - |-------------------------------------------------------------------------- - | Default Queue Connection Name - |-------------------------------------------------------------------------- - | - | Laravel's queue API supports an assortment of back-ends via a single - | API, giving you convenient access to each back-end using the same - | syntax for every one. Here you may define a default connection. - | - */ - + * Default Queue Connection Name + * + * Laravel's queue API supports an assortment of back-ends via a single + * API, giving you convenient access to each back-end using the same + * syntax for every one. Here you may define a default connection. + * + */ 'default' => env('QUEUE_CONNECTION', 'sync'), /* - |-------------------------------------------------------------------------- - | Queue Connections - |-------------------------------------------------------------------------- - | - | Here you may configure the connection information for each server that - | is used by your application. A default configuration has been added - | for each back-end shipped with Laravel. You are free to add more. - | - | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null" - | - */ - + * Queue Connections + * + * Here you may configure the connection information for each server that + * is used by your application. A default configuration has been added + * for each back-end shipped with Laravel. You are free to add more. + * + * Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null" + * + */ 'connections' => [ 'sync' => [ 'driver' => 'sync', @@ -73,32 +67,26 @@ ], /* - |-------------------------------------------------------------------------- - | Job Batching - |-------------------------------------------------------------------------- - | - | The following options configure the database and table that store job - | batching information. These options can be updated to any database - | connection and table which has been defined by your application. - | - */ - + * Job Batching + * + * The following options configure the database and table that store job + * batching information. These options can be updated to any database + * connection and table which has been defined by your application. + * + */ 'batching' => [ 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'job_batches', ], /* - |-------------------------------------------------------------------------- - | Failed Queue Jobs - |-------------------------------------------------------------------------- - | - | These options configure the behavior of failed queue job logging so you - | can control which database and table are used to store the jobs that - | have failed. You may change them to any database / table you wish. - | - */ - + * Failed Queue Jobs + * + * These options configure the behavior of failed queue job logging so you + * can control which database and table are used to store the jobs that + * have failed. You may change them to any database / table you wish. + * + */ 'failed' => [ 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), 'database' => env('DB_CONNECTION', 'mysql'), diff --git a/app/config/services.php b/app/config/services.php index 70d6d500..e5f2a8c0 100644 --- a/app/config/services.php +++ b/app/config/services.php @@ -4,17 +4,14 @@ return [ /* - |-------------------------------------------------------------------------- - | Third Party Services - |-------------------------------------------------------------------------- - | - | This file is for storing the credentials for third party services such - | as Mailgun, Postmark, AWS and more. This file provides the de facto - | location for this type of information, allowing packages to have - | a conventional file to locate the various service credentials. - | - */ - + * Third Party Services + * + * This file is for storing the credentials for third party services such + * as Mailgun, Postmark, AWS and more. This file provides the de facto + * location for this type of information, allowing packages to have + * a conventional file to locate the various service credentials. + * + */ 'mailgun' => [ 'domain' => env('MAILGUN_DOMAIN'), 'secret' => env('MAILGUN_SECRET'), diff --git a/app/config/session.php b/app/config/session.php index e4cf6285..45975fb4 100644 --- a/app/config/session.php +++ b/app/config/session.php @@ -6,196 +6,153 @@ return [ /* - |-------------------------------------------------------------------------- - | Default Session Driver - |-------------------------------------------------------------------------- - | - | This option controls the default session "driver" that will be used on - | requests. By default, we will use the lightweight native driver but - | you may specify any of the other wonderful drivers provided here. - | - | Supported: "file", "cookie", "database", "apc", - | "memcached", "redis", "dynamodb", "array" - | - */ - + * Default Session Driver + * + * This option controls the default session "driver" that will be used on + * requests. By default, we will use the lightweight native driver but + * you may specify any of the other wonderful drivers provided here. + * + * Supported: "file", "cookie", "database", "apc", + * "memcached", "redis", "dynamodb", "array" + * + */ 'driver' => env('SESSION_DRIVER', 'file'), /* - |-------------------------------------------------------------------------- - | Session Lifetime - |-------------------------------------------------------------------------- - | - | Here you may specify the number of minutes that you wish the session - | to be allowed to remain idle before it expires. If you want them - | to immediately expire on the browser closing, set that option. - | - */ - + * Session Lifetime + * + * Here you may specify the number of minutes that you wish the session + * to be allowed to remain idle before it expires. If you want them + * to immediately expire on the browser closing, set that option. + * + */ 'lifetime' => env('SESSION_LIFETIME', 120), - 'expire_on_close' => false, /* - |-------------------------------------------------------------------------- - | Session Encryption - |-------------------------------------------------------------------------- - | - | This option allows you to easily specify that all of your session data - | should be encrypted before it is stored. All encryption will be run - | automatically by Laravel and you can use the Session like normal. - | - */ - + * Session Encryption + * + * This option allows you to easily specify that all of your session data + * should be encrypted before it is stored. All encryption will be run + * automatically by Laravel and you can use the Session like normal. + * + */ 'encrypt' => false, /* - |-------------------------------------------------------------------------- - | Session File Location - |-------------------------------------------------------------------------- - | - | When using the native session driver, we need a location where session - | files may be stored. A default has been set for you but a different - | location may be specified. This is only needed for file sessions. - | - */ - + * Session File Location + * + * When using the native session driver, we need a location where session + * files may be stored. A default has been set for you but a different + * location may be specified. This is only needed for file sessions. + * + */ 'files' => storage_path('framework/sessions'), /* - |-------------------------------------------------------------------------- - | Session Database Connection - |-------------------------------------------------------------------------- - | - | When using the "database" or "redis" session drivers, you may specify a - | connection that should be used to manage these sessions. This should - | correspond to a connection in your database configuration options. - | - */ - + * Session Database Connection + * + * When using the "database" or "redis" session drivers, you may specify a + * connection that should be used to manage these sessions. This should + * correspond to a connection in your database configuration options. + * + */ 'connection' => env('SESSION_CONNECTION'), /* - |-------------------------------------------------------------------------- - | Session Database Table - |-------------------------------------------------------------------------- - | - | When using the "database" session driver, you may specify the table we - | should use to manage the sessions. Of course, a sensible default is - | provided for you; however, you are free to change this as needed. - | - */ - + * Session Database Table + * + * When using the "database" session driver, you may specify the table we + * should use to manage the sessions. Of course, a sensible default is + * provided for you; however, you are free to change this as needed. + * + */ 'table' => 'sessions', /* - |-------------------------------------------------------------------------- - | Session Cache Store - |-------------------------------------------------------------------------- - | - | While using one of the framework's cache driven session backends you may - | list a cache store that should be used for these sessions. This value - | must match with one of the application's configured cache "stores". - | - | Affects: "apc", "dynamodb", "memcached", "redis" - | - */ - + * Session Cache Store + * + * While using one of the framework's cache driven session backends you may + * list a cache store that should be used for these sessions. This value + * must match with one of the application's configured cache "stores". + * + * Affects: "apc", "dynamodb", "memcached", "redis" + * + */ 'store' => env('SESSION_STORE'), /* - |-------------------------------------------------------------------------- - | Session Sweeping Lottery - |-------------------------------------------------------------------------- - | - | Some session drivers must manually sweep their storage location to get - | rid of old sessions from storage. Here are the chances that it will - | happen on a given request. By default, the odds are 2 out of 100. - | - */ - + * Session Sweeping Lottery + * + * Some session drivers must manually sweep their storage location to get + * rid of old sessions from storage. Here are the chances that it will + * happen on a given request. By default, the odds are 2 out of 100. + * + */ 'lottery' => [2, 100], /* - |-------------------------------------------------------------------------- - | Session Cookie Name - |-------------------------------------------------------------------------- - | - | Here you may change the name of the cookie used to identify a session - | instance by ID. The name specified here will get used every time a - | new session cookie is created by the framework for every driver. - | - */ - + * Session Cookie Name + * + * Here you may change the name of the cookie used to identify a session + * instance by ID. The name specified here will get used every time a + * new session cookie is created by the framework for every driver. + * + */ 'cookie' => env( 'SESSION_COOKIE', Str::slug(env('APP_NAME', 'laravel'), '_') . '_session' ), /* - |-------------------------------------------------------------------------- - | Session Cookie Path - |-------------------------------------------------------------------------- - | - | The session cookie path determines the path for which the cookie will - | be regarded as available. Typically, this will be the root path of - | your application but you are free to change this when necessary. - | - */ - + * Session Cookie Path + * + * The session cookie path determines the path for which the cookie will + * be regarded as available. Typically, this will be the root path of + * your application, but you are free to change this when necessary. + * + */ 'path' => '/', /* - |-------------------------------------------------------------------------- - | Session Cookie Domain - |-------------------------------------------------------------------------- - | - | Here you may change the domain of the cookie used to identify a session - | in your application. This will determine which domains the cookie is - | available to in your application. A sensible default has been set. - | - */ - + * Session Cookie Domain + * + * Here you may change the domain of the cookie used to identify a session + * in your application. This will determine which domains the cookie is + * available to in your application. A sensible default has been set. + * + */ 'domain' => env('SESSION_DOMAIN'), /* - |-------------------------------------------------------------------------- - | HTTPS Only Cookies - |-------------------------------------------------------------------------- - | - | By setting this option to true, session cookies will only be sent back - | to the server if the browser has a HTTPS connection. This will keep - | the cookie from being sent to you when it can't be done securely. - | - */ - + * HTTPS Only Cookies + * + * By setting this option to true, session cookies will only be sent back + * to the server if the browser has a HTTPS connection. This will keep + * the cookie from being sent to you when it can't be done securely. + * + */ 'secure' => env('SESSION_SECURE_COOKIE'), /* - |-------------------------------------------------------------------------- - | HTTP Access Only - |-------------------------------------------------------------------------- - | - | Setting this value to true will prevent JavaScript from accessing the - | value of the cookie and the cookie will only be accessible through - | the HTTP protocol. You are free to modify this option if needed. - | - */ - + * HTTP Access Only + * + * Setting this value to true will prevent JavaScript from accessing the + * value of the cookie and the cookie will only be accessible through + * the HTTP protocol. You are free to modify this option if needed. + * + */ 'http_only' => true, /* - |-------------------------------------------------------------------------- - | Same-Site Cookies - |-------------------------------------------------------------------------- - | - | This option determines how your cookies behave when cross-site requests - | take place, and can be used to mitigate CSRF attacks. By default, we - | will set this value to "lax" since this is a secure default value. - | - | Supported: "lax", "strict", "none", null - | - */ - + * Same-Site Cookies + * + * This option determines how your cookies behave when cross-site requests + * take place, and can be used to mitigate CSRF attacks. By default, we + * will set this value to "lax" since this is a secure default value. + * + * Supported: "lax", "strict", "none", null + * + */ 'same_site' => 'lax', ]; diff --git a/app/config/view.php b/app/config/view.php index 89d71777..796e1b4d 100644 --- a/app/config/view.php +++ b/app/config/view.php @@ -4,31 +4,25 @@ return [ /* - |-------------------------------------------------------------------------- - | View Storage Paths - |-------------------------------------------------------------------------- - | - | Most templating systems load templates from disk. Here you may specify - | an array of paths that should be checked for your views. Of course - | the usual Laravel view path has already been registered for you. - | - */ - + * View Storage Paths + * + * Most templating systems load templates from disk. Here you may specify + * an array of paths that should be checked for your views. Of course + * the usual Laravel view path has already been registered for you. + * + */ 'paths' => [ resource_path('views'), ], /* - |-------------------------------------------------------------------------- - | Compiled View Path - |-------------------------------------------------------------------------- - | - | This option determines where all the compiled Blade templates will be - | stored for your application. Typically, this is within the storage - | directory. However, as usual, you are free to change this value. - | - */ - + * Compiled View Path + * + * This option determines where all the compiled Blade templates will be + * stored for your application. Typically, this is within the storage + * directory. However, as usual, you are free to change this value. + * + */ 'compiled' => env( 'VIEW_COMPILED_PATH', realpath(storage_path('framework/views')) diff --git a/app/database/factories/UserFactory.php b/app/database/factories/UserFactory.php index a4ad5940..2a28a0e2 100644 --- a/app/database/factories/UserFactory.php +++ b/app/database/factories/UserFactory.php @@ -8,7 +8,7 @@ use Illuminate\Support\Str; /** - * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User> + * @extends \Illuminate\Database\Eloquent\Factories\Factory<\Domain\User\Models\User> */ class UserFactory extends Factory { diff --git a/app/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/app/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php deleted file mode 100644 index 35b7c3a7..00000000 --- a/app/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php +++ /dev/null @@ -1,34 +0,0 @@ -id(); - $table->morphs('tokenable'); - $table->string('name'); - $table->string('token', 64)->unique(); - $table->text('abilities')->nullable(); - $table->timestamp('last_used_at')->nullable(); - $table->timestamp('expires_at')->nullable(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('personal_access_tokens'); - } -}; diff --git a/app/database/seeders/DatabaseSeeder.php b/app/database/seeders/DatabaseSeeder.php index b25c77bd..9f5aa301 100644 --- a/app/database/seeders/DatabaseSeeder.php +++ b/app/database/seeders/DatabaseSeeder.php @@ -14,9 +14,9 @@ class DatabaseSeeder extends Seeder */ public function run(): void { - // \App\Models\User::factory(10)->create(); + // \Domain\User\Models\User::factory(10)->create(); - // \App\Models\User::factory()->create([ + // \Domain\User\Models\User::factory()->create([ // 'name' => 'Test User', // 'email' => 'test@example.com', // ]); diff --git a/app/routes/channels.php b/app/routes/channels.php deleted file mode 100644 index 5d451e1f..00000000 --- a/app/routes/channels.php +++ /dev/null @@ -1,18 +0,0 @@ -id === (int) $id; -}); diff --git a/app/app/Console/Kernel.php b/app/src/Bridge/Laravel/Console/Kernel.php similarity index 95% rename from app/app/Console/Kernel.php rename to app/src/Bridge/Laravel/Console/Kernel.php index 34006820..912d24c1 100644 --- a/app/app/Console/Kernel.php +++ b/app/src/Bridge/Laravel/Console/Kernel.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Console; +namespace Laravel\Console; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; diff --git a/app/app/Exceptions/Handler.php b/app/src/Bridge/Laravel/Exceptions/Handler.php similarity index 96% rename from app/app/Exceptions/Handler.php rename to app/src/Bridge/Laravel/Exceptions/Handler.php index c5564508..d5955d66 100644 --- a/app/app/Exceptions/Handler.php +++ b/app/src/Bridge/Laravel/Exceptions/Handler.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Exceptions; +namespace Laravel\Exceptions; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Throwable; diff --git a/app/app/Http/Controllers/Controller.php b/app/src/Bridge/Laravel/Http/Controllers/Controller.php similarity index 89% rename from app/app/Http/Controllers/Controller.php rename to app/src/Bridge/Laravel/Http/Controllers/Controller.php index 1203bb36..c79a1502 100644 --- a/app/app/Http/Controllers/Controller.php +++ b/app/src/Bridge/Laravel/Http/Controllers/Controller.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Controllers; +namespace Laravel\Http\Controllers; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Validation\ValidatesRequests; diff --git a/app/app/Http/Kernel.php b/app/src/Bridge/Laravel/Http/Kernel.php similarity index 77% rename from app/app/Http/Kernel.php rename to app/src/Bridge/Laravel/Http/Kernel.php index b6cfe5fc..c06c390a 100644 --- a/app/app/Http/Kernel.php +++ b/app/src/Bridge/Laravel/Http/Kernel.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http; +namespace Laravel\Http; use Illuminate\Foundation\Http\Kernel as HttpKernel; @@ -16,12 +16,12 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - // \App\Http\Middleware\TrustHosts::class, - \App\Http\Middleware\TrustProxies::class, + // \Laravel\Http\Middleware\TrustHosts::class, + \Laravel\Http\Middleware\TrustProxies::class, \Illuminate\Http\Middleware\HandleCors::class, - \App\Http\Middleware\PreventRequestsDuringMaintenance::class, + \Laravel\Http\Middleware\PreventRequestsDuringMaintenance::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, - \App\Http\Middleware\TrimStrings::class, + \Laravel\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, ]; @@ -32,11 +32,11 @@ class Kernel extends HttpKernel */ protected $middlewareGroups = [ 'web' => [ - \App\Http\Middleware\EncryptCookies::class, + \Laravel\Http\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, - \App\Http\Middleware\VerifyCsrfToken::class, + \Laravel\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, ], @@ -54,14 +54,14 @@ class Kernel extends HttpKernel * @var array */ protected $middlewareAliases = [ - 'auth' => \App\Http\Middleware\Authenticate::class, + 'auth' => \Laravel\Http\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class, 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, 'can' => \Illuminate\Auth\Middleware\Authorize::class, - 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'guest' => \Laravel\Http\Middleware\RedirectIfAuthenticated::class, 'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class, - 'signed' => \App\Http\Middleware\ValidateSignature::class, + 'signed' => \Laravel\Http\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, ]; diff --git a/app/app/Http/Middleware/Authenticate.php b/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php similarity index 92% rename from app/app/Http/Middleware/Authenticate.php rename to app/src/Bridge/Laravel/Http/Middleware/Authenticate.php index cd4ebd30..eef15624 100644 --- a/app/app/Http/Middleware/Authenticate.php +++ b/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; use Illuminate\Auth\Middleware\Authenticate as Middleware; use Illuminate\Http\Request; diff --git a/app/app/Http/Middleware/EncryptCookies.php b/app/src/Bridge/Laravel/Http/Middleware/EncryptCookies.php similarity index 89% rename from app/app/Http/Middleware/EncryptCookies.php rename to app/src/Bridge/Laravel/Http/Middleware/EncryptCookies.php index b92fc3a4..3d19dec6 100644 --- a/app/app/Http/Middleware/EncryptCookies.php +++ b/app/src/Bridge/Laravel/Http/Middleware/EncryptCookies.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; use Illuminate\Cookie\Middleware\EncryptCookies as Middleware; diff --git a/app/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/app/src/Bridge/Laravel/Http/Middleware/PreventRequestsDuringMaintenance.php similarity index 90% rename from app/app/Http/Middleware/PreventRequestsDuringMaintenance.php rename to app/src/Bridge/Laravel/Http/Middleware/PreventRequestsDuringMaintenance.php index ec896388..a3f938f6 100644 --- a/app/app/Http/Middleware/PreventRequestsDuringMaintenance.php +++ b/app/src/Bridge/Laravel/Http/Middleware/PreventRequestsDuringMaintenance.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware; diff --git a/app/app/Http/Middleware/RedirectIfAuthenticated.php b/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php similarity index 90% rename from app/app/Http/Middleware/RedirectIfAuthenticated.php rename to app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php index 67666da3..70c36c95 100644 --- a/app/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; -use App\Providers\RouteServiceProvider; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Laravel\Providers\RouteServiceProvider; use Symfony\Component\HttpFoundation\Response; class RedirectIfAuthenticated diff --git a/app/app/Http/Middleware/TrimStrings.php b/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php similarity index 91% rename from app/app/Http/Middleware/TrimStrings.php rename to app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php index b538af8a..47a25b88 100644 --- a/app/app/Http/Middleware/TrimStrings.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; diff --git a/app/app/Http/Middleware/TrustHosts.php b/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php similarity index 91% rename from app/app/Http/Middleware/TrustHosts.php rename to app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php index 1a108c3a..042d5c8c 100644 --- a/app/app/Http/Middleware/TrustHosts.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; use Illuminate\Http\Middleware\TrustHosts as Middleware; diff --git a/app/app/Http/Middleware/TrustProxies.php b/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php similarity index 94% rename from app/app/Http/Middleware/TrustProxies.php rename to app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php index 5ec274de..fe0fb8cb 100644 --- a/app/app/Http/Middleware/TrustProxies.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; use Illuminate\Http\Middleware\TrustProxies as Middleware; use Illuminate\Http\Request; diff --git a/app/app/Http/Middleware/ValidateSignature.php b/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php similarity index 92% rename from app/app/Http/Middleware/ValidateSignature.php rename to app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php index 0b3a971f..a5d42ea4 100644 --- a/app/app/Http/Middleware/ValidateSignature.php +++ b/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; use Illuminate\Routing\Middleware\ValidateSignature as Middleware; diff --git a/app/app/Http/Middleware/VerifyCsrfToken.php b/app/src/Bridge/Laravel/Http/Middleware/VerifyCsrfToken.php similarity index 89% rename from app/app/Http/Middleware/VerifyCsrfToken.php rename to app/src/Bridge/Laravel/Http/Middleware/VerifyCsrfToken.php index ca4a6f4d..33b568d0 100644 --- a/app/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/src/Bridge/Laravel/Http/Middleware/VerifyCsrfToken.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Http\Middleware; +namespace Laravel\Http\Middleware; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware; diff --git a/app/app/Providers/AppServiceProvider.php b/app/src/Bridge/Laravel/Providers/AppServiceProvider.php similarity index 92% rename from app/app/Providers/AppServiceProvider.php rename to app/src/Bridge/Laravel/Providers/AppServiceProvider.php index e2fe69d9..ff815775 100644 --- a/app/app/Providers/AppServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/AppServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Providers; +namespace Laravel\Providers; use Illuminate\Support\ServiceProvider; diff --git a/app/app/Providers/AuthServiceProvider.php b/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php similarity index 94% rename from app/app/Providers/AuthServiceProvider.php rename to app/src/Bridge/Laravel/Providers/AuthServiceProvider.php index ec8dd8f8..aefdabaf 100644 --- a/app/app/Providers/AuthServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Providers; +namespace Laravel\Providers; // use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; diff --git a/app/app/Providers/EventServiceProvider.php b/app/src/Bridge/Laravel/Providers/EventServiceProvider.php similarity index 92% rename from app/app/Providers/EventServiceProvider.php rename to app/src/Bridge/Laravel/Providers/EventServiceProvider.php index 0f0a8514..bde320f2 100644 --- a/app/app/Providers/EventServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/EventServiceProvider.php @@ -2,12 +2,11 @@ declare(strict_types=1); -namespace App\Providers; +namespace Laravel\Providers; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; -use Illuminate\Support\Facades\Event; class EventServiceProvider extends ServiceProvider { diff --git a/app/app/Providers/RouteServiceProvider.php b/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php similarity index 97% rename from app/app/Providers/RouteServiceProvider.php rename to app/src/Bridge/Laravel/Providers/RouteServiceProvider.php index b4ccf52e..aa028172 100644 --- a/app/app/Providers/RouteServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Providers; +namespace Laravel\Providers; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; diff --git a/app/app/Models/User.php b/app/src/Domain/User/Models/User.php similarity index 96% rename from app/app/Models/User.php rename to app/src/Domain/User/Models/User.php index 58449cfa..09a63279 100644 --- a/app/app/Models/User.php +++ b/app/src/Domain/User/Models/User.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Models; +namespace Domain\User\Models; // use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Factories\HasFactory;