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

---
 componentbuilderlanguagetabs.xml              | 16 +++----
 forms/joomla_component.xml                    |  4 +-
 ..._content_componentbuilderlanguagetabs.ini} |  2 +-
 ...tent_componentbuilderlanguagetabs.sys.ini} |  2 +-
 script.php                                    |  2 +-
 {fields => services}/index.html               |  0
 services/provider.php                         | 48 +++++++++++++++++++
 .../ComponentbuilderLanguageTabs.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_componentbuilderlanguagetabs.ini => plg_content_componentbuilderlanguagetabs.ini} (97%)
 rename language/en-GB/{en-GB.plg_content_componentbuilderlanguagetabs.sys.ini => plg_content_componentbuilderlanguagetabs.sys.ini} (97%)
 rename {fields => services}/index.html (100%)
 create mode 100644 services/provider.php
 rename componentbuilderlanguagetabs.php => src/Extension/ComponentbuilderLanguageTabs.php (81%)
 rename {rules => src/Extension}/index.html (100%)
 create mode 100644 src/Field/index.html
 create mode 100644 src/Rule/index.html

diff --git a/componentbuilderlanguagetabs.xml b/componentbuilderlanguagetabs.xml
index c34d846..24e7f80 100644
--- a/componentbuilderlanguagetabs.xml
+++ b/componentbuilderlanguagetabs.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_COMPONENTBUILDERLANGUAGETABS</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\ComponentbuilderLanguageTabs</namespace>
 	<description>PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_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_componentbuilderlanguagetabs.ini</language>
-		<language tag="en-GB">en-GB/en-GB.plg_content_componentbuilderlanguagetabs.sys.ini</language>
+		<language tag="en-GB">en-GB/plg_content_componentbuilderlanguagetabs.ini</language>
+		<language tag="en-GB">en-GB/plg_content_componentbuilderlanguagetabs.sys.ini</language>
 	</languages>
 
 	<!-- Plugin files -->
 	<files>
-		<filename plugin="componentbuilderlanguagetabs">componentbuilderlanguagetabs.php</filename>
+		<folder plugin="componentbuilderlanguagetabs">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/joomla_component.xml b/forms/joomla_component.xml
index 96ae17d..19d8e94 100644
--- a/forms/joomla_component.xml
+++ b/forms/joomla_component.xml
@@ -4,8 +4,8 @@
 	<fields name="params">
 	<!-- default paths of language_options fieldset points to the plugin -->
 	<fieldset name="language_options" label="PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_LANGUAGE_OPTIONS"
-		addrulepath="/plugins/content/componentbuilderlanguagetabs/rules"
-		addfieldpath="/plugins/content/componentbuilderlanguagetabs/fields"
+		addrulepath="VDM\Plugin\Content\componentbuilderlanguagetabs\Rule"
+		addfieldpath="VDM\Plugin\Content\componentbuilderlanguagetabs\Field"
 	>
 	<fields name="language_options">
 		<!-- Note_language_note Field. Type: Note. A None Database Field. (joomla) -->
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.ini b/language/en-GB/plg_content_componentbuilderlanguagetabs.ini
similarity index 97%
rename from language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.ini
rename to language/en-GB/plg_content_componentbuilderlanguagetabs.ini
index 8a67c13..99aa6ec 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.ini
+++ b/language/en-GB/plg_content_componentbuilderlanguagetabs.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS="Content - Componentbuilder Language Tabs"
 PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_DESCRIPTION="This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration."
-PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Language Tabs (v.2.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration.</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_COMPONENTBUILDERLANGUAGETABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Language Tabs (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration.</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_COMPONENTBUILDERLANGUAGETABS_LANGUAGE_OPTIONS="Language Options"
 PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NOTE_LANGUAGE_NOTE_LABEL="Would you like to move languages to their own packages?"
 PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NOTE_LANGUAGE_NOTE_DESCRIPTION="<p>Adding all your translations to your component can increase its size dramatically, so now you are able to move each extra language translation to its own installing package, leaving just your main language in the component.</p><p>Please note that this is only relevant if you actually have added extra translations to your component in the <b>Language Translations</b> area of JCB.</p>"
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.sys.ini b/language/en-GB/plg_content_componentbuilderlanguagetabs.sys.ini
similarity index 97%
rename from language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.sys.ini
rename to language/en-GB/plg_content_componentbuilderlanguagetabs.sys.ini
index 8a67c13..99aa6ec 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderlanguagetabs.sys.ini
+++ b/language/en-GB/plg_content_componentbuilderlanguagetabs.sys.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS="Content - Componentbuilder Language Tabs"
 PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_DESCRIPTION="This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration."
-PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Language Tabs (v.2.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration.</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_COMPONENTBUILDERLANGUAGETABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Language Tabs (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to link your components to the language packaging and extending options, so you can set all the required details for the integration.</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_COMPONENTBUILDERLANGUAGETABS_LANGUAGE_OPTIONS="Language Options"
 PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NOTE_LANGUAGE_NOTE_LABEL="Would you like to move languages to their own packages?"
 PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NOTE_LANGUAGE_NOTE_DESCRIPTION="<p>Adding all your translations to your component can increase its size dramatically, so now you are able to move each extra language translation to its own installing package, leaving just your main language in the component.</p><p>Please note that this is only relevant if you actually have added extra translations to your component in the <b>Language Translations</b> area of JCB.</p>"
diff --git a/script.php b/script.php
index b301c03..44d721a 100644
--- a/script.php
+++ b/script.php
@@ -20,7 +20,7 @@ use Joomla\CMS\Filesystem\Folder;
 /**
  * Content - Componentbuilder Language Tabs script file.
  *
- * @package PlgContentComponentbuilderLanguageTabs
+ * @package ComponentbuilderLanguageTabs
  */
 class plgContentComponentbuilderLanguageTabsInstallerScript
 {
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..b086412
--- /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\ComponentbuilderLanguageTabs\Extension\ComponentbuilderLanguageTabs;
+
+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 ComponentbuilderLanguageTabs(
+					$container->get(DispatcherInterface::class),
+					(array) PluginHelper::getPlugin('content', 'componentbuilderlanguagetabs')
+				);
+				$plugin->setApplication(Factory::getApplication());
+
+				return $plugin;
+			}
+		);
+	}
+};
diff --git a/componentbuilderlanguagetabs.php b/src/Extension/ComponentbuilderLanguageTabs.php
similarity index 81%
rename from componentbuilderlanguagetabs.php
rename to src/Extension/ComponentbuilderLanguageTabs.php
index 0903d5f..5cc8fbd 100644
--- a/componentbuilderlanguagetabs.php
+++ b/src/Extension/ComponentbuilderLanguageTabs.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\ComponentbuilderLanguageTabs\Extension;
+
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Form\Form;
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Form\Form;
-
 /**
  * Content - Componentbuilder Language Tabs plugin.
  *
  * @package   ComponentbuilderLanguageTabs
- * @since     2.0.0
+ * @since     3.0.0
  */
-class PlgContentComponentbuilderLanguageTabs extends CMSPlugin
+final class ComponentbuilderLanguageTabs extends CMSPlugin
 {
 	/**
 	 * Affects constructor behaviour. If true, language files will be loaded automatically.
@@ -49,7 +51,7 @@ class PlgContentComponentbuilderLanguageTabs extends CMSPlugin
 		if (strpos($context, 'com_componentbuilder.joomla_component') === 0)
 		{
 			// Add the forms path
-			Form::addFormPath(__DIR__ . '/forms');
+			Form::addFormPath(__DIR__ . '/../../forms');
 			// add the admin view params for privacy integration
 			$form->loadFile('joomla_component');
 		}
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