MAGETWO-71257: Need to disable module output by configuration

Author: Eric Bohanon

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -20,7 +20,7 @@
         @deprecated Magento does not support custom disabling/enabling modules output since 2.2.0 version.
         Section 'Advanced' was disabled. This section will be removed from code in one release.
         -->
-        <section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="0" showInWebsite="0" showInStore="0">
+        <section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>
             <tab>advanced</tab>
             <resource>Magento_Backend::advanced</resource>

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php

@@ -7,7 +7,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @deprecated because \Magento\Config\Block\System\Config\Form\Fieldset\Modules\DisableOutput is deprecated
  */
 class DisableOutputTest extends \PHPUnit\Framework\TestCase
 {

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

@@ -21,8 +21,6 @@ class Manager
 {
     /**
      * @var Output\ConfigInterface
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version.
-     * The property can be removed in a future major release
      */
     private $_outputConfig;
 
@@ -33,8 +31,6 @@ class Manager
 
     /**
      * @var array
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version.
-     * The property can be removed in a future major release
      */
     private $_outputConfigPaths;
 
@@ -69,14 +65,18 @@ public function isEnabled($moduleName)
      *
      * @param string $moduleName Fully-qualified module name
      * @return boolean
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
      */
     public function isOutputEnabled($moduleName)
     {
         if (!$this->isEnabled($moduleName)) {
             return false;
         }
-
+        if (!$this->_isCustomOutputConfigEnabled($moduleName)) {
+            return false;
+        }
+        if ($this->_outputConfig->isEnabled($moduleName)) {
+            return false;
+        }
         return true;
     }
 
@@ -85,7 +85,6 @@ public function isOutputEnabled($moduleName)
      *
      * @param string $moduleName Fully-qualified module name
      * @return boolean
-     * @deprecated
      */
     protected function _isCustomOutputConfigEnabled($moduleName)
     {

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

@@ -7,11 +7,6 @@
  */
 namespace Magento\Framework\Module\Output;
 
-/**
- * Checks whether the module is enabled in the configuration.
- *
- * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
- */
 class Config implements \Magento\Framework\Module\Output\ConfigInterface
 {
     /**
@@ -53,7 +48,7 @@ public function __construct(
      */
     public function isEnabled($moduleName)
     {
-        return false;
+        return $this->isSetFlag(sprintf(self::XML_PATH_MODULE_OUTPUT_STATUS, $moduleName));
     }
 
     /**
@@ -65,6 +60,6 @@ public function isEnabled($moduleName)
      */
     public function isSetFlag($path)
     {
-        return false;
+        return $this->_scopeConfig->isSetFlag($path, $this->_storeType);
     }
 }