Skip to content

Commit 31852d8

Browse files
bilfeldtbilfeldt
committed
Remove the spatie package skeleton and fix issues with component namespacing + remove configuration
1 parent 5e53e31 commit 31852d8

File tree

13 files changed

+41
-77
lines changed

13 files changed

+41
-77
lines changed

‎composer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
],
1818
"require": {
1919
"php": "^8.0",
20-
"spatie/laravel-package-tools": "^1.4.3",
2120
"illuminate/contracts": "^8.51 || ^9.0"
2221
},
2322
"require-dev": {

‎config/flash-message.php‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/FlashMessageServiceProvider.php‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,89 +4,78 @@
44

55
use Illuminate\Http\RedirectResponse;
66
use Illuminate\Support\Facades\Blade;
7+
use Illuminate\Support\ServiceProvider;
78
use Illuminate\Support\ViewErrorBag;
89
use Illuminate\View\Factory;
910
use Illuminate\View\View;
10-
use Spatie\LaravelPackageTools\Package;
11-
use Spatie\LaravelPackageTools\PackageServiceProvider;
1211

13-
class FlashMessageServiceProvider extends PackageServiceProvider
12+
class FlashMessageServiceProvider extends ServiceProvider
1413
{
1514
public const VIEW_COMPONENT_NAMESPACE = 'flash';
1615

17-
public function configurePackage(Package $package): void
16+
/**
17+
* Bootstrap any package services.
18+
*
19+
* @return void
20+
*/
21+
public function boot()
1822
{
19-
/*
20-
* This class is a Package Service Provider
21-
*
22-
* More info: https://github.com/spatie/laravel-package-tools
23-
*/
24-
$package
25-
->name('laravel-flash-message')
26-
->hasConfigFile()
27-
->hasViews(); // required for the view component blade files to be registered
28-
// The package does not allow for namespaces (`<x-namespace:component />`) but only prefixes (`<x-prefix-component />`
29-
// so we register those manually using `componentNamespace()`
30-
//->hasViewComponents(
31-
// self::VIEW_COMPONENT_NAMESPACE,
32-
// Messages::class,
33-
// Alert::class,
34-
// AlertError::class,
35-
// AlertInfo::class,
36-
// AlertMessage::class,
37-
// AlertSuccess::class,
38-
// AlertWarning::class
39-
//);
40-
}
23+
$this->loadViewsFrom(__DIR__.'/../resources/views', self::VIEW_COMPONENT_NAMESPACE);
24+
25+
$this->publishes([
26+
__DIR__.'/../resources/views' => resource_path('views/vendor/'.self::VIEW_COMPONENT_NAMESPACE),
27+
]);
28+
29+
$this->publishes([
30+
__DIR__.'/../config/flash-message.php' => config_path('flash-message.php'),
31+
]);
4132

42-
public function packageBooted()
43-
{
4433
Blade::componentNamespace('Bilfeldt\\LaravelFlashMessage\\View\\Components', self::VIEW_COMPONENT_NAMESPACE);
4534

4635
// This is used when adding a message from a controller: view('posts-index')->withMessage(...)
4736
View::macro('withMessage', function (Message $message, string $bag = 'default'): View {
4837
/** @var ViewFlashMessageBag $viewFlashMessageBag */
49-
$viewFlashMessageBag = \Illuminate\Support\Facades\View::shared(config('flash-message.view_share'), new ViewFlashMessageBag());
38+
$viewFlashMessageBag = \Illuminate\Support\Facades\View::shared('messages', new ViewFlashMessageBag());
5039

51-
\Illuminate\Support\Facades\View::share(config('flash-message.view_share'), $viewFlashMessageBag->push($message, $bag));
40+
\Illuminate\Support\Facades\View::share('messages', $viewFlashMessageBag->push($message, $bag));
5241

5342
return $this;
5443
});
5544

5645
// This is used when adding a message from the View Facade: \Illuminate\Support\Facades\View::withMessage(...)
5746
Factory::macro('withMessage', function (Message $message, string $bag = 'default'): Factory {
5847
/** @var ViewFlashMessageBag $viewFlashMessageBag */
59-
$viewFlashMessageBag = \Illuminate\Support\Facades\View::shared(config('flash-message.view_share'), new ViewFlashMessageBag());
48+
$viewFlashMessageBag = \Illuminate\Support\Facades\View::shared('messages', new ViewFlashMessageBag());
6049

61-
\Illuminate\Support\Facades\View::share(config('flash-message.view_share'), $viewFlashMessageBag->push($message, $bag));
50+
\Illuminate\Support\Facades\View::share('messages', $viewFlashMessageBag->push($message, $bag));
6251

6352
return $this;
6453
});
6554

6655
// This is used when adding messages from a controller: view('posts-index')->withMessages(...)
6756
View::macro('withMessages', function (array $messages, string $bag = 'default'): View {
6857
/** @var ViewFlashMessageBag $viewFlashMessageBag */
69-
$viewFlashMessageBag = \Illuminate\Support\Facades\View::shared(config('flash-message.view_share'), new ViewFlashMessageBag());
58+
$viewFlashMessageBag = \Illuminate\Support\Facades\View::shared('messages', new ViewFlashMessageBag());
7059

7160
/** @var \Bilfeldt\LaravelFlashMessage\Message $message */
7261
foreach ($messages as $message) {
7362
$viewFlashMessageBag->push($message, $bag);
7463
}
75-
\Illuminate\Support\Facades\View::share(config('flash-message.view_share'), $viewFlashMessageBag);
64+
\Illuminate\Support\Facades\View::share('messages', $viewFlashMessageBag);
7665

7766
return $this;
7867
});
7968

8069
// This is used when adding messages from the View Facade: \Illuminate\Support\Facades\View::withMessages(...)
8170
Factory::macro('withMessages', function (array $messages, string $bag = 'default'): Factory {
8271
/** @var ViewFlashMessageBag $viewFlashMessageBag */
83-
$viewFlashMessageBag = \Illuminate\Support\Facades\View::shared(config('flash-message.view_share'), new ViewFlashMessageBag());
72+
$viewFlashMessageBag = \Illuminate\Support\Facades\View::shared('messages', new ViewFlashMessageBag());
8473

8574
/** @var \Bilfeldt\LaravelFlashMessage\Message $message */
8675
foreach ($messages as $message) {
8776
$viewFlashMessageBag->push($message, $bag);
8877
}
89-
\Illuminate\Support\Facades\View::share(config('flash-message.view_share'), $viewFlashMessageBag);
78+
\Illuminate\Support\Facades\View::share('messages', $viewFlashMessageBag);
9079

9180
return $this;
9281
});

‎src/Http/Middleware/ShareMessagesFromSession.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function handle($request, Closure $next)
4343
// without having to bind. An empty collection is set when there aren't any messages.
4444
$this->view->share(
4545
'messages',
46-
ViewFlashMessageBag::make($request->session()->get(config('flash-message.session_flash')) ?: [])
46+
ViewFlashMessageBag::make($request->session()->get('messages') ?: [])
4747
);
4848

4949
// Putting the messages in the view for every view allows the developer to just

‎src/View/Components/Alert.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public function render()
2626
{
2727
switch ($this->level) {
2828
case Message::LEVEL_MESSAGE:
29-
return view('flash-message::components.alert-message');
29+
return view('flash::components.alert-message');
3030
case Message::LEVEL_INFO:
31-
return view('flash-message::components.alert-info');
31+
return view('flash::components.alert-info');
3232
case Message::LEVEL_SUCCESS:
33-
return view('flash-message::components.alert-success');
33+
return view('flash::components.alert-success');
3434
case Message::LEVEL_WARNING:
35-
return view('flash-message::components.alert-warning');
35+
return view('flash::components.alert-warning');
3636
case Message::LEVEL_ERROR:
37-
return view('flash-message::components.alert-error');
37+
return view('flash::components.alert-error');
3838
default:
3939
throw new \InvalidArgumentException('Invalid alert level: '.$this->level);
4040
}

‎src/View/Components/AlertError.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ class AlertError extends AbstractAlert
66
{
77
public function render()
88
{
9-
return view('flash-message::components.alert-error');
9+
return view('flash::components.alert-error');
1010
}
1111
}

‎src/View/Components/AlertInfo.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ class AlertInfo extends AbstractAlert
66
{
77
public function render()
88
{
9-
return view('flash-message::components.alert-info');
9+
return view('flash::components.alert-info');
1010
}
1111
}

‎src/View/Components/AlertMessage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ class AlertMessage extends AbstractAlert
66
{
77
public function render()
88
{
9-
return view('flash-message::components.alert-message');
9+
return view('flash::components.alert-message');
1010
}
1111
}

‎src/View/Components/AlertSuccess.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ class AlertSuccess extends AbstractAlert
66
{
77
public function render()
88
{
9-
return view('flash-message::components.alert-success');
9+
return view('flash::components.alert-success');
1010
}
1111
}

‎src/View/Components/AlertWarning.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ class AlertWarning extends AbstractAlert
66
{
77
public function render()
88
{
9-
return view('flash-message::components.alert-warning');
9+
return view('flash::components.alert-warning');
1010
}
1111
}

0 commit comments

Comments
 (0)