Skip to content

Commit 23057ba

Browse files
committed
MAGETWO-52958: Better Semantic for UI Components
- fixed wrong processing of "extends" attribute
1 parent 8067cec commit 23057ba

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

app/code/Magento/Ui/Config/Reader.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ private function readFiles($fileList)
130130
}
131131

132132
$definitionData = $this->definitionReader->read();
133-
$output = $this->mergeDefinition($output, $definitionData);
134133

135134
if (isset($output['attributes']['extends'])) {
136135
$extendsReader = $this->readerFactory->create(
@@ -145,6 +144,8 @@ private function readFiles($fileList)
145144
$output = array_replace_recursive($extendsData, $output);
146145
}
147146

147+
$output = $this->mergeDefinition($output, $definitionData);
148+
148149
return $output;
149150
}
150151

0 commit comments

Comments
 (0)