Merge remote-tracking branch 'origin/MAGETWO-44635-Error-in-disabling-module' into PR_Branch

Author: Olga Kopylova

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

@@ -6,6 +6,8 @@
 
 namespace Magento\Framework\App;
 
+use Magento\Framework\Config\ConfigOptionsListConstants;
+
 /**
  * Application deployment configuration
  */
@@ -39,13 +41,6 @@ class DeploymentConfig
      */
     private $overrideData;
 
-    /**
-     * Availability of deployment config file
-     *
-     * @var bool
-     */
-    private $isAvailable;
-
     /**
      * Constructor
      *
@@ -65,7 +60,7 @@ public function __construct(DeploymentConfig\Reader $reader, $overrideData = [])
      *
      * @param string $key
      * @param mixed $defaultValue
-     * @return array|null
+     * @return mixed|null
      */
     public function get($key = null, $defaultValue = null)
     {
@@ -85,7 +80,7 @@ public function isAvailable()
     {
         $this->data = null;
         $this->load();
-        return $this->isAvailable;
+        return isset($this->flatData[ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE]);
     }
 
     /**
@@ -128,7 +123,6 @@ private function load()
     {
         if (null === $this->data) {
             $this->data = $this->reader->load();
-            $this->isAvailable = !empty($this->data);
             if ($this->overrideData) {
                 $this->data = array_replace($this->data, $this->overrideData);
             }

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

@@ -7,6 +7,7 @@
 namespace Magento\Framework\App\Test\Unit;
 
 use \Magento\Framework\App\DeploymentConfig;
+use \Magento\Framework\Config\ConfigOptionsListConstants;
 
 class DeploymentConfigTest extends \PHPUnit_Framework_TestCase
 {
@@ -88,7 +89,9 @@ public function testGetters()
 
     public function testIsAvailable()
     {
-        $this->reader->expects($this->once())->method('load')->willReturn(['a' => 1]);
+        $this->reader->expects($this->once())->method('load')->willReturn([
+            ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE => 1
+        ]);
         $object = new DeploymentConfig($this->reader);
         $this->assertTrue($object->isAvailable());
     }
@@ -103,7 +106,9 @@ public function testNotAvailable()
     public function testNotAvailableThenAvailable()
     {
         $this->reader->expects($this->at(0))->method('load')->willReturn([]);
-        $this->reader->expects($this->at(1))->method('load')->willReturn(['a' => 1]);
+        $this->reader->expects($this->at(1))->method('load')->willReturn([
+            ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE => 1
+        ]);
         $object = new DeploymentConfig($this->reader);
         $this->assertFalse($object->isAvailable());
         $this->assertTrue($object->isAvailable());

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

@@ -139,7 +139,7 @@ public function isModuleInfoAvailable()
      */
     private function loadConfigData()
     {
-        if (null === $this->configData && ($this->config->isAvailable())) {
+        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

@@ -47,7 +47,6 @@ protected function setUp()
 
     public function testGetAll()
     {
-        $this->config->expects($this->once())->method('isAvailable')->willReturn(true);
         $this->setLoadAllExpectation();
         $this->setLoadConfigExpectation();
         $expected = ['foo' => self::$allFixture['foo']];
@@ -58,15 +57,13 @@ public function testGetAll()
     public function testGetAllNoData()
     {
         $this->loader->expects($this->exactly(2))->method('load')->willReturn([]);
-        $this->config->expects($this->never())->method('isAvailable');
         $this->setLoadConfigExpectation(false);
         $this->assertEquals([], $this->model->getAll());
         $this->assertEquals([], $this->model->getAll());
     }
 
     public function testGetOne()
     {
-        $this->config->expects($this->once())->method('isAvailable')->willReturn(true);
         $this->setLoadAllExpectation();
         $this->setLoadConfigExpectation();
         $this->assertSame(['key' => 'value'], $this->model->getOne('foo'));
@@ -75,7 +72,6 @@ public function testGetOne()
 
     public function testGetNames()
     {
-        $this->config->expects($this->once())->method('isAvailable')->willReturn(true);
         $this->setLoadAllExpectation(false);
         $this->setLoadConfigExpectation();
         $this->assertSame(['foo'], $this->model->getNames());
@@ -84,7 +80,6 @@ public function testGetNames()
 
     public function testHas()
     {
-        $this->config->expects($this->once())->method('isAvailable')->willReturn(true);
         $this->setLoadAllExpectation(false);
         $this->setLoadConfigExpectation();
         $this->assertTrue($this->model->has('foo'));
@@ -93,15 +88,14 @@ public function testHas()
 
     public function testIsModuleInfoAvailable()
     {
-        $this->config->expects($this->once())->method('isAvailable')->willReturn(true);
         $this->setLoadConfigExpectation(true);
         $this->assertTrue($this->model->isModuleInfoAvailable());
     }
 
     public function testIsModuleInfoAvailableNoConfig()
     {
-        $this->config->expects($this->once())->method('isAvailable')->willReturn(true);
-        $this->config->expects($this->once())->method('get')->willReturn(null);
+        $this->config->expects($this->at(0))->method('get')->willReturn(['modules' => 'testModule']);
+        $this->config->expects($this->at(1))->method('get')->willReturn(null);
         $this->assertFalse($this->model->isModuleInfoAvailable());
     }
 
@@ -114,7 +108,7 @@ public function testIsModuleInfoAvailableNoConfig()
     private function setLoadConfigExpectation($isExpected = true)
     {
         if ($isExpected) {
-            $this->config->expects($this->once())->method('get')->willReturn(self::$enabledFixture);
+            $this->config->expects($this->exactly(2))->method('get')->willReturn(self::$enabledFixture);
         } else {
             $this->config->expects($this->never())->method('get');
         }