diff --git a/src/Providers/AbstractServiceProvider.php b/src/Providers/AbstractServiceProvider.php index cf703adc..806a07e0 100644 --- a/src/Providers/AbstractServiceProvider.php +++ b/src/Providers/AbstractServiceProvider.php @@ -12,11 +12,11 @@ use LaraStrict\Context\Contexts\AbstractContext; use LaraStrict\Context\Services\ContextEventsService; use LaraStrict\Enums\EnvironmentType; -use LaraStrict\Providers\Pipes\LoadProviderRoutesPipe; +use LaraStrict\Providers\Pipes\BootProviderPoliciesPipe; +use LaraStrict\Providers\Pipes\BootProviderRoutesPipe; +use LaraStrict\Providers\Pipes\BootProviderViewComponents; use LaraStrict\Providers\Pipes\LoadProviderTranslations; -use LaraStrict\Providers\Pipes\LoadProviderViewComponents; use LaraStrict\Providers\Pipes\LoadProviderViews; -use LaraStrict\Providers\Pipes\RegisterProviderPoliciesPipe; abstract class AbstractServiceProvider extends AbstractBaseServiceProvider { @@ -52,7 +52,7 @@ protected function registerPipes(): array protected function bootPipes(): array { - return [LoadProviderRoutesPipe::class, RegisterProviderPoliciesPipe::class, LoadProviderViewComponents::class]; + return [BootProviderRoutesPipe::class, BootProviderPoliciesPipe::class, BootProviderViewComponents::class]; } protected function canRegisterSchedule(): bool diff --git a/src/Providers/Pipes/RegisterProviderPoliciesPipe.php b/src/Providers/Pipes/BootProviderPoliciesPipe.php similarity index 90% rename from src/Providers/Pipes/RegisterProviderPoliciesPipe.php rename to src/Providers/Pipes/BootProviderPoliciesPipe.php index 1bd73587..98d0b534 100644 --- a/src/Providers/Pipes/RegisterProviderPoliciesPipe.php +++ b/src/Providers/Pipes/BootProviderPoliciesPipe.php @@ -10,7 +10,7 @@ use LaraStrict\Contracts\HasPolicies; use LaraStrict\Providers\Entities\AppServiceProviderEntity; -class RegisterProviderPoliciesPipe implements AppServiceProviderPipeContract +class BootProviderPoliciesPipe implements AppServiceProviderPipeContract { public function __construct( private readonly Gate $gate diff --git a/src/Providers/Pipes/LoadProviderRoutesPipe.php b/src/Providers/Pipes/BootProviderRoutesPipe.php similarity index 99% rename from src/Providers/Pipes/LoadProviderRoutesPipe.php rename to src/Providers/Pipes/BootProviderRoutesPipe.php index 95c7bcaa..2d9d3172 100644 --- a/src/Providers/Pipes/LoadProviderRoutesPipe.php +++ b/src/Providers/Pipes/BootProviderRoutesPipe.php @@ -21,7 +21,7 @@ use LogicException; use Psr\Log\LoggerInterface; -class LoadProviderRoutesPipe implements AppServiceProviderPipeContract +class BootProviderRoutesPipe implements AppServiceProviderPipeContract { public function __construct( private readonly Container $container, diff --git a/src/Providers/Pipes/LoadProviderViewComponents.php b/src/Providers/Pipes/BootProviderViewComponents.php similarity index 93% rename from src/Providers/Pipes/LoadProviderViewComponents.php rename to src/Providers/Pipes/BootProviderViewComponents.php index 7109d11e..9f7ab60d 100644 --- a/src/Providers/Pipes/LoadProviderViewComponents.php +++ b/src/Providers/Pipes/BootProviderViewComponents.php @@ -10,7 +10,7 @@ use LaraStrict\Contracts\HasViewComponents; use LaraStrict\Providers\Entities\AppServiceProviderEntity; -class LoadProviderViewComponents implements AppServiceProviderPipeContract +class BootProviderViewComponents implements AppServiceProviderPipeContract { public function __construct( private readonly BladeCompiler $bladeCompiler diff --git a/src/Providers/Pipes/BootViewComposersPipe.php b/src/Providers/Pipes/BootViewComposersPipe.php new file mode 100644 index 00000000..76bf57e6 --- /dev/null +++ b/src/Providers/Pipes/BootViewComposersPipe.php @@ -0,0 +1,33 @@ +serviceProvider instanceof HasViewComposers) { + $appServiceProvider->serviceProvider->bootViewComposers( + serviceName: $appServiceProvider->serviceName, + viewFactory: $this->viewFactory, + ); + } + + $next($appServiceProvider); + } +} diff --git a/tests/Unit/Providers/Pipes/LoadProviderRoutesPipeTest.php b/tests/Unit/Providers/Pipes/LoadProviderRoutesPipeTest.php index 4fffb2e7..381b2b20 100644 --- a/tests/Unit/Providers/Pipes/LoadProviderRoutesPipeTest.php +++ b/tests/Unit/Providers/Pipes/LoadProviderRoutesPipeTest.php @@ -10,7 +10,7 @@ use LaraStrict\Contracts\RegisterNamedCustomRouteActionContract; use LaraStrict\Providers\AbstractServiceProvider; use LaraStrict\Providers\Entities\AppServiceProviderEntity; -use LaraStrict\Providers\Pipes\LoadProviderRoutesPipe; +use LaraStrict\Providers\Pipes\BootProviderRoutesPipe; use LaraStrict\Testing\Laravel\TestingApplication; use LaraStrict\Testing\Laravel\TestingApplicationRoutes; use LaraStrict\Testing\Laravel\TestingContainer; @@ -108,7 +108,7 @@ protected function assertInvalidRoutes( $this->expectExceptionMessage($expectedExceptionMessage); } - $pipe = new LoadProviderRoutesPipe($container, new NullLogger()); + $pipe = new BootProviderRoutesPipe($container, new NullLogger()); $serviceProvider = new class( $app, $customRoutes