github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-03 04:54:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: provide web friendly session driver name (#3690)

Browse Source
This commit is contained in:
Ian Morland 2022-11-22 17:02:44 +00:00 committed by GitHub
parent e5d2b8cad9
commit 67dd2c21b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Admin/Content/AdminPayload.php
View File

@ -113,7 +113,7 @@ class AdminPayload
} }
$document->payload['queueDriver'] = $this->appInfo->identifyQueueDriver(); $document->payload['queueDriver'] = $this->appInfo->identifyQueueDriver();
$document->payload['sessionDriver'] = $this->appInfo->identifySessionDriver(); $document->payload['sessionDriver'] = $this->appInfo->identifySessionDriver(true);
/** /**
* Used in the admin user list. Implemented as this as it matches the API in flarum/statistics. * Used in the admin user list. Implemented as this as it matches the API in flarum/statistics.

6
framework/core/src/Foundation/ApplicationInfoProvider.php
View File

@ -157,7 +157,7 @@ class ApplicationInfoProvider
* 2. If the configured session driver is invalid, fallback to the default one and mention it. * 2. If the configured session driver is invalid, fallback to the default one and mention it.
* 3. If the actual used driver (i.e `session.handler`) is different from the current one (configured or default), mention it. * 3. If the actual used driver (i.e `session.handler`) is different from the current one (configured or default), mention it.
*/ */
public function identifySessionDriver(): string public function identifySessionDriver(bool $forWeb = false): string
{ {
/* /*
* Get the configured driver and fallback to the default one. * Get the configured driver and fallback to the default one.
@ -190,11 +190,11 @@ class ApplicationInfoProvider
$handlerName = str_replace('sessionhandler', '', $handlerName); $handlerName = str_replace('sessionhandler', '', $handlerName);
if ($driver !== $handlerName) { if ($driver !== $handlerName) {
return "$handlerName <comment>(Code override. Configured to <options=bold,underscore>$configuredDriver</>)</comment>"; return $forWeb ? $handlerName : "$handlerName <comment>(Code override. Configured to <options=bold,underscore>$configuredDriver</>)</comment>";
} }
if ($driver !== $configuredDriver) { if ($driver !== $configuredDriver) {
return "$driver <comment>(Fallback default driver. Configured to invalid driver <options=bold,underscore>$configuredDriver</>)</comment>"; return $forWeb ? $driver : "$driver <comment>(Fallback default driver. Configured to invalid driver <options=bold,underscore>$configuredDriver</>)</comment>";
} }
return $driver; return $driver;