X-Git-Url: https://git.agnieray.net/?a=blobdiff_plain;f=galette%2Flib%2FGalette%2FMiddleware%2FUpdateAndMaintenance.php;fp=galette%2Flib%2FGalette%2FMiddleware%2FUpdateAndMaintenance.php;h=19343d9975ad33cafeee7e722e960d9c0a2cb0c6;hb=280706510665e680011201e5305f7d3ad9db3411;hp=8f3f60f6cc3eedaba5a32587b5fa598b58a33912;hpb=a3aaea8e88f50171b859c599541603828d388ee4;p=galette.git
diff --git a/galette/lib/Galette/Middleware/UpdateAndMaintenance.php b/galette/lib/Galette/Middleware/UpdateAndMaintenance.php
index 8f3f60f6c..19343d997 100644
--- a/galette/lib/Galette/Middleware/UpdateAndMaintenance.php
+++ b/galette/lib/Galette/Middleware/UpdateAndMaintenance.php
@@ -43,7 +43,7 @@ use Galette\Core\I18n;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Server\RequestHandlerInterface as RequestHandler;
-use Slim\Routing\RouteContext;
+use Slim\Routing\RouteParser;
/**
* Galette's Slim middleware for Update and Maintenance
@@ -74,15 +74,22 @@ class UpdateAndMaintenance
*/
protected $i18n;
+ /**
+ * @var RouteParser
+ */
+ protected RouteParser $routeParser;
+
/**
* Constructor
*
- * @param I18n $i18n I18n instance
- * @param callable|int $callback Callable or local constant
+ * @param I18n $i18n I18n instance
+ * @param RouteParser $routeParser Route parser
+ * @param callable|int $callback Callable or local constant
*/
- public function __construct(I18n $i18n, $callback = self::MAINTENANCE)
+ public function __construct(I18n $i18n, RouteParser $routeParser, callable|int $callback = self::MAINTENANCE)
{
$this->i18n = $i18n;
+ $this->routeParser = $routeParser;
if ($callback === self::MAINTENANCE) {
$this->callback = array($this, 'maintenancePage');
@@ -118,16 +125,14 @@ class UpdateAndMaintenance
/**
* Renders the page
*
- * @param \Psr\Http\Message\ServerRequestInterface $request PSR7 request
- * @param string $contents HTML page contents
+ * @param Request $request PSR7 request
+ * @param string $contents HTML page contents
*
* @return string
*/
private function renderPage(Request $request, $contents)
{
- $routeContext = RouteContext::fromRequest($request);
- $routeParser = $routeContext->getRouteParser();
- $path = $routeParser->urlFor('slash');
+ $path = $this->routeParser->urlFor('slash');
//add ending / if missing
if (
@@ -145,7 +150,6 @@ class UpdateAndMaintenance
" . _T("Galette needs update!") . "
-
@@ -168,7 +172,7 @@ class UpdateAndMaintenance
/**
* Displays maintenance page
*
- * @param \Psr\Http\Message\ServerRequestInterface $request PSR7 request
+ * @param Request $request PSR7 request
*
* @return string
*/
@@ -182,7 +186,7 @@ class UpdateAndMaintenance
/**
* Displays needs update page
*
- * @param \Psr\Http\Message\ServerRequestInterface $request PSR7 request
+ * @param Request $request PSR7 request
*
* @return string
*/