Stable release of v3.2.0-beta6

Fix the plug-in installer script builder bug #1068. Fix Event triggers for Joomla 4 and 5 builds.
2024-03-11 18:14:39 +02:00 · 2024-03-11 18:14:39 +02:00 · 7448403a46
commit 7448403a46
parent f5f308dbf2
9 changed files with 70 additions and 43 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,8 @@
+# v3.2.0-beta6
+
+- Fix the plug-in installer script builder bug #1068
+- Fix Event triggers for Joomla 4 and 5 builds.
+
 # v3.2.0-beta5

 - Add custom file file mapping for Joomla 4 and 5
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.0-beta5) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.0-beta6) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -145,12 +145,12 @@ TODO
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 11th March, 2024
-+ *Version*: 3.2.0-beta5
+ *Version*: 3.2.0-beta6
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **738787**
+ *Line count*: **738821**
 + *Field count*: **2078**
-+ *File count*: **5199**
+ *File count*: **5200**
 + *Folder count*: **459**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
--- a/admin/README.txt
+++ b/admin/README.txt
@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.0-beta5) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.0-beta6) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -145,12 +145,12 @@ TODO
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 11th March, 2024
-+ *Version*: 3.2.0-beta5
+ *Version*: 3.2.0-beta6
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **738787**
+ *Line count*: **738821**
 + *Field count*: **2078**
-+ *File count*: **5199**
+ *File count*: **5200**
 + *Folder count*: **459**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
--- a/admin/sql/updates/mysql/3.2.0-beta5.sql
+++ b/admin/sql/updates/mysql/3.2.0-beta5.sql
@ -0,0 +1 @@
+
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@ -7,9 +7,9 @@
 	<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>3.2.0-beta5</version>
+	<version>3.2.0-beta6</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.3.2.0-beta5)</h1>
+		<h1>Component Builder (v.3.2.0-beta6)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.

--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@ -1613,4 +1613,22 @@
 		<maintainerurl>https://dev.vdm.io</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>pkg_component_builder</element>
+		<type>package</type>
+		<client>site</client>
+		<version>3.2.0-beta6</version>
+		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta6.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>beta</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>https://dev.vdm.io</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Event.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFive/Event.php
@ -26,13 +26,20 @@ use VDM\Joomla\Componentbuilder\Compiler\Interfaces\EventInterface;
 class Event implements EventInterface
 {
 	/**
-	 * event plugin trigger switch
+	 * event plug-in trigger switch
 	 *
 	 * @var    boolean
 	 * @since 3.2.0
 	 */
 	protected $activePlugins = false;

+	/**
+	 * The application to trigger and event TODO
+	 *
+	 * @since 3.2.0
+	 */
+	protected $dispatcher;
+
 	/**
 	 * Constructor
 	 *
@ -60,6 +67,8 @@ class Event implements EventInterface
 				}
 			}
 		}
+
+		$this->dispatcher = Factory::getApplication();
 	}

 	/**
@ -77,22 +86,14 @@ class Event implements EventInterface
 		// only execute if plugins were loaded (active)
 		if ($this->activePlugins)
 		{
-			// Get the dispatcher.
-			$dispatcher = \JEventDispatcher::getInstance();
-
+			try
+			{
 				// Trigger this compiler event.
-			$results = $dispatcher->trigger($event, $data);
-
-			// Check for errors encountered while trigger the event
-			if (count((array) $results) && in_array(false, $results, true))
+				$results = $this->dispatcher->triggerEvent($event, $data ?? []);
+			}
+			catch (\Exception $e)
 			{
-				// Get the last error.
-				$error = $dispatcher->getError();
-
-				if (!($error instanceof \Exception))
-				{
-					throw new \Exception($error);
-				}
+				throw new \Exception("Error processing event '$event': " . $e->getMessage());
 			}
 		}
 	}
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFour/Event.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/JoomlaFour/Event.php
@ -12,6 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaFour;


+use Joomla\CMS\Factory;
 use Joomla\Registry\Registry;
 use Joomla\CMS\Plugin\PluginHelper;
 use VDM\Joomla\Utilities\Component\Helper;
@ -26,13 +27,20 @@ use VDM\Joomla\Componentbuilder\Compiler\Interfaces\EventInterface;
 final class Event implements EventInterface
 {
 	/**
-	 * event plugin trigger switch
+	 * event plug-in trigger switch
 	 *
 	 * @var    boolean
 	 * @since 3.2.0
 	 */
 	protected $activePlugins = false;

+	/**
+	 * The application to trigger and event TODO
+	 *
+	 * @since 3.2.0
+	 */
+	protected $dispatcher;
+
 	/**
 	 * Constructor
 	 *
@ -60,6 +68,8 @@ final class Event implements EventInterface
 				}
 			}
 		}
+
+		$this->dispatcher = Factory::getApplication();
 	}

 	/**
@ -77,22 +87,14 @@ final class Event implements EventInterface
 		// only execute if plugins were loaded (active)
 		if ($this->activePlugins)
 		{
-			// Get the dispatcher.
-			$dispatcher = \JEventDispatcher::getInstance();
-
+			try
+			{
 				// Trigger this compiler event.
-			$results = $dispatcher->trigger($event, $data);
-
-			// Check for errors encountered while trigger the event
-			if (count((array) $results) && in_array(false, $results, true))
+				$results = $this->dispatcher->triggerEvent($event, $data ?? []);
+			}
+			catch (\Exception $e)
 			{
-				// Get the last error.
-				$error = $dispatcher->getError();
-
-				if (!($error instanceof \Exception))
-				{
-					throw new \Exception($error);
-				}
+				throw new \Exception("Error processing event '$event': " . $e->getMessage());
 			}
 		}
 	}
--- a/script.php
+++ b/script.php
@ -9618,7 +9618,7 @@ class Com_ComponentbuilderInstallerScript
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 3.2.0-beta5 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 3.2.0-beta6 Was Successful! Let us know if anything is not working as expected.</h3></div>';

 			// Set db if not set already.
 			if (!isset($db))