From 9f43ea427b5746a1f43e9236c50168d6ef5d17ec Mon Sep 17 00:00:00 2001 From: Markus Klein Date: Mon, 25 Jan 2021 16:02:17 +0100 Subject: [PATCH] [BUGFIX] Use more precise extension key To avoid name clashes we use a more precise extension key. Also the namespace is adjusted accordingly. Resolves: #8 --- Classes/Backend/Preview.php | 2 +- Classes/Frontend/DataProcessing/SkillSets.php | 2 +- Classes/Frontend/DataProcessing/Skills.php | 2 +- Classes/SettingsFactory.php | 2 +- Classes/TcaEnhancer.php | 2 +- Classes/ViewHelpers/Verification/ButtonViewHelper.php | 4 ++-- Classes/ViewHelpers/Verification/UrlViewHelper.php | 4 ++-- Classes/ViewHelpers/VerificationViewHelper.php | 3 +-- Configuration/PageTSconfig/Index.tsconfig | 2 +- Configuration/PageTSconfig/Mod/Wizards/Index.tsconfig | 2 +- Configuration/PageTSconfig/Mod/Wizards/Skills.tsconfig | 6 +++--- Configuration/PageTSconfig/Mod/Wizards/Skillset.tsconfig | 6 +++--- Configuration/Services.yaml | 8 ++++---- Configuration/SiteConfiguration/Overrides/sites.php | 2 +- Configuration/TCA/Overrides/sys_template.php | 2 +- Configuration/TCA/Overrides/tt_content.php | 5 +++-- Configuration/TCA/Overrides/tt_content_skills.php | 3 +-- Configuration/TCA/Overrides/tt_content_skillset.php | 3 +-- Configuration/TypoScript/setup.typoscript | 6 +++--- README.rst | 6 +++--- Resources/Private/Language/locallang_be.xlf | 2 +- Resources/Private/Language/locallang_tca.xlf | 2 +- .../Partials/ContentElements/VerificationBox.html | 2 +- .../Templates/Backend/ContentElements/Skills.html | 2 +- .../Templates/Backend/ContentElements/Skillset.html | 2 +- .../Templates/ContentElements/SkillDisplaySkillSet.html | 2 +- .../Templates/ContentElements/SkillDisplaySkills.html | 2 +- Tests/Unit/Backend/PreviewTest.php | 6 +++--- Tests/Unit/Frontend/DataProcessing/SkillSetsTest.php | 6 +++--- Tests/Unit/Frontend/DataProcessing/SkillsTest.php | 6 +++--- Tests/Unit/SettingsFactoryTest.php | 6 +++--- .../ViewHelpers/Verification/ButtonViewHelperTest.php | 8 ++++---- .../Unit/ViewHelpers/Verification/UrlViewHelperTest.php | 8 ++++---- composer.json | 9 ++++----- ext_localconf.php | 4 ++-- 35 files changed, 68 insertions(+), 71 deletions(-) diff --git a/Classes/Backend/Preview.php b/Classes/Backend/Preview.php index 1006815..2e5a9b0 100644 --- a/Classes/Backend/Preview.php +++ b/Classes/Backend/Preview.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Backend; +namespace SkillDisplay\SkilldisplayContent\Backend; /* * Copyright (C) 2020 Daniel Siepmann diff --git a/Classes/Frontend/DataProcessing/SkillSets.php b/Classes/Frontend/DataProcessing/SkillSets.php index bfde225..34439d1 100644 --- a/Classes/Frontend/DataProcessing/SkillSets.php +++ b/Classes/Frontend/DataProcessing/SkillSets.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Frontend\DataProcessing; +namespace SkillDisplay\SkilldisplayContent\Frontend\DataProcessing; /* * Copyright (C) 2020 Daniel Siepmann diff --git a/Classes/Frontend/DataProcessing/Skills.php b/Classes/Frontend/DataProcessing/Skills.php index 77d3026..6cdfbfe 100644 --- a/Classes/Frontend/DataProcessing/Skills.php +++ b/Classes/Frontend/DataProcessing/Skills.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Frontend\DataProcessing; +namespace SkillDisplay\SkilldisplayContent\Frontend\DataProcessing; /* * Copyright (C) 2020 Daniel Siepmann diff --git a/Classes/SettingsFactory.php b/Classes/SettingsFactory.php index 2faebfa..c23e0e4 100644 --- a/Classes/SettingsFactory.php +++ b/Classes/SettingsFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension; +namespace SkillDisplay\SkilldisplayContent; /* * Copyright (C) 2020 Daniel Siepmann diff --git a/Classes/TcaEnhancer.php b/Classes/TcaEnhancer.php index 7d3bc4e..3a22820 100644 --- a/Classes/TcaEnhancer.php +++ b/Classes/TcaEnhancer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension; +namespace SkillDisplay\SkilldisplayContent; use SkillDisplay\PHPToolKit\Api\Campaigns; use SkillDisplay\PHPToolKit\Entity\Campaign; diff --git a/Classes/ViewHelpers/Verification/ButtonViewHelper.php b/Classes/ViewHelpers/Verification/ButtonViewHelper.php index 86e0ece..f433f26 100644 --- a/Classes/ViewHelpers/Verification/ButtonViewHelper.php +++ b/Classes/ViewHelpers/Verification/ButtonViewHelper.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\ViewHelpers\Verification; +namespace SkillDisplay\SkilldisplayContent\ViewHelpers\Verification; /* * Copyright (C) 2020 Daniel Siepmann @@ -24,7 +24,7 @@ namespace SkillDisplay\Typo3Extension\ViewHelpers\Verification; */ use SkillDisplay\PHPToolKit\Verification\Link; -use SkillDisplay\Typo3Extension\ViewHelpers\VerificationViewHelper; +use SkillDisplay\SkilldisplayContent\ViewHelpers\VerificationViewHelper; use TYPO3\CMS\Core\Utility\GeneralUtility; class ButtonViewHelper extends VerificationViewHelper diff --git a/Classes/ViewHelpers/Verification/UrlViewHelper.php b/Classes/ViewHelpers/Verification/UrlViewHelper.php index 225989d..65d96a8 100644 --- a/Classes/ViewHelpers/Verification/UrlViewHelper.php +++ b/Classes/ViewHelpers/Verification/UrlViewHelper.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\ViewHelpers\Verification; +namespace SkillDisplay\SkilldisplayContent\ViewHelpers\Verification; /* * Copyright (C) 2020 Daniel Siepmann @@ -24,7 +24,7 @@ namespace SkillDisplay\Typo3Extension\ViewHelpers\Verification; */ use SkillDisplay\PHPToolKit\Verification\Link; -use SkillDisplay\Typo3Extension\ViewHelpers\VerificationViewHelper; +use SkillDisplay\SkilldisplayContent\ViewHelpers\VerificationViewHelper; use TYPO3\CMS\Core\Utility\GeneralUtility; class UrlViewHelper extends VerificationViewHelper diff --git a/Classes/ViewHelpers/VerificationViewHelper.php b/Classes/ViewHelpers/VerificationViewHelper.php index d5d87ce..467654e 100644 --- a/Classes/ViewHelpers/VerificationViewHelper.php +++ b/Classes/ViewHelpers/VerificationViewHelper.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\ViewHelpers; +namespace SkillDisplay\SkilldisplayContent\ViewHelpers; /* * Copyright (C) 2020 Daniel Siepmann @@ -27,7 +27,6 @@ use SkillDisplay\PHPToolKit\Verification\Link; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; -use TYPO3\CMS\Core\Utility\GeneralUtility; abstract class VerificationViewHelper extends AbstractViewHelper { diff --git a/Configuration/PageTSconfig/Index.tsconfig b/Configuration/PageTSconfig/Index.tsconfig index 3877dc0..91e513d 100644 --- a/Configuration/PageTSconfig/Index.tsconfig +++ b/Configuration/PageTSconfig/Index.tsconfig @@ -1 +1 @@ -@import 'EXT:skilldisplay/Configuration/PageTSconfig/Mod/Wizards/*.tsconfig' +@import 'EXT:skilldisplay_content/Configuration/PageTSconfig/Mod/Wizards/*.tsconfig' diff --git a/Configuration/PageTSconfig/Mod/Wizards/Index.tsconfig b/Configuration/PageTSconfig/Mod/Wizards/Index.tsconfig index be1c85a..7aca29a 100644 --- a/Configuration/PageTSconfig/Mod/Wizards/Index.tsconfig +++ b/Configuration/PageTSconfig/Mod/Wizards/Index.tsconfig @@ -1,6 +1,6 @@ mod { wizards.newContentElement.wizardItems.skilldisplay { - header = LLL:EXT:skilldisplay/Resources/Private/Language/locallang_be.xlf:newContentElement.skilldisplay.header + header = LLL:EXT:skilldisplay_content/Resources/Private/Language/locallang_be.xlf:newContentElement.skilldisplay.header show = * } } diff --git a/Configuration/PageTSconfig/Mod/Wizards/Skills.tsconfig b/Configuration/PageTSconfig/Mod/Wizards/Skills.tsconfig index 60f2414..ba5df3d 100644 --- a/Configuration/PageTSconfig/Mod/Wizards/Skills.tsconfig +++ b/Configuration/PageTSconfig/Mod/Wizards/Skills.tsconfig @@ -3,13 +3,13 @@ mod { elements { skilldisplay_skills { iconIdentifier = skilldisplay-skill - title = LLL:EXT:skilldisplay/Resources/Private/Language/locallang_tca.xlf:tt_content.skilldisplay_skills - description = LLL:EXT:skilldisplay/Resources/Private/Language/locallang_be.xlf:newContentElement.skilldisplay.skills.description + title = LLL:EXT:skilldisplay_content/Resources/Private/Language/locallang_tca.xlf:tt_content.skilldisplay_skills + description = LLL:EXT:skilldisplay_content/Resources/Private/Language/locallang_be.xlf:newContentElement.skilldisplay.skills.description tt_content_defValues { CType = skilldisplay_skills } } } } - web_layout.tt_content.preview.skilldisplay_skills = EXT:skilldisplay/Resources/Private/Templates/Backend/ContentElements/Skills.html + web_layout.tt_content.preview.skilldisplay_skills = EXT:skilldisplay_content/Resources/Private/Templates/Backend/ContentElements/Skills.html } diff --git a/Configuration/PageTSconfig/Mod/Wizards/Skillset.tsconfig b/Configuration/PageTSconfig/Mod/Wizards/Skillset.tsconfig index 3e1a869..bc945ff 100644 --- a/Configuration/PageTSconfig/Mod/Wizards/Skillset.tsconfig +++ b/Configuration/PageTSconfig/Mod/Wizards/Skillset.tsconfig @@ -3,13 +3,13 @@ mod { elements { skilldisplay_skillset { iconIdentifier = skilldisplay-skillset - title = LLL:EXT:skilldisplay/Resources/Private/Language/locallang_tca.xlf:tt_content.skilldisplay_skillset - description = LLL:EXT:skilldisplay/Resources/Private/Language/locallang_be.xlf:newContentElement.skilldisplay.skillset.description + title = LLL:EXT:skilldisplay_content/Resources/Private/Language/locallang_tca.xlf:tt_content.skilldisplay_skillset + description = LLL:EXT:skilldisplay_content/Resources/Private/Language/locallang_be.xlf:newContentElement.skilldisplay.skillset.description tt_content_defValues { CType = skilldisplay_skillset } } } } - web_layout.tt_content.preview.skilldisplay_skillset = EXT:skilldisplay/Resources/Private/Templates/Backend/ContentElements/Skillset.html + web_layout.tt_content.preview.skilldisplay_skillset = EXT:skilldisplay_content/Resources/Private/Templates/Backend/ContentElements/Skillset.html } diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml index ec5baba..cb80a5d 100644 --- a/Configuration/Services.yaml +++ b/Configuration/Services.yaml @@ -4,17 +4,17 @@ services: autoconfigure: true public: false - SkillDisplay\Typo3Extension\: + SkillDisplay\SkilldisplayContent\: resource: '../Classes/*' - SkillDisplay\Typo3Extension\Frontend\DataProcessing\: + SkillDisplay\SkilldisplayContent\Frontend\DataProcessing\: resource: '../Classes/Frontend/DataProcessing/*' public: true skilldisplay.settings: class: 'SkillDisplay\PHPToolKit\Configuration\Settings' factory: - - '@SkillDisplay\Typo3Extension\SettingsFactory' + - '@SkillDisplay\SkilldisplayContent\SettingsFactory' - 'createFromCurrentSiteConfiguration' SkillDisplay\PHPToolKit\Configuration\Settings: @@ -37,5 +37,5 @@ services: arguments: $settings: '@skilldisplay.settings' - SkillDisplay\Typo3Extension\Backend\Preview: + SkillDisplay\SkilldisplayContent\Backend\Preview: public: true diff --git a/Configuration/SiteConfiguration/Overrides/sites.php b/Configuration/SiteConfiguration/Overrides/sites.php index bebd83c..4e68314 100644 --- a/Configuration/SiteConfiguration/Overrides/sites.php +++ b/Configuration/SiteConfiguration/Overrides/sites.php @@ -36,4 +36,4 @@ ], ], ]); -})('skilldisplay', 'site'); +})('skilldisplay_content', 'site'); diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php index 624a6bb..1a12775 100644 --- a/Configuration/TCA/Overrides/sys_template.php +++ b/Configuration/TCA/Overrides/sys_template.php @@ -6,4 +6,4 @@ 'Configuration/TypoScript/', 'SkillDisplay' ); -})('skilldisplay', 'sys_template'); +})('skilldisplay_content', 'sys_template'); diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php index 5911056..b11ddb5 100644 --- a/Configuration/TCA/Overrides/tt_content.php +++ b/Configuration/TCA/Overrides/tt_content.php @@ -37,10 +37,11 @@ 'config' => [ 'type' => 'select', 'renderType' => 'selectSingle', - 'itemsProcFunc' => \SkillDisplay\Typo3Extension\TcaEnhancer::class . '->' . 'getCampaignsForTCA', + 'itemsProcFunc' => \SkillDisplay\SkilldisplayContent\TcaEnhancer::class + . '->' . 'getCampaignsForTCA', 'items' => [] ] ], ], ]); -})('skilldisplay', 'tt_content'); +})('skilldisplay_content', 'tt_content'); diff --git a/Configuration/TCA/Overrides/tt_content_skills.php b/Configuration/TCA/Overrides/tt_content_skills.php index 024970d..3114c25 100644 --- a/Configuration/TCA/Overrides/tt_content_skills.php +++ b/Configuration/TCA/Overrides/tt_content_skills.php @@ -41,7 +41,6 @@ $languagePath . $contentType, $contentType, 'skilldisplay-skill', - 'skilldisplay' ] ); -})('skilldisplay', 'tt_content', 'skilldisplay_skills'); +})('skilldisplay_content', 'tt_content', 'skilldisplay_skills'); diff --git a/Configuration/TCA/Overrides/tt_content_skillset.php b/Configuration/TCA/Overrides/tt_content_skillset.php index e462fca..6419cdf 100644 --- a/Configuration/TCA/Overrides/tt_content_skillset.php +++ b/Configuration/TCA/Overrides/tt_content_skillset.php @@ -41,7 +41,6 @@ $languagePath . $contentType, $contentType, 'skilldisplay-skillset', - 'skilldisplay' ] ); -})('skilldisplay', 'tt_content', 'skilldisplay_skillset'); +})('skilldisplay_content', 'tt_content', 'skilldisplay_skillset'); diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index 49d0364..868511a 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -3,7 +3,7 @@ tt_content.skilldisplay_skills { templateName = SkillDisplaySkills dataProcessing { - 10 = SkillDisplay\Typo3Extension\Frontend\DataProcessing\Skills + 10 = SkillDisplay\SkilldisplayContent\Frontend\DataProcessing\Skills 10 { skills.field = skilldisplay_skills } @@ -15,7 +15,7 @@ tt_content.skilldisplay_skillset { templateName = SkillDisplaySkillSet dataProcessing { - 10 = SkillDisplay\Typo3Extension\Frontend\DataProcessing\SkillSets + 10 = SkillDisplay\SkilldisplayContent\Frontend\DataProcessing\SkillSets 10 { skillSets.field = skilldisplay_skillset } @@ -24,6 +24,6 @@ tt_content.skilldisplay_skillset { page { includeCSS { - skilldisplay = EXT:skilldisplay/Resources/Public/Css/Styles.css + skilldisplay = EXT:skilldisplay_content/Resources/Public/Css/Styles.css } } diff --git a/README.rst b/README.rst index ef8a889..11404b1 100644 --- a/README.rst +++ b/README.rst @@ -29,14 +29,14 @@ The TypoScript contains the rendering definition for provided content elements. Next Step: Copy Templates or adjust template paths via TypoScript. In order to allow TYPO3 to find the Fluid templates for content elements, -either add the path `EXT:skilldisplay/Resources/Private/Templates/ContentElements/` in TypoScript, e.g.:: +either add the path `EXT:skilldisplay_content/Resources/Private/Templates/ContentElements/` in TypoScript, e.g.:: lib.contentElement { partialRootPaths { - 50 = EXT:skilldisplay/Resources/Private/Partials/ContentElements/ + 50 = EXT:skilldisplay_content/Resources/Private/Partials/ContentElements/ } templateRootPaths { - 50 = EXT:skilldisplay/Resources/Private/Templates/ContentElements/ + 50 = EXT:skilldisplay_content/Resources/Private/Templates/ContentElements/ } } diff --git a/Resources/Private/Language/locallang_be.xlf b/Resources/Private/Language/locallang_be.xlf index 9b4ad0c..39b3609 100644 --- a/Resources/Private/Language/locallang_be.xlf +++ b/Resources/Private/Language/locallang_be.xlf @@ -1,6 +1,6 @@ - + SkillDisplay diff --git a/Resources/Private/Language/locallang_tca.xlf b/Resources/Private/Language/locallang_tca.xlf index 3a541c9..fdb9882 100644 --- a/Resources/Private/Language/locallang_tca.xlf +++ b/Resources/Private/Language/locallang_tca.xlf @@ -1,6 +1,6 @@ - + SkillDisplay diff --git a/Resources/Private/Partials/ContentElements/VerificationBox.html b/Resources/Private/Partials/ContentElements/VerificationBox.html index 11a7e8b..e279b3a 100644 --- a/Resources/Private/Partials/ContentElements/VerificationBox.html +++ b/Resources/Private/Partials/ContentElements/VerificationBox.html @@ -22,7 +22,7 @@
- +
Self Assessment
 diff --git a/Resources/Private/Templates/Backend/ContentElements/Skills.html b/Resources/Private/Templates/Backend/ContentElements/Skills.html index 66b8adf..de9482f 100644 --- a/Resources/Private/Templates/Backend/ContentElements/Skills.html +++ b/Resources/Private/Templates/Backend/ContentElements/Skills.html @@ -1,6 +1,6 @@ {f:render(partial: 'VerificationBox', arguments: { diff --git a/Resources/Private/Templates/ContentElements/SkillDisplaySkills.html b/Resources/Private/Templates/ContentElements/SkillDisplaySkills.html index fc91724..50a3e3b 100644 --- a/Resources/Private/Templates/ContentElements/SkillDisplaySkills.html +++ b/Resources/Private/Templates/ContentElements/SkillDisplaySkills.html @@ -1,5 +1,5 @@ {f:render(partial: 'VerificationBox', arguments: { diff --git a/Tests/Unit/Backend/PreviewTest.php b/Tests/Unit/Backend/PreviewTest.php index 766f6d1..da91a8d 100644 --- a/Tests/Unit/Backend/PreviewTest.php +++ b/Tests/Unit/Backend/PreviewTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Tests\Unit\Backend; +namespace SkillDisplay\SkilldisplayContent\Tests\Unit\Backend; /* * Copyright (C) 2020 Daniel Siepmann @@ -28,12 +28,12 @@ use SkillDisplay\PHPToolKit\Api\Skill; use SkillDisplay\PHPToolKit\Api\SkillSet; use SkillDisplay\PHPToolKit\Entity\Skill as SkillEntity; use SkillDisplay\PHPToolKit\Entity\SkillSet as SkillSetEntity; -use SkillDisplay\Typo3Extension\Backend\Preview; +use SkillDisplay\SkilldisplayContent\Backend\Preview; use TYPO3\CMS\Backend\View\PageLayoutView; use TYPO3\TestingFramework\Core\Unit\UnitTestCase as TestCase; /** - * @covers SkillDisplay\Typo3Extension\Backend\Preview + * @covers SkillDisplay\SkilldisplayContent\Backend\Preview */ class PreviewTest extends TestCase { diff --git a/Tests/Unit/Frontend/DataProcessing/SkillSetsTest.php b/Tests/Unit/Frontend/DataProcessing/SkillSetsTest.php index 2c5c796..ba22109 100644 --- a/Tests/Unit/Frontend/DataProcessing/SkillSetsTest.php +++ b/Tests/Unit/Frontend/DataProcessing/SkillSetsTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Tests\Unit\Frontend\DataProcessing; +namespace SkillDisplay\SkilldisplayContent\Tests\Unit\Frontend\DataProcessing; /* * Copyright (C) 2020 Daniel Siepmann @@ -26,12 +26,12 @@ namespace SkillDisplay\Typo3Extension\Tests\Unit\Frontend\DataProcessing; use Prophecy\PhpUnit\ProphecyTrait; use SkillDisplay\PHPToolKit\Api\SkillSet; use SkillDisplay\PHPToolKit\Entity\SkillSet as SkillSetEntity; -use SkillDisplay\Typo3Extension\Frontend\DataProcessing\SkillSets; +use SkillDisplay\SkilldisplayContent\Frontend\DataProcessing\SkillSets; use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; use TYPO3\TestingFramework\Core\Unit\UnitTestCase as TestCase; /** - * @covers SkillDisplay\Typo3Extension\Frontend\DataProcessing\SkillSets + * @covers SkillDisplay\SkilldisplayContent\Frontend\DataProcessing\SkillSets */ class SkillSetsTest extends TestCase { diff --git a/Tests/Unit/Frontend/DataProcessing/SkillsTest.php b/Tests/Unit/Frontend/DataProcessing/SkillsTest.php index c4fd422..c37e93d 100644 --- a/Tests/Unit/Frontend/DataProcessing/SkillsTest.php +++ b/Tests/Unit/Frontend/DataProcessing/SkillsTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Tests\Unit\Frontend\DataProcessing; +namespace SkillDisplay\SkilldisplayContent\Tests\Unit\Frontend\DataProcessing; /* * Copyright (C) 2020 Daniel Siepmann @@ -26,12 +26,12 @@ namespace SkillDisplay\Typo3Extension\Tests\Unit\Frontend\DataProcessing; use Prophecy\PhpUnit\ProphecyTrait; use SkillDisplay\PHPToolKit\Api\Skill; use SkillDisplay\PHPToolKit\Entity\Skill as SkillEntity; -use SkillDisplay\Typo3Extension\Frontend\DataProcessing\Skills; +use SkillDisplay\SkilldisplayContent\Frontend\DataProcessing\Skills; use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; use TYPO3\TestingFramework\Core\Unit\UnitTestCase as TestCase; /** - * @covers SkillDisplay\Typo3Extension\Frontend\DataProcessing\Skills + * @covers SkillDisplay\SkilldisplayContent\Frontend\DataProcessing\Skills */ class SkillsTest extends TestCase { diff --git a/Tests/Unit/SettingsFactoryTest.php b/Tests/Unit/SettingsFactoryTest.php index ecc6a84..20f57e7 100644 --- a/Tests/Unit/SettingsFactoryTest.php +++ b/Tests/Unit/SettingsFactoryTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Tests\Unit; +namespace SkillDisplay\SkilldisplayContent\Tests\Unit; /* * Copyright (C) 2020 Daniel Siepmann @@ -25,13 +25,13 @@ namespace SkillDisplay\Typo3Extension\Tests\Unit; use Prophecy\PhpUnit\ProphecyTrait; use SkillDisplay\PHPToolKit\Configuration\Settings; -use SkillDisplay\Typo3Extension\SettingsFactory; +use SkillDisplay\SkilldisplayContent\SettingsFactory; use TYPO3\CMS\Core\Http\ServerRequest; use TYPO3\CMS\Core\Site\Entity\Site; use TYPO3\TestingFramework\Core\Unit\UnitTestCase as TestCase; /** - * @covers SkillDisplay\Typo3Extension\SettingsFactory + * @covers SkillDisplay\SkilldisplayContent\SettingsFactory */ class SettingsFactoryTest extends TestCase { diff --git a/Tests/Unit/ViewHelpers/Verification/ButtonViewHelperTest.php b/Tests/Unit/ViewHelpers/Verification/ButtonViewHelperTest.php index a5d8330..3fc85e5 100644 --- a/Tests/Unit/ViewHelpers/Verification/ButtonViewHelperTest.php +++ b/Tests/Unit/ViewHelpers/Verification/ButtonViewHelperTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Tests\Unit\ViewHelpers\Verification; +namespace SkillDisplay\SkilldisplayContent\Tests\Unit\ViewHelpers\Verification; /* * Copyright (C) 2020 Daniel Siepmann @@ -26,14 +26,14 @@ namespace SkillDisplay\Typo3Extension\Tests\Unit\ViewHelpers\Verification; use Prophecy\PhpUnit\ProphecyTrait; use Prophecy\Prophecy\ObjectProphecy; use SkillDisplay\PHPToolKit\Verification\Link; -use SkillDisplay\Typo3Extension\ViewHelpers\Verification\ButtonViewHelper; +use SkillDisplay\SkilldisplayContent\ViewHelpers\Verification\ButtonViewHelper; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\TestingFramework\Core\Unit\UnitTestCase as TestCase; /** - * @covers SkillDisplay\Typo3Extension\ViewHelpers\Verification\ButtonViewHelper - * @covers SkillDisplay\Typo3Extension\ViewHelpers\VerificationViewHelper + * @covers SkillDisplay\SkilldisplayContent\ViewHelpers\Verification\ButtonViewHelper + * @covers SkillDisplay\SkilldisplayContent\ViewHelpers\VerificationViewHelper */ class ButtonViewHelperTest extends TestCase { diff --git a/Tests/Unit/ViewHelpers/Verification/UrlViewHelperTest.php b/Tests/Unit/ViewHelpers/Verification/UrlViewHelperTest.php index 2ea4c86..714c47c 100644 --- a/Tests/Unit/ViewHelpers/Verification/UrlViewHelperTest.php +++ b/Tests/Unit/ViewHelpers/Verification/UrlViewHelperTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SkillDisplay\Typo3Extension\Tests\Unit\ViewHelpers\Verification; +namespace SkillDisplay\SkilldisplayContent\Tests\Unit\ViewHelpers\Verification; /* * Copyright (C) 2020 Daniel Siepmann @@ -26,14 +26,14 @@ namespace SkillDisplay\Typo3Extension\Tests\Unit\ViewHelpers\Verification; use Prophecy\PhpUnit\ProphecyTrait; use Prophecy\Prophecy\ObjectProphecy; use SkillDisplay\PHPToolKit\Verification\Link; -use SkillDisplay\Typo3Extension\ViewHelpers\Verification\UrlViewHelper; +use SkillDisplay\SkilldisplayContent\ViewHelpers\Verification\UrlViewHelper; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\TestingFramework\Core\Unit\UnitTestCase as TestCase; /** - * @covers SkillDisplay\Typo3Extension\ViewHelpers\Verification\UrlViewHelper - * @covers SkillDisplay\Typo3Extension\ViewHelpers\VerificationViewHelper + * @covers SkillDisplay\SkilldisplayContent\ViewHelpers\Verification\UrlViewHelper + * @covers SkillDisplay\SkilldisplayContent\ViewHelpers\VerificationViewHelper */ class UrlViewHelperTest extends TestCase { diff --git a/composer.json b/composer.json index a421078..34522dd 100644 --- a/composer.json +++ b/composer.json @@ -17,12 +17,12 @@ ], "autoload": { "psr-4": { - "SkillDisplay\\Typo3Extension\\": "Classes/" + "SkillDisplay\\SkilldisplayContent\\": "Classes/" } }, "autoload-dev": { "psr-4": { - "SkillDisplay\\Typo3Extension\\Tests\\": "Tests/" + "SkillDisplay\\SkilldisplayContent\\Tests\\": "Tests/" } }, "require": { @@ -48,14 +48,13 @@ "prefer-stable": true, "scripts": { "post-autoload-dump": [ - "mkdir -p .Build/web/typo3conf/ext/", - "[ -L .Build/web/typo3conf/ext/skilldisplay ] || ln -snvf ../../../../. .Build/web/typo3conf/ext/skilldisplay" + "TYPO3\\TestingFramework\\Composer\\ExtensionTestEnvironment::prepare" ] }, "extra": { "typo3/cms": { "cms-package-dir": "{$vendor-dir}/typo3/cms", - "extension-key": "skilldisplay", + "extension-key": "skilldisplay_content", "web-dir": ".Build/web" }, "branch-alias": { diff --git a/ext_localconf.php b/ext_localconf.php index 85c9815..c544be0 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -23,5 +23,5 @@ } $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem'][$extKey] = - \SkillDisplay\Typo3Extension\Backend\Preview::class; -})('skilldisplay'); + \SkillDisplay\SkilldisplayContent\Backend\Preview::class; +})('skilldisplay_content');