MAGETWO-71257: Need to disable module output by configuration

 - Fix deprecation tags

Author: Eric Bohanon

app/code/Magento/Backend/Block/Template.php

@@ -84,6 +84,11 @@ public function getFormKey()
      *
      * @param string $moduleName Full module name
      * @return boolean
+     * @deprecated 100.2.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.
      */
     public function isOutputEnabled($moduleName = null)
     {

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

@@ -21,18 +21,28 @@ class Manager
 {
     /**
      * @var Output\ConfigInterface
+     * @deprecated 100.2.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.
      */
-    private $_outputConfig;
+    private $outputConfig;
 
     /**
      * @var ModuleListInterface
      */
-    private $_moduleList;
+    private $moduleList;
 
     /**
      * @var array
+     * @deprecated 100.2.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.
      */
-    private $_outputConfigPaths;
+    private $outputConfigPaths;
 
     /**
      * @param Output\ConfigInterface $outputConfig
@@ -44,9 +54,9 @@ public function __construct(
         ModuleListInterface $moduleList,
         array $outputConfigPaths = []
     ) {
-        $this->_outputConfig = $outputConfig;
-        $this->_moduleList = $moduleList;
-        $this->_outputConfigPaths = $outputConfigPaths;
+        $this->outputConfig = $outputConfig;
+        $this->moduleList = $moduleList;
+        $this->outputConfigPaths = $outputConfigPaths;
     }
 
     /**
@@ -57,43 +67,46 @@ public function __construct(
      */
     public function isEnabled($moduleName)
     {
-        return $this->_moduleList->has($moduleName);
+        return $this->moduleList->has($moduleName);
     }
 
     /**
      * Whether a module output is permitted by the configuration or not
      *
      * @param string $moduleName Fully-qualified module name
      * @return boolean
+     * @deprecated 100.2.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.
      */
     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;
+        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 100.2.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.
      */
     protected function _isCustomOutputConfigEnabled($moduleName)
     {
-        if (isset($this->_outputConfigPaths[$moduleName])) {
-            $configPath = $this->_outputConfigPaths[$moduleName];
+        if (isset($this->outputConfigPaths[$moduleName])) {
+            $configPath = $this->outputConfigPaths[$moduleName];
             if (defined($configPath)) {
                 $configPath = constant($configPath);
             }
-            return $this->_outputConfig->isSetFlag($configPath);
+            return $this->outputConfig->isSetFlag($configPath);
         }
         return true;
     }

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

@@ -7,23 +7,42 @@
  */
 namespace Magento\Framework\Module\Output;
 
+/**
+ * @deprecated 100.2.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.
+ */
 class Config implements \Magento\Framework\Module\Output\ConfigInterface
 {
     /**
      * XPath in the configuration where module statuses are stored
-     * @deprecated Magento does not support custom disabling/enabling module output since 2.2.0 version
+     * @deprecated 100.2.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.
      */
     const XML_PATH_MODULE_OUTPUT_STATUS = 'advanced/modules_disable_output/%s';
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
+     * @deprecated 100.2.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.
      */
     protected $_scopeConfig;
 
     /**
      * @var string
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
+     * @deprecated 100.2.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.
      */
     protected $_storeType;
 
@@ -43,7 +62,11 @@ public function __construct(
      * Whether a module is enabled in the configuration or not
      *
      * @param string $moduleName Fully-qualified module name
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
+     * @deprecated 100.2.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.
      * @return boolean
      */
     public function isEnabled($moduleName)
@@ -55,7 +78,11 @@ public function isEnabled($moduleName)
      * Retrieve module enabled specific path
      *
      * @param string $path Fully-qualified config path
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
+     * @deprecated 100.2.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.
      * @return boolean
      */
     public function isSetFlag($path)

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

@@ -5,13 +5,21 @@
  */
 namespace Magento\Framework\Module\Output;
 
+/**
+ * @deprecated 100.2.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.
+ */
 interface ConfigInterface
 {
     /**
      * Whether a module is enabled in the configuration or not
      *
      * @param string $moduleName Fully-qualified module name
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
+     * @deprecated 100.2.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.
      * @return boolean
      */
     public function isEnabled($moduleName);
@@ -20,7 +28,11 @@ public function isEnabled($moduleName);
      * Retrieve module enabled specific path
      *
      * @param string $path Fully-qualified config path
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
+     * @deprecated 100.2.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.
      * @return boolean
      */
     public function isSetFlag($path);