Get rid of old container in DatabaseInterface

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index e8e64e53ca..1d3fd1f612 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\MoTranslator\Loader;
 use PhpMyAdmin\Theme;
@@ -79,7 +80,9 @@ define('PMA_MAJOR_VERSION', $GLOBALS['PMA_Config']->get('PMA_MAJOR_VERSION'));
 LanguageManager::getInstance()->getLanguage('en')->activate();
 
 /* Load Database interface */
-DatabaseInterface::load();
+$oldContainer = Container::getDefaultContainer();
+$oldContainer->set(DatabaseInterface::class, DatabaseInterface::load());
+$oldContainer->alias('dbi', DatabaseInterface::class);
 
 // Set proxy information from env, if available
 $http_proxy = getenv('http_proxy');