From 89e1d26dba596dc65d5050ecd23ee7237b66499e Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@ebay.com>
Date: Thu, 7 May 2015 11:47:44 -0500
Subject: [PATCH] MAGETWO-36080: Move
dev/tools/Magento/Tools/SampleData/install.php
- Changes based on CR feedback.
---
.../Magento/Test/Legacy/_files/obsolete_classes.php | 12 ++++++++----
lib/internal/Magento/Framework/App/Utility/Files.php | 3 +--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 00606349a80..5a4ac04f025 100755
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -3415,9 +3415,9 @@ return [
['Magento\Tools\SampleData\SetupInterface', 'Magento\SampleData\Model\SetupInterface'],
[
'Magento\Tools\SampleData\Module\Bundle\Setup\Product\Converter',
- 'Magento\SampleData\Module\Bundle\Setup\Product\Converter'],
- ['Magento\Tools\SampleData\Module\Bundle\Setup\Product', 'Magento\SampleData\Module\Bundle\Setup\Product'
+ 'Magento\SampleData\Module\Bundle\Setup\Product\Converter'
],
+ ['Magento\Tools\SampleData\Module\Bundle\Setup\Product', 'Magento\SampleData\Module\Bundle\Setup\Product'],
['Magento\Tools\SampleData\Module\Bundle\Setup', 'Magento\SampleData\Module\Bundle\Setup'],
['Magento\Tools\SampleData\Module\Catalog\Setup\Attribute', 'Magento\SampleData\Module\Catalog\Setup\Attribute'],
['Magento\Tools\SampleData\Module\Catalog\Setup\Category', 'Magento\SampleData\Module\Catalog\Setup\Category'],
@@ -3454,8 +3454,11 @@ return [
],
[
'Magento\Tools\SampleData\Module\ConfigurableProduct\Setup\Product',
- 'Magento\SampleData\Module\ConfigurableProduct\Setup\Product'],
- ['Magento\Tools\SampleData\Module\ConfigurableProduct\Setup', 'Magento\SampleData\Module\ConfigurableProduct\Setup'
+ 'Magento\SampleData\Module\ConfigurableProduct\Setup\Product'
+ ],
+ [
+ 'Magento\Tools\SampleData\Module\ConfigurableProduct\Setup',
+ 'Magento\SampleData\Module\ConfigurableProduct\Setup'
],
['Magento\Tools\SampleData\Module\Customer\Setup\Customer', 'Magento\SampleData\Module\Customer\Setup\Customer'],
['Magento\Tools\SampleData\Module\Customer\Setup', 'Magento\SampleData\Module\Customer\Setup'],
@@ -3526,4 +3529,5 @@ return [
],
['Magento\Tools\SampleData\Module\Wishlist\Setup\Wishlist', 'Magento\SampleData\Module\Wishlist\Setup\Wishlist'],
['Magento\Tools\SampleData\Module\Wishlist\Setup', 'Magento\SampleData\Module\Wishlist\Setup'],
+ ['Magento\Tools\SampleData\InstallerApp'],
];
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index efc05f7fa85..2feccec4ac1 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -134,8 +134,7 @@ class Files
$files,
glob($this->_path . '/*.php', GLOB_NOSORT),
glob($this->_path . '/pub/*.php', GLOB_NOSORT),
- $this->getFilesSubset(["{$this->_path}/lib/internal/Magento"], '*.php', $this->libTestDirs),
- self::getFiles(["{$this->_path}/app/code/Magento/SampleData"], '*.php')
+ $this->getFilesSubset(["{$this->_path}/lib/internal/Magento"], '*.php', $this->libTestDirs)
);
}
if ($tests) {
--
GitLab