lib/internal/Magento/Framework/Module/Output/ConfigInterface has been removed. The behavior of the Magento\Framework\Module\Manager::isOutputEnabled has changed

Author: vlmed

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

@@ -164,11 +164,6 @@
             <argument name="urlPlaceholder" xsi:type="string">{{base_url}}</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Module\Output\Config">
-        <arguments>
-        <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Session\Config">
         <arguments>
         <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>

app/etc/di.xml

@@ -83,7 +83,6 @@
     <preference for="Magento\Framework\Message\ManagerInterface" type="Magento\Framework\Message\Manager" />
     <preference for="Magento\Framework\App\Config\ValueInterface" type="Magento\Framework\App\Config\Value" />
     <preference for="Magento\Framework\Interception\ChainInterface" type="Magento\Framework\Interception\Chain\Chain" />
-    <preference for="Magento\Framework\Module\Output\ConfigInterface" type="Magento\Framework\Module\Output\Config" />
     <preference for="Magento\Framework\View\Design\Theme\CustomizationInterface" type="Magento\Framework\View\Design\Theme\Customization" />
     <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
     <preference for="Magento\Framework\Image\Adapter\ConfigInterface" type="Magento\Framework\Image\Adapter\Config" />

lib/internal/Magento/Framework/Module/Manager.php

@@ -21,12 +21,6 @@
  */
 class Manager
 {
-    /**
-     * @var Output\ConfigInterface
-     * @deprecated 101.0.0
-     */
-    private $outputConfig;
-
     /**
      * @var ModuleListInterface
      */
@@ -39,16 +33,13 @@ class Manager
     private $outputConfigPaths;
 
     /**
-     * @param Output\ConfigInterface $outputConfig
      * @param ModuleListInterface $moduleList
      * @param array $outputConfigPaths
      */
     public function __construct(
-        Output\ConfigInterface $outputConfig,
         ModuleListInterface $moduleList,
         array $outputConfigPaths = []
     ) {
-        $this->outputConfig = $outputConfig;
         $this->moduleList = $moduleList;
         $this->outputConfigPaths = $outputConfigPaths;
     }
@@ -70,34 +61,12 @@ public function isEnabled($moduleName)
      * @param string $moduleName Fully-qualified module name
      * @return boolean
      * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
-     * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
-     * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
-     * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
-     * issues that will be addressed in future releases.
+     * version. Magento does not support disabling/enabling modules output from the configuration files since 2.5.0.
+     * Module design should explicitly state dependencies to avoid requiring output disabling.
+     * @see \Magento\Framework\Module\Manager::isEnabled()
      */
     public function isOutputEnabled($moduleName)
     {
-        return $this->isEnabled($moduleName)
-            && $this->_isCustomOutputConfigEnabled($moduleName)
-            && !$this->outputConfig->isEnabled($moduleName);
-    }
-
-    /**
-     * Whether a configuration switch for a module output permits output or not
-     *
-     * @param string $moduleName Fully-qualified module name
-     * @return boolean
-     * @deprecated 101.0.0
-     */
-    protected function _isCustomOutputConfigEnabled($moduleName)
-    {
-        if (isset($this->outputConfigPaths[$moduleName])) {
-            $configPath = $this->outputConfigPaths[$moduleName];
-            if (defined($configPath)) {
-                $configPath = constant($configPath);
-            }
-            return $this->outputConfig->isSetFlag($configPath);
-        }
-        return true;
+        return $this->isEnabled($moduleName);
     }
 }

lib/internal/Magento/Framework/Module/Output/Config.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\Module\DbVersionInfo;
 use Magento\Framework\Module\ModuleListInterface;
-use Magento\Framework\Module\Output\ConfigInterface;
 use Magento\Framework\Module\ResourceInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -31,11 +30,6 @@ class DbVersionInfoTest extends TestCase
      */
     private $moduleResource;
 
-    /**
-     * @var ConfigInterface|MockObject
-     */
-    private $_outputConfig;
-
     protected function setUp(): void
     {
         $this->moduleList = $this->getMockForAbstractClass(ModuleListInterface::class);
@@ -49,8 +43,6 @@ protected function setUp(): void
         $this->moduleList->expects($this->any())
             ->method('getNames')
             ->willReturn(['Module_One', 'Module_Two']);
-
-        $this->_outputConfig = $this->getMockForAbstractClass(ConfigInterface::class);
         $this->moduleResource = $this->getMockForAbstractClass(ResourceInterface::class);
 
         $this->dbVersionInfo = new DbVersionInfo(

lib/internal/Magento/Framework/Module/Output/ConfigInterface.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\Module\Manager;
 use Magento\Framework\Module\ModuleListInterface;
-use Magento\Framework\Module\Output\ConfigInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -30,11 +29,6 @@ class ManagerTest extends TestCase
      */
     private $_moduleList;
 
-    /**
-     * @var MockObject
-     */
-    private $_outputConfig;
-
     /**
      * @inheritdoc
      */
@@ -50,9 +44,8 @@ protected function setUp(): void
                     ['Module_Three', ['name' => 'Two_Three']],
                 ]
             );
-        $this->_outputConfig = $this->getMockForAbstractClass(ConfigInterface::class);
+
         $this->_model = new Manager(
-            $this->_outputConfig,
             $this->_moduleList,
             [
                 'Module_Two' => self::XML_PATH_OUTPUT_ENABLED,
@@ -74,56 +67,7 @@ public function testIsEnabled()
 
     public function testIsOutputEnabledReturnsFalseForDisabledModule()
     {
-        $this->_outputConfig->expects($this->any())->method('isSetFlag')->willReturn(true);
+        $this->_moduleList->expects($this->once())->method('has')->willReturn(false);
         $this->assertFalse($this->_model->isOutputEnabled('Disabled_Module'));
     }
-
-    /**
-     * @param bool $configValue
-     * @param bool $expectedResult
-     * @dataProvider isOutputEnabledGenericConfigPathDataProvider
-     */
-    public function testIsOutputEnabledGenericConfigPath($configValue, $expectedResult)
-    {
-        $this->_moduleList->expects($this->once())->method('has')->willReturn(true);
-        $this->_outputConfig->expects($this->once())
-            ->method('isEnabled')
-            ->with('Module_One')
-            ->willReturn($configValue);
-        $this->assertEquals($expectedResult, $this->_model->isOutputEnabled('Module_One'));
-    }
-
-    /**
-     * @return array
-     */
-    public function isOutputEnabledGenericConfigPathDataProvider()
-    {
-        return ['output disabled' => [true, false], 'output enabled' => [false, true]];
-    }
-
-    /**
-     * @param bool $configValue
-     * @param bool $expectedResult
-     * @dataProvider isOutputEnabledCustomConfigPathDataProvider
-     */
-    public function testIsOutputEnabledCustomConfigPath($configValue, $expectedResult)
-    {
-        $this->_moduleList->expects($this->once())->method('has')->willReturn(true);
-        $this->_outputConfig->expects($this->at(0))
-            ->method('isSetFlag')
-            ->with(self::XML_PATH_OUTPUT_ENABLED)
-            ->willReturn($configValue);
-        $this->assertEquals($expectedResult, $this->_model->isOutputEnabled('Module_Two'));
-    }
-
-    /**
-     * @return array
-     */
-    public function isOutputEnabledCustomConfigPathDataProvider()
-    {
-        return [
-            'path literal, output disabled' => [false, false],
-            'path literal, output enabled'  => [true, true],
-        ];
-    }
 }