Add backwards compatibility to XmlCatalog PhpStorm changes

Author: tdgroot

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

@@ -7,10 +7,11 @@
 namespace Magento\Developer\Model\XmlCatalog\Format;
 
 use Magento\Developer\Model\XmlCatalog\Format\PhpStorm\DomDocumentFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
-use Magento\Framework\Filesystem\File\WriteFactory as FileWriteFactory;
+use Magento\Framework\Filesystem\File\WriteFactory;
 
 /**
  * Class PhpStorm generates URN catalog for PhpStorm 9
@@ -23,7 +24,7 @@ class PhpStorm implements FormatInterface
     private $currentDirRead;
 
     /**
-     * @var FileWriteFactory
+     * @var WriteFactory
      */
     private $fileWriteFactory;
 
@@ -34,17 +35,17 @@ class PhpStorm implements FormatInterface
 
     /**
      * @param ReadFactory $readFactory
-     * @param FileWriteFactory $fileWriteFactory
+     * @param WriteFactory $fileWriteFactory
      * @param DomDocumentFactory $domDocumentFactory
      */
     public function __construct(
         ReadFactory $readFactory,
-        FileWriteFactory $fileWriteFactory,
-        DomDocumentFactory $domDocumentFactory
+        WriteFactory $fileWriteFactory,
+        DomDocumentFactory $domDocumentFactory = null
     ) {
         $this->currentDirRead = $readFactory->create(getcwd());
         $this->fileWriteFactory = $fileWriteFactory;
-        $this->domDocumentFactory = $domDocumentFactory;
+        $this->domDocumentFactory = $domDocumentFactory ?: ObjectManager::getInstance()->get(DomDocumentFactory::class);
     }
 
     /**

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

@@ -7,14 +7,28 @@
 
 use DOMDocument;
 
-class DomDocumentFactory extends \Magento\Framework\DomDocument\DomDocumentFactory
+class DomDocumentFactory
 {
+    /**
+     * @var \Magento\Framework\DomDocument\DomDocumentFactory
+     */
+    private $documentFactory;
+
+    /**
+     * DomDocumentFactory constructor.
+     * @param \Magento\Framework\DomDocument\DomDocumentFactory $documentFactory
+     */
+    public function __construct(\Magento\Framework\DomDocument\DomDocumentFactory $documentFactory)
+    {
+        $this->documentFactory = $documentFactory;
+    }
+
     /**
      * {@inheritdoc}
      */
-    public function create($data = null)
+    public function create(string $data = null)
     {
-        $dom = parent::create($data);
+        $dom = $this->documentFactory->create($data);
 
         if (empty($data)) {
             $this->initializeDocument($dom);

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

@@ -34,11 +34,12 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @return DOMDocument
      */
-    public function create($data = null)
+    public function create(string $data = null)
     {
+        /** @var DOMDocument $dom */
         $dom = $this->objectManager->create(DOMDocument::class);
 
-        if (!empty($data) && is_string($data)) {
+        if (!empty($data)) {
             $dom->loadXML($data);
         }
 

lib/internal/Magento/Framework/Test/Unit/DomDocument/DomDocumentFactoryTest.php

@@ -68,14 +68,14 @@ public function testCreate($data = null)
             ->with(DOMDocument::class)
             ->willReturn($this->domDocumentMock);
 
-        if (empty($data) || !is_string($data)) {
-            $this->domDocumentMock->expects($this->never())
-                ->method('loadXML');
-        } else {
+        if (!empty($data)) {
             $this->domDocumentMock->expects($this->once())
                 ->method('loadXML')
                 ->with($data)
                 ->willReturn(true);
+        } else {
+            $this->domDocumentMock->expects($this->never())
+                ->method('loadXML');
         }
 
         $this->domDocumentFactory->create($data);