Skip to content

Commit 3cfdb8d

Browse files
bwatersvrann
authored andcommitted
MAGETWO-51592: Make single tenant compiler work when Magento not installed
-- Updated grammar in console messages.
1 parent a903332 commit 3cfdb8d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

setup/src/Magento/Setup/Console/Command/AbstractModuleCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function cleanup(InputInterface $input, OutputInterface $output)
8585
$cleanupFiles = $this->objectManager->get('Magento\Framework\App\State\CleanupFiles');
8686
$cleanupFiles->clearCodeGeneratedClasses();
8787
$output->writeln(
88-
"<info>Generated classes cleared successfully. Please run 'setup:di:compile' command to "
88+
"<info>Generated classes cleared successfully. Please run the 'setup:di:compile' command to "
8989
. 'generate classes.</info>'
9090
);
9191
if ($input->getOption(self::INPUT_KEY_CLEAR_STATIC_CONTENT)) {
@@ -94,7 +94,7 @@ protected function cleanup(InputInterface $input, OutputInterface $output)
9494
} else {
9595
$output->writeln(
9696
"<info>Info: Some modules might require static view files to be cleared. To do this, run '"
97-
. $this->getName() . "' with --" . self::INPUT_KEY_CLEAR_STATIC_CONTENT
97+
. $this->getName() . "' with the --" . self::INPUT_KEY_CLEAR_STATIC_CONTENT
9898
. ' option to clear them.</info>'
9999
);
100100
}

setup/src/Magento/Setup/Console/Command/DiCompileCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private function checkEnvironment()
110110
$config = $this->deploymentConfig->get(ConfigOptionsListConstants::KEY_MODULES);
111111
if (!$config) {
112112
$messages[] = 'You cannot run this command because modules are not enabled. You can enable modules by'
113-
. ' running \'module:enable --all\' command.';
113+
. ' running the \'module:enable --all\' command.';
114114
}
115115

116116
/**

setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function testExecuteModulesNotEnabled()
103103
$tester = new CommandTester($this->command);
104104
$tester->execute([]);
105105
$this->assertEquals(
106-
'You cannot run this command because modules are not enabled. You can enable modules by running \'module:'
106+
'You cannot run this command because modules are not enabled. You can enable modules by running the \'module:'
107107
. 'enable --all\' command.' . PHP_EOL,
108108
$tester->getDisplay()
109109
);

setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleEnableDisableCommandTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ public function executeDataProvider()
115115
false,
116116
'%amodules have been enabled%aMagento_Module1%a'
117117
. "Info: Some modules might require static view files to be cleared. To do this, run "
118-
. "'module:enable' with --clear-static-content%a"
118+
. "'module:enable' with the --clear-static-content%a"
119119
],
120120
'disable, do not clear static content' => [
121121
false,
122122
false,
123123
'%amodules have been disabled%aMagento_Module1%a'
124124
. "Info: Some modules might require static view files to be cleared. To do this, run "
125-
. "'module:disable' with --clear-static-content%a"
125+
. "'module:disable' with the --clear-static-content%a"
126126
],
127127
'enable, clear static content' => [
128128
true,
@@ -162,7 +162,7 @@ public function testExecuteDisableInvalidModule()
162162
}
163163

164164
/**
165-
* @param bool $isEnable
165+
* @param bool $isEnab
166166
* @param string $expectedMessage
167167
* @param bool $isInstalled
168168
*

0 commit comments

Comments
 (0)