From 83f8e98ae9749841ff808952e04f0ddd5bc15e35 Mon Sep 17 00:00:00 2001 From: Shikha Mishra Date: Thu, 13 Dec 2018 17:28:16 +0530 Subject: [PATCH] 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(),