From 1f5ec6fda14aa0c767e2b396da9e51ec99177787 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Thu, 13 Dec 2018 17:28:16 +0530
Subject: [PATCH 1/2] Updated Collector.php

Fixed issue #19605 Don't static compile disabled modules

Updated Collector.php

Updated Collector.php
---
 app/code/Magento/Deploy/Collector/Collector.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php
index b02c8e478d639..9dd66828d4820 100644
--- a/app/code/Magento/Deploy/Collector/Collector.php
+++ b/app/code/Magento/Deploy/Collector/Collector.php
@@ -8,6 +8,7 @@
 use Magento\Deploy\Source\SourcePool;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFactory;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
 
 /**
@@ -43,6 +44,9 @@ class Collector implements CollectorInterface
      * @var PackageFactory
      */
     private $packageFactory;
+    
+    /** @var \Magento\Framework\Module\Manager */
+    private $moduleManager;
 
     /**
      * Default values for package primary identifiers
@@ -65,11 +69,14 @@ class Collector implements CollectorInterface
     public function __construct(
         SourcePool $sourcePool,
         FileNameResolver $fileNameResolver,
-        PackageFactory $packageFactory
+        PackageFactory $packageFactory,
+        Manager $moduleManager  = null
     ) {
         $this->sourcePool = $sourcePool;
         $this->fileNameResolver = $fileNameResolver;
         $this->packageFactory = $packageFactory;
+        $this->moduleManager = $moduleManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+                              ->get(\Magento\Framework\Module\Manager::class);
     }
 
     /**
@@ -81,6 +88,9 @@ public function collect()
         foreach ($this->sourcePool->getAll() as $source) {
             $files = $source->get();
             foreach ($files as $file) {
+                if ($file->getModule() && !$this->moduleManager->isEnabled($file->getModule())) {
+                    continue;
+                }
                 $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
                 $params = [
                     'area' => $file->getArea(),

From 484b79acbf0249eee6126bb83503b38e5ec67697 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 2 Jan 2019 15:50:48 +0200
Subject: [PATCH 2/2] Fix static tests.

---
 .../Magento/Deploy/Collector/Collector.php    | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php
index 9dd66828d4820..0a71af5758b7d 100644
--- a/app/code/Magento/Deploy/Collector/Collector.php
+++ b/app/code/Magento/Deploy/Collector/Collector.php
@@ -5,9 +5,10 @@
  */
 namespace Magento\Deploy\Collector;
 
-use Magento\Deploy\Source\SourcePool;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFactory;
+use Magento\Deploy\Source\SourcePool;
+use Magento\Deploy\Package\PackageFile;
 use Magento\Framework\Module\Manager;
 use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
 
@@ -44,7 +45,7 @@ class Collector implements CollectorInterface
      * @var PackageFactory
      */
     private $packageFactory;
-    
+
     /** @var \Magento\Framework\Module\Manager */
     private $moduleManager;
 
@@ -65,18 +66,19 @@ class Collector implements CollectorInterface
      * @param SourcePool $sourcePool
      * @param FileNameResolver $fileNameResolver
      * @param PackageFactory $packageFactory
+     * @param Manager $moduleManager
      */
     public function __construct(
         SourcePool $sourcePool,
         FileNameResolver $fileNameResolver,
         PackageFactory $packageFactory,
-        Manager $moduleManager  = null
+        Manager $moduleManager = null
     ) {
         $this->sourcePool = $sourcePool;
         $this->fileNameResolver = $fileNameResolver;
         $this->packageFactory = $packageFactory;
         $this->moduleManager = $moduleManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-                              ->get(\Magento\Framework\Module\Manager::class);
+            ->get(Manager::class);
     }
 
     /**
@@ -92,18 +94,7 @@ public function collect()
                     continue;
                 }
                 $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
-                $params = [
-                    'area' => $file->getArea(),
-                    'theme' => $file->getTheme(),
-                    'locale' => $file->getLocale(),
-                    'module' => $file->getModule(),
-                    'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
-                ];
-                foreach ($this->packageDefaultValues as $name => $value) {
-                    if (!isset($params[$name])) {
-                        $params[$name] = $value;
-                    }
-                }
+                $params = $this->getParams($file);
                 $packagePath = "{$params['area']}/{$params['theme']}/{$params['locale']}";
                 if (!isset($packages[$packagePath])) {
                     $packages[$packagePath] = $this->packageFactory->create($params);
@@ -115,4 +106,28 @@ public function collect()
         }
         return $packages;
     }
+
+    /**
+     * Retrieve package params.
+     *
+     * @param PackageFile $file
+     * @return array
+     */
+    private function getParams(PackageFile $file)
+    {
+        $params = [
+            'area' => $file->getArea(),
+            'theme' => $file->getTheme(),
+            'locale' => $file->getLocale(),
+            'module' => $file->getModule(),
+            'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
+        ];
+        foreach ($this->packageDefaultValues as $name => $value) {
+            if (!isset($params[$name])) {
+                $params[$name] = $value;
+            }
+        }
+
+        return $params;
+    }
 }