Fix issue disabled modules still include less

Author: mrtuvn

app/code/Magento/Developer/etc/di.xml

@@ -202,11 +202,12 @@
             <argument name="fileSource" xsi:type="object">Magento\Framework\Css\PreProcessor\File\Collector\Aggregated</argument>
         </arguments>
     </type>
+
     <type name="Magento\Framework\Css\PreProcessor\File\Collector\Aggregated">
         <arguments>
             <argument name="libraryFiles" xsi:type="object">Magento\Framework\Css\PreProcessor\File\Collector\Library</argument>
             <argument name="baseFiles" xsi:type="object">cssSourceBaseFilesSorted</argument>
-            <argument name="overriddenBaseFiles" xsi:type="object">cssSourceOverriddenBaseFiles</argument>
+            <argument name="overriddenBaseFiles" xsi:type="object">cssSourceOverriddenBaseFilesSorted</argument>
         </arguments>
     </type>
 
@@ -215,17 +216,31 @@
             <argument name="subject" xsi:type="object">cssSourceBaseFilesFiltered</argument>
         </arguments>
     </virtualType>
+
     <virtualType name="cssSourceBaseFilesFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
         <arguments>
             <argument name="subject" xsi:type="object">cssSourceBaseFiles</argument>
         </arguments>
     </virtualType>
+
     <virtualType name="cssSourceBaseFiles" type="Magento\Framework\View\File\Collector\Base">
         <arguments>
             <argument name="subDir" xsi:type="string">web</argument>
         </arguments>
     </virtualType>
 
+    <virtualType name="cssSourceOverriddenBaseFilesSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">cssSourceOverriddenBaseFilesFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="cssSourceOverriddenBaseFilesFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleEnabled">
+        <arguments>
+            <argument name="subject" xsi:type="object">cssSourceOverriddenBaseFiles</argument>
+        </arguments>
+    </virtualType>
+
     <virtualType name="cssSourceOverriddenBaseFiles" type="Magento\Framework\View\File\Collector\Override\Base">
         <arguments>
             <argument name="subDir" xsi:type="string">web</argument>

lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleEnabled.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\View\File\Collector\Decorator;
+
+use Magento\Framework\Module\Manager as ModuleManager;
+use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\View\File;
+use Magento\Framework\View\File\CollectorInterface;
+
+class ModuleEnabled implements CollectorInterface
+{
+    /**
+     * Subject
+     *
+     * @var CollectorInterface
+     */
+    private $subject;
+
+    /**
+     * Module manager
+     *
+     * @var ModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * Constructor
+     *
+     * @param CollectorInterface $subject
+     * @param ModuleManager $moduleManager
+     */
+    public function __construct(
+        CollectorInterface $subject,
+        ModuleManager $moduleManager
+    ) {
+        $this->subject = $subject;
+        $this->moduleManager = $moduleManager;
+    }
+
+    /**
+     * Retrieve files
+     *
+     * Filter out theme files that belong to inactive modules or ones explicitly configured to not produce any output
+     *
+     * @param ThemeInterface $theme
+     * @param string $filePath
+     * @return File[]
+     */
+    public function getFiles(ThemeInterface $theme, $filePath): array
+    {
+        $result = [];
+        foreach ($this->subject->getFiles($theme, $filePath) as $file) {
+            if ($this->moduleManager->isEnabled($file->getModule())) {
+                $result[] = $file;
+            }
+        }
+        return $result;
+    }
+}

lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php

@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\View\File\Collector\Decorator;
 
-use Magento\Framework\Module\Manager;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\File;
 use Magento\Framework\View\File\CollectorInterface;
@@ -34,11 +34,11 @@ class ModuleOutput implements CollectorInterface
      * Constructor
      *
      * @param CollectorInterface $subject
-     * @param Manager $moduleManager
+     * @param ModuleManager $moduleManager
      */
     public function __construct(
         CollectorInterface $subject,
-        Manager $moduleManager
+        ModuleManager $moduleManager
     ) {
         $this->subject = $subject;
         $this->moduleManager = $moduleManager;
@@ -51,7 +51,7 @@ public function __construct(
      *
      * @param ThemeInterface $theme
      * @param string $filePath
-     * @return \Magento\Framework\View\File[]
+     * @return File[]
      */
     public function getFiles(ThemeInterface $theme, $filePath)
     {

lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Decorator/ModuleEnabledTest.php

@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\View\Test\Unit\File\Collector\Decorator;
+
+use Magento\Framework\Module\Manager as ModuleManager;
+use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\View\File;
+use Magento\Framework\View\File\Collector\Decorator\ModuleEnabled;
+use Magento\Framework\View\File\CollectorInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class ModuleEnabledTest extends TestCase
+{
+    /**
+     * @var ModuleEnabled
+     */
+    private $model;
+
+    /**
+     * @var CollectorInterface|MockObject
+     */
+    private $fileSourceMock;
+
+    /**
+     * @var ModuleManager|MockObject
+     */
+    private $moduleManagerMock;
+
+    protected function setUp(): void
+    {
+        $this->fileSourceMock = $this->getMockForAbstractClass(CollectorInterface::class);
+        $this->moduleManagerMock = $this->createMock(ModuleManager::class);
+        $this->moduleManagerMock
+            ->expects($this->any())
+            ->method('isEnabled')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['Module_Enabled', true],
+                        ['Module_Disabled', false],
+                    ]
+                )
+            );
+        $this->model = new ModuleEnabled(
+            $this->fileSourceMock,
+            $this->moduleManagerMock
+        );
+    }
+
+    public function testGetFiles(): void
+    {
+        $theme = $this->getMockForAbstractClass(ThemeInterface::class);
+        $fileOne = new File('1.xml', 'Module_Enabled');
+        $fileTwo = new File('2.xml', 'Module_Disabled');
+        $fileThree = new File('3.xml', 'Module_Enabled', $theme);
+        $this->fileSourceMock->expects($this->once())
+            ->method('getFiles')
+            ->with($theme, '*.xml')
+            ->willReturn([$fileOne, $fileTwo, $fileThree]);
+        $this->assertSame([$fileOne, $fileThree], $this->model->getFiles($theme, '*.xml'));
+    }
+}