From 24d887dada7037508cac0e2068ea163bab4d0471 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Thu, 17 May 2018 09:29:20 +0200
Subject: [PATCH] [BUGFIX] Keep RecordListController->modTSconfig public

For now, we have to keep property modTSconfig public in
RecordListController since it is used from DatabaseRecordList
via infamous $GLOBALS['SOBE'] and otherwise shows deprecation
notices in list module :(

Resolves: #85030
Related: #85016
Releases: master
Change-Id: I40bdd54a89e2282d8403b633fb08c505b214c338
Reviewed-on: https://review.typo3.org/56987
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
---
 ...n-84993-DeprecateSomeTSconfigRelatedMethods.rst |  1 -
 .../Php/PropertyProtectedMatcher.php               |  5 -----
 .../Classes/Controller/RecordListController.php    | 14 +-------------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-84993-DeprecateSomeTSconfigRelatedMethods.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-84993-DeprecateSomeTSconfigRelatedMethods.rst
index 444263b1fdd2..bfce75b269fa 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-84993-DeprecateSomeTSconfigRelatedMethods.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-84993-DeprecateSomeTSconfigRelatedMethods.rst
@@ -29,7 +29,6 @@ These properties have been set to protected, should not be used any longer and l
 
 * :php:`TYPO3\CMS\backend\Tree\View\PagePositionMap->getModConfigCache`
 * :php:`TYPO3\CMS\backend\Tree\View\PagePositionMap->modConfigStr`
-* :php:`TYPO3\CMS\recordlist\Controller\RecordListController->modTSconfig`
 
 
 Impact
diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php
index 64cf4c80edbe..d4cd724e8f84 100644
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php
@@ -587,9 +587,4 @@ return [
             'Deprecation-84984-ProtectedUserTSconfigPropertiesInBackendUserAuthentication.rst'
         ],
     ],
-    'TYPO3\CMS\recordlist\Controller\RecordListController->modTSconfig' => [
-        'restFiles' => [
-            'Deprecation-84984-ProtectedUserTSconfigPropertiesInBackendUserAuthentication.rst'
-        ],
-    ],
 ];
diff --git a/typo3/sysext/recordlist/Classes/Controller/RecordListController.php b/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
index fd7ba82037ed..42c519902f7e 100644
--- a/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
@@ -23,7 +23,6 @@ use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Template\ModuleTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
-use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
@@ -45,17 +44,6 @@ use TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList;
  */
 class RecordListController
 {
-    use PublicPropertyDeprecationTrait;
-
-    /**
-     * Properties which have been moved to protected status from public
-     *
-     * @var array
-     */
-    protected $deprecatedPublicProperties = [
-        'modTSconfig' => 'Using $modTSconfig of class RecordListController is discouraged. This property is for class internal use only.',
-    ];
-
     /**
      * Page Id for which to make the listing
      *
@@ -145,7 +133,7 @@ class RecordListController
      *
      * @var array
      */
-    protected $modTSconfig;
+    public $modTSconfig;
 
     /**
      * Current ids page record
-- 
GitLab