MC-36785: Unable to set YouTube API key by CLI

Author: dhorytskyi

app/code/Magento/Config/App/Config/Source/ModularConfigSource.php

@@ -8,6 +8,7 @@
 use Magento\Config\Model\Config\Structure\Reader as ConfigStructureReader;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ConfigSourceInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\App\Config\Initial\Reader as InitialConfigReader;
 
@@ -31,14 +32,15 @@ class ModularConfigSource implements ConfigSourceInterface
 
     /**
      * @param InitialConfigReader $initialConfigReader
-     * @param ConfigStructureReader $configStructureReader
+     * @param ConfigStructureReader|null $configStructureReader
      */
     public function __construct(
         InitialConfigReader $initialConfigReader,
-        ConfigStructureReader $configStructureReader
+        ?ConfigStructureReader $configStructureReader = null
     ) {
         $this->initialConfigReader = $initialConfigReader;
-        $this->configStructureReader = $configStructureReader;
+        $this->configStructureReader = $configStructureReader
+            ?? ObjectManager::getInstance()->get(ConfigStructureReader::class);
     }
 
     /**
@@ -63,18 +65,6 @@ public function get($path = '')
         return $data->getData('data' . $path) ?: [];
     }
 
-    private function addPathKey(array $data, string $path): array
-    {
-        if (strpos($path, '/') !== false) {
-            list ($key, $subPath) = explode('/', $path, 2);
-            $data[$key] = $this->addPathKey($data[$key] ?? [], $subPath);
-        } else {
-            $data += [$path => null];
-        }
-
-        return $data;
-    }
-
     /**
      * Merge initial config with config structure
      *
@@ -84,7 +74,7 @@ private function addPathKey(array $data, string $path): array
      */
     private function merge(array $config, array $sections): array
     {
-        foreach ($sections as $key => $section) {
+        foreach ($sections as $section) {
             if (isset($section['children'])) {
                 $config[$section['id']] = $this->merge(
                     $config[$section['id']] ?? [],

app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php

@@ -8,7 +8,8 @@
 namespace Magento\Config\Test\Unit\App\Config\Source;
 
 use Magento\Config\App\Config\Source\ModularConfigSource;
-use Magento\Framework\App\Config\Initial\Reader;
+use Magento\Config\Model\Config\Structure\Reader as ConfigStructureReader;
+use Magento\Framework\App\Config\Initial\Reader as InitialConfigReader;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -18,9 +19,14 @@
 class ModularConfigSourceTest extends TestCase
 {
     /**
-     * @var Reader|MockObject
+     * @var InitialConfigReader|MockObject
      */
-    private $reader;
+    private $initialConfigReader;
+
+    /**
+     * @var ConfigStructureReader|MockObject
+     */
+    private $configStructureReader;
 
     /**
      * @var ModularConfigSource
@@ -29,15 +35,17 @@ class ModularConfigSourceTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->reader = $this->getMockBuilder(Reader::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->source = new ModularConfigSource($this->reader);
+        $this->initialConfigReader = $this->createMock(InitialConfigReader::class);
+        $this->configStructureReader = $this->createMock(ConfigStructureReader::class);
+        $this->source = new ModularConfigSource(
+            $this->initialConfigReader,
+            $this->configStructureReader
+        );
     }
 
     public function testGet()
     {
-        $this->reader->expects($this->once())
+        $this->initialConfigReader->expects($this->once())
             ->method('read')
             ->willReturn(['data' => ['path' => 'value']]);
         $this->assertEquals('value', $this->source->get('path'));