Moved some class around for better structure in the jcb_powers of JCB. Fixed small issue with JCB package export.

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.1.8) 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.1.9) 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)
 
@@ -140,13 +140,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*: 20th October, 2022
++ *Last Build*: 23rd October, 2022
-+ *Version*: 3.1.8
++ *Version*: 3.1.9
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **332785**
++ *Line count*: **332840**
 + *Field count*: **2004**
-+ *File count*: **2173**
++ *File count*: **2174**
 + *Folder count*: **378**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://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.1.8) 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.1.9) 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)
 
@@ -140,13 +140,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*: 20th October, 2022
++ *Last Build*: 23rd October, 2022
-+ *Version*: 3.1.8
++ *Version*: 3.1.9
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **332785**
++ *Line count*: **332840**
 + *Field count*: **2004**
-+ *File count*: **2173**
++ *File count*: **2174**
 + *Folder count*: **378**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -9215,6 +9215,7 @@ COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_EXIST="The
 COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_RETURN_ANY_DATA="The url (%s) set to retrieve the packages does not return any data!"
 COM_COMPONENTBUILDER_THE_WIKI_CAN_ONLY_BE_LOADED_WHEN_YOUR_JCB_SYSTEM_HAS_INTERNET_CONNECTION="The wiki can only be loaded when your JCB system has internet connection."
 COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
+COM_COMPONENTBUILDER_THIS_AREA_IS_STILL_UNDER_DEVELOPMENT_AND_DOES_NOT_WORK="This area is still under development and does not work."
 COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME="This <b>%s</b> is not linked to any other areas of JCB at this time!"
 COM_COMPONENTBUILDER_THIS_MAY_TAKE_A_WHILE_DEPENDING_ON_THE_SIZE_OF_YOUR_PROJECT="This may take a while depending on the size of your project."
 COM_COMPONENTBUILDER_THIS_PACKAGE_BPASSEDB_THE_CHECKSUM_VALIDATIONBR_BR_SMALLMANUALLY_ALSO_VALIDATE_THAT_THE_CORRECT_CHECKSUM_WAS_USEDSMALLBR_THIS_CHECKSUM_BSB_MUST_BE_THE_SAME_AS_THE_ONE_FOUND_A_S_SA="This package <b>PASSED</b> the checksum validation!<br /><br /><small>Manually also validate that the correct checksum was used.</small><br />This checksum: <b>%s</b> must be the same as the one found @ <a %s %s</a>"

admin/models/joomla_components.php

@@ -693,17 +693,26 @@ class ComponentbuilderModelJoomla_components extends ListModel
 		{
 			$values = json_decode($values, true);
 		}
+		// let's check for just a string or int
+		elseif (is_string($values) || (is_numeric($values) && $values > 0))
+		{
+			$values = [$values];
+		}
+
 		// make sure we have an array of values
 		if (!ComponentbuilderHelper::checkArray($values, true) || !ComponentbuilderHelper::checkString($table) || !ComponentbuilderHelper::checkString($key))
 		{
 			return false;
 		}
+
 		// start the query
 		$query = $this->_db->getQuery(true);
 		// Select some fields
 		$query->select(array('a.*'));
+
 		// From the componentbuilder_ANY table
 		$query->from($this->_db->quoteName('#__componentbuilder_'. $table, 'a'));
+
 		// check if this is an array of integers 
 		if ($this->is_numeric($values))
 		{
@@ -722,12 +731,14 @@ class ComponentbuilderModelJoomla_components extends ListModel
 				return $this->_db->quote($var);
 			}, $values)) . ')');
 		}
+
 		// Implement View Level Access
 		if (!$this->user->authorise('core.options', 'com_componentbuilder'))
 		{
 			$groups = implode(',', $this->user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')');
 		}
+
 		// Order the results by ordering
 		$query->order('a.ordering  ASC');
 		// Load the items

admin/models/powers.php

@@ -271,7 +271,7 @@ class ComponentbuilderModelPowers extends ListModel
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.system_name LIKE '.$search.' OR a.type LIKE '.$search.' OR a.description LIKE '.$search.' OR a.extends_custom LIKE '.$search.' OR a.extends LIKE '.$search.' OR a.name LIKE '.$search.')');
+				$query->where('(a.system_name LIKE '.$search.' OR a.type LIKE '.$search.' OR a.description LIKE '.$search.' OR a.extends_custom LIKE '.$search.' OR a.extends LIKE '.$search.' OR a.guid LIKE '.$search.' OR a.name LIKE '.$search.')');
 			}
 		}
 

admin/views/search/tmpl/default.php

@@ -37,6 +37,10 @@ $selectNotice .= '<p>' . JText::_('COM_COMPONENTBUILDER_ENTER_YOUR_SEARCH_TEXT')
 </script>
 <?php $urlId = (isset($this->item->id)) ? '&id='. (int) $this->item->id : ''; ?>
 
