[TASK] Remove dummy files from ext:indexed_search 42/20442/3
authorChristian Kuhn <lolli@schwarzbu.ch>
Thu, 2 May 2013 20:08:27 +0000 (22:08 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Fri, 5 Jul 2013 14:53:10 +0000 (16:53 +0200)
* The pi1 script still lives as dummy file since the addPItoST43
  registration fails otherwise.
* modfunc1 and modfunc2 class files still live as dummy files as
  the sub-sub module handling in core fails otherwise.

Change-Id: I21b92a07e7ff83cd1dd3f12b0e15bef7f84691e9
Resolves: #47852
Related: #47756
Releases: 6.2
Reviewed-on: https://review.typo3.org/20442
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
18 files changed:
typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
typo3/sysext/indexed_search/Classes/Indexer.php
typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php
typo3/sysext/indexed_search/class.crawler.php
typo3/sysext/indexed_search/class.doublemetaphone.php [deleted file]
typo3/sysext/indexed_search/class.external_parser.php [deleted file]
typo3/sysext/indexed_search/class.indexer.php [deleted file]
typo3/sysext/indexed_search/class.lexer.php [deleted file]
typo3/sysext/indexed_search/class.tx_indexedsearch_util.php [deleted file]
typo3/sysext/indexed_search/ext_autoload.php [deleted file]
typo3/sysext/indexed_search/hooks/class.tx_indexedsearch_tslib_fe_hook.php [deleted file]
typo3/sysext/indexed_search/mod/index.php
typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php
typo3/sysext/indexed_search/modfunc2/class.tx_indexedsearch_modfunc2.php
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
typo3/sysext/indexed_search_mysql/class.tx_indexedsearch_mysql.php [deleted file]
typo3/sysext/indexed_search_mysql/ext_localconf.php

index d5bf6bd..5904b91 100644 (file)
@@ -23,15 +23,11 @@ namespace TYPO3\CMS\IndexedSearch\Controller;
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
+
 /**
  * Module extension (addition to function menu) 'Indexed search statistics' for the 'indexed_search' extension.
  *
- * @author     Dimitri Ebert <dimitri.ebert@dkd.de>
- */
-/**
- * Module extension (addition to function menu) 'Indexed search statistics' for the 'indexed_search' extension.
- *
- * @author     Dimitri Ebert <dimitri.ebert@dkd.de>
+ * @author Dimitri Ebert <dimitri.ebert@dkd.de>
  */
 class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
index f7d4f31..aca0316 100644 (file)
@@ -52,7 +52,7 @@ class CrawlerHook {
        /**
         * @todo Define visibility
         */
-       public $callBack = 'EXT:indexed_search/class.crawler.php:&TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_crawler';
+       public $callBack = '&TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_crawler';
 
        // The object reference to this class.
        /**
index 398d9ab..5465a28 100644 (file)
@@ -476,12 +476,10 @@ class Indexer {
                        $this->initializeExternalParsers();
                }
                // Initialize lexer (class that deconstructs the text into words):
-               // Example configuration (localconf.php) for this hook: $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] = 'EXT:indexed_search/class.lexer.php:&tx_indexedsearch_lexer';
-               $lexerObjRef = $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] ? $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] : 'EXT:indexed_search/class.lexer.php:&tx_indexedsearch_lexer';
+               $lexerObjRef = $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] ? $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] : 'TYPO3\\CMS\\IndexedSearch\\Lexer';
                $this->lexerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($lexerObjRef);
                $this->lexerObj->debug = $this->indexerConfig['debugMode'];
                // Initialize metaphone hook:
-               // Example configuration (localconf.php) for this hook: $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['metaphone'] = 'EXT:indexed_search/class.doublemetaphone.php:&user_DoubleMetaPhone';
                // Make sure that the hook is loaded _after_ indexed_search as this may overwrite the hook depending on the configuration.
                if ($this->enableMetaphoneSearch && $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['metaphone']) {
                        $this->metaphoneObj = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['metaphone']);
@@ -802,7 +800,7 @@ class Indexer {
                                                                'conf' => $this->conf
                                                        );
                                                        unset($params['conf']['content']);
-                                                       $crawler->addQueueEntry_callBack(0, $params, 'EXT:indexed_search/class.crawler.php:&TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_files', $this->conf['id']);
+                                                       $crawler->addQueueEntry_callBack(0, $params, '&TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_files', $this->conf['id']);
                                                        $this->log_setTSlogMessage('media "' . $params['document'] . '" added to "crawler" queue.', 1);
                                                } else {
                                                        $this->indexRegularDocument($linkInfo['href'], FALSE, $linkSource, $ext);
@@ -814,7 +812,7 @@ class Indexer {
                                                                'conf' => $this->conf
                                                        );
                                                        unset($params['conf']['content']);
-                                                       $crawler->addQueueEntry_callBack(0, $params, 'EXT:indexed_search/class.crawler.php:&TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_files', $this->conf['id']);
+                                                       $crawler->addQueueEntry_callBack(0, $params, '&TYPO3\\CMS\\IndexedSearch\\Controller\\SearchFormController_files', $this->conf['id']);
                                                        $this->log_setTSlogMessage('media "' . $params['document'] . '" added to "crawler" queue.', 1);
                                                } else {
                                                        $this->indexRegularDocument($linkSource);
index cf01de5..aa4bbbc 100644 (file)
@@ -37,8 +37,8 @@ namespace TYPO3\CMS\IndexedSearch\Utility;
  ***************************************************************/
 
 /**
- * TYPO3: Had to change name to "user_DoubleMetaPhone" from just "DoubleMetaPhone" because TYPO3 requires a user class to be prefixed so:
- * TYPO3: If you want to use this metaphone method instead of the default in the class.indexer.php you can enable it in the extension configuration
+ * TYPO3: Had to change name to "\TYPO3\CMS\IndexedSearch\Utility\DoubleMetaPhoneUtility" from just "DoubleMetaPhone" because TYPO3 requires a user class to be prefixed so:
+ * TYPO3: If you want to use this metaphone method instead of the default in the indexer you can enable it in the extension configuration
  * TYPO3: Of course you can write your own metaphone hook methods by taking this class and configuration as example (also see ext_localconf.php)
  */
 class DoubleMetaPhoneUtility {
index eb3ffe2..d798475 100755 (executable)
@@ -24,6 +24,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
+
 /**
  * Crawler hook for indexed search. Works with the "crawler" extension
  *
@@ -34,16 +35,4 @@ if (!is_object($GLOBALS['LANG'])) {
        $GLOBALS['LANG'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Lang\\LanguageService');
        $GLOBALS['LANG']->init($GLOBALS['BE_USER']->uc['lang']);
 }
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_crawler and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Hook/CrawlerHook.php';
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_files and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Hook/CrawlerFilesHook.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Hook/CrawlerFilesHook.php';
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search/class.doublemetaphone.php b/typo3/sysext/indexed_search/class.doublemetaphone.php
deleted file mode 100755 (executable)
index 70667a1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname user_DoubleMetaPhone and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Utility/DoubleMetaPhoneUtility.php';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search/class.external_parser.php b/typo3/sysext/indexed_search/class.external_parser.php
deleted file mode 100755 (executable)
index 8d245ed..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_indexed_search_extparse and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/FileContentParser.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/FileContentParser.php';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search/class.indexer.php b/typo3/sysext/indexed_search/class.indexer.php
deleted file mode 100755 (executable)
index 67b4cd2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_indexer and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Indexer.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Indexer.php';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search/class.lexer.php b/typo3/sysext/indexed_search/class.lexer.php
deleted file mode 100755 (executable)
index 2d1d847..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_lexer and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Lexer.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Lexer.php';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search/class.tx_indexedsearch_util.php b/typo3/sysext/indexed_search/class.tx_indexedsearch_util.php
deleted file mode 100644 (file)
index bdf2743..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_util and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Utility/IndexedSearchUtility.php';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search/ext_autoload.php b/typo3/sysext/indexed_search/ext_autoload.php
deleted file mode 100644 (file)
index e926811..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/*
- * Register necessary class names with autoloader
- */
-$extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search');
-return array(
-       'tx_indexedsearch_indexer' => $extensionPath . 'class.indexer.php',
-       'tx_indexedsearch_util' => $extensionPath . 'class.tx_indexedsearch_util.php'
-);
-?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search/hooks/class.tx_indexedsearch_tslib_fe_hook.php b/typo3/sysext/indexed_search/hooks/class.tx_indexedsearch_tslib_fe_hook.php
deleted file mode 100644 (file)
index 3104fba..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_tslib_fe_hook and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Hook/TypoScriptFrontendHook.php';
-?>
\ No newline at end of file
index 2f5aeca..604d761 100755 (executable)
@@ -24,6 +24,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
+
 /**
  * Module: Indexing Engine Overview
  *
  */
 $BE_USER->modAccess($MCONF, 1);
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('indexed_search', 1);
-/*
- * @deprecated since 6.0, the classname SC_mod_tools_isearch_index and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Controller/ModuleController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Controller/ModuleController.php';
-// Make instance:
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\IndexedSearch\\Controller\\ModuleController');
 $SOBE->init();
 $SOBE->main();
index bacd961..8821ae3 100755 (executable)
@@ -1,36 +1,10 @@
 <?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2001-2013 Kasper Skårhøj (kasperYYYY@typo3.com)
- *  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.
- *
- *  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!
- ***************************************************************/
 /**
- * Module extension (addition to function menu) 'Indexed search' for the 'indexed_search' extension.
+ * This file is empty by intention: At the moment, it is still needed by
+ * TYPO3\CMS\Backend\Module\AbstractFunctionModule and registered as 'path'
+ * in ext_tables.php insertModuleFunction(). See init() method of AbstractFunctionModule
+ * to improve this.
  *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'class.indexer.php';
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_modfunc1 and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
+ * As real class TYPO3\CMS\IndexedSearch\Controller\IndexedPagesController is called.
  */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Controller/IndexedPagesController.php';
 ?>
\ No newline at end of file
index ce513ef..6ef6e05 100644 (file)
@@ -1,8 +1,10 @@
 <?php
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_modfunc2 and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
+/**
+ * This file is empty by intention: At the moment, it is still needed by
+ * TYPO3\CMS\Backend\Module\AbstractFunctionModule and registered as 'path'
+ * in ext_tables.php insertModuleFunction(). See init() method of AbstractFunctionModule
+ * to improve this.
+ *
+ * As real class TYPO3\CMS\IndexedSearch\Controller\IndexingStatisticsController is called.
  */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Controller/IndexingStatisticsController.php';
 ?>
\ No newline at end of file
index 131b637..c75d9b0 100755 (executable)
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
+
 /**
  * Index search frontend
  *
- * Creates a searchform for indexed search. Indexing must be enabled
- * for this to make sense.
+ * Creates a search form for indexed search. Indexing must
+ * be enabled for this to make sense.
  *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @co-author  Christian Jul Jensen <christian@typo3.com>
+ * 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
  */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'class.indexer.php';
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Controller/SearchFormController.php';
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search_mysql/class.tx_indexedsearch_mysql.php b/typo3/sysext/indexed_search_mysql/class.tx_indexedsearch_mysql.php
deleted file mode 100644 (file)
index 5327c36..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_indexedsearch_mysql and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/indexed_search/Classes/Hook/MysqlFulltextIndexHook.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('indexed_search') . 'Classes/Hook/MysqlFulltextIndexHook.php';
-?>
\ No newline at end of file
index 21cb038..4588351 100644 (file)
@@ -3,7 +3,7 @@ if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
 // Configure hook to query the fulltext index
-$TYPO3_CONF_VARS['EXTCONF']['indexed_search']['pi1_hooks']['getResultRows_SQLpointer'] = 'EXT:indexed_search_mysql/class.tx_indexedsearch_mysql.php:&tx_indexedsearch_mysql';
+$TYPO3_CONF_VARS['EXTCONF']['indexed_search']['pi1_hooks']['getResultRows_SQLpointer'] = '&TYPO3\CMS\IndexedSearch\Hook\MysqlFulltextIndexHook';
 // Use all index_* tables except "index_rel" and "index_words"
 $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['use_tables'] = 'index_phash,index_fulltext,index_section,index_grlist,index_stat_search,index_stat_word,index_debug,index_config';
 ?>
\ No newline at end of file