Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update FlasherServiceProvider.php for Livewire 3 Compatibility #3

Closed
wants to merge 7 commits into from
Closed

Update FlasherServiceProvider.php for Livewire 3 Compatibility #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14636ce
Update README.md
zsnakeee Oct 23, 2023
4e3dbf3
Update README.md
zsnakeee Oct 23, 2023
e49eb61
Update FlasherServiceProvider.php
zsnakeee Oct 23, 2023
131ee4b
Integrated with livewire v3
zsnakeee Oct 23, 2023
03e2819
Update composer.json
zsnakeee Oct 23, 2023
694732a
Handling livewire v2.x and v3.x
zsnakeee Nov 27, 2023
eb580e9
Update composer.json
zsnakeee Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 53 additions & 22 deletions FlasherServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
use Livewire\Component;
use Livewire\LivewireManager;
use Livewire\Response;
use Livewire\Mechanisms\HandleComponents\ComponentContext;

/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
Expand Down Expand Up @@ -204,7 +205,7 @@ private function registerTranslations()
{
/** @var \Illuminate\Translation\Translator $translator */
$translator = $this->app->make('translator');
$translator->addNamespace('flasher', __DIR__.'/Translation/lang');
$translator->addNamespace('flasher', __DIR__ . '/Translation/lang');
}

/**
Expand All @@ -221,29 +222,59 @@ private function registerLivewire()
return;
}

$livewire->listen('component.dehydrate.subsequent', function (Component $component, Response $response) {
if (isset($response->effects['redirect'])) {
return;
}

/** @var FlasherInterface $flasher */
$flasher = app('flasher');

/** @var array{envelopes: Envelope[]} $data */
$data = $flasher->render(array(), 'array');
//try for livewrie v2.x
try {
$livewire->listen('component.dehydrate.subsequent', function (Component $component, Response $response) {
if (isset($response->effects['redirect'])) {
return;
}

/** @var FlasherInterface $flasher */
$flasher = app('flasher');

/** @var array{envelopes: Envelope[]} $data */
$data = $flasher->render(array(), 'array');

if (\count($data['envelopes']) > 0) {
$data['context']['livewire'] = array(
'id' => $component->id,
'name' => $response->fingerprint['name'],
);

$response->effects['dispatches'][] = array(
'event' => 'flasher:render',
'data' => $data,
);
}
});
} catch (Exception $e) {
} finally { //if catched error try for livewire v3.x
$livewire->listen('dehydrate', function (Component $component, ComponentContext $context) {
if (isset($response->effects['redirect'])) {
return;
}

/** @var FlasherInterface $flasher */
$flasher = app('flasher');

/** @var array{envelopes: Envelope[]} $data */
$data = $flasher->render(array(), 'array');

if (\count($data['envelopes']) > 0) {
$data['context']['livewire'] = array(
'id' => $component->id(),
'name' => $component->getName(),
);

$context->addEffect('dispatches', array([
'name' => 'flasher:render',
'params' => $data,
]));
}
});
}

if (\count($data['envelopes']) > 0) {
$data['context']['livewire'] = array(
'id' => $component->id,
'name' => $response->fingerprint['name'],
);

$response->effects['dispatches'][] = array(
'event' => 'flasher:render',
'data' => $data,
);
}
});
}

