From 7848defe008ca280bc095e9e7b1a3ca397141bd5 Mon Sep 17 00:00:00 2001 From: aB0t Date: Thu, 15 Aug 2024 01:35:23 +0200 Subject: [PATCH] Release of v4.0.0 --- componentbuilderheaderscompiler.xml | 16 ++- ...ension_componentbuilderheaderscompiler.ini | 8 ++ ...on_componentbuilderheaderscompiler.sys.ini | 8 ++ ...nsion_componentbuilderheaderscompiler.ini} | 2 +- ...n_componentbuilderheaderscompiler.sys.ini} | 2 +- script.php | 120 +++++++++++++++++- services/index.html | 1 + services/provider.php | 47 +++++++ .../ComponentbuilderHeadersCompiler.php | 34 ++++- src/Extension/index.html | 1 + 10 files changed, 222 insertions(+), 17 deletions(-) create mode 100644 language/af-ZA/plg_extension_componentbuilderheaderscompiler.ini create mode 100644 language/af-ZA/plg_extension_componentbuilderheaderscompiler.sys.ini rename language/en-GB/{en-GB.plg_extension_componentbuilderheaderscompiler.ini => plg_extension_componentbuilderheaderscompiler.ini} (94%) rename language/en-GB/{en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini => plg_extension_componentbuilderheaderscompiler.sys.ini} (94%) create mode 100644 services/index.html create mode 100644 services/provider.php rename componentbuilderheaderscompiler.php => src/Extension/ComponentbuilderHeadersCompiler.php (92%) create mode 100644 src/Extension/index.html diff --git a/componentbuilderheaderscompiler.xml b/componentbuilderheaderscompiler.xml index d094cd1..c67211f 100644 --- a/componentbuilderheaderscompiler.xml +++ b/componentbuilderheaderscompiler.xml @@ -1,13 +1,14 @@ PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER - 27th July, 2024 + 14th August, 2024 Llewellyn van der Merwe joomla@vdm.io https://dev.vdm.io Copyright (C) 2015 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 3.0.0 + 4.0.0 + VDM\Plugin\Extension\ComponentbuilderHeadersCompiler PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION @@ -15,14 +16,17 @@ - en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini - en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini + en-GB/plg_extension_componentbuilderheaderscompiler.ini + en-GB/plg_extension_componentbuilderheaderscompiler.sys.ini + af-ZA/plg_extension_componentbuilderheaderscompiler.ini + af-ZA/plg_extension_componentbuilderheaderscompiler.sys.ini - componentbuilderheaderscompiler.php + services index.html - language + services + src \ No newline at end of file diff --git a/language/af-ZA/plg_extension_componentbuilderheaderscompiler.ini b/language/af-ZA/plg_extension_componentbuilderheaderscompiler.ini new file mode 100644 index 0000000..66bfa92 --- /dev/null +++ b/language/af-ZA/plg_extension_componentbuilderheaderscompiler.ini @@ -0,0 +1,8 @@ +PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_YES="Ja" +PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NO="Nee" +PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Ja" +PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="Nee" +PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_NO="Nee" +PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_YES="Ja" +PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_YES="Ja" +PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_NO="Nee" \ No newline at end of file diff --git a/language/af-ZA/plg_extension_componentbuilderheaderscompiler.sys.ini b/language/af-ZA/plg_extension_componentbuilderheaderscompiler.sys.ini new file mode 100644 index 0000000..66bfa92 --- /dev/null +++ b/language/af-ZA/plg_extension_componentbuilderheaderscompiler.sys.ini @@ -0,0 +1,8 @@ +PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_YES="Ja" +PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NO="Nee" +PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Ja" +PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="Nee" +PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_NO="Nee" +PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_YES="Ja" +PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_YES="Ja" +PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_NO="Nee" \ No newline at end of file diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini b/language/en-GB/plg_extension_componentbuilderheaderscompiler.ini similarity index 94% rename from language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini rename to language/en-GB/plg_extension_componentbuilderheaderscompiler.ini index 0ed70f3..88facc9 100644 --- a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini +++ b/language/en-GB/plg_extension_componentbuilderheaderscompiler.ini @@ -1,3 +1,3 @@ PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER="Extension - Componentbuilder Headers Compiler" PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_DESCRIPTION="This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your code where you would like to set Custom Headers." -PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="

Extension - Componentbuilder Headers Compiler (v.3.0.0)

This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your code where you would like to set Custom Headers.

Created by Llewellyn van der Merwe
Development started 10th March, 2024

" \ No newline at end of file +PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="

Extension - Componentbuilder Headers Compiler (v.4.0.0)

This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your code where you would like to set Custom Headers.

Created by Llewellyn van der Merwe
Development started 10th March, 2024

