MAGETWO-44440: Register URN resolver to resolve internal dependencies

- Fixed static tests

Author: Eugene Tulika

app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php

@@ -92,9 +92,9 @@ protected function configure()
                 new InputOption(
                     self::IDE_OPTION,
                     null,
-                    InputOption::VALUE_OPTIONAL,
+                    InputOption::VALUE_REQUIRED,
                     'Format in which catalog will be generated. Supported: ['.
-                        implode(', ', $this->getSupportedFormats()) . ']',
+                    implode(', ', $this->getSupportedFormats()) . ']',
                     'phpstorm'
                 ),
                 new InputArgument(
@@ -154,7 +154,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($formatter = $this->getFormatters($ideName)) {
             $formatter->generateCatalog($urnDictionary, $absolutePath);
         } else {
-            throw new InputException(__("Format for IDE '%ide' is not supported", ['ide' => $ideName]));
+            throw new InputException(__("Format for IDE '%1' is not supported", $ideName));
         }
     }
 

app/code/Magento/Developer/Model/XmlCatalog/Format/FormatInterface.php

@@ -19,4 +19,4 @@ interface FormatInterface
      * @return void
      */
     public function generateCatalog(array $dictionary, $path);
-}
+}

app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php

@@ -9,6 +9,7 @@
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filesystem\Directory\WriteFactory;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 
 /**
  * Class PhpStormNine generates URN catalog for PhpStorm 9
@@ -88,4 +89,4 @@ public function generateCatalog(array $dictionary, $path)
         $dom->formatOutput = true;
         $this->currentDirWrite->writeFile($path, $dom->saveXML());
     }
-}
+}

app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php

@@ -27,12 +27,12 @@ public function setUp()
         $filesMock->expects($this->at(1))
             ->method('getXmlCatalogFiles')
             ->will($this->returnValue([]));
-        $urnResolverMock = $this->getMock('\Magento\Framework\Config\Dom\UrnResolver',  [], [], '', false);
+        $urnResolverMock = $this->getMock('\Magento\Framework\Config\Dom\UrnResolver', [], [], '', false);
         $urnResolverMock->expects($this->once())
             ->method('getRealPath')
             ->with($this->equalTo('urn:magento:framework:Module/etc/module.xsd'))
             ->will($this->returnValue($fixtureXmlFile));
-        $phpstormFormatMock = $this->getMock('\Magento\Developer\Model\XmlCatalog\Format\PhpStorm',  [], [], '', false);
+        $phpstormFormatMock = $this->getMock('\Magento\Developer\Model\XmlCatalog\Format\PhpStorm', [], [], '', false);
         $phpstormFormatMock->expects($this->once())
             ->method('generateCatalog')
             ->with(
@@ -41,8 +41,8 @@ public function setUp()
             )->will($this->returnValue(null));
 
         $formats = ['phpstorm' => $phpstormFormatMock];
-        $filesystem = $this->getMock('Magento\Framework\Filesystem',  [], [], '', false);
-        $readDirMock = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface',  [], [], '', false);
+        $filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $readDirMock = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface', [], [], '', false);
 
         $content = file_get_contents($fixtureXmlFile);
 
@@ -58,12 +58,12 @@ public function setUp()
             ->method('getDirectoryRead')
             ->will($this->returnValue($readDirMock));
 
-        $currDirMock = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface',  [], [], '', false);
+        $currDirMock = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface', [], [], '', false);
         $currDirMock->expects($this->once())
             ->method('getAbsolutePath')
             ->with($this->equalTo('test'))
             ->will($this->returnValue('test_absolute_path'));
-        $readDirFactory = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadFactory',  [], [], '', false);
+        $readDirFactory = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadFactory', [], [], '', false);
         $readDirFactory->expects($this->once())
             ->method('create')
             ->will($this->returnValue($currDirMock));
@@ -83,4 +83,4 @@ public function testExecuteBadType()
         $commandTester->execute([XmlCatalogGenerateCommand::IDE_FILE_PATH_ARGUMENT => 'test']);
         $this->assertEquals('', $commandTester->getDisplay());
     }
-}
+}