[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
This commit is contained in:
Markus Klein 2021-01-25 16:02:17 +01:00
parent 6dc8bed8c3
commit 9f43ea427b
35 changed files with 68 additions and 71 deletions

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension\Backend;
namespace SkillDisplay\SkilldisplayContent\Backend;
/*
* Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension\Frontend\DataProcessing;
namespace SkillDisplay\SkilldisplayContent\Frontend\DataProcessing;
/*
* Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension\Frontend\DataProcessing;
namespace SkillDisplay\SkilldisplayContent\Frontend\DataProcessing;
/*
* Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension;
namespace SkillDisplay\SkilldisplayContent;
/*
* Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension;
namespace SkillDisplay\SkilldisplayContent;
use SkillDisplay\PHPToolKit\Api\Campaigns;
use SkillDisplay\PHPToolKit\Entity\Campaign;

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension\ViewHelpers\Verification;
namespace SkillDisplay\SkilldisplayContent\ViewHelpers\Verification;
/*
* Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>
@ -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

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension\ViewHelpers\Verification;
namespace SkillDisplay\SkilldisplayContent\ViewHelpers\Verification;
/*
* Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>
@ -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

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension\ViewHelpers;
namespace SkillDisplay\SkilldisplayContent\ViewHelpers;
/*
* Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>
@ -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
{

View file

@ -1 +1 @@
@import 'EXT:skilldisplay/Configuration/PageTSconfig/Mod/Wizards/*.tsconfig'
@import 'EXT:skilldisplay_content/Configuration/PageTSconfig/Mod/Wizards/*.tsconfig'

View file

@ -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 = *
}
}

View file

@ -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
}

View file

@ -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
}

View file

@ -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

View file

@ -36,4 +36,4 @@
],
],
]);
})('skilldisplay', 'site');
})('skilldisplay_content', 'site');

View file

@ -6,4 +6,4 @@
'Configuration/TypoScript/',
'SkillDisplay'
);
})('skilldisplay', 'sys_template');
})('skilldisplay_content', 'sys_template');

View file

@ -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');

View file

@ -41,7 +41,6 @@
$languagePath . $contentType,
$contentType,
'skilldisplay-skill',
'skilldisplay'
]
);
})('skilldisplay', 'tt_content', 'skilldisplay_skills');
})('skilldisplay_content', 'tt_content', 'skilldisplay_skills');

View file

@ -41,7 +41,6 @@
$languagePath . $contentType,
$contentType,
'skilldisplay-skillset',
'skilldisplay'
]
);
})('skilldisplay', 'tt_content', 'skilldisplay_skillset');
})('skilldisplay_content', 'tt_content', 'skilldisplay_skillset');

View file

@ -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
}
}

View file

@ -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/
}
}

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="messages" date="2020-11-27T22:38:17+01:00" product-name="skilldisplay">
<file source-language="en" datatype="plaintext" original="messages" date="2020-11-27T22:38:17+01:00" product-name="skilldisplay_content">
<body>
<trans-unit id="newContentElement.skilldisplay.header" resname="newContentElement.skilldisplay.header">
<source>SkillDisplay</source>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="messages" date="2020-11-27T22:38:17+01:00" product-name="skilldisplay">
<file source-language="en" datatype="plaintext" original="messages" date="2020-11-27T22:38:17+01:00" product-name="skilldisplay_content">
<body>
<trans-unit id="tt_content.CType.itemGroups.skilldisplay" resname="tt_content.CType.itemGroups.skilldisplay">
<source>SkillDisplay</source>

View file

@ -22,7 +22,7 @@
<div class="sd-buttons">
<a href="{verificationUrl}" target="_blank" class="sd-button sd-learner">
<div class="sd-hint">
<f:image src="{f:uri.resource(extensionName: 'skilldisplay', path: 'Images/default.svg')}" title="Not learned yet" alt="Indicates self assessment is not done yet" />
<f:image src="{f:uri.resource(extensionName: 'SkilldisplayContent', path: 'Images/default.svg')}" title="Not learned yet" alt="Indicates self assessment is not done yet" />
</div>
<div class="sd-type">Self Assessment</div>
</a>

View file

@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
xmlns:sd="http://typo3.org/ns/SkillDisplay/Typo3Extension/ViewHelpers"
xmlns:sd="http://typo3.org/ns/SkillDisplay/SkilldisplayContent/ViewHelpers"
data-namespace-typo3-fluid="true">
<a href="{be:uri.editRecord(

View file

@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
xmlns:sd="http://typo3.org/ns/SkillDisplay/Typo3Extension/ViewHelpers"
xmlns:sd="http://typo3.org/ns/SkillDisplay/SkilldisplayContent/ViewHelpers"
data-namespace-typo3-fluid="true">
<a href="{be:uri.editRecord(

View file

@ -1,5 +1,5 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:sd="http://typo3.org/ns/SkillDisplay/Typo3Extension/ViewHelpers"
xmlns:sd="http://typo3.org/ns/SkillDisplay/SkilldisplayContent/ViewHelpers"
data-namespace-typo3-fluid="true">
<f:for each="{skillSets}" as="skillSet">
{f:render(partial: 'VerificationBox', arguments: {

View file

@ -1,5 +1,5 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:sd="http://typo3.org/ns/SkillDisplay/Typo3Extension/ViewHelpers"
xmlns:sd="http://typo3.org/ns/SkillDisplay/SkilldisplayContent/ViewHelpers"
data-namespace-typo3-fluid="true">
<f:for each="{skills}" as="skill">
{f:render(partial: 'VerificationBox', arguments: {

View file

@ -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 <coding@daniel-siepmann.de>
@ -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
{

View file

@ -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 <coding@daniel-siepmann.de>
@ -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
{

View file

@ -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 <coding@daniel-siepmann.de>
@ -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
{

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace SkillDisplay\Typo3Extension\Tests\Unit;
namespace SkillDisplay\SkilldisplayContent\Tests\Unit;
/*
* Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>
@ -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
{

View file

@ -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 <coding@daniel-siepmann.de>
@ -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
{

View file

@ -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 <coding@daniel-siepmann.de>
@ -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
{

View file

@ -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": {

View file

@ -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');