Commit 18c362f9 authored by Benni Mack's avatar Benni Mack Committed by Georg Ringer
Browse files

[TASK] Mark various internal TSFE methods as protected

Various methods within TypoScripFrontendController
are now "protected" as they are marked as internal.

Resolves: #95315
Releases: master
Change-Id: Iae9691457b250305c617b11fa5f558ac4e55c2b8
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/71179

Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
parent 3c4dc4b8
......@@ -952,7 +952,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
* @internal
* @param ServerRequestInterface|null $request
*/
public function fetch_the_id(ServerRequestInterface $request = null)
protected function fetch_the_id(ServerRequestInterface $request = null)
{
$request = $request ?? $GLOBALS['TYPO3_REQUEST'] ?? ServerRequestFactory::fromGlobals();
$timeTracker = $this->getTimeTracker();
......@@ -1462,7 +1462,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
* @param int $rootPageId Page uid of the page where the found site is located
* @internal
*/
public function getPageAndRootlineWithDomain($rootPageId, ServerRequestInterface $request)
protected function getPageAndRootlineWithDomain($rootPageId, ServerRequestInterface $request)
{
$this->getPageAndRootline($request);
// Checks if the $domain-startpage is in the rootLine. This is necessary so that references to page-id's via ?id=123 from other sites are not possible.
......@@ -1905,12 +1905,11 @@ class TypoScriptFrontendController implements LoggerAwareInterface
* Setting the language key that will be used by the current page.
* In this function it should be checked, 1) that this language exists, 2) that a page_overlay_record exists, .. and if not the default language, 0 (zero), should be set.
*
* @param ServerRequestInterface|null $request
* @param ServerRequestInterface $request
* @internal
*/
public function settingLanguage(ServerRequestInterface $request = null)
protected function settingLanguage(ServerRequestInterface $request)
{
$request = $request ?? $GLOBALS['TYPO3_REQUEST'] ?? ServerRequestFactory::fromGlobals();
$_params = [];
foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['settingLanguage_preProcess'] ?? [] as $_funcRef) {
$ref = $this; // introduced for phpstan to not lose type information when passing $this into callUserFunction
......@@ -2960,7 +2959,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
* @see \TYPO3\CMS\Frontend\Http\RequestHandler
* @see INTincScript()
*/
public function setAbsRefPrefix()
protected function setAbsRefPrefix()
{
if (!$this->absRefPrefix) {
return;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment