Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[TASK] Move page rendering preparations into middleware
In the course of making TSFE request/response aware, we split the rendering preparations of TSFE into a PSR-15 middleware. This the first step to extract other parts, like redirecting to shortcuts/ mountpoints and sending http headers as well into middleware implementations. Resolves: #84909 Releases: master Change-Id: I704ae89a23c8e254574e19a78ecec363f182c747 Reviewed-on: https://review.typo3.org/56833 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Georg Ringer <georg.ringer@gmail.com> Tested-by: Georg Ringer <georg.ringer@gmail.com> Reviewed-by: Frank Naegler <frank.naegler@typo3.org> Tested-by: Frank Naegler <frank.naegler@typo3.org>
- Loading branch information
Showing
4 changed files
with
93 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
typo3/sysext/frontend/Classes/Middleware/PrepareTypoScriptFrontendRendering.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
<?php | ||
declare(strict_types = 1); | ||
|
||
namespace TYPO3\CMS\Frontend\Middleware; | ||
|
||
/* | ||
* This file is part of the TYPO3 CMS project. | ||
* | ||
* It is free software; you can redistribute it and/or modify it under | ||
* the terms of the GNU General Public License, either version 2 | ||
* of the License, or any later version. | ||
* | ||
* For the full copyright and license information, please read the | ||
* LICENSE.txt file that was distributed with this source code. | ||
* | ||
* The TYPO3 project - inspiring people to share! | ||
*/ | ||
|
||
use Psr\Http\Message\ResponseInterface; | ||
use Psr\Http\Message\ServerRequestInterface; | ||
use Psr\Http\Server\MiddlewareInterface; | ||
use Psr\Http\Server\RequestHandlerInterface as PsrRequestHandlerInterface; | ||
use TYPO3\CMS\Core\TimeTracker\TimeTracker; | ||
use TYPO3\CMS\Core\Utility\GeneralUtility; | ||
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController; | ||
|
||
/** | ||
* Initialization of TypoScriptFrontendController | ||
* | ||
* Do all necessary preparation steps for rendering | ||
*/ | ||
class PrepareTypoScriptFrontendRendering implements MiddlewareInterface | ||
{ | ||
/** | ||
* @var TypoScriptFrontendController | ||
*/ | ||
protected $controller; | ||
|
||
/** | ||
* @var TimeTracker | ||
*/ | ||
protected $timeTracker; | ||
|
||
public function __construct(TypoScriptFrontendController $controller = null, TimeTracker $timeTracker = null) | ||
{ | ||
$this->controller = $controller ?: $GLOBALS['TSFE']; | ||
$this->timeTracker = $timeTracker ?: GeneralUtility::makeInstance(TimeTracker::class); | ||
} | ||
|
||
/** | ||
* Initialize TypoScriptFrontendController to the point right before rendering of the page is triggered | ||
* | ||
* @param ServerRequestInterface $request | ||
* @param PsrRequestHandlerInterface $handler | ||
* @return ResponseInterface | ||
*/ | ||
public function process(ServerRequestInterface $request, PsrRequestHandlerInterface $handler): ResponseInterface | ||
{ | ||
// Starts the template | ||
$this->timeTracker->push('Start Template', ''); | ||
$this->controller->initTemplate(); | ||
$this->timeTracker->pull(); | ||
// Get from cache | ||
$this->timeTracker->push('Get Page from cache', ''); | ||
$this->controller->getFromCache(); | ||
$this->timeTracker->pull(); | ||
// Get config if not already gotten | ||
// After this, we should have a valid config-array ready | ||
$this->controller->getConfigArray(); | ||
// Setting language and locale | ||
$this->timeTracker->push('Setting language and locale', ''); | ||
$this->controller->settingLanguage(); | ||
$this->controller->settingLocale(); | ||
$this->timeTracker->pull(); | ||
|
||
// Convert POST data to utf-8 for internal processing if metaCharset is different | ||
$this->controller->convPOSTCharset(); | ||
|
||
$this->controller->initializeRedirectUrlHandlers(); | ||
$this->controller->handleDataSubmission(); | ||
|
||
return $handler->handle($request); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters