Skip to content

Commit 1eb1fcb

Browse files
author
Eric Bohanon
committed
MAGETWO-71257: Need to disable module output by configuration
1 parent 8f2f48c commit 1eb1fcb

File tree

3 files changed

+14
-70
lines changed

3 files changed

+14
-70
lines changed

app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,25 @@ class DisableOutput extends \Magento\Config\Block\System\Config\Form\Fieldset
2121
{
2222
/**
2323
* @var \Magento\Framework\DataObject
24-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
25-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
26-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
27-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
28-
* issues that will be addressed in future releases.
24+
* @deprecated 100.2.0
2925
*/
3026
protected $_dummyElement;
3127

3228
/**
3329
* @var \Magento\Config\Block\System\Config\Form\Field
34-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
35-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
36-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
37-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
38-
* issues that will be addressed in future releases.
30+
* @deprecated 100.2.0
3931
*/
4032
protected $_fieldRenderer;
4133

4234
/**
4335
* @var array
44-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
45-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
46-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
47-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
48-
* issues that will be addressed in future releases.
36+
* @deprecated 100.2.0
4937
*/
5038
protected $_values;
5139

5240
/**
5341
* @var \Magento\Framework\Module\ModuleListInterface
54-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
55-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
56-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
57-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
58-
* issues that will be addressed in future releases.
42+
* @deprecated 100.2.0
5943
*/
6044
protected $_moduleList;
6145

@@ -112,11 +96,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
11296
}
11397

11498
/**
115-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
116-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
117-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
118-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
119-
* issues that will be addressed in future releases.
99+
* @deprecated 100.2.0
120100
* @return \Magento\Framework\DataObject
121101
*/
122102
protected function _getDummyElement()
@@ -128,11 +108,7 @@ protected function _getDummyElement()
128108
}
129109

130110
/**
131-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
132-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
133-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
134-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
135-
* issues that will be addressed in future releases.
111+
* @deprecated 100.2.0
136112
* @return \Magento\Config\Block\System\Config\Form\Field
137113
*/
138114
protected function _getFieldRenderer()
@@ -146,11 +122,7 @@ protected function _getFieldRenderer()
146122
}
147123

148124
/**
149-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
150-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
151-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
152-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
153-
* issues that will be addressed in future releases.
125+
* @deprecated 100.2.0
154126
* @return array
155127
*/
156128
protected function _getValues()
@@ -167,11 +139,7 @@ protected function _getValues()
167139
/**
168140
* @param \Magento\Framework\Data\Form\Element\Fieldset $fieldset
169141
* @param string $moduleName
170-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
171-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
172-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
173-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
174-
* issues that will be addressed in future releases.
142+
* @deprecated 100.2.0
175143
* @return mixed
176144
*/
177145
protected function _getFieldHtml($fieldset, $moduleName)

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ class Manager
2121
{
2222
/**
2323
* @var Output\ConfigInterface
24-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
25-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
26-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
27-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
28-
* issues that will be addressed in future releases.
24+
* @deprecated 100.2.0
2925
*/
3026
private $outputConfig;
3127

@@ -36,11 +32,7 @@ class Manager
3632

3733
/**
3834
* @var array
39-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
40-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
41-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
42-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
43-
* issues that will be addressed in future releases.
35+
* @deprecated 100.2.0
4436
*/
4537
private $outputConfigPaths;
4638

@@ -93,11 +85,7 @@ public function isOutputEnabled($moduleName)
9385
*
9486
* @param string $moduleName Fully-qualified module name
9587
* @return boolean
96-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
97-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
98-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
99-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
100-
* issues that will be addressed in future releases.
88+
* @deprecated 100.2.0
10189
*/
10290
protected function _isCustomOutputConfigEnabled($moduleName)
10391
{

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,19 @@ class Config implements \Magento\Framework\Module\Output\ConfigInterface
1818
{
1919
/**
2020
* XPath in the configuration where module statuses are stored
21-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
22-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
23-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
24-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
25-
* issues that will be addressed in future releases.
21+
* @deprecated 100.2.0
2622
*/
2723
const XML_PATH_MODULE_OUTPUT_STATUS = 'advanced/modules_disable_output/%s';
2824

2925
/**
3026
* @var \Magento\Framework\App\Config\ScopeConfigInterface
31-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
32-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
33-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
34-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
35-
* issues that will be addressed in future releases.
27+
* @deprecated 100.2.0
3628
*/
3729
protected $_scopeConfig;
3830

3931
/**
4032
* @var string
41-
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
42-
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
43-
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
44-
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
45-
* issues that will be addressed in future releases.
33+
* @deprecated 100.2.0
4634
*/
4735
protected $_storeType;
4836

0 commit comments

Comments
 (0)