ISSE-33802: load config on empty cache only

Author: sergeynezbritskiy

lib/internal/Magento/Framework/App/DeploymentConfig.php

@@ -38,7 +38,7 @@ class DeploymentConfig
      *
      * @var array
      */
-    private $flatData;
+    private $flatData = [];
 
     /**
      * Injected configuration data
@@ -72,7 +72,6 @@ public function __construct(DeploymentConfig\Reader $reader, $overrideData = [])
      */
     public function get($key = null, $defaultValue = null)
     {
-        $this->load();
         $result = $this->getByKey($key);
         if ($result === null) {
             $this->resetData();
@@ -201,9 +200,8 @@ private function flattenParams(array $params, $path = null, array &$flattenResul
     protected function getByKey($key)
     {
         if ($key === null) {
-            return $this->flatData;
+            return $this->flatData ?: null;
         }
-
         if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {
             return '';
         }

lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php

@@ -163,7 +163,7 @@ public function keyCollisionDataProvider(): array
 
     public function testResetData(): void
     {
-        $this->readerMock->expects($this->exactly(2))->method('load')->willReturn(self::$fixture);
+        $this->readerMock->expects($this->once())->method('load')->willReturn(self::$fixture);
         $this->assertSame(self::$flattenedFixture, $this->_deploymentConfig->get());
         $this->_deploymentConfig->resetData();
         // second time to ensure loader will be invoked only once after reset
@@ -179,9 +179,9 @@ public function testIsDbAvailable(): void
         $this->assertTrue($this->_deploymentConfig->isDbAvailable());
     }
 
-    public function testReloadDataOnMissingConfig(): void
+    public function testResetDataOnMissingConfig(): void
     {
-        $this->readerMock->expects($this->exactly(2))->method('load')->willReturn(self::$fixture);
+        $this->readerMock->expects($this->once())->method('load')->willReturn(self::$fixture);
         $defaultValue = 'some_default_value';
         $result = $this->_deploymentConfig->get('missing/key', $defaultValue);
         $this->assertEquals($defaultValue, $result);