MAGETWO-64602: Sync config file with DB: Validation

Author: Bohdan Korablov

app/code/Magento/Deploy/Console/Command/App/ApplicationDumpCommand.php

@@ -12,7 +12,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Deploy\Model\DeploymentConfig\HashUpdater;
+use Magento\Deploy\Model\DeploymentConfig\Hash;
 use Magento\Framework\App\ObjectManager;
 
 /**
@@ -31,26 +31,26 @@ class ApplicationDumpCommand extends Command
     private $sources;
 
     /**
-     * @var HashUpdater
+     * @var Hash
      */
-    private $configHashUpdater;
+    private $configHash;
 
     /**
      * ApplicationDumpCommand constructor.
      *
      * @param Writer $writer
      * @param array $sources
-     * @param HashUpdater $configHashUpdater
+     * @param Hash $configHash
      */
     public function __construct(
         Writer $writer,
         array $sources,
-        HashUpdater $configHashUpdater = null
+        Hash $configHash = null
     ) {
         parent::__construct();
         $this->writer = $writer;
         $this->sources = $sources;
-        $this->configHashUpdater = $configHashUpdater ?: ObjectManager::getInstance()->get(HashUpdater::class);
+        $this->configHash = $configHash ?: ObjectManager::getInstance()->get(Hash::class);
     }
 
     /**
@@ -98,7 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         // Generate and save new hash of deployment configuration.
-        $this->configHashUpdater->update();
+        $this->configHash->regenerate();
 
         $output->writeln('<info>Done.</info>');
         return Cli::RETURN_SUCCESS;

app/code/Magento/Deploy/Model/DeploymentConfig/Hash.php

@@ -35,30 +35,51 @@ class Hash
      */
     private $writer;
 
+    /**
+     * Hash generator.
+     *
+     * @var Hash\Generator
+     */
+    private $configHashGenerator;
+
+    /**
+     * Config data collector.
+     *
+     * @var DataCollector
+     */
+    private $dataConfigCollector;
+
     /**
      * @param DeploymentConfig $deploymentConfig the application deployment configuration
      * @param Writer $writer the configuration writer that writes to files
+     * @param Hash\Generator $configHashGenerator the hash generator
+     * @param DataCollector $dataConfigCollector the config data collector
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
-        Writer $writer
+        Writer $writer,
+        Hash\Generator $configHashGenerator,
+        DataCollector $dataConfigCollector
     ) {
         $this->deploymentConfig = $deploymentConfig;
         $this->writer = $writer;
+        $this->configHashGenerator = $configHashGenerator;
+        $this->dataConfigCollector = $dataConfigCollector;
     }
 
     /**
-     * Saves a deployment configuration hash to storage.
+     * Updates hash in the storage.
      *
-     * @param array|string $hash the deployment configuration data from files
      * @return void
      * @throws LocalizedException
      */
-    public function save($hash)
+    public function regenerate()
     {
         try {
+            $config = $this->dataConfigCollector->getConfig();
+            $hash = $this->configHashGenerator->generate($config);
             $this->writer->saveConfig([ConfigFilePool::APP_ENV => [self::CONFIG_KEY => $hash]]);
-        } catch (FileSystemException $exception) {
+        } catch (LocalizedException $exception) {
             throw new LocalizedException(__('Hash has not been saved'), $exception);
         }
     }

app/code/Magento/Deploy/Model/DeploymentConfig/HashUpdater.php

@@ -39,9 +39,9 @@ class Importer
     /**
      * Hash updater of config data.
      *
-     * @var HashUpdater
+     * @var Hash
      */
-    private $configHashUpdater;
+    private $configHash;
 
     /**
      * Logger.
@@ -54,20 +54,20 @@ class Importer
      * @param Validator $configValidator the manager of deployment configuration hash
      * @param ImporterPool $configImporterPool the pool of all deployment configuration importers
      * @param DeploymentConfig $deploymentConfig the application deployment configuration
-     * @param HashUpdater $configHashUpdater the hash updater of config data
+     * @param Hash $configHash the hash updater of config data
      * @param Logger $logger the logger
      */
     public function __construct(
         Validator $configValidator,
         ImporterPool $configImporterPool,
         DeploymentConfig $deploymentConfig,
-        HashUpdater $configHashUpdater,
+        Hash $configHash,
         Logger $logger
     ) {
         $this->configValidator = $configValidator;
         $this->configImporterPool = $configImporterPool;
         $this->deploymentConfig = $deploymentConfig;
-        $this->configHashUpdater = $configHashUpdater;
+        $this->configHash = $configHash;
         $this->logger = $logger;
     }
 
@@ -98,7 +98,7 @@ public function import()
                     );
                 }
 
-                $this->configHashUpdater->update();
+                $this->configHash->regenerate();
             }
         } catch (LocalizedException $exception) {
             $this->logger->error($exception);

app/code/Magento/Deploy/Model/DeploymentConfig/Importer.php

@@ -12,7 +12,7 @@
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Deploy\Model\DeploymentConfig\HashUpdater;
+use Magento\Deploy\Model\DeploymentConfig\Hash;
 
 /**
  * Test command for dump application state
@@ -40,9 +40,9 @@ class ApplicationDumpCommandTest extends \PHPUnit_Framework_TestCase
     private $source;
 
     /**
-     * @var HashUpdater|\PHPUnit_Framework_MockObject_MockObject
+     * @var Hash|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $configHashUpdaterMock;
+    private $configHashMock;
 
     /**
      * @var ApplicationDumpCommand
@@ -51,7 +51,7 @@ class ApplicationDumpCommandTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->configHashUpdaterMock = $this->getMockBuilder(HashUpdater::class)
+        $this->configHashMock = $this->getMockBuilder(Hash::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->input = $this->getMockBuilder(InputInterface::class)
@@ -68,7 +68,7 @@ public function setUp()
         $this->command = new ApplicationDumpCommand(
             $this->writer,
             [['namespace' => 'system', 'source' => $this->source]],
-            $this->configHashUpdaterMock
+            $this->configHashMock
         );
     }
 
@@ -78,8 +78,8 @@ public function testExport()
             'system' => ['systemDATA']
         ];
         $data = [ConfigFilePool::APP_CONFIG => $dump];
-        $this->configHashUpdaterMock->expects($this->once())
-            ->method('update');
+        $this->configHashMock->expects($this->once())
+            ->method('regenerate');
         $this->source
             ->expects($this->once())
             ->method('get')