fix: default Laravel namespace conflict

wayofdev · Jun 11, 2024 · 06406d2 · 06406d2
1 parent 67f58e1
commit 06406d2
Show file tree

Hide file tree

Showing 38 changed files with 60 additions and 160 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -261,108 +261,4 @@
       <code><![CDATA[function () {]]></code>
     </MissingClosureReturnType>
   </file>
-  <file src="vendor/laravel/framework/src/Illuminate/Console/Command.php">
-    <LessSpecificReturnStatement>
-      <code><![CDATA[$this]]></code>
-    </LessSpecificReturnStatement>
-    <MixedArgument>
-      <code><![CDATA[$arguments]]></code>
-      <code><![CDATA[$options]]></code>
-      <code><![CDATA[$this->name = $name]]></code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[(array) $this->aliases]]></code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment>
-      <code><![CDATA[$this->name]]></code>
-    </MixedAssignment>
-    <RedundantCast>
-      <code><![CDATA[(string) $this->help]]></code>
-    </RedundantCast>
-    <RedundantCastGivenDocblockType>
-      <code><![CDATA[(array) $this->aliases]]></code>
-    </RedundantCastGivenDocblockType>
-    <UninitializedProperty>
-      <code><![CDATA[$this->name]]></code>
-    </UninitializedProperty>
-  </file>
-  <file src="vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factories/HasFactory.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[is_callable($count) || is_array($count) ? $count : $state]]></code>
-      <code><![CDATA[is_callable($count) || is_array($count) ? $count : $state]]></code>
-      <code><![CDATA[is_callable($count) || is_array($count) ? $count : $state]]></code>
-    </MixedArgumentTypeCoercion>
-    <RedundantCondition>
-      <code><![CDATA[static::newFactory()]]></code>
-      <code><![CDATA[static::newFactory()]]></code>
-      <code><![CDATA[static::newFactory()]]></code>
-    </RedundantCondition>
-  </file>
-  <file src="vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php">
-    <MissingConstructor>
-      <code><![CDATA[$table]]></code>
-      <code><![CDATA[$table]]></code>
-      <code><![CDATA[$table]]></code>
-    </MissingConstructor>
-  </file>
-  <file src="vendor/laravel/framework/src/Illuminate/Foundation/Application.php">
-    <MissingConstructor>
-      <code><![CDATA[$appPath]]></code>
-      <code><![CDATA[$basePath]]></code>
-      <code><![CDATA[$bootstrapPath]]></code>
-      <code><![CDATA[$configPath]]></code>
-      <code><![CDATA[$databasePath]]></code>
-      <code><![CDATA[$environmentPath]]></code>
-      <code><![CDATA[$langPath]]></code>
-      <code><![CDATA[$publicPath]]></code>
-      <code><![CDATA[$storagePath]]></code>
-    </MissingConstructor>
-  </file>
-  <file src="vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[$model]]></code>
-    </ArgumentTypeCoercion>
-    <MixedArgument>
-      <code><![CDATA[$ability]]></code>
-      <code><![CDATA[$ability]]></code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$model]]></code>
-      <code><![CDATA[$parameter]]></code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment>
-      <code><![CDATA[$ability]]></code>
-    </MixedAssignment>
-    <MixedInferredReturnType>
-      <code><![CDATA[string]]></code>
-    </MixedInferredReturnType>
-    <PossiblyUnusedParam>
-      <code><![CDATA[$request]]></code>
-    </PossiblyUnusedParam>
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[$parameter]]></code>
-    </RiskyTruthyFalsyComparison>
-  </file>
-  <file src="vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php">
-    <DeprecatedProperty>
-      <code><![CDATA[$this->routeMiddleware]]></code>
-    </DeprecatedProperty>
-    <MoreSpecificImplementedParamType>
-      <code><![CDATA[$request]]></code>
-      <code><![CDATA[$request]]></code>
-      <code><![CDATA[$response]]></code>
-    </MoreSpecificImplementedParamType>
-  </file>
-  <file src="vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php">
-    <MixedArgument>
-      <code><![CDATA[$validator->getRulesWithoutPlaceholders()]]></code>
-      <code><![CDATA[$validator->getRulesWithoutPlaceholders()]]></code>
-    </MixedArgument>
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getRulesWithoutPlaceholders]]></code>
-      <code><![CDATA[getRulesWithoutPlaceholders]]></code>
-      <code><![CDATA[setRules]]></code>
-      <code><![CDATA[setRules]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
 </files>
diff --git a/app/psalm.xml b/app/psalm.xml
@@ -21,6 +21,9 @@
         <directory name="src/"/>
         <directory name="tests/"/>
         <directory name="routes/"/>
+        <ignoreFiles>
+            <directory name="vendor/"/>
+        </ignoreFiles>
         <file name=".php-cs-fixer.dist.php"/>
     </projectFiles>
 </psalm>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Laravel\Providers;
+namespace Bridge\Laravel\Providers;
 
 use Illuminate\Support\ServiceProvider;