Add format fixes

Author: manuelcanepa

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

@@ -3,14 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare (strict_types = 1);
 
 namespace Magento\Developer\Model\XmlCatalog\Format;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DomDocument\DomDocumentFactory;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem\DriverPool;
 use Magento\Framework\Filesystem\File\WriteFactory;
 
 /**
@@ -19,6 +20,8 @@
 class VsCode implements FormatInterface
 {
     private const PROJECT_PATH_IDENTIFIER = '..';
+    private const FILE_MODE_READ = 'r';
+    private const FILE_MODE_WRITE = 'w';
 
     /**
      * @var ReadInterface
@@ -47,26 +50,22 @@ public function __construct(
     ) {
         $this->currentDirRead = $readFactory->create(getcwd());
         $this->fileWriteFactory = $fileWriteFactory;
-        $this->domDocumentFactory = $domDocumentFactory ?: ObjectManager::getInstance()->get(DomDocumentFactory::class);
+        $this->domDocumentFactory = $domDocumentFactory;
     }
 
     /**
      * Generate Catalog of URNs for the VsCode
      *
      * @param string[] $dictionary
-     * @param string $configFilePath relative path to the PhpStorm misc.xml
+     * @param string $configFile relative path to the VsCode catalog.xml
      * @return void
      */
-    public function generateCatalog(array $dictionary, $configFilePath)
+    public function generateCatalog(array $dictionary, $configFile): void
     {
         $catalogNode = null;
 
         try {
-            $file = $this->fileWriteFactory->create(
-                $configFilePath,
-                \Magento\Framework\Filesystem\DriverPool::FILE,
-                'r'
-            );
+            $file = $this->fileWriteFactory->create($configFile, DriverPool::FILE, self::FILE_MODE_READ);
             $dom = $this->domDocumentFactory->create();
             $fileContent = $file->readAll();
             if (!empty($fileContent)) {
@@ -91,11 +90,7 @@ public function generateCatalog(array $dictionary, $configFilePath)
             $catalogNode->appendChild($node);
         }
         $dom->formatOutput = true;
-        $file = $this->fileWriteFactory->create(
-            $configFilePath,
-            \Magento\Framework\Filesystem\DriverPool::FILE,
-            'w'
-        );
+        $file = $this->fileWriteFactory->create($configFile, DriverPool::FILE, self::FILE_MODE_WRITE);
         $file->write($dom->saveXML());
         $file->close();
     }
@@ -106,7 +101,7 @@ public function generateCatalog(array $dictionary, $configFilePath)
      * @param \DOMDocument $dom
      * @return \DOMElement
      */
-    private function initEmptyFile(\DOMDocument $dom)
+    private function initEmptyFile(\DOMDocument $dom): \DOMElement
     {
         $catalogNode = $dom->createElement('catalog');