Release of v3.2.0-beta2

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-beta1) 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-beta2) 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)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 2nd March, 2024
++ *Last Build*: 4th March, 2024
-+ *Version*: 3.2.0-beta1
++ *Version*: 3.2.0-beta2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **694660**
++ *Line count*: **694682**
 + *Field count*: **2077**
-+ *File count*: **5121**
++ *File count*: **5122**
 + *Folder count*: **455**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).

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-beta1) 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-beta2) 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)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 2nd March, 2024
++ *Last Build*: 4th March, 2024
-+ *Version*: 3.2.0-beta1
++ *Version*: 3.2.0-beta2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **694660**
++ *Line count*: **694682**
 + *Field count*: **2077**
-+ *File count*: **5121**
++ *File count*: **5122**
 + *Folder count*: **455**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).

admin/controllers/admin_views.php

@@ -136,7 +136,7 @@ class ComponentbuilderControllerAdmin_views extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/controllers/compiler.php

@@ -129,7 +129,7 @@ class ComponentbuilderControllerCompiler extends AdminController
 				$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
 				if (($pos = strpos($model->compiler->filepath['component'], "/tmp/")) !== FALSE)
 				{
-				    $url = JURI::root() . substr($model->compiler->filepath['component'], $pos + 1);
+				    $url = \JUri::root() . substr($model->compiler->filepath['component'], $pos + 1);
 				}
 				// check if we have plugins
 				$add_plugin_install = UtilitiesArrayHelper::check($model->compiler->filepath['plugins'], true);
@@ -212,7 +212,7 @@ class ComponentbuilderControllerCompiler extends AdminController
 							$message[] = '<b>Module Path:</b> <code>' . $module_path . '</code><br />';
 							if (($pos = strpos($module_path, "/tmp/")) !== FALSE)
 							{
-								$module_urls[$module_id] = JURI::root() . substr($module_path, $pos + 1);
+								$module_urls[$module_id] = \JUri::root() . substr($module_path, $pos + 1);
 								$message[] = '<b>Module URL:</b> <code>' . $module_urls[$module_id] . '</code><br />';
 							}
 						}
@@ -228,7 +228,7 @@ class ComponentbuilderControllerCompiler extends AdminController
 							$message[] = '<b>Plugin Path:</b> <code>' . $plugin_path . '</code><br />';
 							if (($pos = strpos($plugin_path, "/tmp/")) !== FALSE)
 							{
-								$plugin_urls[$plugin_id] = JURI::root() . substr($plugin_path, $pos + 1);
+								$plugin_urls[$plugin_id] = \JUri::root() . substr($plugin_path, $pos + 1);
 								$message[] = '<b>Plugin URL:</b> <code>' . $plugin_urls[$plugin_id] . '</code><br />';
 							}
 						}
@@ -543,7 +543,7 @@ class ComponentbuilderControllerCompiler extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/controllers/custom_codes.php

@@ -136,7 +136,7 @@ class ComponentbuilderControllerCustom_codes extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/controllers/dynamic_gets.php

@@ -136,7 +136,7 @@ class ComponentbuilderControllerDynamic_gets extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/controllers/fields.php

@@ -136,7 +136,7 @@ class ComponentbuilderControllerFields extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/controllers/joomla_components.php

@@ -137,7 +137,7 @@ class ComponentbuilderControllerJoomla_components extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/controllers/joomla_plugins.php

@@ -71,7 +71,7 @@ class ComponentbuilderControllerJoomla_plugins extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/controllers/powers.php

@@ -72,7 +72,7 @@ class ComponentbuilderControllerPowers extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/controllers/validation_rules.php

@@ -136,7 +136,7 @@ class ComponentbuilderControllerValidation_rules extends AdminController
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{

admin/helpers/componentbuilder.php

@@ -2808,7 +2808,7 @@ abstract class ComponentbuilderHelper
 				// get the global settings
 				if (!ObjectHelper::check(self::$params))
 				{
-					self::$params = JComponentHelper::getParams('com_componentbuilder');
+					self::$params = \JComponentHelper::getParams('com_componentbuilder');
 				}
 				self::$gitHubAccessToken = self::$params->get('github_access_token', null);
 			}
@@ -3714,7 +3714,7 @@ abstract class ComponentbuilderHelper
 		// get the global settings
 		if (!ObjectHelper::check(self::$params))
 		{
-			self::$params = JComponentHelper::getParams('com_componentbuilder');
+			self::$params = \JComponentHelper::getParams('com_componentbuilder');
 		}
 		$folderPath = self::$params->get($target, $default);
 		// create the folder if it does not exist
