Merge remote-tracking branch 'falcons/MAGETWO-67159' into MAGETWO-69983

# Conflicts:
#	app/code/Magento/Config/Model/Config/Importer.php
#	app/code/Magento/Config/Test/Unit/Model/Config/ImporterTest.php

Author: Bohdan Korablov

app/code/Magento/Config/Model/Config/Importer.php

@@ -13,8 +13,7 @@
 use Magento\Framework\App\State;
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\Exception\State\InvalidTransitionException;
-use Magento\Framework\Flag\FlagResource;
-use Magento\Framework\FlagFactory;
+use Magento\Framework\FlagManager;
 use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
@@ -32,18 +31,11 @@ class Importer implements ImporterInterface
     const FLAG_CODE = 'system_config_snapshot';
 
     /**
-     * The flag factory.
+     * The flag manager.
      *
-     * @var FlagFactory
+     * @var FlagManager
      */
-    private $flagFactory;
-
-    /**
-     * The flag resource.
-     *
-     * @var FlagResource
-     */
-    private $flagResource;
+    private $flagManager;
 
     /**
      * An array utils.
@@ -81,25 +73,22 @@ class Importer implements ImporterInterface
     private $saveProcessor;
 
     /**
-     * @param FlagFactory $flagFactory The flag factory
-     * @param FlagResource $flagResource The flag resource
+     * @param FlagManager $flagManager The flag manager
      * @param ArrayUtils $arrayUtils An array utils
      * @param SaveProcessor $saveProcessor Saves configuration data
      * @param ScopeConfigInterface $scopeConfig The application config storage.
      * @param State $state The application scope to run
      * @param ScopeInterface $scope The application scope
      */
     public function __construct(
-        FlagFactory $flagFactory,
-        FlagResource $flagResource,
+        FlagManager $flagManager,
         ArrayUtils $arrayUtils,
         SaveProcessor $saveProcessor,
         ScopeConfigInterface $scopeConfig,
         State $state,
         ScopeInterface $scope
     ) {
-        $this->flagFactory = $flagFactory;
-        $this->flagResource = $flagResource;
+        $this->flagManager = $flagManager;
         $this->arrayUtils = $arrayUtils;
         $this->saveProcessor = $saveProcessor;
         $this->scopeConfig = $scopeConfig;
@@ -118,13 +107,10 @@ public function import(array $data)
         $currentScope = $this->scope->getCurrentScope();
 
         try {
-            $flag = $this->flagFactory->create(['data' => ['flag_code' => static::FLAG_CODE]]);
-            $this->flagResource->load($flag, static::FLAG_CODE, 'flag_code');
-            $previouslyProcessedData = $flag->getFlagData() ?: [];
-
+            $savedFlag = $this->flagManager->getFlagData(static::FLAG_CODE) ?: [];
             $changedData = array_replace_recursive(
-                $this->arrayUtils->recursiveDiff($previouslyProcessedData, $data),
-                $this->arrayUtils->recursiveDiff($data, $previouslyProcessedData)
+                $this->arrayUtils->recursiveDiff($savedFlag, $data),
+                $this->arrayUtils->recursiveDiff($data, $savedFlag)
             );
 
             /**
@@ -142,8 +128,7 @@ public function import(array $data)
                 $this->saveProcessor->process($changedData);
             });
 
-            $flag->setFlagData($data);
-            $this->flagResource->save($flag);
+            $this->flagManager->saveFlag(static::FLAG_CODE, $data);
         } catch (\Exception $e) {
             throw new InvalidTransitionException(__('%1', $e->getMessage()), $e);
         } finally {

app/code/Magento/Config/Model/PreparedValueFactory.php

@@ -80,7 +80,6 @@ public function __construct(
      * @return ValueInterface
      * @throws RuntimeException If Value can not be created
      * @see ValueInterface
-     * @see Value
      */
     public function create($path, $value, $scope, $scopeCode = null)
     {

app/code/Magento/Config/Test/Unit/Model/Config/ImporterTest.php

@@ -15,7 +15,7 @@
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\Flag;
 use Magento\Framework\Flag\FlagResource;
-use Magento\Framework\FlagFactory;
+use Magento\Framework\FlagManager;
 use Magento\Framework\Stdlib\ArrayUtils;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
@@ -33,20 +33,15 @@ class ImporterTest extends \PHPUnit_Framework_TestCase
     private $model;
 
     /**
-     * @var FlagFactory|Mock
+     * @var FlagManager|Mock
      */
-    private $flagFactoryMock;
+    private $flagManagerMock;
 
     /**
      * @var Flag|Mock
      */
     private $flagMock;
 
-    /**
-     * @var FlagResource|Mock
-     */
-    private $flagResourceMock;
-
     /**
      * @var ArrayUtils|Mock
      */
@@ -87,7 +82,7 @@ class ImporterTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->flagFactoryMock = $this->getMockBuilder(FlagFactory::class)
+        $this->flagManagerMock = $this->getMockBuilder(FlagManager::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->flagMock = $this->getMockBuilder(Flag::class)
@@ -116,13 +111,12 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->flagFactoryMock->expects($this->any())
+        $this->flagManagerMock->expects($this->any())
             ->method('create')
             ->willReturn($this->flagMock);
 
         $this->model = new Importer(
-            $this->flagFactoryMock,
-            $this->flagResourceMock,
+            $this->flagManagerMock,
             $this->arrayUtilsMock,
             $this->saveProcessorMock,
             $this->scopeConfigMock,
@@ -136,11 +130,9 @@ public function testImport()
         $data = [];
         $currentData = ['current' => '2'];
 
-        $this->flagResourceMock->expects($this->once())
-            ->method('load')
-            ->with($this->flagMock, Importer::FLAG_CODE, 'flag_code');
-        $this->flagMock->expects($this->once())
+        $this->flagManagerMock->expects($this->once())
             ->method('getFlagData')
+            ->with(Importer::FLAG_CODE)
             ->willReturn($currentData);
         $this->arrayUtilsMock->expects($this->exactly(2))
             ->method('recursiveDiff')
@@ -157,12 +149,9 @@ public function testImport()
         $this->scopeMock->expects($this->once())
             ->method('setCurrentScope')
             ->with('oldScope');
-        $this->flagMock->expects($this->once())
-            ->method('setFlagData')
-            ->with($data);
-        $this->flagResourceMock->expects($this->once())
-            ->method('save')
-            ->with($this->flagMock);
+        $this->flagManagerMock->expects($this->once())
+            ->method('saveFlag')
+            ->with(Importer::FLAG_CODE, $data);
 
         $this->assertSame(['System config was processed'], $this->model->import($data));
     }
@@ -176,10 +165,7 @@ public function testImportWithException()
         $data = [];
         $currentData = ['current' => '2'];
 
-        $this->flagResourceMock->expects($this->once())
-            ->method('load')
-            ->with($this->flagMock, Importer::FLAG_CODE, 'flag_code');
-        $this->flagMock->expects($this->once())
+        $this->flagManagerMock->expects($this->once())
             ->method('getFlagData')
             ->willReturn($currentData);
         $this->arrayUtilsMock->expects($this->exactly(2))

app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SensitiveConfigSetFacade.php

@@ -78,12 +78,13 @@ public function __construct(
     }
 
     /**
-     * Processes the sensitive:config:set command.
+     * Processes the config:sensitive:set command.
      *
      * @param InputInterface $input The input manager
      * @param OutputInterface $output The output manager
      * @return void
-     * @throws RuntimeException If data can not be processed
+     * @throws LocalizedException If scope or scope code is not valid
+     * @throws RuntimeException If sensitive config can not be filled
      */
     public function process(InputInterface $input, OutputInterface $output)
     {

lib/internal/Magento/Framework/FlagManager.php

@@ -44,7 +44,7 @@ public function __construct(
      * Retrieves raw data from the flag.
      *
      * @param string $code The code of flag
-     * @return mixed
+     * @return string|int|float|bool|array|null
      */
     public function getFlagData($code)
     {
@@ -55,7 +55,7 @@ public function getFlagData($code)
      * Saves the flag value by code.
      *
      * @param string $code The code of flag
-     * @param mixed $value The value of flag
+     * @param string|int|float|bool|array|null $value The value of flag
      * @return bool
      */
     public function saveFlag($code, $value)