+<div class="alert alert-info" role="alert">
+	<?php echo JText::_('COM_COMPONENTBUILDER_THIS_AREA_IS_STILL_UNDER_DEVELOPMENT_AND_DOES_NOT_WORK'); ?>
+</div>
+<hr />
 <?php if(!empty( $this->sidebar)): ?>
 <div id="j-sidebar-container" class="span2">
 	<?php echo $this->sidebar; ?>

componentbuilder.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="4" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>20th October, 2022</creationDate>
+	<creationDate>23rd October, 2022</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.1.8</version>
+	<version>3.1.9</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.3.1.8)</h1>
+		<h1>Component Builder (v.3.1.9)</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

@@ -1097,10 +1097,10 @@
 		<element>pkg_component_builder</element>
 		<type>package</type>
 		<client>site</client>
-		<version>3.1.8</version>
+		<version>3.1.9</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.1.8.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.1.9.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Abstraction/BaseConfig.php

@@ -20,11 +20,11 @@ use VDM\Joomla\Utilities\String\ClassfunctionHelper;
 
 
 /**
- * Registry
+ * Config
  * 
  * @since 3.2.0
  */
-abstract class Registry extends JoomlaRegistry
+abstract class BaseConfig extends JoomlaRegistry
 {
 	/**
 	 * Hold a JInput object for easier access to the input variables.

libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Abstraction/BaseRegistry.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    3rd September, 2022
+ * @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
+ */
+
+namespace VDM\Joomla\Componentbuilder\Abstraction;
+
+
+use Joomla\Registry\Registry as JoomlaRegistry;
+
+
+/**
+ * Registry
+ * 
+ * So we have full control over this class
+ * 
+ * @since 3.2.0
+ */
+abstract class BaseRegistry extends JoomlaRegistry implements \JsonSerializable, \ArrayAccess, \IteratorAggregate, \Countable
+{
+	/**
+	 * Method to iterate over any part of the registry
+	 *
+	 * @param   string  $path  Registry path (e.g. joomla.content.showauthor)
+	 *
+	 * @return  \ArrayIterator  This object represented as an ArrayIterator.
+	 *
+	 * @since   3.4.0
+	 */
+	public function _($path)
+	{
+		$data = $this->extract($path);
+
+		if ($data === null)
+		{
+			return null;
+		}
+
+		return $data->getIterator();
+	}
+
+}
+

libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Config.php

@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
 
 use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Componentbuilder\Abstraction\Registry;
+use VDM\Joomla\Componentbuilder\Abstraction\BaseConfig;
 
 
 /**
@@ -22,7 +22,7 @@ use VDM\Joomla\Componentbuilder\Abstraction\Registry;
  * 
  * @since 3.2.0
  */
-class Config extends Registry
+class Config extends BaseConfig
 {
 	/**
 	 * get posted component id

libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php

@@ -13,6 +13,16 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
 
 
 use Joomla\DI\Container;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Compiler;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Event;
+use VDM\Joomla\Componentbuilder\Compiler\Service\History;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Language;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Placeholder;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Customcode;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Power;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Component;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Extension;
+use VDM\Joomla\Componentbuilder\Compiler\Service\Field;
 
 
 /**
@@ -43,7 +53,7 @@ abstract class Factory
 	 *
 	 * @param   string  $key  The container class key
 	 *
-	 * @return  Mixed
+	 * @return  mixed
 	 * @since 3.2.0
 	 */
 	public static function _($key)
@@ -56,7 +66,7 @@ abstract class Factory
 	 *
 	 * @param   string  $key  The container class key
 	 *
-	 * @return  Mixed
+	 * @return  mixed
 	 * @since 3.2.0
 	 */
 	public static function _J($key)
@@ -94,20 +104,19 @@ abstract class Factory
 	protected static function createContainer(): Container
 	{
 		$container = (new Container())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Compiler())
+			->registerServiceProvider(new Compiler())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Event())
+			->registerServiceProvider(new Event())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\History())
+			->registerServiceProvider(new History())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Language())
+			->registerServiceProvider(new Language())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Placeholder())
+			->registerServiceProvider(new Placeholder())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Customcode())
+			->registerServiceProvider(new Customcode())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Power())
+			->registerServiceProvider(new Power())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Component())
+			->registerServiceProvider(new Component())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Extension())
+			->registerServiceProvider(new Extension())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Field());
+			->registerServiceProvider(new Field());
 
 		return $container;
 	}
-
 
 }
 

libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Registry.php

@@ -12,18 +12,16 @@
 namespace VDM\Joomla\Componentbuilder\Compiler;
 
 
-use Joomla\Registry\Registry as JoomlaRegistry;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
+use VDM\Joomla\Componentbuilder\Abstraction\BaseRegistry;
 
 
 /**
  * Compiler Registry
  * 
- * So we have full control over this class
- * 
  * @since 3.2.0
  */
