[4.0] Change com_config to services (#20620)

* Change com_templates to services

* Change com_config to services

* Fix front end editing of configuration

* Revert file

* cs

Author: laoneo

administrator/components/com_config/dispatcher.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The config service provider.
+ *
+ * @since  4.0.0
+ */
+return new class implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function register(Container $container)
+	{
+		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Config'));
+		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Config'));
+
+		$container->set(
+			ComponentInterface::class,
+			function (Container $container)
+			{
+				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+
+				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+
+				return $component;
+			}
+		);
+	}
+};

administrator/components/com_config/services/provider.php

@@ -49,7 +49,7 @@ public function save($key = null, $urlVar = null)
 		if ($document->getType() === 'json')
 		{
 			$app   = \JFactory::getApplication();
-			$model = $this->getModel();
+			$model = $this->getModel('Style', 'Administrator');
 			$table = $model->getTable();
 			$data  = $this->input->post->get('params', array(), 'array');
 			$checkin = property_exists($table, 'checked_out');
@@ -73,7 +73,7 @@ public function save($key = null, $urlVar = null)
 				return false;
 			}
 
-			\JForm::addFormPath(JPATH_ADMINISTRATOR . '/components/com_templates/models/forms');
+			\JForm::addFormPath(JPATH_ADMINISTRATOR . '/components/com_templates/forms');
 
 			// Validate the posted data.
 			// Sometimes the form needs some posted data, such as for plugins and modules.

administrator/components/com_templates/Controller/StyleController.php

@@ -80,7 +80,7 @@ public function save()
 		// Set FTP credentials, if given.
 		\JClientHelper::setCredentialsFromRequest('ftp');
 
-		$model = new \Joomla\Component\Config\Site\Model\ConfigModel;
+		$model = $this->getModel();
 
 		$form  = $model->getForm();
 		$data  = $this->app->input->post->get('jform', array(), 'array');
@@ -106,11 +106,10 @@ public function save()
 		$data = $return;
 
 		// Access backend com_config
-		\JLoader::registerPrefix('Config', JPATH_ADMINISTRATOR . '/components/com_config');
-		$saveClass = new \Joomla\Component\Config\Administrator\Controller\ApplicationController;
+		$saveClass = $this->factory->createController('Application', 'Administrator');
 
 		// Get a document object
-		$document = \JFactory::getDocument();
+		$document = $this->app->getDocument();
 
 		// Set backend required params
 		$document->setType('json');

components/com_config/Controller/ConfigController.php

@@ -87,13 +87,10 @@ public function save()
 		$app = $this->app;
 
 		// Access backend com_templates
-		\JLoader::register('TemplatesControllerStyle', JPATH_ADMINISTRATOR . '/components/com_templates/controllers/style.php');
-		\JLoader::register('TemplatesModelStyle', JPATH_ADMINISTRATOR . '/components/com_templates/models/style.php');
-		\JLoader::register('TemplatesTableStyle', JPATH_ADMINISTRATOR . '/components/com_templates/tables/style.php');
-		$controllerClass = new StyleController;
+		$controllerClass = $app->bootComponent('com_templates')->createMVCFactory($app)->createController('Style', 'Administrator');
 
 		// Get a document object
-		$document = \JFactory::getDocument();
+		$document = $app->getDocument();
 
 		// Set backend required params
 		$document->setType('json');
@@ -123,8 +120,10 @@ public function save()
 		// Set the success message.
 		$message = \JText::_('COM_CONFIG_SAVE_SUCCESS');
 
+		$this->setMessage($message);
+
 		// Redirect back to com_config display
-		$app->redirect(\JRoute::_('index.php?option=com_config&view=templates', false), $message);
+		$this->redirect(\JRoute::_('index.php?option=com_config&view=templates', false));
 
 		return true;
 	}

components/com_config/Controller/TemplatesController.php

@@ -7,27 +7,19 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\Component\Config\Site\Dispatcher;
+
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Exception\NotAllowed;
-use Joomla\CMS\Dispatcher\Dispatcher;
 
 /**
  * Dispatcher class for com_config
  *
  * @since  4.0.0
  */
-class ConfigDispatcher extends Dispatcher
+class Dispatcher extends \Joomla\CMS\Dispatcher\Dispatcher
 {
-	/**
-	 * The extension namespace
-	 *
-	 * @var    string
-	 *
-	 * @since  4.0.0
-	 */
-	protected $namespace = 'Joomla\\Component\\Config';
-
 	/**
 	 * Method to check component access permission
 	 *

components/com_config/dispatcher.php renamed to components/com_config/Dispatcher/Dispatcher.php

@@ -9,8 +9,11 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+
 // Load tooltips behavior
 JHtml::_('behavior.formvalidator');
+HTMLHelper::_('script', 'com_config/config-default.js', ['relative' => true, 'version' => 'auto']);
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate"  data-cancel-task="config.cancel.component">