[!!!][TASK] Remove empty classes implementing AbstractTreeView 27/27527/8
authorTymoteusz Motylewski <t.motylewski@gmail.com>
Mon, 10 Feb 2014 16:25:37 +0000 (17:25 +0100)
committerMarkus Klein <klein.t3@mfc-linz.at>
Mon, 24 Feb 2014 18:17:29 +0000 (19:17 +0100)
The tree class hierachie contains 3 empty classes, removed
by the patch:

* \TYPO3\CMS\Rtehtmlarea\ImageFolderTree
* rteFolderTree extends localPageTree in class.browse_links.php
* rtePageTree extends localFoltderTree in class.browse_links.php

Resolves: #55847
Related: #55830
Releases: 6.2
Change-Id: I5d0d92a484c37b6c2812f3350ab3f4dd3dfd15c8
Reviewed-on: https://review.typo3.org/27527
Tested-by: Tymoteusz Motylewski
Reviewed-by: Tymoteusz Motylewski
Reviewed-by: Frans Saris
Tested-by: Frans Saris
Reviewed-by: Markus Klein
Tested-by: Markus Klein
NEWS.md
typo3/class.browse_links.php
typo3/sysext/core/ext_autoload.php
typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
typo3/sysext/rtehtmlarea/Classes/FolderTree.php
typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php [deleted file]
typo3/sysext/rtehtmlarea/Classes/PageTree.php
typo3/sysext/rtehtmlarea/Classes/SelectImage.php
typo3/sysext/rtehtmlarea/Migrations/Code/ClassAliasMap.php

diff --git a/NEWS.md b/NEWS.md
index 61e9590..d2da037 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -158,6 +158,13 @@ the session ID on each request, until it was fixated by a user login.
 The superfluous option "dontSetCookie" is now ineffective as the cookie
 is not set anymore by default.
 
+* No backward compatibility for classes inheriting localPageTree or localFolderTree
+
+Backwards compatibility for extensions that inherit from one of the classes
+localPageTree, localFolderTree, rtefoldertree, rtepagetree, tbe_foldertree or tbe_pagetree
+is dropped.
+
+
 ### Administration / Customization
 
 * Content-length header (TypoScript setting config.enableContentLengthHeader)
index 4cf1670..8857986 100644 (file)
@@ -136,15 +136,6 @@ class localPageTree extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
 }
 
 /**
- * Page tree for the RTE - totally the same, no changes needed. (Just for the sake of beauty - or confusion... :-)
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-class rtePageTree extends localPageTree {
-
-}
-
-/**
  * For TBE record browser
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
@@ -262,15 +253,6 @@ class localFolderTree extends \TYPO3\CMS\Backend\Tree\View\FolderTreeView {
 }
 
 /**
- * Folder tree for the RTE - totally the same, no changes needed. (Just for the sake of beauty - or confusion... :-)
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-class rteFolderTree extends localFolderTree {
-
-}
-
-/**
  * For TBE File Browser
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
index cf4b34e..7e880d9 100644 (file)
@@ -7,8 +7,6 @@ $typo3Classes = array(
        'moveelementlocalpagetree' => PATH_typo3 . 'move_el.php',
        'newrecordlocalpagetree' => PATH_typo3 . 'db_new.php',
        'localfoldertree' => PATH_typo3 . 'class.browse_links.php',
-       'rtefoldertree' => PATH_typo3 . 'class.browse_links.php',
-       'rtepagetree' => PATH_typo3 . 'class.browse_links.php',
        'tbe_foldertree' => PATH_typo3 . 'class.browse_links.php',
        'tbe_pagetree' => PATH_typo3 . 'class.browse_links.php',
        'localpagetree' => PATH_typo3 . 'class.browse_links.php',
index 119c6c9..5edefb6 100644 (file)
@@ -879,7 +879,7 @@ class ElementBrowser {
                        case 'file':
 
                        case 'folder':
-                               $foldertree = GeneralUtility::makeInstance('rteFolderTree');
+                               $foldertree = GeneralUtility::makeInstance('localFolderTree');
                                $foldertree->thisScript = $this->thisScript;
                                $tree = $foldertree->getBrowsableTree();
                                if (!$this->curUrlInfo['value'] || $this->curUrlInfo['act'] != $this->act) {
@@ -1017,7 +1017,7 @@ class ElementBrowser {
                                }
                                break;
                        case 'page':
-                               $pageTree = GeneralUtility::makeInstance('rtePageTree');
+                               $pageTree = GeneralUtility::makeInstance('localPageTree');
                                $pageTree->thisScript = $this->thisScript;
                                $pageTree->ext_showPageId = $GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.showPageIdWithTitle');
                                $pageTree->ext_showNavTitle = $GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.showNavTitle');
index 8fb7461..d86ed10 100644 (file)
@@ -7,7 +7,7 @@ namespace TYPO3\CMS\Rtehtmlarea;
  *
  * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  */
