diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowFrameworkCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowFrameworkCommandTest.php
similarity index 93%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowFrameworkCommandTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowFrameworkCommandTest.php
index 76db3df10eb0e8c065a4a7406a5469a97660053a..ff82940e58aecd75c722ea2a7d926bf76b50c46f 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowFrameworkCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowFrameworkCommandTest.php
@@ -3,9 +3,8 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Console\Command;
+namespace Magento\Setup\Console\Command;
-use Magento\Tools\Console\Command\DependenciesShowFrameworkCommand;
use Symfony\Component\Console\Tester\CommandTester;
class DependenciesShowFrameworkCommandTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowModulesCircularCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommandTest.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowModulesCircularCommandTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommandTest.php
index c47489a361dc77d9420f41d12c67d39fd991f5d6..9fc5e9dbecdae680e4d7eda3a13929d6886d2558 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowModulesCircularCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommandTest.php
@@ -3,9 +3,8 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Console\Command;
+namespace Magento\Setup\Console\Command;
-use Magento\Tools\Console\Command\DependenciesShowModulesCircularCommand;
use Symfony\Component\Console\Tester\CommandTester;
class DependenciesShowModulesCircularCommandTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowModulesCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowModulesCommandTest.php
similarity index 93%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowModulesCommandTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowModulesCommandTest.php
index 348d82f098a27cf1191e6243868e6cb180826024..6d0c16225cd5cb7395672f8361baf7e9f9ab5c73 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/DependenciesShowModulesCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowModulesCommandTest.php
@@ -3,9 +3,8 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Console\Command;
+namespace Magento\Setup\Console\Command;
-use Magento\Tools\Console\Command\DependenciesShowModulesCommand;
use Symfony\Component\Console\Tester\CommandTester;
class DependenciesShowModulesCommandTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/expected/circular.csv b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expected/circular.csv
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/expected/circular.csv
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expected/circular.csv
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/expected/framework.csv b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expected/framework.csv
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/expected/framework.csv
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expected/framework.csv
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/expected/modules.csv b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expected/modules.csv
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/expected/modules.csv
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expected/modules.csv
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/composer.json
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/etc/module.xml b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/composer.json
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/etc/module.xml b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
rename to dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/CircularTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/CircularTest.php
similarity index 85%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/CircularTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/CircularTest.php
index 6f00de7adac0b43b6e7b0dfcc638e22fffeca37c..01bac7a189596944c44b056fbfc19e9a015a51b4 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/CircularTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/CircularTest.php
@@ -3,14 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Dependency;
-
-use Magento\Tools\Dependency\Circular;
+namespace Magento\Setup\Module\Dependency;
class CircularTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Circular
+ * @var Circular
*/
protected $circular;
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Parser/Composer/JsonTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Composer/JsonTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Parser/Composer/JsonTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Composer/JsonTest.php
index 684c24f7b933bf7999ce97c835b851d8140e98a4..173148154fc7f302c75e5c50bb634e0e375fb3bf 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Parser/Composer/JsonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Composer/JsonTest.php
@@ -3,9 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Dependency\Parser\Composer;
-
-use Magento\Tools\Dependency\Parser\Composer\Json;
+namespace Magento\Setup\Module\Dependency\Parser\Composer;
class JsonTest extends \PHPUnit_Framework_TestCase
{
@@ -15,7 +13,7 @@ class JsonTest extends \PHPUnit_Framework_TestCase
protected $fixtureDir;
/**
- * @var \Magento\Tools\Dependency\Parser\Composer\Json
+ * @var Json
*/
protected $parser;
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Parser/Config/XmlTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Config/XmlTest.php
similarity index 82%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Parser/Config/XmlTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Config/XmlTest.php
index cdf12497059a9f1d0072ac89eb6edb4e280dafdf..d9439764258b64e591af7382775693fa28bb83d8 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Parser/Config/XmlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Config/XmlTest.php
@@ -3,9 +3,8 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Dependency\Parser\Config;
+namespace Magento\Setup\Module\Dependency\Parser\Config;
-use Magento\Tools\Dependency\Parser\Config\Xml;
class XmlTest extends \PHPUnit_Framework_TestCase
{
@@ -15,7 +14,7 @@ class XmlTest extends \PHPUnit_Framework_TestCase
protected $fixtureDir;
/**
- * @var \Magento\Tools\Dependency\Parser\Config\Xml
+ * @var Xml
*/
protected $parser;
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/CircularTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/CircularTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/CircularTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/CircularTest.php
index 0fa0180dc786d09d20da674d104152423bbd1ecb..ce72ffc46b1c99ef2ef420d2cb2132d0844758eb 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/CircularTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/CircularTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Dependency\Report;
+namespace Magento\Setup\Module\Dependency\Report;
-use Magento\Tools\Dependency\ServiceLocator;
+use Magento\Setup\Module\Dependency\ServiceLocator;
class CircularTest extends \PHPUnit_Framework_TestCase
{
@@ -20,7 +20,7 @@ class CircularTest extends \PHPUnit_Framework_TestCase
protected $sourceFilename;
/**
- * @var \Magento\Tools\Dependency\Report\BuilderInterface
+ * @var BuilderInterface
*/
protected $builder;
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/DependencyTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/DependencyTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/DependencyTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/DependencyTest.php
index 2c672d400375bd262d7947ac5bf266c860f63532..3c896043ae3be59290786b93a7d2723ee9c90d24 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/DependencyTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/DependencyTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Dependency\Report;
+namespace Magento\Setup\Module\Dependency\Report;
-use Magento\Tools\Dependency\ServiceLocator;
+use Magento\Setup\Module\Dependency\ServiceLocator;
class DependencyTest extends \PHPUnit_Framework_TestCase
{
@@ -20,7 +20,7 @@ class DependencyTest extends \PHPUnit_Framework_TestCase
protected $sourceFilename;
/**
- * @var \Magento\Tools\Dependency\Report\BuilderInterface
+ * @var BuilderInterface
*/
protected $builder;
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/FrameworkTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/FrameworkTest.php
similarity index 93%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/FrameworkTest.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/FrameworkTest.php
index 15ef53dd86247ae5701956c621ee3e1d43977535..ba4021dd6c1c88d63daeecbd2e3f8245231f25a5 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/Report/FrameworkTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Report/FrameworkTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Test\Tools\Dependency\Report;
+namespace Magento\Setup\Module\Dependency\Report;
-use Magento\Tools\Dependency\ServiceLocator;
+use Magento\Setup\Module\Dependency\ServiceLocator;
class FrameworkTest extends \PHPUnit_Framework_TestCase
{
@@ -25,7 +25,7 @@ class FrameworkTest extends \PHPUnit_Framework_TestCase
protected $sourceFilename;
/**
- * @var \Magento\Tools\Dependency\Report\BuilderInterface
+ * @var BuilderInterface
*/
protected $builder;
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/Helper/Helper.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/Helper/Helper.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/Helper/Helper.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/Helper/Helper.php
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/Model/Model.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/Model/Model.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/Model/Model.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/Model/Model.php
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/Model/WithoutDependencies.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/Model/WithoutDependencies.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/Model/WithoutDependencies.php
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/Model/WithoutDependencies.php
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/etc/module.xml b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/etc/module.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/etc/module.xml
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/etc/module.xml
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/view/frontend/template.phtml b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/view/frontend/template.phtml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/code/Magento/FirstModule/view/frontend/template.phtml
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/code/Magento/FirstModule/view/frontend/template.phtml
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer1.json
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer1.json
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer2.json
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer2.json
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer3.json
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer3.json
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer4.json
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer4.json
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer5.json
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/composer5.json
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/circular-dependencies.csv b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/circular-dependencies.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4b83254473bcbbfd4674c5b9c7040c55c4aefbb1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/circular-dependencies.csv
@@ -0,0 +1,9 @@
+"Circular dependencies:","Total number of chains"
+"","2"
+
+"Circular dependencies for each module:",""
+"magento/module-module1","1"
+"magento/module-module1->magento/module-module2->magento/module-module1"
+
+"magento/module-module2","1"
+"magento/module-module2->magento/module-module1->magento/module-module2"
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/dependencies.csv b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/dependencies.csv
new file mode 100644
index 0000000000000000000000000000000000000000..9ab2ef5f53021ab021b0cee0491e54c263ca2c61
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/dependencies.csv
@@ -0,0 +1,10 @@
+"","All","Hard","Soft"
+"Total number of dependencies","3","2","1"
+
+"Dependencies for each module:","All","Hard","Soft"
+"magento/module-module1","2","1","1"
+" -- magento/module-module2","","1","0"
+" -- magento/module-backend","","0","1"
+
+"magento/module-module2","1","1","0"
+" -- magento/module-module3","","1","0"
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/framework-dependencies.csv b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/framework-dependencies.csv
new file mode 100644
index 0000000000000000000000000000000000000000..8b681bd873577b40cb7949f7f4cf72b32c361c19
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/framework-dependencies.csv
@@ -0,0 +1,8 @@
+"Dependencies of framework:","Total number"
+"","3"
+
+"Dependencies for each module:",""
+"Magento\FirstModule","3"
+" -- Magento\LibFirst","1"
+" -- Magento\LibSecond","2"
+" -- Magento\Third","1"
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-circular-dependencies.csv b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-circular-dependencies.csv
new file mode 100644
index 0000000000000000000000000000000000000000..6397730cd9f5224eecf710abbe60c36c6f934f32
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-circular-dependencies.csv
@@ -0,0 +1,2 @@
+"Circular dependencies:","Total number of chains"
+"","0"
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-dependencies.csv b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-dependencies.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e1b73bda9759948fbfba9732c732fcf140d2097c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-dependencies.csv
@@ -0,0 +1,2 @@
+"","All","Hard","Soft"
+"Total number of dependencies","0","0","0"
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-framework-dependencies.csv b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-framework-dependencies.csv
new file mode 100644
index 0000000000000000000000000000000000000000..2c5a00595d4c7ada7190e982450a810f2568a0a1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-framework-dependencies.csv
@@ -0,0 +1,2 @@
+"Dependencies of framework:","Total number"
+"","0"
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/module1.xml b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/module1.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/module1.xml
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/module1.xml
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/module2.xml b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/module2.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/module2.xml
rename to dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/module2.xml
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/output/.gitignore b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/output/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/circular-dependencies.csv b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/circular-dependencies.csv
deleted file mode 100644
index 1d29bfdb31a21dd73cf03522ff188ed6805fcd0e..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/circular-dependencies.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-"Circular dependencies:";"Total number of chains"
-"";"2"
-
-"Circular dependencies for each module:";""
-"magento/module-module1";"1"
-"magento/module-module1->magento/module-module2->magento/module-module1"
-
-"magento/module-module2";"1"
-"magento/module-module2->magento/module-module1->magento/module-module2"
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/dependencies.csv b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/dependencies.csv
deleted file mode 100644
index bce8d9c13d29ac3ac3e983a635069e2170a3d6bf..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/dependencies.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"";"All";"Hard";"Soft"
-"Total number of dependencies";"3";"2";"1"
-
-"Dependencies for each module:";"All";"Hard";"Soft"
-"magento/module-module1";"2";"1";"1"
-" -- magento/module-module2";"";"1";"0"
-" -- magento/module-backend";"";"0";"1"
-
-"magento/module-module2";"1";"1";"0"
-" -- magento/module-module3";"";"1";"0"
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/framework-dependencies.csv b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/framework-dependencies.csv
deleted file mode 100644
index d20a242e069ac263887e4bfc670ef37cb0bd00cc..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/framework-dependencies.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-"Dependencies of framework:";"Total number"
-"";"3"
-
-"Dependencies for each module:";""
-"Magento\FirstModule";"3"
-" -- Magento\LibFirst";"1"
-" -- Magento\LibSecond";"2"
-" -- Magento\Third";"1"
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-circular-dependencies.csv b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-circular-dependencies.csv
deleted file mode 100644
index 2861dd888e2e134e6ceb489c5842ba0ce5d3a38f..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-circular-dependencies.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Circular dependencies:";"Total number of chains"
-"";"0"
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-dependencies.csv b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-dependencies.csv
deleted file mode 100644
index a1ca40ac82b64cab883d3359d367932ec7ec26dd..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-dependencies.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"";"All";"Hard";"Soft"
-"Total number of dependencies";"0";"0";"0"
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-framework-dependencies.csv b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-framework-dependencies.csv
deleted file mode 100644
index 71bbbf849782150012a734c4999a45896e0ee6c8..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-framework-dependencies.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Dependencies of framework:";"Total number"
-"";"0"
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 530d181efe07b357b5d9a3ed3dec7e03ffa97054..15bd7a8135fa10d18a078e0da7a98a7f4a41519b 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
@@ -3336,4 +3336,70 @@ return [
['Magento\Framework\App\Filesystem\DirectoryList\AbstractShell'],
['Magento\Tools\Layout\Reference'],
['Magento\Tools\Layout\Formatter', 'Magento\Developer\Model\Tools\Formatter'],
+ ['Magento\Tools\Dependency\Circular', 'Magento\Setup\Module\Dependency\Circular'],
+ ['Magento\Tools\Dependency\Parser\Code', 'Magento\Setup\Module\Dependency\Parser\Code'],
+ ['Magento\Tools\Dependency\Parser\Composer\Json', 'Magento\Setup\Module\Dependency\Composer\Json'],
+ ['Magento\Tools\Dependency\Parser\Config\Xml', 'Magento\Setup\Module\Dependency\Config\Xml'],
+ ['Magento\Tools\Dependency\ParserInterface', 'Magento\Setup\Module\Dependency\ParserInterface'],
+ [
+ 'Magento\Tools\Dependency\Report\Builder\AbstractBuilder',
+ 'Magento\Setup\Module\Dependency\Report\Builder\AbstractBuilder'
+ ],
+ ['Magento\Tools\Dependency\Report\BuilderInterface', 'Magento\Setup\Module\Dependency\Report\BuilderInterface'],
+ ['Magento\Tools\Dependency\Report\Circular\Builder', 'Magento\Setup\Module\Dependency\Report\Circular\Builder'],
+ [
+ 'Magento\Tools\Dependency\Report\Circular\Data\Chain',
+ 'Magento\Setup\Module\Dependency\Report\Circular\Data\Chain'
+ ],
+ [
+ 'Magento\Tools\Dependency\Report\Circular\Data\Config',
+ 'Magento\Setup\Module\Dependency\Report\Circular\Data\Config'
+ ],
+ [
+ 'Magento\Tools\Dependency\Report\Circular\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Circular\Data\Module'
+ ],
+ ['Magento\Tools\Dependency\Report\Circular\Writer', 'Magento\Setup\Module\Dependency\Report\Circular\Writer'],
+ [
+ 'Magento\Tools\Dependency\Report\Data\Config\AbstractConfig',
+ 'Magento\Setup\Module\Dependency\Report\Data\Config\AbstractConfig'
+ ],
+ [
+ 'Magento\Tools\Dependency\Report\Data\ConfigInterface',
+ 'Magento\Setup\Module\Dependency\Report\Data\ConfigInterface'
+ ],
+ ['Magento\Tools\Dependency\Report\Dependency\Builder', 'Magento\Setup\Module\Dependency\Report\Dependency\Builder'],
+ [
+ 'Magento\Tools\Dependency\Report\Dependency\Data\Config',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Config'
+ ],
+ [
+ 'Magento\Tools\Dependency\Report\Dependency\Data\Dependency',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency'
+ ],
+ [
+ 'Magento\Tools\Dependency\Report\Dependency\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Module'
+ ],
+ ['Magento\Tools\Dependency\Report\Dependency\Writer', 'Magento\Setup\Module\Dependency\Report\Dependency\Writer'],
+ ['Magento\Tools\Dependency\Report\Framework\Builder', 'Magento\Setup\Module\Dependency\Report\Framework\Builder'],
+ [
+ 'Magento\Tools\Dependency\Report\Framework\Data\Config',
+ 'Magento\Setup\Module\Dependency\Report\Framework\Data\Config'
+ ],
+ [
+ 'Magento\Tools\Dependency\Report\Framework\Data\Dependency',
+ 'Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency'
+ ],
+ [
+ 'Magento\Tools\Dependency\Report\Framework\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Framework\Data\Module'
+ ],
+ ['Magento\Tools\Dependency\Report\Framework\Writer', 'Magento\Setup\Module\Dependency\Report\Framework\Writer'],
+ [
+ 'Magento\Tools\Dependency\Report\Writer\Csv\AbstractWriter',
+ 'Magento\Setup\Module\Dependency\Report\Writer\Csv\AbstractWriter'
+ ],
+ ['Magento\Tools\Dependency\Report\WriterInterface', 'Magento\Setup\Module\Dependency\Report\WriterInterface'],
+ ['Magento\Tools\Dependency\ServiceLocator', 'Magento\Setup\Module\Dependency\ServiceLocator'],
];
diff --git a/dev/tools/Magento/Tools/Console/CommandList.php b/dev/tools/Magento/Tools/Console/CommandList.php
index 1b2f2b8dab905377fee4e9def77a9fdfb21e8e31..a25d185b58c09dfa1aad3f668260a9c1cc866320 100644
--- a/dev/tools/Magento/Tools/Console/CommandList.php
+++ b/dev/tools/Magento/Tools/Console/CommandList.php
@@ -20,11 +20,7 @@ class CommandList
*/
protected function getCommandsClasses()
{
- return [
- 'Magento\Tools\Console\Command\DependenciesShowFrameworkCommand',
- 'Magento\Tools\Console\Command\DependenciesShowModulesCircularCommand',
- 'Magento\Tools\Console\Command\DependenciesShowModulesCommand',
- ];
+ return [];
}
/**
diff --git a/dev/tools/Magento/Tools/Console/Command/AbstractDependenciesCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
similarity index 98%
rename from dev/tools/Magento/Tools/Console/Command/AbstractDependenciesCommand.php
rename to setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
index 19c94e8dfe193b2670ef93722a1f8856720a2902..023677f588606634f109ea0fc1e4674fedac052a 100644
--- a/dev/tools/Magento/Tools/Console/Command/AbstractDependenciesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Console\Command;
+namespace Magento\Setup\Console\Command;
use Magento\Framework\App\Utility\Files;
use Symfony\Component\Console\Command\Command;
diff --git a/dev/tools/Magento/Tools/Console/Command/DependenciesShowFrameworkCommand.php b/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
similarity index 94%
rename from dev/tools/Magento/Tools/Console/Command/DependenciesShowFrameworkCommand.php
rename to setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
index 03499b681ba40d9df238823b7e141f3f877b5921..af16b59bc9b2f45d383cbec1f355312b3cd9a04f 100644
--- a/dev/tools/Magento/Tools/Console/Command/DependenciesShowFrameworkCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
@@ -3,10 +3,10 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Console\Command;
+namespace Magento\Setup\Console\Command;
use Magento\Framework\App\Utility\Files;
-use Magento\Tools\Dependency\ServiceLocator;
+use Magento\Setup\Module\Dependency\ServiceLocator;
/**
* Command for showing numbers of dependencies on Magento Framework
diff --git a/dev/tools/Magento/Tools/Console/Command/DependenciesShowModulesCircularCommand.php b/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommand.php
similarity index 93%
rename from dev/tools/Magento/Tools/Console/Command/DependenciesShowModulesCircularCommand.php
rename to setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommand.php
index 96a4dfeb25fe84815dfcd80f76044ee1c4843bd0..01b2208f57f13bbe60d6d44c34c0f5024dc2596b 100644
--- a/dev/tools/Magento/Tools/Console/Command/DependenciesShowModulesCircularCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommand.php
@@ -3,10 +3,10 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Console\Command;
+namespace Magento\Setup\Console\Command;
use Magento\Framework\App\Utility\Files;
-use Magento\Tools\Dependency\ServiceLocator;
+use Magento\Setup\Module\Dependency\ServiceLocator;
/**
* Command for showing number of circular dependencies between modules
diff --git a/dev/tools/Magento/Tools/Console/Command/DependenciesShowModulesCommand.php b/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCommand.php
similarity index 93%
rename from dev/tools/Magento/Tools/Console/Command/DependenciesShowModulesCommand.php
rename to setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCommand.php
index 1c7ced7c37c959029df6bc1091ff20c4636bd0ff..429d36c89d00fe51d136141afbdf11ce2dce4850 100644
--- a/dev/tools/Magento/Tools/Console/Command/DependenciesShowModulesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DependenciesShowModulesCommand.php
@@ -3,10 +3,10 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Console\Command;
+namespace Magento\Setup\Console\Command;
use Magento\Framework\App\Utility\Files;
-use Magento\Tools\Dependency\ServiceLocator;
+use Magento\Setup\Module\Dependency\ServiceLocator;
/**
* Command for showing number of dependencies between modules
diff --git a/setup/src/Magento/Setup/Console/CommandList.php b/setup/src/Magento/Setup/Console/CommandList.php
index 0cb36548c556e62d72ec7bce44d1ecf130ed2a0c..6ebcc5c9850302f8ef84f6ba9ec1db88cb84a5fd 100644
--- a/setup/src/Magento/Setup/Console/CommandList.php
+++ b/setup/src/Magento/Setup/Console/CommandList.php
@@ -43,6 +43,9 @@ class CommandList
'Magento\Setup\Console\Command\DbDataUpgradeCommand',
'Magento\Setup\Console\Command\DbSchemaUpgradeCommand',
'Magento\Setup\Console\Command\DbStatusCommand',
+ 'Magento\Setup\Console\Command\DependenciesShowFrameworkCommand',
+ 'Magento\Setup\Console\Command\DependenciesShowModulesCircularCommand',
+ 'Magento\Setup\Console\Command\DependenciesShowModulesCommand',
'Magento\Setup\Console\Command\DeployStaticContentCommand',
'Magento\Setup\Console\Command\DiCompileCommand',
'Magento\Setup\Console\Command\DiCompileMultiTenantCommand',
diff --git a/dev/tools/Magento/Tools/Dependency/Circular.php b/setup/src/Magento/Setup/Module/Dependency/Circular.php
similarity index 98%
rename from dev/tools/Magento/Tools/Dependency/Circular.php
rename to setup/src/Magento/Setup/Module/Dependency/Circular.php
index 1589083ab0490ee35f79367f2489dd38aea7977f..0f939ea5d5419bb17c6e79b6b56e7633e1b8cb95 100644
--- a/dev/tools/Magento/Tools/Dependency/Circular.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Circular.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency;
+namespace Magento\Setup\Module\Dependency;
use Magento\Framework\Data\Graph;
diff --git a/dev/tools/Magento/Tools/Dependency/Parser/Code.php b/setup/src/Magento/Setup/Module/Dependency/Parser/Code.php
similarity index 96%
rename from dev/tools/Magento/Tools/Dependency/Parser/Code.php
rename to setup/src/Magento/Setup/Module/Dependency/Parser/Code.php
index 133836c21293f1aca8c594497477c767be81e8bc..39d30a1557a95c31470c2536e68cc9ad4d23d1ad 100644
--- a/dev/tools/Magento/Tools/Dependency/Parser/Code.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Parser/Code.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Parser;
+namespace Magento\Setup\Module\Dependency\Parser;
-use Magento\Tools\Dependency\ParserInterface;
+use Magento\Setup\Module\Dependency\ParserInterface;
/**
* Code parser
diff --git a/dev/tools/Magento/Tools/Dependency/Parser/Composer/Json.php b/setup/src/Magento/Setup/Module/Dependency/Parser/Composer/Json.php
similarity index 96%
rename from dev/tools/Magento/Tools/Dependency/Parser/Composer/Json.php
rename to setup/src/Magento/Setup/Module/Dependency/Parser/Composer/Json.php
index cf1ce6504f8dab66d5e5b87f6a65a1db129abcb5..f8a2efc05aa51add2bbcd50c9f506ae34f6d27e0 100644
--- a/dev/tools/Magento/Tools/Dependency/Parser/Composer/Json.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Parser/Composer/Json.php
@@ -3,10 +3,10 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Parser\Composer;
+namespace Magento\Setup\Module\Dependency\Parser\Composer;
use Magento\Framework\Config\Composer\Package;
-use Magento\Tools\Dependency\ParserInterface;
+use Magento\Setup\Module\Dependency\ParserInterface;
/**
* Composer Json parser
diff --git a/dev/tools/Magento/Tools/Dependency/Parser/Config/Xml.php b/setup/src/Magento/Setup/Module/Dependency/Parser/Config/Xml.php
similarity index 94%
rename from dev/tools/Magento/Tools/Dependency/Parser/Config/Xml.php
rename to setup/src/Magento/Setup/Module/Dependency/Parser/Config/Xml.php
index 127cb6c4cc2908ee4f47d4e92430a4db0eb6ccc5..aec365bd4136340220ff1622a8cb79773c135ee3 100644
--- a/dev/tools/Magento/Tools/Dependency/Parser/Config/Xml.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Parser/Config/Xml.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Parser\Config;
+namespace Magento\Setup\Module\Dependency\Parser\Config;
-use Magento\Tools\Dependency\ParserInterface;
+use Magento\Setup\Module\Dependency\ParserInterface;
/**
* Config xml parser
diff --git a/dev/tools/Magento/Tools/Dependency/ParserInterface.php b/setup/src/Magento/Setup/Module/Dependency/ParserInterface.php
similarity index 87%
rename from dev/tools/Magento/Tools/Dependency/ParserInterface.php
rename to setup/src/Magento/Setup/Module/Dependency/ParserInterface.php
index bd851f518fc97dcbf4dfac514a42ed127af42f30..d9d9552e37da5f5f121077250edfdf6adbcc95fb 100644
--- a/dev/tools/Magento/Tools/Dependency/ParserInterface.php
+++ b/setup/src/Magento/Setup/Module/Dependency/ParserInterface.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency;
+namespace Magento\Setup\Module\Dependency;
/**
* Parser Interface
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Builder/AbstractBuilder.php b/setup/src/Magento/Setup/Module/Dependency/Report/Builder/AbstractBuilder.php
similarity index 81%
rename from dev/tools/Magento/Tools/Dependency/Report/Builder/AbstractBuilder.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Builder/AbstractBuilder.php
index aebde9c6cfb968dff054e7d9e6d526021c7e6b30..b8c73a114b1effc2d3ba80bf267c290124606a3b 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Builder/AbstractBuilder.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Builder/AbstractBuilder.php
@@ -3,11 +3,11 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Builder;
+namespace Magento\Setup\Module\Dependency\Report\Builder;
-use Magento\Tools\Dependency\ParserInterface;
-use Magento\Tools\Dependency\Report\BuilderInterface;
-use Magento\Tools\Dependency\Report\WriterInterface;
+use Magento\Setup\Module\Dependency\ParserInterface;
+use Magento\Setup\Module\Dependency\Report\BuilderInterface;
+use Magento\Setup\Module\Dependency\Report\WriterInterface;
/**
* Abstract report builder by config files
@@ -17,14 +17,14 @@ abstract class AbstractBuilder implements BuilderInterface
/**
* Dependencies parser
*
- * @var \Magento\Tools\Dependency\ParserInterface
+ * @var \Magento\Setup\Module\Dependency\ParserInterface
*/
protected $dependenciesParser;
/**
* Report writer
*
- * @var \Magento\Tools\Dependency\Report\WriterInterface
+ * @var \Magento\Setup\Module\Dependency\Report\WriterInterface
*/
protected $reportWriter;
@@ -81,7 +81,7 @@ abstract class AbstractBuilder implements BuilderInterface
* Template method. Prepare data for writer step
*
* @param array $modulesData
- * @return \Magento\Tools\Dependency\Report\Data\ConfigInterface
+ * @return \Magento\Setup\Module\Dependency\Report\Data\ConfigInterface
*/
abstract protected function buildData($modulesData);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Report/BuilderInterface.php b/setup/src/Magento/Setup/Module/Dependency/Report/BuilderInterface.php
similarity index 85%
rename from dev/tools/Magento/Tools/Dependency/Report/BuilderInterface.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/BuilderInterface.php
index 5cbb5f020dc4b49721700a8bb915f7e5393e7ef3..53aabb8ef11f5b1de208658986c0f646c48e76d1 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/BuilderInterface.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/BuilderInterface.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report;
+namespace Magento\Setup\Module\Dependency\Report;
/**
* Builder Interface
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Circular/Builder.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Builder.php
similarity index 72%
rename from dev/tools/Magento/Tools/Dependency/Report/Circular/Builder.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Circular/Builder.php
index 4e306689c7b14fa24010c3b74c2353d9eb4896e9..2f2d3a7ea78fb1a2dd335c93e013e2090fc6d7af 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Circular/Builder.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Builder.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Circular;
+namespace Magento\Setup\Module\Dependency\Report\Circular;
-use Magento\Tools\Dependency\Circular;
-use Magento\Tools\Dependency\ParserInterface;
-use Magento\Tools\Dependency\Report\Builder\AbstractBuilder;
-use Magento\Tools\Dependency\Report\WriterInterface;
+use Magento\Setup\Module\Dependency\Circular;
+use Magento\Setup\Module\Dependency\ParserInterface;
+use Magento\Setup\Module\Dependency\Report\Builder\AbstractBuilder;
+use Magento\Setup\Module\Dependency\Report\WriterInterface;
/**
* Dependencies report builder
@@ -18,16 +18,16 @@ class Builder extends AbstractBuilder
/**
* Circular dependencies builder
*
- * @var \Magento\Tools\Dependency\Circular
+ * @var \Magento\Setup\Module\Dependency\Circular
*/
protected $circularBuilder;
/**
* Builder constructor
*
- * @param \Magento\Tools\Dependency\ParserInterface $dependenciesParser
- * @param \Magento\Tools\Dependency\Report\WriterInterface $reportWriter
- * @param \Magento\Tools\Dependency\Circular $circularBuilder
+ * @param \Magento\Setup\Module\Dependency\ParserInterface $dependenciesParser
+ * @param \Magento\Setup\Module\Dependency\Report\WriterInterface $reportWriter
+ * @param \Magento\Setup\Module\Dependency\Circular $circularBuilder
*/
public function __construct(
ParserInterface $dependenciesParser,
@@ -43,7 +43,7 @@ class Builder extends AbstractBuilder
* Template method. Prepare data for writer step
*
* @param array $modulesData
- * @return \Magento\Tools\Dependency\Report\Circular\Data\Config
+ * @return \Magento\Setup\Module\Dependency\Report\Circular\Data\Config
*/
protected function buildData($modulesData)
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Chain.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Chain.php
similarity index 87%
rename from dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Chain.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Chain.php
index 256d9dd81ec8112aa201718807572db72a007730..a0d3e88f4919c824ba3a74b2bbc0218c8a5ecc02 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Chain.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Chain.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Circular\Data;
+namespace Magento\Setup\Module\Dependency\Report\Circular\Data;
/**
* Chain
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Config.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Config.php
similarity index 66%
rename from dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Config.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Config.php
index 6f10a943b332a2d924f9cebaac2a7e8dcbf30ec3..87e4c35eb98c1d25631a322e29c48e2738a6d231 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Config.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Config.php
@@ -3,14 +3,14 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Circular\Data;
+namespace Magento\Setup\Module\Dependency\Report\Circular\Data;
-use Magento\Tools\Dependency\Report\Data\Config\AbstractConfig;
+use Magento\Setup\Module\Dependency\Report\Data\Config\AbstractConfig;
/**
* Config
*
- * @method \Magento\Tools\Dependency\Report\Circular\Data\Module[] getModules()
+ * @method \Magento\Setup\Module\Dependency\Report\Circular\Data\Module[] getModules()
*/
class Config extends AbstractConfig
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Module.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Module.php
similarity index 76%
rename from dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Module.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Module.php
index fdb6691d97daecf3f1ef939c492120ea120eb1e1..0a8561103458882974568df36dc8418f4790b039 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Circular/Data/Module.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Data/Module.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Circular\Data;
+namespace Magento\Setup\Module\Dependency\Report\Circular\Data;
/**
* Module
@@ -20,7 +20,7 @@ class Module
/**
* Circular dependencies chains
*
- * @var \Magento\Tools\Dependency\Report\Circular\Data\Chain[]
+ * @var \Magento\Setup\Module\Dependency\Report\Circular\Data\Chain[]
*/
protected $chains;
@@ -28,7 +28,7 @@ class Module
* Module construct
*
* @param array $name
- * @param \Magento\Tools\Dependency\Report\Circular\Data\Chain[] $chains
+ * @param \Magento\Setup\Module\Dependency\Report\Circular\Data\Chain[] $chains
*/
public function __construct($name, array $chains = [])
{
@@ -49,7 +49,7 @@ class Module
/**
* Get circular dependencies chains
*
- * @return \Magento\Tools\Dependency\Report\Circular\Data\Chain[]
+ * @return \Magento\Setup\Module\Dependency\Report\Circular\Data\Chain[]
*/
public function getChains()
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Circular/Writer.php b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Writer.php
similarity index 83%
rename from dev/tools/Magento/Tools/Dependency/Report/Circular/Writer.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Circular/Writer.php
index 57538f4767ce26ac7347b5a687b8d5121566cb24..a1e57ab0383317218483a1a4b901b53320379231 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Circular/Writer.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Circular/Writer.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Circular;
+namespace Magento\Setup\Module\Dependency\Report\Circular;
-use Magento\Tools\Dependency\Report\Writer\Csv\AbstractWriter;
+use Magento\Setup\Module\Dependency\Report\Writer\Csv\AbstractWriter;
/**
* Csv file writer for circular dependencies report
@@ -20,7 +20,7 @@ class Writer extends AbstractWriter
/**
* Template method. Prepare data step
*
- * @param \Magento\Tools\Dependency\Report\Circular\Data\Config $config
+ * @param \Magento\Setup\Module\Dependency\Report\Circular\Data\Config $config
* @return array
*/
protected function prepareData($config)
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Data/Config/AbstractConfig.php b/setup/src/Magento/Setup/Module/Dependency/Report/Data/Config/AbstractConfig.php
similarity index 83%
rename from dev/tools/Magento/Tools/Dependency/Report/Data/Config/AbstractConfig.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Data/Config/AbstractConfig.php
index 0719d84e7e4f6aa0080d1ac654472fee046064dd..c04192d7a240a5c1f8247ee62d5b4be7ef10cb25 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Data/Config/AbstractConfig.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Data/Config/AbstractConfig.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Data\Config;
+namespace Magento\Setup\Module\Dependency\Report\Data\Config;
-use Magento\Tools\Dependency\Report\Data\ConfigInterface;
+use Magento\Setup\Module\Dependency\Report\Data\ConfigInterface;
/**
* Config
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Data/ConfigInterface.php b/setup/src/Magento/Setup/Module/Dependency/Report/Data/ConfigInterface.php
similarity index 87%
rename from dev/tools/Magento/Tools/Dependency/Report/Data/ConfigInterface.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Data/ConfigInterface.php
index c1108df9e486d6169dc66fddee0b2c60c15c1703..d204e5fd93258c03352d66451078fa59a0785b13 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Data/ConfigInterface.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Data/ConfigInterface.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Data;
+namespace Magento\Setup\Module\Dependency\Report\Data;
/**
* Config
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Builder.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Builder.php
similarity index 79%
rename from dev/tools/Magento/Tools/Dependency/Report/Dependency/Builder.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Builder.php
index 473f30313608a02e70a65ba9750d79128b947de5..b0f5fa3b8778e867ce4d64dd9759a364c202da51 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Builder.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Builder.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Dependency;
+namespace Magento\Setup\Module\Dependency\Report\Dependency;
-use Magento\Tools\Dependency\Report\Builder\AbstractBuilder;
+use Magento\Setup\Module\Dependency\Report\Builder\AbstractBuilder;
/**
* Modules dependencies report builder
@@ -16,7 +16,7 @@ class Builder extends AbstractBuilder
* Template method. Prepare data for writer step
*
* @param array $modulesData
- * @return \Magento\Tools\Dependency\Report\Dependency\Data\Config
+ * @return \Magento\Setup\Module\Dependency\Report\Dependency\Data\Config
*/
protected function buildData($modulesData)
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Config.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Config.php
similarity index 81%
rename from dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Config.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Config.php
index 7ecc5e61aceb419c93f2488f4b39658729c226ce..518bf6ccabbd19491d8d500c8aa99e4ca1a8f96b 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Config.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Config.php
@@ -3,14 +3,14 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Dependency\Data;
+namespace Magento\Setup\Module\Dependency\Report\Dependency\Data;
-use Magento\Tools\Dependency\Report\Data\Config\AbstractConfig;
+use Magento\Setup\Module\Dependency\Report\Data\Config\AbstractConfig;
/**
* Config
*
- * @method \Magento\Tools\Dependency\Report\Dependency\Data\Module[] getModules()
+ * @method \Magento\Setup\Module\Dependency\Report\Dependency\Data\Module[] getModules()
*/
class Config extends AbstractConfig
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Dependency.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Dependency.php
similarity index 95%
rename from dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Dependency.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Dependency.php
index 4b33bc8737486082f12a80f979652ffde168489e..ba97debadead40c146fdd51b8a103fd6159d6952 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Dependency.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Dependency.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Dependency\Data;
+namespace Magento\Setup\Module\Dependency\Report\Dependency\Data;
/**
* Dependency
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Module.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Module.php
similarity index 83%
rename from dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Module.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Module.php
index 5c99904d381b87a80070510a1cffd517fec52601..32e26bb123440f94e367c8130386e02631a8ede8 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Data/Module.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Data/Module.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Dependency\Data;
+namespace Magento\Setup\Module\Dependency\Report\Dependency\Data;
/**
* Module
@@ -20,7 +20,7 @@ class Module
/**
* Module dependencies
*
- * @var \Magento\Tools\Dependency\Report\Dependency\Data\Dependency[]
+ * @var \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency[]
*/
protected $dependencies;
@@ -28,7 +28,7 @@ class Module
* Module construct
*
* @param array $name
- * @param \Magento\Tools\Dependency\Report\Dependency\Data\Dependency[] $dependencies
+ * @param \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency[] $dependencies
*/
public function __construct($name, array $dependencies = [])
{
@@ -49,7 +49,7 @@ class Module
/**
* Get dependencies
*
- * @return \Magento\Tools\Dependency\Report\Dependency\Data\Dependency[]
+ * @return \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency[]
*/
public function getDependencies()
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Writer.php b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Writer.php
similarity index 88%
rename from dev/tools/Magento/Tools/Dependency/Report/Dependency/Writer.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Writer.php
index d34c954f5112ac1defc21ce4334236ed8c3cbd3d..651d800e7dc54bef387c4b4bc1701a8a0e300a49 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Dependency/Writer.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Dependency/Writer.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Dependency;
+namespace Magento\Setup\Module\Dependency\Report\Dependency;
-use Magento\Tools\Dependency\Report\Writer\Csv\AbstractWriter;
+use Magento\Setup\Module\Dependency\Report\Writer\Csv\AbstractWriter;
/**
* Csv file writer for modules dependencies report
@@ -15,7 +15,7 @@ class Writer extends AbstractWriter
/**
* Template method. Prepare data step
*
- * @param \Magento\Tools\Dependency\Report\Dependency\Data\Config $config
+ * @param \Magento\Setup\Module\Dependency\Report\Dependency\Data\Config $config
* @return array
*/
protected function prepareData($config)
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Framework/Builder.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Builder.php
similarity index 85%
rename from dev/tools/Magento/Tools/Dependency/Report/Framework/Builder.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Framework/Builder.php
index a4b2140060284b449fef6212d682676f9c07a567..d498d2074c05ab80e414052dadb848d2edca656a 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Framework/Builder.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Builder.php
@@ -3,11 +3,11 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Framework;
+namespace Magento\Setup\Module\Dependency\Report\Framework;
-use Magento\Tools\Dependency\ParserInterface;
-use Magento\Tools\Dependency\Report\Builder\AbstractBuilder;
-use Magento\Tools\Dependency\Report\WriterInterface;
+use Magento\Setup\Module\Dependency\ParserInterface;
+use Magento\Setup\Module\Dependency\Report\Builder\AbstractBuilder;
+use Magento\Setup\Module\Dependency\Report\WriterInterface;
/**
* Framework dependencies report builder
@@ -17,7 +17,7 @@ class Builder extends AbstractBuilder
/**
* Config parser
*
- * @var \Magento\Tools\Dependency\ParserInterface
+ * @var \Magento\Setup\Module\Dependency\ParserInterface
*/
protected $configParser;
@@ -58,7 +58,7 @@ class Builder extends AbstractBuilder
* Template method. Prepare data for writer step
*
* @param array $modulesData
- * @return \Magento\Tools\Dependency\Report\Framework\Data\Config
+ * @return \Magento\Setup\Module\Dependency\Report\Framework\Data\Config
*/
protected function buildData($modulesData)
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Config.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Config.php
similarity index 67%
rename from dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Config.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Config.php
index 464664593c4f0109d61783b67452c8037ff617e9..8c3f0b6b5e6bee5a39466ce2233ee51ffde0f5f5 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Config.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Config.php
@@ -3,14 +3,14 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Framework\Data;
+namespace Magento\Setup\Module\Dependency\Report\Framework\Data;
-use Magento\Tools\Dependency\Report\Data\Config\AbstractConfig;
+use Magento\Setup\Module\Dependency\Report\Data\Config\AbstractConfig;
/**
* Config
*
- * @method \Magento\Tools\Dependency\Report\Framework\Data\Module[] getModules()
+ * @method \Magento\Setup\Module\Dependency\Report\Framework\Data\Module[] getModules()
*/
class Config extends AbstractConfig
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Dependency.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Dependency.php
similarity index 92%
rename from dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Dependency.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Dependency.php
index 95deff3c8065bd9b84e93b6db2dbc5b999d05824..b1bd6038425d1d152ce59d8ee585cec7bab8f873 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Dependency.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Dependency.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Framework\Data;
+namespace Magento\Setup\Module\Dependency\Report\Framework\Data;
/**
* Dependency
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Module.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Module.php
similarity index 74%
rename from dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Module.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Module.php
index 50093ad2f003c2c3e0ddc32c1472a1f31df699dc..006d56b76fe3f663cb2f317c48df741df4264b01 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Framework/Data/Module.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Data/Module.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Framework\Data;
+namespace Magento\Setup\Module\Dependency\Report\Framework\Data;
/**
* Module
@@ -20,7 +20,7 @@ class Module
/**
* Module dependencies
*
- * @var \Magento\Tools\Dependency\Report\Framework\Data\Dependency[]
+ * @var \Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency[]
*/
protected $dependencies;
@@ -28,7 +28,7 @@ class Module
* Module construct
*
* @param array $name
- * @param \Magento\Tools\Dependency\Report\Framework\Data\Dependency[] $dependencies
+ * @param \Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency[] $dependencies
*/
public function __construct($name, array $dependencies = [])
{
@@ -49,7 +49,7 @@ class Module
/**
* Get dependencies
*
- * @return \Magento\Tools\Dependency\Report\Framework\Data\Dependency[]
+ * @return \Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency[]
*/
public function getDependencies()
{
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Framework/Writer.php b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Writer.php
similarity index 82%
rename from dev/tools/Magento/Tools/Dependency/Report/Framework/Writer.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Framework/Writer.php
index 756256f68f7a472bb7db170cb578532e07095aea..d6fb3341c3c8847a006104bd00cae5c5d375bed6 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Framework/Writer.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Framework/Writer.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Framework;
+namespace Magento\Setup\Module\Dependency\Report\Framework;
-use Magento\Tools\Dependency\Report\Writer\Csv\AbstractWriter;
+use Magento\Setup\Module\Dependency\Report\Writer\Csv\AbstractWriter;
/**
* Csv file writer for framework dependencies report
@@ -15,7 +15,7 @@ class Writer extends AbstractWriter
/**
* Template method. Prepare data step
*
- * @param \Magento\Tools\Dependency\Report\Framework\Data\Config $config
+ * @param \Magento\Setup\Module\Dependency\Report\Framework\Data\Config $config
* @return array
*/
protected function prepareData($config)
diff --git a/dev/tools/Magento/Tools/Dependency/Report/Writer/Csv/AbstractWriter.php b/setup/src/Magento/Setup/Module/Dependency/Report/Writer/Csv/AbstractWriter.php
similarity index 85%
rename from dev/tools/Magento/Tools/Dependency/Report/Writer/Csv/AbstractWriter.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/Writer/Csv/AbstractWriter.php
index c62e02bad8e4c6543251a86c59107045469a49f3..d5013a1508756da8e2091450a25fd7f7bedd8a55 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/Writer/Csv/AbstractWriter.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/Writer/Csv/AbstractWriter.php
@@ -3,10 +3,10 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report\Writer\Csv;
+namespace Magento\Setup\Module\Dependency\Report\Writer\Csv;
-use Magento\Tools\Dependency\Report\Data\ConfigInterface;
-use Magento\Tools\Dependency\Report\WriterInterface;
+use Magento\Setup\Module\Dependency\Report\Data\ConfigInterface;
+use Magento\Setup\Module\Dependency\Report\WriterInterface;
/**
* Abstract csv file writer for reports
@@ -59,7 +59,7 @@ abstract class AbstractWriter implements WriterInterface
/**
* Template method. Prepare data step
*
- * @param \Magento\Tools\Dependency\Report\Data\ConfigInterface $config
+ * @param \Magento\Setup\Module\Dependency\Report\Data\ConfigInterface $config
* @return array
*/
abstract protected function prepareData($config);
diff --git a/dev/tools/Magento/Tools/Dependency/Report/WriterInterface.php b/setup/src/Magento/Setup/Module/Dependency/Report/WriterInterface.php
similarity index 62%
rename from dev/tools/Magento/Tools/Dependency/Report/WriterInterface.php
rename to setup/src/Magento/Setup/Module/Dependency/Report/WriterInterface.php
index 0b2f0bfafec08479f3d6ed47e578d1412bd26f89..74780c5816e356dcf9a13a03f3bb58520470d4e8 100644
--- a/dev/tools/Magento/Tools/Dependency/Report/WriterInterface.php
+++ b/setup/src/Magento/Setup/Module/Dependency/Report/WriterInterface.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Report;
+namespace Magento\Setup\Module\Dependency\Report;
-use Magento\Tools\Dependency\Report\Data\ConfigInterface;
+use Magento\Setup\Module\Dependency\Report\Data\ConfigInterface;
/**
* Writer Interface
@@ -16,7 +16,7 @@ interface WriterInterface
* Write a report file
*
* @param array $options
- * @param \Magento\Tools\Dependency\Report\Data\ConfigInterface $config
+ * @param \Magento\Setup\Module\Dependency\Report\Data\ConfigInterface $config
* @return void
*/
public function write(array $options, ConfigInterface $config);
diff --git a/dev/tools/Magento/Tools/Dependency/ServiceLocator.php b/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
similarity index 77%
rename from dev/tools/Magento/Tools/Dependency/ServiceLocator.php
rename to setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
index 469f425c803e90b37e8d3aae2a47e3bf82df4d68..dc4c45f9962f53593142c1000bb0cfad0c747717 100644
--- a/dev/tools/Magento/Tools/Dependency/ServiceLocator.php
+++ b/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
@@ -3,13 +3,13 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency;
+namespace Magento\Setup\Module\Dependency;
use Magento\Framework\File\Csv;
-use Magento\Tools\Dependency\Circular as CircularTool;
-use Magento\Tools\Dependency\Report\Circular as CircularReport;
-use Magento\Tools\Dependency\Report\Dependency;
-use Magento\Tools\Dependency\Report\Framework;
+use Magento\Setup\Module\Dependency\Circular as CircularTool;
+use Magento\Setup\Module\Dependency\Report\Circular as CircularReport;
+use Magento\Setup\Module\Dependency\Report\Dependency;
+use Magento\Setup\Module\Dependency\Report\Framework;
/**
* Service Locator (instead DI container)
@@ -21,42 +21,42 @@ class ServiceLocator
/**
* Xml config dependencies parser
*
- * @var \Magento\Tools\Dependency\ParserInterface
+ * @var \Magento\Setup\Module\Dependency\ParserInterface
*/
private static $xmlConfigParser;
/**
* Composer Json parser
*
- * @var \Magento\Tools\Dependency\ParserInterface
+ * @var \Magento\Setup\Module\Dependency\ParserInterface
*/
private static $composerJsonParser;
/**
* Framework dependencies parser
*
- * @var \Magento\Tools\Dependency\ParserInterface
+ * @var \Magento\Setup\Module\Dependency\ParserInterface
*/
private static $frameworkDependenciesParser;
/**
* Modules dependencies report builder
*
- * @var \Magento\Tools\Dependency\Report\BuilderInterface
+ * @var \Magento\Setup\Module\Dependency\Report\BuilderInterface
*/
private static $dependenciesReportBuilder;
/**
* Modules circular dependencies report builder
*
- * @var \Magento\Tools\Dependency\Report\BuilderInterface
+ * @var \Magento\Setup\Module\Dependency\Report\BuilderInterface
*/
private static $circularDependenciesReportBuilder;
/**
* Framework dependencies report builder
*
- * @var \Magento\Tools\Dependency\Report\BuilderInterface
+ * @var \Magento\Setup\Module\Dependency\Report\BuilderInterface
*/
private static $frameworkDependenciesReportBuilder;
@@ -70,7 +70,7 @@ class ServiceLocator
/**
* Get modules dependencies report builder
*
- * @return \Magento\Tools\Dependency\Report\BuilderInterface
+ * @return \Magento\Setup\Module\Dependency\Report\BuilderInterface
*/
public static function getDependenciesReportBuilder()
{
@@ -86,7 +86,7 @@ class ServiceLocator
/**
* Get modules circular dependencies report builder
*
- * @return \Magento\Tools\Dependency\Report\BuilderInterface
+ * @return \Magento\Setup\Module\Dependency\Report\BuilderInterface
*/
public static function getCircularDependenciesReportBuilder()
{
@@ -103,7 +103,7 @@ class ServiceLocator
/**
* Get framework dependencies report builder
*
- * @return \Magento\Tools\Dependency\Report\BuilderInterface
+ * @return \Magento\Setup\Module\Dependency\Report\BuilderInterface
*/
public static function getFrameworkDependenciesReportBuilder()
{
@@ -120,7 +120,7 @@ class ServiceLocator
/**
* Get modules dependencies parser
*
- * @return \Magento\Tools\Dependency\ParserInterface
+ * @return \Magento\Setup\Module\Dependency\ParserInterface
*/
private static function getXmlConfigParser()
{
@@ -133,7 +133,7 @@ class ServiceLocator
/**
* Get modules dependencies from composer.json parser
*
- * @return \Magento\Tools\Dependency\ParserInterface
+ * @return \Magento\Setup\Module\Dependency\ParserInterface
*/
private static function getComposerJsonParser()
{
@@ -146,7 +146,7 @@ class ServiceLocator
/**
* Get framework dependencies parser
*
- * @return \Magento\Tools\Dependency\ParserInterface
+ * @return \Magento\Setup\Module\Dependency\ParserInterface
*/
private static function getFrameworkDependenciesParser()
{
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/CodeTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/CodeTest.php
similarity index 92%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/CodeTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/CodeTest.php
index c591bd39ddfe998003896a5a3d1a86072445f2d2..655b459dd08f51d0f170132b228833d866f1daf6 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/CodeTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/CodeTest.php
@@ -3,21 +3,21 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Parser;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Parser;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class CodeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Parser\Code
+ * @var \Magento\Setup\Module\Dependency\Parser\Code
*/
protected $parser;
protected function setUp()
{
$objectManagerHelper = new ObjectManager($this);
- $this->parser = $objectManagerHelper->getObject('Magento\Tools\Dependency\Parser\Code');
+ $this->parser = $objectManagerHelper->getObject('Magento\Setup\Module\Dependency\Parser\Code');
}
/**
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/Composer/JsonTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/Composer/JsonTest.php
similarity index 85%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/Composer/JsonTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/Composer/JsonTest.php
index 0aa80ac637d376b8030a294fd3a5b14a9219d967..c8fb94785e06e85b12a71e56846db20a0ab2810c 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/Composer/JsonTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/Composer/JsonTest.php
@@ -3,21 +3,21 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Parser\Composer;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Parser\Composer;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class JsonTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Parser\Config\Xml
+ * @var \Magento\Setup\Module\Dependency\Parser\Config\Xml
*/
protected $parser;
protected function setUp()
{
$objectManagerHelper = new ObjectManager($this);
- $this->parser = $objectManagerHelper->getObject('Magento\Tools\Dependency\Parser\Composer\Json');
+ $this->parser = $objectManagerHelper->getObject('Magento\Setup\Module\Dependency\Parser\Composer\Json');
}
/**
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/Config/XmlTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/Config/XmlTest.php
similarity index 85%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/Config/XmlTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/Config/XmlTest.php
index 39ade55ab1ea03ccbd34731c22e24670265095ba..4c0b9ad1f0236d9e3b9a90519c445cc5cecec5fc 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Parser/Config/XmlTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Parser/Config/XmlTest.php
@@ -3,21 +3,21 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Parser\Config;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Parser\Config;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class XmlTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Parser\Config\Xml
+ * @var \Magento\Setup\Module\Dependency\Parser\Config\Xml
*/
protected $parser;
protected function setUp()
{
$objectManagerHelper = new ObjectManager($this);
- $this->parser = $objectManagerHelper->getObject('Magento\Tools\Dependency\Parser\Config\Xml');
+ $this->parser = $objectManagerHelper->getObject('Magento\Setup\Module\Dependency\Parser\Config\Xml');
}
/**
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Builder/AbstractBuilderTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Builder/AbstractBuilderTest.php
similarity index 78%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Builder/AbstractBuilderTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Builder/AbstractBuilderTest.php
index f19faccb90a83dcba60ca3909d2a14a19f0492da..dce2cdcda680c14a8aa4fb15437df4ad9e9d9321 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Builder/AbstractBuilderTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Builder/AbstractBuilderTest.php
@@ -3,32 +3,32 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Builder;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Builder;
class AbstractBuilderTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\ParserInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\ParserInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $dependenciesParserMock;
/**
- * @var \Magento\Tools\Dependency\Report\WriterInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\WriterInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $reportWriterMock;
/**
- * @var \Magento\Tools\Dependency\Report\Builder\AbstractBuilder|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Builder\AbstractBuilder|\PHPUnit_Framework_MockObject_MockObject
*/
protected $builder;
protected function setUp()
{
- $this->dependenciesParserMock = $this->getMock('Magento\Tools\Dependency\ParserInterface');
- $this->reportWriterMock = $this->getMock('Magento\Tools\Dependency\Report\WriterInterface');
+ $this->dependenciesParserMock = $this->getMock('Magento\Setup\Module\Dependency\ParserInterface');
+ $this->reportWriterMock = $this->getMock('Magento\Setup\Module\Dependency\Report\WriterInterface');
$this->builder = $this->getMockForAbstractClass(
- 'Magento\Tools\Dependency\Report\Builder\AbstractBuilder',
+ 'Magento\Setup\Module\Dependency\Report\Builder\AbstractBuilder',
['dependenciesParser' => $this->dependenciesParserMock, 'reportWriter' => $this->reportWriterMock]
);
}
@@ -79,7 +79,7 @@ class AbstractBuilderTest extends \PHPUnit_Framework_TestCase
];
$parseResult = ['foo', 'bar', 'baz'];
- $configMock = $this->getMock('\Magento\Tools\Dependency\Report\Data\ConfigInterface');
+ $configMock = $this->getMock('\Magento\Setup\Module\Dependency\Report\Data\ConfigInterface');
$this->dependenciesParserMock->expects(
$this->once()
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ChainTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ChainTest.php
similarity index 69%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ChainTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ChainTest.php
index e2d73594b87bac35b88ac7d85293b3dd75945270..1e0ebda735d21dfaa567031cc8a1fcfe91a813ec 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ChainTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ChainTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Circular\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Circular\Data;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -14,9 +14,9 @@ class ChainTest extends \PHPUnit_Framework_TestCase
$modules = ['foo', 'baz', 'bar'];
$objectManagerHelper = new ObjectManager($this);
- /** @var \Magento\Tools\Dependency\Report\Circular\Data\Chain $chain */
+ /** @var \Magento\Setup\Module\Dependency\Report\Circular\Data\Chain $chain */
$chain = $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Circular\Data\Chain',
+ 'Magento\Setup\Module\Dependency\Report\Circular\Data\Chain',
['modules' => $modules]
);
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ConfigTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ConfigTest.php
similarity index 66%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ConfigTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ConfigTest.php
index c8d2ebba4bc48d4d1bce1df43acec1ded653dd3f..a171dc132be2eb7692af34a5702b64645198f575 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ConfigTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ConfigTest.php
@@ -3,38 +3,38 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Circular\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Circular\Data;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class ConfigTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Report\Circular\Data\Module|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Circular\Data\Module|\PHPUnit_Framework_MockObject_MockObject
*/
protected $moduleFirst;
/**
- * @var \Magento\Tools\Dependency\Report\Circular\Data\Module|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Circular\Data\Module|\PHPUnit_Framework_MockObject_MockObject
*/
protected $moduleSecond;
/**
- * @var \Magento\Tools\Dependency\Report\Circular\Data\Config
+ * @var \Magento\Setup\Module\Dependency\Report\Circular\Data\Config
*/
protected $config;
public function setUp()
{
$this->moduleFirst = $this->getMock(
- 'Magento\Tools\Dependency\Report\Circular\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Circular\Data\Module',
[],
[],
'',
false
);
$this->moduleSecond = $this->getMock(
- 'Magento\Tools\Dependency\Report\Circular\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Circular\Data\Module',
[],
[],
'',
@@ -43,7 +43,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$objectManagerHelper = new ObjectManager($this);
$this->config = $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Circular\Data\Config',
+ 'Magento\Setup\Module\Dependency\Report\Circular\Data\Config',
['modules' => [$this->moduleFirst, $this->moduleSecond]]
);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ModuleTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ModuleTest.php
similarity index 83%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ModuleTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ModuleTest.php
index 6321fc522a7426ddaa5aedc1f0e9e62055944ba2..9564f7c3a2c11b1c700ef4fe0ca33193fd93bec4 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Circular/Data/ModuleTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Circular/Data/ModuleTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Circular\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Circular\Data;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -12,13 +12,13 @@ class ModuleTest extends \PHPUnit_Framework_TestCase
/**
* @param string $name
* @param array $chains
- * @return \Magento\Tools\Dependency\Report\Circular\Data\Module
+ * @return \Magento\Setup\Module\Dependency\Report\Circular\Data\Module
*/
protected function createModule($name, $chains = [])
{
$objectManagerHelper = new ObjectManager($this);
return $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Circular\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Circular\Data\Module',
['name' => $name, 'chains' => $chains]
);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Data/Config/AbstractConfigTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Data/Config/AbstractConfigTest.php
similarity index 63%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Data/Config/AbstractConfigTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Data/Config/AbstractConfigTest.php
index e19c231513b62115a779491d23eb5ae59175bed6..55ff0b734cf89fb0a6d8e46113f4939bcd249b05 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Data/Config/AbstractConfigTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Data/Config/AbstractConfigTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Data\Config;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Data\Config;
class AbstractConfigTest extends \PHPUnit_Framework_TestCase
{
@@ -11,9 +11,9 @@ class AbstractConfigTest extends \PHPUnit_Framework_TestCase
{
$modules = ['foo', 'baz', 'bar'];
- /** @var \Magento\Tools\Dependency\Report\Data\Config\AbstractConfig $config */
+ /** @var \Magento\Setup\Module\Dependency\Report\Data\Config\AbstractConfig $config */
$config = $this->getMockForAbstractClass(
- 'Magento\Tools\Dependency\Report\Data\Config\AbstractConfig',
+ 'Magento\Setup\Module\Dependency\Report\Data\Config\AbstractConfig',
['modules' => $modules]
);
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/ConfigTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/ConfigTest.php
similarity index 80%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/ConfigTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/ConfigTest.php
index 791c8fb56735a633435ccf98b664ac936cfb2c5c..7225eb7d88edc0506cae12db9d78140a4dae0eef 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/ConfigTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/ConfigTest.php
@@ -3,38 +3,38 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Dependency\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Dependency\Data;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class ConfigTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Report\Dependency\Data\Module|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Dependency\Data\Module|\PHPUnit_Framework_MockObject_MockObject
*/
protected $moduleFirst;
/**
- * @var \Magento\Tools\Dependency\Report\Dependency\Data\Module|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Dependency\Data\Module|\PHPUnit_Framework_MockObject_MockObject
*/
protected $moduleSecond;
/**
- * @var \Magento\Tools\Dependency\Report\Dependency\Data\Config
+ * @var \Magento\Setup\Module\Dependency\Report\Dependency\Data\Config
*/
protected $config;
public function setUp()
{
$this->moduleFirst = $this->getMock(
- 'Magento\Tools\Dependency\Report\Dependency\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Module',
[],
[],
'',
false
);
$this->moduleSecond = $this->getMock(
- 'Magento\Tools\Dependency\Report\Dependency\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Module',
[],
[],
'',
@@ -43,7 +43,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$objectManagerHelper = new ObjectManager($this);
$this->config = $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Dependency\Data\Config',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Config',
['modules' => [$this->moduleFirst, $this->moduleSecond]]
);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/DependencyTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/DependencyTest.php
similarity index 76%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/DependencyTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/DependencyTest.php
index 4f563acf6fdec58c3854de9ce4c24bc996cee8cf..98eb160634a4d6867c8505ff253c688581c733ad 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/DependencyTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/DependencyTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Dependency\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Dependency\Data;
-use \Magento\Tools\Dependency\Report\Dependency\Data\Dependency;
+use \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -13,14 +13,14 @@ class DependencyTest extends \PHPUnit_Framework_TestCase
{
/**
* @param string $module
- * @param string|null $type One of \Magento\Tools\Dependency\Dependency::TYPE_ const
- * @return \Magento\Tools\Dependency\Report\Dependency\Data\Dependency
+ * @param string|null $type One of \Magento\Setup\Module\Dependency\Dependency::TYPE_ const
+ * @return \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency
*/
protected function createDependency($module, $type = null)
{
$objectManagerHelper = new ObjectManager($this);
return $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Dependency\Data\Dependency',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency',
['module' => $module, 'type' => $type]
);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/ModuleTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/ModuleTest.php
similarity index 78%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/ModuleTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/ModuleTest.php
index 84d67f2d47030e7bcda0bdadaa5bba57f943d8b4..460cff3f68bfb9928bc51f90bc90154cec403d0d 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Dependency/Data/ModuleTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Dependency/Data/ModuleTest.php
@@ -3,38 +3,38 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Dependency\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Dependency\Data;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class ModuleTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Report\Dependency\Data\Dependency|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency|\PHPUnit_Framework_MockObject_MockObject
*/
protected $dependencyFirst;
/**
- * @var \Magento\Tools\Dependency\Report\Dependency\Data\Dependency|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency|\PHPUnit_Framework_MockObject_MockObject
*/
protected $dependencySecond;
/**
- * @var \Magento\Tools\Dependency\Report\Dependency\Data\Module
+ * @var \Magento\Setup\Module\Dependency\Report\Dependency\Data\Module
*/
protected $module;
public function setUp()
{
$this->dependencyFirst = $this->getMock(
- 'Magento\Tools\Dependency\Report\Dependency\Data\Dependency',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency',
[],
[],
'',
false
);
$this->dependencySecond = $this->getMock(
- 'Magento\Tools\Dependency\Report\Dependency\Data\Dependency',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Dependency',
[],
[],
'',
@@ -43,7 +43,7 @@ class ModuleTest extends \PHPUnit_Framework_TestCase
$objectManagerHelper = new ObjectManager($this);
$this->module = $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Dependency\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Dependency\Data\Module',
['name' => 'name', 'dependencies' => [$this->dependencyFirst, $this->dependencySecond]]
);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/BuilderTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/BuilderTest.php
similarity index 85%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/BuilderTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/BuilderTest.php
index dda31cd755bf23b43e94a7fd13836fbc43019676..da6328871879796fe987e808f5291114e540d813 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/BuilderTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/BuilderTest.php
@@ -3,21 +3,21 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Framework;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Framework;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class BuilderTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Report\Framework\Builder
+ * @var \Magento\Setup\Module\Dependency\Report\Framework\Builder
*/
protected $builder;
protected function setUp()
{
$objectManagerHelper = new ObjectManager($this);
- $this->builder = $objectManagerHelper->getObject('Magento\Tools\Dependency\Report\Framework\Builder');
+ $this->builder = $objectManagerHelper->getObject('Magento\Setup\Module\Dependency\Report\Framework\Builder');
}
/**
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/ConfigTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/ConfigTest.php
similarity index 66%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/ConfigTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/ConfigTest.php
index 9b217587100017180b35e50ddf3fffe8780c644c..799a7650635e832fbbddfd451499b89b77b76cc6 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/ConfigTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/ConfigTest.php
@@ -3,38 +3,38 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Framework\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Framework\Data;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
class ConfigTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Report\Framework\Data\Module|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Framework\Data\Module|\PHPUnit_Framework_MockObject_MockObject
*/
protected $moduleFirst;
/**
- * @var \Magento\Tools\Dependency\Report\Framework\Data\Module|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Framework\Data\Module|\PHPUnit_Framework_MockObject_MockObject
*/
protected $moduleSecond;
/**
- * @var \Magento\Tools\Dependency\Report\Framework\Data\Config
+ * @var \Magento\Setup\Module\Dependency\Report\Framework\Data\Config
*/
protected $config;
public function setUp()
{
$this->moduleFirst = $this->getMock(
- 'Magento\Tools\Dependency\Report\Framework\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Framework\Data\Module',
[],
[],
'',
false
);
$this->moduleSecond = $this->getMock(
- 'Magento\Tools\Dependency\Report\Framework\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Framework\Data\Module',
[],
[],
'',
@@ -43,7 +43,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$objectManagerHelper = new ObjectManager($this);
$this->config = $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Framework\Data\Config',
+ 'Magento\Setup\Module\Dependency\Report\Framework\Data\Config',
['modules' => [$this->moduleFirst, $this->moduleSecond]]
);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/DependencyTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/DependencyTest.php
similarity index 79%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/DependencyTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/DependencyTest.php
index f89a3669702f60980ee2a289b6c4214b2fe8ddcd..8633152c5f9e5aca19b15716e65841ab8220d2d8 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/DependencyTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/DependencyTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Framework\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Framework\Data;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -12,13 +12,13 @@ class DependencyTest extends \PHPUnit_Framework_TestCase
/**
* @param string $lib
* @param int $count
- * @return \Magento\Tools\Dependency\Report\Framework\Data\Dependency
+ * @return \Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency
*/
protected function createDependency($lib, $count)
{
$objectManagerHelper = new ObjectManager($this);
return $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Framework\Data\Dependency',
+ 'Magento\Setup\Module\Dependency\Report\Framework\Data\Dependency',
['lib' => $lib, 'count' => $count]
);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/ModuleTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/ModuleTest.php
similarity index 83%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/ModuleTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/ModuleTest.php
index c9e49b9d1a5f41fdcffd5de750ddb75c9932e4a5..a6ed71292efa6478ca04b8e17e94f96c169e120b 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Framework/Data/ModuleTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Framework/Data/ModuleTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Framework\Data;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Framework\Data;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -12,13 +12,13 @@ class ModuleTest extends \PHPUnit_Framework_TestCase
/**
* @param string $name
* @param array $dependencies
- * @return \Magento\Tools\Dependency\Report\Framework\Data\Module
+ * @return \Magento\Setup\Module\Dependency\Report\Framework\Data\Module
*/
protected function createModule($name, $dependencies = [])
{
$objectManagerHelper = new ObjectManager($this);
return $objectManagerHelper->getObject(
- 'Magento\Tools\Dependency\Report\Framework\Data\Module',
+ 'Magento\Setup\Module\Dependency\Report\Framework\Data\Module',
['name' => $name, 'dependencies' => $dependencies]
);
}
diff --git a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Writer/Csv/AbstractWriterTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Writer/Csv/AbstractWriterTest.php
similarity index 78%
rename from dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Writer/Csv/AbstractWriterTest.php
rename to setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Writer/Csv/AbstractWriterTest.php
index 18084a75eb36fe903c45473781b552444102b69f..280679e2fa10796051ea7ff85066a39d8c58f3a0 100644
--- a/dev/tools/Magento/Tools/Dependency/Test/Unit/Report/Writer/Csv/AbstractWriterTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Dependency/Report/Writer/Csv/AbstractWriterTest.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Dependency\Test\Unit\Report\Writer\Csv;
+namespace Magento\Setup\Test\Unit\Module\Dependency\Report\Writer\Csv;
class AbstractWriterTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tools\Dependency\Report\Writer\Csv\AbstractWriter|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Setup\Module\Dependency\Report\Writer\Csv\AbstractWriter|\PHPUnit_Framework_MockObject_MockObject
*/
protected $writer;
@@ -22,7 +22,7 @@ class AbstractWriterTest extends \PHPUnit_Framework_TestCase
$this->csvMock = $this->getMock('Magento\Framework\File\Csv');
$this->writer = $this->getMockForAbstractClass(
- 'Magento\Tools\Dependency\Report\Writer\Csv\AbstractWriter',
+ 'Magento\Setup\Module\Dependency\Report\Writer\Csv\AbstractWriter',
['writer' => $this->csvMock]
);
}
@@ -30,7 +30,7 @@ class AbstractWriterTest extends \PHPUnit_Framework_TestCase
public function testWrite()
{
$options = ['report_filename' => 'some_filename'];
- $configMock = $this->getMock('Magento\Tools\Dependency\Report\Data\ConfigInterface');
+ $configMock = $this->getMock('Magento\Setup\Module\Dependency\Report\Data\ConfigInterface');
$preparedData = ['foo', 'baz', 'bar'];
$this->writer->expects(
@@ -55,7 +55,7 @@ class AbstractWriterTest extends \PHPUnit_Framework_TestCase
*/
public function testWriteWithWrongOptionReportFilename($options)
{
- $configMock = $this->getMock('Magento\Tools\Dependency\Report\Data\ConfigInterface');
+ $configMock = $this->getMock('Magento\Setup\Module\Dependency\Report\Data\ConfigInterface');
$this->writer->write($options, $configMock);
}