[TASK] Revert deprecation introduced by backport 76/57976/2
authorAnja Leichsenring <aleichsenring@ab-softlab.de>
Mon, 20 Aug 2018 20:55:52 +0000 (22:55 +0200)
committerOliver Hader <oliver.hader@typo3.org>
Tue, 21 Aug 2018 06:47:03 +0000 (08:47 +0200)
Remove trigger_error call and according rst file.

Change-Id: Ie383d7de12b27d6ee8f60881538a79120d5ed899
Releases: 8.7
Resolves: #85913
Relates: #83750
Reviewed-on: https://review.typo3.org/57976
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
typo3/sysext/core/Documentation/Changelog/master/Deprecation-83750-AdaptTCASignatureForInlineCustomControl.rst [deleted file]

index 105f982..05b2a29 100644 (file)
@@ -324,7 +324,6 @@ class InlineControlContainer extends AbstractContainer
             $html .= '<div id="' . $nameObject . '_customControls">';
             foreach ($config['customControls'] as $customControlConfig) {
                 if (!isset($customControlConfig['userFunc'])) {
-                    trigger_error('Support for customControl without a userFunc key will be removed in TYPO3 v10.', E_USER_DEPRECATED);
                     $customControlConfig = [
                         'userFunc' => $customControlConfig
                     ];
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-83750-AdaptTCASignatureForInlineCustomControl.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-83750-AdaptTCASignatureForInlineCustomControl.rst
deleted file mode 100644 (file)
index 5c8c83d..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-.. include:: ../../Includes.txt
-
-============================================================
-Deprecation: #83750 - Adapt TCA signature for customControls
-============================================================
-
-See :issue:`83750`
-
-Description
-===========
-
-According to the TCA documentation since TYPO3 v4.7, the definition of "customControls" for "inline" columns
-is as follows:
-
-    Numerical array containing definitions of custom header controls for IRRE fields. This makes it possible to
-    create special controls by calling user-defined functions (userFuncs). Each item in the array item must be
-    an array itself, with at least on key "userFunc" pointing to the user function to call.
-
-The implementation instead relied on the userFunc string being provided as the key of the array.
-
-
-Impact
-======
-
-TCA definition for "inline" fields using custom header controls for IIRE fields will trigger a deprecation:
-
-.. code-block:: php
-
-    'some-column' => [
-        'config' => [
-            'type' => 'inline',
-            // ...
-            'customControls' => [
-                \Vendor\MyExtension\Tca\MyFirstCustomControl::class . '->render',
-                \Vendor\MyExtension\Tca\MySecondCustomControl::class . '->render'
-            ]
-        ]
-    ]
-
-
-Migration
-=========
-
-Update the TCA definition with a `userFunc` key for specifying the method to be called:
-
-.. code-block:: php
-
-    'some-column' => [
-        'config' => [
-            'type' => 'inline',
-            // ...
-            'customControls' => [
-                [
-                    'userFunc' => \Vendor\MyExtension\Tca\MyFirstCustomControl::class . '->render'
-                ],
-                [
-                    'userFunc' => \Vendor\MyExtension\Tca\MySecondCustomControl::class . '->render'
-                ]
-            ]
-        ]
-    ]
-
-
-.. index:: TCA, NotScanned, ext:core