From c1d1fe223d64b0b2a98abea32284e7d4c0c416e4 Mon Sep 17 00:00:00 2001
From: Alan Vosper <avosper@magento.com>
Date: Fri, 7 Oct 2016 16:14:38 -0700
Subject: [PATCH] MAGETWO-59405: Improve Semantic of performance-toolkit
Configuration
- Moved supplementary profile configuration files and updated references.
---
.../{profiles/ce => config}/attributeSets.xml | 0
.../{profiles/ce => config}/searchConfig.xml | 0
.../{profiles/ce => config}/searchTerms.xml | 0
setup/performance-toolkit/profiles/ce/extra_large.xml | 6 +++---
setup/performance-toolkit/profiles/ce/large.xml | 6 +++---
setup/performance-toolkit/profiles/ce/medium.xml | 6 +++---
setup/performance-toolkit/profiles/ce/small.xml | 6 +++---
setup/src/Magento/Setup/Fixtures/FixtureModel.php | 6 +++++-
8 files changed, 17 insertions(+), 13 deletions(-)
rename setup/performance-toolkit/{profiles/ce => config}/attributeSets.xml (100%)
rename setup/performance-toolkit/{profiles/ce => config}/searchConfig.xml (100%)
rename setup/performance-toolkit/{profiles/ce => config}/searchTerms.xml (100%)
diff --git a/setup/performance-toolkit/profiles/ce/attributeSets.xml b/setup/performance-toolkit/config/attributeSets.xml
similarity index 100%
rename from setup/performance-toolkit/profiles/ce/attributeSets.xml
rename to setup/performance-toolkit/config/attributeSets.xml
diff --git a/setup/performance-toolkit/profiles/ce/searchConfig.xml b/setup/performance-toolkit/config/searchConfig.xml
similarity index 100%
rename from setup/performance-toolkit/profiles/ce/searchConfig.xml
rename to setup/performance-toolkit/config/searchConfig.xml
diff --git a/setup/performance-toolkit/profiles/ce/searchTerms.xml b/setup/performance-toolkit/config/searchTerms.xml
similarity index 100%
rename from setup/performance-toolkit/profiles/ce/searchTerms.xml
rename to setup/performance-toolkit/config/searchTerms.xml
diff --git a/setup/performance-toolkit/profiles/ce/extra_large.xml b/setup/performance-toolkit/profiles/ce/extra_large.xml
index c9bf96ad4f4..fd1da116bc9 100644
--- a/setup/performance-toolkit/profiles/ce/extra_large.xml
+++ b/setup/performance-toolkit/profiles/ce/extra_large.xml
@@ -68,8 +68,8 @@
<set_scheduled>true</set_scheduled>
</indexer>
</indexers>
- <xi:include href="searchTerms.xml" />
- <xi:include href="searchConfig.xml" />
- <xi:include href="attributeSets.xml" />
+ <xi:include href="../../config/searchTerms.xml" />
+ <xi:include href="../../config/searchConfig.xml" />
+ <xi:include href="../../config/attributeSets.xml" />
</profile>
</config>
diff --git a/setup/performance-toolkit/profiles/ce/large.xml b/setup/performance-toolkit/profiles/ce/large.xml
index 07e7ac33023..d5d381fe059 100644
--- a/setup/performance-toolkit/profiles/ce/large.xml
+++ b/setup/performance-toolkit/profiles/ce/large.xml
@@ -68,8 +68,8 @@
<set_scheduled>true</set_scheduled>
</indexer>
</indexers>
- <xi:include href="searchTerms.xml" />
- <xi:include href="searchConfig.xml" />
- <xi:include href="attributeSets.xml" />
+ <xi:include href="../../config/searchTerms.xml" />
+ <xi:include href="../../config/searchConfig.xml" />
+ <xi:include href="../../config/attributeSets.xml" />
</profile>
</config>
diff --git a/setup/performance-toolkit/profiles/ce/medium.xml b/setup/performance-toolkit/profiles/ce/medium.xml
index 6b1b289e823..95cd062fa74 100644
--- a/setup/performance-toolkit/profiles/ce/medium.xml
+++ b/setup/performance-toolkit/profiles/ce/medium.xml
@@ -68,8 +68,8 @@
<set_scheduled>false</set_scheduled>
</indexer>
</indexers>
- <xi:include href="searchTerms.xml" />
- <xi:include href="searchConfig.xml" />
- <xi:include href="attributeSets.xml" />
+ <xi:include href="../../config/searchTerms.xml" />
+ <xi:include href="../../config/searchConfig.xml" />
+ <xi:include href="../../config/attributeSets.xml" />
</profile>
</config>
diff --git a/setup/performance-toolkit/profiles/ce/small.xml b/setup/performance-toolkit/profiles/ce/small.xml
index 4f9b436666f..1949bb2a53f 100644
--- a/setup/performance-toolkit/profiles/ce/small.xml
+++ b/setup/performance-toolkit/profiles/ce/small.xml
@@ -68,8 +68,8 @@
<set_scheduled>false</set_scheduled>
</indexer>
</indexers>
- <xi:include href="searchTerms.xml" />
- <xi:include href="searchConfig.xml" />
- <xi:include href="attributeSets.xml" />
+ <xi:include href="../../config/searchTerms.xml" />
+ <xi:include href="../../config/searchConfig.xml" />
+ <xi:include href="../../config/attributeSets.xml" />
</profile>
</config>
diff --git a/setup/src/Magento/Setup/Fixtures/FixtureModel.php b/setup/src/Magento/Setup/Fixtures/FixtureModel.php
index 44173a32c3e..d8e23253e8d 100644
--- a/setup/src/Magento/Setup/Fixtures/FixtureModel.php
+++ b/setup/src/Magento/Setup/Fixtures/FixtureModel.php
@@ -221,6 +221,10 @@ class FixtureModel
*/
public function getValue($key, $default = null)
{
- return isset($this->config['config']['profile'][$key]) ? $this->config['config']['profile'][$key] : $default;
+ return isset($this->config['config']['profile'][$key]) ?
+ (
+ isset($this->config['config']['profile'][$key]['_value']) ?
+ $this->config['config']['profile'][$key]['_value'] : $this->config['config']['profile'][$key]
+ ) : $default;
}
}
--
GitLab