From 886b32cd0743364a754146de53061b7bc82bdae9 Mon Sep 17 00:00:00 2001
From: aB0t <robot@vdm.io>
Date: Thu, 15 Aug 2024 01:39:55 +0200
Subject: [PATCH] Release of v3.0.0

---
 componentbuilderfieldorderingtabs.xml         | 16 +++----
 forms/admin_view.xml                          |  4 +-
 ...ent_componentbuilderfieldorderingtabs.ini} |  2 +-
 ...componentbuilderfieldorderingtabs.sys.ini} |  2 +-
 script.php                                    |  2 +-
 {fields => services}/index.html               |  0
 services/provider.php                         | 48 +++++++++++++++++++
 .../ComponentbuilderFieldOrderingTabs.php     | 14 +++---
 {rules => src/Extension}/index.html           |  0
 src/Field/index.html                          |  1 +
 src/Rule/index.html                           |  1 +
 11 files changed, 71 insertions(+), 19 deletions(-)
 rename language/en-GB/{en-GB.plg_content_componentbuilderfieldorderingtabs.ini => plg_content_componentbuilderfieldorderingtabs.ini} (97%)
 rename language/en-GB/{en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini => plg_content_componentbuilderfieldorderingtabs.sys.ini} (97%)
 rename {fields => services}/index.html (100%)
 create mode 100644 services/provider.php
 rename componentbuilderfieldorderingtabs.php => src/Extension/ComponentbuilderFieldOrderingTabs.php (80%)
 rename {rules => src/Extension}/index.html (100%)
 create mode 100644 src/Field/index.html
 create mode 100644 src/Rule/index.html

diff --git a/componentbuilderfieldorderingtabs.xml b/componentbuilderfieldorderingtabs.xml
index 3f97dcc..7a27704 100644
--- a/componentbuilderfieldorderingtabs.xml
+++ b/componentbuilderfieldorderingtabs.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="4.0" group="content" method="upgrade">
 	<name>PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS</name>
-	<creationDate>27th July, 2024</creationDate>
+	<creationDate>14th August, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.0.0</version>
+	<version>3.0.0</version>
+	<namespace path="src">VDM\Plugin\Content\ComponentbuilderFieldOrderingTabs</namespace>
 	<description>PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
@@ -15,17 +16,16 @@
 
 	<!-- Language files -->
 	<languages folder="language">
-		<language tag="en-GB">en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.ini</language>
-		<language tag="en-GB">en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini</language>
+		<language tag="en-GB">en-GB/plg_content_componentbuilderfieldorderingtabs.ini</language>
+		<language tag="en-GB">en-GB/plg_content_componentbuilderfieldorderingtabs.sys.ini</language>
 	</languages>
 
 	<!-- Plugin files -->
 	<files>
-		<filename plugin="componentbuilderfieldorderingtabs">componentbuilderfieldorderingtabs.php</filename>
+		<folder plugin="componentbuilderfieldorderingtabs">services</folder>
 		<filename>index.html</filename>
-		<folder>language</folder>
-		<folder>fields</folder>
 		<folder>forms</folder>
-		<folder>rules</folder>
+		<folder>services</folder>
+		<folder>src</folder>
 	</files>
 </extension>
\ No newline at end of file
diff --git a/forms/admin_view.xml b/forms/admin_view.xml
index b7097ea..27397a3 100644
--- a/forms/admin_view.xml
+++ b/forms/admin_view.xml
@@ -4,8 +4,8 @@
 	<fields name="params">
 	<!-- default paths of fieldordering fieldset points to the plugin -->
 	<fieldset name="fieldordering" label="PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_FIELD_ORDERING"
-		addrulepath="/plugins/content/componentbuilderfieldorderingtabs/rules"
-		addfieldpath="/plugins/content/componentbuilderfieldorderingtabs/fields"
+		addrulepath="VDM\Plugin\Content\componentbuilderfieldorderingtabs\Rule"
+		addfieldpath="VDM\Plugin\Content\componentbuilderfieldorderingtabs\Field"
 	>
 	<fields name="fieldordering">
 		<!-- Add_admin_ordering Field. Type: Radio. (joomla) -->
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.ini b/language/en-GB/plg_content_componentbuilderfieldorderingtabs.ini
similarity index 97%
rename from language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.ini
rename to language/en-GB/plg_content_componentbuilderfieldorderingtabs.ini
index 8f6789a..d16bc39 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.ini
+++ b/language/en-GB/plg_content_componentbuilderfieldorderingtabs.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS="Content - Componentbuilder Field Ordering Tabs"
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_DESCRIPTION="This plugin is used to set custom ordering to fields in the JCB list views."
-PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Field Ordering Tabs (v.2.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set custom ordering to fields in the JCB list views.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Field Ordering Tabs (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set custom ordering to fields in the JCB list views.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_FIELD_ORDERING="Field Ordering"
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ADD_ADMIN_ORDERING_LABEL="Add Admin List View Ordering"
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ADD_ADMIN_ORDERING_DESCRIPTION="Select the ordering behavior, default is by id, and custom lets you select."
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini b/language/en-GB/plg_content_componentbuilderfieldorderingtabs.sys.ini
similarity index 97%
rename from language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini
rename to language/en-GB/plg_content_componentbuilderfieldorderingtabs.sys.ini
index 8f6789a..d16bc39 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderfieldorderingtabs.sys.ini
+++ b/language/en-GB/plg_content_componentbuilderfieldorderingtabs.sys.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS="Content - Componentbuilder Field Ordering Tabs"
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_DESCRIPTION="This plugin is used to set custom ordering to fields in the JCB list views."
-PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Field Ordering Tabs (v.2.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set custom ordering to fields in the JCB list views.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Field Ordering Tabs (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set custom ordering to fields in the JCB list views.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_FIELD_ORDERING="Field Ordering"
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ADD_ADMIN_ORDERING_LABEL="Add Admin List View Ordering"
 PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ADD_ADMIN_ORDERING_DESCRIPTION="Select the ordering behavior, default is by id, and custom lets you select."
diff --git a/script.php b/script.php
index fd473b0..5afdea5 100644
--- a/script.php
+++ b/script.php
@@ -20,7 +20,7 @@ use Joomla\CMS\Filesystem\Folder;
 /**
  * Content - Componentbuilder Field Ordering Tabs script file.
  *
- * @package PlgContentComponentbuilderFieldOrderingTabs
+ * @package ComponentbuilderFieldOrderingTabs
  */
 class plgContentComponentbuilderFieldOrderingTabsInstallerScript
 {
diff --git a/fields/index.html b/services/index.html
similarity index 100%
rename from fields/index.html
rename to services/index.html
diff --git a/services/provider.php b/services/provider.php
new file mode 100644
index 0000000..c436c90
--- /dev/null
+++ b/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\DI\Container;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use VDM\Plugin\Content\ComponentbuilderFieldOrderingTabs\Extension\ComponentbuilderFieldOrderingTabs;
+
+return new class () implements ServiceProviderInterface {
+	/**
+	* Registers the service provider with a DI container.
+	*
+	* @param   Container  $container  The DI container.
+	*
+	* @return  void
+	* @since   4.3.0
+	*/
+	public function register(Container $container)
+	{
+		$container->set(
+			PluginInterface::class,
+			function (Container $container) {
+				$plugin = new ComponentbuilderFieldOrderingTabs(
+					$container->get(DispatcherInterface::class),
+					(array) PluginHelper::getPlugin('content', 'componentbuilderfieldorderingtabs')
+				);
+				$plugin->setApplication(Factory::getApplication());
+
+				return $plugin;
+			}
+		);
+	}
+};
diff --git a/componentbuilderfieldorderingtabs.php b/src/Extension/ComponentbuilderFieldOrderingTabs.php
similarity index 80%
rename from componentbuilderfieldorderingtabs.php
rename to src/Extension/ComponentbuilderFieldOrderingTabs.php
index 5dc06e3..5fdda85 100644
--- a/componentbuilderfieldorderingtabs.php
+++ b/src/Extension/ComponentbuilderFieldOrderingTabs.php
@@ -8,20 +8,22 @@
  * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
+namespace VDM\Plugin\Content\ComponentbuilderFieldOrderingTabs\Extension;
+
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Plugin\CMSPlugin;
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\CMS\Form\Form;
-use Joomla\CMS\Plugin\CMSPlugin;
-
 /**
  * Content - Componentbuilder Field Ordering Tabs plugin.
  *
  * @package   ComponentbuilderFieldOrderingTabs
- * @since     2.0.0
+ * @since     3.0.0
  */
-class PlgContentComponentbuilderFieldOrderingTabs extends CMSPlugin
+final class ComponentbuilderFieldOrderingTabs extends CMSPlugin
 {
 	/**
 	 * Affects constructor behaviour. If true, language files will be loaded automatically.
@@ -49,7 +51,7 @@ class PlgContentComponentbuilderFieldOrderingTabs extends CMSPlugin
 		if (strpos($context, 'com_componentbuilder.admin_view') === 0)
 		{
 			// Add the forms path
-			Form::addFormPath(__DIR__ . '/forms');
+			Form::addFormPath(__DIR__ . '/../../forms');
 			// add the admin view params for privacy integration
 			$form->loadFile('admin_view');
 		}
diff --git a/rules/index.html b/src/Extension/index.html
similarity index 100%
rename from rules/index.html
rename to src/Extension/index.html
diff --git a/src/Field/index.html b/src/Field/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/src/Field/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/src/Rule/index.html b/src/Rule/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/src/Rule/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file