[WIP][!!!][TASK] New Content Block folder structure

todo: - Migration wizard from old to new structure - Documentation
FriendsOfTYPO3 · Sep 16, 2024 · baafe73 · baafe73
1 parent 5d37c15
commit baafe73
Show file tree

Hide file tree

Showing 83 changed files with 223 additions and 226 deletions.
diff --git a/...ements/accordion/Assets/EditorPreview.css → ...ements/accordion/assets/EditorPreview.css b/...ements/accordion/Assets/EditorPreview.css → ...ements/accordion/assets/EditorPreview.css
diff --git a/...entElements/accordion/Assets/Frontend.css → ...entElements/accordion/assets/Frontend.css b/...entElements/accordion/Assets/Frontend.css → ...entElements/accordion/assets/Frontend.css
diff --git a/...tentElements/accordion/Assets/Frontend.js → ...tentElements/accordion/assets/Frontend.js b/...tentElements/accordion/Assets/Frontend.js → ...tentElements/accordion/assets/Frontend.js
diff --git a/...ments/accordion/Assets/accordion_item.svg → ...ments/accordion/assets/accordion_item.svg b/...ments/accordion/Assets/accordion_item.svg → ...ments/accordion/assets/accordion_item.svg
diff --git a/...ContentElements/accordion/Assets/Icon.svg → ...ContentElements/accordion/assets/icon.svg b/...ContentElements/accordion/Assets/Icon.svg → ...ContentElements/accordion/assets/icon.svg
diff --git a/...ntElements/accordion/EditorInterface.yaml → ...cks/ContentElements/accordion/config.yaml b/...ntElements/accordion/EditorInterface.yaml → ...cks/ContentElements/accordion/config.yaml
diff --git a/...ents/accordion/Source/Language/Labels.xlf → ...entElements/accordion/language/labels.xlf b/...ents/accordion/Source/Language/Labels.xlf → ...entElements/accordion/language/labels.xlf
diff --git a/...ntElements/accordion/Source/Frontend.html → ...lements/accordion/templates/frontend.html b/...ntElements/accordion/Source/Frontend.html → ...lements/accordion/templates/frontend.html
diff --git a/...ments/accordion/Source/EditorPreview.html → ...Elements/accordion/templates/preview.html b/...ments/accordion/Source/EditorPreview.html → ...Elements/accordion/templates/preview.html
diff --git a/Classes/Builder/ContentBlockBuilder.php b/Classes/Builder/ContentBlockBuilder.php
@@ -115,7 +115,7 @@ protected function createEditorInterfaceYaml(LoadedContentBlock $contentBlock, s
 
     protected function createLabelsXlf(LoadedContentBlock $contentBlock, string $basePath): void
     {
-        GeneralUtility::mkdir_deep($basePath . '/' . ContentBlockPathUtility::getLanguageFolderPath());
+        GeneralUtility::mkdir_deep($basePath . '/' . ContentBlockPathUtility::getLanguageFolder());
         $xliffContent = $this->languageFileGenerator->generate($contentBlock);
         GeneralUtility::writeFile(
             $basePath . '/' . ContentBlockPathUtility::getLanguageFilePath(),

diff --git a/Classes/Command/GenerateLanguageFileCommand.php b/Classes/Command/GenerateLanguageFileCommand.php
@@ -107,7 +107,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     protected function writeLabelsXlf(LoadedContentBlock $contentBlock): void
     {
         $contentBlockPath = GeneralUtility::getFileAbsFileName($contentBlock->getExtPath());
-        $labelsFolder = $contentBlockPath . '/' . ContentBlockPathUtility::getLanguageFolderPath();
+        $labelsFolder = $contentBlockPath . '/' . ContentBlockPathUtility::getLanguageFolder();
         $labelsXlfPath = $contentBlockPath . '/' . ContentBlockPathUtility::getLanguageFilePath();
         $result = $this->languageFileGenerator->generate($contentBlock);
         GeneralUtility::mkdir_deep($labelsFolder);

diff --git a/Classes/ServiceProvider.php b/Classes/ServiceProvider.php
@@ -163,19 +163,16 @@ public static function getContentBlockTypoScript(ContainerInterface $container):
                 if ($tableDefinition->getContentType() === ContentType::CONTENT_ELEMENT) {
                     $extPath = $contentBlockRegistry->getContentBlockExtPath($typeDefinition->getName());
                     $privatePath = $extPath . '/' . ContentBlockPathUtility::getPrivateFolder();
-                    $template = ContentBlockPathUtility::getFrontendTemplateFileNameWithoutExtension();
+                    $template = ContentBlockPathUtility::getFrontendTemplateFileName();
                     $typoScript = <<<HEREDOC
 tt_content.{$typeDefinition->getTypeName()} =< lib.contentBlock
 tt_content.{$typeDefinition->getTypeName()} {
-    templateName = {$template}
-    templateRootPaths {
-        20 = $privatePath/
-    }
+    file = $privatePath/$template
     partialRootPaths {
-        20 = $privatePath/Partials/
+        20 = $privatePath/partials/
     }
     layoutRootPaths {
-        20 = $privatePath/Layouts/
+        20 = $privatePath/layouts/
     }
 }
 HEREDOC;

diff --git a/Classes/Utility/ContentBlockPathUtility.php b/Classes/Utility/ContentBlockPathUtility.php
@@ -37,12 +37,12 @@ public static function getContentBlockExtPath(string $extensionKey, string $cont
 
     public static function getContentBlockDefinitionFileName(): string
     {
-        return 'EditorInterface.yaml';
+        return 'config.yaml';
     }
 
     public static function getBackendPreviewFileName(): string
     {
-        return 'EditorPreview.html';
+        return 'preview.html';
     }
 
     public static function getBackendPreviewFileNameWithoutExtension(): string
@@ -57,7 +57,7 @@ public static function getBackendPreviewPath(): string
 
     public static function getFrontendTemplateFileName(): string
     {
-        return 'Frontend.html';
+        return 'frontend.html';
     }
 
     public static function getFrontendTemplateFileNameWithoutExtension(): string
@@ -70,29 +70,24 @@ public static function getFrontendTemplatePath(): string
         return self::getPrivateFolder() . '/' . self::getFrontendTemplateFileName();
     }
 
-    public static function getLanguageFolderPath(): string
-    {
-        return self::getPrivateFolder() . '/Language';
-    }
-
     public static function getLanguageFilePath(): string
     {
-        return self::getLanguageFolderPath() . '/Labels.xlf';
+        return self::getLanguageFolder() . '/labels.xlf';
     }
 
     public static function getIconNameWithoutFileExtension(): string
     {
-        return 'Icon';
+        return 'icon';
     }
 
     public static function getIconHideInMenuNameWithoutFileExtension(): string
     {
-        return 'IconHideInMenu';
+        return 'icon-hide-in-menu';
     }
 
     public static function getIconRootNameWithoutFileExtension(): string
     {
-        return 'IconRoot';
+        return 'icon-root';
     }
 
     public static function getIconPathWithoutFileExtension(): string
@@ -142,12 +137,17 @@ public static function getRecordTypesFolder(): string
 
     public static function getPublicFolder(): string
     {
-        return 'Assets';
+        return 'assets';
     }
 
     public static function getPrivateFolder(): string
     {
-        return 'Source';
+        return 'templates';
+    }
+
+    public static function getLanguageFolder(): string
+    {
+        return 'language';
     }
 
     public static function getHostExtPublicContentBlockBasePath(string $hostExtension): string

diff --git a/...ontent-element-a/Assets/EditorPreview.css → ...ontent-element-a/assets/EditorPreview.css b/...ontent-element-a/Assets/EditorPreview.css → ...ontent-element-a/assets/EditorPreview.css
diff --git a/...nts/content-element-a/Assets/Frontend.css → ...nts/content-element-a/assets/Frontend.css b/...nts/content-element-a/Assets/Frontend.css → ...nts/content-element-a/assets/Frontend.css
diff --git a/...ents/content-element-a/Assets/Frontend.js → ...ents/content-element-a/assets/Frontend.js b/...ents/content-element-a/Assets/Frontend.js → ...ents/content-element-a/assets/Frontend.js
diff --git a/...lements/content-element-a/Assets/Icon.svg → ...lements/content-element-a/assets/icon.svg b/...lements/content-element-a/Assets/Icon.svg → ...lements/content-element-a/assets/icon.svg
diff --git a/...ts/content-element-a/EditorInterface.yaml → ...entElements/content-element-a/config.yaml b/...ts/content-element-a/EditorInterface.yaml → ...entElements/content-element-a/config.yaml
diff --git a/...tent-element-a/Source/Language/Labels.xlf → ...nts/content-element-a/language/labels.xlf b/...tent-element-a/Source/Language/Labels.xlf → ...nts/content-element-a/language/labels.xlf
diff --git a/...ts/content-element-a/Source/Frontend.html → ...content-element-a/templates/frontend.html b/...ts/content-element-a/Source/Frontend.html → ...content-element-a/templates/frontend.html
diff --git a/...ntent-element-a/Source/EditorPreview.html → .../content-element-a/templates/preview.html b/...ntent-element-a/Source/EditorPreview.html → .../content-element-a/templates/preview.html
diff --git a/...ontent-element-b/Assets/EditorPreview.css → ...ontent-element-b/assets/EditorPreview.css b/...ontent-element-b/Assets/EditorPreview.css → ...ontent-element-b/assets/EditorPreview.css
diff --git a/...nts/content-element-b/Assets/Frontend.css → ...nts/content-element-b/assets/Frontend.css b/...nts/content-element-b/Assets/Frontend.css → ...nts/content-element-b/assets/Frontend.css
diff --git a/...ents/content-element-b/Assets/Frontend.js → ...ents/content-element-b/assets/Frontend.js b/...ents/content-element-b/Assets/Frontend.js → ...ents/content-element-b/assets/Frontend.js
diff --git a/...lements/content-element-b/Assets/Icon.svg → ...lements/content-element-b/assets/icon.svg b/...lements/content-element-b/Assets/Icon.svg → ...lements/content-element-b/assets/icon.svg
diff --git a/...ts/content-element-b/EditorInterface.yaml → ...entElements/content-element-b/config.yaml b/...ts/content-element-b/EditorInterface.yaml → ...entElements/content-element-b/config.yaml
diff --git a/...tent-element-b/Source/Language/Labels.xlf → ...nts/content-element-b/language/labels.xlf b/...tent-element-b/Source/Language/Labels.xlf → ...nts/content-element-b/language/labels.xlf
diff --git a/...ts/content-element-b/Source/Frontend.html → ...content-element-b/templates/frontend.html b/...ts/content-element-b/Source/Frontend.html → ...content-element-b/templates/frontend.html
diff --git a/...ntent-element-b/Source/EditorPreview.html → .../content-element-b/templates/preview.html b/...ntent-element-b/Source/EditorPreview.html → .../content-element-b/templates/preview.html
diff --git a/...ordTypes/test-record/EditorInterface.yaml → ...locks/RecordTypes/test-record/config.yaml b/...ordTypes/test-record/EditorInterface.yaml → ...locks/RecordTypes/test-record/config.yaml
diff --git a/.../simple-relation/Assets/EditorPreview.css → .../simple-relation/assets/EditorPreview.css b/.../simple-relation/Assets/EditorPreview.css → .../simple-relation/assets/EditorPreview.css
diff --git a/...ments/simple-relation/Assets/Frontend.css → ...ments/simple-relation/assets/Frontend.css b/...ments/simple-relation/Assets/Frontend.css → ...ments/simple-relation/assets/Frontend.css
diff --git a/...ements/simple-relation/Assets/Frontend.js → ...ements/simple-relation/assets/Frontend.js b/...ements/simple-relation/Assets/Frontend.js → ...ements/simple-relation/assets/Frontend.js
diff --git a/...tElements/simple-relation/Assets/Icon.svg → ...tElements/simple-relation/assets/icon.svg b/...tElements/simple-relation/Assets/Icon.svg → ...tElements/simple-relation/assets/icon.svg
diff --git a/...ents/simple-relation/EditorInterface.yaml → ...ntentElements/simple-relation/config.yaml b/...ents/simple-relation/EditorInterface.yaml → ...ntentElements/simple-relation/config.yaml
diff --git a/...imple-relation/Source/Language/Labels.xlf → ...ments/simple-relation/language/labels.xlf b/...imple-relation/Source/Language/Labels.xlf → ...ments/simple-relation/language/labels.xlf
diff --git a/...ents/simple-relation/Source/Frontend.html → ...s/simple-relation/templates/frontend.html b/...ents/simple-relation/Source/Frontend.html → ...s/simple-relation/templates/frontend.html
diff --git a/...entElements/simple-vendor/Assets/Icon.svg → ...entElements/simple-vendor/assets/icon.svg b/...entElements/simple-vendor/Assets/Icon.svg → ...entElements/simple-vendor/assets/icon.svg
diff --git a/...ements/simple-vendor/EditorInterface.yaml → ...ContentElements/simple-vendor/config.yaml b/...ements/simple-vendor/EditorInterface.yaml → ...ContentElements/simple-vendor/config.yaml
diff --git a/.../simple-vendor/Source/Language/Labels.xlf → ...lements/simple-vendor/language/labels.xlf b/.../simple-vendor/Source/Language/Labels.xlf → ...lements/simple-vendor/language/labels.xlf
diff --git a/...ements/simple-vendor/Source/Frontend.html → ...nts/simple-vendor/templates/frontend.html b/...ements/simple-vendor/Source/Frontend.html → ...nts/simple-vendor/templates/frontend.html
diff --git a/...mple-with-basics/Assets/EditorPreview.css → ...mple-with-basics/assets/EditorPreview.css b/...mple-with-basics/Assets/EditorPreview.css → ...mple-with-basics/assets/EditorPreview.css
diff --git a/...ts/simple-with-basics/Assets/Frontend.css → ...ts/simple-with-basics/assets/Frontend.css b/...ts/simple-with-basics/Assets/Frontend.css → ...ts/simple-with-basics/assets/Frontend.css
diff --git a/...nts/simple-with-basics/Assets/Frontend.js → ...nts/simple-with-basics/assets/Frontend.js b/...nts/simple-with-basics/Assets/Frontend.js → ...nts/simple-with-basics/assets/Frontend.js
diff --git a/...ements/simple-with-basics/Assets/Icon.svg → ...ements/simple-with-basics/assets/icon.svg b/...ements/simple-with-basics/Assets/Icon.svg → ...ements/simple-with-basics/assets/icon.svg
diff --git a/...s/simple-with-basics/EditorInterface.yaml → ...ntElements/simple-with-basics/config.yaml b/...s/simple-with-basics/EditorInterface.yaml → ...ntElements/simple-with-basics/config.yaml
diff --git a/...le-with-basics/Source/Language/Labels.xlf → ...ts/simple-with-basics/language/labels.xlf b/...le-with-basics/Source/Language/Labels.xlf → ...ts/simple-with-basics/language/labels.xlf
diff --git a/...s/simple-with-basics/Source/Frontend.html → ...imple-with-basics/templates/frontend.html b/...s/simple-with-basics/Source/Frontend.html → ...imple-with-basics/templates/frontend.html
diff --git a/...tElements/simple/Assets/EditorPreview.css → ...tElements/simple/assets/EditorPreview.css b/...tElements/simple/Assets/EditorPreview.css → ...tElements/simple/assets/EditorPreview.css
diff --git a/...ontentElements/simple/Assets/Frontend.css → ...ontentElements/simple/assets/Frontend.css b/...ontentElements/simple/Assets/Frontend.css → ...ontentElements/simple/assets/Frontend.css
diff --git a/...ContentElements/simple/Assets/Frontend.js → ...ContentElements/simple/assets/Frontend.js b/...ContentElements/simple/Assets/Frontend.js → ...ContentElements/simple/assets/Frontend.js
diff --git a/...ks/ContentElements/simple/Assets/Icon.svg → ...ks/ContentElements/simple/assets/icon.svg b/...ks/ContentElements/simple/Assets/Icon.svg → ...ks/ContentElements/simple/assets/icon.svg
diff --git a/...ntentElements/simple/EditorInterface.yaml → ...Blocks/ContentElements/simple/config.yaml b/...ntentElements/simple/EditorInterface.yaml → ...Blocks/ContentElements/simple/config.yaml
diff --git a/...lements/simple/Source/Language/Labels.xlf → ...ontentElements/simple/language/labels.xlf b/...lements/simple/Source/Language/Labels.xlf → ...ontentElements/simple/language/labels.xlf
diff --git a/...ntentElements/simple/Source/Frontend.html → ...ntElements/simple/templates/frontend.html b/...ntentElements/simple/Source/Frontend.html → ...ntElements/simple/templates/frontend.html
@@ -18,5 +18,5 @@ <h1>{data.header}</h1>
 <p>creationDate:{data.systemProperties.createdAt.timestamp}</p>
 <p>updateDate:{data.systemProperties.lastUpdatedAt.timestamp}</p>
 <span><f:translate key="{cb:languagePath()}:title"/></span>
-<img src="{f:uri.resource(path: '{cb:assetPath()}/Icon.svg')}" alt="">
-<img src="{f:uri.resource(path: '{cb:assetPath()}/Icon.svg', absolute: '1')}" alt="">
+<img src="{f:uri.resource(path: '{cb:assetPath()}/icon.svg')}" alt="">
+<img src="{f:uri.resource(path: '{cb:assetPath()}/icon.svg', absolute: '1')}" alt="">
diff --git a/...Elements/simple2/Assets/EditorPreview.css → ...Elements/simple2/assets/EditorPreview.css b/...Elements/simple2/Assets/EditorPreview.css → ...Elements/simple2/assets/EditorPreview.css
diff --git a/...ntentElements/simple2/Assets/Frontend.css → ...ntentElements/simple2/assets/Frontend.css b/...ntentElements/simple2/Assets/Frontend.css → ...ntentElements/simple2/assets/Frontend.css
diff --git a/...ontentElements/simple2/Assets/Frontend.js → ...ontentElements/simple2/assets/Frontend.js b/...ontentElements/simple2/Assets/Frontend.js → ...ontentElements/simple2/assets/Frontend.js
diff --git a/...s/ContentElements/simple2/Assets/Icon.svg → ...s/ContentElements/simple2/assets/icon.svg b/...s/ContentElements/simple2/Assets/Icon.svg → ...s/ContentElements/simple2/assets/icon.svg
diff --git a/...tentElements/simple2/EditorInterface.yaml → ...locks/ContentElements/simple2/config.yaml b/...tentElements/simple2/EditorInterface.yaml → ...locks/ContentElements/simple2/config.yaml
diff --git a/...ements/simple2/Source/Language/Labels.xlf → ...ntentElements/simple2/language/labels.xlf b/...ements/simple2/Source/Language/Labels.xlf → ...ntentElements/simple2/language/labels.xlf
diff --git a/...tentElements/simple2/Source/Frontend.html → ...tElements/simple2/templates/frontend.html b/...tentElements/simple2/Source/Frontend.html → ...tElements/simple2/templates/frontend.html
diff --git a/.../RecordTypes/record1/EditorInterface.yaml → ...entBlocks/RecordTypes/record1/config.yaml b/.../RecordTypes/record1/EditorInterface.yaml → ...entBlocks/RecordTypes/record1/config.yaml
diff --git a/...dTypes/record1/Source/Language/Labels.xlf → ...s/RecordTypes/record1/language/labels.xlf b/...dTypes/record1/Source/Language/Labels.xlf → ...s/RecordTypes/record1/language/labels.xlf
diff --git a/.../RecordTypes/record2/EditorInterface.yaml → ...entBlocks/RecordTypes/record2/config.yaml b/.../RecordTypes/record2/EditorInterface.yaml → ...entBlocks/RecordTypes/record2/config.yaml
diff --git a/Tests/Functional/Frontend/ContentBlockFrontendRenderingTest.php b/Tests/Functional/Frontend/ContentBlockFrontendRenderingTest.php
@@ -78,8 +78,8 @@ public function variablesAndAssetsRendered(): void
         // @todo The path should be absolute. See: https://github.com/TYPO3/testing-framework/issues/577
         self::assertStringContainsString('<link href="typo3conf/ext/test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple/Frontend.css', $html);
         self::assertStringContainsString('<script src="typo3conf/ext/test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple/Frontend.js', $html);
-        self::assertStringContainsString('<img src="typo3conf/ext/test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple/Icon.svg', $html);
-        self::assertStringContainsString('<img src="http://localhost/typo3conf/ext/test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple/Icon.svg', $html);
+        self::assertStringContainsString('<img src="typo3conf/ext/test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple/icon.svg', $html);
+        self::assertStringContainsString('<img src="http://localhost/typo3conf/ext/test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple/icon.svg', $html);
     }
 
     #[Test]

diff --git a/...ntentElements/test_1/EditorInterface.yaml → ...Blocks/ContentElements/test_1/config.yaml b/...ntentElements/test_1/EditorInterface.yaml → ...Blocks/ContentElements/test_1/config.yaml
diff --git a/...ntentElements/test_2/EditorInterface.yaml → ...Blocks/ContentElements/test_2/config.yaml b/...ntentElements/test_2/EditorInterface.yaml → ...Blocks/ContentElements/test_2/config.yaml
diff --git a/...ntentElements/test_3/EditorInterface.yaml → ...Blocks/ContentElements/test_3/config.yaml b/...ntentElements/test_3/EditorInterface.yaml → ...Blocks/ContentElements/test_3/config.yaml
diff --git a/...lements/test_3/Source/Language/Labels.xlf → ...ontentElements/test_3/language/labels.xlf b/...lements/test_3/Source/Language/Labels.xlf → ...ontentElements/test_3/language/labels.xlf
diff --git a/...ntentElements/test_4/EditorInterface.yaml → ...Blocks/ContentElements/test_4/config.yaml b/...ntentElements/test_4/EditorInterface.yaml → ...Blocks/ContentElements/test_4/config.yaml
diff --git a/...lements/test_4/Source/Language/Labels.xlf → ...ontentElements/test_4/language/labels.xlf b/...lements/test_4/Source/Language/Labels.xlf → ...ontentElements/test_4/language/labels.xlf
diff --git a/...ntentElements/test_5/EditorInterface.yaml → ...Blocks/ContentElements/test_5/config.yaml b/...ntentElements/test_5/EditorInterface.yaml → ...Blocks/ContentElements/test_5/config.yaml
diff --git a/...lements/test_5/Source/Language/Labels.xlf → ...ontentElements/test_5/language/labels.xlf b/...lements/test_5/Source/Language/Labels.xlf → ...ontentElements/test_5/language/labels.xlf
diff --git a/...ntentElements/test_6/EditorInterface.yaml → ...Blocks/ContentElements/test_6/config.yaml b/...ntentElements/test_6/EditorInterface.yaml → ...Blocks/ContentElements/test_6/config.yaml
diff --git a/...lements/test_6/Source/Language/Labels.xlf → ...ontentElements/test_6/language/labels.xlf b/...lements/test_6/Source/Language/Labels.xlf → ...ontentElements/test_6/language/labels.xlf
diff --git a/...ntentElements/test_7/EditorInterface.yaml → ...Blocks/ContentElements/test_7/config.yaml b/...ntentElements/test_7/EditorInterface.yaml → ...Blocks/ContentElements/test_7/config.yaml
diff --git a/...lements/test_7/Source/Language/Labels.xlf → ...ontentElements/test_7/language/labels.xlf b/...lements/test_7/Source/Language/Labels.xlf → ...ontentElements/test_7/language/labels.xlf
diff --git a/...ntentElements/test_8/EditorInterface.yaml → ...Blocks/ContentElements/test_8/config.yaml b/...ntentElements/test_8/EditorInterface.yaml → ...Blocks/ContentElements/test_8/config.yaml
diff --git a/Tests/Functional/Generator/IconGeneratorTest.php b/Tests/Functional/Generator/IconGeneratorTest.php
@@ -53,7 +53,7 @@ public static function registeredContentBlockIconsHaveCorrectConfigurationDataPr
             [
                 'provider' => SvgIconProvider::class,
                 'options' => [
-                    'source' => 'EXT:test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple/Icon.svg',
+                    'source' => 'EXT:test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple/icon.svg',
                 ],
             ],
         ];
@@ -62,7 +62,7 @@ public static function registeredContentBlockIconsHaveCorrectConfigurationDataPr
             [
                 'provider' => SvgIconProvider::class,
                 'options' => [
-                    'source' => 'EXT:test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple2/Icon.svg',
+                    'source' => 'EXT:test_content_blocks_c/Resources/Public/ContentBlocks/simple/simple2/icon.svg',
                 ],
             ],
         ];
@@ -71,7 +71,7 @@ public static function registeredContentBlockIconsHaveCorrectConfigurationDataPr
             [
                 'provider' => SvgIconProvider::class,
                 'options' => [
-                    'source' => 'EXT:test_content_blocks_c/Resources/Public/ContentBlocks/simple/basics/Icon.svg',
+                    'source' => 'EXT:test_content_blocks_c/Resources/Public/ContentBlocks/simple/basics/icon.svg',
                 ],
             ],
         ];

diff --git a/Tests/Functional/Generator/TcaGeneratorTest.php b/Tests/Functional/Generator/TcaGeneratorTest.php
@@ -37,7 +37,7 @@ public function coreLabelsAreNotOverriddenIfMissingInLanguageFile(): void
     public function coreLabelsAreOverriddenIfTranslationExistsInLanguageFile(): void
     {
         self::assertSame(
-            'LLL:EXT:test_content_blocks_c/ContentBlocks/ContentElements/simple2/Source/Language/Labels.xlf:header.label',
+            'LLL:EXT:test_content_blocks_c/ContentBlocks/ContentElements/simple2/language/labels.xlf:header.label',
             $GLOBALS['TCA']['tt_content']['types']['simple_simple2']['columnsOverrides']['header']['label']
         );
     }
@@ -138,11 +138,11 @@ public function typeFieldSelectAddedForRecordType(): void
         self::assertSame(
             [
                 [
-                    'label' => 'LLL:EXT:test_content_blocks_c/ContentBlocks/RecordTypes/record1/Source/Language/Labels.xlf:title',
+                    'label' => 'LLL:EXT:test_content_blocks_c/ContentBlocks/RecordTypes/record1/language/labels.xlf:title',
                     'value' => 'record1',
                     'icon' => 'custom_record-record1-cc2849f',
                     'group' => null,
-                    'description' => 'LLL:EXT:test_content_blocks_c/ContentBlocks/RecordTypes/record1/Source/Language/Labels.xlf:description',
+                    'description' => 'LLL:EXT:test_content_blocks_c/ContentBlocks/RecordTypes/record1/language/labels.xlf:description',
                 ],
                 [
                     'label' => 'content-blocks/record2',

diff --git a/Tests/Functional/ViewHelpers/LanguagePathViewHelperTest.php b/Tests/Functional/ViewHelpers/LanguagePathViewHelperTest.php
@@ -40,11 +40,11 @@ public static function renderReturnsStringDataProvider(): array
         return [
             'name explicitly set' => [
                 '<cb:languagePath name="typo3tests/content-element-b" />',
-                'LLL:EXT:test_content_blocks_b/ContentBlocks/ContentElements/content-element-b/Source/Language/Labels.xlf',
+                'LLL:EXT:test_content_blocks_b/ContentBlocks/ContentElements/content-element-b/language/labels.xlf',
             ],
             'fallback to name from context' => [
                 '<cb:languagePath />',
-                'LLL:EXT:test_content_blocks_b/ContentBlocks/ContentElements/content-element-b/Source/Language/Labels.xlf',
+                'LLL:EXT:test_content_blocks_b/ContentBlocks/ContentElements/content-element-b/language/labels.xlf',
             ],
         ];
     }