Skip to content

Commit 97ad5bf

Browse files
committed
MAGETWO-33519: [GITHUB] php index.php update - Class Magento\Store\Model\StoreManagerInterface does not exist #1014
- clearing var folder before update
1 parent ec627da commit 97ad5bf

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,13 @@ public function testCheckApplicationFilePermissions()
314314

315315
public function testUpdateModulesSequence()
316316
{
317+
$varDir = $this->getMockForAbstractClass('Magento\Framework\Filesystem\Directory\WriteInterface');
318+
$varDir->expects($this->once())->method('getAbsolutePath')->willReturn('/var');
319+
$this->filesystem
320+
->expects($this->once())
321+
->method('getDirectoryWrite')
322+
->willReturn($varDir);
323+
317324
$allModules = [
318325
'Foo_One' => [],
319326
'Bar_Two' => [],
@@ -327,13 +334,18 @@ public function testUpdateModulesSequence()
327334
'New_Module' => 1
328335
];
329336

337+
$this->config->expects($this->atLeastOnce())->method('isAvailable')->willReturn(true);
330338
$this->deploymentConfigFactory->expects($this->once())->method('create')->with($expectedModules)
331339
->willReturn($this->deploymentConfig);
332340

333341
$newObject = $this->createObject(false, false);
334342
$this->configReader->expects($this->once())->method('load')
335343
->willReturn(['modules' => ['Bar_Two' => 0, 'Foo_One' => 1, 'Old_Module' => 0] ]);
336344
$this->configWriter->expects($this->once())->method('update')->with($this->deploymentConfig);
345+
$this->logger->expects($this->at(0))->method('log')->with('File system cleanup:');
346+
$this->logger->expects($this->at(1))->method('log')
347+
->with('The directory \'/var\' doesn\'t exist - skipping cleanup');
348+
$this->logger->expects($this->at(2))->method('log')->with('Updating modules:');
337349
$newObject->updateModulesSequence();
338350
}
339351

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,9 @@ public function installAdminUser($data)
815815
public function updateModulesSequence()
816816
{
817817
$this->assertDeploymentConfigExists();
818+
$this->log->log('File system cleanup:');
819+
$this->deleteDirContents(DirectoryList::VAR_DIR);
820+
$this->log->log('Updating modules:');
818821
$allModules = array_keys($this->moduleLoader->load());
819822
$deploymentConfig = $this->deploymentConfigReader->load();
820823
$currentModules = isset($deploymentConfig['modules']) ? $deploymentConfig['modules'] : [] ;

0 commit comments

Comments
 (0)