-class Registry extends JoomlaRegistry implements \JsonSerializable, \ArrayAccess, \IteratorAggregate, \Countable
+class Registry extends BaseRegistry
 {
 	/**
 	 * Default indentation value
@@ -33,27 +31,6 @@ class Registry extends JoomlaRegistry implements \JsonSerializable, \ArrayAccess
 	 */
 	protected $indent = 2;
 
-	/**
-	 * Method to iterate over any part of the registry
-	 *
-	 * @param   string  $path  Registry path (e.g. joomla.content.showauthor)
-	 *
-	 * @return  \ArrayIterator  This object represented as an ArrayIterator.
-	 *
-	 * @since   3.4.0
-	 */
-	public function _($path)
-	{
-		$data = $this->extract($path);
-
-		if ($data === null)
-		{
-			return null;
-		}
-
-		return $data->getIterator();
-	}
-
 	/**
 	 * Method to export a set of values to a PHP array
 	 *

libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Config.php

@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Search;
 
 
-use VDM\Joomla\Componentbuilder\Abstraction\Registry;
+use VDM\Joomla\Componentbuilder\Abstraction\BaseConfig;
 
 
 /**
@@ -20,7 +20,7 @@ use VDM\Joomla\Componentbuilder\Abstraction\Registry;
  * 
  * @since 3.2.0
  */
-class Config extends Registry
+class Config extends BaseConfig
 {
 	/**
 	 * get posted search value

libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Search/Factory.php

@@ -13,6 +13,10 @@ namespace VDM\Joomla\Componentbuilder\Search;
 
 
 use Joomla\DI\Container;
+use VDM\Joomla\Componentbuilder\Search\Service\Search;
+use VDM\Joomla\Componentbuilder\Search\Service\Model;
+use VDM\Joomla\Componentbuilder\Search\Service\Database;
+use VDM\Joomla\Componentbuilder\Search\Service\Agent;
 
 
 /**
@@ -68,10 +72,10 @@ abstract class Factory
 	protected static function createContainer(): Container
 	{
 		$container = (new Container())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Search\Service\Search())
+			->registerServiceProvider(new Search())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Search\Service\Model())
+			->registerServiceProvider(new Model())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Search\Service\Database())
+			->registerServiceProvider(new Database())
-			->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Search\Service\Agent());
+			->registerServiceProvider(new Agent());
 
 		return $container;
 	}

libraries/jcb_powers/VDM.Joomla/src/Utilities/GetHelper.php

@@ -26,17 +26,17 @@ abstract class GetHelper
 	/**
 	 * Get a Variable 
 	 *
-	 * @param   string   $table        The table from which to get the variable
+	 * @param   string|null  $table        The table from which to get the variable
-	 * @param   string   $where        The value where
+	 * @param   mixed        $where        The value where
-	 * @param   string   $whereString  The target/field string where/name
+	 * @param   string       $whereString  The target/field string where/name
-	 * @param   string   $what         The return field
+	 * @param   string       $what         The return field
-	 * @param   string   $operator     The operator between $whereString/field and $where/value
+	 * @param   string       $operator     The operator between $whereString/field and $where/value
-	 * @param   string   $main         The component in which the table is found
+	 * @param   string       $main         The component in which the table is found
 	 *
 	 * @return  mixed string/int/float
 	 * @since  3.0.9
 	 */
-	public static function var(string $table, ?string $where = null,
+	public static function var(?string $table = null, $where = null,
 		string $whereString = 'user', string $what = 'id',
 		string $operator = '=', ?string $main = null)
 	{
@@ -93,18 +93,18 @@ abstract class GetHelper
 	/**
 	 * Get array of variables
 	 *
-	 * @param   string   $table        The table from which to get the variables
+	 * @param   string|null  $table        The table from which to get the variables
-	 * @param   string   $where        The value where
+	 * @param   mixed        $where        The value where
-	 * @param   string   $whereString  The target/field string where/name
+	 * @param   string       $whereString  The target/field string where/name
-	 * @param   string   $what         The return field
+	 * @param   string       $what         The return field
-	 * @param   string   $operator     The operator between $whereString/field and $where/value
+	 * @param   string       $operator     The operator between $whereString/field and $where/value
-	 * @param   string   $main         The component in which the table is found
+	 * @param   string       $main         The component in which the table is found
-	 * @param   bool     $unique       The switch to return a unique array
+	 * @param   bool         $unique       The switch to return a unique array
 	 *
 	 * @return  array|null
 	 * @since  3.0.9
 	 */
-	public static function vars(string $table, ?string $where = null,
+	public static function vars(?string $table = null, $where = null,
 		string $whereString = 'user', string $what = 'id', string $operator = 'IN',
 		?string $main = null, bool $unique = true): ?array
 	{

script.php

@@ -9422,7 +9422,7 @@ class com_componentbuilderInstallerScript
 			echo '<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.1.8 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 3.1.9 Was Successful! Let us know if anything is not working as expected.</h3>';
 
 			// Set db if not set already.
 			if (!isset($db))