MAGETWO-38561: Exceptions when publishing static files in production mode

- removed duplicated logic
- reusing Theme model logic

Author: eddielau

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

@@ -6,13 +6,11 @@
 
 namespace Magento\Setup\Model;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManagerFactory;
 use Magento\Framework\App\View\Deployment\Version;
 use Magento\Framework\App\View\Asset\Publisher;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Config\Theme;
-use Magento\Framework\Filesystem;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Translate\Js\Config as JsTranslationConfig;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -24,11 +22,6 @@
  */
 class Deployer
 {
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
     /** @var Files */
     private $filesUtil;
 
@@ -78,14 +71,8 @@ class Deployer
      */
     protected $jsTranslationConfig;
 
-    /**
-     * @var \Magento\Framework\View\Design\ThemeInterface[]
-     */
-    private $parentTheme;
-
     /**
      * @param Files $filesUtil
-     * @param Filesystem $filesystem
      * @param OutputInterface $output
      * @param Version\StorageInterface $versionStorage
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -95,15 +82,13 @@ class Deployer
      */
     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;
@@ -326,36 +311,22 @@ private function deployFile($filePath, $area, $themePath, $locale, $module)
     }
 
     /**
-     * Find ancestor themes
+     * Find ancestor themes' full paths
      *
      * @param string $themeFullPath
      * @return string[]
      */
     private function findAncestors($themeFullPath)
     {
-        $ancestors = [];
-        if (!isset($this->parentTheme[$themeFullPath])) {
-            /** @var \Magento\Framework\View\Design\Theme\ListInterface $themeCollection */
-            $themeCollection = $this->objectManager->get('Magento\Framework\View\Design\Theme\ListInterface');
-            $theme = $themeCollection->getThemeByFullPath($themeFullPath);
-            $parentTheme = $theme->getParentTheme();
-            if ($parentTheme) {
-                $this->parentTheme[$themeFullPath] = $parentTheme;
-                $ancestors[] = $parentTheme->getFullPath();
-                $ancestors = array_merge(
-                    $ancestors,
-                    $this->findAncestors($parentTheme->getFullPath())
-                );
-            }
-        } else {
-            $parentTheme = $this->parentTheme[$themeFullPath];
-            $ancestors[] = $parentTheme->getFullPath();
-            $ancestors = array_merge(
-                $ancestors,
-                $this->findAncestors($parentTheme->getFullPath())
-            );
+        /** @var \Magento\Framework\View\Design\Theme\ListInterface $themeCollection */
+        $themeCollection = $this->objectManager->get('Magento\Framework\View\Design\Theme\ListInterface');
+        $theme = $themeCollection->getThemeByFullPath($themeFullPath);
+        $ancestors = $theme->getInheritedThemes();
+        $ancestorThemeFullPath = [];
+        foreach ($ancestors as $ancestor) {
+            $ancestorThemeFullPath[] = $ancestor->getFullPath();
         }
-        return $ancestors;
+        return $ancestorThemeFullPath;
     }
 
     /**