From 828325e86ca2fa6b59225d32a275b1ea41170bb6 Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Mon, 19 Aug 2019 21:47:59 +0100
Subject: [PATCH] Move to new dispatcher concept

---
 .travis.yml                                   | 11 +---
 composer.json                                 |  5 +-
 .../Extension/WeblinksComponent.php           | 57 +++++++++++++++++++
 .../components/com_weblinks/dispatcher.php    | 29 ----------
 .../com_weblinks/services/provider.php        | 55 ++++++++++++++++++
 .../components/com_weblinks/weblinks.xml      |  1 +
 6 files changed, 118 insertions(+), 40 deletions(-)
 create mode 100644 src/administrator/components/com_weblinks/Extension/WeblinksComponent.php
 delete mode 100644 src/administrator/components/com_weblinks/dispatcher.php
 create mode 100644 src/administrator/components/com_weblinks/services/provider.php

diff --git a/.travis.yml b/.travis.yml
index 3f685bf..bd378b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,9 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
-    - php: 7.0
-      env: RUN_PHPCS="yes"
-      sudo: true
-      addons:
-        firefox: 'latest-esr'
-    - php: 7.1
     - php: 7.2
+      sudo: true
+      env: RUN_PHPCS="yes"
     - php: 7.3
 
 before_script:
@@ -50,5 +45,5 @@ script:
 # System tests (Codeception)
 - mv tests/acceptance.suite.dist.yml tests/acceptance.suite.yml
 - vendor/bin/robo run:tests --use-htaccess
-# Run phpcs on PHP 7.0 against weblinks source
+# Run phpcs on flagged php versions against weblinks source
 - if [[ $RUN_PHPCS == "yes" ]]; then vendor/bin/phpcs --report=full --extensions=php -p --standard=tests/joomla/build/phpcs/Joomla ./src; fi
diff --git a/composer.json b/composer.json
index ba46131..327f822 100644
--- a/composer.json
+++ b/composer.json
@@ -4,14 +4,13 @@
     "license"    : "GPL-2.0+",
     "config": {
         "platform": {
-            "php": "5.6.0"
+            "php": "7.2.0"
         }
     },
     "require"    : {
-        "php": ">=5.4"
+        "php": ">=7.2"
     },
     "require-dev": {
-        "php": ">=5.6",
         "codeception/codeception": "^3",
         "phpunit/phpunit": "^5.7.27",
         "joomla-projects/joomla-browser": "v3.9.0",
diff --git a/src/administrator/components/com_weblinks/Extension/WeblinksComponent.php b/src/administrator/components/com_weblinks/Extension/WeblinksComponent.php
new file mode 100644
index 0000000..1172396
--- /dev/null
+++ b/src/administrator/components/com_weblinks/Extension/WeblinksComponent.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Weblinks\Administrator\Extension;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Association\AssociationServiceInterface;
+use Joomla\CMS\Association\AssociationServiceTrait;
+use Joomla\CMS\Categories\CategoryServiceInterface;
+use Joomla\CMS\Categories\CategoryServiceTrait;
+use Joomla\CMS\Extension\MVCComponent;
+
+/**
+ * Component class for com_contact
+ *
+ * @since  4.0.0
+ */
+class WeblinksComponent extends MVCComponent implements CategoryServiceInterface, AssociationServiceInterface
+{
+	use CategoryServiceTrait;
+	use AssociationServiceTrait;
+
+	/**
+	 * Returns the table for the count items functions for the given section.
+	 *
+	 * @param   string  $section  The section
+	 *
+	 * @return  string|null
+	 *
+	 * @since   4.0.0
+	 */
+	protected function getTableNameForSection(string $section = null)
+	{
+		return ($section === 'category' ? 'categories' : 'weblinks');
+	}
+
+	/**
+	 * Returns the state column for the count items functions for the given section.
+	 *
+	 * @param   string  $section  The section
+	 *
+	 * @return  string|null
+	 *
+	 * @since   4.0.0
+	 */
+	protected function getStateColumnForSection(string $section = null)
+	{
+		return 'published';
+	}
+}
diff --git a/src/administrator/components/com_weblinks/dispatcher.php b/src/administrator/components/com_weblinks/dispatcher.php
deleted file mode 100644
index 1cf280b..0000000
--- a/src/administrator/components/com_weblinks/dispatcher.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 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_weblinks
- *
- * @since  __DEPLOY_VERSION__
- */
-class WeblinksDispatcher extends Dispatcher
-{
-	/**
-	 * The extension namespace
-	 *
-	 * @var    string
-	 *
-	 * @since  __DEPLOY_VERSION__
-	 */
-	protected $namespace = 'Joomla\\Component\\Weblinks';
-}
diff --git a/src/administrator/components/com_weblinks/services/provider.php b/src/administrator/components/com_weblinks/services/provider.php
new file mode 100644
index 0000000..da71ea9
--- /dev/null
+++ b/src/administrator/components/com_weblinks/services/provider.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2019 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\Categories\CategoryFactoryInterface;
+use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\Service\Provider\CategoryFactory;
+use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Component\Weblinks\Administrator\Extension\WeblinksComponent;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The banners 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 CategoryFactory('\\Joomla\\Component\\Weblinks'));
+        $container->registerServiceProvider(new MVCFactory('\\Joomla\\Component\\Weblinks'));
+        $container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Weblinks'));
+        $container->set(
+            ComponentInterface::class,
+            function (Container $container)
+            {
+                $component = new WeblinksComponent($container->get(ComponentDispatcherFactoryInterface::class));
+                $component->setMVCFactory($container->get(MVCFactoryInterface::class));
+                $component->setCategoryFactory($container->get(CategoryFactoryInterface::class));
+
+                return $component;
+            }
+        );
+    }
+};
diff --git a/src/administrator/components/com_weblinks/weblinks.xml b/src/administrator/components/com_weblinks/weblinks.xml
index dec3e4c..a872b1c 100644
--- a/src/administrator/components/com_weblinks/weblinks.xml
+++ b/src/administrator/components/com_weblinks/weblinks.xml
@@ -10,6 +10,7 @@
 	<version>##VERSION##</version>
 	<description>COM_WEBLINKS_XML_DESCRIPTION</description>
 	<scriptfile>script.php</scriptfile>
+	<namespace>Joomla\Component\Weblinks</namespace>
 
 	<install>
 		<sql>