[4.0] Introduce router service

administrator/components/com_content/Extension/ContentComponent.php

@@ -16,30 +16,34 @@
 use Joomla\CMS\Association\AssociationServiceInterface;
 use Joomla\CMS\Categories\CategoryServiceInterface;
 use Joomla\CMS\Categories\CategoryServiceTrait;
+use Joomla\CMS\Component\Router\RouterServiceInterface;
+use Joomla\CMS\Component\Router\RouterServiceTrait;
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Fields\FieldsServiceInterface;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Workflow\WorkflowServiceInterface;
 use Joomla\CMS\Workflow\WorkflowServiceTrait;
 use Joomla\Component\Content\Administrator\Helper\ContentHelper;
 use Joomla\Component\Content\Administrator\Service\HTML\AdministratorService;
 use Joomla\Component\Content\Administrator\Service\HTML\Icon;
 use Psr\Container\ContainerInterface;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Factory;
 
 /**
  * Component class for com_content
  *
  * @since  __DEPLOY_VERSION__
  */
 class ContentComponent extends MVCComponent implements
-	BootableExtensionInterface, CategoryServiceInterface, FieldsServiceInterface, AssociationServiceInterface, WorkflowServiceInterface
+	BootableExtensionInterface, CategoryServiceInterface, FieldsServiceInterface, AssociationServiceInterface,
+	WorkflowServiceInterface, RouterServiceInterface
 {
 	use CategoryServiceTrait;
 	use AssociationServiceTrait;
+	use RouterServiceTrait;
 	use HTMLRegistryAwareTrait;
 	use WorkflowServiceTrait;
 

administrator/components/com_content/services/provider.php

@@ -11,11 +11,13 @@
 
 use Joomla\CMS\Association\AssociationExtensionInterface;
 use Joomla\CMS\Categories\CategoryFactoryInterface;
+use Joomla\CMS\Component\Router\RouterFactoryInterface;
 use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Extension\Service\Provider\CategoryFactory;
 use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
 use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\Extension\Service\Provider\RouterFactory;
 use Joomla\CMS\HTML\Registry;
 use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
@@ -46,6 +48,7 @@ public function register(Container $container)
 		$container->registerServiceProvider(new CategoryFactory('\\Joomla\\Component\\Content'));
 		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Content'));
 		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Content'));
+		$container->registerServiceProvider(new RouterFactory('\\Joomla\\Component\\Content'));
 
 		$container->set(
 			ComponentInterface::class,
@@ -57,6 +60,7 @@ function (Container $container)
 				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
 				$component->setCategoryFactory($container->get(CategoryFactoryInterface::class));
 				$component->setAssociationExtension($container->get(AssociationExtensionInterface::class));
+				$component->setRouterFactory($container->get(RouterFactoryInterface::class));
 
 				return $component;
 			}

administrator/components/com_finder/Extension/FinderComponent.php

@@ -11,6 +11,8 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Component\Router\RouterServiceInterface;
+use Joomla\CMS\Component\Router\RouterServiceTrait;
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
@@ -24,8 +26,9 @@
  *
  * @since  __DEPLOY_VERSION__
  */
-class FinderComponent extends MVCComponent implements BootableExtensionInterface
+class FinderComponent extends MVCComponent implements BootableExtensionInterface, RouterServiceInterface
 {
+	use RouterServiceTrait;
 	use HTMLRegistryAwareTrait;
 
 	/**

administrator/components/com_finder/services/provider.php

@@ -9,10 +9,12 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\Router\RouterFactoryInterface;
 use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
 use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\Extension\Service\Provider\RouterFactory;
 use Joomla\CMS\HTML\Registry;
 use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
 use Joomla\Component\Finder\Administrator\Extension\FinderComponent;
@@ -39,13 +41,15 @@ public function register(Container $container)
 	{
 		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Finder'));
 		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Finder'));
+		$container->registerServiceProvider(new RouterFactory('\\Joomla\\Component\\Finder'));
 
 		$container->set(
 			ComponentInterface::class,
 			function (Container $container)
 			{
 				$component = new FinderComponent($container->get(DispatcherFactoryInterface::class));
 				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+				$component->setRouterFactory($container->get(RouterFactoryInterface::class));
 				$component->setRegistry($container->get(Registry::class));
 
 				return $component;

administrator/components/com_newsfeeds/Extension/NewsfeedsComponent.php

@@ -15,10 +15,11 @@
 use Joomla\CMS\Association\AssociationServiceInterface;
 use Joomla\CMS\Categories\CategoryServiceInterface;
 use Joomla\CMS\Categories\CategoryServiceTrait;
+use Joomla\CMS\Component\Router\RouterServiceInterface;
+use Joomla\CMS\Component\Router\RouterServiceTrait;
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
-use Joomla\CMS\MVC\Factory\MVCFactoryServiceInterface;
 use Joomla\Component\Newsfeeds\Administrator\Service\HTML\AdministratorService;
 use Psr\Container\ContainerInterface;
 
@@ -28,11 +29,12 @@
  * @since  __DEPLOY_VERSION__
  */
 class NewsfeedsComponent extends MVCComponent implements
-	BootableExtensionInterface, CategoryServiceInterface, AssociationServiceInterface
+	BootableExtensionInterface, CategoryServiceInterface, AssociationServiceInterface, RouterServiceInterface
 {
 	use CategoryServiceTrait;
 	use AssociationServiceTrait;
 	use HTMLRegistryAwareTrait;
+	use RouterServiceTrait;
 
 	/**
 	 * Booting the extension. This is the function to set up the environment of the extension like

administrator/components/com_newsfeeds/services/provider.php

@@ -11,11 +11,13 @@
 
 use Joomla\CMS\Association\AssociationExtensionInterface;
 use Joomla\CMS\Categories\CategoryFactoryInterface;
+use Joomla\CMS\Component\Router\RouterFactoryInterface;
 use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Extension\Service\Provider\CategoryFactory;
 use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
 use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\Extension\Service\Provider\RouterFactory;
 use Joomla\CMS\HTML\Registry;
 use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
 use Joomla\Component\Newsfeeds\Administrator\Extension\NewsfeedsComponent;
@@ -46,6 +48,7 @@ public function register(Container $container)
 		$container->registerServiceProvider(new CategoryFactory('\\Joomla\\Component\\Newsfeeds'));
 		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Newsfeeds'));
 		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Newsfeeds'));
+		$container->registerServiceProvider(new RouterFactory('\\Joomla\\Component\\Newsfeeds'));
 
 		$container->set(
 			ComponentInterface::class,
@@ -57,6 +60,7 @@ function (Container $container)
 				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
 				$component->setCategoryFactory($container->get(CategoryFactoryInterface::class));
 				$component->setAssociationExtension($container->get(AssociationExtensionInterface::class));
+				$component->setRouterFactory($container->get(RouterFactoryInterface::class));
 
 				return $component;
 			}

administrator/components/com_users/Extension/UsersComponent.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @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\Users\Administrator\Extension;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\Router\RouterServiceInterface;
+use Joomla\CMS\Component\Router\RouterServiceTrait;
+use Joomla\CMS\Extension\MVCComponent;
+
+/**
+ * Component class for com_users
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class UsersComponent extends MVCComponent implements RouterServiceInterface
+{
+	use RouterServiceTrait;
+}

administrator/components/com_users/services/provider.php

@@ -9,12 +9,14 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\Router\RouterFactoryInterface;
 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\Extension\Service\Provider\RouterFactory;
 use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
+use Joomla\Component\Users\Administrator\Extension\UsersComponent;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 
@@ -38,12 +40,15 @@ public function register(Container $container)
 	{
 		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Users'));
 		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Users'));
+		$container->registerServiceProvider(new RouterFactory('\\Joomla\\Component\\Users'));
+
 		$container->set(
 			ComponentInterface::class,
 			function (Container $container)
 			{
-				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+				$component = new UsersComponent($container->get(DispatcherFactoryInterface::class));
 				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+				$component->setRouterFactory($container->get(RouterFactoryInterface::class));
 
 				return $component;
 			}

components/com_contact/router.php → components/com_contact/Service/Router.php

@@ -7,36 +7,61 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\Component\Contact\Site\Service;
+
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Application\SiteApplication;
+use Joomla\CMS\Categories\CategoryFactoryInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Component\Router\RouterView;
 use Joomla\CMS\Component\Router\RouterViewConfiguration;
 use Joomla\CMS\Component\Router\Rules\MenuRules;
 use Joomla\CMS\Component\Router\Rules\NomenuRules;
 use Joomla\CMS\Component\Router\Rules\StandardRules;
 use Joomla\CMS\Menu\AbstractMenu;
-use Joomla\CMS\Categories\Categories;
-use Joomla\CMS\Factory;
+use Joomla\Database\DatabaseInterface;
 
 /**
  * Routing class from com_contact
  *
  * @since  3.3
  */
-class ContactRouter extends RouterView
+class Router extends RouterView
 {
 	protected $noIDs = false;
 
 	/**
-	 * Search Component router constructor
+	 * The category factory
+	 *
+	 * @var CategoryFactoryInterface
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $categoryFactory;
+
+	/**
+	 * The db
 	 *
-	 * @param   CMSApplication  $app   The application object
-	 * @param   AbstractMenu    $menu  The menu object to work with
+	 * @var DatabaseInterface
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $db;
+
+	/**
+	 * Content Component router constructor
+	 *
+	 * @param   SiteApplication           $app              The application object
+	 * @param   AbstractMenu              $menu             The menu object to work with
+	 * @param   CategoryFactoryInterface  $categoryFactory  The category object
+	 * @param   DatabaseInterface         $db               The database object
 	 */
-	public function __construct($app = null, $menu = null)
+	public function __construct(SiteApplication $app, AbstractMenu $menu, CategoryFactoryInterface $categoryFactory, DatabaseInterface $db)
 	{
+		$this->categoryFactory = $categoryFactory;
+		$this->db              = $db;
+
 		$params = ComponentHelper::getParams('com_contact');
 		$this->noIDs = (bool) $params->get('sef_ids');
 		$categories = new RouterViewConfiguration('categories');
@@ -67,7 +92,7 @@ public function __construct($app = null, $menu = null)
 	 */
 	public function getCategorySegment($id, $query)
 	{
-		$category = Categories::getInstance($this->getName())->get($id);
+		$category = $this->categoryFactory->createCategory()->get($id);
 
 		if ($category)
 		{
@@ -113,14 +138,13 @@ public function getContactSegment($id, $query)
 	{
 		if (!strpos($id, ':'))
 		{
-			$db = Factory::getDbo();
-			$dbquery = $db->getQuery(true);
+			$dbquery = $this->db->getQuery(true);
 			$dbquery->select($dbquery->quoteName('alias'))
 				->from($dbquery->quoteName('#__contact_details'))
 				->where('id = ' . $dbquery->quote((int) $id));
-			$db->setQuery($dbquery);
+			$this->db->setQuery($dbquery);
 
-			$id .= ':' . $db->loadResult();
+			$id .= ':' . $this->db->loadResult();
 		}
 
 		if ($this->noIDs)
@@ -145,7 +169,7 @@ public function getCategoryId($segment, $query)
 	{
 		if (isset($query['id']))
 		{
-			$category = Categories::getInstance($this->getName(), array('access' => false))->get($query['id']);
+			$category = $this->categoryFactory->createCategory(['access' => false])->get($query['id']);
 
 			if ($category)
 			{
@@ -197,15 +221,14 @@ public function getContactId($segment, $query)
 	{
 		if ($this->noIDs)
 		{
-			$db = Factory::getDbo();
-			$dbquery = $db->getQuery(true);
+			$dbquery = $this->db->getQuery(true);
 			$dbquery->select($dbquery->quoteName('id'))
 				->from($dbquery->quoteName('#__contact_details'))
 				->where('alias = ' . $dbquery->quote($segment))
 				->where('catid = ' . $dbquery->quote($query['id']));
-			$db->setQuery($dbquery);
+			$this->db->setQuery($dbquery);
 
-			return (int) $db->loadResult();
+			return (int) $this->db->loadResult();
 		}
 
 		return (int) $segment;