From b02172f31e1be6cd989d5b44adaecf726266ae58 Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Fri, 16 Oct 2020 16:22:32 +0200 Subject: [PATCH] [BUGFIX] Workspace and reference index fixes This drops all left over calls that suppress the refindex integrity checks in DataHandler functional tests, except those within ManyToMany tests: This area needs more work before the reference index can be fixed. Two bugs indirectly related to the reference index are fixed along the way, those can't be separated as standalone patches: * When a translated page is deleted in workspaces, the DataHandler deleted live records on this page, too. This is fixed by adding a proper db restriction. This also fixes the reference index state in this scenario. * When publishing a delete placeholder that has inline children, workspace delete placeholders are created for the children, which is wrong. This happens because the user is not set to the live workspace during the publish operation. Temporarily changing the user workspace to live not only fixes the reference index, but does not create the bogus inline children placeholder records anymore, too. Change-Id: I897f6a93b1d5a579bfa5c52e93e65119a018e4aa Resolves: #92589 Related: #92467 Releases: master, 10.4 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66152 Tested-by: TYPO3com Tested-by: Benni Mack Tested-by: Anja Leichsenring Tested-by: Christian Kuhn Reviewed-by: Benni Mack Reviewed-by: David Steeb Reviewed-by: Anja Leichsenring Reviewed-by: Christian Kuhn --- .../core/Classes/DataHandling/DataHandler.php | 33 ++++++++++++ .../Regular/AbstractActionTestCase.php | 13 ++++- .../Regular/Modify/ActionTest.php | 9 ---- ...izeContentWithEmptyTcaIntegrityColumns.csv | 3 -- .../Classes/Hook/DataHandlerHook.php | 15 ++++-- .../DataHandling/FAL/Modify/ActionTest.php | 6 --- .../modifyContentNDeleteAllFileReference.csv | 4 +- .../modifyContentNDeleteFileReference.csv | 4 +- .../FAL/Publish/DataSet/deleteContent.csv | 4 ++ .../FAL/PublishAll/DataSet/deleteContent.csv | 4 ++ .../IRRE/CSV/Publish/ActionTest.php | 3 -- .../IRRE/CSV/Publish/DataSet/deletePage.csv | 53 +++++-------------- .../Publish/DataSet/deleteParentContent.csv | 5 ++ .../IRRE/CSV/PublishAll/ActionTest.php | 3 -- .../CSV/PublishAll/DataSet/deletePage.csv | 53 +++++-------------- .../DataSet/deleteParentContent.csv | 5 ++ .../DataSet/modifyParentNDeleteHotelChild.csv | 3 ++ .../IRRE/ForeignField/Modify/ActionTest.php | 3 -- .../DataSet/modifyParentNDeleteHotelChild.csv | 2 +- .../IRRE/ForeignField/Publish/ActionTest.php | 3 -- .../Publish/DataSet/deletePage.csv | 28 ---------- .../Publish/DataSet/deleteParentContent.csv | 3 ++ .../DataSet/modifyParentNDeleteHotelChild.csv | 2 + .../ForeignField/PublishAll/ActionTest.php | 3 -- .../PublishAll/DataSet/deletePage.csv | 28 ---------- .../DataSet/deleteParentContent.csv | 3 ++ .../DataSet/modifyParentNDeleteHotelChild.csv | 2 + .../DataSet/deleteContentOfRelation.csv | 10 +--- .../DataSet/deleteContentOfRelation.csv | 10 +--- .../Regular/Discard/ActionTest.php | 9 ---- .../changeContentSortingNDeleteLiveRecord.csv | 4 +- ...geAndContentsAndDeletePageLocalization.csv | 4 +- .../Regular/Modify/ActionTest.php | 15 ------ .../changeContentSortingNDeleteLiveRecord.csv | 4 +- ...izeContentWithEmptyTcaIntegrityColumns.csv | 3 -- ...geAndContentsAndDeletePageLocalization.csv | 4 +- .../Regular/Publish/ActionTest.php | 9 ---- ...tePlaceholdersAndDeleteDraftParentPage.csv | 14 ++--- .../Regular/Publish/DataSet/deleteContent.csv | 2 +- .../Publish/DataSet/deleteContentAndPage.csv | 14 ++--- .../deleteLocalizedContentNDeleteContent.csv | 4 +- .../Regular/Publish/DataSet/deletePage.csv | 14 ++--- .../Regular/PublishAll/ActionTest.php | 15 ------ ...tePlaceholdersAndDeleteDraftParentPage.csv | 12 ++--- .../PublishAll/DataSet/deleteContent.csv | 2 +- .../DataSet/deleteContentAndPage.csv | 12 ++--- .../deleteLocalizedContentNDeleteContent.csv | 4 +- .../Regular/PublishAll/DataSet/deletePage.csv | 12 ++--- ...geAndContentsAndDeletePageLocalization.csv | 4 +- 49 files changed, 161 insertions(+), 317 deletions(-) diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php index 7666898a5e54..1a71207bc144 100644 --- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php +++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php @@ -3576,6 +3576,15 @@ public function copyRecord_raw($table, $uid, $pid, $overrideArray = [], array $w } // Do the copy by internal function $theNewSQLID = $this->insertNewCopyVersion($table, $row, $pid); + + // When a record is copied in workspace (eg. to create a delete placeholder record for a live record), records + // pointing to that record need a reference index update. This is for instance the case in FAL, if a sys_file_reference + // for a eg. tt_content record is marked as deleted. The tt_content record then needs a reference index update. + // This scenario seems to currently only show up if in workspaces, so the refindex update is restricted to this for now. + if (!empty($workspaceOptions)) { + $this->referenceIndexUpdater->registerUpdateForReferencesToItem($table, (int)$row['uid'], (int)$this->BE_USER->workspace); + } + if ($theNewSQLID) { $this->dbAnalysisStoreExec(); $this->dbAnalysisStore = []; @@ -4716,11 +4725,23 @@ public function deleteVersionsForRecord($table, $uid, $forceHardDelete) if (is_array($versions)) { foreach ($versions as $verRec) { if (!$verRec['_CURRENT_VERSION']) { + $currentUserWorkspace = null; + if ((int)$verRec['t3ver_wsid'] !== (int)$this->BE_USER->workspace) { + // If deleting records from 'foreign' / 'other' workspaces, the be user must be put into + // this workspace temporarily so stuff like refindex updating is registered for this workspace + // when deleting records in there. + $currentUserWorkspace = $this->BE_USER->workspace; + $this->BE_USER->workspace = (int)$verRec['t3ver_wsid']; + } if ($table === 'pages') { $this->deletePages($verRec['uid'], true, $forceHardDelete); } else { $this->deleteRecord($table, $verRec['uid'], true, $forceHardDelete); } + if ($currentUserWorkspace !== null) { + // Switch back workspace + $this->BE_USER->workspace = $currentUserWorkspace; + } } } } @@ -4974,6 +4995,18 @@ public function deleteSpecificPage($uid, $forceHardDelete = false, bool $deleteR ) ); } + + $currentUserWorkspace = (int)$this->BE_USER->workspace; + if ($currentUserWorkspace !== 0 && BackendUtility::isTableWorkspaceEnabled($table)) { + // If we are in a workspace, make sure only records of this workspace are deleted. + $queryBuilder->andWhere( + $queryBuilder->expr()->eq( + 't3ver_wsid', + $queryBuilder->createNamedParameter($currentUserWorkspace, \PDO::PARAM_INT) + ) + ); + } + $statement = $queryBuilder->execute(); while ($row = $statement->fetch()) { diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php index 4b5e642af9c5..2412c8625c1a 100644 --- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php +++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php @@ -15,8 +15,10 @@ namespace TYPO3\CMS\Core\Tests\Functional\DataHandling\Regular; +use TYPO3\CMS\Core\Database\ReferenceIndex; use TYPO3\CMS\Core\Migrations\TcaMigration; use TYPO3\CMS\Core\Tests\Functional\DataHandling\AbstractDataHandlerActionTestCase; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\StringUtility; /** @@ -191,10 +193,17 @@ public function localizeContentWithEmptyTcaIntegrityColumns() foreach ($integrityFieldNames as $integrityFieldName) { unset($GLOBALS['TCA'][self::TABLE_Content]['columns'][$integrityFieldName]); } + // After TCA changes, refindex is not ok anymore for imported rows. Update it before performing other actions. + $referenceIndex = GeneralUtility::makeInstance(ReferenceIndex::class); + $referenceIndex->updateIndex(false); + // explicitly call TcaMigration (which was executed already earlier in functional testing bootstrap) $GLOBALS['TCA'] = (new TcaMigration())->migrate($GLOBALS['TCA']); + // create translated page first + $this->actionService->copyRecordToLanguage(self::TABLE_Page, self::VALUE_PageId, self::VALUE_LanguageId); // perform actions to be tested - self::localizeContent(); + $localizedTableIds = $this->actionService->localizeRecord(self::TABLE_Content, self::VALUE_ContentIdSecond, self::VALUE_LanguageId); + $this->recordIds['localizedContentId'] = $localizedTableIds[self::TABLE_Content][self::VALUE_ContentIdSecond]; } public function localizeContentWithLanguageSynchronization() @@ -399,6 +408,8 @@ public function localizePageAndContentsAndDeletePageLocalization() $this->recordIds['localizedPageId'] = $localizedTableIds[self::TABLE_Page][self::VALUE_PageId]; $localizedTableIds = $this->actionService->localizeRecord(self::TABLE_Content, self::VALUE_ContentIdSecond, self::VALUE_LanguageId); $this->recordIds['localizedContentId'] = $localizedTableIds[self::TABLE_Content][self::VALUE_ContentIdSecond]; + // Deleting the localized page should also delete its localized records + $this->actionService->deleteRecord(self::TABLE_Page, $this->recordIds['localizedPageId']); } public function localizeNestedPagesAndContents() diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php index c8850129e33c..5ed1f2750c1b 100644 --- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php +++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php @@ -269,18 +269,12 @@ public function localizeContent() */ public function localizeContentWithEmptyTcaIntegrityColumns() { - // Create translated page first - $this->actionService->copyRecordToLanguage(self::TABLE_Page, self::VALUE_PageId, self::VALUE_LanguageId); parent::localizeContentWithEmptyTcaIntegrityColumns(); $this->assertAssertionDataSet('localizeContentWithEmptyTcaIntegrityColumns'); $responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseSections(); self::assertThat($responseSections, $this->getRequestSectionHasRecordConstraint() ->setTable(self::TABLE_Content)->setField('header')->setValues('[Translate to Dansk:] Regular Element #1', '[Translate to Dansk:] Regular Element #2')); - - // Due to the changed TCA columns passthrough vs select, reference index updates are performed - // differently for this test. We disable the 'clean refindex' test in tearDown() here. - $this->assertCleanReferenceIndex = false; } /** @@ -716,9 +710,6 @@ public function localizePageAndContentsAndDeletePageLocalization() { // Create localized page and localize content elements first parent::localizePageAndContentsAndDeletePageLocalization(); - - // Deleting the localized page should also delete its localized records - $this->actionService->deleteRecord(self::TABLE_Page, $this->recordIds['localizedPageId']); $this->assertAssertionDataSet('localizePageAndContentsAndDeletePageLocalization'); } diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv index 0f0a66a86547..47e8cd8ca487 100644 --- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv +++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv @@ -11,8 +11,5 @@ "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, -,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297, -,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297, ,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89, ,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1, diff --git a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php index fe4b60a0cac0..8ce0f34b361d 100644 --- a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php +++ b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php @@ -711,12 +711,19 @@ protected function version_swap($table, $id, $swapWith, DataHandler $dataHandler // Register swapped ids for later remapping: $this->remappedIds[$table][$id] = $swapWith; $this->remappedIds[$table][$swapWith] = $id; - // Checking for delete: - // Delete only if new/deleted placeholders are there. - if (((int)$t3ver_state['swapVersion'] === VersionState::NEW_PLACEHOLDER || (int)$t3ver_state['swapVersion'] === VersionState::DELETE_PLACEHOLDER)) { - // Force delete + if ((int)$t3ver_state['swapVersion'] === VersionState::NEW_PLACEHOLDER) { + // Delete t3ver_state = 1 record as t3ver_state = -1 record is going to be live $dataHandler->deleteEl($table, $id, true); } + if ((int)$t3ver_state['swapVersion'] === VersionState::DELETE_PLACEHOLDER) { + // We're publishing a delete placeholder t3ver_state = 2. This means the live record should + // be set to deleted. We're currently in some workspace and deal with a live record here. Thus, + // we temporarily set backend user workspace to 0 so all operations happen as in live. + $currentUserWorkspace = $dataHandler->BE_USER->workspace; + $dataHandler->BE_USER->workspace = 0; + $dataHandler->deleteEl($table, $id, true); + $dataHandler->BE_USER->workspace = $currentUserWorkspace; + } if ($dataHandler->enableLogging) { $dataHandler->log($table, $id, SystemLogGenericAction::UNDEFINED, 0, SystemLogErrorClassification::MESSAGE, 'Publishing successful for table "' . $table . '" uid ' . $id . '=>' . $swapWith, -1, [], $dataHandler->eventPid($table, $id, $swapVersion['pid'])); } diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php index affd01c2499b..bf894856551e 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php @@ -228,9 +228,6 @@ public function modifyContentAndDeleteFileReference() self::assertThat($responseSections, $this->getRequestSectionStructureDoesNotHaveRecordConstraint() ->setRecordIdentifier(self::TABLE_Content . ':' . self::VALUE_ContentIdLast)->setRecordField(self::FIELD_ContentImage) ->setTable(self::TABLE_FileReference)->setField('title')->setValues('Taken at T3BOARD')); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** @@ -245,9 +242,6 @@ public function modifyContentAndDeleteAllFileReference() self::assertThat($responseSections, $this->getRequestSectionStructureDoesNotHaveRecordConstraint() ->setRecordIdentifier(self::TABLE_Content . ':' . self::VALUE_ContentIdLast)->setRecordField(self::FIELD_ContentImage) ->setTable(self::TABLE_FileReference)->setField('title')->setValues('Taken at T3BOARD', 'This is Kasper')); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv index cd0a75832221..37f29d99b85e 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv @@ -30,7 +30,7 @@ ,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,, ,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,, ,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,, -,"9b3ba47f25f09e445354845b22e252b5","tt_content",332,"image",,,,0,0,1,"sys_file_reference",128,,,,,,, -,"e76fc3ad92291277bca43e6f234f7527","tt_content",332,"image",,,,1,0,1,"sys_file_reference",129,,,,,,, +,"89012eac2e5e5270bf76a165f513d70b","tt_content",332,"image",,,,0,0,1,"sys_file_reference",131,,,,,,, +,"ad864b7fbebc8d3d065e8481daf769d2","tt_content",332,"image",,,,1,0,1,"sys_file_reference",130,,,,,,, ,"0980446befe1793ccdfce909b8e4b21e","sys_file_reference",130,"uid_local",,,,0,0,1,"sys_file",1,,,,,,, ,"cdd72700845a23a1296c927245325605","sys_file_reference",131,"uid_local",,,,0,0,1,"sys_file",21,,,,,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv index 1df62292969e..279450a083e5 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv @@ -31,6 +31,6 @@ ,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,, ,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,, ,"0980446befe1793ccdfce909b8e4b21e","sys_file_reference",130,"uid_local",,,,0,0,1,"sys_file",1,,,,,,, -,"9b3ba47f25f09e445354845b22e252b5","tt_content",332,"image",,,,0,0,1,"sys_file_reference",128,,,,,,, -,"ad864b7fbebc8d3d065e8481daf769d2","tt_content",332,"image",,,,1,0,1,"sys_file_reference",130,,,,,,, +,"2dd6f68f7a7d8474b2700bb709c4c988","tt_content",332,"image",,,,0,0,1,"sys_file_reference",130,,,,,,, +,"15ecf1ccb07af00b78a32622bdd995f7","tt_content",332,"image",,,,1,0,1,"sys_file_reference",131,,,,,,, ,"cdd72700845a23a1296c927245325605","sys_file_reference",131,"uid_local",,,,0,0,1,"sys_file",21,,,,,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/deleteContent.csv index c0cb3c477e56..b440a368b1be 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/deleteContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/deleteContent.csv @@ -4,6 +4,8 @@ ,127,89,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,, ,128,89,1,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,, ,129,89,1,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,, +,130,89,1,0,0,1,2,0,128,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,, +,131,89,1,0,0,1,2,0,129,1,331,"tt_content","image",2,"sys_file","This is Kasper",,, "tt_content",,,,,,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image",,,,,,, ,330,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,, @@ -25,3 +27,5 @@ ,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,, ,"0b7edf2205371519698cdfbf6e0cc6e7","sys_file_reference",128,"uid_local",,,,0,1,0,"sys_file",21,,,,,,, ,"fb266d0b94cee39b87fe03b9b7875c25","sys_file_reference",129,"uid_local",,,,0,1,0,"sys_file",1,,,,,,, +,"901c0e3cec70fba54579674ab0fab258","sys_file_reference",130,"uid_local",,,,0,1,1,"sys_file",21,,,,,,, +,"eab0cafc17f8d63c1ebd4994d7ab7413","sys_file_reference",131,"uid_local",,,,0,1,1,"sys_file",1,,,,,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/deleteContent.csv index c0cb3c477e56..b440a368b1be 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/deleteContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/deleteContent.csv @@ -4,6 +4,8 @@ ,127,89,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,, ,128,89,1,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,, ,129,89,1,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,, +,130,89,1,0,0,1,2,0,128,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,, +,131,89,1,0,0,1,2,0,129,1,331,"tt_content","image",2,"sys_file","This is Kasper",,, "tt_content",,,,,,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image",,,,,,, ,330,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,, @@ -25,3 +27,5 @@ ,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,, ,"0b7edf2205371519698cdfbf6e0cc6e7","sys_file_reference",128,"uid_local",,,,0,1,0,"sys_file",21,,,,,,, ,"fb266d0b94cee39b87fe03b9b7875c25","sys_file_reference",129,"uid_local",,,,0,1,0,"sys_file",1,,,,,,, +,"901c0e3cec70fba54579674ab0fab258","sys_file_reference",130,"uid_local",,,,0,1,1,"sys_file",21,,,,,,, +,"eab0cafc17f8d63c1ebd4994d7ab7413","sys_file_reference",131,"uid_local",,,,0,1,1,"sys_file",1,,,,,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php index 4c377d4ec5b7..c01f82a234b5 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php @@ -221,9 +221,6 @@ public function deletePage() (new InternalRequest())->withPageId(self::VALUE_PageId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv index 93bc51671f21..5399b151a671 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv @@ -13,19 +13,12 @@ ,3,89,256,1,0,0,0,0,0,0,"Hotel #1","5,6", ,4,89,128,1,0,0,0,0,0,0,"Hotel #2",7, ,5,89,64,1,0,0,0,0,0,0,"Hotel #1",8, -,6,89,256,1,0,0,1,2,0,3,"Hotel #1","5,6", -,7,89,128,1,0,0,1,2,0,4,"Hotel #2",7, -,8,89,64,1,0,0,1,2,0,5,"Hotel #1",8, "tx_irretutorial_1ncsv_offer",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","prices", ,5,89,256,1,0,0,0,0,0,0,"Offer #1.1","7,8,9", ,6,89,128,1,0,0,0,0,0,0,"Offer #1.2","10,11", ,7,89,64,1,0,0,0,0,0,0,"Offer #2.1",12, ,8,89,32,1,0,0,0,0,0,0,"Offer #1.1",13, -,9,89,256,1,0,0,1,2,0,5,"Offer #1.1","7,8,9", -,10,89,128,1,0,0,1,2,0,6,"Offer #1.2","10,11", -,11,89,64,1,0,0,1,2,0,7,"Offer #2.1",12, -,12,89,32,1,0,0,1,2,0,8,"Offer #1.1",13, "tx_irretutorial_1ncsv_price",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title",, ,7,89,256,1,0,0,0,0,0,0,"Price #1.1.1",, @@ -35,39 +28,21 @@ ,11,89,16,1,0,0,0,0,0,0,"Price #1.2.2",, ,12,89,8,1,0,0,0,0,0,0,"Price #2.1.1",, ,13,89,4,1,0,0,0,0,0,0,"Price #1.1.1",, -,14,89,256,1,0,0,1,2,0,7,"Price #1.1.1",, -,15,89,128,1,0,0,1,2,0,8,"Price #1.1.2",, -,16,89,64,1,0,0,1,2,0,9,"Price #1.1.3",, -,17,89,32,1,0,0,1,2,0,10,"Price #1.2.1",, -,18,89,16,1,0,0,1,2,0,11,"Price #1.2.2",, -,19,89,8,1,0,0,1,2,0,12,"Price #2.1.1",, -,20,89,4,1,0,0,1,2,0,13,"Price #1.1.1",, "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" -,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3, -,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4, -,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5, +,"e07c2b913a15f97a696f3214c197b028","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",3, +,"261e5c7da98680813898f45fc2f70541","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,1,0,"tx_irretutorial_1ncsv_hotel",4, +,"16f1e8f366b6ffcfcdef525e9fc0c693","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",5, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5, -,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6, -,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7, -,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8, -,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7, -,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8, -,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9, -,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10, -,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11, -,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12, -,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13, -,"3a031f8e07bae7645b761635ea389593","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",7, -,"edf50e21bb12435523856e3c23d0d8c0","tx_irretutorial_1ncsv_offer",9,"prices",,,,1,1,1,"tx_irretutorial_1ncsv_price",8, -,"b96e00cd4983fb11a60adde171411fba","tx_irretutorial_1ncsv_offer",9,"prices",,,,2,1,1,"tx_irretutorial_1ncsv_price",9, -,"d78befb4d52de34aaa5b817f315107b7","tx_irretutorial_1ncsv_offer",10,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",10, -,"e55c96765a8e4fe99da7b0ccd0605aef","tx_irretutorial_1ncsv_offer",10,"prices",,,,1,1,1,"tx_irretutorial_1ncsv_price",11, -,"4352d0f914838bc69d0ba4db39630fe2","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",12, -,"0f89c87b0e1abaa31318098e5d1bbfc2","tx_irretutorial_1ncsv_offer",12,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",13, -,"1e3e4d7629eb4b154fcf050427e1c19d","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,1,1,"tx_irretutorial_1ncsv_offer",5, -,"5d82f76d68aa8333c4c09029ed4f5fc1","tx_irretutorial_1ncsv_hotel",6,"offers",,,,1,1,1,"tx_irretutorial_1ncsv_offer",6, -,"c15ab860bf7bea1be4075b42f268403d","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,1,1,"tx_irretutorial_1ncsv_offer",7, -,"dc0c58068a5508e674377c2125be5678","tx_irretutorial_1ncsv_hotel",8,"offers",,,,0,1,1,"tx_irretutorial_1ncsv_offer",8, +,"6a0e58af0833389ce9c517fb1a88eafa","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",5, +,"018fa41d8f70e83547ddf309b4817069","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,1,0,"tx_irretutorial_1ncsv_offer",6, +,"b5aec3780d4d441b3c3a9511421016e8","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",7, +,"096f8b08d3c6fa0c0ce946607707a07f","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",8, +,"1e657b7d5a025d25ed502694bbc000a3","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",7, +,"d8800763315a79d6116691696f56751a","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,1,0,"tx_irretutorial_1ncsv_price",8, +,"6a2b7b15e9fa09129e582a8ebe31160c","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,1,0,"tx_irretutorial_1ncsv_price",9, +,"c5b92b43108b9de724acb3b2cf20d2f5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",10, +,"7c5dd5a752ab87e35e9c8bcae161f70a","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,1,0,"tx_irretutorial_1ncsv_price",11, +,"99c522a367159f97706e6e255b2cd701","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",12, +,"dd79ff8643d620ed5ee537ba1e7393c3","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",13, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deleteParentContent.csv index 5461483416a4..646a442709f3 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deleteParentContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deleteParentContent.csv @@ -7,12 +7,14 @@ ,3,89,256,0,0,0,0,0,0,0,"Hotel #1","5,6", ,4,89,128,0,0,0,0,0,0,0,"Hotel #2",7, ,5,89,64,1,0,0,0,0,0,0,"Hotel #1",8, +,6,89,64,1,0,0,1,2,0,5,"Hotel #1",8, "tx_irretutorial_1ncsv_offer",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","prices", ,5,89,256,0,0,0,0,0,0,0,"Offer #1.1","7,8,9", ,6,89,128,0,0,0,0,0,0,0,"Offer #1.2","10,11", ,7,89,64,0,0,0,0,0,0,0,"Offer #2.1",12, ,8,89,32,1,0,0,0,0,0,0,"Offer #1.1",13, +,9,89,32,1,0,0,1,2,0,8,"Offer #1.1",13, "tx_irretutorial_1ncsv_price",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title",, ,7,89,256,0,0,0,0,0,0,0,"Price #1.1.1",, @@ -22,6 +24,7 @@ ,11,89,16,0,0,0,0,0,0,0,"Price #1.2.2",, ,12,89,8,0,0,0,0,0,0,0,"Price #2.1.1",, ,13,89,4,1,0,0,0,0,0,0,"Price #1.1.1",, +,14,89,4,1,0,0,1,2,0,13,"Price #1.1.1",, "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3, @@ -40,3 +43,5 @@ ,"16f1e8f366b6ffcfcdef525e9fc0c693","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",5, ,"096f8b08d3c6fa0c0ce946607707a07f","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",8, ,"dd79ff8643d620ed5ee537ba1e7393c3","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",13, +,"f78d8029018114f6a0ea8bc0cfbbbb78","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,1,1,"tx_irretutorial_1ncsv_offer",8, +,"92af1b855b5461ac8d7be9e2186fbd18","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",13, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php index 99f4a36340d7..057f8cf43692 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php @@ -218,9 +218,6 @@ public function deletePage() (new InternalRequest())->withPageId(self::VALUE_PageId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deletePage.csv index 93bc51671f21..5399b151a671 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deletePage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deletePage.csv @@ -13,19 +13,12 @@ ,3,89,256,1,0,0,0,0,0,0,"Hotel #1","5,6", ,4,89,128,1,0,0,0,0,0,0,"Hotel #2",7, ,5,89,64,1,0,0,0,0,0,0,"Hotel #1",8, -,6,89,256,1,0,0,1,2,0,3,"Hotel #1","5,6", -,7,89,128,1,0,0,1,2,0,4,"Hotel #2",7, -,8,89,64,1,0,0,1,2,0,5,"Hotel #1",8, "tx_irretutorial_1ncsv_offer",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","prices", ,5,89,256,1,0,0,0,0,0,0,"Offer #1.1","7,8,9", ,6,89,128,1,0,0,0,0,0,0,"Offer #1.2","10,11", ,7,89,64,1,0,0,0,0,0,0,"Offer #2.1",12, ,8,89,32,1,0,0,0,0,0,0,"Offer #1.1",13, -,9,89,256,1,0,0,1,2,0,5,"Offer #1.1","7,8,9", -,10,89,128,1,0,0,1,2,0,6,"Offer #1.2","10,11", -,11,89,64,1,0,0,1,2,0,7,"Offer #2.1",12, -,12,89,32,1,0,0,1,2,0,8,"Offer #1.1",13, "tx_irretutorial_1ncsv_price",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title",, ,7,89,256,1,0,0,0,0,0,0,"Price #1.1.1",, @@ -35,39 +28,21 @@ ,11,89,16,1,0,0,0,0,0,0,"Price #1.2.2",, ,12,89,8,1,0,0,0,0,0,0,"Price #2.1.1",, ,13,89,4,1,0,0,0,0,0,0,"Price #1.1.1",, -,14,89,256,1,0,0,1,2,0,7,"Price #1.1.1",, -,15,89,128,1,0,0,1,2,0,8,"Price #1.1.2",, -,16,89,64,1,0,0,1,2,0,9,"Price #1.1.3",, -,17,89,32,1,0,0,1,2,0,10,"Price #1.2.1",, -,18,89,16,1,0,0,1,2,0,11,"Price #1.2.2",, -,19,89,8,1,0,0,1,2,0,12,"Price #2.1.1",, -,20,89,4,1,0,0,1,2,0,13,"Price #1.1.1",, "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" -,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3, -,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4, -,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5, +,"e07c2b913a15f97a696f3214c197b028","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",3, +,"261e5c7da98680813898f45fc2f70541","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,1,0,"tx_irretutorial_1ncsv_hotel",4, +,"16f1e8f366b6ffcfcdef525e9fc0c693","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",5, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5, -,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6, -,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7, -,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8, -,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7, -,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8, -,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9, -,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10, -,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11, -,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12, -,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13, -,"3a031f8e07bae7645b761635ea389593","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",7, -,"edf50e21bb12435523856e3c23d0d8c0","tx_irretutorial_1ncsv_offer",9,"prices",,,,1,1,1,"tx_irretutorial_1ncsv_price",8, -,"b96e00cd4983fb11a60adde171411fba","tx_irretutorial_1ncsv_offer",9,"prices",,,,2,1,1,"tx_irretutorial_1ncsv_price",9, -,"d78befb4d52de34aaa5b817f315107b7","tx_irretutorial_1ncsv_offer",10,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",10, -,"e55c96765a8e4fe99da7b0ccd0605aef","tx_irretutorial_1ncsv_offer",10,"prices",,,,1,1,1,"tx_irretutorial_1ncsv_price",11, -,"4352d0f914838bc69d0ba4db39630fe2","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",12, -,"0f89c87b0e1abaa31318098e5d1bbfc2","tx_irretutorial_1ncsv_offer",12,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",13, -,"1e3e4d7629eb4b154fcf050427e1c19d","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,1,1,"tx_irretutorial_1ncsv_offer",5, -,"5d82f76d68aa8333c4c09029ed4f5fc1","tx_irretutorial_1ncsv_hotel",6,"offers",,,,1,1,1,"tx_irretutorial_1ncsv_offer",6, -,"c15ab860bf7bea1be4075b42f268403d","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,1,1,"tx_irretutorial_1ncsv_offer",7, -,"dc0c58068a5508e674377c2125be5678","tx_irretutorial_1ncsv_hotel",8,"offers",,,,0,1,1,"tx_irretutorial_1ncsv_offer",8, +,"6a0e58af0833389ce9c517fb1a88eafa","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",5, +,"018fa41d8f70e83547ddf309b4817069","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,1,0,"tx_irretutorial_1ncsv_offer",6, +,"b5aec3780d4d441b3c3a9511421016e8","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",7, +,"096f8b08d3c6fa0c0ce946607707a07f","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",8, +,"1e657b7d5a025d25ed502694bbc000a3","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",7, +,"d8800763315a79d6116691696f56751a","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,1,0,"tx_irretutorial_1ncsv_price",8, +,"6a2b7b15e9fa09129e582a8ebe31160c","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,1,0,"tx_irretutorial_1ncsv_price",9, +,"c5b92b43108b9de724acb3b2cf20d2f5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",10, +,"7c5dd5a752ab87e35e9c8bcae161f70a","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,1,0,"tx_irretutorial_1ncsv_price",11, +,"99c522a367159f97706e6e255b2cd701","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",12, +,"dd79ff8643d620ed5ee537ba1e7393c3","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",13, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deleteParentContent.csv index 5461483416a4..646a442709f3 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deleteParentContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/deleteParentContent.csv @@ -7,12 +7,14 @@ ,3,89,256,0,0,0,0,0,0,0,"Hotel #1","5,6", ,4,89,128,0,0,0,0,0,0,0,"Hotel #2",7, ,5,89,64,1,0,0,0,0,0,0,"Hotel #1",8, +,6,89,64,1,0,0,1,2,0,5,"Hotel #1",8, "tx_irretutorial_1ncsv_offer",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","prices", ,5,89,256,0,0,0,0,0,0,0,"Offer #1.1","7,8,9", ,6,89,128,0,0,0,0,0,0,0,"Offer #1.2","10,11", ,7,89,64,0,0,0,0,0,0,0,"Offer #2.1",12, ,8,89,32,1,0,0,0,0,0,0,"Offer #1.1",13, +,9,89,32,1,0,0,1,2,0,8,"Offer #1.1",13, "tx_irretutorial_1ncsv_price",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title",, ,7,89,256,0,0,0,0,0,0,0,"Price #1.1.1",, @@ -22,6 +24,7 @@ ,11,89,16,0,0,0,0,0,0,0,"Price #1.2.2",, ,12,89,8,0,0,0,0,0,0,0,"Price #2.1.1",, ,13,89,4,1,0,0,0,0,0,0,"Price #1.1.1",, +,14,89,4,1,0,0,1,2,0,13,"Price #1.1.1",, "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3, @@ -40,3 +43,5 @@ ,"16f1e8f366b6ffcfcdef525e9fc0c693","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",5, ,"096f8b08d3c6fa0c0ce946607707a07f","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",8, ,"dd79ff8643d620ed5ee537ba1e7393c3","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",13, +,"f78d8029018114f6a0ea8bc0cfbbbb78","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,1,1,"tx_irretutorial_1ncsv_offer",8, +,"92af1b855b5461ac8d7be9e2186fbd18","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",13, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv index 217a1da246ec..c02d452f334d 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv @@ -13,6 +13,7 @@ ,6,89,128,0,0,0,0,0,0,0,"Offer #1.2","10,11", ,7,89,64,1,0,0,0,0,0,0,"Offer #2.1",12, ,8,89,32,0,0,0,0,0,0,0,"Offer #1.1",13, +,11,89,64,1,0,0,1,2,0,7,"Offer #2.1",12, "tx_irretutorial_1ncsv_price",,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title",, ,7,89,256,0,0,0,0,0,0,0,"Price #1.1.1",, @@ -22,6 +23,7 @@ ,11,89,16,0,0,0,0,0,0,0,"Price #1.2.2",, ,12,89,8,1,0,0,0,0,0,0,"Price #2.1.1",, ,13,89,4,0,0,0,0,0,0,0,"Price #1.1.1",, +,19,89,8,1,0,0,1,2,0,12,"Price #2.1.1",, "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3, @@ -39,3 +41,4 @@ ,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13, ,"b5aec3780d4d441b3c3a9511421016e8","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",7, ,"99c522a367159f97706e6e255b2cd701","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",12, +,"4352d0f914838bc69d0ba4db39630fe2","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,1,1,"tx_irretutorial_1ncsv_price",12, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php index 732bd82ba1bb..77e22006bc09 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php @@ -416,9 +416,6 @@ public function modifyParentAndDeleteHotelChild() self::assertThat($responseSections, $this->getRequestSectionStructureDoesNotHaveRecordConstraint() ->setRecordIdentifier(self::TABLE_Content . ':' . self::VALUE_ContentIdLast)->setRecordField(self::FIELD_ContentHotel) ->setTable(self::TABLE_Hotel)->setField('title')->setValues('Hotel #2')); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv index d986e2166137..b9d35ff93a01 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv @@ -62,6 +62,6 @@ ,"f561d1fa09c0dff2366ae1120a815a65","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,1,"tx_irretutorial_1nff_offer",9,,, ,"8811c79b54d73bbe750295665a5d9456","tx_irretutorial_1nff_hotel",6,"offers",,,,1,0,1,"tx_irretutorial_1nff_offer",10,,, ,"b433e0664325eb1877eb82011377bd3a","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,1,"tx_irretutorial_1nff_hotel",6,,, -,"cd42d7f90f46a5765b04ba2e19695866","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,1,"tx_irretutorial_1nff_hotel",4,,, +,"df48839ade90c547b1ca668d1f0f1ed3","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,1,"tx_irretutorial_1nff_hotel",7,,, ,"f6761e0e565ab9b6c457cf5ac9457114","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,1,"tx_irretutorial_1nff_price",19,,, ,"88c301be0cfb0e8af61bc8715fb08912","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,1,"tx_irretutorial_1nff_offer",11,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php index 41ac953157e7..68f464ce735d 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php @@ -224,9 +224,6 @@ public function deletePage() (new InternalRequest())->withPageId(self::VALUE_PageId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv index 1dc566f575a1..0c82c1d21516 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv @@ -15,19 +15,12 @@ ,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1 ,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1 ,6,89,1,1,0,0,1,2,0,2,"Hotel #0",89,"pages",,0 -,7,89,1,1,0,0,1,2,0,3,"Hotel #1",297,"tt_content",,2 -,8,89,2,1,0,0,1,2,0,4,"Hotel #2",297,"tt_content",,1 -,9,89,1,1,0,0,1,2,0,5,"Hotel #1",298,"tt_content",,1 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices" ,5,89,1,1,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3 ,6,89,2,1,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2 ,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 ,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 -,9,89,1,1,0,0,1,2,0,5,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3 -,10,89,2,1,0,0,1,2,0,6,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2 -,11,89,1,1,0,0,1,2,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 -,12,89,1,1,0,0,1,2,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier", ,7,89,1,1,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",, @@ -37,28 +30,7 @@ ,11,89,2,1,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",, ,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, ,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, -,14,89,1,1,0,0,1,2,0,7,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",, -,15,89,2,1,0,0,1,2,0,8,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",, -,16,89,3,1,0,0,1,2,0,9,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",, -,17,89,1,1,0,0,1,2,0,10,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",, -,18,89,2,1,0,0,1,2,0,11,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",, -,19,89,1,1,0,0,1,2,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, -,20,89,1,1,0,0,1,2,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, "sys_refindex",,,,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",, -,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,, -,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,, -,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1,,, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3,,, -,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,, -,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,, -,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,, -,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,, -,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,, -,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,, -,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,, -,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,, -,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,, -,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,, -,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv index e483203498b6..14f46adb2e9b 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv @@ -8,12 +8,14 @@ ,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2 ,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1 ,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1 +,6,89,1,1,0,0,1,2,0,5,"Hotel #1",298,"tt_content",,1 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices" ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3 ,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2 ,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 ,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 +,9,89,1,1,0,0,1,2,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier", ,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",, @@ -23,6 +25,7 @@ ,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",, ,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, ,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, +,14,89,1,1,0,0,1,2,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, "sys_refindex",,,,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",, ,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv index 6c68be96b0cc..6eb9ddb717ae 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv @@ -14,6 +14,7 @@ ,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2 ,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 ,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 +,11,89,1,1,0,0,1,2,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier", ,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",, @@ -23,6 +24,7 @@ ,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",, ,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, ,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, +,19,89,1,1,0,0,1,2,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, "sys_refindex",,,,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",, ,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php index cb8f074bcb15..4e0a8f62fcbf 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php @@ -219,9 +219,6 @@ public function deletePage() (new InternalRequest())->withPageId(self::VALUE_PageId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv index 1dc566f575a1..0c82c1d21516 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv @@ -15,19 +15,12 @@ ,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1 ,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1 ,6,89,1,1,0,0,1,2,0,2,"Hotel #0",89,"pages",,0 -,7,89,1,1,0,0,1,2,0,3,"Hotel #1",297,"tt_content",,2 -,8,89,2,1,0,0,1,2,0,4,"Hotel #2",297,"tt_content",,1 -,9,89,1,1,0,0,1,2,0,5,"Hotel #1",298,"tt_content",,1 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices" ,5,89,1,1,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3 ,6,89,2,1,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2 ,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 ,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 -,9,89,1,1,0,0,1,2,0,5,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3 -,10,89,2,1,0,0,1,2,0,6,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2 -,11,89,1,1,0,0,1,2,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 -,12,89,1,1,0,0,1,2,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier", ,7,89,1,1,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",, @@ -37,28 +30,7 @@ ,11,89,2,1,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",, ,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, ,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, -,14,89,1,1,0,0,1,2,0,7,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",, -,15,89,2,1,0,0,1,2,0,8,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",, -,16,89,3,1,0,0,1,2,0,9,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",, -,17,89,1,1,0,0,1,2,0,10,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",, -,18,89,2,1,0,0,1,2,0,11,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",, -,19,89,1,1,0,0,1,2,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, -,20,89,1,1,0,0,1,2,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, "sys_refindex",,,,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",, -,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,, -,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,, -,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1,,, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3,,, -,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,, -,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,, -,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,, -,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,, -,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,, -,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,, -,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,, -,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,, -,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,, -,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,, -,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv index e483203498b6..14f46adb2e9b 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv @@ -8,12 +8,14 @@ ,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2 ,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1 ,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1 +,6,89,1,1,0,0,1,2,0,5,"Hotel #1",298,"tt_content",,1 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices" ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3 ,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2 ,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 ,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 +,9,89,1,1,0,0,1,2,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier", ,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",, @@ -23,6 +25,7 @@ ,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",, ,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, ,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, +,14,89,1,1,0,0,1,2,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, "sys_refindex",,,,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",, ,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv index 6c68be96b0cc..6eb9ddb717ae 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv @@ -14,6 +14,7 @@ ,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2 ,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 ,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1 +,11,89,1,1,0,0,1,2,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1 "tx_irretutorial_1nff_price",,,,,,,,,,,,,,, ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier", ,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",, @@ -23,6 +24,7 @@ ,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",, ,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, ,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",, +,19,89,1,1,0,0,1,2,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",, "sys_refindex",,,,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",, ,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/deleteContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/deleteContentOfRelation.csv index e0f6d426b537..741fda911fc6 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/deleteContentOfRelation.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/deleteContentOfRelation.csv @@ -16,12 +16,4 @@ ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories" ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",0,2 ,298,89,512,1,0,0,0,0,0,0,"Regular Element #2",0,2 -"sys_refindex",,,,,,,,,,,,, -,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" -,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297, -,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297, -,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298, -,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298, -,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, -,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, +# @todo: sys_refindex checking. temporarily dropped here since mariadb vs. postgres & sqlite are different diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/deleteContentOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/deleteContentOfRelation.csv index e0f6d426b537..741fda911fc6 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/deleteContentOfRelation.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/deleteContentOfRelation.csv @@ -16,12 +16,4 @@ ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories" ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",0,2 ,298,89,512,1,0,0,0,0,0,0,"Regular Element #2",0,2 -"sys_refindex",,,,,,,,,,,,, -,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" -,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297, -,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297, -,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298, -,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298, -,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, -,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, +# @todo: sys_refindex checking. temporarily dropped here since mariadb vs. postgres & sqlite are different diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/ActionTest.php index 719e6fd7ecc4..7fa0f26ca056 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/ActionTest.php @@ -227,9 +227,6 @@ public function changeContentSortingAndDeleteLiveRecord() // Note the deleted=1 records are NOT discarded. This is ok since deleted=1 means "not seen in backend", // so it is also ignored by the discard operation. $this->assertAssertionDataSet('changeContentSortingNDeleteLiveRecord'); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** @@ -325,15 +322,9 @@ public function localizePageAndContentsAndDeletePageLocalization() { // Create localized page and localize content elements first parent::localizePageAndContentsAndDeletePageLocalization(); - - // Deleting the localized page in workspace should also delete its localized records - $this->actionService->deleteRecord(self::TABLE_Page, $this->recordIds['localizedPageId']); // Deleted records are not discarded $this->actionService->clearWorkspaceRecord(self::TABLE_Page, $this->recordIds['localizedPageId']); $this->assertAssertionDataSet('localizePageAndContentsAndDeletePageLocalization'); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/changeContentSortingNDeleteLiveRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/changeContentSortingNDeleteLiveRecord.csv index 66f6aeaf909e..100ce0c85fae 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/changeContentSortingNDeleteLiveRecord.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/changeContentSortingNDeleteLiveRecord.csv @@ -20,7 +20,7 @@ ,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"1e6b51d85d3cd183117ede990b8d20b6","tt_content",322,"l18n_parent",,,,0,0,1,"tt_content",321, -,"cd92ab3ab5798dc139f98107e7c28cb7","tt_content",323,"l18n_parent",,,,0,0,1,"tt_content",321, +,"49284ead5b8848439643d03afd80871f","tt_content",322,"l18n_parent",,,,0,1,1,"tt_content",321, +,"6d9b50a3f74cea422ebe9f7a9721b965","tt_content",323,"l18n_parent",,,,0,1,1,"tt_content",321, ,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297, ,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizePageAndContentsAndDeletePageLocalization.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizePageAndContentsAndDeletePageLocalization.csv index 91acf86c834d..68670e29057d 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizePageAndContentsAndDeletePageLocalization.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizePageAndContentsAndDeletePageLocalization.csv @@ -12,8 +12,8 @@ ,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1" ,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2" ,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3" -,300,89,1024,0,1,1,299,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3" -,301,89,384,0,1,1,297,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1" +,300,89,1024,0,0,1,299,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3" +,301,89,384,0,0,1,297,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1" ,302,89,448,0,0,2,297,301,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" ,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php index 90e5775cd35c..f3985be4bc76 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php @@ -228,17 +228,11 @@ public function localizeContent() */ public function localizeContentWithEmptyTcaIntegrityColumns() { - // Create translated page first - $this->actionService->copyRecordToLanguage(self::TABLE_Page, self::VALUE_PageId, self::VALUE_LanguageId); parent::localizeContentWithEmptyTcaIntegrityColumns(); $this->assertAssertionDataSet('localizeContentWithEmptyTcaIntegrityColumns'); $responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseSections(); self::assertThat($responseSections, $this->getRequestSectionHasRecordConstraint() ->setTable(self::TABLE_Content)->setField('header')->setValues('[Translate to Dansk:] Regular Element #1', '[Translate to Dansk:] Regular Element #2')); - - // Due to the changed TCA columns passthrough vs select, reference index updates are performed - // differently for this test. We disable the 'clean refindex' test in tearDown() here. - $this->assertCleanReferenceIndex = false; } /** @@ -326,9 +320,6 @@ public function changeContentSortingAndDeleteLiveRecord() ->setTable(self::TABLE_Content)->setField('header')->setValues('Regular Element #2')); self::assertThat($responseSections, $this->getRequestSectionDoesNotHaveRecordConstraint() ->setTable(self::TABLE_Content)->setField('header')->setValues('Regular Element #1')); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** @@ -485,9 +476,6 @@ public function localizePageAndContentsAndDeletePageLocalization() { // Create localized page and localize content elements first parent::localizePageAndContentsAndDeletePageLocalization(); - - // Deleting the localized page in workspace should also delete its localized records - $this->actionService->deleteRecord(self::TABLE_Page, $this->recordIds['localizedPageId']); $this->assertAssertionDataSet('localizePageAndContentsAndDeletePageLocalization'); $response = $this->executeFrontendRequest( @@ -495,9 +483,6 @@ public function localizePageAndContentsAndDeletePageLocalization() (new InternalRequestContext())->withBackendUserId(self::VALUE_BackendUserId)->withWorkspaceId(self::VALUE_WorkspaceId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteLiveRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteLiveRecord.csv index 66f6aeaf909e..100ce0c85fae 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteLiveRecord.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingNDeleteLiveRecord.csv @@ -20,7 +20,7 @@ ,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"1e6b51d85d3cd183117ede990b8d20b6","tt_content",322,"l18n_parent",,,,0,0,1,"tt_content",321, -,"cd92ab3ab5798dc139f98107e7c28cb7","tt_content",323,"l18n_parent",,,,0,0,1,"tt_content",321, +,"49284ead5b8848439643d03afd80871f","tt_content",322,"l18n_parent",,,,0,1,1,"tt_content",321, +,"6d9b50a3f74cea422ebe9f7a9721b965","tt_content",323,"l18n_parent",,,,0,1,1,"tt_content",321, ,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297, ,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv index d55c69a63a21..e9d43f2a034e 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv @@ -16,9 +16,6 @@ "sys_refindex",,,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string", ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,, -,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,, -,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,, -,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1,, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3,, ,"620500aee65485a0aed7d1ee2d0eff17","pages",92,"l10n_parent",,,,0,0,1,"pages",89,, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageAndContentsAndDeletePageLocalization.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageAndContentsAndDeletePageLocalization.csv index 91acf86c834d..68670e29057d 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageAndContentsAndDeletePageLocalization.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageAndContentsAndDeletePageLocalization.csv @@ -12,8 +12,8 @@ ,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1" ,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2" ,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3" -,300,89,1024,0,1,1,299,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3" -,301,89,384,0,1,1,297,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1" +,300,89,1024,0,0,1,299,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3" +,301,89,384,0,0,1,297,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1" ,302,89,448,0,0,2,297,301,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" ,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php index 5c6f81a826b8..643482376c77 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php @@ -382,9 +382,6 @@ public function deletePage() (new InternalRequest())->withPageId(self::VALUE_PageId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** @@ -400,9 +397,6 @@ public function deleteContentAndPage() (new InternalRequest())->withPageId(self::VALUE_PageId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** @@ -642,8 +636,5 @@ public function createPlaceholdersAndDeleteDraftParentPage() parent::createPlaceholdersAndDeleteDraftParentPage(); $this->actionService->publishRecord(self::TABLE_Page, self::VALUE_ParentPageId); $this->assertAssertionDataSet('createPlaceholdersAndDeleteDraftParentPage'); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } } diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv index d76c948a602d..8a03064569aa 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv @@ -19,19 +19,13 @@ ,310,90,256,1,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,1,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" ,312,90,768,1,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" -# 320 is discarded now since page 89 has been deleted +# 320 is set to deleted now since page 89 has been deleted ,320,89,512,1,0,0,0,298,2,2,0,298,"Regular Element #2" -,321,89,384,1,1,297,297,301,1,2,0,301,"[Translate to Dansk:] Regular Element #1" -,322,89,448,1,2,297,301,302,1,2,0,302,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" -,323,89,1024,1,1,299,299,300,1,2,0,300,"[Translate to Dansk:] Regular Element #3" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, -,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297, -,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297, +,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299, +,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297, +,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"45ba14d962040ebce9ac85864a2982eb","tt_content",321,"l18n_parent",,,,0,1,1,"tt_content",297, -,"0ac1dfb24a17464a1a6b3f984af8aab8","tt_content",322,"l18n_parent",,,,0,1,1,"tt_content",297, -,"43199563740a11296a23eae93b14993d","tt_content",323,"l18n_parent",,,,0,1,1,"tt_content",299, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContent.csv index f999936ea5eb..2e1910651a9e 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContent.csv @@ -10,7 +10,7 @@ ,310,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" ,312,90,768,0,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" -,320,89,512,0,0,0,0,298,2,2,0,298,"Regular Element #2" +,320,89,512,1,0,0,0,298,2,2,0,298,"Regular Element #2" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContentAndPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContentAndPage.csv index cd85e4cea279..6fe2bcb6548e 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContentAndPage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteContentAndPage.csv @@ -16,20 +16,14 @@ ,310,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" ,312,90,768,0,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" -# 320 is discarded now since page 89 has been deleted +# 320 is set to deleted now since page 89 has been deleted ,320,89,512,1,0,0,0,298,2,2,0,298,"Regular Element #2" ,321,89,512,1,0,0,0,298,1,2,0,298,"Regular Element #2" -,322,89,384,1,1,297,297,301,1,2,0,301,"[Translate to Dansk:] Regular Element #1" -,323,89,448,1,2,297,301,302,1,2,0,302,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" -,324,89,1024,1,1,299,299,300,1,2,0,300,"[Translate to Dansk:] Regular Element #3" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, -,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297, -,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297, +,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299, +,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297, +,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"0ac1dfb24a17464a1a6b3f984af8aab8","tt_content",322,"l18n_parent",,,,0,1,1,"tt_content",297, -,"4aa47b8c9d1db85d49e099281dc9eeee","tt_content",323,"l18n_parent",,,,0,1,1,"tt_content",297, -,"0db2b4ceeb1292a0e29c2bd99d49f9a7","tt_content",324,"l18n_parent",,,,0,1,1,"tt_content",299, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteLocalizedContentNDeleteContent.csv index 9079534f5404..5ef48554b8cb 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteLocalizedContentNDeleteContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deleteLocalizedContentNDeleteContent.csv @@ -4,13 +4,14 @@ ,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1" ,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2" ,299,89,768,1,0,0,0,299,0,0,0,0,"Regular Element #3" -,300,89,1024,1,1,299,299,300,0,0,0,0,"[Translate to Dansk:] Regular Element #3" +,300,89,1024,1,1,299,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3" ,301,89,384,0,1,297,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1" ,302,89,448,0,2,297,301,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" ,310,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" ,312,90,768,0,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" ,320,89,512,0,0,0,0,298,2,2,0,298,"Regular Element #2" +,321,89,1024,1,1,299,299,300,1,2,0,300,"[Translate to Dansk:] Regular Element #3" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, @@ -19,3 +20,4 @@ ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, ,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299, +,"d66745d02e365757d59fb2cac7447134","tt_content",321,"l18n_parent",,,,0,1,1,"tt_content",299, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deletePage.csv index 5377c30e26a8..06b007b6341f 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deletePage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/deletePage.csv @@ -16,19 +16,13 @@ ,310,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" ,312,90,768,0,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" -# 320 is discarded now since page 89 has been deleted +# 320 is set to deleted now since page 89 has been deleted ,320,89,512,1,0,0,0,298,2,2,0,298,"Regular Element #2" -,321,89,384,1,1,297,297,301,1,2,0,301,"[Translate to Dansk:] Regular Element #1" -,322,89,448,1,2,297,301,302,1,2,0,302,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" -,323,89,1024,1,1,299,299,300,1,2,0,300,"[Translate to Dansk:] Regular Element #3" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, -,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297, -,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297, +,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299, +,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297, +,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"45ba14d962040ebce9ac85864a2982eb","tt_content",321,"l18n_parent",,,,0,1,1,"tt_content",297, -,"0ac1dfb24a17464a1a6b3f984af8aab8","tt_content",322,"l18n_parent",,,,0,1,1,"tt_content",297, -,"43199563740a11296a23eae93b14993d","tt_content",323,"l18n_parent",,,,0,1,1,"tt_content",299, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php index 51d0f14ba4fb..0be08a2d7aee 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php @@ -368,9 +368,6 @@ public function deletePage() (new InternalRequest())->withPageId(self::VALUE_PageId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** @@ -386,9 +383,6 @@ public function deleteContentAndPage() (new InternalRequest())->withPageId(self::VALUE_PageId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** @@ -398,9 +392,6 @@ public function localizePageAndContentsAndDeletePageLocalization() { // Create localized page and localize content elements first parent::localizePageAndContentsAndDeletePageLocalization(); - - // Deleting the localized page in workspace should also delete its localized records - $this->actionService->deleteRecord(self::TABLE_Page, $this->recordIds['localizedPageId']); $this->actionService->publishWorkspace(self::VALUE_WorkspaceId); $this->assertAssertionDataSet('localizePageAndContentsAndDeletePageLocalization'); @@ -409,9 +400,6 @@ public function localizePageAndContentsAndDeletePageLocalization() (new InternalRequestContext())->withBackendUserId(self::VALUE_BackendUserId)->withWorkspaceId(self::VALUE_WorkspaceId) ); self::assertEquals(404, $response->getStatusCode()); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** @@ -642,9 +630,6 @@ public function createPlaceholdersAndDeleteDraftParentPage() parent::createPlaceholdersAndDeleteDraftParentPage(); $this->actionService->publishWorkspace(self::VALUE_WorkspaceId); $this->assertAssertionDataSet('createPlaceholdersAndDeleteDraftParentPage'); - - // @todo: reference index not clean after this test. Needs investigation. - $this->assertCleanReferenceIndex = false; } /** diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv index d76c948a602d..2251ed8e4b51 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createPlaceholdersAndDeleteDraftParentPage.csv @@ -21,17 +21,11 @@ ,312,90,768,1,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" # 320 is discarded now since page 89 has been deleted ,320,89,512,1,0,0,0,298,2,2,0,298,"Regular Element #2" -,321,89,384,1,1,297,297,301,1,2,0,301,"[Translate to Dansk:] Regular Element #1" -,322,89,448,1,2,297,301,302,1,2,0,302,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" -,323,89,1024,1,1,299,299,300,1,2,0,300,"[Translate to Dansk:] Regular Element #3" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, -,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297, -,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297, +,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299, +,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297, +,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"45ba14d962040ebce9ac85864a2982eb","tt_content",321,"l18n_parent",,,,0,1,1,"tt_content",297, -,"0ac1dfb24a17464a1a6b3f984af8aab8","tt_content",322,"l18n_parent",,,,0,1,1,"tt_content",297, -,"43199563740a11296a23eae93b14993d","tt_content",323,"l18n_parent",,,,0,1,1,"tt_content",299, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContent.csv index f999936ea5eb..2e1910651a9e 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContent.csv @@ -10,7 +10,7 @@ ,310,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" ,312,90,768,0,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" -,320,89,512,0,0,0,0,298,2,2,0,298,"Regular Element #2" +,320,89,512,1,0,0,0,298,2,2,0,298,"Regular Element #2" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContentAndPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContentAndPage.csv index cd85e4cea279..9ecf559e2671 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContentAndPage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteContentAndPage.csv @@ -19,17 +19,11 @@ # 320 is discarded now since page 89 has been deleted ,320,89,512,1,0,0,0,298,2,2,0,298,"Regular Element #2" ,321,89,512,1,0,0,0,298,1,2,0,298,"Regular Element #2" -,322,89,384,1,1,297,297,301,1,2,0,301,"[Translate to Dansk:] Regular Element #1" -,323,89,448,1,2,297,301,302,1,2,0,302,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" -,324,89,1024,1,1,299,299,300,1,2,0,300,"[Translate to Dansk:] Regular Element #3" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, -,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297, -,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297, +,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299, +,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297, +,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"0ac1dfb24a17464a1a6b3f984af8aab8","tt_content",322,"l18n_parent",,,,0,1,1,"tt_content",297, -,"4aa47b8c9d1db85d49e099281dc9eeee","tt_content",323,"l18n_parent",,,,0,1,1,"tt_content",297, -,"0db2b4ceeb1292a0e29c2bd99d49f9a7","tt_content",324,"l18n_parent",,,,0,1,1,"tt_content",299, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv index 73bae5c31693..eff74da2a320 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv @@ -4,13 +4,14 @@ ,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1" ,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2" ,299,89,768,1,0,0,0,299,0,0,0,0,"Regular Element #3" -,300,89,1024,1,1,299,299,300,0,0,0,0,"[Translate to Dansk:] Regular Element #3" +,300,89,1024,1,1,299,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3" ,301,89,384,0,1,297,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1" ,302,89,448,0,2,297,301,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" ,310,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10" ,312,90,768,0,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" ,320,89,512,0,0,0,0,298,2,2,0,298,"Regular Element #2" +,321,89,1024,1,1,299,299,300,1,2,0,300,"[Translate to Dansk:] Regular Element #3" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, @@ -21,3 +22,4 @@ ,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89, ,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1, ,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299, +,"d66745d02e365757d59fb2cac7447134","tt_content",321,"l18n_parent",,,,0,1,1,"tt_content",299, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deletePage.csv index 5377c30e26a8..a456da4c9531 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deletePage.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deletePage.csv @@ -18,17 +18,11 @@ ,312,90,768,0,2,0,311,311,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #10" # 320 is discarded now since page 89 has been deleted ,320,89,512,1,0,0,0,298,2,2,0,298,"Regular Element #2" -,321,89,384,1,1,297,297,301,1,2,0,301,"[Translate to Dansk:] Regular Element #1" -,322,89,448,1,2,297,301,302,1,2,0,302,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" -,323,89,1024,1,1,299,299,300,1,2,0,300,"[Translate to Dansk:] Regular Element #3" "sys_refindex",,,,,,,,,,,,, ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string" ,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28, -,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299, -,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297, -,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297, +,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299, +,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297, +,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297, ,"d05558a22d87f923406b45cc3f369943","sys_workspace",1,"custom_stages",,,,0,0,0,"sys_workspace_stage",1, ,"1bbbf7d18b85fd6e70d76947a563e492","sys_workspace_stage",1,"responsible_persons",,,,0,0,0,"be_users",3, -,"45ba14d962040ebce9ac85864a2982eb","tt_content",321,"l18n_parent",,,,0,1,1,"tt_content",297, -,"0ac1dfb24a17464a1a6b3f984af8aab8","tt_content",322,"l18n_parent",,,,0,1,1,"tt_content",297, -,"43199563740a11296a23eae93b14993d","tt_content",323,"l18n_parent",,,,0,1,1,"tt_content",299, diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePageAndContentsAndDeletePageLocalization.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePageAndContentsAndDeletePageLocalization.csv index 91acf86c834d..68670e29057d 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePageAndContentsAndDeletePageLocalization.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePageAndContentsAndDeletePageLocalization.csv @@ -12,8 +12,8 @@ ,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1" ,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2" ,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3" -,300,89,1024,0,1,1,299,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3" -,301,89,384,0,1,1,297,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1" +,300,89,1024,0,0,1,299,299,299,0,0,0,0,"[Translate to Dansk:] Regular Element #3" +,301,89,384,0,0,1,297,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1" ,302,89,448,0,0,2,297,301,301,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1" ,310,90,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #10" ,311,90,512,0,0,1,0,310,310,0,0,0,0,"[Translate to Dansk:] Regular Element #10"