[!!!][TASK] Drop TSFE->dtdAllowsFrames 82/52782/3
authorBenni Mack <benni@typo3.org>
Thu, 11 May 2017 15:41:03 +0000 (17:41 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 12 May 2017 10:39:18 +0000 (12:39 +0200)
The typolink calculation for checking of allowing frames has been encapsulated
in the TypoLinkBuilder extraction, so this public property is also obsolete.

Resolves: #81198
Releases: master
Change-Id: Ic2d0e64a754da983abfd6c9bcaa66884eaa9af35
Reviewed-on: https://review.typo3.org/52782
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/core/Documentation/Changelog/master/Breaking-80700-DeprecatedFunctionalityRemoved.rst
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php

index bdfd6f3..629e44a 100644 (file)
@@ -265,6 +265,7 @@ The following public class properties have been dropped:
 * TYPO3\CMS\Core\Imaging\GraphicalFunctions->tempPath
 * TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject->parentMenuArr
 * TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->compensateFieldWidth
+* TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->dtdAllowsFrames
 * TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->excludeCHashVars
 * TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->scriptParseTime
 * TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->csConvObj
index 11abfbc..455600a 100644 (file)
@@ -787,11 +787,6 @@ class TypoScriptFrontendController
     protected $requestedId;
 
     /**
-     * @var bool
-     */
-    public $dtdAllowsFrames;
-
-    /**
      * Class constructor
      * Takes a number of GET/POST input variable as arguments and stores them internally.
      * The processing of these variables goes on later in this class.
@@ -3135,19 +3130,6 @@ class TypoScriptFrontendController
         $this->initializeSearchWordDataInTsfe();
         // linkVars
         $this->calculateLinkVars();
-        // dtdAllowsFrames indicates whether to use the target attribute in links
-        $this->dtdAllowsFrames = false;
-        if ($this->config['config']['doctype']) {
-            if (in_array(
-                (string)$this->config['config']['doctype'],
-                ['xhtml_trans', 'xhtml_basic', 'html5'],
-                true)
-            ) {
-                $this->dtdAllowsFrames = true;
-            }
-        } else {
-            $this->dtdAllowsFrames = true;
-        }
         // Setting XHTML-doctype from doctype
         if (!$this->config['config']['xhtmlDoctype']) {
             $this->config['config']['xhtmlDoctype'] = $this->config['config']['doctype'];
index 026ff9d..51a915d 100644 (file)
@@ -494,23 +494,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Functional\
     /**
      * @return array
      */
-    protected function getLibParseTarget()
-    {
-        return [
-            'override' => '',
-            'override.' => [
-                'if.' => [
-                    'isTrue.' => [
-                        'data' => 'TSFE:dtdAllowsFrames',
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * @return array
-     */
     protected function getLibParseFunc()
     {
         return [
@@ -519,7 +502,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Functional\
                 'http.' => [
                     'keep' => '{$styles.content.links.keep}',
                     'extTarget' => '',
-                    'extTarget.' => $this->getLibParseTarget(),
                     'mailto.' => [
                         'keep' => 'path',
                     ],
@@ -533,8 +515,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Functional\
                         'parameter.' => [
                             'data' => 'parameters : allParams',
                         ],
-                        'extTarget.' => $this->getLibParseTarget(),
-                        'target.' => $this->getLibParseTarget(),
                     ],
                     'parseFunc.' => [
                         'constants' => '1',
index b8f41d7..270e017 100644 (file)
@@ -2299,23 +2299,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
     /**
      * @return array
      */
-    protected function getLibParseTarget()
-    {
-        return [
-            'override' => '',
-            'override.' => [
-                'if.' => [
-                    'isTrue.' => [
-                        'data' => 'TSFE:dtdAllowsFrames',
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * @return array
-     */
     protected function getLibParseFunc()
     {
         return [
@@ -2324,7 +2307,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
                 'http.' => [
                     'keep' => '{$styles.content.links.keep}',
                     'extTarget' => '',
-                    'extTarget.' => $this->getLibParseTarget(),
                     'mailto.' => [
                         'keep' => 'path',
                     ],
@@ -2338,8 +2320,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
                         'parameter.' => [
                             'data' => 'parameters : allParams',
                         ],
-                        'extTarget.' => $this->getLibParseTarget(),
-                        'target.' => $this->getLibParseTarget(),
                     ],
                     'parseFunc.' => [
                         'constants' => '1',
@@ -2464,13 +2444,6 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
                     'http.' => [
                         'extTarget.' =>  [
                             'override' => '_blank',
-                            'override.' => [
-                                'if.' => [
-                                    'isTrue.' => [
-                                        'data' => 'TSFE:dtdAllowsFrames',
-                                    ],
-                                ],
-                            ],
                         ],
                         'keep' => 'path',
                     ],
@@ -2511,26 +2484,12 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
                         'typolink.' => [
                             'extTarget.' =>  [
                                 'override' => '',
-                                'override.' => [
-                                    'if.' => [
-                                        'isTrue.' => [
-                                            'data' => 'TSFE:dtdAllowsFrames',
-                                        ],
-                                    ],
-                                ],
                             ],
                             'parameter.' => [
                                 'data' => 'parameters : allParams',
                             ],
                             'target.' =>  [
                                 'override' => '',
-                                'override.' => [
-                                    'if.' => [
-                                        'isTrue.' => [
-                                            'data' => 'TSFE:dtdAllowsFrames',
-                                        ],
-                                    ],
-                                ],
                             ],
                         ],
                     ],