MAGETWO-38010: Warnings During Running Static View Files Deployment Command

- removed unused variables
- refactored a method with NPath complexity

Author: Olga Kopylova

lib/internal/Magento/Framework/View/Asset/Source.php

@@ -130,7 +130,6 @@ public function getContent(LocalInterface $asset)
     private function preProcess(LocalInterface $asset)
     {
         $sourceFile = $this->findSourceFile($asset);
-        $dirCode = DirectoryList::ROOT;
         if ($sourceFile !== false) {
             $path = $this->rootDir->getRelativePath($sourceFile);
         } else {
@@ -143,20 +142,10 @@ private function preProcess(LocalInterface $asset)
             return unserialize($cached);
         }
 
-        $origContent = $path ? $this->rootDir->readFile($path) : '';
-        $origContentType = $this->getContentType($path) ?: $asset->getContentType();
-
-        $chain = $this->chainFactory->create(
-            [
-                'asset' => $asset,
-                'origContent' => $origContent,
-                'origContentType' => $origContentType,
-                'origAssetPath' => $path
-            ]
-        );
-
+        $chain = $this->createChain($asset, $path);
         $this->preProcessorPool->process($chain);
         $chain->assertValid();
+        $dirCode = DirectoryList::ROOT;
         if ($chain->isChanged()) {
             $dirCode = DirectoryList::VAR_DIR;
             $path = DirectoryList::TMP_MATERIALIZATION_DIR . '/source/' . $chain->getTargetAssetPath();
@@ -257,4 +246,32 @@ public function findRelativeSourceFilePath(LocalInterface $asset)
         }
         return $this->rootDir->getRelativePath($sourceFile);
     }
+
+    /**
+     * Creates a chain for pre-processing
+     *
+     * @param LocalInterface $asset
+     * @param string|bool $path
+     * @return PreProcessor\Chain
+     */
+    private function createChain(LocalInterface $asset, $path)
+    {
+        if ($path) {
+            $origContent = $this->rootDir->readFile($path);
+            $origContentType = $this->getContentType($path);
+        } else {
+            $origContent = '';
+            $origContentType = $asset->getContentType();
+        }
+
+        $chain = $this->chainFactory->create(
+            [
+                'asset' => $asset,
+                'origContent' => $origContent,
+                'origContentType' => $origContentType,
+                'origAssetPath' => $path
+            ]
+        );
+        return $chain;
+    }
 }

setup/src/Magento/Setup/Model/Deployer.php

@@ -24,11 +24,6 @@
  */
 class Deployer
 {
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
     /** @var Files */
     private $filesUtil;
 
@@ -41,9 +36,6 @@ class Deployer
     /** @var Version\StorageInterface */
     private $versionStorage;
 
-    /** @var \Magento\Framework\Stdlib\DateTime */
-    private $dateTime;
-
     /** @var \Magento\Framework\View\Asset\Repository */
     private $assetRepo;
 
@@ -85,29 +77,23 @@ class Deployer
 
     /**
      * @param Files $filesUtil
-     * @param Filesystem $filesystem
      * @param OutputInterface $output
      * @param Version\StorageInterface $versionStorage
-     * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\View\Asset\MinifyService $minifyService
      * @param JsTranslationConfig $jsTranslationConfig
      * @param bool $isDryRun
      */
     public function __construct(
         Files $filesUtil,
-        Filesystem $filesystem,
         OutputInterface $output,
         Version\StorageInterface $versionStorage,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Framework\View\Asset\MinifyService $minifyService,
         JsTranslationConfig $jsTranslationConfig,
         $isDryRun = false
     ) {
-        $this->filesystem = $filesystem;
         $this->filesUtil = $filesUtil;
         $this->output = $output;
         $this->versionStorage = $versionStorage;
-        $this->dateTime = $dateTime;
         $this->isDryRun = $isDryRun;
         $this->minifyService = $minifyService;
         $this->jsTranslationConfig = $jsTranslationConfig;