From dd8162e93da70c43d7f37050d82ef6b42e338999 Mon Sep 17 00:00:00 2001
From: Ivan Gavryshko <igavryshko@ebay.com>
Date: Thu, 23 Apr 2015 08:52:11 -0500
Subject: [PATCH] MAGETWO-36078: Move
dev/tools/Magento/Tools/Webdev/file_assembler.php
- fixed static PHPMD issues
- chamges according to CR
---
.../Developer/Console/{ => Command}/CssDeployCommand.php | 3 ++-
.../Test/Unit/Console/{ => Command}/CssDeployCommandTest.php | 5 ++---
app/code/Magento/Developer/etc/di.xml | 2 +-
setup/src/Magento/Setup/Model/Deployer.php | 2 ++
4 files changed, 7 insertions(+), 5 deletions(-)
rename app/code/Magento/Developer/Console/{ => Command}/CssDeployCommand.php (98%)
rename app/code/Magento/Developer/Test/Unit/Console/{ => Command}/CssDeployCommandTest.php (97%)
diff --git a/app/code/Magento/Developer/Console/CssDeployCommand.php b/app/code/Magento/Developer/Console/Command/CssDeployCommand.php
similarity index 98%
rename from app/code/Magento/Developer/Console/CssDeployCommand.php
rename to app/code/Magento/Developer/Console/Command/CssDeployCommand.php
index 6ca277c3ebd..11961852dbb 100644
--- a/app/code/Magento/Developer/Console/CssDeployCommand.php
+++ b/app/code/Magento/Developer/Console/Command/CssDeployCommand.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Developer\Console;
+namespace Magento\Developer\Console\Command;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
@@ -23,6 +23,7 @@ use Magento\Framework\App\Filesystem\DirectoryList;
/**
* Class CssDeployCommand
+ * @SuppressWarnings("PMD.CouplingBetweenObjects")
*/
class CssDeployCommand extends Command
{
diff --git a/app/code/Magento/Developer/Test/Unit/Console/CssDeployCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php
similarity index 97%
rename from app/code/Magento/Developer/Test/Unit/Console/CssDeployCommandTest.php
rename to app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php
index dce4348ac3b..93f545aefe3 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/CssDeployCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Developer\Test\Unit\Console;
+namespace Magento\Developer\Test\Unit\Console\Command;
use Magento\Framework\Filesystem;
use Magento\Framework\View\Asset\Source;
@@ -15,7 +15,7 @@ use Magento\Framework\App\ObjectManager\ConfigLoader;
use Magento\Framework\View\Asset\SourceFileGeneratorPool;
use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface;
use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Developer\Console\CssDeployCommand;
+use Magento\Developer\Console\Command\CssDeployCommand;
use Symfony\Component\Console\Tester\CommandTester;
class CssDeployCommandTest extends \PHPUnit_Framework_TestCase
@@ -99,7 +99,6 @@ class CssDeployCommandTest extends \PHPUnit_Framework_TestCase
public function testExecute()
{
$file = 'css/styles-m' . '.less';
- $content = '';
$this->configLoader->expects($this->once())->method('load')->with('frontend')->willReturn([]);
$this->objectManager->expects($this->once())->method('configure');
diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml
index 1822f34aaf1..d793eb340a2 100644
--- a/app/code/Magento/Developer/etc/di.xml
+++ b/app/code/Magento/Developer/etc/di.xml
@@ -27,7 +27,7 @@
<arguments>
<argument name="commands" xsi:type="array">
<item name="dev_tests_run" xsi:type="object">Magento\Developer\Console\Command\DevTestsRunCommand</item>
- <item name="dev_css_deploy" xsi:type="object">Magento\Developer\Console\CssDeployCommand</item>
+ <item name="dev_css_deploy" xsi:type="object">Magento\Developer\Console\Command\CssDeployCommand</item>
</argument>
</arguments>
</type>
diff --git a/setup/src/Magento/Setup/Model/Deployer.php b/setup/src/Magento/Setup/Model/Deployer.php
index d4593e939e1..8e3973ce2ce 100644
--- a/setup/src/Magento/Setup/Model/Deployer.php
+++ b/setup/src/Magento/Setup/Model/Deployer.php
@@ -246,6 +246,8 @@ class Deployer
* @param string $locale
* @param string $module
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
private function deployFile($filePath, $area, $themePath, $locale, $module)
{
--
GitLab