/**
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<p align="center"> Enhanced Laravel Flasher for Livewire 3</p>

<p align="center">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/php-flasher/art/main/php-flasher-github-dark.png">
Expand Down
114 changes: 107 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "php-flasher/flasher-laravel",
"name": "php-flasher/php-flasher",
"description": "PHPFlasher - A powerful & easy-to-use package for adding flash messages to Laravel or Symfony projects. Provides feedback to users, improves engagement & enhances user experience. Intuitive design for beginners & experienced developers. A reliable, flexible solution.",
"license": "MIT",
"type": "library",
Expand Down Expand Up @@ -34,31 +34,131 @@
"role": "Developer"
}
],
"homepage": "https://php-flasher.io",
"require": {
"php": ">=5.3",
"php": ">=5.3"
},
"require-dev": {
"ext-json": "*",
"ext-mbstring": "*",
"ergebnis/composer-normalize": "^2.31",
"friendsofphp/php-cs-fixer": "^3.17",
"illuminate/routing": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
"illuminate/support": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
"php-flasher/flasher": "^1.15.3"
"livewire/livewire": "^2.12.3",
"orchestra/testbench": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
"phpro/grumphp": "^1.16",
"phpstan/phpstan": "^1.10.16",
"phpunit/phpunit": "^10.2.1",
"symfony/config": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/console": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/dependency-injection": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/framework-bundle": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/http-kernel": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/translation": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/twig-bundle": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symplify/monorepo-builder": "^11.2.3.72",
"vimeo/psalm": "^5.12"
},
"replace": {
"php-flasher/flasher": "self.version",
"php-flasher/flasher-cli": "self.version",
"php-flasher/flasher-cli-laravel": "self.version",
"php-flasher/flasher-cli-symfony": "self.version",
"php-flasher/flasher-laravel": "self.version",
"php-flasher/flasher-noty": "self.version",
"php-flasher/flasher-noty-laravel": "self.version",
"php-flasher/flasher-noty-symfony": "self.version",
"php-flasher/flasher-notyf": "self.version",
"php-flasher/flasher-notyf-laravel": "self.version",
"php-flasher/flasher-notyf-symfony": "self.version",
"php-flasher/flasher-pnotify": "self.version",
"php-flasher/flasher-pnotify-laravel": "self.version",
"php-flasher/flasher-pnotify-symfony": "self.version",
"php-flasher/flasher-sweetalert": "self.version",
"php-flasher/flasher-sweetalert-laravel": "self.version",
"php-flasher/flasher-sweetalert-symfony": "self.version",
"php-flasher/flasher-symfony": "self.version",
"php-flasher/flasher-toastr": "self.version",
"php-flasher/flasher-toastr-laravel": "self.version",
"php-flasher/flasher-toastr-symfony": "self.version"
},
"minimum-stability": "stable",
"prefer-stable": true,
"autoload": {
"psr-4": {
"Flasher\\Laravel\\": ""
"Flasher\\": "src/",
"Flasher\\Cli\\Laravel\\": "src/Cli/Laravel/",
"Flasher\\Cli\\Prime\\": "src/Cli/Prime/",
"Flasher\\Cli\\Symfony\\": "src/Cli/Symfony/",
"Flasher\\Laravel\\": "src/Laravel/",
"Flasher\\Noty\\Laravel\\": "src/Noty/Laravel/",
"Flasher\\Noty\\Prime\\": "src/Noty/Prime/",
"Flasher\\Noty\\Symfony\\": "src/Noty/Symfony/",
"Flasher\\Notyf\\Laravel\\": "src/Notyf/Laravel/",
"Flasher\\Notyf\\Prime\\": "src/Notyf/Prime/",
"Flasher\\Notyf\\Symfony\\": "src/Notyf/Symfony/",
"Flasher\\Pnotify\\Laravel\\": "src/Pnotify/Laravel/",
"Flasher\\Pnotify\\Prime\\": "src/Pnotify/Prime/",
"Flasher\\Pnotify\\Symfony\\": "src/Pnotify/Symfony/",
"Flasher\\Prime\\": "src/Prime/",
"Flasher\\SweetAlert\\Laravel\\": "src/SweetAlert/Laravel/",
"Flasher\\SweetAlert\\Prime\\": "src/SweetAlert/Prime/",
"Flasher\\SweetAlert\\Symfony\\": "src/SweetAlert/Symfony/",
"Flasher\\Symfony\\": "src/Symfony/",
"Flasher\\Toastr\\Laravel\\": "src/Toastr/Laravel/",
"Flasher\\Toastr\\Prime\\": "src/Toastr/Prime/",
"Flasher\\Toastr\\Symfony\\": "src/Toastr/Symfony/"
},
"files": [
"src/Cli/Prime/helpers.php",
"src/Noty/Prime/helpers.php",
"src/Notyf/Prime/helpers.php",
"src/Pnotify/Prime/helpers.php",
"src/Prime/helpers.php",
"src/SweetAlert/Prime/helpers.php",
"src/Toastr/Prime/helpers.php"
]
},
"autoload-dev": {
"psr-4": {
"Flasher\\Tests\\": "tests/"
}
},
"config": {
"allow-plugins": {
"ergebnis/composer-normalize": true,
"kylekatarnls/update-helper": true,
"phpro/grumphp": true
},
"preferred-install": "dist",
"sort-packages": true
},
"extra": {
"laravel": {
"aliases": {
"Flasher": "Flasher\\Laravel\\Facade\\Flasher"
"Flasher": "Flasher\\Laravel\\Facade\\Flasher",
"Noty": "Flasher\\Laravel\\Facade\\Flasher",
"Notyf": "Flasher\\Notyf\\Laravel\\Facade\\Notyf",
"Pnotify": "Flasher\\Pnotify\\Laravel\\Facade\\Pnotify",
"SweetAlert": "Flasher\\SweetAlert\\Laravel\\Facade\\SweetAlert",
"Toastr": "Flasher\\Toastr\\Laravel\\Facade\\Toastr"
},
"providers": [
"Flasher\\Laravel\\FlasherServiceProvider"
"Flasher\\Cli\\Laravel\\FlasherCliServiceProvider",
"Flasher\\Toastr\\Laravel\\FlasherToastrServiceProvider",
"Flasher\\Laravel\\FlasherServiceProvider",
"Flasher\\Noty\\Laravel\\FlasherNotyServiceProvider",
"Flasher\\Pnotify\\Laravel\\FlasherPnotifyServiceProvider",
"Flasher\\Notyf\\Laravel\\FlasherNotyfServiceProvider",
"Flasher\\SweetAlert\\Laravel\\FlasherSweetAlertServiceProvider"
]
}
},
"scripts": {
"check-syntax": "test `find ./src -iname \"*.php\" | xargs -n1 -P6 php -l | grep -Fv \"No syntax errors\" | wc -l` -eq 0",
"lint": "git diff --staged | php ./vendor/bin/grumphp run",
"normalize-composer": "find src -name \"composer.json\" -exec composer normalize {} \\;",
"normalize-packs": "find packs -name \"composer.json\" -exec composer normalize {} \\;",
"validate-composer": "find src -name \"composer.json\" -exec composer validate --strict {} \\;"
}
}
Loading