MAGETWO-37765: Unable to run indexer as part of an install

- renamed classes according to CR feedback, deleted unused dependency

Author: Ivan Gavryshko

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

@@ -12,8 +12,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Developer\Model\Tools\Formatter;
-use Magento\Framework\DomDocument\Factory;
-use Magento\Framework\XSLTProcessor\Factory as XSLTProcessorFactory;
+use Magento\Framework\DomDocument\DomDocumentFactory;
+use Magento\Framework\XsltProcessor\XsltProcessorFactory;
 
 /**
  * Class XmlConverterCommand
@@ -42,26 +42,26 @@ class XmlConverterCommand extends Command
     private $formatter;
 
     /**
-     * @var Factory
+     * @var DomDocumentFactory
      */
     private $domFactory;
 
     /**
-     * @var XSLTProcessorFactory
+     * @var XsltProcessorFactory
      */
     private $xsltProcessorFactory;
 
     /**
      * Inject dependencies
      *
      * @param Formatter $formatter
-     * @param Factory $domFactory
-     * @param xsltProcessorFactory $xsltProcessorFactory
+     * @param DomDocumentFactory $domFactory
+     * @param XsltProcessorFactory $xsltProcessorFactory
      */
     public function __construct(
         Formatter $formatter,
-        Factory $domFactory,
-        XSLTProcessorFactory $xsltProcessorFactory
+        DomDocumentFactory $domFactory,
+        XsltProcessorFactory $xsltProcessorFactory
     ) {
         $this->formatter = $formatter;
         $this->domFactory = $domFactory;
@@ -106,9 +106,9 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
-            $domXml = $this->domFactory->createDomDocument();
-            $domXsl = $this->domFactory->createDomDocument();
-            $xsltProcessor = $this->xsltProcessorFactory->createXSLTProcessor();
+            $domXml = $this->domFactory->create();
+            $domXsl = $this->domFactory->create();
+            $xsltProcessor = $this->xsltProcessorFactory->create();
 
             $xmlFile = $input->getArgument(self::XML_FILE_ARGUMENT);
             $domXml->preserveWhiteSpace = true;

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

@@ -9,8 +9,8 @@
 use Magento\Developer\Console\Command\XmlConverterCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 use Magento\Developer\Model\Tools\Formatter;
-use Magento\Framework\DomDocument\Factory;
-use Magento\Framework\XSLTProcessor\Factory as XSLTProcessorFactory;
+use Magento\Framework\DomDocument\DomDocumentFactory;
+use Magento\Framework\XsltProcessor\XsltProcessorFactory;
 
 class XmlConverterCommandTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,20 +25,26 @@ class XmlConverterCommandTest extends \PHPUnit_Framework_TestCase
     private $command;
 
     /**
-     * @var Factory|\PHPUnit_Framework_MockObject_MockObject
+     * @var DomDocumentFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $domFactory;
 
     /**
-     * @var XSLTProcessorFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var XsltProcessorFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $xsltProcessorFactory;
 
     public function setUp()
     {
         $this->formatter = $this->getMock('Magento\Developer\Model\Tools\Formatter', [], [], '', false);
-        $this->domFactory = $this->getMock('Magento\Framework\DomDocument\Factory', [], [], '', false);
-        $this->xsltProcessorFactory = $this->getMock('Magento\Framework\XSLTProcessor\Factory', [], [], '', false);
+        $this->domFactory = $this->getMock('Magento\Framework\DomDocument\DomDocumentFactory', [], [], '', false);
+        $this->xsltProcessorFactory = $this->getMock(
+            'Magento\Framework\XsltProcessor\XsltProcessorFactory',
+            [],
+            [],
+            '',
+            false
+        );
 
         $this->command = new XmlConverterCommand($this->formatter, $this->domFactory, $this->xsltProcessorFactory);
     }
@@ -50,13 +56,13 @@ public function testExecute()
         $domXml->expects($this->once())->method('load')->with('file.xml');
         $domXsl->expects($this->once())->method('load')->with('file.xsl');
 
-        $this->domFactory->expects($this->at(0))->method('createDomDocument')->willReturn($domXml);
-        $this->domFactory->expects($this->at(1))->method('createDomDocument')->willReturn($domXsl);
+        $this->domFactory->expects($this->at(0))->method('create')->willReturn($domXml);
+        $this->domFactory->expects($this->at(1))->method('create')->willReturn($domXsl);
 
         $xsltProcessor = $this->getMock('XSLTProcessor', [], [], '', false);
         $xsltProcessor->expects($this->once())->method('transformToXml')->with($domXml)->willReturn('XML');
 
-        $this->xsltProcessorFactory->expects($this->once())->method('createXSLTProcessor')->willReturn($xsltProcessor);
+        $this->xsltProcessorFactory->expects($this->once())->method('create')->willReturn($xsltProcessor);
 
         $this->formatter->expects($this->once())->method('format')->with('XML')->willReturn('result');
 

app/code/Magento/Webapi/Model/Soap/Server.php

@@ -31,11 +31,6 @@ class Server
      */
     protected $_configScope;
 
-    /**
-     * @var \Magento\Framework\DomDocument\Factory
-     */
-    protected $_domDocumentFactory;
-
     /**
      * @var \Magento\Webapi\Controller\Soap\Request
      */
@@ -67,7 +62,6 @@ class Server
      * @param \Magento\Framework\App\AreaList $areaList
      * @param \Magento\Framework\Config\ScopeInterface $configScope
      * @param \Magento\Webapi\Controller\Soap\Request $request
-     * @param \Magento\Framework\DomDocument\Factory $domDocumentFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Webapi\Model\Soap\ServerFactory $soapServerFactory
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
@@ -78,7 +72,6 @@ public function __construct(
         \Magento\Framework\App\AreaList $areaList,
         \Magento\Framework\Config\ScopeInterface $configScope,
         \Magento\Webapi\Controller\Soap\Request $request,
-        \Magento\Framework\DomDocument\Factory $domDocumentFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Webapi\Model\Soap\ServerFactory $soapServerFactory,
         \Magento\Framework\Reflection\TypeProcessor $typeProcessor,
@@ -94,7 +87,6 @@ public function __construct(
         $this->_areaList = $areaList;
         $this->_configScope = $configScope;
         $this->_request = $request;
-        $this->_domDocumentFactory = $domDocumentFactory;
         $this->_storeManager = $storeManager;
         $this->_soapServerFactory = $soapServerFactory;
         $this->_typeProcessor = $typeProcessor;

app/code/Magento/Webapi/Test/Unit/Model/Soap/ServerTest.php

@@ -18,9 +18,6 @@ class ServerTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Webapi\Controller\Soap\Request */
     protected $_requestMock;
 
-    /** @var \Magento\Framework\DomDocument\Factory */
-    protected $_domDocumentFactory;
-
     /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $_storeManagerMock;
 
@@ -67,10 +64,6 @@ protected function setUp()
             'Magento\Webapi\Controller\Soap\Request'
         )->disableOriginalConstructor()->getMock();
 
-        $this->_domDocumentFactory = $this->getMockBuilder(
-            'Magento\Framework\DomDocument\Factory'
-        )->disableOriginalConstructor()->getMock();
-
         $this->_soapServerFactory = $this->getMockBuilder(
             'Magento\Webapi\Model\Soap\ServerFactory'
         )->disableOriginalConstructor()->getMock();
@@ -90,7 +83,6 @@ protected function setUp()
             $areaListMock,
             $configScopeMock,
             $this->_requestMock,
-            $this->_domDocumentFactory,
             $this->_storeManagerMock,
             $this->_soapServerFactory,
             $this->_typeProcessor,

lib/internal/Magento/Framework/DomDocument/Factory.php renamed to lib/internal/Magento/Framework/DomDocument/DomDocumentFactory.php

@@ -8,14 +8,14 @@
 /**
  * DOM document factory
  */
-class Factory
+class DomDocumentFactory
 {
     /**
      * Create empty DOM document instance.
      *
      * @return \DOMDocument
      */
-    public function createDomDocument()
+    public function create()
     {
         return new \DOMDocument();
     }

lib/internal/Magento/Framework/XSLTProcessor/Factory.php renamed to lib/internal/Magento/Framework/XSLTProcessor/XsltProcessorFactory.php

@@ -3,19 +3,19 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\XSLTProcessor;
+namespace Magento\Framework\XsltProcessor;
 
 /**
  * XSLTProcessor document factory
  */
-class Factory
+class XsltProcessorFactory
 {
     /**
      * Create empty XSLTProcessor instance.
      *
      * @return \XSLTProcessor
      */
-    public function createXSLTProcessor()
+    public function create()
     {
         return new \XSLTProcessor();
     }