From 453a32a6eaaa930507443e951e79a47ec60a2e93 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 4 May 2015 14:13:59 -0500
Subject: [PATCH] MAGETWO-36071: Move
dev/tools/Magento/Tools/Dependency/generate/*.dependencies.php tools
- moved Dependency module into setup
---
.../DependenciesShowFrameworkCommandTest.php | 3 +-
...ndenciesShowModulesCircularCommandTest.php | 3 +-
.../DependenciesShowModulesCommandTest.php | 3 +-
.../Command/_files/expected/circular.csv | 0
.../Command/_files/expected/framework.csv | 0
.../Command/_files/expected/modules.csv | 0
.../root/app/code/Magento/A/Model/Foo.php | 0
.../root/app/code/Magento/A/composer.json | 0
.../root/app/code/Magento/A/etc/module.xml | 0
.../root/app/code/Magento/B/Model/Foo.php | 0
.../root/app/code/Magento/B/composer.json | 0
.../root/app/code/Magento/B/etc/module.xml | 0
.../Module}/Dependency/CircularTest.php | 6 +-
.../Dependency/Parser/Composer/JsonTest.php | 6 +-
.../Dependency/Parser/Config/XmlTest.php | 5 +-
.../Dependency/Report/CircularTest.php | 6 +-
.../Dependency/Report/DependencyTest.php | 6 +-
.../Dependency/Report/FrameworkTest.php | 6 +-
.../Magento/FirstModule/Helper/Helper.php | 0
.../code/Magento/FirstModule/Model/Model.php | 0
.../FirstModule/Model/WithoutDependencies.php | 0
.../code/Magento/FirstModule/etc/module.xml | 0
.../FirstModule/view/frontend/template.phtml | 0
.../Module}/Dependency/_files/composer1.json | 0
.../Module}/Dependency/_files/composer2.json | 0
.../Module}/Dependency/_files/composer3.json | 0
.../Module}/Dependency/_files/composer4.json | 0
.../Module}/Dependency/_files/composer5.json | 0
.../_files/expected/circular-dependencies.csv | 9 +++
.../_files/expected/dependencies.csv | 10 +++
.../expected/framework-dependencies.csv | 8 +++
.../without-circular-dependencies.csv | 2 +
.../_files/expected/without-dependencies.csv | 2 +
.../without-framework-dependencies.csv | 2 +
.../Module}/Dependency/_files/module1.xml | 0
.../Module}/Dependency/_files/module2.xml | 0
.../Console/Command/_files/output/.gitignore | 0
.../_files/expected/circular-dependencies.csv | 9 ---
.../_files/expected/dependencies.csv | 10 ---
.../expected/framework-dependencies.csv | 8 ---
.../without-circular-dependencies.csv | 2 -
.../_files/expected/without-dependencies.csv | 2 -
.../without-framework-dependencies.csv | 2 -
.../Test/Legacy/_files/obsolete_classes.php | 66 +++++++++++++++++++
.../Magento/Tools/Console/CommandList.php | 6 +-
.../Command/AbstractDependenciesCommand.php | 2 +-
.../DependenciesShowFrameworkCommand.php | 4 +-
...DependenciesShowModulesCircularCommand.php | 4 +-
.../DependenciesShowModulesCommand.php | 4 +-
.../src/Magento/Setup/Console/CommandList.php | 3 +
.../Setup/Module}/Dependency/Circular.php | 2 +-
.../Setup/Module}/Dependency/Parser/Code.php | 4 +-
.../Dependency/Parser/Composer/Json.php | 4 +-
.../Module}/Dependency/Parser/Config/Xml.php | 4 +-
.../Module}/Dependency/ParserInterface.php | 2 +-
.../Report/Builder/AbstractBuilder.php | 14 ++--
.../Dependency/Report/BuilderInterface.php | 2 +-
.../Dependency/Report/Circular/Builder.php | 20 +++---
.../Dependency/Report/Circular/Data/Chain.php | 2 +-
.../Report/Circular/Data/Config.php | 6 +-
.../Report/Circular/Data/Module.php | 8 +--
.../Dependency/Report/Circular/Writer.php | 6 +-
.../Report/Data/Config/AbstractConfig.php | 4 +-
.../Report/Data/ConfigInterface.php | 2 +-
.../Dependency/Report/Dependency/Builder.php | 6 +-
.../Report/Dependency/Data/Config.php | 6 +-
.../Report/Dependency/Data/Dependency.php | 2 +-
.../Report/Dependency/Data/Module.php | 8 +--
.../Dependency/Report/Dependency/Writer.php | 6 +-
.../Dependency/Report/Framework/Builder.php | 12 ++--
.../Report/Framework/Data/Config.php | 6 +-
.../Report/Framework/Data/Dependency.php | 2 +-
.../Report/Framework/Data/Module.php | 8 +--
.../Dependency/Report/Framework/Writer.php | 6 +-
.../Report/Writer/Csv/AbstractWriter.php | 8 +--
.../Dependency/Report/WriterInterface.php | 6 +-
.../Module}/Dependency/ServiceLocator.php | 34 +++++-----
.../Module/Dependency}/Parser/CodeTest.php | 6 +-
.../Dependency}/Parser/Composer/JsonTest.php | 6 +-
.../Dependency}/Parser/Config/XmlTest.php | 6 +-
.../Report/Builder/AbstractBuilderTest.php | 16 ++---
.../Report/Circular/Data/ChainTest.php | 6 +-
.../Report/Circular/Data/ConfigTest.php | 14 ++--
.../Report/Circular/Data/ModuleTest.php | 6 +-
.../Report/Data/Config/AbstractConfigTest.php | 6 +-
.../Report/Dependency/Data/ConfigTest.php | 14 ++--
.../Report/Dependency/Data/DependencyTest.php | 10 +--
.../Report/Dependency/Data/ModuleTest.php | 14 ++--
.../Report/Framework/BuilderTest.php | 6 +-
.../Report/Framework/Data/ConfigTest.php | 14 ++--
.../Report/Framework/Data/DependencyTest.php | 6 +-
.../Report/Framework/Data/ModuleTest.php | 6 +-
.../Report/Writer/Csv/AbstractWriterTest.php | 10 +--
93 files changed, 296 insertions(+), 239 deletions(-)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/DependenciesShowFrameworkCommandTest.php (93%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/DependenciesShowModulesCircularCommandTest.php (92%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/DependenciesShowModulesCommandTest.php (93%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/expected/circular.csv (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/expected/framework.csv (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/expected/modules.csv (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/root/app/code/Magento/A/composer.json (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/root/app/code/Magento/A/etc/module.xml (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/root/app/code/Magento/B/composer.json (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup}/Console/Command/_files/root/app/code/Magento/B/etc/module.xml (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/CircularTest.php (85%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/Parser/Composer/JsonTest.php (88%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/Parser/Config/XmlTest.php (82%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/Report/CircularTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/Report/DependencyTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/Report/FrameworkTest.php (93%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/code/Magento/FirstModule/Helper/Helper.php (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/code/Magento/FirstModule/Model/Model.php (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/code/Magento/FirstModule/Model/WithoutDependencies.php (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/code/Magento/FirstModule/etc/module.xml (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/code/Magento/FirstModule/view/frontend/template.phtml (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/composer1.json (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/composer2.json (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/composer3.json (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/composer4.json (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/composer5.json (100%)
create mode 100644 dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/circular-dependencies.csv
create mode 100644 dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/dependencies.csv
create mode 100644 dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/framework-dependencies.csv
create mode 100644 dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-circular-dependencies.csv
create mode 100644 dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-dependencies.csv
create mode 100644 dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/_files/expected/without-framework-dependencies.csv
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/module1.xml (100%)
rename dev/tests/integration/testsuite/Magento/{Test/Tools => Setup/Module}/Dependency/_files/module2.xml (100%)
delete mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/output/.gitignore
delete mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/circular-dependencies.csv
delete mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/dependencies.csv
delete mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/framework-dependencies.csv
delete mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-circular-dependencies.csv
delete mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-dependencies.csv
delete mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/expected/without-framework-dependencies.csv
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup}/Console/Command/AbstractDependenciesCommand.php (98%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup}/Console/Command/DependenciesShowFrameworkCommand.php (94%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup}/Console/Command/DependenciesShowModulesCircularCommand.php (93%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup}/Console/Command/DependenciesShowModulesCommand.php (93%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Circular.php (98%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Parser/Code.php (96%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Parser/Composer/Json.php (96%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Parser/Config/Xml.php (94%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/ParserInterface.php (87%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Builder/AbstractBuilder.php (81%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/BuilderInterface.php (85%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Circular/Builder.php (72%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Circular/Data/Chain.php (87%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Circular/Data/Config.php (66%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Circular/Data/Module.php (76%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Circular/Writer.php (83%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Data/Config/AbstractConfig.php (83%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Data/ConfigInterface.php (87%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Dependency/Builder.php (79%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Dependency/Data/Config.php (81%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Dependency/Data/Dependency.php (95%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Dependency/Data/Module.php (83%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Dependency/Writer.php (88%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Framework/Builder.php (85%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Framework/Data/Config.php (67%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Framework/Data/Dependency.php (92%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Framework/Data/Module.php (74%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Framework/Writer.php (82%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/Writer/Csv/AbstractWriter.php (85%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/Report/WriterInterface.php (62%)
rename {dev/tools/Magento/Tools => setup/src/Magento/Setup/Module}/Dependency/ServiceLocator.php (77%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Parser/CodeTest.php (92%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Parser/Composer/JsonTest.php (85%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Parser/Config/XmlTest.php (85%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Builder/AbstractBuilderTest.php (78%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Circular/Data/ChainTest.php (69%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Circular/Data/ConfigTest.php (66%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Circular/Data/ModuleTest.php (83%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Data/Config/AbstractConfigTest.php (63%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Dependency/Data/ConfigTest.php (80%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Dependency/Data/DependencyTest.php (76%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Dependency/Data/ModuleTest.php (78%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Framework/BuilderTest.php (85%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Framework/Data/ConfigTest.php (66%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Framework/Data/DependencyTest.php (79%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Framework/Data/ModuleTest.php (83%)
rename {dev/tools/Magento/Tools/Dependency/Test/Unit => setup/src/Magento/Setup/Test/Unit/Module/Dependency}/Report/Writer/Csv/AbstractWriterTest.php (78%)
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 76db3df10eb..ff82940e58a 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 c47489a361d..9fc5e9dbecd 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 348d82f098a..6d0c16225cd 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 6f00de7adac..01bac7a1895 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 684c24f7b93..173148154fc 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 cdf12497059..d9439764258 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 0fa0180dc78..ce72ffc46b1 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 2c672d40037..3c896043ae3 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 15ef53dd862..ba4021dd6c1 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 00000000000..4b83254473b
--- /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 00000000000..9ab2ef5f530
--- /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 00000000000..8b681bd8735
--- /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 00000000000..6397730cd9f
--- /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 00000000000..e1b73bda975
--- /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 00000000000..2c5a00595d4
--- /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 e69de29bb2d..00000000000
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 1d29bfdb31a..00000000000
--- 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 bce8d9c13d2..00000000000
--- 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 d20a242e069..00000000000
--- 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 2861dd888e2..00000000000
--- 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 a1ca40ac82b..00000000000
--- 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 71bbbf84978..00000000000
--- 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 530d181efe0..15bd7a8135f 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 1b2f2b8dab9..a25d185b58c 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 19c94e8dfe1..023677f5886 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 03499b681ba..af16b59bc9b 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 96a4dfeb25f..01b2208f57f 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 1c7ced7c37c..429d36c89d0 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 0cb36548c55..6ebcc5c9850 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 1589083ab04..0f939ea5d54 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 133836c2129..39d30a1557a 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 cf1ce6504f8..f8a2efc05aa 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 127cb6c4cc2..aec365bd413 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 bd851f518fc..d9d9552e37d 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 aebde9c6cfb..b8c73a114b1 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 5cbb5f020dc..53aabb8ef11 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 4e306689c7b..2f2d3a7ea78 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 256d9dd81ec..a0d3e88f491 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 6f10a943b33..87e4c35eb98 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 fdb6691d97d..0a856110345 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 57538f4767c..a1e57ab0383 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 0719d84e7e4..c04192d7a24 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 c1108df9e48..d204e5fd932 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 473f3031360..b0f5fa3b877 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 7ecc5e61ace..518bf6ccabb 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 4b33bc87374..ba97debadea 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 5c99904d381..32e26bb1234 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 d34c954f511..651d800e7dc 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 a4b21400602..d498d2074c0 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 464664593c4..8c3f0b6b5e6 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 95deff3c806..b1bd6038425 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 50093ad2f00..006d56b76fe 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 756256f68f7..d6fb3341c3c 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 c62e02bad8e..d5013a15087 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 0b2f0bfafec..74780c5816e 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 469f425c803..dc4c45f9962 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 c591bd39ddf..655b459dd08 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 0aa80ac637d..c8fb94785e0 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 39ade55ab1e..4c0b9ad1f02 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 f19faccb90a..dce2cdcda68 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 e2d73594b87..1e0ebda735d 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 c8d2ebba4bc..a171dc132be 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 6321fc522a7..9564f7c3a2c 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 e19c231513b..55ff0b734cf 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 791c8fb5673..7225eb7d88e 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 4f563acf6fd..98eb160634a 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 84d67f2d470..460cff3f68b 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 dda31cd755b..da632887187 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 9b217587100..799a7650635 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 f89a3669702..8633152c5f9 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 c9e49b9d1a5..a6ed71292ef 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 18084a75eb3..280679e2fa1 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);
}
--
GitLab