-class FolderTree extends \rteFolderTree {
+class FolderTree extends \localFolderTree {
 
        /**
         * Constructor function of the class
diff --git a/typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php b/typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php
deleted file mode 100644 (file)
index 1cc5b12..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-namespace TYPO3\CMS\Rtehtmlarea;
-
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 1999-2013 Kasper Skårhøj (kasper@typo3.com)
- *  (c) 2004-2013 Stanislas Rolland <typo3(arobas)sjbr.ca>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the text file GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-/**
- * Displays image selector for the RTE
- *
- * @author     Kasper Skårhøj <kasper@typo3.com>
- * @author     Stanislas Rolland <typo3(arobas)sjbr.ca>
- */
-/**
- * Local Folder Tree
- *
- * @author     Kasper Skårhøj <kasper@typo3.com>
- */
-class ImageFolderTree extends FolderTree {
-
-}
index 5d0daaa..fa648a8 100644 (file)
@@ -42,7 +42,7 @@ namespace TYPO3\CMS\Rtehtmlarea;
  *
  * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  */
-class PageTree extends \rtePageTree {
+class PageTree extends \localPageTree {
 
        /**
         * Create the page navigation tree in HTML
index edd50b0..c314295 100644 (file)
@@ -735,7 +735,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
 
                        case 'magic':
                                // Create folder tree:
-                               $foldertree = GeneralUtility::makeInstance('TYPO3\\CMS\\Rtehtmlarea\\ImageFolderTree');
+                               $foldertree = GeneralUtility::makeInstance('TYPO3\\CMS\\Rtehtmlarea\\FolderTree');
                                $foldertree->thisScript = $this->thisScript;
                                $tree = $foldertree->getBrowsableTree();
                                // Get currently selected folder
index b7f502b..3295909 100644 (file)
@@ -44,10 +44,11 @@ return array(
        'tx_rtehtmlarea_deprecatedRteProperties' => 'TYPO3\\CMS\\Rtehtmlarea\\Hook\\Install\\DeprecatedRteProperties',
        'tx_rtehtmlarea_softrefproc' => 'TYPO3\\CMS\\Rtehtmlarea\\Hook\\SoftReferenceHook',
        'tx_rtehtmlarea_statusReport_conflictsCheck' => 'TYPO3\\CMS\\Rtehtmlarea\\Hook\\StatusReportConflictsCheckHook',
-       'tx_rtehtmlarea_image_folderTree' => 'TYPO3\\CMS\\Rtehtmlarea\\ImageFolderTree',
+       'tx_rtehtmlarea_image_folderTree' => 'TYPO3\\CMS\\Rtehtmlarea\\FolderTree',
        'tx_rtehtmlarea_pageTree' => 'TYPO3\\CMS\\Rtehtmlarea\\PageTree',
        'tx_rtehtmlarea_api' => 'TYPO3\\CMS\\Rtehtmlarea\\RteHtmlAreaApi',
        'tx_rtehtmlarea_base' => 'TYPO3\\CMS\\Rtehtmlarea\\RteHtmlAreaBase',
        'tx_rtehtmlarea_select_image' => 'TYPO3\\CMS\\Rtehtmlarea\\SelectImage',
        'tx_rtehtmlarea_user' => 'TYPO3\\CMS\\Rtehtmlarea\\User',
+       'TYPO3\\CMS\\Rtehtmlarea\\ImageFolderTree' => 'TYPO3\\CMS\\Rtehtmlarea\\FolderTree',
 );