[!!!][TASK] Indexed Search: Remove class aliases 19/40119/4
authorMarkus Klein <markus.klein@typo3.org>
Mon, 8 Jun 2015 22:02:31 +0000 (00:02 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Mon, 29 Jun 2015 12:38:09 +0000 (14:38 +0200)
Resolves: #67792
Releases: master
Change-Id: I83a5d93645af8e1bd0a1b6397587c134cca332b0
Reviewed-on: http://review.typo3.org/40119
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/compatibility6/Migrations/Code/LegacyClassesForIde.php
typo3/sysext/core/Documentation/Changelog/master/Breaking-67792-ClassAliasesOfIndexedSearchRemoved.rst [new file with mode: 0644]
typo3/sysext/indexed_search/Migrations/Code/ClassAliasMap.php [deleted file]
typo3/sysext/indexed_search/ext_localconf.php
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php [deleted file]

index bc0b605..efa7447 100644 (file)
@@ -5094,16 +5094,6 @@ class tx_impexp_task extends \TYPO3\CMS\Impexp\Task\ImportExportTask {}
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class Tx_IndexedSearch_Controller_SearchController extends \TYPO3\CMS\IndexedSearch\Controller\SearchController {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tx_indexedsearch extends \TYPO3\CMS\IndexedSearch\Controller\SearchFormController {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
 class tx_indexedsearch_files extends \TYPO3\CMS\IndexedSearch\Hook\CrawlerFilesHook {}
 
 /**
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-67792-ClassAliasesOfIndexedSearchRemoved.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-67792-ClassAliasesOfIndexedSearchRemoved.rst
new file mode 100644 (file)
index 0000000..6e58a23
--- /dev/null
@@ -0,0 +1,32 @@
+==========================================================
+Breaking: #67792 - Class aliases of Indexed Search removed
+==========================================================
+
+Description
+===========
+
+The class aliases of the Indexed Search extension are removed.
+
+
+Impact
+======
+
+These class aliases are not available anymore:
+
+- ``tx_indexedsearch``
+- ``Tx_IndexedSearch_Controller_SearchController``
+
+
+Affected Installations
+======================
+
+Any third party code using the old class aliases.
+
+
+Migration
+=========
+
+Use the new class names:
+
+- ``\TYPO3\CMS\IndexedSearch\Controller\SearchFormController``
+- ``\TYPO3\CMS\IndexedSearch\Controller\SearchController``
diff --git a/typo3/sysext/indexed_search/Migrations/Code/ClassAliasMap.php b/typo3/sysext/indexed_search/Migrations/Code/ClassAliasMap.php
deleted file mode 100644 (file)
index a5ab75c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array(
-       'tx_indexedsearch' => \TYPO3\CMS\IndexedSearch\Controller\SearchFormController::class,
-       'Tx_IndexedSearch_Controller_SearchController' => \TYPO3\CMS\IndexedSearch\Controller\SearchController::class,
-);
\ No newline at end of file
index 120f2bc..608b0e5 100644 (file)
@@ -1,8 +1,23 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43('indexed_search');
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin('indexed_search', 'Pi2', array('Search' => 'form,search'), array('Search' => 'form,search'));
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript(
+       'indexed_search',
+       'setup',
+       trim('
+plugin.tx_indexedsearch = USER_INT
+plugin.tx_indexedsearch.userFunc = ' . \TYPO3\CMS\IndexedSearch\Controller\SearchFormController::class . '->main
+       ')
+);
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript(
+       'indexed_search',
+       'setup',
+       'tt_content.list.20.indexed_search =< plugin.tx_indexedsearch',
+       'defaultContentRendering'
+);
+
+\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin('TYPO3.CMS.indexed_search', 'Pi2', array('Search' => 'form,search'), array('Search' => 'form,search'));
 // Attach to hooks:
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['pageIndexing'][] = \TYPO3\CMS\IndexedSearch\Indexer::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['headerNoCache']['tx_indexedsearch'] = \TYPO3\CMS\IndexedSearch\Hook\TypoScriptFrontendHook::class . '->headerNoCache';
diff --git a/typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php b/typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
deleted file mode 100644 (file)
index 600f1e9..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Index search frontend
- *
- * Creates a search form for indexed search. Indexing must
- * be enabled for this to make sense.
- *
- * This file is empty, the class was moved to Classes/Controller/SearchFormController.php,
- * it is added addPItoST43 in ext_localconf.php to TypoScript and instantiated as its
- * alias tx_indexedsearch
- */