From 2508528596a648d3349eac47a635a54bda187031 Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Thu, 16 Aug 2018 17:13:18 +0200
Subject: [PATCH] Move com_finder to services

---
 .../components/com_finder/dispatcher.php      | 29 -----------
 .../components/com_finder/finder.php          | 19 -------
 .../com_finder/services/provider.php          | 52 +++++++++++++++++++
 components/com_finder/dispatcher.php          | 29 -----------
 4 files changed, 52 insertions(+), 77 deletions(-)
 delete mode 100644 administrator/components/com_finder/dispatcher.php
 delete mode 100644 administrator/components/com_finder/finder.php
 create mode 100644 administrator/components/com_finder/services/provider.php
 delete mode 100644 components/com_finder/dispatcher.php

diff --git a/administrator/components/com_finder/dispatcher.php b/administrator/components/com_finder/dispatcher.php
deleted file mode 100644
index 305da8d0701fa..0000000000000
--- a/administrator/components/com_finder/dispatcher.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @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\Dispatcher;
-
-/**
- * Dispatcher class for com_finder
- *
- * @since  4.0.0
- */
-class FinderDispatcher extends Dispatcher
-{
-	/**
-	 * The extension namespace
-	 *
-	 * @var    string
-	 *
-	 * @since  4.0.0
-	 */
-	protected $namespace = 'Joomla\\Component\\Finder';
-}
diff --git a/administrator/components/com_finder/finder.php b/administrator/components/com_finder/finder.php
deleted file mode 100644
index c9773becdaf6c..0000000000000
--- a/administrator/components/com_finder/finder.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @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;
-
-if (!\JFactory::getUser()->authorise('core.manage', 'com_finder'))
-{
-	throw new \JAccessExceptionNotallowed(\JText::_('JERROR_ALERTNOAUTHOR'), 403);
-}
-
-$controller = \JControllerLegacy::getInstance('Finder');
-$controller->execute(\JFactory::getApplication()->input->get('task'));
-$controller->redirect();
diff --git a/administrator/components/com_finder/services/provider.php b/administrator/components/com_finder/services/provider.php
new file mode 100644
index 0000000000000..7011e9eb0d127
--- /dev/null
+++ b/administrator/components/com_finder/services/provider.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @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 finder 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\\Finder'));
+		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Finder'));
+		$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_finder/dispatcher.php b/components/com_finder/dispatcher.php
deleted file mode 100644
index 722639aa990c9..0000000000000
--- a/components/com_finder/dispatcher.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  com_finder
- *
- * @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\Dispatcher;
-
-/**
- * Dispatcher class for com_finder
- *
- * @since  4.0.0
- */
-class FinderDispatcher extends Dispatcher
-{
-	/**
-	 * The extension namespace
-	 *
-	 * @var    string
-	 *
-	 * @since  4.0.0
-	 */
-	protected $namespace = 'Joomla\\Component\\Finder';
-}