Skip to content

Flash Messages are now lists of strings #34

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

Open
wants to merge 2 commits into
base: 1.9.x
Choose a base branch
from
Open

Flash Messages are now lists of strings #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db0a29b
Flash Messages are now lists of strings
gsteel Jan 18, 2024
83ab331
Bump minimum version of mezzio-session to 1.7
gsteel Jan 18, 2024
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
7 changes: 4 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,15 @@
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"mezzio/mezzio-session": "^1.0",
"mezzio/mezzio-session": "^1.7",
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"phpunit/phpunit": "^10.2.2",
"laminas/laminas-diactoros": "^3.3",
"phpunit/phpunit": "^10.5.7",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.13.1"
"vimeo/psalm": "^5.20.0"
},
"autoload": {
"psr-4": {
Expand Down
152 changes: 146 additions & 6 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/FlashMessageMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

namespace Mezzio\Flash;

use Mezzio\Session\RetrieveSession;
use Mezzio\Session\SessionInterface;
use Mezzio\Session\SessionMiddleware;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\MiddlewareInterface;
use Psr\Http\Server\RequestHandlerInterface;

use function is_callable;

class FlashMessageMiddleware implements MiddlewareInterface
final class FlashMessageMiddleware implements MiddlewareInterface
{
public const FLASH_ATTRIBUTE = 'flash';

Expand All @@ -22,8 +22,8 @@ class FlashMessageMiddleware implements MiddlewareInterface

public function __construct(
string $flashMessagesClass = FlashMessages::class,
private string $sessionKey = FlashMessagesInterface::FLASH_NEXT,
private string $attributeKey = self::FLASH_ATTRIBUTE
private readonly string $sessionKey = FlashMessagesInterface::FLASH_NEXT,
private readonly string $attributeKey = self::FLASH_ATTRIBUTE
) {
$factory = [$flashMessagesClass, 'createFromSession'];
if (! is_callable($factory)) {
Expand All @@ -35,7 +35,7 @@ public function __construct(

public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{
$session = $request->getAttribute(SessionMiddleware::SESSION_ATTRIBUTE, false);
$session = RetrieveSession::fromRequestOrNull($request);
if (! $session instanceof SessionInterface) {
throw Exception\MissingSessionException::forMiddleware($this);
}
Expand Down
Loading