Commit 0b5d061b authored by Christian Kuhn's avatar Christian Kuhn Committed by Anja Leichsenring
Browse files

[!!!][TASK] Remove deprecated code from PageLayoutController

Resolves: #87270
Releases: master
Change-Id: Ib6016927dbc79f83d4e0f0b57f8e01bc88ddb963
Reviewed-on: https://review.typo3.org/59274

Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: Alexander Schnitzler's avatarAlexander Schnitzler <typo3@alexanderschnitzler.de>
Tested-by: Alexander Schnitzler's avatarAlexander Schnitzler <typo3@alexanderschnitzler.de>
Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
parent 322c73bf
......@@ -25,8 +25,6 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\View\BackendLayoutView;
use TYPO3\CMS\Backend\View\PageLayoutView;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Compatibility\PublicMethodDeprecationTrait;
use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
......@@ -51,52 +49,6 @@ use TYPO3\CMS\Frontend\Page\PageRepository;
*/
class PageLayoutController
{
use PublicMethodDeprecationTrait;
use PublicPropertyDeprecationTrait;
/**
* @var array
*/
private $deprecatedPublicMethods = [
'init' => 'Using PageLayoutController::init() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'main' => 'Using PageLayoutController::main() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'menuConfig' => 'Using PageLayoutController::menuConfig() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'renderContent' => 'Using PageLayoutController::renderContent() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'clearCache' => 'Using PageLayoutController::clearCache() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'getModuleTemplate' => 'Using PageLayoutController::getModuleTemplate() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'getLocalizedPageTitle' => 'Using PageLayoutController::getLocalizedPageTitle() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'getNumberOfHiddenElements' => 'Using PageLayoutController::getNumberOfHiddenElements() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'local_linkThisScript' => 'Using PageLayoutController::local_linkThisScript() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'pageIsNotLockedForEditors' => 'Using PageLayoutController::pageIsNotLockedForEditors() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'contentIsNotLockedForEditors' => 'Using PageLayoutController::contentIsNotLockedForEditors() is deprecated and will not be possible anymore in TYPO3 v10.0.',
];
/**
* @var array
*/
private $deprecatedPublicProperties = [
'pointer' => 'Using PageLayoutController::$pointer is deprecated and will not be possible anymore in TYPO3 v10.0.',
'imagemode' => 'Using PageLayoutController::$imagemode is deprecated and will not be possible anymore in TYPO3 v10.0.',
'search_field' => 'Using PageLayoutController::$search_field is deprecated and will not be possible anymore in TYPO3 v10.0.',
'search_levels' => 'Using PageLayoutController::$search_levels is deprecated and will not be possible anymore in TYPO3 v10.0.',
'showLimit' => 'Using PageLayoutController::$showLimit is deprecated and will not be possible anymore in TYPO3 v10.0.',
'returnUrl' => 'Using PageLayoutController::$returnUrl is deprecated and will not be possible anymore in TYPO3 v10.0.',
'clear_cache' => 'Using PageLayoutController::$clear_cache is deprecated and will not be possible anymore in TYPO3 v10.0.',
'popView' => 'Using PageLayoutController::$popView is deprecated and will not be possible anymore in TYPO3 v10.0.',
'perms_clause' => 'Using PageLayoutController::$perms_clause is deprecated and will not be possible anymore in TYPO3 v10.0.',
'modTSconfig' => 'Using PageLayoutController::$modTSconfig is deprecated and will not be possible anymore in TYPO3 v10.0.',
'modSharedTSconfig' => 'Using PageLayoutController::$modSharedTSconfig is deprecated and will not be possible anymore in TYPO3 v10.0.',
'descrTable' => 'Using PageLayoutController::$descrTable is deprecated and will not be possible anymore in TYPO3 v10.0.',
'colPosList' => 'Using PageLayoutController::$colPosList is deprecated and will not be possible anymore in TYPO3 v10.0.',
'EDIT_CONTENT' => 'Using PageLayoutController::$EDIT_CONTENT is deprecated and will not be possible anymore in TYPO3 v10.0.',
'CALC_PERMS' => 'Using PageLayoutController::$CALC_PERMS is deprecated and will not be possible anymore in TYPO3 v10.0.',
'current_sys_language' => 'Using PageLayoutController::$current_sys_language is deprecated and will not be possible anymore in TYPO3 v10.0.',
'MCONF' => 'Using PageLayoutController::$MCONF is deprecated and will not be possible anymore in TYPO3 v10.0.',
'MOD_MENU' => 'Using PageLayoutController::$MOD_MENU is deprecated and will not be possible anymore in TYPO3 v10.0.',
'content' => 'Using PageLayoutController::$content is deprecated and will not be possible anymore in TYPO3 v10.0.',
'activeColPosList' => 'Using PageLayoutController::$activeColPosList is deprecated and will not be possible anymore in TYPO3 v10.0.',
];
/**
* Page Id for which to make the listing
*
......@@ -321,9 +273,8 @@ class PageLayoutController
* Initializing the module
* @param ServerRequestInterface $request
*/
protected function init(ServerRequestInterface $request = null): void
protected function init(ServerRequestInterface $request): void
{
$request = $request ?: $GLOBALS['TYPO3_REQUEST'];
// Set the GPvars from outside
$parsedBody = $request->getParsedBody();
$queryParams = $request->getQueryParams();
......@@ -367,9 +318,8 @@ class PageLayoutController
* Initialize menu array
* @param ServerRequestInterface $request
*/
protected function menuConfig(ServerRequestInterface $request = null): void
protected function menuConfig(ServerRequestInterface $request): void
{
$request = $request ?: $GLOBALS['TYPO3_REQUEST'];
// Set the GPvars from outside
$parsedBody = $request->getParsedBody();
$queryParams = $request->getQueryParams();
......@@ -718,9 +668,8 @@ class PageLayoutController
*
* @param ServerRequestInterface $request
*/
protected function main(ServerRequestInterface $request = null): void
protected function main(ServerRequestInterface $request): void
{
$request = $request ?: $GLOBALS['TYPO3_REQUEST'];
$lang = $this->getLanguageService();
// Access check...
// The page will show only if there is a valid page and if this page may be viewed by the user
......
......@@ -514,6 +514,17 @@ The following class methods have changed visibility:
* :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->makeEditForm()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->preInit()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->processData()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->clearCache()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->contentIsNotLockedForEditors()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->getLocalizedPageTitle()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->getModuleTemplate()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->getNumberOfHiddenElements()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->init()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->local_linkThisScript()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->main()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->menuConfig()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->pageIsNotLockedForEditors()` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->renderContent()` changed from public to protected
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\BlowfishPasswordHash->base64Encode()` changed from public to protected
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\BlowfishPasswordHash->isValidSalt()` changed from public to protected
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\Md5PasswordHash->base64Encode()` changed from public to protected
......@@ -643,6 +654,26 @@ The following class properties have changed visibility:
* :php:`TYPO3\CMS\Backend\Controller\NewRecordController->tRows` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\NewRecordController->web_list_modTSconfig` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\NewRecordController->web_list_modTSconfig_pid` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->activeColPosList` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->CALC_PERMS` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->clear_cache` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->colPosList` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->content` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->current_sys_language` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->descrTable` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->EDIT_CONTENT` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->imagemode` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->MCONF` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->MOD_MENU` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->modSharedTSconfig` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->modTSconfig` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->perms_clause` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->pointer` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->popView` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->returnUrl` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->search_field` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->search_levels` changed from public to protected
* :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->showLimit` changed from public to protected
* :php:`TYPO3\CMS\Core\Authentication\BackendUserAuthentication->checkWorkspaceCurrent_cache` changed from public to protected
* :php:`TYPO3\CMS\Core\Authentication\BackendUserAuthentication->TSdataArray` changed from public to protected
* :php:`TYPO3\CMS\Core\Authentication\BackendUserAuthentication->userTS` changed from public to protected
......
......@@ -3317,6 +3317,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->getNumberOfHiddenElements' => [
......@@ -3324,6 +3325,7 @@ return [
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->local_linkThisScript' => [
......@@ -3331,6 +3333,7 @@ return [
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->pageIsNotLockedForEditors' => [
......@@ -3338,6 +3341,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->contentIsNotLockedForEditors' => [
......@@ -3345,6 +3349,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Info\Controller\TranslationStatusController->getSystemLanguages' => [
......
......@@ -709,47 +709,56 @@ return [
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->popView' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->modSharedTSconfig' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->colPosList' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->EDIT_CONTENT' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->CALC_PERMS' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->MCONF' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->MOD_MENU' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->current_sys_language' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Backend\Controller\PageLayoutController->activeColPosList' => [
'restFiles' => [
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst'
'Deprecation-84375-ProtectedMethodsAndPropertiesInPageLayoutController.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject->menuNumber' => [
......
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