[!!!][TASK] Remove deprecated code from TableController 68/59368/3
authorGeorg Ringer <georg.ringer@gmail.com>
Mon, 7 Jan 2019 20:47:57 +0000 (21:47 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Mon, 7 Jan 2019 21:49:38 +0000 (22:49 +0100)
Resolves: #87360
Releases: master
Change-Id: Iaac2d1242fdc9d9fe71500f816096753266c40a5
Reviewed-on: https://review.typo3.org/59368
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php

index f4f21c3..382e564 100644 (file)
@@ -20,7 +20,6 @@ use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
 use TYPO3\CMS\Backend\Template\ModuleTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait;
 use TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Http\HtmlResponse;
@@ -28,7 +27,6 @@ use TYPO3\CMS\Core\Http\RedirectResponse;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\HttpUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 
 /**
@@ -37,24 +35,6 @@ use TYPO3\CMS\Core\Utility\MathUtility;
  */
 class TableController extends AbstractWizardController
 {
-    use PublicPropertyDeprecationTrait;
-
-    /**
-     * Properties which have been moved to protected status from public
-     *
-     * @var array
-     */
-    protected $deprecatedPublicProperties = [
-        'content' => 'Using $content of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-        'inputStyle' => 'Using $inputStyle of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-        'xmlStorage' => 'Using $xmlStorage of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-        'numNewRows' => 'Using $numNewRows of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-        'colsFieldName' => 'Using $colsFieldName of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-        'P' => 'Using $P of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-        'TABLECFG' => 'Using $TABLECFG of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-        'tableParsing_quote' => 'Using $tableParsing_quote of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-        'tableParsing_delimiter' => 'Using $tableParsing_delimiter of class TableController from the outside is discouraged, as this variable is only used for internal storage.',
-     ];
 
     /**
      * Content accumulation for the module.
@@ -166,125 +146,6 @@ class TableController extends AbstractWizardController
     }
 
     /**
-     * Main function, rendering the table wizard
-     *
-     * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
-     */
-    public function main()
-    {
-        trigger_error('TableController->main() will be replaced by protected method renderContent() in TYPO3 v10.0. Do not call from other extensions.', E_USER_DEPRECATED);
-
-        $response = $this->renderContent($GLOBALS['TYPO3_REQUEST']);
-
-        if ($response instanceof RedirectResponse) {
-            HttpUtility::redirect($response->getHeaders()['location'][0]);
-        }
-    }
-
-    /**
-     * Draws the table wizard content
-     *
-     * @return string HTML content for the form.
-     * @throws \RuntimeException
-     *
-     * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
-     */
-    public function tableWizard()
-    {
-        trigger_error('TableController->tableWizard() will be replaced by protected method renderTableWizard() in TYPO3 v10.0. Do not call from other extensions.', E_USER_DEPRECATED);
-
-        $result = $this->renderTableWizard($GLOBALS['TYPO3_REQUEST']);
-
-        if ($result instanceof RedirectResponse) {
-            HttpUtility::redirect($result->getHeaders()['location'][0]);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Will get and return the configuration code string
-     * Will also save (and possibly redirect/exit) the content if a save button has been pressed
-     *
-     * @param array $row Current parent record row
-     * @return array Table config code in an array
-     *
-     * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
-     */
-    public function getConfigCode($row)
-    {
-        trigger_error('TableController->getConfigCode() will be replaced by protected method getConfiguration() in TYPO3 v10.0. Do not call from other extensions.', E_USER_DEPRECATED);
-
-        $result = $this->getConfiguration($row, $GLOBALS['TYPO3_REQUEST']);
-
-        if ($result instanceof RedirectResponse) {
-            HttpUtility::redirect($result->getHeaders()['location'][0]);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Creates the HTML for the Table Wizard:
-     *
-     * @param array $configuration Table config array
-     * @return string HTML for the table wizard
-     * @internal
-     *
-     * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
-     */
-    public function getTableHTML($configuration)
-    {
-        trigger_error('TableController->getTableHTML() will be replaced by protected method getTableWizard() in TYPO3 v10.0. Do not call from other extensions.', E_USER_DEPRECATED);
-        return $this->getTableWizard($configuration);
-    }
-
-    /**
-     * Detects if a control button (up/down/around/delete) has been pressed for an item and accordingly it will
-     * manipulate the internal TABLECFG array
-     *
-     * @internal
-     *
-     * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
-     */
-    public function changeFunc()
-    {
-        trigger_error('TableController->changeFunc() will be replaced by protected method manipulateTable() in TYPO3 v10.0. Do not call from other extensions.', E_USER_DEPRECATED);
-        $this->manipulateTable();
-    }
-
-    /**
-     * Converts the input array to a configuration code string
-     *
-     * @param array $cfgArr Array of table configuration (follows the input structure from the table wizard POST form)
-     * @return string The array converted into a string with line-based configuration.
-     * @see cfgString2CfgArray()
-     *
-     * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
-     */
-    public function cfgArray2CfgString($cfgArr)
-    {
-        trigger_error('TableController->cfgArray2CfgString() will be replaced by protected method configurationArrayToString() in TYPO3 v10.0. Do not call from other extensions.', E_USER_DEPRECATED);
-        return $this->configurationArrayToString($cfgArr);
-    }
-
-    /**
-     * Converts the input configuration code string into an array
-     *
-     * @param string $configurationCode Configuration code
-     * @param int $columns Default number of columns
-     * @return array Configuration array
-     * @see cfgArray2CfgString()
-     *
-     * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
-     */
-    public function cfgString2CfgArray($configurationCode, $columns)
-    {
-        trigger_error('TableController->cfgString2CfgArray() will be replaced by protected method configurationStringToArray() in TYPO3 v10.0. Do not call from other extensions.', E_USER_DEPRECATED);
-        return $this->configurationStringToArray($configurationCode, $columns);
-    }
-
-    /**
      * Initialization of the class
      *
      * @param ServerRequestInterface $request
index 1588cfc..39e5f8d 100644 (file)
@@ -207,6 +207,12 @@ The following PHP class methods that have been previously deprecated for v9 have
 * :php:`TYPO3\CMS\Backend\Controller\NewRecordController->regularNew()`
 * :php:`TYPO3\CMS\Backend\Controller\NewRecordController->showNewRecLink()`
 * :php:`TYPO3\CMS\Backend\Controller\NewRecordController->sortNewRecordsByConfig()`
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->cfgArray2CfgString()`
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->cfgString2CfgArray()`
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->changeFunc()`
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->getConfigCode()`
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->getTableHTML()`
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->tableWizard()`
 * :php:`TYPO3\CMS\Backend\Controller\UserSettingsController->process()`
 * :php:`TYPO3\CMS\Backend\FrontendBackendUserAuthentication->initializeAdminPanel()`
 * :php:`TYPO3\CMS\Backend\FrontendBackendUserAuthentication->initializeFrontendEdit()`
@@ -780,6 +786,15 @@ The following class properties have changed visibility:
 * :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\Backend\Controller\Wizard\TableController->content` changed from public to protected
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->inputStyle` changed from public to protected
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->xmlStorage` changed from public to protected
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->numNewRows` changed from public to protected
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->colsFieldName` changed from public to protected
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->P` changed from public to protected
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->TABLECFG` changed from public to protected
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->tableParsing_quote` changed from public to protected
+* :php:`TYPO3\CMS\Backend\Controller\Wizard\TableController->tableParsing_delimiter` 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
index 0c0a39a..b74c95c 100644 (file)
@@ -2270,6 +2270,7 @@ return [
         'maximumNumberOfArguments' => 0,
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->getConfigCode' => [
@@ -2277,6 +2278,7 @@ return [
         'maximumNumberOfArguments' => 1,
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->getTableHTML' => [
@@ -2284,6 +2286,7 @@ return [
         'maximumNumberOfArguments' => 1,
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->changeFunc' => [
@@ -2291,6 +2294,7 @@ return [
         'maximumNumberOfArguments' => 0,
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->cfgArray2CfgString' => [
@@ -2298,6 +2302,7 @@ return [
         'maximumNumberOfArguments' => 1,
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->cfgString2CfgArray' => [
@@ -2305,6 +2310,7 @@ return [
         'maximumNumberOfArguments' => 2,
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Rsaauth\RsaEncryptionEncoder->getRsaPublicKey' => [
index 2944bab..0ebf693 100644 (file)
@@ -567,36 +567,43 @@ return [
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->inputStyle' => [
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->xmlStorage' => [
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->numNewRows' => [
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->colsFieldsName' => [
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->TABLECFG' => [
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->tableParsing_quote' => [
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Backend\Controller\Wizard\TableController->tableParsing_delimiter' => [
         'restFiles' => [
             'Deprecation-84338-ProtectedMethodsAndPropertiesInTableController.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList->newWizards' => [