From 9eb8e99bcce80486b413c4896b6b884471fdde11 Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Mon, 6 Aug 2018 15:31:31 +0200
Subject: [PATCH] Change content history to services

---
 .../Dispatcher.php}                           | 18 +++----
 .../helpers/contenthistory.php                |  4 +-
 .../com_contenthistory/services/provider.php  | 54 +++++++++++++++++++
 .../Controller/DisplayController.php          | 41 ++++++++++++++
 .../Dispatcher.php}                           | 22 ++++----
 5 files changed, 113 insertions(+), 26 deletions(-)
 rename administrator/components/com_contenthistory/{dispatcher.php => Dispatcher/Dispatcher.php} (72%)
 create mode 100644 administrator/components/com_contenthistory/services/provider.php
 create mode 100644 components/com_contenthistory/Controller/DisplayController.php
 rename components/com_contenthistory/{dispatcher.php => Dispatcher/Dispatcher.php} (81%)

diff --git a/administrator/components/com_contenthistory/dispatcher.php b/administrator/components/com_contenthistory/Dispatcher/Dispatcher.php
similarity index 72%
rename from administrator/components/com_contenthistory/dispatcher.php
rename to administrator/components/com_contenthistory/Dispatcher/Dispatcher.php
index eb87c19b77983..ea633b86b3255 100644
--- a/administrator/components/com_contenthistory/dispatcher.php
+++ b/administrator/components/com_contenthistory/Dispatcher/Dispatcher.php
@@ -7,33 +7,27 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\Component\Contenthistory\Administrator\Dispatcher;
+
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Exception\Notallowed;
-use Joomla\CMS\Dispatcher\Dispatcher;
 
 /**
- * Dispatcher class for com_contenthistory
+ * Dispatcher class for com_associations
  *
  * @since  4.0.0
  */
-class ContenthistoryDispatcher extends Dispatcher
+class Dispatcher extends \Joomla\CMS\Dispatcher\Dispatcher
 {
-	/**
-	 * The extension namespace
-	 *
-	 * @var    string
-	 *
-	 * @since  4.0.0
-	 */
-	protected $namespace = 'Joomla\\Component\\Contenthistory';
-
 	/**
 	 * Method to check component access permission
 	 *
 	 * @since   4.0.0
 	 *
 	 * @return  void
+	 *
+	 * @throws  \Exception|Notallowed
 	 */
 	protected function checkAccess()
 	{
diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php
index a276a7206cb83..c738d556824ea 100644
--- a/administrator/components/com_contenthistory/helpers/contenthistory.php
+++ b/administrator/components/com_contenthistory/helpers/contenthistory.php
@@ -12,7 +12,9 @@
 /**
  * Categories helper.
  *
- * @since  3.2
+ * @since       3.2
+ *
+ * @deprecated  5.0 Use \Joomla\Component\Contenthistory\Administrator\Helper\ContenthistoryHelper instead
  */
 class ContenthistoryHelper extends \Joomla\Component\Contenthistory\Administrator\Helper\ContenthistoryHelper
 {
diff --git a/administrator/components/com_contenthistory/services/provider.php b/administrator/components/com_contenthistory/services/provider.php
new file mode 100644
index 0000000000000..12202354091e9
--- /dev/null
+++ b/administrator/components/com_contenthistory/services/provider.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @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 content history 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\\Contenthistory'));
+		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Contenthistory'));
+
+		$container->set(
+			ComponentInterface::class,
+			function (Container $container)
+			{
+				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+
+				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+
+				return $component;
+			}
+		);
+	}
+};
diff --git a/components/com_contenthistory/Controller/DisplayController.php b/components/com_contenthistory/Controller/DisplayController.php
new file mode 100644
index 0000000000000..71d9d39f4b826
--- /dev/null
+++ b/components/com_contenthistory/Controller/DisplayController.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\Component\Contenthistory\Site\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+
+/**
+ * History manager master display controller.
+ *
+ * @since  4.0
+ */
+class DisplayController extends BaseController
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array                $config   An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 * @param   MVCFactoryInterface  $factory  The factory.
+	 * @param   CMSApplication       $app      The JApplication for the dispatcher
+	 * @param   \JInput              $input    Input
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null)
+	{
+		$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+
+		parent::__construct($config, $factory, $app, $input);
+	}
+}
diff --git a/components/com_contenthistory/dispatcher.php b/components/com_contenthistory/Dispatcher/Dispatcher.php
similarity index 81%
rename from components/com_contenthistory/dispatcher.php
rename to components/com_contenthistory/Dispatcher/Dispatcher.php
index 096772649b6c3..52601d5a539d9 100644
--- a/components/com_contenthistory/dispatcher.php
+++ b/components/com_contenthistory/Dispatcher/Dispatcher.php
@@ -1,34 +1,26 @@
 <?php
 /**
- * @package     Joomla.Administrator
+ * @package     Joomla.Site
  * @subpackage  com_contenthistory
  *
  * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\Component\Contenthistory\Site\Dispatcher;
+
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Access\Exception\Notallowed;
+use Joomla\CMS\Access\Exception\NotAllowed;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Dispatcher\Dispatcher;
 
 /**
  * Dispatcher class for com_contenthistory
  *
  * @since  4.0.0
  */
-class ContenthistoryDispatcher extends Dispatcher
+class Dispatcher extends \Joomla\CMS\Dispatcher\Dispatcher
 {
-	/**
-	 * The extension namespace
-	 *
-	 * @var    string
-	 *
-	 * @since  4.0.0
-	 */
-	protected $namespace = 'Joomla\\Component\\Contenthistory';
-
 	/**
 	 * Load the language
 	 *
@@ -49,9 +41,12 @@ protected function loadLanguage()
 	 * @since   4.0.0
 	 *
 	 * @return  void
+	 *
+	 * @throws  \Exception|Notallowed
 	 */
 	protected function checkAccess()
 	{
+		// Check the user has permission to access this component if in the backend
 		if ($this->app->getIdentity()->guest)
 		{
 			throw new Notallowed($this->app->getLanguage()->_('JERROR_ALERTNOAUTHOR'), 403);
@@ -72,6 +67,7 @@ protected function checkAccess()
 	public function getController(string $name, string $client = '', array $config = array()): BaseController
 	{
 		$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		$client = 'Administrator';
 
 		return parent::getController($name, $client, $config);
 	}