Skip to content

Commit 32e3fb0

Browse files
committed
TASK: Simplify migrateIncludeInAllToCopyTo
1 parent f5a44a1 commit 32e3fb0

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

Classes/Driver/Version5/Mapping/NodeTypeMappingBuilder.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public function buildMappingInformation(Index $index)
104104

105105
/**
106106
* @param array $mapping
107+
* @return void
107108
*/
108109
protected function migrateConfigurationForElasticVersion5(array &$mapping)
109110
{
@@ -116,6 +117,7 @@ protected function migrateConfigurationForElasticVersion5(array &$mapping)
116117
* warnings on index creation
117118
*
118119
* @param array $mapping
120+
* @return void
119121
*/
120122
protected function migrateIncludeInAllToCopyTo(array &$mapping)
121123
{
@@ -129,15 +131,12 @@ protected function migrateIncludeInAllToCopyTo(array &$mapping)
129131
};
130132

131133
$migrateIncludeInAll($mapping);
132-
134+
133135
foreach ($mapping as &$item) {
134-
if (!is_array($item)) {
135-
continue;
136+
if (is_array($item)) {
137+
$migrateIncludeInAll($mapping);
138+
$this->migrateIncludeInAllToCopyTo($item);
136139
}
137-
138-
$migrateIncludeInAll($mapping);
139-
140-
$this->migrateIncludeInAllToCopyTo($item);
141140
}
142141
}
143142

0 commit comments

Comments
 (0)