From 2f7123c489dd171a15aeaf0ec09494eaa2b34c92 Mon Sep 17 00:00:00 2001
From: Sorin Loghin <sorin.loghin@in2code.de>
Date: Thu, 13 Feb 2020 10:13:26 +0100
Subject: [PATCH 1/3] [TASK] Replace deprecated calls to ContentObjectRenderer

---
 Classes/helpers/class.tx_caretaker_LocalizationHelper.php     | 2 +-
 Classes/services/tests/class.tx_caretaker_TestServiceBase.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Classes/helpers/class.tx_caretaker_LocalizationHelper.php b/Classes/helpers/class.tx_caretaker_LocalizationHelper.php
index fda80ccc..fe5dea64 100644
--- a/Classes/helpers/class.tx_caretaker_LocalizationHelper.php
+++ b/Classes/helpers/class.tx_caretaker_LocalizationHelper.php
@@ -73,7 +73,7 @@ public static function localizeString($locallangString)
                     // FE
                     if ($GLOBALS['TSFE']) {
                         $lcObj = GeneralUtility::makeInstance('TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer');
-                        $result = $lcObj->TEXT(array('data' => $locallangString));
+                        $result = $lcObj->cObjGetSingle('TEXT',array('data' => $locallangString));
                     } // eID
                     else {
                         /** @var \TYPO3\CMS\Lang\LanguageService $LANG */
diff --git a/Classes/services/tests/class.tx_caretaker_TestServiceBase.php b/Classes/services/tests/class.tx_caretaker_TestServiceBase.php
index 94b63680..4d94d6ca 100644
--- a/Classes/services/tests/class.tx_caretaker_TestServiceBase.php
+++ b/Classes/services/tests/class.tx_caretaker_TestServiceBase.php
@@ -272,7 +272,7 @@ protected function locallizeString($locallang_string)
             case 'FE':
                 $lcObj = GeneralUtility::makeInstance('TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer');
 
-                return $lcObj->TEXT(array('data' => $locallang_string));
+                return $lcObj->cObjGetSingle('TEXT', array('data' => $locallang_string));
 
             case 'BE':
                 $locallang_key = array_pop($locallang_parts);

From 5d524cf662c8d6b351a5011287cfad760706bf8d Mon Sep 17 00:00:00 2001
From: Sorin Loghin <sorin.loghin@in2code.de>
Date: Thu, 13 Feb 2020 10:18:03 +0100
Subject: [PATCH 2/3] [TASK] Codestyle fix

---
 Classes/helpers/class.tx_caretaker_LocalizationHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/helpers/class.tx_caretaker_LocalizationHelper.php b/Classes/helpers/class.tx_caretaker_LocalizationHelper.php
index fe5dea64..e1c5cf47 100644
--- a/Classes/helpers/class.tx_caretaker_LocalizationHelper.php
+++ b/Classes/helpers/class.tx_caretaker_LocalizationHelper.php
@@ -73,7 +73,7 @@ public static function localizeString($locallangString)
                     // FE
                     if ($GLOBALS['TSFE']) {
                         $lcObj = GeneralUtility::makeInstance('TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer');
-                        $result = $lcObj->cObjGetSingle('TEXT',array('data' => $locallangString));
+                        $result = $lcObj->cObjGetSingle('TEXT', array('data' => $locallangString));
                     } // eID
                     else {
                         /** @var \TYPO3\CMS\Lang\LanguageService $LANG */

From 750f23b7d77f4224ba2b130ef93b055b0ceef229 Mon Sep 17 00:00:00 2001
From: Sorin Loghin <sorin.loghin@in2code.de>
Date: Fri, 14 Feb 2020 14:18:27 +0100
Subject: [PATCH 3/3] [TASK] Fix TCA configuration for plugins

---
 Configuration/TCA/Overrides/tt_content.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
index ff65dbb3..b5f155d3 100644
--- a/Configuration/TCA/Overrides/tt_content.php
+++ b/Configuration/TCA/Overrides/tt_content.php
@@ -1,14 +1,14 @@
 <?php
 
 // overview
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY . '_pi_overview'] = 'layout,select_key,pages';
-$TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY . '_pi_overview'] = 'pi_flexform';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['caretaker_pi_overview'] = 'layout,select_key,pages';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['caretaker_pi_overview'] = 'pi_flexform';
 // singleview
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY . '_pi_singleview'] = 'layout,select_key,pages';
-$TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY . '_pi_singleview'] = 'pi_flexform';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['caretaker_pi_singleview'] = 'layout,select_key,pages';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['caretaker_pi_singleview'] = 'pi_flexform';
 // graphreport
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY . '_pi_graphreport'] = 'layout,select_key,pages';
-$TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY . '_pi_graphreport'] = 'pi_flexform';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['caretaker_pi_graphreport'] = 'layout,select_key,pages';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['caretaker_pi_graphreport'] = 'pi_flexform';
 // abstract
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY . '_pi_abstract'] = 'layout,select_key,pages';
-$TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY . '_pi_abstract'] = 'pi_flexform';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['caretaker_pi_abstract'] = 'layout,select_key,pages';
+$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['caretaker_pi_abstract'] = 'pi_flexform';