Skip to content

Commit

Permalink
refactor(Providers): Adjust convention for boot pipes - use Boot prefix
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Low conflict - Renamed LoadProviderRoutes Pipe to BootProviderRoutesPipe,
LoadProviderViewComponents Pipe to BootProviderViewComponents and
RegisterProviderPoliciesPipe to BootProviderPoliciesPipe
  • Loading branch information
pionl committed Dec 19, 2022
1 parent 2633e26 commit 25b420d
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 9 deletions.
8 changes: 4 additions & 4 deletions src/Providers/AbstractServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 33 additions & 0 deletions src/Providers/Pipes/BootViewComposersPipe.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

declare(strict_types=1);

namespace LaraStrict\Providers\Pipes;

use Closure;
use Illuminate\Contracts\View\Factory;
use LaraStrict\Contracts\AppServiceProviderPipeContract;
use LaraStrict\Contracts\HasViewComposers;
use LaraStrict\Providers\Entities\AppServiceProviderEntity;

class BootViewComposersPipe implements AppServiceProviderPipeContract
{
public function __construct(
private readonly Factory $viewFactory,
) {
}

public function handle(AppServiceProviderEntity $appServiceProvider, Closure $next): void
{
// We need to load view components to its own namespace because Views/components
// requires lowercase components string (not compatible).
if ($appServiceProvider->serviceProvider instanceof HasViewComposers) {
$appServiceProvider->serviceProvider->bootViewComposers(
serviceName: $appServiceProvider->serviceName,
viewFactory: $this->viewFactory,
);
}

$next($appServiceProvider);
}
}
4 changes: 2 additions & 2 deletions tests/Unit/Providers/Pipes/LoadProviderRoutesPipeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 25b420d

Please sign in to comment.