Release of v3.0.0

componentbuilderlanguagetabs.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="5.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>

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) -->

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>"

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>"

script.php

@@ -13,15 +13,129 @@
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Version;
+use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Filesystem\Folder;
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
 
 /**
  * Content - Componentbuilder Language Tabs script file.
  *
- * @package PlgContentComponentbuilderLanguageTabs
+ * @package ComponentbuilderLanguageTabs
  */
 class plgContentComponentbuilderLanguageTabsInstallerScript
 {
+	/**
+	 * The CMS Application.
+	 *
+	 * @since  4.4.2
+	 */
+	protected $app;
+
+	/**
+	 * A list of files to be deleted
+	 *
+	 * @var    array
+	 * @since  3.6
+	 */
+	protected array $deleteFiles = [];
+
+	/**
+	 * A list of folders to be deleted
+	 *
+	 * @var    array
+	 * @since  3.6
+	 */
+	protected array $deleteFolders = [];
+
+	/**
+	 * Constructor
+	 *
+	 * @param   InstallerAdapter  $adapter  The object responsible for running this script
+	 */
+	public function __construct($adapter)
+	{
+		// get application
+		$this->app = Factory::getApplication();
+
+		if (is_file(JPATH_ROOT . '/plugins/content/componentbuilderlanguagetabs/componentbuilderlanguagetabs.php'))
+		{
+			$this->deleteFiles[] = '/plugins/content/componentbuilderlanguagetabs/componentbuilderlanguagetabs.php';
+		}
+	}
+
+	/**
+	 * Called before any type of action
+	 *
+	 * @param   string  $route  Which action is happening (install|uninstall|discover_install|update)
+	 * @param   InstallerAdapter  $adapter  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function preflight($route, $adapter)
+	{
+		// set application to local method var, just use $this->app in future [we will drop $app in J6]
+		$app = $this->app;
+
+		// the default for both install and update
+		$jversion = new Version();
+		if (!$jversion->isCompatible('5.0.0'))
+		{
+			$app->enqueueMessage('Please upgrade to at least Joomla! 5.0.0 before continuing!', 'error');
+			return false;
+		}
+
+		// remove old files and folders
+		$this->removeFiles();
+
+		return true;
+	}
+
+	/**
+	 * Called before any type of action
+	 *
+	 * @param   string  $route  Which action is happening (install|uninstall|discover_install|update)
+	 * @param   InstallerAdapter  $adapter  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function postflight($route, $adapter)
+	{
+		// set application to local method var, just use $this->app in future [we will drop $app in J6]
+		$app = $this->app;
+
+		return true;
+	}
+
+	/**
+	 * Remove the files and folders in the given array from
+	 *
+	 * @return  void
+	 * @since   5.0.2
+	 */
+	protected function removeFiles()
+	{
+		if (!empty($this->deleteFiles))
+		{
+			foreach ($this->deleteFiles as $file)
+			{
+				if (is_file(JPATH_ROOT . $file) && !File::delete(JPATH_ROOT . $file))
+				{
+					echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file) . '<br>';
+				}
+			}
+		}
+
+		if (!empty($this->deleteFolders))
+		{
+			foreach ($this->deleteFolders as $folder)
+			{
+				if (is_dir(JPATH_ROOT . $folder) && !Folder::delete(JPATH_ROOT . $folder))
+				{
+					echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $folder) . '<br>';
+				}
+			}
+		}
+	}
 }

services/provider.php

@@ -0,0 +1,47 @@
+<?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\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;
+			}
+		);
+	}
+};

src/Extension/ComponentbuilderLanguageTabs.php

@@ -8,20 +8,21 @@
  * @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 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 +50,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');
 		}

src/Field/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>

src/Rule/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>