From 13c28e2be962e5118a9d7963ea0ca237b24e021b Mon Sep 17 00:00:00 2001
From: akoenig <koenig@clickstorm.de>
Date: Mon, 6 Jul 2020 09:33:46 +0200
Subject: [PATCH 1/4] [TASK] change constraints for TYPO3 10

---
 composer.json  | 2 +-
 ext_emconf.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 4975f3f..cc4ef1f 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "homepage": "http://wappler.systems",
     "license": "GPL-2.0-or-later",
     "require": {
-        "typo3/cms-core": "^7.6 || ^8.7 || ^9.5"
+        "typo3/cms-core": "^7.6 || ^8.7 || ^9.5 || ^10.4"
     },
     "replace": {
         "svewap/cleverreach": "self.version"
diff --git a/ext_emconf.php b/ext_emconf.php
index b0d23fa..67d988f 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -10,10 +10,10 @@
     'author' => 'Sven Wappler',
     'author_email' => 'typo3YYYY@wappler.systems',
     'author_company' => 'WapplerSystems',
-    'version' => '0.1.7',
+    'version' => '0.1.8',
     'constraints' => [
         'depends' => [
-            'typo3' => '7.6.0-9.5.99',
+            'typo3' => '7.6.0-10.4.99',
             'php' => '7.0.0-7.4.99',
         ],
         'conflicts' => [],

From 9084298a7fa5661242b061fbaf40afdc87fbc8f6 Mon Sep 17 00:00:00 2001
From: akoenig <koenig@clickstorm.de>
Date: Mon, 6 Jul 2020 09:53:15 +0200
Subject: [PATCH 2/4] [TASK] migrate registration for pagetsconfig to
 Overrides/pages.php

---
 Configuration/TCA/Overrides/pages.php | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Configuration/TCA/Overrides/pages.php

diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
new file mode 100644
index 0000000..62df0a8
--- /dev/null
+++ b/Configuration/TCA/Overrides/pages.php
@@ -0,0 +1,9 @@
+<?php
+defined('TYPO3_MODE') or die();
+
+/* Register PageTSconfig */
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
+    'cleverreach',
+    'Configuration/TSconfig/powermail.tsconfig',
+    'EXT:cleverreach - Page TSconfig'
+);

From 73124663e688f56fa4cc91c5d22c2539a04c555a Mon Sep 17 00:00:00 2001
From: akoenig <koenig@clickstorm.de>
Date: Wed, 8 Jul 2020 15:19:24 +0200
Subject: [PATCH 3/4] [TASK] migrations for powermail 8

---
 Classes/Powermail/Finisher/CleverReach.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/Classes/Powermail/Finisher/CleverReach.php b/Classes/Powermail/Finisher/CleverReach.php
index 1561b68..6cd211d 100644
--- a/Classes/Powermail/Finisher/CleverReach.php
+++ b/Classes/Powermail/Finisher/CleverReach.php
@@ -31,14 +31,23 @@ class CleverReach extends AbstractFinisher
      */
     protected $mailRepository;
 
-
-
     /**
+     * typoScriptService
      * Because of T3 7 compatibility use this class
-     * @var \TYPO3\CMS\Extbase\Service\TypoScriptService
-     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * 
+     * @var \TYPO3\CMS\Core\TypoScript\TypoScriptService
      */
-    protected $typoScriptService;
+    protected $typoScriptService = null;
+    
+    /**
+     * Inject a typoScriptService
+     *
+     * @param \TYPO3\CMS\Core\TypoScript\TypoScriptService $typoScriptService
+     */
+    public function injectTypoScriptService(\TYPO3\CMS\Core\TypoScript\TypoScriptService $typoScriptService)
+    {
+        $this->typoScriptService = $typoScriptService;
+    }
 
 
     /**
@@ -121,7 +130,7 @@ public function cleverreachFinisher()
     /**
      * Initialize
      */
-    public function initializeFinisher()
+    public function initializeFinisher(): void
     {
         $configuration = $this->typoScriptService->convertPlainArrayToTypoScriptArray($this->settings);
         if (!empty($configuration['dbEntry.'])) {

From 0aa79b927bf85ae282e2031bf7f50a8c336b6135 Mon Sep 17 00:00:00 2001
From: akoenig <koenig@clickstorm.de>
Date: Wed, 8 Jul 2020 15:20:16 +0200
Subject: [PATCH 4/4] [TASK] rebase TsConfig path

---
 Configuration/TCA/Overrides/pages.php                           | 2 +-
 .../{TypoScript/TsConfig/Page => TsConfig}/powermail.tsconfig   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Configuration/{TypoScript/TsConfig/Page => TsConfig}/powermail.tsconfig (100%)

diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
index 62df0a8..1480f09 100644
--- a/Configuration/TCA/Overrides/pages.php
+++ b/Configuration/TCA/Overrides/pages.php
@@ -4,6 +4,6 @@
 /* Register PageTSconfig */
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
     'cleverreach',
-    'Configuration/TSconfig/powermail.tsconfig',
+    'Configuration/TsConfig/powermail.tsconfig',
     'EXT:cleverreach - Page TSconfig'
 );
diff --git a/Configuration/TypoScript/TsConfig/Page/powermail.tsconfig b/Configuration/TsConfig/powermail.tsconfig
similarity index 100%
rename from Configuration/TypoScript/TsConfig/Page/powermail.tsconfig
rename to Configuration/TsConfig/powermail.tsconfig