[TASK] Version cleanup

Configuration/TCA/Overrides/sys_template.php

@@ -1,22 +1,13 @@
 <?php
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
 defined('TYPO3') || die();
 
-call_user_func(function () {
-    /**
-     * Default TypoScript for Headless News
-     */
-    $versionInformation = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Information\Typo3Version::class);
-    if ($versionInformation->getMajorVersion() > 11) {
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
-            'headless_news',
-            'Configuration/TypoScript/v12',
-            'Headless News For V12'
-        );
-    } else {
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
-            'headless_news',
-            'Configuration/TypoScript',
-            'Headless News'
-        );
-    }
-});
+(static function () {
+    ExtensionManagementUtility::addStaticFile(
+        'headless_news',
+        'Configuration/TypoScript',
+        'Headless News'
+    );
+})();

Configuration/TypoScript/setup.typoscript

@@ -1,31 +1,97 @@
-tt_content.list =< lib.contentElementWithHeader
-tt_content.list {
-  fields {
-    content {
-      fields {
-        data = CASE
-        data {
-          key.field = list_type
+tt_content {
+    news_pi1 =< lib.contentElementWithHeader
+    news_pi1 {
+        fields {
+            content {
+                fields {
+                    data = USER
+                    data {
+                        userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
+                        vendorName = GeorgRinger
+                        extensionName = News
+                        pluginName = Pi1
+                        controller = News
+                        view =< plugin.tx_news.view
+                        persistence =< plugin.tx_news.persistence
+                        settings =< plugin.tx_news.settings
+                        settings {
+                            dateFormat = TEXT
+                            dateFormat = M d Y
+                            dateTimeFormat = TEXT
+                            dateTimeFormat = Y-m-d H:i:s
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    news_newsliststicky < tt_content.news_pi1
+    news_newsliststicky {
+        fields {
+            content {
+                fields {
+                    data {
+                        pluginName = NewsListSticky
+                    }
+                }
+            }
+        }
+    }
+
+    news_newsdatemenu < tt_content.news_pi1
+
+    news_newssearchresult < tt_content.news_pi1
+    news_newssearchresult {
+        fields {
+            content {
+                fields {
+                    data {
+                        pluginName = NewsSearchForm
+                    }
+                }
+            }
+        }
+    }
+
+    news_categorylist < tt_content.news_pi1
+    news_categorylist {
+        fields {
+            content {
+                fields {
+                    data {
+                        pluginName = CategoryList
+                        controller = Category
+                    }
+                }
+            }
+        }
+    }
+
+    news_taglist < tt_content.news_pi1
+    news_taglist {
+        fields {
+            content {
+                fields {
+                    data {
+                        pluginName = TagList
+                        controller = Tag
+                    }
+                }
+            }
+        }
+    }
 
-          news_pi1 = USER
-          news_pi1 {
-            userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
-            vendorName = GeorgRinger
-            extensionName = News
-            pluginName = Pi1
-            controller = News
-            view < plugin.tx_news.view
-            persistence < plugin.tx_news.persistence
-            settings < plugin.tx_news.settings
-            settings {
-              dateFormat = TEXT
-              dateFormat = M d Y
-              dateTimeFormat = TEXT
-              dateTimeFormat = Y-m-d H:i:s
+    news_newsdetail < tt_content.news_pi1
+    news_newsdetail {
+        fields {
+            content {
+                fields {
+                    data {
+                        pluginName = NewsDetail
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }

composer.json

@@ -28,11 +28,11 @@
     }
   ],
   "require": {
-    "typo3/cms-core": "^10.0 || ^12.0"
+    "typo3/cms-core": "^11.5 || ^12.4"
   },
   "suggest": {
-  	"friendsoftypo3/headless": "^2.0 || ^4.0",
-    "georgringer/news": "^9.0 || ^11.0"
+  	"friendsoftypo3/headless": "^3.0 || ^4.0",
+    "georgringer/news": "^11.0"
   },
   "extra": {
      "typo3/cms": {

ext_emconf.php

@@ -9,15 +9,15 @@
     'author_email' => 'extensions@macopedia.com',
     'category' => 'fe',
     'internal' => '',
-    'version' => '2.0.0',
+    'version' => '3.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.0.0-12.5.99',
-            'frontend' => '10.0.0-12.5.99',
+            'typo3' => '11.5.0-12.5.99',
+            'frontend' => '11.5.0-12.5.99',
         ],
         'conflicts' => [],
         'suggests' => [
-            'headless' => '2.0.0-4.9.9',
+            'headless' => '3.0.0-4.9.9',
         ],
     ],
 ];