Skip to content

Commit 7944783

Browse files
committed
MAGETWO-38151: Data Rollback
- Changes based on CR comments.
1 parent f7c470e commit 7944783

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

lib/internal/Magento/Framework/Setup/Test/Unit/BackupRollbackTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function testCodeRollback()
116116
$this->model->codeRollback('RollbackFile_A.tgz');
117117
}
118118

119-
public function testMeidaBackup()
119+
public function testMediaBackup()
120120
{
121121
$this->setupCodeBackupRollback();
122122
$this->filesystem->expects($this->once())

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,19 +146,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
146146
private function doRollback(InputInterface $input, OutputInterface $output)
147147
{
148148
$inputOptionProvided = false;
149+
$rollbackHandler = $this->backupRollbackFactory->create($output);
149150
if ($input->getOption(self::INPUT_KEY_CODE_BACKUP_FILE)) {
150-
$codeRollback = $this->backupRollbackFactory->create($output);
151-
$codeRollback->codeRollback($input->getOption(self::INPUT_KEY_CODE_BACKUP_FILE));
151+
$rollbackHandler->codeRollback($input->getOption(self::INPUT_KEY_CODE_BACKUP_FILE));
152152
$inputOptionProvided = true;
153153
}
154154
if ($input->getOption(self::INPUT_KEY_MEDIA_BACKUP_FILE)) {
155-
$mediaRollback = $this->backupRollbackFactory->create($output);
156-
$mediaRollback->codeRollback($input->getOption(self::INPUT_KEY_MEDIA_BACKUP_FILE), Factory::TYPE_MEDIA);
155+
$rollbackHandler->codeRollback($input->getOption(self::INPUT_KEY_MEDIA_BACKUP_FILE), Factory::TYPE_MEDIA);
157156
$inputOptionProvided = true;
158157
}
159158
if ($input->getOption(self::INPUT_KEY_DB_BACKUP_FILE)) {
160-
$dbRollback = $this->backupRollbackFactory->create($output);
161-
$dbRollback->dbRollback($input->getOption(self::INPUT_KEY_DB_BACKUP_FILE));
159+
$rollbackHandler->dbRollback($input->getOption(self::INPUT_KEY_DB_BACKUP_FILE));
162160
$inputOptionProvided = true;
163161
}
164162
if (!$inputOptionProvided) {

0 commit comments

Comments
 (0)