Skip to content

Commit 06406d2

Browse files
lotyplotyp
committed
fix: default Laravel namespace conflict
1 parent 67f58e1 commit 06406d2

38 files changed

+60
-160
lines changed

‎.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ MEMCACHED_HOST=127.0.0.1
4545
REDIS_HOST=127.0.0.1
4646
REDIS_PASSWORD=null
4747
REDIS_PORT=6379
48+
REDIS_FORWARD_PORT=16379
4849

4950
MAIL_MAILER=smtp
5051
MAIL_HOST=mailpit

‎app/bootstrap/app.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
|
1212
*/
1313

14-
$app = (new Laravel\Application(
14+
$app = (new Bridge\Laravel\Application(
1515
$_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
1616
));
1717

@@ -28,17 +28,17 @@
2828

2929
$app->singleton(
3030
Illuminate\Contracts\Http\Kernel::class,
31-
Laravel\HttpKernel::class
31+
Bridge\Laravel\HttpKernel::class
3232
);
3333

3434
$app->singleton(
3535
Illuminate\Contracts\Console\Kernel::class,
36-
Laravel\ConsoleKernel::class
36+
Bridge\Laravel\ConsoleKernel::class
3737
);
3838

3939
$app->singleton(
4040
Illuminate\Contracts\Debug\ExceptionHandler::class,
41-
Laravel\Exceptions\Handler::class
41+
Bridge\Laravel\Exceptions\Handler::class
4242
);
4343

4444
/*

‎app/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
"prefer-stable": true,
7171
"autoload": {
7272
"psr-4": {
73+
"Bridge\\Laravel\\": "src/Bridge/Laravel/",
7374
"Database\\Factories\\": "database/factories/",
7475
"Database\\Seeders\\": "database/seeders/",
7576
"Domain\\": "src/Domain/",
76-
"Laravel\\": "src/Bridge/Laravel/",
7777
"Support\\": "src/Support/"
7878
}
7979
},

‎app/config/app.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@
108108
/*
109109
* Application Service Providers...
110110
*/
111-
Laravel\Providers\AppServiceProvider::class,
112-
Laravel\Providers\AuthServiceProvider::class,
113-
Laravel\Providers\EventServiceProvider::class,
114-
Laravel\Providers\RouteServiceProvider::class,
111+
Bridge\Laravel\Providers\AppServiceProvider::class,
112+
Bridge\Laravel\Providers\AuthServiceProvider::class,
113+
Bridge\Laravel\Providers\EventServiceProvider::class,
114+
Bridge\Laravel\Providers\RouteServiceProvider::class,
115115

116116
/*
117117
* Domain Service Providers
118118
*/
119-
Laravel\Providers\Domain\UserServiceProvider::class,
120-
Laravel\Providers\Domain\CategoryServiceProvider::class,
121-
Laravel\Providers\Domain\ProductServiceProvider::class,
119+
Bridge\Laravel\Providers\Domain\UserServiceProvider::class,
120+
Bridge\Laravel\Providers\Domain\CategoryServiceProvider::class,
121+
Bridge\Laravel\Providers\Domain\ProductServiceProvider::class,
122122
])->toArray(),
123123

