diff --git a/installation/src/Service/Provider/Application.php b/installation/src/Service/Provider/Application.php index b411045f24dfd..4bef9b40a98a5 100644 --- a/installation/src/Service/Provider/Application.php +++ b/installation/src/Service/Provider/Application.php @@ -41,15 +41,7 @@ public function register(Container $container) InstallationApplication::class, function (Container $container) { - $config = null; - - // Load the global configuration file if available - if (file_exists(JPATH_CONFIGURATION . '/configuration.php')) - { - $config = Factory::getConfig(); - } - - $app = new InstallationApplication(null, $config, null, $container); + $app = new InstallationApplication(null, $container->get('config'), null, $container); // The session service provider needs JFactory::$application, set it if still null if (Factory::$application === null) diff --git a/libraries/src/Service/Provider/Config.php b/libraries/src/Service/Provider/Config.php index e8e51050cb999..dc75e3d1a9cef 100644 --- a/libraries/src/Service/Provider/Config.php +++ b/libraries/src/Service/Provider/Config.php @@ -39,7 +39,7 @@ function (Container $container) { if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')) { - return []; + return new Registry; } \JLoader::register('JConfig', JPATH_CONFIGURATION . '/configuration.php');