" \ No newline at end of file diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini b/language/en-GB/plg_extension_componentbuilderheaderscompiler.sys.ini similarity index 94% rename from language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini rename to language/en-GB/plg_extension_componentbuilderheaderscompiler.sys.ini index 0ed70f3..88facc9 100644 --- a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini +++ b/language/en-GB/plg_extension_componentbuilderheaderscompiler.sys.ini @@ -1,3 +1,3 @@ PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER="Extension - Componentbuilder Headers Compiler" PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_DESCRIPTION="This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your code where you would like to set Custom Headers." -PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="

Extension - Componentbuilder Headers Compiler (v.3.0.0)

This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your code where you would like to set Custom Headers.

Created by Llewellyn van der Merwe
Development started 10th March, 2024

" \ No newline at end of file +PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="

Extension - Componentbuilder Headers Compiler (v.4.0.0)

This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.Also be sure to set your code where you would like to set Custom Headers.

Created by Llewellyn van der Merwe
Development started 10th March, 2024

" \ No newline at end of file diff --git a/script.php b/script.php index 4954701..8d402df 100644 --- a/script.php +++ b/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; /** * Extension - Componentbuilder Headers Compiler script file. * - * @package PlgExtensionComponentbuilderHeadersCompiler + * @package ComponentbuilderHeadersCompiler */ class plgExtensionComponentbuilderHeadersCompilerInstallerScript { + /** + * 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/extension/componentbuilderheaderscompiler/componentbuilderheaderscompiler.php')) + { + $this->deleteFiles[] = '/plugins/extension/componentbuilderheaderscompiler/componentbuilderheaderscompiler.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) . '
'; + } + } + } + + 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) . '
'; + } + } + } + } } diff --git a/services/index.html b/services/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/services/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/services/provider.php b/services/provider.php new file mode 100644 index 0000000..080902e --- /dev/null +++ b/services/provider.php @@ -0,0 +1,47 @@ + + * @git 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\Extension\ComponentbuilderHeadersCompiler\Extension\ComponentbuilderHeadersCompiler; + +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 ComponentbuilderHeadersCompiler( + $container->get(DispatcherInterface::class), + (array) PluginHelper::getPlugin('extension', 'componentbuilderheaderscompiler') + ); + $plugin->setApplication(Factory::getApplication()); + + return $plugin; + } + ); + } +}; diff --git a/componentbuilderheaderscompiler.php b/src/Extension/ComponentbuilderHeadersCompiler.php similarity index 92% rename from componentbuilderheaderscompiler.php rename to src/Extension/ComponentbuilderHeadersCompiler.php index b7db26e..04dc5e6 100644 --- a/componentbuilderheaderscompiler.php +++ b/src/Extension/ComponentbuilderHeadersCompiler.php @@ -8,9 +8,7 @@ * @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'); +namespace VDM\Plugin\Extension\ComponentbuilderHeadersCompiler\Extension; use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Plugin\CMSPlugin; @@ -20,15 +18,19 @@ use VDM\Joomla\Utilities\ArrayHelper; use VDM\Joomla\Utilities\JsonHelper; use VDM\Joomla\Utilities\StringHelper; use VDM\Joomla\Utilities\GuidHelper; -use VDM\Joomla\Utilities\String\NamespaceHelper; +use VDM\Joomla\Utilities\String\NamespaceHelper; +use Joomla\Event\SubscriberInterface; + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); /** * Extension - Componentbuilder Headers Compiler plugin. * * @package ComponentbuilderHeadersCompiler - * @since 3.0.0 + * @since 4.0.0 */ -class PlgExtensionComponentbuilderHeadersCompiler extends CMSPlugin +final class ComponentbuilderHeadersCompiler extends CMSPlugin implements SubscriberInterface { /** * Global switch to see if a file has custom headers. @@ -729,4 +731,24 @@ class PlgExtensionComponentbuilderHeadersCompiler extends CMSPlugin return null; } + + /** + * Returns an array of events this subscriber will listen to. + * + * @return array + * + * @since 5.0.0 + */ + public static function getSubscribedEvents(): array + { + return [ + 'jcb_ce_onBeforeModelViewData' => 'jcb_ce_onBeforeModelViewData', + 'jcb_ce_onBeforeModelCustomViewData' => 'jcb_ce_onBeforeModelCustomViewData', + 'jcb_ce_onBeforeModelDynamicGetData' => 'jcb_ce_onBeforeModelDynamicGetData', + 'jcb_ce_onBeforeModelComponentData' => 'jcb_ce_onBeforeModelComponentData', + 'jcb_ce_setClassHeader' => 'jcb_ce_setClassHeader', + 'jcb_ce_onBeforeGetComponentData' => 'jcb_ce_onBeforeGetComponentData', + 'jcb_ce_onAfterGetComponentData' => 'jcb_ce_onAfterGetComponentData' + ]; + } } diff --git a/src/Extension/index.html b/src/Extension/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/src/Extension/index.html @@ -0,0 +1 @@ + \ No newline at end of file