124124
/*

‎app/psalm-baseline.xml

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -261,108 +261,4 @@
261261
<code><![CDATA[function () {]]></code>
262262
</MissingClosureReturnType>
263263
</file>
264-
<file src="vendor/laravel/framework/src/Illuminate/Console/Command.php">
265-
<LessSpecificReturnStatement>
266-
<code><![CDATA[$this]]></code>
267-
</LessSpecificReturnStatement>
268-
<MixedArgument>
269-
<code><![CDATA[$arguments]]></code>
270-
<code><![CDATA[$options]]></code>
271-
<code><![CDATA[$this->name = $name]]></code>
272-
</MixedArgument>
273-
<MixedArgumentTypeCoercion>
274-
<code><![CDATA[(array) $this->aliases]]></code>
275-
</MixedArgumentTypeCoercion>
276-
<MixedAssignment>
277-
<code><![CDATA[$this->name]]></code>
278-
</MixedAssignment>
279-
<RedundantCast>
280-
<code><![CDATA[(string) $this->help]]></code>
281-
</RedundantCast>
282-
<RedundantCastGivenDocblockType>
283-
<code><![CDATA[(array) $this->aliases]]></code>
284-
</RedundantCastGivenDocblockType>
285-
<UninitializedProperty>
286-
<code><![CDATA[$this->name]]></code>
287-
</UninitializedProperty>
288-
</file>
289-
<file src="vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factories/HasFactory.php">
290-
<MixedArgumentTypeCoercion>
291-
<code><![CDATA[is_callable($count) || is_array($count) ? $count : $state]]></code>
292-
<code><![CDATA[is_callable($count) || is_array($count) ? $count : $state]]></code>
293-
<code><![CDATA[is_callable($count) || is_array($count) ? $count : $state]]></code>
294-
</MixedArgumentTypeCoercion>
295-
<RedundantCondition>
296-
<code><![CDATA[static::newFactory()]]></code>
297-
<code><![CDATA[static::newFactory()]]></code>
298-
<code><![CDATA[static::newFactory()]]></code>
299-
</RedundantCondition>
300-
</file>
301-
<file src="vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php">
302-
<MissingConstructor>
303-
<code><![CDATA[$table]]></code>
304-
<code><![CDATA[$table]]></code>
305-
<code><![CDATA[$table]]></code>
306-
</MissingConstructor>
307-
</file>
308-
<file src="vendor/laravel/framework/src/Illuminate/Foundation/Application.php">
309-
<MissingConstructor>
310-
<code><![CDATA[$appPath]]></code>
311-
<code><![CDATA[$basePath]]></code>
312-
<code><![CDATA[$bootstrapPath]]></code>
313-
<code><![CDATA[$configPath]]></code>
314-
<code><![CDATA[$databasePath]]></code>
315-
<code><![CDATA[$environmentPath]]></code>
316-
<code><![CDATA[$langPath]]></code>
317-
<code><![CDATA[$publicPath]]></code>
318-
<code><![CDATA[$storagePath]]></code>
319-
</MissingConstructor>
320-
</file>
321-
<file src="vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php">
322-
<ArgumentTypeCoercion>
323-
<code><![CDATA[$model]]></code>
324-
</ArgumentTypeCoercion>
325-
<MixedArgument>
326-
<code><![CDATA[$ability]]></code>
327-
<code><![CDATA[$ability]]></code>
328-
</MixedArgument>
329-
<MixedArgumentTypeCoercion>
330-
<code><![CDATA[$model]]></code>
331-
<code><![CDATA[$parameter]]></code>
332-
</MixedArgumentTypeCoercion>
333-
<MixedAssignment>
334-
<code><![CDATA[$ability]]></code>
335-
</MixedAssignment>
336-
<MixedInferredReturnType>
337-
<code><![CDATA[string]]></code>
338-
</MixedInferredReturnType>
339-
<PossiblyUnusedParam>
340-
<code><![CDATA[$request]]></code>
341-
</PossiblyUnusedParam>
342-
<RiskyTruthyFalsyComparison>
343-
<code><![CDATA[$parameter]]></code>
344-
</RiskyTruthyFalsyComparison>
345-
</file>
346-
<file src="vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php">
347-
<DeprecatedProperty>
348-
<code><![CDATA[$this->routeMiddleware]]></code>
349-
</DeprecatedProperty>
350-
<MoreSpecificImplementedParamType>
351-
<code><![CDATA[$request]]></code>
352-
<code><![CDATA[$request]]></code>
353-
<code><![CDATA[$response]]></code>
354-
</MoreSpecificImplementedParamType>
355-
</file>
356-
<file src="vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php">
357-
<MixedArgument>
358-
<code><![CDATA[$validator->getRulesWithoutPlaceholders()]]></code>
359-
<code><![CDATA[$validator->getRulesWithoutPlaceholders()]]></code>
360-
</MixedArgument>
361-
<UndefinedInterfaceMethod>
362-
<code><![CDATA[getRulesWithoutPlaceholders]]></code>
363-
<code><![CDATA[getRulesWithoutPlaceholders]]></code>
364-
<code><![CDATA[setRules]]></code>
365-
<code><![CDATA[setRules]]></code>
366-
</UndefinedInterfaceMethod>
367-
</file>
368264
</files>

‎app/psalm.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<directory name="src/"/>
2222
<directory name="tests/"/>
2323
<directory name="routes/"/>
24+
<ignoreFiles>
25+
<directory name="vendor/"/>
26+
</ignoreFiles>
2427
<file name=".php-cs-fixer.dist.php"/>
2528
</projectFiles>
2629
</psalm>

‎app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Admin\Category\Controllers;
5+
namespace Bridge\Laravel\Admin\Category\Controllers;
66

7+
use Bridge\Laravel\Admin\Category\Queries\IndexQuery;
8+
use Bridge\Laravel\Admin\Category\Transformers\CategoryTransformer;
9+
use Bridge\Laravel\Http\Controller;
710
use Domain\Category\Models\Category;
811
use Illuminate\Http\JsonResponse;
9-
use Laravel\Admin\Category\Queries\IndexQuery;
10-
use Laravel\Admin\Category\Transformers\CategoryTransformer;
11-
use Laravel\Http\Controller;
1212
use Spatie\RouteAttributes\Attributes\Resource;
1313

1414
#[Resource(

‎app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Admin\Category\Queries;
5+
namespace Bridge\Laravel\Admin\Category\Queries;
66

77
use Domain\Category\Models\Category;
88
use Illuminate\Http\Request;

‎app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Admin\Category\Transformers;
5+
namespace Bridge\Laravel\Admin\Category\Transformers;
66

77
use Domain\Category\Models\Category;
88
use League\Fractal\TransformerAbstract;

‎app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Admin\Network\Controllers;
5+
namespace Bridge\Laravel\Admin\Network\Controllers;
66

7-
use Laravel\Http\Controller;
7+
use Bridge\Laravel\Http\Controller;
88
use Spatie\RouteAttributes\Attributes\Resource;
99

1010
#[Resource(

‎app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Admin\Product\Controllers;
5+
namespace Bridge\Laravel\Admin\Product\Controllers;
66

7-
use Laravel\Http\Controller;
7+
use Bridge\Laravel\Http\Controller;
88
use Spatie\RouteAttributes\Attributes\Resource;
99

1010
#[Resource(

‎app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Admin\User\Controllers;
5+
namespace Bridge\Laravel\Admin\User\Controllers;
66

7-
use Laravel\Http\Controller;
7+
use Bridge\Laravel\Http\Controller;
88
use Spatie\RouteAttributes\Attributes\Resource;
99

1010
#[Resource(

‎app/src/Bridge/Laravel/Application.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel;
5+
namespace Bridge\Laravel;
66

77
use Illuminate\Foundation\Application as LaravelApplication;
88

99
class Application extends LaravelApplication
1010
{
11-
protected $namespace = 'Laravel\\';
11+
protected $namespace = 'Bridge\\Laravel\\';
1212

1313
public function path($path = ''): string
1414
{

‎app/src/Bridge/Laravel/Console/Commands/DemoCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Console\Commands;
5+
namespace Bridge\Laravel\Console\Commands;
66

77
use Illuminate\Console\Command;
88

‎app/src/Bridge/Laravel/ConsoleKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel;
5+
namespace Bridge\Laravel;
66

77
use Illuminate\Console\Scheduling\Schedule;
88
use Illuminate\Foundation\Console\Kernel as BaseConsoleKernel;

‎app/src/Bridge/Laravel/Exceptions/Handler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Exceptions;
5+
namespace Bridge\Laravel\Exceptions;
66

77
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
88
use Throwable;

‎app/src/Bridge/Laravel/Http/Controller.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Http;
5+
namespace Bridge\Laravel\Http;
66

77
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
88
use Illuminate\Foundation\Validation\ValidatesRequests;

‎app/src/Bridge/Laravel/Http/Middleware/Authenticate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Http\Middleware;
5+
namespace Bridge\Laravel\Http\Middleware;
66

77
use Illuminate\Auth\Middleware\Authenticate as Middleware;
88
use Illuminate\Http\Request;

‎app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Http\Middleware;
5+
namespace Bridge\Laravel\Http\Middleware;
66

7+
use Bridge\Laravel\Providers\RouteServiceProvider;
78
use Closure;
89
use Illuminate\Http\Request;
910
use Illuminate\Support\Facades\Auth;
10-
use Laravel\Providers\RouteServiceProvider;
1111
use Symfony\Component\HttpFoundation\Response;
1212

1313
final class RedirectIfAuthenticated

‎app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Http\Middleware;
5+
namespace Bridge\Laravel\Http\Middleware;
66

77
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
88

‎app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Http\Middleware;
5+
namespace Bridge\Laravel\Http\Middleware;
66

77
use Illuminate\Http\Middleware\TrustHosts as Middleware;
88

‎app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Http\Middleware;
5+
namespace Bridge\Laravel\Http\Middleware;
66

77
use Illuminate\Http\Middleware\TrustProxies as Middleware;
88
use Symfony\Component\HttpFoundation\Request;

‎app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Http\Middleware;
5+
namespace Bridge\Laravel\Http\Middleware;
66

77
use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
88

‎app/src/Bridge/Laravel/HttpKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel;
5+
namespace Bridge\Laravel;
66

77
use Illuminate\Foundation\Http\Kernel;
88

‎app/src/Bridge/Laravel/Providers/AppServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Laravel\Providers;
5+
namespace Bridge\Laravel\Providers;
66

77
use Illuminate\Support\ServiceProvider;
88

0 commit comments

Comments
 (0)