diff --git a/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php b/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
index 00db7f57f132ac2ff0edbdab207d0cea8ed451b6..ee2b8e0cd984cae3b9a721d64b2c21748d7cb4ab 100644
--- a/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
+++ b/app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
@@ -22,11 +22,6 @@ class PhpStorm implements FormatInterface
      */
     private $currentDirRead;
 
-    /**
-     * @var WriteInterface
-     */
-    private $currentDirWrite;
-
     /**
      * @var \Magento\Framework\Filesystem\File\WriteFactory
      */
@@ -68,7 +63,7 @@ class PhpStorm implements FormatInterface
             $nodeList = $xpath->query('/project');
             $projectNode = $nodeList->item(0);
             $file->close();
-        } catch (FileSystemException $f){
+        } catch (FileSystemException $f) {
             //create file if does not exists
             $dom = new \DOMDocument();
             $projectNode = $dom->createElement('project');
diff --git a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
index 13702ca9abe4f1d852f342c99c67d149b444dc4e..4bc62504d253c9c09113c81883e775e69b6aaaed 100644
--- a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
+++ b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
@@ -43,12 +43,12 @@ class UrnResolver
             $package = $componentRegistrar
                 ->getPath(ComponentRegistrar::LIBRARY, $matches['vendor'] . '/' . $matches['framework']);
         } else {
-            throw new NotFoundException(new Phrase("Unsupported format of schema location: '%1'", $schema));
+            throw new NotFoundException(new Phrase("Unsupported format of schema location: '%1'", [$schema]));
         }
         $schemaPath = $package . '/' . $matches['path'];
         if (empty($package) || !file_exists($schemaPath)) {
             throw new NotFoundException(
-                new Phrase("Could not locate schema: '%1' at '%2'", $schema, $schemaPath)
+                new Phrase("Could not locate schema: '%1' at '%2'", [$schema, $schemaPath])
             );
         }
         return $schemaPath;