MAGETWO-38150: Data Backup

- Changes based on code review feedback.
- Changed info:backups:list to show sorted list based on type.

Author: safwkhan

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

@@ -92,6 +92,7 @@ public function codeBackup($time, $type = Factory::TYPE_FILESYSTEM)
         if ($type === Factory::TYPE_FILESYSTEM) {
             $fsBackup->addIgnorePaths($this->getCodeBackupIgnorePaths());
             $granularType = 'Code';
+            $fsBackup->setName('code');
         } elseif ($type === Factory::TYPE_MEDIA) {
             $fsBackup->addIgnorePaths($this->getMediaBackupIgnorePaths());
             $granularType = 'Media';
@@ -295,7 +296,6 @@ private function getMediaBackupIgnorePaths()
     private function checkRollbackFileValidity($time, $type)
     {
         $invalidFileNameMsg = 'Invalid rollback file.';
-        $count = count($time);
         if (!in_array(count($time), [2, 3])) {
             throw new LocalizedException(new Phrase($invalidFileNameMsg));
         }

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

@@ -20,7 +20,7 @@ public function testCreate()
             '',
             false
         );
-        $objectManager->expects($this->any())
+        $objectManager->expects($this->exactly(2))
             ->method('create')
             ->will($this->returnValueMap([
                 ['Magento\Framework\Setup\ConsoleLogger', ['output' => $output], $consoleLogger],

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

@@ -105,6 +105,15 @@ public function testCodeBackup()
         $this->model->codeBackup(time());
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage This backup type \'txt\' is not supported.
+     */
+    public function testCodeBackupWithInvalidType()
+    {
+        $this->model->codeBackup(time(), 'txt');
+    }
+
     public function testCodeRollback()
     {
         $this->filesystem->expects($this->once())->method('rollback');
@@ -116,6 +125,42 @@ public function testCodeRollback()
         $this->model->codeRollback('RollbackFile_A.tgz');
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage The rollback file does not exist.
+     */
+    public function testCodeRollbackWithInvalidFilePath()
+    {
+        $this->file->expects($this->once())
+            ->method('isExists')
+            ->willReturn(false);
+        $this->model->codeRollback('RollbackFile_A.tgz');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Invalid rollback file.
+     */
+    public function testCodeRollbackWithInvalidFileType()
+    {
+        $this->file->expects($this->once())
+            ->method('isExists')
+            ->willReturn(true);
+        $this->model->codeRollback('RollbackFile_A.txt');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Invalid rollback file.
+     */
+    public function testCodeRollbackWithInvalidFileFormat()
+    {
+        $this->file->expects($this->once())
+            ->method('isExists')
+            ->willReturn(true);
+        $this->model->codeRollback('RollbackFile.gz');
+    }
+
     public function testMediaBackup()
     {
         $this->setupCodeBackupRollback();

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

@@ -25,7 +25,6 @@ class BackupCommand extends AbstractSetupCommand
     /**
      * Name of input options
      */
-
     const INPUT_KEY_CODE = 'code';
     const INPUT_KEY_MEDIA = 'media';
     const INPUT_KEY_DB = 'db';
@@ -38,11 +37,15 @@ class BackupCommand extends AbstractSetupCommand
     private $objectManager;
 
     /**
+     * Handler for maintenance mode
+     *
      * @var MaintenanceMode
      */
     private $maintenanceMode;
 
     /**
+     * Factory for BackupRollback
+     *
      * @var BackupRollbackFactory
      */
     private $backupRollbackFactory;

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

@@ -65,17 +65,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $backupsDir = $this->directoryList->getPath(DirectoryList::VAR_DIR)
             . '/' . BackupRollback::DEFAULT_BACKUP_DIRECTORY;
         if ($this->file->isExists($backupsDir)) {
-            $output->writeln(
-                '<info>Showing backup files in ' . $backupsDir
-                . ' (first part of the filename is the time it was taken) ...</info>'
-            );
             $contents = $this->file->readDirectoryRecursively($backupsDir);
-            if (empty($contents)) {
-                $output->writeln('<info>No backup files found.</info>');
-                return;
-            }
-            $table = $this->getHelperSet()->get('table');
-            $table->setHeaders(['Backup Filename', 'Backup Type']);
+            $tempTable = [];
             foreach ($contents as $path) {
                 $partsOfPath = explode('/', str_replace('\\', '/', $path));
                 $fileName = $partsOfPath[count($partsOfPath) - 1];
@@ -86,14 +77,26 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     // and filename contains the type of backup separated by '_'
                     $fileNameParts = explode('_', $filenameWithoutExtension[0]);
                     if (in_array(Factory::TYPE_MEDIA, $fileNameParts)) {
-                        $table->addRow([$fileName, Factory::TYPE_MEDIA]);
+                        $tempTable[$fileName] = Factory::TYPE_MEDIA;
                     } elseif (in_array(Factory::TYPE_DB, $fileNameParts)) {
-                        $table->addRow([$fileName, Factory::TYPE_DB]);
-                    } elseif (in_array(Factory::TYPE_FILESYSTEM, $fileNameParts)) {
-                        $table->addRow([$fileName, Factory::TYPE_FILESYSTEM]);
+                        $tempTable[$fileName] = Factory::TYPE_DB;
+                    } elseif (in_array('code', $fileNameParts)) {
+                        $tempTable[$fileName] = 'code';
                     }
                 }
             }
+            if (empty($tempTable)) {
+                $output->writeln('<info>No backup files found.</info>');
+                return;
+            }
+            $output->writeln("<info>Showing backup files in $backupsDir.</info>");
+            /** @var \Symfony\Component\Console\Helper\Table $table */
+            $table = $this->getHelperSet()->get('table');
+            $table->setHeaders(['Backup Filename', 'Backup Type']);
+            asort($tempTable);
+            foreach ($tempTable as $key => $value) {
+                $table->addRow([$key, $value]);
+            }
             $table->render($output);
         } else {
             $output->writeln('<info>No backup files found.</info>');

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

@@ -238,7 +238,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $helper = $this->getHelper('question');
         $question = new ConfirmationQuestion(
-            'You are about to remove code and database tables. Are you sure?[y/N]',
+            'You are about to remove code and/or database tables. Are you sure?[y/N]',
             false
         );
         if (!$helper->ask($input, $output, $question) && $input->isInteractive()) {

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

@@ -60,9 +60,7 @@ public function setUp()
         $this->deploymentConfig = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false);
         $this->objectManager->expects($this->any())
             ->method('get')
-            ->will($this->returnValueMap([
-                ['Magento\Framework\Setup\BackupRollbackFactory', $this->backupRollbackFactory],
-            ]));
+            ->will($this->returnValue($this->backupRollbackFactory));
         $command = new BackupCommand(
             $objectManagerProvider,
             $maintenanceMode,

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

@@ -23,13 +23,6 @@ public function testExecute()
          * |\PHPUnit_Framework_MockObject_MockObject $directoryList
          */
         $directoryList = $this->getMock('Magento\Framework\App\Filesystem\DirectoryList', [], [], '', false);
-        $path = realpath(__DIR__);
-        $directoryList->expects($this->any())
-            ->method('getRoot')
-            ->willReturn($path);
-        $directoryList->expects($this->any())
-            ->method('getPath')
-            ->willReturn($path);
         /** @var \Magento\Framework\Filesystem\Driver\File|\PHPUnit_Framework_MockObject_MockObject $file */
         $file = $this->getMock('Magento\Framework\Filesystem\Driver\File', [], [], '', false);
         $file->expects($this->once())->method('isExists')->will($this->returnValue(true));