@@ -4943,7 +4943,7 @@ abstract class ComponentbuilderHelper
 			// get the global settings
 			if (!ObjectHelper::check(self::$params))
 			{
-				self::$params = JComponentHelper::getParams('com_componentbuilder');
+				self::$params = \JComponentHelper::getParams('com_componentbuilder');
 			}
 			// get UIKIT version
 			$uikit = self::$params->get('uikit_version', 2);
@@ -5055,7 +5055,7 @@ abstract class ComponentbuilderHelper
 			// get the global settings
 			if (!ObjectHelper::check(self::$params))
 			{
-				self::$params = JComponentHelper::getParams('com_componentbuilder');
+				self::$params = \JComponentHelper::getParams('com_componentbuilder');
 			}
 			// get UIKIT version
 			$uikit = self::$params->get('uikit_version', 2);
@@ -5492,7 +5492,7 @@ abstract class ComponentbuilderHelper
 		// get global values
 		if (self::$subformLayouts === false)
 		{
-			self::$subformLayouts = JComponentHelper::getParams('com_componentbuilder')->get('subform_layouts', false);
+			self::$subformLayouts = \JComponentHelper::getParams('com_componentbuilder')->get('subform_layouts', false);
 		}
 		// check what we found (else) return default
 		if (ObjectHelper::check(self::$subformLayouts))

admin/models/ajax.php

