Commit 0ed1f300 authored by Anja Leichsenring's avatar Anja Leichsenring Committed by Wouter Wolters
Browse files

[TASK] Handle pageTs for FormEngine in only one result array key, not two

PageTsConfig settings are stored, processed and read from the same array
key in the result array now, no longer two. The split turned out to be
not neccessary, so it was dropped.

Change-Id: Iac284df60d739ec80d9a7f46d4b93b455274f740
Resolves: #70554
Releases: master
Reviewed-on: http://review.typo3.org/43948

Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
parent 48321468
......@@ -188,9 +188,9 @@ class RteController extends AbstractWizardController
);
}
$pageTsConfigMerged = $formData['pageTsConfigMerged'];
if ((string)$pageTsConfigMerged['TCEFORM.'][$this->P['table'] . '.'][$this->P['field'] . '.']['RTEfullScreenWidth'] !== '') {
$width = (string)$pageTsConfigMerged['TCEFORM.'][$this->P['table'] . '.'][$this->P['field'] . '.']['RTEfullScreenWidth'];
$pageTsConfig = $formData['pageTsConfig'];
if ((string)$pageTsConfig['TCEFORM.'][$this->P['table'] . '.'][$this->P['field'] . '.']['RTEfullScreenWidth'] !== '') {
$width = (string)$pageTsConfig['TCEFORM.'][$this->P['table'] . '.'][$this->P['field'] . '.']['RTEfullScreenWidth'];
} else {
$width = '100%';
}
......
......@@ -349,7 +349,7 @@ class InlineControlContainer extends AbstractContainer
$selectDataInput = [
'tableName' => 'dummyTable',
'command' => 'edit',
'pageTsConfigMerged' => $pageTsConfig,
'pageTsConfig' => $pageTsConfig,
'vanillaTableTca' => [
'ctrl' => [],
'columns' => [
......
......@@ -395,10 +395,10 @@ class PaletteAndSingleContainer extends AbstractContainer
}
$fieldTSConfig = [];
if (isset($this->data['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'])
&& is_array($this->data['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'])
if (isset($this->data['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'])
&& is_array($this->data['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'])
) {
$fieldTSConfig = $this->data['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'];
$fieldTSConfig = $this->data['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'];
}
if (!empty($fieldTSConfig['label'])) {
......
......@@ -80,10 +80,10 @@ class SingleFieldContainer extends AbstractContainer
}
$parameterArray['fieldTSConfig'] = [];
if (isset($this->data['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'])
&& is_array($this->data['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'])
if (isset($this->data['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'])
&& is_array($this->data['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'])
) {
$parameterArray['fieldTSConfig'] = $this->data['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'];
$parameterArray['fieldTSConfig'] = $this->data['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'];
}
if ($parameterArray['fieldTSConfig']['disabled']) {
return $resultArray;
......
......@@ -386,7 +386,7 @@ abstract class AbstractFormElement extends AbstractNode
$selectWizardDataInput = [
'tableName' => 'dummySelectWizard',
'command' => 'edit',
'pageTsConfigMerged' => $pageTsConfig,
'pageTsConfig' => $pageTsConfig,
'vanillaTableTca' => [
'ctrl' => [],
'columns' => [
......
......@@ -142,7 +142,9 @@ class FormDataCompiler
// Full user TsConfig
'userTsConfig' => array(),
// Full page TSConfig of the page that is edited or of the parent page if a record is added.
// This includes any defaultPageTSconfig and is merged with user TsConfig page. section
// This includes any defaultPageTSconfig and is merged with user TsConfig page. section. After type
// of handled record was determined, record type specific settings [TCEFORM.][tableName.][field.][types.][type.]
// are merged into [TCEFORM.][tableName.][field.]. Array keys still contain the concatenation dots.
'pageTsConfig' => array(),
// Not changed TCA of handled table
'vanillaTableTca' => array(),
......@@ -167,8 +169,6 @@ class FormDataCompiler
'additionalLanguageRows' => array(),
// The tca record type value of the record. Forced to string, there can be "named" type values.
'recordTypeValue' => '0',
// prepared Ts config: Type specific configuration is merged and some additional values are set.
'pageTsConfigMerged' => array(),
// TCA of table with processed fields. After processing, this array contains merged and resolved
// array data, items were resolved, only used types are set, renderTypes are set.
'processedTca' => array(),
......
......@@ -39,8 +39,8 @@ abstract class AbstractItemProvider
$config = $result['processedTca']['columns'][$fieldName]['config'];
$pageTsProcessorParameters = null;
if (!empty($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['itemsProcFunc.'])) {
$pageTsProcessorParameters = $result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['itemsProcFunc.'];
if (!empty($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['itemsProcFunc.'])) {
$pageTsProcessorParameters = $result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['itemsProcFunc.'];
}
$processorParameters = [
// Function manipulates $items directly and return nothing
......@@ -87,7 +87,7 @@ abstract class AbstractItemProvider
* PageTsConfig addItems:
*
* TCEFORMS.aTable.aField[.types][.aType].addItems.aValue = aLabel,
* with type specific options merged by pageTsConfigMerged already
* with type specific options merged by pageTsConfig already
*
* @param array $result result array
* @param string $fieldName Current handle field name
......@@ -97,10 +97,10 @@ abstract class AbstractItemProvider
protected function addItemsFromPageTsConfig(array $result, $fieldName, array $items)
{
$table = $result['tableName'];
if (!empty($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['addItems.'])
&& is_array($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['addItems.'])
if (!empty($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['addItems.'])
&& is_array($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['addItems.'])
) {
$addItemsArray = $result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['addItems.'];
$addItemsArray = $result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['addItems.'];
foreach ($addItemsArray as $value => $label) {
// If the value ends with a dot, it is a subelement like "34.icon = mylabel.png", skip it
if (substr($value, -1) === '.') {
......
......@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\ArrayUtility;
class PageTsConfigMerged implements FormDataProviderInterface
{
/**
* Merge type specific page TS to pageTsConfigMerged
* Merge type specific page TS to pageTsConfig
*
* @param array $result
* @return array
......@@ -33,7 +33,7 @@ class PageTsConfigMerged implements FormDataProviderInterface
$mergedTsConfig = $result['pageTsConfig'];
if (empty($result['pageTsConfig']['TCEFORM.']) || !is_array($result['pageTsConfig']['TCEFORM.'])) {
$result['pageTsConfigMerged'] = $mergedTsConfig;
$result['pageTsConfig'] = $mergedTsConfig;
return $result;
}
......@@ -58,7 +58,7 @@ class PageTsConfigMerged implements FormDataProviderInterface
}
}
$result['pageTsConfigMerged'] = $mergedTsConfig;
$result['pageTsConfig'] = $mergedTsConfig;
return $result;
}
......
......@@ -79,10 +79,10 @@ class TcaCheckboxItems extends AbstractItemProvider implements FormDataProviderI
}
// Set label overrides from pageTsConfig if given
if (isset($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'])
&& is_array($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'])
if (isset($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'])
&& is_array($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'])
) {
foreach ($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'] as $itemKey => $label) {
foreach ($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'] as $itemKey => $label) {
if (isset($items[$itemKey][0])) {
$items[$itemKey][0] = $languageService->sL($label);
}
......
......@@ -109,9 +109,9 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
{
$table = $result['tableName'];
$pageTs = [];
if (!empty($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'][$flexIdentifier . '.'])
&& is_array($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'][$flexIdentifier . '.'])) {
$pageTs = $result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.'][$flexIdentifier . '.'];
if (!empty($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'][$flexIdentifier . '.'])
&& is_array($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'][$flexIdentifier . '.'])) {
$pageTs = $result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.'][$flexIdentifier . '.'];
}
return $pageTs;
}
......@@ -258,9 +258,9 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
$dataStructureSheetElements = $dataStructureSheetDefinition['ROOT']['el'];
// Prepare pageTsConfig of this sheet
$pageTsConfigMerged['TCEFORM.'][$tableName . '.'] = [];
$pageTsConfig['TCEFORM.'][$tableName . '.'] = [];
if (isset($pageTsConfig[$dataStructureSheetName . '.']) && is_array($pageTsConfig[$dataStructureSheetName . '.'])) {
$pageTsConfigMerged['TCEFORM.'][$tableName . '.'] = $pageTsConfig[$dataStructureSheetName . '.'];
$pageTsConfig['TCEFORM.'][$tableName . '.'] = $pageTsConfig[$dataStructureSheetName . '.'];
}
foreach ($dataStructureSheetElements as $dataStructureSheetElementName => $dataStructureSheetElementDefinition) {
......@@ -305,7 +305,7 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
'tableName' => $result['tableName'],
'command' => $command,
// It is currently not possible to have pageTsConfig for section container
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
'databaseRow' => $valueArray,
'vanillaTableTca' => [
'ctrl' => [],
......@@ -354,7 +354,7 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
$inputToFlexFormSegment = [
'tableName' => $result['tableName'],
'command' => 'new',
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
'databaseRow' => [
'uid' => $result['databaseRow']['uid'],
],
......@@ -411,7 +411,7 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
// tablename of "parent" is given down for inline elements to resolve correctly
'tableName' => $result['tableName'],
'command' => $command,
'pageTsConfigMerged' => $pageTsConfigMerged,
'pageTsConfig' => $pageTsConfig,
'databaseRow' => $valueArray,
'vanillaTableTca' => [
'ctrl' => [],
......
......@@ -85,10 +85,10 @@ class TcaRadioItems extends AbstractItemProvider implements FormDataProviderInte
}
// Set label overrides from pageTsConfig if given
if (isset($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'])
&& is_array($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'])
if (isset($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'])
&& is_array($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'])
) {
foreach ($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'] as $itemKey => $label) {
foreach ($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'] as $itemKey => $label) {
if (isset($items[$itemKey][0])) {
$items[$itemKey][0] = $languageService->sL($label);
}
......
......@@ -105,10 +105,10 @@ class TcaSelectItems extends AbstractItemProvider implements FormDataProviderInt
if (!isset($dynamicItems[$key])) {
$staticValues[$item[1]] = $item;
}
if (isset($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'][$item[1]])
&& !empty($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'][$item[1]])
if (isset($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'][$item[1]])
&& !empty($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'][$item[1]])
) {
$label = $languageService->sL($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'][$item[1]]);
$label = $languageService->sL($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['altLabels.'][$item[1]]);
} else {
$label = $languageService->sL($item[0]);
}
......@@ -464,15 +464,15 @@ class TcaSelectItems extends AbstractItemProvider implements FormDataProviderInt
protected function removeItemsByKeepItemsPageTsConfig(array $result, $fieldName, array $items)
{
$table = $result['tableName'];
if (empty($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['keepItems'])
|| !is_string($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['keepItems'])
if (empty($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['keepItems'])
|| !is_string($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['keepItems'])
) {
return $items;
}
return ArrayUtility::keepItemsInArray(
$items,
$result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['keepItems'],
$result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['keepItems'],
function ($value) {
return $value[1];
}
......@@ -490,15 +490,15 @@ class TcaSelectItems extends AbstractItemProvider implements FormDataProviderInt
protected function removeItemsByRemoveItemsPageTsConfig(array $result, $fieldName, array $items)
{
$table = $result['tableName'];
if (empty($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['removeItems'])
|| !is_string($result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['removeItems'])
if (empty($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['removeItems'])
|| !is_string($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['removeItems'])
) {
return $items;
}
$removeItems = GeneralUtility::trimExplode(
',',
$result['pageTsConfigMerged']['TCEFORM.'][$table . '.'][$fieldName . '.']['removeItems'],
$result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['removeItems'],
true
);
foreach ($items as $key => $itemValues) {
......@@ -928,12 +928,12 @@ class TcaSelectItems extends AbstractItemProvider implements FormDataProviderInt
}
}
$pageTsConfigId = 0;
if ($result['pageTsConfigMerged']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_ID']) {
$pageTsConfigId = (int)$result['pageTsConfigMerged']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_ID'];
if ($result['pageTsConfig']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_ID']) {
$pageTsConfigId = (int)$result['pageTsConfig']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_ID'];
}
$pageTsConfigIdList = 0;
if ($result['pageTsConfigMerged']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_IDLIST']) {
$pageTsConfigIdList = $result['pageTsConfigMerged']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_IDLIST'];
if ($result['pageTsConfig']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_IDLIST']) {
$pageTsConfigIdList = $result['pageTsConfig']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_IDLIST'];
$pageTsConfigIdListArray = GeneralUtility::trimExplode(',', $pageTsConfigIdList, true);
$pageTsConfigIdList = array();
foreach ($pageTsConfigIdListArray as $pageTsConfigIdListElement) {
......@@ -944,8 +944,8 @@ class TcaSelectItems extends AbstractItemProvider implements FormDataProviderInt
$pageTsConfigIdList = implode(',', $pageTsConfigIdList);
}
$pageTsConfigString = '';
if ($result['pageTsConfigMerged']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_STR']) {
$pageTsConfigString = $result['pageTsConfigMerged']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_STR'];
if ($result['pageTsConfig']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_STR']) {
$pageTsConfigString = $result['pageTsConfig']['TCEFORM.'][$localTable . '.'][$localFieldName . '.']['PAGE_TSCONFIG_STR'];
$pageTsConfigString = $database->quoteStr($pageTsConfigString, $foreignTableName);
}
......
......@@ -45,7 +45,7 @@ class PageTsConfigMergedTest extends UnitTestCase
],
];
$expected = $input;
$expected['pageTsConfigMerged'] = $input['pageTsConfig'];
$expected['pageTsConfig'] = $input['pageTsConfig'];
$this->assertSame($expected, $this->subject->addData($input));
}
......@@ -68,7 +68,7 @@ class PageTsConfigMergedTest extends UnitTestCase
],
];
$expected = $input;
$expected['pageTsConfigMerged'] = $input['pageTsConfig'];
$expected['pageTsConfig'] = $input['pageTsConfig'];
$this->assertSame($expected, $this->subject->addData($input));
}
......@@ -95,7 +95,7 @@ class PageTsConfigMergedTest extends UnitTestCase
],
];
$expected = $input;
$expected['pageTsConfigMerged'] = [
$expected['pageTsConfig'] = [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -131,7 +131,7 @@ class PageTsConfigMergedTest extends UnitTestCase
],
];
$expected = $input;
$expected['pageTsConfigMerged'] = [
$expected['pageTsConfig'] = [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......
......@@ -210,7 +210,7 @@ class TcaCheckboxItemsTest extends UnitTestCase
'databaseRow' => [
'aField' => 'aValue',
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -279,7 +279,7 @@ class TcaCheckboxItemsTest extends UnitTestCase
'databaseRow' => [
'aField' => 'aValue',
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -350,7 +350,7 @@ class TcaCheckboxItemsTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......
......@@ -91,7 +91,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -154,7 +154,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -232,7 +232,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -310,7 +310,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -388,7 +388,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -467,7 +467,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
];
$this->backendUserProphecy->isAdmin()->shouldBeCalled()->willReturn(false);
......@@ -529,7 +529,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
];
$this->backendUserProphecy->isAdmin()->shouldBeCalled()->willReturn(false);
......@@ -599,7 +599,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
];
$this->backendUserProphecy->isAdmin()->shouldBeCalled()->willReturn(true);
......@@ -668,7 +668,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -746,7 +746,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -846,7 +846,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
];
$GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['formDataGroup']['flexFormSegment'] = [
......@@ -903,7 +903,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
];
$this->backendUserProphecy->isAdmin()->willReturn(true);
......@@ -950,7 +950,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
];
$this->backendUserProphecy->isAdmin()->willReturn(true);
......@@ -1049,7 +1049,7 @@ class TcaFlexProcessTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [],
'pageTsConfig' => [],
];
$GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['formDataGroup']['flexFormSegment'] = [
......
......@@ -255,7 +255,7 @@ class TcaRadioItemsTest extends UnitTestCase
'databaseRow' => [
'aField' => 'aValue',
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -324,7 +324,7 @@ class TcaRadioItemsTest extends UnitTestCase
'databaseRow' => [
'aField' => 'aValue',
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -395,7 +395,7 @@ class TcaRadioItemsTest extends UnitTestCase
],
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......
......@@ -1207,7 +1207,7 @@ class TcaSelectItemsTest extends UnitTestCase
'AND fTable.uid=###PAGE_TSCONFIG_ID###',
'pages.uid=fTable.pid AND pages.deleted=0 AND 1=1 AND fTable.uid=451',
[
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -1232,7 +1232,7 @@ class TcaSelectItemsTest extends UnitTestCase
'AND fTable.uid IN (###PAGE_TSCONFIG_IDLIST###)',
'pages.uid=fTable.pid AND pages.deleted=0 AND 1=1 AND fTable.uid IN (471,481)',
[
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -1285,7 +1285,7 @@ class TcaSelectItemsTest extends UnitTestCase
'is_siteroot' => null,
],
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -1588,7 +1588,7 @@ class TcaSelectItemsTest extends UnitTestCase
],
]
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -1643,7 +1643,7 @@ class TcaSelectItemsTest extends UnitTestCase
],
]
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -1939,7 +1939,7 @@ class TcaSelectItemsTest extends UnitTestCase
'databaseRow' => [
'aField' => 'aValue',
],
'pageTsConfigMerged' => [
'pageTsConfig' => [
'TCEFORM.' => [
'aTable.' => [
'aField.' => [
......@@ -2008,7 +2008,7 @@ class TcaSelectItemsTest extends UnitTestCase