MC-33278: [Magento Cloud] - Magento\Framework\App\DeploymentConfig\Reader::load function is taking too much time

Author: rostyslav-hymon

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/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;