Skip to content

Commit 863c6d1

Browse files
committed
AC-9499::Update Symfony dependency packages to the latest LTS versions 6.4
1 parent 964fe42 commit 863c6d1

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ public function testRegenerateStatic(): void
149149
$this->shell
150150
->expects($this->exactly(4))
151151
->method('execute')
152-
->withConsecutive([$cacheFlushCmd], [$setupDiCompileCmd], [$cacheFlushCmd], [$staticContentDeployCmd]);
152+
->withConsecutive([$cacheFlushCmd], [$setupDiCompileCmd], [$cacheFlushCmd], [$staticContentDeployCmd])
153+
->willReturn("Compilation complete");
153154

154155
$this->output
155156
->method('writeln')
@@ -176,9 +177,18 @@ public function testGenerateStaticForNotAllowedStoreViewLocale(): void
176177
$this->expectExceptionMessage(
177178
';echo argument has invalid value, run info:language:list for list of available locales'
178179
);
180+
$setupDiCompileCmd = $this->cmdPrefix . 'setup:di:compile';
179181
$storeLocales = ['fr_FR', 'de_DE', ';echo'];
180182
$this->storeView->method('retrieveLocales')
181183
->willReturn($storeLocales);
184+
$cacheFlushCmd = $this->cmdPrefix . 'cache:flush';
185+
$staticContentDeployCmd = $this->cmdPrefix . 'setup:static-content:deploy -f '
186+
. implode(' ', $storeLocales);
187+
$this->shell
188+
->expects($this->exactly(3))
189+
->method('execute')
190+
->withConsecutive([$cacheFlushCmd], [$setupDiCompileCmd], [$cacheFlushCmd], [$staticContentDeployCmd])
191+
->willReturn("Compilation complete");
182192

183193
$this->initAdminLocaleMock('en_US');
184194

@@ -196,9 +206,18 @@ public function testGenerateStaticForNotAllowedAdminLocale(): void
196206
$this->expectExceptionMessage(
197207
';echo argument has invalid value, run info:language:list for list of available locales'
198208
);
209+
$setupDiCompileCmd = $this->cmdPrefix . 'setup:di:compile';
199210
$storeLocales = ['fr_FR', 'de_DE', 'en_US'];
211+
$cacheFlushCmd = $this->cmdPrefix . 'cache:flush';
212+
$staticContentDeployCmd = $this->cmdPrefix . 'setup:static-content:deploy -f '
213+
. implode(' ', $storeLocales);
200214
$this->storeView->method('retrieveLocales')
201215
->willReturn($storeLocales);
216+
$this->shell
217+
->expects($this->exactly(3))
218+
->method('execute')
219+
->withConsecutive([$cacheFlushCmd], [$setupDiCompileCmd], [$cacheFlushCmd], [$staticContentDeployCmd])
220+
->willReturn("Compilation complete");
202221

203222
$this->initAdminLocaleMock(';echo');
204223

app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
183183
$fileWriter->writeFile($patchFile, $patchTemplateData);
184184

185185
$outputPatchFile = str_replace($this->directoryList->getRoot() . '/', '', $patchDir . '/' . $patchFile);
186-
$output->writeln(__('Patch %1 has been successfully generated.', $outputPatchFile));
186+
$output->writeln("Patch $outputPatchFile has been successfully generated.");
187187

188188
return Cli::RETURN_SUCCESS;
189189
}

app/code/Magento/Translation/Test/Unit/Console/Command/UninstallLanguageCommandTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ public function testExecute()
9898
->method('create')
9999
->willReturn($backupRollback);
100100

101-
$this->remove->expects($this->once())->method('remove');
101+
$this->remove->expects($this->once())->method('remove')
102+
->willReturn('vendor/language-ua_ua');
102103
$this->cache->expects($this->once())->method('clean');
103104

104105
$this->tester->execute(['package' => ['vendor/language-ua_ua'], '--backup-code' => true]);
@@ -122,7 +123,8 @@ public function testExecuteNoBackupOption()
122123
);
123124

124125
$this->backupRollbackFactory->expects($this->never())->method('create');
125-
$this->remove->expects($this->once())->method('remove');
126+
$this->remove->expects($this->once())->method('remove')
127+
->willReturn('vendor/language-ua_ua');
126128
$this->cache->expects($this->once())->method('clean');
127129

128130
$this->tester->execute(['package' => ['vendor/language-ua_ua']]);

0 commit comments

Comments
 (0)