MAGETWO-32948: Contribution to Mainline of Sprint 22 Work

- fixed code style and missing dependency

Author: Olga Kopylova

dev/tests/unit/testsuite/Magento/Framework/App/State/CleanupTest.php

@@ -80,7 +80,7 @@ public function testClearMaterializedViewFiles()
         $var = $this->getDirectoryCleanMock(Source::TMP_MATERIALIZATION_DIR);
         $this->filesystem->expects($this->exactly(2))->method('getDirectoryWrite')->will($this->returnValueMap([
             [DirectoryList::STATIC_VIEW, DriverPool::FILE, $static],
-            [DirectoryList::VAR_DIR, DriverPool::FILE,  $var],
+            [DirectoryList::VAR_DIR, DriverPool::FILE, $var],
         ]));
         $this->object->clearMaterializedViewFiles();
     }

dev/tests/unit/testsuite/Magento/Framework/Module/DependencyCheckerTest.php

@@ -47,7 +47,14 @@ public function setUp()
             ->method('getRequire')
             ->will($this->returnValueMap($requireMap));
 
-        $this->packageInfoFactoryMock = $this->getMock('Magento\Framework\Module\PackageInfoFactory', [], [], '', false);
+        $this->packageInfoFactoryMock = $this->getMock(
+            'Magento\Framework\Module\PackageInfoFactory'
+            ,
+            [],
+            [],
+            '',
+            false
+        );
         $this->packageInfoFactoryMock->expects($this->once())
             ->method('create')
             ->will($this->returnValue($this->packageInfoMock));

dev/tests/unit/testsuite/Magento/Setup/Controller/ConsoleControllerTest.php

@@ -113,12 +113,8 @@ public function testGetRouterConfig()
 
     public function testSetEventManager()
     {
-        $controller = $this->controller;
-        $closureMock = function () use ($controller) {
-        };
-
         $eventManager = $this->getMock('Zend\EventManager\EventManagerInterface');
-        $eventManager->expects($this->atLeastOnce())->method('attach')->will($this->returnCallback($closureMock));
+        $eventManager->expects($this->atLeastOnce())->method('attach');
         $returnValue = $this->controller->setEventManager($eventManager);
         $this->assertSame($returnValue, $this->controller);
     }
@@ -497,7 +493,8 @@ public function testHelpAction($option, $noParameters)
         $usage = $this->controller->getCommandUsage();
         $expectedValue = explode(' ', (strlen($usage[$option]) > 0 ? $usage[$option] : $noParameters));
         $returnValue = explode(
-            ' ', trim(str_replace([PHP_EOL, 'Available parameters:'], '', $this->controller->helpAction()))
+            ' ',
+            trim(str_replace([PHP_EOL, 'Available parameters:'], '', $this->controller->helpAction()))
         );
         $expectedValue = asort($expectedValue);
         $returnValue = asort($returnValue);

dev/tests/unit/testsuite/Magento/Setup/Model/InstallerFactoryTest.php

@@ -5,7 +5,7 @@
 
 namespace Magento\Setup\Model;
 
-class InstallerFactoryTest Extends \PHPUnit_Framework_TestCase
+class InstallerFactoryTest extends \PHPUnit_Framework_TestCase
 {
     public function testCreate()
     {

dev/tests/unit/testsuite/Magento/Setup/Model/InstallerTest.php

@@ -10,6 +10,10 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\DriverPool;
 
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class InstallerTest extends \PHPUnit_Framework_TestCase
 {
     /**

dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php

@@ -26,6 +26,8 @@ public function testGetConfigData(array $data, array $expected)
 
     /**
      * return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getConfigDataDataProvider()
     {

dev/tests/unit/testsuite/Magento/Setup/Model/WebLoggerTest.php

@@ -84,7 +84,8 @@ public function testLogSuccess()
         $this->assertEquals(
             '<span class="text-success">[SUCCESS] ' . 'Success1' . '</span><br/>' .
             '<span class="text-success">[SUCCESS] ' . 'Success2' . '</span><br/>',
-            self::$log);
+            self::$log
+        );
     }
 
     public function testLogError()
@@ -181,6 +182,9 @@ public static function readLog()
         return self::$log;
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
     public static function writeToLog($logFile, $message)
     {
         self::$log .= $message;

dev/tests/unit/testsuite/Magento/Setup/Module/Setup/FileResolverTest.php

@@ -66,10 +66,4 @@ public function testGetResourceCode()
         // Invalid module name
         $this->assertNull($this->fileResolver->getResourceCode('Magento_Module5'));
     }
-
-
-
-
-
-
 }

dev/tests/unit/testsuite/Magento/Setup/Module/SetupModuleTest.php

@@ -90,7 +90,7 @@ public function testApplyRecurringUpdatesWithInvalidFile()
         $setupModule->applyRecurringUpdates();
     }
 
-    public  function testApplyUpdatesWithNullResource()
+    public function testApplyUpdatesWithNullResource()
     {
         $fileResolver = $this->getMock('Magento\Setup\Module\Setup\FileResolver', [], [], '', false);
         $fileResolver
@@ -108,7 +108,7 @@ public  function testApplyUpdatesWithNullResource()
         $this->assertInstanceOf('Magento\Setup\Module\SetupModule', $setupModule);
     }
 
-    public  function testApplyUpdatesWithNoVersions()
+    public function testApplyUpdatesWithNoVersions()
     {
         $fileResolver = $this->getMock('Magento\Setup\Module\Setup\FileResolver', [], [], '', false);
         $setupModule = new SetupModule(