Skip to content

Commit c1d1fe2

Browse files
committed
MAGETWO-59405: Improve Semantic of performance-toolkit Configuration
- Moved supplementary profile configuration files and updated references.
1 parent 7003dff commit c1d1fe2

File tree

8 files changed

+17
-13
lines changed

8 files changed

+17
-13
lines changed

setup/performance-toolkit/profiles/ce/extra_large.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<set_scheduled>true</set_scheduled>
6969
</indexer>
7070
</indexers>
71-
<xi:include href="searchTerms.xml" />
72-
<xi:include href="searchConfig.xml" />
73-
<xi:include href="attributeSets.xml" />
71+
<xi:include href="../../config/searchTerms.xml" />
72+
<xi:include href="../../config/searchConfig.xml" />
73+
<xi:include href="../../config/attributeSets.xml" />
7474
</profile>
7575
</config>

setup/performance-toolkit/profiles/ce/large.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<set_scheduled>true</set_scheduled>
6969
</indexer>
7070
</indexers>
71-
<xi:include href="searchTerms.xml" />
72-
<xi:include href="searchConfig.xml" />
73-
<xi:include href="attributeSets.xml" />
71+
<xi:include href="../../config/searchTerms.xml" />
72+
<xi:include href="../../config/searchConfig.xml" />
73+
<xi:include href="../../config/attributeSets.xml" />
7474
</profile>
7575
</config>

setup/performance-toolkit/profiles/ce/medium.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<set_scheduled>false</set_scheduled>
6969
</indexer>
7070
</indexers>
71-
<xi:include href="searchTerms.xml" />
72-
<xi:include href="searchConfig.xml" />
73-
<xi:include href="attributeSets.xml" />
71+
<xi:include href="../../config/searchTerms.xml" />
72+
<xi:include href="../../config/searchConfig.xml" />
73+
<xi:include href="../../config/attributeSets.xml" />
7474
</profile>
7575
</config>

setup/performance-toolkit/profiles/ce/small.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<set_scheduled>false</set_scheduled>
6969
</indexer>
7070
</indexers>
71-
<xi:include href="searchTerms.xml" />
72-
<xi:include href="searchConfig.xml" />
73-
<xi:include href="attributeSets.xml" />
71+
<xi:include href="../../config/searchTerms.xml" />
72+
<xi:include href="../../config/searchConfig.xml" />
73+
<xi:include href="../../config/attributeSets.xml" />
7474
</profile>
7575
</config>

setup/src/Magento/Setup/Fixtures/FixtureModel.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ public function loadConfig($filename)
221221
*/
222222
public function getValue($key, $default = null)
223223
{
224-
return isset($this->config['config']['profile'][$key]) ? $this->config['config']['profile'][$key] : $default;
224+
return isset($this->config['config']['profile'][$key]) ?
225+
(
226+
isset($this->config['config']['profile'][$key]['_value']) ?
227+
$this->config['config']['profile'][$key]['_value'] : $this->config['config']['profile'][$key]
228+
) : $default;
225229
}
226230
}

0 commit comments

Comments
 (0)