Skip to content

Commit 75b23e2

Browse files
committed
MAGETWO-38151: Data Rollback
- Changes based on message review comments.
1 parent 0e94e50 commit 75b23e2

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

lib/internal/Magento/Framework/Setup/BackupRollback.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function codeBackup($time, $type = Factory::TYPE_FILESYSTEM)
113113
. ' (The archive can be uncompressed with 7-Zip on Windows systems)'
114114
);
115115
$this->log->log($granularType . ' backup path: ' . $fsBackup->getBackupPath());
116-
$this->log->logSuccess($granularType . ' backup has completed successfully.');
116+
$this->log->logSuccess($granularType . ' backup completed successfully.');
117117
}
118118

119119
/**
@@ -163,7 +163,7 @@ public function codeRollback($rollbackFile, $type = Factory::TYPE_FILESYSTEM)
163163
$fsRollback->rollback();
164164
$this->log->log($granularType . ' rollback filename: ' . $fsRollback->getBackupFilename());
165165
$this->log->log($granularType . ' rollback file path: ' . $fsRollback->getBackupPath());
166-
$this->log->logSuccess($granularType . ' rollback has completed successfully.');
166+
$this->log->logSuccess($granularType . ' rollback completed successfully.');
167167
}
168168

169169
/**
@@ -192,7 +192,7 @@ public function dbBackup($time)
192192
. ' (The archive can be uncompressed with 7-Zip on Windows systems)'
193193
);
194194
$this->log->log('DB backup path: ' . $dbBackup->getBackupPath());
195-
$this->log->logSuccess('DB backup has completed successfully.');
195+
$this->log->logSuccess('DB backup completed successfully.');
196196
}
197197

198198
/**
@@ -225,7 +225,7 @@ public function dbRollback($rollbackFile)
225225
$dbRollback->rollback();
226226
$this->log->log('DB rollback filename: ' . $dbRollback->getBackupFilename());
227227
$this->log->log('DB rollback path: ' . $dbRollback->getBackupPath());
228-
$this->log->logSuccess('DB rollback has completed successfully.');
228+
$this->log->logSuccess('DB rollback completed successfully.');
229229
}
230230

231231
/**

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ protected function configure()
9999
),
100100
];
101101
$this->setName('setup:rollback')
102-
->setDescription('Rolls back Magento Application code base, media and database')
102+
->setDescription('Rolls back Magento Application codebase, media and database')
103103
->setDefinition($options);
104104
parent::configure();
105105
}
@@ -111,7 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
111111
{
112112
if (!$this->deploymentConfig->isAvailable() && ($input->getOption(self::INPUT_KEY_MEDIA_BACKUP_FILE)
113113
|| $input->getOption(self::INPUT_KEY_DB_BACKUP_FILE))) {
114-
$output->writeln("<info>No information is available: the application is not installed.</info>");
114+
$output->writeln("<info>No information is available: the Magento application is not installed.</info>");
115115
return;
116116
}
117117
try {
@@ -161,7 +161,7 @@ private function doRollback(InputInterface $input, OutputInterface $output)
161161
}
162162
if (!$inputOptionProvided) {
163163
throw new \InvalidArgumentException(
164-
'No option is provided for the command to rollback.'
164+
'Not enough information provided to roll back.'
165165
);
166166
}
167167
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public function testExecuteNotInstalled()
138138
->will($this->returnValue(false));
139139
$this->tester->execute(['--db-file' => 'C.gz']);
140140
$this->assertStringMatchesFormat(
141-
'No information is available: the application is not installed.%w',
141+
'No information is available: the Magento application is not installed.%w',
142142
$this->tester->getDisplay()
143143
);
144144
}
@@ -150,7 +150,7 @@ public function testExecuteNoOptions()
150150
->will($this->returnValue(true));
151151
$this->tester->execute([]);
152152
$expected = 'Enabling maintenance mode' . PHP_EOL
153-
. 'No option is provided for the command to rollback.' . PHP_EOL
153+
. 'Not enough information provided to roll back.' . PHP_EOL
154154
. 'Disabling maintenance mode';
155155
$this->assertStringMatchesFormat($expected, $this->tester->getDisplay());
156156
}

0 commit comments

Comments
 (0)