MAGETWO-65208: Store checksum for every section of configuration file & change behavior on read-only FS & add sorting of importers

Author: Bohdan Korablov

app/code/Magento/Deploy/Console/Command/App/ConfigImport/Importer.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\DeploymentConfig\ImporterInterface;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\RuntimeException;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Deploy\Model\DeploymentConfig\Validator;
@@ -112,11 +113,14 @@ public function import(OutputInterface $output)
                 if (!$this->configValidator->isValid($section)) {
                     /** @var ImporterInterface $importer */
                     $importer = $this->importerFactory->create($importerClassName);
-                    $messages = $importer->import((array) $this->deploymentConfig->getConfigData($section));
+                    $messages = $importer->import((array)$this->deploymentConfig->getConfigData($section));
                     $output->writeln($messages);
                     $this->configHash->regenerate($section);
                 }
             }
+        } catch (LocalizedException $exception) {
+            $this->logger->error($exception);
+            $output->writeln(sprintf('<error>%s</error>', $exception->getMessage()));
         } catch (\Exception $exception) {
             $this->logger->error($exception);
             throw new RuntimeException(__('Import is failed. Please see the log report.'), $exception);

app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImport/ImporterTest.php

@@ -58,9 +58,6 @@ class ImporterTest extends \PHPUnit_Framework_TestCase
      */
     private $importer;
 
-    /**
-     * @return void
-     */
     protected function setUp()
     {
         $this->importerFactoryMock = $this->getMockBuilder(ImporterFactory::class)
@@ -94,9 +91,6 @@ protected function setUp()
         );
     }
 
-    /**
-     * @return void
-     */
     public function testImport()
     {
         $configData = ['some data'];
@@ -141,13 +135,12 @@ public function testImport()
     }
 
     /**
-     * @return void
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage Import is failed. Please see the log report.
      */
     public function testImportWithException()
     {
-        $exception = new LocalizedException(__('Some error'));
+        $exception = new \Exception('Some error');
         $this->outputMock->expects($this->never())
             ->method('writeln');
         $this->configHashMock->expects($this->never())
@@ -166,10 +159,31 @@ public function testImportWithException()
         $this->importer->import($this->outputMock);
     }
 
+    public function testImportWithLocalizedException()
+    {
+        $exception = new LocalizedException(__('Some error'));
+        $this->outputMock->expects($this->once())
+            ->method('writeln')
+            ->with('<error>Some error</error>');
+        $this->configHashMock->expects($this->never())
+            ->method('regenerate');
+        $this->configValidatorMock->expects($this->never())
+            ->method('isValid');
+        $this->deploymentConfigMock->expects($this->never())
+            ->method('getConfigData');
+        $this->configImporterPoolMock->expects($this->once())
+            ->method('getImporters')
+            ->willThrowException($exception);
+        $this->loggerMock->expects($this->once())
+            ->method('error')
+            ->with($exception);
+
+        $this->importer->import($this->outputMock);
+    }
+
     /**
      * @param array $importers
      * @param bool $isValid
-     * @return void
      * @dataProvider importNothingToImportDataProvider
      */
     public function testImportNothingToImport(array $importers, $isValid)