From 06406d2d6c3587a2b500544de7ba7dd4884e8869 Mon Sep 17 00:00:00 2001 From: lotyp Date: Tue, 11 Jun 2024 03:30:47 +0300 Subject: [PATCH] fix: default Laravel namespace conflict --- .env.example | 1 + app/bootstrap/app.php | 8 +- app/composer.json | 2 +- app/config/app.php | 14 +-- app/psalm-baseline.xml | 104 ------------------ app/psalm.xml | 3 + .../Controllers/CategoryController.php | 8 +- .../Admin/Category/Queries/IndexQuery.php | 2 +- .../Transformers/CategoryTransformer.php | 2 +- .../Network/Controllers/NetworkController.php | 4 +- .../Product/Controllers/ProductController.php | 4 +- .../Admin/User/Controllers/UserController.php | 4 +- app/src/Bridge/Laravel/Application.php | 4 +- .../Laravel/Console/Commands/DemoCommand.php | 2 +- app/src/Bridge/Laravel/ConsoleKernel.php | 2 +- app/src/Bridge/Laravel/Exceptions/Handler.php | 2 +- app/src/Bridge/Laravel/Http/Controller.php | 2 +- .../Laravel/Http/Middleware/Authenticate.php | 2 +- .../Middleware/RedirectIfAuthenticated.php | 4 +- .../Laravel/Http/Middleware/TrimStrings.php | 2 +- .../Laravel/Http/Middleware/TrustHosts.php | 2 +- .../Laravel/Http/Middleware/TrustProxies.php | 2 +- .../Http/Middleware/ValidateSignature.php | 2 +- app/src/Bridge/Laravel/HttpKernel.php | 2 +- .../Laravel/Providers/AppServiceProvider.php | 2 +- .../Laravel/Providers/AuthServiceProvider.php | 2 +- .../Domain/CategoryServiceProvider.php | 2 +- .../Domain/ProductServiceProvider.php | 2 +- .../Providers/Domain/UserServiceProvider.php | 2 +- .../Providers/EventServiceProvider.php | 2 +- .../Providers/RouteServiceProvider.php | 2 +- .../Controllers/CategoryController.php | 4 +- .../Public/Category/Queries/IndexQuery.php | 2 +- .../Network/Controllers/NetworkController.php | 4 +- .../Product/Controllers/ProductController.php | 4 +- .../User/Controllers/UserController.php | 4 +- docker-compose.override.yaml.dist | 2 +- docker-compose.yaml | 2 +- 38 files changed, 60 insertions(+), 160 deletions(-) diff --git a/.env.example b/.env.example index 675eed20..55753c27 100644 --- a/.env.example +++ b/.env.example @@ -45,6 +45,7 @@ MEMCACHED_HOST=127.0.0.1 REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 +REDIS_FORWARD_PORT=16379 MAIL_MAILER=smtp MAIL_HOST=mailpit diff --git a/app/bootstrap/app.php b/app/bootstrap/app.php index a4241bfb..80092013 100644 --- a/app/bootstrap/app.php +++ b/app/bootstrap/app.php @@ -11,7 +11,7 @@ | */ -$app = (new Laravel\Application( +$app = (new Bridge\Laravel\Application( $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__) )); @@ -28,17 +28,17 @@ $app->singleton( Illuminate\Contracts\Http\Kernel::class, - Laravel\HttpKernel::class + Bridge\Laravel\HttpKernel::class ); $app->singleton( Illuminate\Contracts\Console\Kernel::class, - Laravel\ConsoleKernel::class + Bridge\Laravel\ConsoleKernel::class ); $app->singleton( Illuminate\Contracts\Debug\ExceptionHandler::class, - Laravel\Exceptions\Handler::class + Bridge\Laravel\Exceptions\Handler::class ); /* diff --git a/app/composer.json b/app/composer.json index ebb69e60..4e6e1ec1 100644 --- a/app/composer.json +++ b/app/composer.json @@ -70,10 +70,10 @@ "prefer-stable": true, "autoload": { "psr-4": { + "Bridge\\Laravel\\": "src/Bridge/Laravel/", "Database\\Factories\\": "database/factories/", "Database\\Seeders\\": "database/seeders/", "Domain\\": "src/Domain/", - "Laravel\\": "src/Bridge/Laravel/", "Support\\": "src/Support/" } }, diff --git a/app/config/app.php b/app/config/app.php index 97b4b725..d7c31885 100644 --- a/app/config/app.php +++ b/app/config/app.php @@ -108,17 +108,17 @@ /* * Application Service Providers... */ - Laravel\Providers\AppServiceProvider::class, - Laravel\Providers\AuthServiceProvider::class, - Laravel\Providers\EventServiceProvider::class, - Laravel\Providers\RouteServiceProvider::class, + Bridge\Laravel\Providers\AppServiceProvider::class, + Bridge\Laravel\Providers\AuthServiceProvider::class, + Bridge\Laravel\Providers\EventServiceProvider::class, + Bridge\Laravel\Providers\RouteServiceProvider::class, /* * Domain Service Providers */ - Laravel\Providers\Domain\UserServiceProvider::class, - Laravel\Providers\Domain\CategoryServiceProvider::class, - Laravel\Providers\Domain\ProductServiceProvider::class, + Bridge\Laravel\Providers\Domain\UserServiceProvider::class, + Bridge\Laravel\Providers\Domain\CategoryServiceProvider::class, + Bridge\Laravel\Providers\Domain\ProductServiceProvider::class, ])->toArray(), /* diff --git a/app/psalm-baseline.xml b/app/psalm-baseline.xml index 4533b60c..2023d354 100644 --- a/app/psalm-baseline.xml +++ b/app/psalm-baseline.xml @@ -261,108 +261,4 @@ - - - - - - - - name = $name]]> - - - aliases]]> - - - name]]> - - - help]]> - - - aliases]]> - - - name]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - routeMiddleware]]> - - - - - - - - - - getRulesWithoutPlaceholders()]]> - getRulesWithoutPlaceholders()]]> - - - - - - - - diff --git a/app/psalm.xml b/app/psalm.xml index 1109fdf1..22a3e7b5 100644 --- a/app/psalm.xml +++ b/app/psalm.xml @@ -21,6 +21,9 @@ + + + diff --git a/app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php b/app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php index 5728abfd..afdd587c 100644 --- a/app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php +++ b/app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Laravel\Admin\Category\Controllers; +namespace Bridge\Laravel\Admin\Category\Controllers; +use Bridge\Laravel\Admin\Category\Queries\IndexQuery; +use Bridge\Laravel\Admin\Category\Transformers\CategoryTransformer; +use Bridge\Laravel\Http\Controller; use Domain\Category\Models\Category; use Illuminate\Http\JsonResponse; -use Laravel\Admin\Category\Queries\IndexQuery; -use Laravel\Admin\Category\Transformers\CategoryTransformer; -use Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php b/app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php index 619d57db..e3d0af35 100644 --- a/app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php +++ b/app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Admin\Category\Queries; +namespace Bridge\Laravel\Admin\Category\Queries; use Domain\Category\Models\Category; use Illuminate\Http\Request; diff --git a/app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php b/app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php index 9f58102f..251e0c3a 100644 --- a/app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php +++ b/app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Admin\Category\Transformers; +namespace Bridge\Laravel\Admin\Category\Transformers; use Domain\Category\Models\Category; use League\Fractal\TransformerAbstract; diff --git a/app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php b/app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php index 49bc2efe..e5a0c191 100644 --- a/app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php +++ b/app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Admin\Network\Controllers; +namespace Bridge\Laravel\Admin\Network\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php b/app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php index 8a482e7f..54fd158b 100644 --- a/app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php +++ b/app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Admin\Product\Controllers; +namespace Bridge\Laravel\Admin\Product\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php b/app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php index 7444f67a..692b51ad 100644 --- a/app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php +++ b/app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Admin\User\Controllers; +namespace Bridge\Laravel\Admin\User\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Application.php b/app/src/Bridge/Laravel/Application.php index 012fd33d..07e9596d 100644 --- a/app/src/Bridge/Laravel/Application.php +++ b/app/src/Bridge/Laravel/Application.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Laravel; +namespace Bridge\Laravel; use Illuminate\Foundation\Application as LaravelApplication; class Application extends LaravelApplication { - protected $namespace = 'Laravel\\'; + protected $namespace = 'Bridge\\Laravel\\'; public function path($path = ''): string { diff --git a/app/src/Bridge/Laravel/Console/Commands/DemoCommand.php b/app/src/Bridge/Laravel/Console/Commands/DemoCommand.php index b43adbf5..6f27602e 100644 --- a/app/src/Bridge/Laravel/Console/Commands/DemoCommand.php +++ b/app/src/Bridge/Laravel/Console/Commands/DemoCommand.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Console\Commands; +namespace Bridge\Laravel\Console\Commands; use Illuminate\Console\Command; diff --git a/app/src/Bridge/Laravel/ConsoleKernel.php b/app/src/Bridge/Laravel/ConsoleKernel.php index 1f3d5bbc..e9c76873 100644 --- a/app/src/Bridge/Laravel/ConsoleKernel.php +++ b/app/src/Bridge/Laravel/ConsoleKernel.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel; +namespace Bridge\Laravel; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as BaseConsoleKernel; diff --git a/app/src/Bridge/Laravel/Exceptions/Handler.php b/app/src/Bridge/Laravel/Exceptions/Handler.php index d5955d66..13411a89 100644 --- a/app/src/Bridge/Laravel/Exceptions/Handler.php +++ b/app/src/Bridge/Laravel/Exceptions/Handler.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Exceptions; +namespace Bridge\Laravel\Exceptions; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Throwable; diff --git a/app/src/Bridge/Laravel/Http/Controller.php b/app/src/Bridge/Laravel/Http/Controller.php index 18a17ae3..4aab9fd8 100644 --- a/app/src/Bridge/Laravel/Http/Controller.php +++ b/app/src/Bridge/Laravel/Http/Controller.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http; +namespace Bridge\Laravel\Http; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Validation\ValidatesRequests; diff --git a/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php b/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php index b8963833..5f6cf934 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php +++ b/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Auth\Middleware\Authenticate as Middleware; use Illuminate\Http\Request; diff --git a/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php b/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php index 790fc848..aa4c2d55 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; +use Bridge\Laravel\Providers\RouteServiceProvider; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Laravel\Providers\RouteServiceProvider; use Symfony\Component\HttpFoundation\Response; final class RedirectIfAuthenticated diff --git a/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php b/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php index 1d78feca..368d3fe7 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; diff --git a/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php b/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php index 0e2cf1d3..06da29de 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Http\Middleware\TrustHosts as Middleware; diff --git a/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php b/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php index 9704121c..83e70a2c 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Http\Middleware\TrustProxies as Middleware; use Symfony\Component\HttpFoundation\Request; diff --git a/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php b/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php index a4008e86..9aa9bde1 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php +++ b/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Routing\Middleware\ValidateSignature as Middleware; diff --git a/app/src/Bridge/Laravel/HttpKernel.php b/app/src/Bridge/Laravel/HttpKernel.php index 320f8910..b68e49fc 100644 --- a/app/src/Bridge/Laravel/HttpKernel.php +++ b/app/src/Bridge/Laravel/HttpKernel.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel; +namespace Bridge\Laravel; use Illuminate\Foundation\Http\Kernel; diff --git a/app/src/Bridge/Laravel/Providers/AppServiceProvider.php b/app/src/Bridge/Laravel/Providers/AppServiceProvider.php index ac271383..ca129910 100644 --- a/app/src/Bridge/Laravel/Providers/AppServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/AppServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers; +namespace Bridge\Laravel\Providers; use Illuminate\Support\ServiceProvider; diff --git a/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php b/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php index 69b2235d..dbe50839 100644 --- a/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers; +namespace Bridge\Laravel\Providers; // use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; diff --git a/app/src/Bridge/Laravel/Providers/Domain/CategoryServiceProvider.php b/app/src/Bridge/Laravel/Providers/Domain/CategoryServiceProvider.php index f4048777..6a297d15 100644 --- a/app/src/Bridge/Laravel/Providers/Domain/CategoryServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/Domain/CategoryServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers\Domain; +namespace Bridge\Laravel\Providers\Domain; use Domain\Category\Exceptions\CategoryNotFoundException; use Domain\Category\Models\Category; diff --git a/app/src/Bridge/Laravel/Providers/Domain/ProductServiceProvider.php b/app/src/Bridge/Laravel/Providers/Domain/ProductServiceProvider.php index d3dd5abd..d79118a5 100644 --- a/app/src/Bridge/Laravel/Providers/Domain/ProductServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/Domain/ProductServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers\Domain; +namespace Bridge\Laravel\Providers\Domain; use Domain\Product\Exceptions\ProductNotFoundException; use Domain\Product\Models\Product; diff --git a/app/src/Bridge/Laravel/Providers/Domain/UserServiceProvider.php b/app/src/Bridge/Laravel/Providers/Domain/UserServiceProvider.php index 12f0f0f0..28d1f587 100644 --- a/app/src/Bridge/Laravel/Providers/Domain/UserServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/Domain/UserServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers\Domain; +namespace Bridge\Laravel\Providers\Domain; use Domain\User\Exceptions\UserNotFoundException; use Domain\User\Models\User; diff --git a/app/src/Bridge/Laravel/Providers/EventServiceProvider.php b/app/src/Bridge/Laravel/Providers/EventServiceProvider.php index 9af1ec96..ad55c3c1 100644 --- a/app/src/Bridge/Laravel/Providers/EventServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/EventServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers; +namespace Bridge\Laravel\Providers; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; diff --git a/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php b/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php index 37704bc5..f4486fca 100644 --- a/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers; +namespace Bridge\Laravel\Providers; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; diff --git a/app/src/Bridge/Laravel/Public/Category/Controllers/CategoryController.php b/app/src/Bridge/Laravel/Public/Category/Controllers/CategoryController.php index 4924c4e5..d4e2361d 100644 --- a/app/src/Bridge/Laravel/Public/Category/Controllers/CategoryController.php +++ b/app/src/Bridge/Laravel/Public/Category/Controllers/CategoryController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Public\Category\Controllers; +namespace Bridge\Laravel\Public\Category\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Public/Category/Queries/IndexQuery.php b/app/src/Bridge/Laravel/Public/Category/Queries/IndexQuery.php index 20f4f84a..09eea2bf 100644 --- a/app/src/Bridge/Laravel/Public/Category/Queries/IndexQuery.php +++ b/app/src/Bridge/Laravel/Public/Category/Queries/IndexQuery.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Public\Category\Queries; +namespace Bridge\Laravel\Public\Category\Queries; use Domain\Category\Models\Category; use Illuminate\Http\Request; diff --git a/app/src/Bridge/Laravel/Public/Network/Controllers/NetworkController.php b/app/src/Bridge/Laravel/Public/Network/Controllers/NetworkController.php index 1fcdbe64..26b11896 100644 --- a/app/src/Bridge/Laravel/Public/Network/Controllers/NetworkController.php +++ b/app/src/Bridge/Laravel/Public/Network/Controllers/NetworkController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Public\Network\Controllers; +namespace Bridge\Laravel\Public\Network\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Public/Product/Controllers/ProductController.php b/app/src/Bridge/Laravel/Public/Product/Controllers/ProductController.php index 98da7518..e76090f5 100644 --- a/app/src/Bridge/Laravel/Public/Product/Controllers/ProductController.php +++ b/app/src/Bridge/Laravel/Public/Product/Controllers/ProductController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Public\Product\Controllers; +namespace Bridge\Laravel\Public\Product\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Public/User/Controllers/UserController.php b/app/src/Bridge/Laravel/Public/User/Controllers/UserController.php index 57810cb2..b86ae839 100644 --- a/app/src/Bridge/Laravel/Public/User/Controllers/UserController.php +++ b/app/src/Bridge/Laravel/Public/User/Controllers/UserController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Public\User\Controllers; +namespace Bridge\Laravel\Public\User\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/docker-compose.override.yaml.dist b/docker-compose.override.yaml.dist index 58e97077..2f6c67e8 100644 --- a/docker-compose.override.yaml.dist +++ b/docker-compose.override.yaml.dist @@ -12,7 +12,7 @@ services: links: - database external_links: - - "rabbitmq.${PROJECT_SERVICES_NAMESPACE}.alias:rabbitmq" + - "rabbitmq.${COMPOSE_PROJECT_NAME}.alias:rabbitmq" environment: APP_NAME: ${APP_NAME} COMPOSER_AUTH: ${COMPOSER_AUTH} diff --git a/docker-compose.yaml b/docker-compose.yaml index fde9dbd2..c931d722 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: links: - database external_links: - - 'rabbitmq.${PROJECT_SERVICES_NAMESPACE}.alias:rabbitmq' + - 'rabbitmq.${COMPOSE_PROJECT_NAME}.alias:rabbitmq' volumes: - ./app:/app:rw,cached - ./.env:/app/.env