[TASK] Avoid deprecated INCLUDE_TYPOSCRIPT (#1519)

benjaminkott · Oct 11, 2024 · d87feed · d87feed
1 parent ca6bd80
commit d87feed
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/Configuration/TypoScript/Extension/constants.typoscript b/Configuration/TypoScript/Extension/constants.typoscript
@@ -9,6 +9,14 @@ plugin.tx_bootstrappackage {
 
 # EXTENSIONS
 # Manual inclusion to keep control over loading order
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/Extension/Form/constants.typoscript" condition="extension.isLoaded('form') == 1">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/Extension/IndexedSearch/constants.typoscript" condition="extension.isLoaded('indexed_search') == 1">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/Extension/Seo/constants.typoscript" condition="extension.isLoaded('seo') == 1">
+[extension.isLoaded('form') == 1]
+    @import 'EXT:bootstrap_package/Configuration/TypoScript/Extension/Form/constants.typoscript'
+[end]
+
+[extension.isLoaded('indexed_search') == 1]
+    @import 'EXT:bootstrap_package/Configuration/TypoScript/Extension/IndexedSearch/constants.typoscript'
+[end]
+
+[extension.isLoaded('seo') == 1]
+    @import 'EXT:bootstrap_package/Configuration/TypoScript/Extension/Seo/constants.typoscript'
+[end]
diff --git a/Configuration/TypoScript/Extension/setup.typoscript b/Configuration/TypoScript/Extension/setup.typoscript
@@ -18,7 +18,22 @@ plugin.tx_bootstrappackage {
 
 # EXTENSIONS
 # Manual inclusion to keep control over loading order
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/Extension/Form/setup.typoscript" condition="extension.isLoaded('form') == 1">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/Extension/IndexedSearch/setup.typoscript" condition="extension.isLoaded('indexed_search') == 1">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/Extension/Seo/setup.typoscript" condition="extension.isLoaded('seo') == 1">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/Extension/Container/setup.typoscript" condition="extension.isLoaded('container') == 1">
+[extension.isLoaded('form') == 1]
+    @import 'EXT:bootstrap_package/Configuration/TypoScript/Extension/Form/setup.typoscript'
+[end]
+
+[extension.isLoaded('indexed_search') == 1]
+    @import 'EXT:bootstrap_package/Configuration/TypoScript/Extension/IndexedSearch/setup.typoscript'
+[end]
+
+[extension.isLoaded('indexed_search') == 1]
+    @import 'EXT:bootstrap_package/Configuration/TypoScript/Extension/IndexedSearch/setup.typoscript'
+[end]
+
+[extension.isLoaded('seo') == 1]
+    @import 'EXT:bootstrap_package/Configuration/TypoScript/Extension/Seo/setup.typoscript'
+[end]
+
+[extension.isLoaded('container') == 1]
+    @import 'EXT:bootstrap_package/Configuration/TypoScript/Extension/Container/setup.typoscript'
+[end]
diff --git a/Tests/Packages/demo_package/Configuration/TypoScript/constants.typoscript b/Tests/Packages/demo_package/Configuration/TypoScript/constants.typoscript
@@ -1 +1 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/constants.typoscript">
+@import 'EXT:bootstrap_package/Configuration/TypoScript/constants.typoscript'
diff --git a/Tests/Packages/demo_package/Configuration/TypoScript/setup.typoscript b/Tests/Packages/demo_package/Configuration/TypoScript/setup.typoscript
@@ -1 +1 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/setup.typoscript">
+@import 'EXT:bootstrap_package/Configuration/TypoScript/setup.typoscript'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<INCLUDE_TYPOSCRIPT: source="FILE:EXT:bootstrap_package/Configuration/TypoScript/constants.typoscript">
		@import 'EXT:bootstrap_package/Configuration/TypoScript/constants.typoscript'