[4.0] Config service provider

libraries/src/Application/CliApplication.php

@@ -32,7 +32,7 @@
  */
 abstract class CliApplication extends AbstractApplication implements DispatcherAwareInterface, CMSApplicationInterface
 {
-	use Autoconfigurable, DispatcherAwareTrait, EventAware, IdentityAware, ContainerAwareTrait;
+	use DispatcherAwareTrait, EventAware, IdentityAware, ContainerAwareTrait;
 
 	/**
 	 * Output object
@@ -102,9 +102,6 @@ public function __construct(Input $input = null, Registry $config = null, CliOut
 		// Set the current directory.
 		$this->set('cwd', getcwd());
 
-		// Load the configuration object.
-		$this->loadConfiguration($this->fetchConfigurationData());
-
 		// Set up the environment
 		$this->input->set('format', 'cli');
 	}

libraries/src/Application/ConsoleApplication.php

@@ -30,7 +30,7 @@
  */
 class ConsoleApplication extends Application implements DispatcherAwareInterface, CMSApplicationInterface
 {
-	use Autoconfigurable, DispatcherAwareTrait, EventAware, IdentityAware, ContainerAwareTrait;
+	use DispatcherAwareTrait, EventAware, IdentityAware, ContainerAwareTrait;
 
 	/**
 	 * The application message queue.
@@ -80,9 +80,6 @@ public function __construct(Cli $input = null, Registry $config = null, Dispatch
 			$this->setDispatcher($dispatcher);
 		}
 
-		// Load the configuration object.
-		$this->loadConfiguration($this->fetchConfigurationData());
-
 		// Set the execution datetime and timestamp;
 		$this->set('execution.datetime', gmdate('Y-m-d H:i:s'));
 		$this->set('execution.timestamp', time());

libraries/src/Application/WebApplication.php

@@ -29,7 +29,7 @@
  */
 abstract class WebApplication extends AbstractWebApplication implements DispatcherAwareInterface
 {
-	use Autoconfigurable, DispatcherAwareTrait, EventAware, IdentityAware;
+	use DispatcherAwareTrait, EventAware, IdentityAware;
 
 	/**
 	 * The application document object.
@@ -81,9 +81,6 @@ public function __construct(Input $input = null, Registry $config = null, WebCli
 
 		parent::__construct($input, $config, $client, $response);
 
-		// Load the configuration object.
-		$this->loadConfiguration($this->fetchConfigurationData());
-
 		// Set the execution datetime and timestamp;
 		$this->set('execution.datetime', gmdate('Y-m-d H:i:s'));
 		$this->set('execution.timestamp', time());
@@ -422,4 +419,16 @@ protected function loadSystemUris($requestUri = null)
 			$this->set('uri.media.path', $this->get('uri.base.path') . 'media/');
 		}
 	}
+
+	/**
+	 * Retrieve the application configuration object.
+	 *
+	 * @return  Registry
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getConfig()
+	{
+		return $this->config;
+	}
 }

libraries/src/Factory.php

@@ -500,6 +500,7 @@ protected static function createContainer(): Container
 		$container = (new Container)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Application)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Authentication)
+			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Config)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Console)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Database)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Dispatcher)

libraries/src/Service/Provider/Application.php

@@ -49,7 +49,7 @@ public function register(Container $container)
 				'JApplicationAdministrator',
 				function (Container $container)
 				{
-					$app = new AdministratorApplication(null, null, null, $container);
+					$app = new AdministratorApplication(null, $container->get('config'), null, $container);
 
 					// The session service provider needs Factory::$application, set it if still null
 					if (Factory::$application === null)
@@ -71,7 +71,7 @@ function (Container $container)
 				'JApplicationSite',
 				function (Container $container)
 				{
-					$app = new SiteApplication(null, null, null, $container);
+					$app = new SiteApplication(null, $container->get('config'), null, $container);
 
 					// The session service provider needs Factory::$application, set it if still null
 					if (Factory::$application === null)
@@ -93,7 +93,7 @@ function (Container $container)
 				BaseConsoleApplication::class,
 				function (Container $container)
 				{
-					$app = new ConsoleApplication;
+					$app = new ConsoleApplication(null, $container->get('config'));
 
 					$dispatcher = $container->get('Joomla\Event\DispatcherInterface');
 

libraries/src/Service/Provider/Config.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Service\Provider;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Registry\Registry;
+
+/**
+ * Service provider for the application's config dependency
+ *
+ * @since  4.0
+ */
+class Config implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0
+	 */
+	public function register(Container $container)
+	{
+		$container->alias('config', 'JConfig')
+			->share(
+				'JConfig',
+				function (Container $container)
+				{
+					if (!file_exists(JPATH_CONFIGURATION . '/configuration.php'))
+					{
+						return [];
+					}
+
+					\JLoader::register('JConfig', JPATH_CONFIGURATION . '/configuration.php');
+
+					if (!class_exists('JConfig'))
+					{
+						throw new \RuntimeException('Configuration class does not exist.');
+					}
+
+					return new Registry(new \JConfig);
+				},
+				true
+			);
+	}
+}

libraries/src/Service/Provider/Database.php

@@ -43,7 +43,7 @@ public function register(Container $container)
 				DatabaseInterface::class,
 			function (Container $container)
 			{
-				$conf = \JFactory::getConfig();
+				$conf = $container->get('config');
 
 				$dbtype = $conf->get('dbtype');
 

libraries/src/Service/Provider/Session.php

@@ -51,7 +51,7 @@ public function register(Container $container)
 				'Joomla\Session\SessionInterface',
 				function (Container $container)
 				{
-					$config = Factory::getConfig();
+					$config = $container->get('config');
 					$app    = Factory::getApplication();
 
 					// Generate a session name.