Skip to content

Commit e0d0ed4

Browse files
committed
MAGETWO-33669: Contribution of Sprint 23 Work to Mainline
- various formatting fixes for static code tests
1 parent 8deaa4e commit e0d0ed4

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

dev/tests/unit/testsuite/Magento/Framework/Module/StatusTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testCheckConstraintsEnableAllowed()
7373
true,
7474
['Module_Foo' => '', 'Module_Bar' => ''],
7575
['Module_baz', 'Module_quz']
76-
);
76+
);
7777
$this->assertEquals([], $result);
7878
}
7979

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function testGetAllModulesWithInputs($expectedAllModules, $expectedConfig
8686
);
8787

8888
$moduleStatus = new ModuleStatus($this->moduleLoader, $this->deploymentConfig, $this->objectManagerProvider);
89-
$allModules = $moduleStatus->getAllModules(['module1' , 'module2']);
89+
$allModules = $moduleStatus->getAllModules(['module1', 'module2']);
9090
$this->assertSame(true, $allModules['module1']['selected']);
9191
$this->assertSame(true, $allModules['module2']['selected']);
9292
$this->assertSame(false, $allModules['module3']['selected']);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private function importDeploymentConfigForm()
141141
$result[Installer::ENABLE_MODULES] = isset($source['store']['selectedModules'])
142142
? implode(',', $source['store']['selectedModules']) : '';
143143
$result[Installer::DISABLE_MODULES] = isset($source['store']['allModules'])
144-
? implode( ',', array_diff($source['store']['allModules'], $source['store']['selectedModules'])) : '';
144+
? implode(',', array_diff($source['store']['allModules'], $source['store']['selectedModules'])) : '';
145145
return $result;
146146
}
147147

setup/src/Magento/Setup/Controller/Modules.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function indexAction()
4444
{
4545
$allModules = $this->allModules->getAllModules();
4646
$enabledModules = [];
47-
foreach ($allModules as $module ) {
47+
foreach ($allModules as $module) {
4848
if ($module['selected']) {
4949
$enabledModules[] = $module['name'];
5050
}
@@ -55,7 +55,7 @@ public function indexAction()
5555
return new JsonModel(['success' => true, 'modules' => $allModules]);
5656
} else {
5757
$errorMessage = $validity->getVariable("error");
58-
return new JsonModel(['success' => false, 'modules' => $allModules,
58+
return new JsonModel(['success' => false, 'modules' => $allModules,
5959
'error' => '<b> Corrupt config.php!</b> <br />' . $errorMessage]);
6060
}
6161
}
@@ -103,8 +103,11 @@ public function validateAction()
103103
$params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
104104
$status = $this->objectManager->create('Magento\Framework\Module\Status');
105105

106-
$constraints = $status->checkConstraints($params['status'], [$params['module']],
107-
array_diff($params['selectedModules'], [$params['module']]));
106+
$constraints = $status->checkConstraints(
107+
$params['status'],
108+
[$params['module']],
109+
array_diff($params['selectedModules'], [$params['module']])
110+
);
108111
if ($constraints) {
109112
$message = $this->getConstraintsFailureMessage($params['status'], $constraints);
110113
return new JsonModel(['success' => false, 'error' => $message]);

0 commit comments

Comments
 (0)