From f826017acfb81d549d5eaada07a0081ddc2498c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20K=C3=B6cke?= <jens@koecke.net>
Date: Thu, 28 Mar 2019 14:55:05 +0100
Subject: [PATCH 1/2] Correct bug 21993 config:set not storing scoped values

---
 .../Config/Console/Command/ConfigSet/DefaultProcessor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index 86ae1f96749df..c622a48b7f2c8 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -90,10 +90,10 @@ public function process($path, $value, $scope, $scopeCode)
         }
 
         try {
-            $config = $this->configFactory->create([
+            $config = $this->configFactory->create(['data' => [
                 'scope' => $scope,
                 'scope_code' => $scopeCode,
-            ]);
+            ]]);
             $config->setDataByPath($path, $value);
             $config->save();
         } catch (\Exception $exception) {

From d53690cbfe4aeac02d05c2078424698ce1fb7d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20K=C3=B6cke?= <jens@koecke.net>
Date: Mon, 1 Apr 2019 07:21:11 +0200
Subject: [PATCH 2/2] Fix unit tests

---
 .../Unit/Console/Command/ConfigSet/DefaultProcessorTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
index edb76c067bf35..35b2406b328cb 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
@@ -103,7 +103,7 @@ public function testProcess($path, $value, $scope, $scopeCode)
         $config = $this->createMock(Config::class);
         $this->configFactory->expects($this->once())
             ->method('create')
-            ->with(['scope' => $scope, 'scope_code' => $scopeCode])
+            ->with(['data' => ['scope' => $scope, 'scope_code' => $scopeCode]])
             ->willReturn($config);
         $config->expects($this->once())
             ->method('setDataByPath')