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

- fixed

Author: Ivan Gavryshko

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

@@ -12,6 +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;
 
 /**
  * Class XmlConverterCommand
@@ -40,14 +42,14 @@ class XmlConverterCommand extends Command
     private $formatter;
 
     /**
-     * @var \DOMDocument
+     * @var Factory
      */
-    private $domXml;
+    private $domFactory;
 
     /**
-     * @var \DOMDocument
+     * @var XSLTProcessorFactory
      */
-    private $domXsl;
+    private $xsltProcessorFactory;
 
     /**
      * @var \XSLTProcessor
@@ -58,21 +60,17 @@ class XmlConverterCommand extends Command
      * Inject dependencies
      *
      * @param Formatter $formatter
-     * @param \DOMDocument $domXml
-     * @param \DOMDocument $domXsl
-     * @param \XSLTProcessor $xsltProcessor
-     * @SuppressWarnings(Magento.TypeDuplication)
+     * @param Factory $domFactory
+     * @param xsltProcessorFactory $xsltProcessorFactory
      */
     public function __construct(
         Formatter $formatter,
-        \DOMDocument $domXml,
-        \DOMDocument $domXsl,
-        \XSLTProcessor $xsltProcessor
+        Factory $domFactory,
+        XSLTProcessorFactory $xsltProcessorFactory
     ) {
         $this->formatter = $formatter;
-        $this->domXml = $domXml;
-        $this->domXsl = $domXsl;
-        $this->xsltProcessor = $xsltProcessor;
+        $this->domFactory = $domFactory;
+        $this->xsltProcessorFactory = $xsltProcessorFactory;
 
         parent::__construct();
     }
@@ -113,16 +111,20 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
+            $domXml = $this->domFactory->createDomDocument();
+            $domXsl = $this->domFactory->createDomDocument();
+            $xsltProcessor = $this->xsltProcessorFactory->createXSLTProcessor();
+
             $xmlFile = $input->getArgument(self::XML_FILE_ARGUMENT);
-            $this->domXml->preserveWhiteSpace = true;
-            $this->domXml->load($xmlFile);
+            $domXml->preserveWhiteSpace = true;
+            $domXml->load($xmlFile);
 
-            $this->domXsl->preserveWhiteSpace = true;
-            $this->domXsl->load($input->getArgument(self::PROCESSOR_ARGUMENT));
+            $domXsl->preserveWhiteSpace = true;
+            $domXsl->load($input->getArgument(self::PROCESSOR_ARGUMENT));
 
-            $this->xsltProcessor->registerPHPFunctions();
-            $this->xsltProcessor->importStylesheet($this->domXsl);
-            $transformedDoc = $this->xsltProcessor->transformToXml($this->domXml);
+            $xsltProcessor->registerPHPFunctions();
+            $xsltProcessor->importStylesheet($domXsl);
+            $transformedDoc = $xsltProcessor->transformToXml($domXml);
             $result = $this->formatter->format($transformedDoc);
 
             if ($input->getOption(self::OVERWRITE_OPTION)) {

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

@@ -9,6 +9,9 @@
 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;
+
 
 class XmlConverterCommandTest extends \PHPUnit_Framework_TestCase
 {
@@ -23,35 +26,38 @@ class XmlConverterCommandTest extends \PHPUnit_Framework_TestCase
     private $command;
 
     /**
-     * @var \DOMDocument|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $domXml;
-
-    /**
-     * @var \DOMDocument|\PHPUnit_Framework_MockObject_MockObject
+     * @var Factory|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $domXsl;
+    private $domFactory;
 
     /**
-     * @var \XSLTProcessor|\PHPUnit_Framework_MockObject_MockObject
+     * @var XSLTProcessorFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $xsltProcessor;
+    private $xsltProcessorFactory;
 
     public function setUp()
     {
         $this->formatter = $this->getMock('Magento\Developer\Model\Tools\Formatter', [], [], '', false);
-        $this->domXml = $this->getMock('DOMDocument', [], [], '', false);
-        $this->domXsl = $this->getMock('DOMDocument', [], [], '', false);
-        $this->xsltProcessor = $this->getMock('XSLTProcessor', [], [], '', false);
-        $this->command = new XmlConverterCommand($this->formatter, $this->domXml, $this->domXsl, $this->xsltProcessor);
+        $this->domFactory = $this->getMock('Magento\Framework\DomDocument\Factory', [], [], '', false);
+        $this->xsltProcessorFactory = $this->getMock('Magento\Framework\XSLTProcessor\Factory', [], [], '', false);
+
+        $this->command = new XmlConverterCommand($this->formatter, $this->domFactory, $this->xsltProcessorFactory);
     }
 
     public function testExecute()
     {
-        $this->domXml->expects($this->once())->method('load')->with('file.xml');
-        $this->domXsl->expects($this->once())->method('load')->with('file.xsl');
+        $domXml = $this->getMock('DOMDocument', [], [], '', false);
+        $domXsl = clone $domXml;
+        $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);
+
+        $xsltProcessor = $this->getMock('XSLTProcessor', [], [], '', false);
+        $xsltProcessor->expects($this->once())->method('transformToXml')->with($domXml)->willReturn('XML');
 
-        $this->xsltProcessor->expects($this->once())->method('transformToXml')->with($this->domXml)->willReturn('XML');
+        $this->xsltProcessorFactory->expects($this->once())->method('createXSLTProcessor')->willReturn($xsltProcessor);
 
         $this->formatter->expects($this->once())->method('format')->with('XML')->willReturn('result');
 

app/code/Magento/Developer/etc/di.xml

@@ -32,10 +32,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Developer\Console\Command\XmlConverterCommand">
-        <arguments>
-            <argument name="domXml" xsi:type="object" shared="false">DOMDocument</argument>
-            <argument name="domXsl" xsi:type="object" shared="false">DOMDocument</argument>
-        </arguments>
-    </type>
 </config>

lib/internal/Magento/Framework/DomDocument/Factory.php

@@ -10,26 +10,13 @@
  */
 class Factory
 {
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface
-     */
-    protected $_objectManager;
-
-    /**
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     */
-    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
-    {
-        $this->_objectManager = $objectManager;
-    }
-
     /**
      * Create empty DOM document instance.
      *
      * @return \DOMDocument
      */
     public function createDomDocument()
     {
-        return $this->_objectManager->create('DOMDocument', []);
+        return new \DOMDocument();
     }
 }

lib/internal/Magento/Framework/XSLTProcessor/Factory.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\XSLTProcessor;
+
+/**
+ * XSLTProcessor document factory
+ */
+class Factory
+{
+    /**
+     * Create empty XSLTProcessor instance.
+     *
+     * @return \XSLTProcessor
+     */
+    public function createXSLTProcessor()
+    {
+        return new \XSLTProcessor();
+    }
+
+}