Skip to content

Commit 9c38f7e

Browse files
monkeyseemonkeysee
committed
MAGETWO-33669: Contribution of Sprint 23 Work to Mainline
- fix unused variables - refactor complex code
1 parent e0d0ed4 commit 9c38f7e

File tree

7 files changed

+86
-35
lines changed

7 files changed

+86
-35
lines changed

‎dev/tests/unit/testsuite/Magento/Setup/Model/ModuleStatusTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public function testGetAllModules($expectedAllModules, $expectedConfig, $expecte
7373
* @param array $expectedAllModules
7474
* @param array $expectedConfig
7575
* @param array $expectedResult
76+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
7677
*
7778
* @dataProvider getAllModulesDataProvider
7879
*/
@@ -98,7 +99,7 @@ public function testGetAllModulesWithInputs($expectedAllModules, $expectedConfig
9899
* @param array $expectedConfig
99100
* @param array $expectedResult
100101
*
101-
* @dataProvider getAllModulesDataProvider
102+
* @dataProvider getAllModulesDataProvider
102103
*/
103104
public function testSetIsEnabled($expectedAllModules, $expectedConfig, $expectedResult)
104105
{

‎lib/internal/Magento/Framework/Module/Status.php

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,13 @@ public function checkConstraints(
118118

119119
foreach ($errorModulesDependency as $moduleName => $missingDependencies) {
120120
if (!empty($missingDependencies)) {
121-
$errorMessages[] = $isEnabled ?
122-
($prettyMessage ? "Cannot enable $moduleName" :
123-
"Cannot enable $moduleName, depending on disabled modules:") :
124-
($prettyMessage ? "Cannot disable $moduleName" :
125-
"Cannot disable $moduleName, modules depending on it:");
126-
foreach ($missingDependencies as $errorModule => $path) {
127-
if (!$prettyMessage) {
128-
$errorMessages [] = "$errorModule: " . implode('->', $path);
129-
}
121+
if ($prettyMessage) {
122+
$errorMessages[] = $this->createShortErrorMessage($isEnabled, $moduleName);
123+
} else {
124+
$errorMessages = array_merge(
125+
$errorMessages,
126+
$this->createVerboseErrorMessage($isEnabled, $moduleName, $missingDependencies)
127+
);
130128
}
131129
}
132130
}
@@ -209,4 +207,41 @@ private function getAllModules($modules)
209207
}
210208
return array_keys($all);
211209
}
210+
211+
/**
212+
* Creates a one-line error message that a module cannot be enabled/disabled.
213+
*
214+
* @param bool $isEnabled
215+
* @param string $moduleName
216+
* @return string
217+
*/
218+
private function createShortErrorMessage($isEnabled, $moduleName) {
219+
if ($isEnabled) {
220+
return "Cannot enable $moduleName";
221+
} else {
222+
return "Cannot disable $moduleName";
223+
}
224+
}
225+
226+
/**
227+
* Creates a verbose error message that a module cannot be enabled/disabled.
228+
*
229+
* Each line in the error message will be an array element.
230+
*
231+
* @param bool $isEnabled
232+
* @param string $moduleName
233+
* @param array $missingDependencies
234+
* @return string[]
235+
*/
236+
private function createVerboseErrorMessage($isEnabled, $moduleName, $missingDependencies) {
237+
if ($isEnabled) {
238+
$errorMessages[] = "Cannot enable $moduleName, depending on disabled modules:";
239+
} else {
240+
$errorMessages[] = "Cannot disable $moduleName, modules depending on it:";
241+
}
242+
foreach ($missingDependencies as $errorModule => $path) {
243+
$errorMessages[] = "$errorModule: " . implode('->', $path);
244+
}
245+
return $errorMessages;
246+
}
212247
}

‎setup/src/Magento/Setup/Controller/ConsoleController.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,6 @@ class ConsoleController extends AbstractActionController
125125
*/
126126
private $objectManagerProvider;
127127

128-
/**
129-
* Object manager
130-
*
131-
* @var \Magento\Framework\ObjectManagerInterface
132-
*/
133-
private $objectManager;
134-
135128
/**
136129
* Gets router configuration to be used in module definition
137130
*

‎setup/src/Magento/Setup/Controller/Install.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public function progressAction()
121121
* Maps data from request to format of deployment config model
122122
*
123123
* @return array
124+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
124125
* @SuppressWarnings(PHPMD.NPathComplexity)
125126
*/
126127
private function importDeploymentConfigForm()

‎setup/src/Magento/Setup/Model/Installer.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,6 @@ class Installer
176176
*/
177177
private $installInfo = [];
178178

179-
/**
180-
* @var \Magento\Framework\ObjectManagerInterface
181-
*/
182-
private $objectManager;
183-
184179
/**
185180
* @var \Magento\Framework\App\DeploymentConfig
186181
*/

‎setup/src/Magento/Setup/Model/ModuleStatus.php

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct(
4848
ObjectManagerProvider $objectManagerProvider
4949
) {
5050
$this->allModules = $moduleLoader->load();
51-
foreach ($this->allModules as $module => $value) {
51+
foreach (array_keys($this->allModules) as $module) {
5252
$this->allModules[$module]['selected'] = true;
5353
$this->allModules[$module]['disabled'] = true;
5454
}
@@ -71,14 +71,7 @@ public function getAllModules(array $selectedModules = null)
7171
$this->allModules[$module]['selected'] = false;
7272
}
7373
} else {
74-
$existingModules = $this->deploymentConfig->getSegment(ModuleDeployment::CONFIG_KEY);
75-
if (isset($existingModules)) {
76-
foreach ($existingModules as $module => $value) {
77-
if (!$value) {
78-
$this->allModules[$module]['selected'] = false;
79-
}
80-
}
81-
}
74+
$this->deselectDisabledModules();
8275
}
8376
$disableModules = $this->getListOfDisableModules();
8477
if (isset($disableModules)) {
@@ -144,4 +137,21 @@ public function setIsEnabled($status, $moduleName)
144137
{
145138
$this->allModules[$moduleName]['selected'] = $status;
146139
}
140+
141+
/**
142+
* Marks modules that are disabled in deploymentConfig as unselected.
143+
*
144+
* @return void
145+
*/
146+
private function deselectDisabledModules()
147+
{
148+
$existingModules = $this->deploymentConfig->getSegment(ModuleDeployment::CONFIG_KEY);
149+
if (isset($existingModules)) {
150+
foreach ($existingModules as $module => $value) {
151+
if (!$value) {
152+
$this->allModules[$module]['selected'] = false;
153+
}
154+
}
155+
}
156+
}
147157
}

‎setup/view/layout/layout.phtml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,26 @@
3333
->appendFile('pub/magento/setup/install.js')
3434
->appendFile('pub/magento/setup/success.js');
3535
?>
36-
<link rel="icon" type="image/x-icon" href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon.ico" sizes="16x16">
37-
<link rel="icon" type="image/png" href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-96x96.png" sizes="96x96">
38-
<link rel="icon" type="image/png" href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-32x32.png" sizes="32x32">
39-
<link rel="icon" type="image/png" href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-16x16.png" sizes="16x16">
36+
<link
37+
rel="icon"
38+
type="image/x-icon"
39+
href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon.ico"
40+
sizes="16x16">
41+
<link
42+
rel="icon"
43+
type="image/png"
44+
href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-96x96.png"
45+
sizes="96x96">
46+
<link
47+
rel="icon"
48+
type="image/png"
49+
href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-32x32.png"
50+
sizes="32x32">
51+
<link
52+
rel="icon"
53+
type="image/png"
54+
href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-16x16.png"
55+
sizes="16x16">
4056
<?php echo $this->inlineScript() ?>
4157
</head>
4258
<body>

0 commit comments

Comments
 (0)