Skip to content

Fixed issue with driver not persisting across requests #2

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

Merged
merged 4 commits into from
May 11, 2016
Merged

Fixed issue with driver not persisting across requests #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01ef882
Fixed bug with driver not persisting across requests
DevKingDigital May 11, 2016
7a562ea
Merge pull request #1 from DevKingDigital/notifier-driver-fix
DevKingDigital May 11, 2016
ded9fc3
Make Notifier work with Non-laravel functions
DevKingDigital May 11, 2016
5d55156
Updated composer to match php coveralls version
DevKingDigital May 11, 2016
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"require-dev": {
"phpunit/phpunit": "4.8.*",
"satooshi/php-coveralls": "dev-master"
"satooshi/php-coveralls": "1.0.0"
},
"minimum-stability": "dev"
}
8 changes: 5 additions & 3 deletions src/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function __construct(TemplateParser $parser, Session $session, array $con
public function notify($level, array $attributes = [])
{
if (isset($this->driver['levels'][$level])) {
$this->notifications[] = array_merge(['level' => $this->driver['levels'][$level]], $attributes);
$this->notifications[] = array_merge(['level' => $this->driver['levels'][$level], 'driver' => $this->driver], $attributes);
$this->session->flash('notifications', $this->notifications);

return $this;
Expand Down Expand Up @@ -117,7 +117,9 @@ public function render()
{
if ($notifications = $this->session->get('notifications')) {
foreach ($notifications as $key => $notification) {
$notifications[$key] = $this->parser->parse($this->driver['template'], $notification);
$driver = $notification['driver'];
unset($notification['driver']);
$notifications[$key] = $this->parser->parse($driver['template'], $notification);
}

if ( ! empty($notifications)) {
Expand Down Expand Up @@ -214,4 +216,4 @@ function __toString()
{
return $this->render();
}
}
}