Merge branch 'ACP2E-2198' of https://github.com/magento-l3/magento2ce into PR-L3-2023-07-14

Author: vkolesny

dev/tests/integration/testsuite/Magento/GraphQl/_files/state-skip-list.php

@@ -34,7 +34,24 @@
         // memory leak, wrong sql, potential issues
         Magento\Framework\Event\Config\Data::class => null,
         Magento\Framework\App\AreaList::class => null,
+        Magento\Framework\App\DeploymentConfig::class => null,
+        Magento\Theme\Model\View\Design::class => null,
+        Magento\Framework\App\Cache\Frontend\Pool::class => null,
+        Magento\Framework\App\Cache\Type\FrontendPool::class => null,
+        Magento\Framework\App\DeploymentConfig\Writer::class => null,
+        Magento\Framework\App\Cache\State::class => null,
+        Magento\Framework\Module\ModuleList::class => null,
+        Magento\RemoteStorage\Model\Config::class => null,
+        Magento\Store\Model\Config\Processor\Fallback::class => null,
+        Magento\Framework\Lock\LockBackendFactory::class => null,
         'customRemoteFilesystem' => null,
+        'systemConfigQueryLocker' => null,
+        Magento\Framework\View\Design\FileResolution\Fallback\TemplateFile::class => null,
+        Magento\Config\App\Config\Source\RuntimeConfigSource::class => null,
+        'scopesConfigInitialDataProvider' => null,
+        Magento\Developer\Model\Logger\Handler\Debug::class => null,
+        Magento\Developer\Model\Logger\Handler\Syslog::class => null,
+        Magento\Store\App\Config\Source\RuntimeConfigSource::class => null,
         Magento\Store\App\Config\Type\Scopes::class => null,
         Magento\Framework\Module\Dir\Reader::class => null,
         Magento\Framework\Module\PackageInfo::class => null,

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

@@ -61,6 +61,11 @@ class DeploymentConfig
      */
     private $readerLoad = [];
 
+    /**
+     * @var array
+     */
+    private $noConfigData = [];
+
     /**
      * Constructor
      *
@@ -94,9 +99,17 @@ public function get($key = null, $defaultValue = null)
         }
         $result = $this->getByKey($key);
         if ($result === null) {
-            if (empty($this->flatData) || count($this->getAllEnvOverrides())) {
+            if (empty($this->flatData)
+                || !isset($this->flatData[$key]) && !isset($this->noConfigData[$key])
+                || count($this->getAllEnvOverrides())
+            ) {
+                $this->resetData();
                 $this->reloadData();
             }
+
+            if (!isset($this->flatData[$key])) {
+                $this->noConfigData[$key] = $key;
+            }
             $result = $this->getByKey($key);
         }
         return $result ?? $defaultValue;

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

@@ -300,4 +300,34 @@ public function testEnvVariablesSubstitution(): void
         $this->assertSame('D', $this->deploymentConfig->get('b'), 'return value from env');
         $this->assertSame('e$%^&', $this->deploymentConfig->get('c'), 'return default value');
     }
+
+    /**
+     * @return void
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    public function testReloadDataOnMissingConfig(): void
+    {
+        $this->readerMock->expects($this->exactly(2))
+            ->method('load')
+            ->willReturnOnConsecutiveCalls(
+                ['db' => ['connection' => ['default' => ['host' => 'localhost']]]],
+                [],
+                []
+            );
+        $connectionConfig1 = $this->deploymentConfig->get(
+            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS . '/' . 'default'
+        );
+        $this->assertArrayHasKey('host', $connectionConfig1);
+        $connectionConfig2 = $this->deploymentConfig->get(
+            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS . '/' . 'default'
+        );
+        $this->assertArrayHasKey('host', $connectionConfig2);
+        $result1 = $this->deploymentConfig->get('missing/key');
+        $this->assertNull($result1);
+        $result2 = $this->deploymentConfig->get('missing/key');
+        $this->assertNull($result2);
+        $result3 = $this->deploymentConfig->get('missing/key');
+        $this->assertNull($result3);
+    }
 }