From 338a17d8429d00a307626334a0a253bec7b3b589 Mon Sep 17 00:00:00 2001
From: nebrot <nebrot@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:12:20 +0200
Subject: [PATCH 1/6] [TASK] Add TYPO3 12 compatibility

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0ba4091..a7f6021 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
   "type": "typo3-cms-extension",
   "license": "GPL-3.0",
   "require": {
-    "typo3/cms-core": ">=10.4.0 <12.0.0"
+    "typo3/cms-core": ">=11.5.0 <13.0.0"
   },
   "replace": {
     "typo3-ter/typoscript2ce": "self.version"

From 45edc6627c311256b3e223dd88aceaa07581d4b3 Mon Sep 17 00:00:00 2001
From: nebrot <nebrot@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:13:17 +0200
Subject: [PATCH 2/6] [TASK] Add TYPO3 12 compatibility

---
 ext_emconf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext_emconf.php b/ext_emconf.php
index 760a0ad..f519d18 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -11,7 +11,7 @@
     'author_company' => 'in2code.de',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.0.0-11.5.99'
+            'typo3' => '11.5.0-12.4.99'
         ],
         'conflicts' => [],
         'suggests' => [],

From da9fefd1cfae17d1736e35ea82996a6e2af8e53e Mon Sep 17 00:00:00 2001
From: nebrot <nebrot@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:13:43 +0200
Subject: [PATCH 3/6] [TASK] Add TYPO3 12 compatibility

---
 ext_localconf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext_localconf.php b/ext_localconf.php
index 7b17972..dc8bc09 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,5 +1,5 @@
 <?php
-if (!defined('TYPO3_MODE')) {
+if (!defined('TYPO3')) {
     die('Access denied.');
 }
 

From f20c6f24215b42d6abe5c72d9269895dd81ae661 Mon Sep 17 00:00:00 2001
From: nebrot <nebrot@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:14:19 +0200
Subject: [PATCH 4/6] [TASK] Add TYPO3 12 compatibility

---
 Configuration/Services.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Configuration/Services.yaml

diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
new file mode 100644
index 0000000..b4e3880
--- /dev/null
+++ b/Configuration/Services.yaml
@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  In2code\Typoscript2ce\:
+    resource: '../Classes/*'

From 0997d583fb7761a8d00da06e72c1d839123e50e3 Mon Sep 17 00:00:00 2001
From: nebrot <nebrot@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:15:00 +0200
Subject: [PATCH 5/6] [TASK] Add TYPO3 12 compatibility

---
 Classes/Controller/TypoScriptController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Classes/Controller/TypoScriptController.php b/Classes/Controller/TypoScriptController.php
index fd08ba5..1d91bc3 100644
--- a/Classes/Controller/TypoScriptController.php
+++ b/Classes/Controller/TypoScriptController.php
@@ -1,6 +1,7 @@
 <?php
 namespace In2code\Typoscript2ce\Controller;
 
+use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
 /**
@@ -9,9 +10,10 @@
 class TypoScriptController extends ActionController
 {
     /**
-     * @return void
+     * @return ResponseInterface
      */
-    public function indexAction()
+    public function indexAction(): ResponseInterface
     {
+        return $this->htmlResponse();
     }
 }

From 7070f3894d1436219d01ac6ef7298790aaa9d55e Mon Sep 17 00:00:00 2001
From: Alexander Kellner <alexander.kellner@in2code.de>
Date: Tue, 18 Oct 2022 19:43:04 +0200
Subject: [PATCH 6/6] [TASK] Release preperations

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

diff --git a/README.md b/README.md
index f315172..5f3ba2f 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ You can enable caching for the plugin in the extension manager settings, if you
 
 | Version    | Date       | State      | Description                                                                  |
 | ---------- | ---------- | ---------- | ---------------------------------------------------------------------------- |
+| 6.0.0      | 2022-10-18 | Task       | Add TYPO3 12 and drop TYPO3 10 compatibility                                 |
 | 5.0.0      | 2021-05-06 | Task       | Add TYPO3 11 compatibility                                                   |
 | 4.0.1      | 2021-03-17 | Task       | Add extension key to composer.json                                           |
 | 4.0.0      | 2021-01-26 | Task       | Modernizing update (new icon, auto releases, reduced technical dept, etc...  |
diff --git a/composer.json b/composer.json
index a7f6021..5e328b3 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
   "type": "typo3-cms-extension",
   "license": "GPL-3.0",
   "require": {
-    "typo3/cms-core": ">=11.5.0 <13.0.0"
+    "typo3/cms-core": "^11.5 || ^12.0"
   },
   "replace": {
     "typo3-ter/typoscript2ce": "self.version"
diff --git a/ext_emconf.php b/ext_emconf.php
index f519d18..560b2a3 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -4,7 +4,7 @@
     'title' => 'typoscript2contentelement',
     'description' => 'typoscript2contentelement allows you to show the result of typoscript (e.g. HMENU) as a contentelement - a simple thing...',
     'category' => 'plugin',
-    'version' => '5.0.0',
+    'version' => '6.0.0',
     'state' => 'stable',
     'author' => 'Alex Kellner',
     'author_email' => 'alexander.kellner@in2code.de',