Skip to content

Commit e0c0b6d

Browse files
committed
MAGETWO-52187: Magento re-install with minimum admin access breaks installation
- Backward Compatible Changes
1 parent bfef420 commit e0c0b6d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

setup/src/Magento/Setup/Controller/Install.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ private function importAdminUserForm()
273273
private function getDeploymentConfig()
274274
{
275275
if ($this->deploymentConfig === null) {
276-
$this->deploymentConfig = \Magento\Framework\App\ObjectManager::getInstance()
276+
$this->deploymentConfig = $this->installer->getObjectManagerProvider()->get()
277277
->get(\Magento\Framework\App\DeploymentConfig::class);
278278
}
279279
return $this->deploymentConfig;

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,16 @@ public function installDeploymentConfig($data)
476476
$this->objectManagerProvider->reset();
477477
}
478478

479+
/**
480+
* Get Object Manager Provider
481+
*
482+
* @return ObjectManagerProvider
483+
*/
484+
public function getObjectManagerProvider()
485+
{
486+
return $this->objectManagerProvider;
487+
}
488+
479489
/**
480490
* Set up setup_module table to register modules' versions, skip this process if it already exists
481491
*

0 commit comments

Comments
 (0)