Skip to content

Commit

Permalink
[TASK] Mark various internal TSFE methods as protected
Browse files Browse the repository at this point in the history
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 <typo3@wouterwolters.nl>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
  • Loading branch information
bmack authored and georgringer committed Sep 22, 2021
1 parent 3c4dc4b commit 18c362f
Showing 1 changed file with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ protected function determineIdIsHiddenPage()
* @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();
Expand Down Expand Up @@ -1462,7 +1462,7 @@ public function getPageAccessFailureReasons(string $failureReasonCode = null)
* @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.
Expand Down Expand Up @@ -1905,12 +1905,11 @@ public function getConfigArray(ServerRequestInterface $request = null)
* 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
Expand Down Expand Up @@ -2960,7 +2959,7 @@ public function newCObj(ServerRequestInterface $request = null)
* @see \TYPO3\CMS\Frontend\Http\RequestHandler
* @see INTincScript()
*/
public function setAbsRefPrefix()
protected function setAbsRefPrefix()
{
if (!$this->absRefPrefix) {
return;
Expand Down

0 comments on commit 18c362f

Please sign in to comment.