Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[!!!][TASK] Drop additional namespace segment for the Tea model #1025

Merged
merged 1 commit into from
Jan 16, 2024
Merged

[!!!][TASK] Drop additional namespace segment for the Tea model #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
### Added

### Changed
- Drop additional namespace segment for the Tea model (#1025)

### Deprecated

Expand Down
4 changes: 2 additions & 2 deletions Classes/Controller/FrontEndEditorController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace TTN\Tea\Controller;

use Psr\Http\Message\ResponseInterface;
use TTN\Tea\Domain\Model\Product\Tea;
use TTN\Tea\Domain\Repository\Product\TeaRepository;
use TTN\Tea\Domain\Model\Tea;
use TTN\Tea\Domain\Repository\TeaRepository;
use TYPO3\CMS\Core\Context\Context;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Annotation as Extbase;
Expand Down
4 changes: 2 additions & 2 deletions Classes/Controller/TeaController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace TTN\Tea\Controller;

use Psr\Http\Message\ResponseInterface;
use TTN\Tea\Domain\Model\Product\Tea;
use TTN\Tea\Domain\Repository\Product\TeaRepository;
use TTN\Tea\Domain\Model\Tea;
use TTN\Tea\Domain\Repository\TeaRepository;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;

/**
Expand Down
2 changes: 1 addition & 1 deletion Classes/Domain/Model/Product/Tea.php → Classes/Domain/Model/Tea.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace TTN\Tea\Domain\Model\Product;
namespace TTN\Tea\Domain\Model;

use TYPO3\CMS\Extbase\Annotation as Extbase;
use TYPO3\CMS\Extbase\Domain\Model\FileReference;
Expand Down
4 changes: 2 additions & 2 deletions ...main/Repository/Product/TeaRepository.php → Classes/Domain/Repository/TeaRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

declare(strict_types=1);

namespace TTN\Tea\Domain\Repository\Product;
namespace TTN\Tea\Domain\Repository;

use TTN\Tea\Domain\Model\Product\Tea;
use TTN\Tea\Domain\Model\Tea;
use TTN\Tea\Domain\Repository\Traits\StoragePageAgnosticTrait;
use TYPO3\CMS\Extbase\Persistence\QueryInterface;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Extbase/Persistence/Classes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
declare(strict_types=1);

return [
\TTN\Tea\Domain\Model\Product\Tea::class => [
\TTN\Tea\Domain\Model\Tea::class => [
'properties' => [
'ownerUid' => ['fieldName' => 'owner'],
],
Expand Down
30 changes: 15 additions & 15 deletions ...n/TCA/tx_tea_domain_model_product_tea.php → ...iguration/TCA/tx_tea_domain_model_tea.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$tca = [
'ctrl' => [
'title' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea',
'title' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea',
'label' => 'title',
'tstamp' => 'tstamp',
'crdate' => 'crdate',
Expand All @@ -26,19 +26,19 @@
'showitem' =>
'--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
title, description, image, owner,
--div--;LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.tabs.access,
--div--;LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.tabs.access,
--palette--;;hidden,
--palette--;;access,',
],
],
'palettes' => [
'hidden' => [
'showitem' => '
hidden;LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.hidden
hidden;LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.hidden
',
],
'access' => [
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.palettes.access',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.palettes.access',
'showitem' => '
starttime;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:starttime_formlabel,
endtime;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:endtime_formlabel,
Expand All @@ -50,7 +50,7 @@
'columns' => [
'hidden' => [
'exclude' => true,
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.hidden',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.hidden',
'config' => [
'type' => 'check',
'renderType' => 'checkboxToggle',
Expand Down Expand Up @@ -107,10 +107,10 @@
'value' => 0,
],
],
'foreign_table' => 'tx_tea_domain_model_product_tea',
'foreign_table' => 'tx_tea_domain_model_tea',
'foreign_table_where' =>
'AND {#tx_tea_domain_model_product_tea}.{#pid}=###CURRENT_PID###
AND {#tx_tea_domain_model_product_tea}.{#sys_language_uid} IN (-1,0)',
'AND {#tx_tea_domain_model_tea}.{#pid}=###CURRENT_PID###
AND {#tx_tea_domain_model_tea}.{#sys_language_uid} IN (-1,0)',
'default' => 0,
],
],
Expand All @@ -126,7 +126,7 @@
],
],
'title' => [
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.title',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.title',
'config' => [
'type' => 'input',
'size' => 40,
Expand All @@ -136,7 +136,7 @@
],
],
'description' => [
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.description',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.description',
'config' => [
'type' => 'text',
'enableRichtext' => true,
Expand All @@ -147,7 +147,7 @@
],
],
'image' => [
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.image',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.image',
'config' => [
'type' => 'file',
'maxitems' => 1,
Expand All @@ -164,7 +164,7 @@
'fe_group' => [
'exclude' => true,
'l10n_mode' => 'exclude',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.fe_group',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.fe_group',
'config' => [
'type' => 'select',
'renderType' => 'selectMultipleSideBySide',
Expand All @@ -191,7 +191,7 @@
'owner' => [
'exclude' => true,
'l10n_mode' => 'exclude',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.owner',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.owner',
'config' => [
'type' => 'group',
'allowed' => 'fe_users',
Expand Down Expand Up @@ -231,7 +231,7 @@
],
];
$tca['columns']['image'] = [
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.image',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.image',
'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig(
'image',
[
Expand All @@ -248,7 +248,7 @@
];
$tca['columns']['hidden']['config'] = [
'type' => 'check',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_product_tea.hidden',
'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_tea.hidden',
'items' => [
[
0 => '',
Expand Down
16 changes: 8 additions & 8 deletions Resources/Private/Language/de.locallang_db.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@
<file source-language="en" target-language="de" datatype="plaintext" original="messages">
<header/>
<body>
<trans-unit id="tx_tea_domain_model_product_tea">
<trans-unit id="tx_tea_domain_model_tea">
<source>Tea</source>
<target>Tee</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.tabs.access">
<trans-unit id="tx_tea_domain_model_tea.tabs.access">
<source>Access</source>
<target>Zugriff</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.title">
<trans-unit id="tx_tea_domain_model_tea.title">
<source>Title</source>
<target>Titel</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.description">
<trans-unit id="tx_tea_domain_model_tea.description">
<source>Description</source>
<target>Beschreibung</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.image">
<trans-unit id="tx_tea_domain_model_tea.image">
<source>Image</source>
<target>Bild</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.owner">
<trans-unit id="tx_tea_domain_model_tea.owner">
<source>Website user who created this record</source>
<target>Website-Benutzer, der diesen Datensatz erstellt hat</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.fe_group">
<trans-unit id="tx_tea_domain_model_tea.fe_group">
<source>Usergroup Access Rights</source>
<target>Zugriffsrechte für Benutzergruppen</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.hidden">
<trans-unit id="tx_tea_domain_model_tea.hidden">
<source>Visible</source>
<target>Sichtbar</target>
</trans-unit>
Expand Down
16 changes: 8 additions & 8 deletions Resources/Private/Language/locallang_db.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
<file source-language="en" datatype="plaintext" original="messages">
<header/>
<body>
<trans-unit id="tx_tea_domain_model_product_tea">
<trans-unit id="tx_tea_domain_model_tea">
<source>Tea</source>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.tabs.access">
<trans-unit id="tx_tea_domain_model_tea.tabs.access">
<source>Access</source>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.title">
<trans-unit id="tx_tea_domain_model_tea.title">
<source>Title</source>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.description">
<trans-unit id="tx_tea_domain_model_tea.description">
<source>Description</source>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.image">
<trans-unit id="tx_tea_domain_model_tea.image">
<source>Image</source>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.owner">
<trans-unit id="tx_tea_domain_model_tea.owner">
<source>Website user who created this record</source>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.fe_group">
<trans-unit id="tx_tea_domain_model_tea.fe_group">
<source>Usergroup Access Rights</source>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.hidden">
<trans-unit id="tx_tea_domain_model_tea.hidden">
<source>Visible</source>
</trans-unit>
</body>
Expand Down
14 changes: 7 additions & 7 deletions Resources/Private/Language/pl.locallang_db.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
<file source-language="en" target-language="pl" datatype="plaintext" original="messages">
<header/>
<body>
<trans-unit id="tx_tea_domain_model_product_tea">
<trans-unit id="tx_tea_domain_model_tea">
<source>Tea</source>
<target>Herbata</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.tabs.access">
<trans-unit id="tx_tea_domain_model_tea.tabs.access">
<source>Access</source>
<target>Dostęp</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.title">
<trans-unit id="tx_tea_domain_model_tea.title">
<source>Title</source>
<target>Tytuł</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.description">
<trans-unit id="tx_tea_domain_model_tea.description">
<source>Description</source>
<target>Opis</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.image">
<trans-unit id="tx_tea_domain_model_tea.image">
<source>Image</source>
<target>Obraz</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.owner">
<trans-unit id="tx_tea_domain_model_tea.owner">
<source>Website user who created this record</source>
<target>Użytkownik strony, który utworzył ten rekord</target>
</trans-unit>
<trans-unit id="tx_tea_domain_model_product_tea.fe_group">
<trans-unit id="tx_tea_domain_model_tea.fe_group">
<source>Usergroup Access Rights</source>
<target>Prawa dostępu grupy użytkowników</target>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/Controller/Fixtures/Database/Teas.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","pid","title"
,1,2,"Godesberger Burgtee"
,2,2,"Oolong"
2 changes: 1 addition & 1 deletion ...ository/Fixtures/Product/PersistedTea.csv → ...main/Repository/Fixtures/PersistedTea.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","title"
,1,"Godesberger Burgtee"
2 changes: 1 addition & 1 deletion ...Repository/Fixtures/Product/TeaOnPage.csv → .../Domain/Repository/Fixtures/TeaOnPage.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","pid","title"
,1,1,"Earl Grey"
2 changes: 1 addition & 1 deletion ...Fixtures/Product/TeaWithAllScalarData.csv → ...ository/Fixtures/TeaWithAllScalarData.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","pid","title","description","owner"
,1,1,"Earl Grey","Fresh and hot.",2
4 changes: 2 additions & 2 deletions ...ository/Fixtures/Product/TeaWithImage.csv → ...main/Repository/Fixtures/TeaWithImage.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","pid","title","image",
,1,1,"Gunpowder",1

"sys_file_reference"
,"uid","uid_foreign","tablenames","fieldname"
,1,1,"tx_tea_domain_model_product_tea","image"
,1,1,"tx_tea_domain_model_tea","image"
2 changes: 1 addition & 1 deletion ...ository/Fixtures/Product/TeaWithOwner.csv → ...main/Repository/Fixtures/TeaWithOwner.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","pid","title","owner"
,"1","1","Earl Grey",1
2 changes: 1 addition & 1 deletion ...tory/Fixtures/Product/TeaWithoutOwner.csv → ...n/Repository/Fixtures/TeaWithoutOwner.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","pid","title","owner"
,1,1,"Earl Grey",0
2 changes: 1 addition & 1 deletion ...ory/Fixtures/Product/TwoTeasWithOwner.csv → .../Repository/Fixtures/TwoTeasWithOwner.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","pid","title","owner"
,1,1,"Earl Grey",1
,2,1,"Assam",1
2 changes: 1 addition & 1 deletion ...tory/Fixtures/Product/TwoUnsortedTeas.csv → ...n/Repository/Fixtures/TwoUnsortedTeas.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"tx_tea_domain_model_product_tea"
"tx_tea_domain_model_tea"
,"uid","pid","title"
,1,1,"Earl Grey"
,2,1,"Assam"
Loading