[!!!][TASK] Remove deprecated code from EXT:indexed_search

Resolves: #87308 Releases: master Change-Id: I02a1d3ef914a9618a91f70a6c3a53d5e3bfe9f79 Reviewed-on: https://review.typo3.org/59307 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Benni Mack <benni@typo3.org> Tested-by: Benni Mack <benni@typo3.org> Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
TYPO3 · Dec 30, 2018 · 0e0069e · 0e0069e
1 parent 89d4714
commit 0e0069e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 53 deletions.
diff --git a/...ocumentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst b/...ocumentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
@@ -492,6 +492,8 @@ The following public class properties have been dropped:
 * :php:`TYPO3\CMS\Impexp\Export->maxFileSize`
 * :php:`TYPO3\CMS\Impexp\Export->maxRecordSize`
 * :php:`TYPO3\CMS\Impexp\Export->maxExportSize`
+* :php:`TYPO3\CMS\IndexedSearch\Lexer->csObj`
+* :php:`TYPO3\CMS\IndexedSearch\Indexer->csObj`
 * :php:`TYPO3\CMS\Extbase\Reflection\ClassSchema->addProperty`
 * :php:`TYPO3\CMS\Extbase\Reflection\ClassSchema->setModelType`
 * :php:`TYPO3\CMS\Extbase\Reflection\ClassSchema->getModelType`

diff --git a/typo3/sysext/indexed_search/Classes/Indexer.php b/typo3/sysext/indexed_search/Classes/Indexer.php
@@ -14,7 +14,6 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
@@ -34,15 +33,6 @@
  */
 class Indexer
 {
-    use PublicPropertyDeprecationTrait;
-
-    /**
-     * List of all deprecated public properties
-     * @var array
-     */
-    protected $deprecatedPublicProperties = [
-        'csObj' => 'Using $csObj within Indexing is discouraged, the property will be removed in TYPO3 v10.0 - if needed instantiate CharsetConverter yourself.',
-    ];
 
     /**
      * @var array
@@ -221,14 +211,6 @@ class Indexer
      */
     public $metaphoneContent = '';
 
-    /**
-     * Charset class object
-     *
-     * @var \TYPO3\CMS\Core\Charset\CharsetConverter
-     * @deprecated since TYPO3 v9.3, will be removed in TYPO3 v10.0 (also the instantiation in the init() method).
-     */
-    protected $csObj;
-
     /**
      * Metaphone object, if any
      *
@@ -511,8 +493,6 @@ public function init()
             $this->metaphoneObj = GeneralUtility::makeInstance($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['metaphone']);
             $this->metaphoneObj->pObj = $this;
         }
-        // Init charset class:
-        $this->csObj = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Charset\CharsetConverter::class);
     }
 
     /**

diff --git a/typo3/sysext/indexed_search/Classes/Lexer.php b/typo3/sysext/indexed_search/Classes/Lexer.php
@@ -15,7 +15,6 @@
  */
 
 use TYPO3\CMS\Core\Charset\CharsetConverter;
-use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -25,15 +24,6 @@
  */
 class Lexer
 {
-    use PublicPropertyDeprecationTrait;
-
-    /**
-     * List of all deprecated public properties
-     * @var array
-     */
-    protected $deprecatedPublicProperties = [
-        'csObj' => 'Using $csObj within Indexing is discouraged, the property will be removed in TYPO3 v10.0 - if needed instantiate CharsetConverter yourself.',
-    ];
 
     /**
      * Debugging options:
@@ -49,14 +39,6 @@ class Lexer
      */
     public $debugString = '';
 
-    /**
-     * Charset class object
-     *
-     * @var CharsetConverter
-     * @deprecated since TYPO3 v9.3, will be removed in TYPO3 v10.0 (also the instantiation in the init() method).
-     */
-    public $csObj;
-
     /**
      * Configuration of the lexer:
      *
@@ -70,15 +52,6 @@ class Lexer
         'removeChars' => [45]
     ];
 
-    /**
-     * Constructor: Initializes the charset class
-     */
-    public function __construct()
-    {
-        // @deprecated, can be removed in TYPO3 v10.0.
-        $this->csObj = GeneralUtility::makeInstance(CharsetConverter::class);
-    }
-
     /**
      * Splitting string into words.
      * Used for indexing, can also be used to find words in query.

diff --git a/typo3/sysext/indexed_search/Configuration/TypoScript/setup.typoscript b/typo3/sysext/indexed_search/Configuration/TypoScript/setup.typoscript
@@ -29,9 +29,7 @@ plugin.tx_indexedsearch {
 
 		rootPidList = {$plugin.tx_indexedsearch.settings.rootPidList}
 		page_links = 10
-		# @deprecated left for BC reasons, will be removed in 10
-		detectDomainRcords = 0
-		detectDomainRecords < .detectDomainRcords
+		detectDomainRecords = 0
 		defaultFreeIndexUidList =
 		searchSkipExtendToSubpagesChecking = 0
 		exactCount = 0

diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
@@ -2647,7 +2647,8 @@
         'numberOfMandatoryArguments' => 0,
         'maximumNumberOfArguments' => 0,
         'restFiles' => [
-            'Deprecation-85125-UsagesOfCharsetConverterInCore.rst'
+            'Deprecation-85125-UsagesOfCharsetConverterInCore.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst'
         ],
     ],
     'TYPO3\CMS\Backend\Routing\UriBuilder->buildUriFromModule' => [

diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php
@@ -409,12 +409,14 @@
     ],
     'TYPO3\CMS\IndexedSearch\Lexer->csObj' => [
         'restFiles' => [
-            'Deprecation-85125-UsagesOfCharsetConverterInCore.rst'
+            'Deprecation-85125-UsagesOfCharsetConverterInCore.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst'
         ],
     ],
     'TYPO3\CMS\IndexedSearch\Indexer->csObj' => [
         'restFiles' => [
-            'Deprecation-85125-UsagesOfCharsetConverterInCore.rst'
+            'Deprecation-85125-UsagesOfCharsetConverterInCore.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst'
         ],
     ],
     'TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->showHiddenPage' => [