@@ -165,7 +165,7 @@ class ComponentbuilderModelAjax extends ListModel
 	protected function componentDetailsDisplay($object)
 	{
 		// set some vars
-		$image = (StringHelper::check($object->image)) ? '<img alt="Joomla Component Image" src="'. JURI::root() . $object->image . '" style="float: right;">': '';
+		$image = (StringHelper::check($object->image)) ? '<img alt="Joomla Component Image" src="'. \JUri::root() . $object->image . '" style="float: right;">': '';
 		$desc = (StringHelper::check($object->description)) ? $object->description : $object->short_description;
 		$placeholder = ($object->add_placeholders == 1) ? '<span class="btn btn-small btn-success"> ' . Text::_('COM_COMPONENTBUILDER_YES') . ' </span>' : '<span class="btn btn-small btn-danger"> ' .Text::_('COM_COMPONENTBUILDER_NO') . ' </span>' ;
 		$debug = ($object->debug_linenr == 1) ? '<span class="btn btn-small btn-success"> ' .Text::_('COM_COMPONENTBUILDER_YES') . '</span>'  : ' <span class="btn btn-small btn-danger"> ' .Text::_('COM_COMPONENTBUILDER_NO') . ' </span>' ;
@@ -203,11 +203,11 @@ class ComponentbuilderModelAjax extends ListModel
 			$result['error'] = '<span style="color: red;">' . Text::sprintf('COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>';
 			if ($this->hasCurl())
 			{
-				$path = '*/5 * * * * curl -s "' .JURI::root() . 'index.php?option=com_componentbuilder&task=api.backup" >/dev/null 2>&1';
+				$path = '*/5 * * * * curl -s "' .\JUri::root() . 'index.php?option=com_componentbuilder&task=api.backup" >/dev/null 2>&1';
 			}
 			else
 			{
-				$path = '*/5 * * * * wget "' .JURI::root() . 'index.php?option=com_componentbuilder&task=api.backup" >/dev/null 2>&1';
+				$path = '*/5 * * * * wget "' .\JUri::root() . 'index.php?option=com_componentbuilder&task=api.backup" >/dev/null 2>&1';
 			}
 			$result['path'] =  '<code>' . $path . '</code>';
 		}
@@ -216,11 +216,11 @@ class ComponentbuilderModelAjax extends ListModel
 			$result['error'] = '<span style="color: red;">' . Text::sprintf('COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>';
 			if ($this->hasCurl())
 			{
-				$path = '* * * * * curl -s "' .JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand" >/dev/null 2>&1';
+				$path = '* * * * * curl -s "' .\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand" >/dev/null 2>&1';
 			}
 			else
 			{
-				$path = '* * * * * wget "' .JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand" >/dev/null 2>&1';
+				$path = '* * * * * wget "' .\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand" >/dev/null 2>&1';
 			}
 			$result['path'] =  '<code>' . $path . '</code>';
 		}
@@ -3349,7 +3349,7 @@ class ComponentbuilderModelAjax extends ListModel
 		// get the textarea
 		$textarea = JFormHelper::loadFieldType('textarea', true);
 		// start building the name field XML
-		$textareaXML = new SimpleXMLElement('<field/>');
+		$textareaXML = new \SimpleXMLElement('<field/>');
 		// textarea attributes
 		$textareaAttribute = array(
 			'type' => 'textarea',
@@ -3375,7 +3375,7 @@ class ComponentbuilderModelAjax extends ListModel
 		// get the subform
 		$subform = JFormHelper::loadFieldType('subform', true);
 		// start building the subform field XML
-		$subformXML = new SimpleXMLElement('<field/>');
+		$subformXML = new \SimpleXMLElement('<field/>');
 		// subform attributes
 		$subformAttribute = array(
 			'type' => 'subform',
@@ -3398,7 +3398,7 @@ class ComponentbuilderModelAjax extends ListModel
 		ComponentbuilderHelper::xmlAddAttributes($childForm, $childFormAttribute);
 
 		// start building the name field XML
-		$nameXML = new SimpleXMLElement('<field/>');
+		$nameXML = new \SimpleXMLElement('<field/>');
 		// subform attributes
 		$nameAttribute = array(
 			'type' => (UtilitiesArrayHelper::check($nameListOptions)) ? 'list' : 'text',
@@ -3430,7 +3430,7 @@ class ComponentbuilderModelAjax extends ListModel
 		ComponentbuilderHelper::xmlAppend($childForm, $nameXML);
 
 		// start building the name field XML
-		$valueXML = new SimpleXMLElement('<field/>');
+		$valueXML = new \SimpleXMLElement('<field/>');
 		// subform attributes
 		$valueAttribute = array(
 			'type' => 'textarea',
@@ -3447,7 +3447,7 @@ class ComponentbuilderModelAjax extends ListModel
 		ComponentbuilderHelper::xmlAppend($childForm, $valueXML);
 
 		// start building the desc field XML
-		$descXML = new SimpleXMLElement('<field/>');
+		$descXML = new \SimpleXMLElement('<field/>');
 		// subform attributes
 		$descAttribute = array(
 			'type' => 'textarea',

admin/models/fields.php

@@ -72,7 +72,7 @@ class ComponentbuilderModelFields extends ListModel
 		$form = parent::getFilterForm($data, $loadData);
 
 		// Create the "extension" filter
-		$form->setField(new SimpleXMLElement(
+		$form->setField(new \SimpleXMLElement(
 			JCBFilterHelper::extensions()
 			),'filter');
 		$form->setValue(

admin/models/language_translations.php

@@ -65,7 +65,7 @@ class ComponentbuilderModelLanguage_translations extends ListModel
 		$form = parent::getFilterForm($data, $loadData);
 
 		// Create the "extension" filter
-		$form->setField(new SimpleXMLElement(
+		$form->setField(new \SimpleXMLElement(
 			JCBFilterHelper::extensions()
 			),'filter');
 		$form->setValue(

admin/sql/updates/mysql/3.2.02.sql

@@ -0,0 +1 @@
+

admin/views/admin_fields_relations/view.html.php

@@ -211,7 +211,7 @@ class ComponentbuilderViewAdmin_fields_relations extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/admin_view/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewAdmin_view extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/class_extends/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewClass_extends extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/class_method/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewClass_method extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/class_property/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewClass_property extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/component_dashboard/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewComponent_dashboard extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/custom_admin_view/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewCustom_admin_view extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/custom_code/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewCustom_code extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		// need to add some language strings
 		Text::script('COM_COMPONENTBUILDER_FUNCTION_NAME_ALREADY_TAKEN_PLEASE_TRY_AGAIN');
 		Text::script('COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_FUNCTION_NAME');

admin/views/dynamic_get/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewDynamic_get extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/field/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewField extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		// add the libs for subform (since not adding it via xml but ajax)
 		Html::_('jquery.ui', array('core', 'sortable'));
 		Html::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true));

admin/views/fieldtype/view.html.php

@@ -268,7 +268,7 @@ class ComponentbuilderViewFieldtype extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/get_snippets/view.html.php

@@ -180,7 +180,7 @@ class ComponentbuilderViewGet_snippets extends HtmlView
 		$this->document->addScriptDeclaration("var snippetPath = '". ComponentbuilderHelper::$snippetPath ."';");
 		$this->document->addScriptDeclaration("var snippetsPath = '". ComponentbuilderHelper::$snippetsPath ."';");
 		// token
-		$this->document->addScriptDeclaration("var token = '". JSession::getFormToken() ."';");
+		$this->document->addScriptDeclaration("var token = '". \JSession::getFormToken() ."';");
 		// add some global items buckets for bulk updating
 		$this->document->addScriptDeclaration("var bulkItems = {};");
 		$this->document->addScriptDeclaration("bulkItems.new = [];");

admin/views/import_joomla_components/view.html.php

@@ -165,7 +165,7 @@ class ComponentbuilderViewImport_joomla_components extends HtmlView
 		$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
 		$this->document->addScriptDeclaration("var all_is_good = '".Text::_('COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IS_NO_NOTICE_AT_THIS_TIME')."';"); 
 		// add a token on the page for javascript
-		$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
+		$this->document->addScriptDeclaration("var token = '".\JSession::getFormToken()."';"); 
 
 
 		// add the Uikit v2 style sheets

admin/views/joomla_component/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewJoomla_component extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/joomla_module/view.html.php

@@ -221,7 +221,7 @@ class ComponentbuilderViewJoomla_module extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		// check if we should use browser storage
 		$setBrowserStorage = $this->params->get('set_browser_storage', null);
 		if ($setBrowserStorage)

admin/views/joomla_plugin/view.html.php

@@ -222,7 +222,7 @@ class ComponentbuilderViewJoomla_plugin extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		// set some lang
 		Text::script('COM_COMPONENTBUILDER_ALREADY_SELECTED_TRY_ANOTHER');
 		Text::script('COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS');

admin/views/layout/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewLayout extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/libraries/tmpl/default_body.php

@@ -77,7 +77,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries&task=library.edit"
 			<?php	// setup the return path
 				if (!isset($returnpath))
 				{
-					$returnpath = urlencode(base64_encode((string) JUri::getInstance()));
+					$returnpath = urlencode(base64_encode((string) \JUri::getInstance()));
 				}
 				// setup the buttons
 				if (!isset($_buttons) || !ArrayHelper::check($_buttons))

admin/views/library/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewLibrary extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/placeholder/view.html.php

@@ -220,7 +220,7 @@ class ComponentbuilderViewPlaceholder extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/power/view.html.php

@@ -226,7 +226,7 @@ class ComponentbuilderViewPower extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		// set some lang
 		Text::script('COM_COMPONENTBUILDER_ALREADY_SELECTED_TRY_ANOTHER');
 		Text::script('COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS');

admin/views/search/tmpl/default.php

@@ -27,7 +27,7 @@ Html::_('behavior.keepalive');
 $this->app->input->set('hidemainmenu', false);
 
 // set the basu URL
-$url_base = JUri::base() . 'index.php?option=com_componentbuilder';
+$url_base = \JUri::base() . 'index.php?option=com_componentbuilder';
 $url_search = $url_base . '&view=search';
 
 // get main search input field
@@ -159,7 +159,7 @@ $search_value = $this->form->getField('search_value');
 const searchTables = <?php echo json_encode($this->item['tables']); ?>;
 
 // the search Ajax URLs
-const UrlAjax = '<?php echo $url_base; ?>&format=json&raw=true&<?php echo JSession::getFormToken(); ?>=1&task=ajax.';
+const UrlAjax = '<?php echo $url_base; ?>&format=json&raw=true&<?php echo \JSession::getFormToken(); ?>=1&task=ajax.';
 
 // the search URL
 const UrlSearch = '<?php echo $url_search; ?>';

admin/views/site_view/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewSite_view extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/template/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewTemplate extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 

admin/views/validation_rule/view.html.php

@@ -217,7 +217,7 @@ class ComponentbuilderViewValidation_rule extends HtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
 		// need to add some language strings
 		Text::script('COM_COMPONENTBUILDER_VALIDATION_RULE_NAME_ALREADY_TAKEN_PLEASE_TRY_AGAIN');
 		Text::script('COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_VALIDATION_RULE_NAME');

componentbuilder.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.10" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>2nd March, 2024</creationDate>
+	<creationDate>4th March, 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>3.2.0-beta1</version>
+	<version>3.2.0-beta2</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.3.2.0-beta1)</h1>
+		<h1>Component Builder (v.3.2.0-beta2)</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.
 

componentbuilder_update_server.xml

@@ -1298,7 +1298,7 @@
 		<version>3.1.29</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1316,7 +1316,7 @@
 		<version>3.1.30</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1334,7 +1334,7 @@
 		<version>3.1.31</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1352,7 +1352,7 @@
 		<version>3.1.32</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1370,7 +1370,7 @@
 		<version>3.1.33</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1388,7 +1388,7 @@
 		<version>3.1.34</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1406,7 +1406,7 @@
 		<version>3.1.35</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1424,7 +1424,7 @@
 		<version>3.1.36</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1442,7 +1442,7 @@
 		<version>3.1.37</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1460,7 +1460,7 @@
 		<version>3.1.38</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1478,7 +1478,7 @@
 		<version>3.1.39</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1496,7 +1496,7 @@
 		<version>3.1.40</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1514,7 +1514,7 @@
 		<version>3.1.42</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1532,7 +1532,7 @@
 		<version>3.2.01</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-beta1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -1541,4 +1541,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.02</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-beta2.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>https://dev.vdm.io</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Creator/CustomFieldTypeFile.php

@@ -551,6 +551,7 @@ final class CustomFieldTypeFile
 			$placeholders['JHtml::'] = 'Html::';
 			$placeholders['JText::'] = 'Text::';
 			$placeholders['JComponentHelper::'] = 'ComponentHelper::';
+			$placeholders['\JComponentHelper::'] = 'ComponentHelper::';
 		}
 
 		$this->placeholders = $placeholders;

script.php

@@ -9613,7 +9613,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-beta1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 3.2.0-beta2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Set db if not set already.
 			if (!isset($db))

site/controllers/api.php

@@ -68,7 +68,7 @@ class ComponentbuilderControllerApi extends FormController
 		// get params first
 		if (!isset($this->params) || !ObjectHelper::check($this->params))
 		{
-			$this->params = JComponentHelper::getParams('com_componentbuilder');
+			$this->params = \JComponentHelper::getParams('com_componentbuilder');
 		}
 		// get model
 		$model = $this->getModel('api');
@@ -146,7 +146,7 @@ class ComponentbuilderControllerApi extends FormController
 		// get params first
 		if (!isset($this->params) || !ObjectHelper::check($this->params))
 		{
-			$this->params = JComponentHelper::getParams('com_componentbuilder');
+			$this->params = \JComponentHelper::getParams('com_componentbuilder');
 		}
 		// check if expansion is enabled
 		$method = $this->params->get('development_method', 1);

site/helpers/componentbuilder.php

@@ -2805,7 +2805,7 @@ abstract class ComponentbuilderHelper
 				// get the global settings
 				if (!ObjectHelper::check(self::$params))
 				{
-					self::$params = JComponentHelper::getParams('com_componentbuilder');
+					self::$params = \JComponentHelper::getParams('com_componentbuilder');
 				}
 				self::$gitHubAccessToken = self::$params->get('github_access_token', null);
 			}
@@ -3711,7 +3711,7 @@ abstract class ComponentbuilderHelper
 		// get the global settings
 		if (!ObjectHelper::check(self::$params))
 		{
-			self::$params = JComponentHelper::getParams('com_componentbuilder');
+			self::$params = \JComponentHelper::getParams('com_componentbuilder');
 		}
 		$folderPath = self::$params->get($target, $default);
 		// create the folder if it does not exist
@@ -4940,7 +4940,7 @@ abstract class ComponentbuilderHelper
 			// get the global settings
 			if (!ObjectHelper::check(self::$params))
 			{
-				self::$params = JComponentHelper::getParams('com_componentbuilder');
+				self::$params = \JComponentHelper::getParams('com_componentbuilder');
 			}
 			// get UIKIT version
 			$uikit = self::$params->get('uikit_version', 2);
@@ -5052,7 +5052,7 @@ abstract class ComponentbuilderHelper
 			// get the global settings
 			if (!ObjectHelper::check(self::$params))
 			{
-				self::$params = JComponentHelper::getParams('com_componentbuilder');
+				self::$params = \JComponentHelper::getParams('com_componentbuilder');
 			}
 			// get UIKIT version
 			$uikit = self::$params->get('uikit_version', 2);
@@ -5489,7 +5489,7 @@ abstract class ComponentbuilderHelper
 		// get global values
 		if (self::$subformLayouts === false)
 		{
-			self::$subformLayouts = JComponentHelper::getParams('com_componentbuilder')->get('subform_layouts', false);
+			self::$subformLayouts = \JComponentHelper::getParams('com_componentbuilder')->get('subform_layouts', false);
 		}
 		// check what we found (else) return default
 		if (ObjectHelper::check(self::$subformLayouts))