Merge remote-tracking branch 'origin/MC-33278' into 2.4-develop-pr22

Author: serhii-balko

dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php

@@ -139,7 +139,7 @@ public function testDebugInDeveloperMode()
     {
         $message = 'test message';
         $this->reinitDebugHandler(State::MODE_DEVELOPER);
-
+        $this->deploymentConfig->resetData();
         $this->removeDebugLog();
         $this->logger->debug($message);
         $this->assertFileExists($this->getDebuggerLogPath());

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

@@ -15,6 +15,7 @@
  * Application deployment configuration
  *
  * @api
+ * @since 100.0.2
  */
 class DeploymentConfig
 {
@@ -148,7 +149,7 @@ public function isDbAvailable()
      */
     private function load()
     {
-        if (null === $this->data) {
+        if (empty($this->data)) {
             $this->data = $this->reader->load();
             if ($this->overrideData) {
                 $this->data = array_replace($this->data, $this->overrideData);
@@ -183,6 +184,7 @@ private function flattenParams(array $params, $path = null, array &$flattenResul
                 $newPath = $key;
             }
             if (isset($flattenResult[$newPath])) {
+                //phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new RuntimeException(new Phrase("Key collision '%1' is already defined.", [$newPath]));
             }
             $flattenResult[$newPath] = $param;

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

@@ -6,10 +6,12 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\DeploymentConfig;
-use \Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class DeploymentConfigTest extends \PHPUnit\Framework\TestCase
+class DeploymentConfigTest extends TestCase
 {
     /**
      * @var array
@@ -63,7 +65,7 @@ class DeploymentConfigTest extends \PHPUnit\Framework\TestCase
     protected $_deploymentConfigMerged;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $reader;
 
@@ -124,7 +126,7 @@ public function testNotAvailable(): void
      */
     public function testNotAvailableThenAvailable(): void
     {
-        $this->reader->expects($this->once())->method('load')->willReturn([]);
+        $this->reader->expects($this->once())->method('load')->willReturn(['Test']);
         $object = new DeploymentConfig($this->reader);
         $this->assertFalse($object->isAvailable());
         $this->assertFalse($object->isAvailable());

lib/internal/Magento/Framework/Locale/Resolver.php

@@ -15,7 +15,7 @@
 class Resolver implements ResolverInterface
 {
     /**
-     * Default locale
+     * Resolver default locale
      */
     const DEFAULT_LOCALE = 'en_US';
 
@@ -79,7 +79,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->defaultLocalePath = $defaultLocalePath;
         $this->scopeType = $scopeType;
-        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->create(DeploymentConfig::class);
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->setLocale($locale);
     }
 

lib/internal/Magento/Framework/Module/ModuleList.php

@@ -140,11 +140,8 @@ public function isModuleInfoAvailable()
      */
     private function loadConfigData()
     {
-        if (null === $this->configData) {
-            $this->config->resetData();
-            if (null !== $this->config->get(ConfigOptionsListConstants::KEY_MODULES)) {
-                $this->configData = $this->config->get(ConfigOptionsListConstants::KEY_MODULES);
-            }
+        if (null === $this->configData && null !== $this->config->get(ConfigOptionsListConstants::KEY_MODULES)) {
+            $this->configData = $this->config->get(ConfigOptionsListConstants::KEY_MODULES);
         }
     }
 }

lib/internal/Magento/Framework/Module/Test/Unit/ModuleListTest.php

@@ -5,9 +5,14 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\ModuleList;
+use Magento\Framework\Module\ModuleList;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class ModuleListTest extends \PHPUnit\Framework\TestCase
+/**
+ * Test for module list
+ */
+class ModuleListTest extends TestCase
 {
     /**
      * Fixture for all modules' meta-information
@@ -24,12 +29,12 @@ class ModuleListTest extends \PHPUnit\Framework\TestCase
     private static $enabledFixture = ['foo' => 1, 'bar' => 0];
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $config;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $loader;
 
@@ -47,7 +52,6 @@ protected function setUp()
 
     public function testGetAll()
     {
-        $this->config->expects($this->once())->method('resetData');
         $this->setLoadAllExpectation();
         $this->setLoadConfigExpectation();
         $expected = ['foo' => self::$allFixture['foo']];
@@ -65,7 +69,6 @@ public function testGetAllNoData()
 
     public function testGetOne()
     {
-        $this->config->expects($this->once())->method('resetData');
         $this->setLoadAllExpectation();
         $this->setLoadConfigExpectation();
         $this->assertSame(['key' => 'value'], $this->model->getOne('foo'));
@@ -74,7 +77,6 @@ public function testGetOne()
 
     public function testGetNames()
     {
-        $this->config->expects($this->once())->method('resetData');
         $this->setLoadAllExpectation(false);
         $this->setLoadConfigExpectation();
         $this->assertSame(['foo'], $this->model->getNames());
@@ -83,7 +85,6 @@ public function testGetNames()
 
     public function testHas()
     {
-        $this->config->expects($this->once())->method('resetData');
         $this->setLoadAllExpectation(false);
         $this->setLoadConfigExpectation();
         $this->assertTrue($this->model->has('foo'));
@@ -92,7 +93,6 @@ public function testHas()
 
     public function testIsModuleInfoAvailable()
     {
-        $this->config->expects($this->once())->method('resetData');
         $this->setLoadConfigExpectation(true);
         $this->assertTrue($this->model->isModuleInfoAvailable());
     }