MAGETWO-33519: [GITHUB] php index.php update - Class Magento\Store\Model\StoreManagerInterface does not exist #1014

- Fixes based on CR comments

Author: mazhalai

dev/tests/unit/testsuite/Magento/Setup/Model/InstallerTest.php

@@ -315,9 +315,9 @@ public function testCheckApplicationFilePermissions()
     public function testUpdateModulesSequence()
     {
         $varDir = $this->getMockForAbstractClass('Magento\Framework\Filesystem\Directory\WriteInterface');
-        $varDir->expects($this->once())->method('getAbsolutePath')->willReturn('/var');
+        $varDir->expects($this->exactly(2))->method('getAbsolutePath')->willReturn('/var');
         $this->filesystem
-            ->expects($this->once())
+            ->expects($this->exactly(2))
             ->method('getDirectoryWrite')
             ->willReturn($varDir);
 
@@ -345,7 +345,7 @@ public function testUpdateModulesSequence()
         $this->logger->expects($this->at(0))->method('log')->with('File system cleanup:');
         $this->logger->expects($this->at(1))->method('log')
             ->with('The directory \'/var\' doesn\'t exist - skipping cleanup');
-        $this->logger->expects($this->at(2))->method('log')->with('Updating modules:');
+        $this->logger->expects($this->at(3))->method('log')->with('Updating modules:');
         $newObject->updateModulesSequence();
     }
 

setup/src/Magento/Setup/Model/Installer.php

@@ -816,7 +816,8 @@ public function updateModulesSequence()
     {
         $this->assertDeploymentConfigExists();
         $this->log->log('File system cleanup:');
-        $this->deleteDirContents(DirectoryList::VAR_DIR);
+        $this->deleteDirContents(DirectoryList::GENERATION);
+        $this->deleteDirContents(DirectoryList::CACHE);
         $this->log->log('Updating modules:');
         $allModules = array_keys($this->moduleLoader->load());
         $deploymentConfig = $this->deploymentConfigReader->load();