Component Builder (v.3.2.4)
+ Component Builder (v.3.2.5-alpha1)
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.
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 36ba2b7d9..7aa9fb94d 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -196,4 +196,22 @@
https://dev.vdm.io
+
+ Component Builder
+ Builds Complex Joomla Components
+ pkg_component_builder
+ package
+ site
+ 3.2.5-alpha1
+ https://dev.vdm.io
+
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha1.zip
+
+
+ alpha
+
+ Llewellyn van der Merwe
+ https://dev.vdm.io
+
+
\ No newline at end of file
diff --git a/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php b/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php
index 1376a814d..4d8b09dc1 100644
--- a/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php
@@ -35,6 +35,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php b/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php
index 203712e80..c8ee9f142 100644
--- a/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php
@@ -26,6 +26,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php
index a3e8c3cbd..20f397db0 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php
@@ -35,14 +35,6 @@ use VDM\Joomla\Interfaces\FactoryInterface;
**/
abstract class Factory implements FactoryInterface
{
- /**
- * Global Package Container
- *
- * @var Container|null
- * @since 0.0.0
- **/
- protected static ?Container $container = null;
-
/**
* Get any class from the package container
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
index 0ad261c6c..18e7e02ce 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
@@ -579,41 +579,57 @@ abstract class Schema implements SchemaInterface
*/
protected function isDataTypeChangeSignificant(string $currentType, string $expectedType): bool
{
- // Normalize both input types to lowercase for case-insensitive comparison
- $currentType = strtolower($currentType);
- $expectedType = strtolower($expectedType);
+ // Normalize both input types to lowercase and remove extra spaces for comparison
+ $currentType = strtolower(trim($currentType));
+ $expectedType = strtolower(trim($expectedType));
- // Regex to extract the base data type and numeric parameters with named groups
- $typePattern = '/^(?\w+)(\((?\d+(,\d+)?)\))?/';
+ // Regex to extract the base data type and numeric parameters (size and precision) with named groups
+ $typePattern = '/^(?\w+)(\((?\s*\d+\s*(,\s*\d+\s*)?)\))?/';
// Match types and parameters
preg_match($typePattern, $currentType, $currentMatches);
preg_match($typePattern, $expectedType, $expectedMatches);
- // Compare base types
+ // Compare base types (datatype without size/precision)
if ($currentMatches['datatype'] !== $expectedMatches['datatype'])
{
return true; // Base types differ
}
- // Define types where size and other modifiers are irrelevant
+ // Define numeric types where display width is irrelevant but precision (for DECIMAL) matters
$sizeIrrelevantTypes = [
- 'int', 'tinyint', 'smallint', 'mediumint', 'bigint',
- 'float', 'double', 'decimal', 'numeric' // Numeric types where display width is irrelevant
+ 'int', 'tinyint', 'smallint', 'mediumint', 'bigint',
+ 'float', 'double' // Numeric types where display width is irrelevant
];
- // If the type is not in the size irrelevant list, compare full definitions
- if (!in_array($currentMatches['datatype'], $sizeIrrelevantTypes))
+ // Handle DECIMAL and NUMERIC types explicitly (precision and scale are relevant)
+ if (in_array($currentMatches['datatype'], ['decimal', 'numeric']))
{
- return $currentType !== $expectedType; // Use full definition for types where size matters
+ // Extract precision and scale (if present)
+ if ($currentMatches['params'] !== $expectedMatches['params'])
+ {
+ return true; // Precision or scale has changed
+ }
}
- // For size irrelevant types, only compare base type, ignoring size and unsigned
- $currentBaseType = preg_replace('/\(\d+(,\d+)?\)|unsigned/', '', $currentType);
- $expectedBaseType = preg_replace('/\(\d+(,\d+)?\)|unsigned/', '', $expectedType);
+ // Check if the type is in the list of size-irrelevant types
+ if (in_array($currentMatches['datatype'], $sizeIrrelevantTypes))
+ {
+ // Remove irrelevant parts like display width and "unsigned" for size-irrelevant types, including extra spaces
+ $currentBaseType = preg_replace('/\s*\(\s*\d+(\s*,\s*\d+)?\s*\)\s*|\s*unsigned\s*/', '', $currentType);
+ $expectedBaseType = preg_replace('/\s*\(\s*\d+(\s*,\s*\d+)?\s*\)\s*|\s*unsigned\s*/', '', $expectedType);
- // Perform a final comparison for numeric types ignoring size
- return $currentBaseType !== $expectedBaseType;
+ // Compare base types after normalization
+ return $currentBaseType !== $expectedBaseType;
+ }
+
+ // For types where size is relevant (e.g., VARCHAR, CHAR, etc.), compare the full definitions
+ // Normalize size parameters by removing extra spaces around commas, e.g., "decimal(5 , 2)" -> "decimal(5,2)"
+ $normalizedCurrentType = preg_replace('/\s*,\s*/', ',', $currentType);
+ $normalizedExpectedType = preg_replace('/\s*,\s*/', ',', $expectedType);
+
+ // Perform a full comparison for types where size matters
+ return $normalizedCurrentType !== $normalizedExpectedType;
}
/**
@@ -624,7 +640,7 @@ abstract class Schema implements SchemaInterface
* @param mixed $currentDefault Current default value.
* @param mixed $newDefault The new default value to be set.
*
- * @return void
+ * @return bool True if update was successful, false if no update was needed.
* @since 3.2.1
* @throws \Exception If there is an error updating column defaults.
*/
@@ -640,13 +656,38 @@ abstract class Schema implements SchemaInterface
$updateTable = 'UPDATE ' . $this->db->quoteName($this->getTable($table));
$dbField = $this->db->quoteName($column);
- // Update SQL to set new default on existing rows where the default is currently the old default
- $sql = $updateTable . " SET $dbField = $sqlDefault WHERE $dbField IS NULL OR $dbField = ''";
+ if (isset($this->columns[$column]))
+ {
+ $fieldType = strtoupper($this->columns[$column]->Type);
- // Execute the update
- $this->db->setQuery($sql);
- return $this->db->execute();
- } catch (\Exception $e) {
+ // If the field is numeric, avoid comparing with empty string
+ if (strpos($fieldType, 'INT') !== false ||
+ strpos($fieldType, 'FLOAT') !== false ||
+ strpos($fieldType, 'DOUBLE') !== false ||
+ strpos($fieldType, 'DECIMAL') !== false)
+ {
+ $whereCondition = "$dbField IS NULL OR $dbField = 0";
+ }
+ else
+ {
+ // Default condition for non-numeric fields
+ $whereCondition = "$dbField IS NULL OR $dbField = ''";
+ }
+
+ // Update SQL to set new default on existing rows where the default is currently the old default
+ $sql = $updateTable . " SET $dbField = $sqlDefault WHERE $whereCondition";
+
+ // Execute the update
+ $this->db->setQuery($sql);
+ return $this->db->execute();
+ }
+ else
+ {
+ throw new \Exception("Error: Column $column does not exist in table $table.");
+ }
+ }
+ catch (\Exception $e)
+ {
throw new \Exception("Error: failed to update ($column) column defaults in $table table. " . $e->getMessage());
}
}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
index eae8ca031..9184813d4 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
@@ -68,6 +68,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Current Joomla Version Being Build
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
index 7804c937d..e72812387 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
@@ -4781,8 +4781,6 @@ class Interpretation extends Fields
}
$method .= PHP_EOL . Indent::_(2) . "}";
}
- $method .= PHP_EOL . PHP_EOL . Indent::_(2)
- . "parent::display(\$tpl);";
}
return $method;
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Fieldtype/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Fieldtype/Factory.php
index 249140f94..7d5a35e53 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Fieldtype/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Fieldtype/Factory.php
@@ -31,6 +31,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php
index fabd0f5e0..0ced36851 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php
@@ -31,6 +31,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php
index 58a3468ca..1a1f7dc43 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php
@@ -28,6 +28,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php
index c5b08cd7f..cea2a0533 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php
@@ -32,6 +32,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php
index 46223d162..5f14fea5b 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php
@@ -28,6 +28,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php
index 25bb3f807..68d1393a5 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php
@@ -28,6 +28,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
*/
abstract class Factory extends ExtendingFactory implements FactoryInterface
{
+ /**
+ * Package Container
+ *
+ * @var Container|null
+ * @since 5.0.3
+ **/
+ protected static ?Container $container = null;
+
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php
index 4b801654e..d3551c678 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php
@@ -130,6 +130,13 @@ final class MultiSubform implements MultiSubformInterface
{
$items = []; // will delete all existing linked items :( not ideal, but real
}
+ else
+ {
+ // make sure the sub-subform:linkValue[data:guid]
+ // is set with the needed key if possible
+ // this ensures that new sub-subform data is correctly linked
+ $this->prepLinkValue($items, $setMap);
+ }
// Save the core data
if (!$this->setSubformData($items, $setMap['_core']))
@@ -515,6 +522,45 @@ final class MultiSubform implements MultiSubformInterface
}
return true; // All checks passed
+ }
+
+ /**
+ * Prepare the linkValue needed by the sub-subform
+ *
+ * @param array $subform The subform data
+ * @param array $setMap Mapping data for processing subforms
+ *
+ * @return void
+ * @since 5.0.3
+ */
+ private function prepLinkValue(array &$subform, array $setMap): void
+ {
+ $code_table = null;
+ foreach ($setMap as $key => $map)
+ {
+ if ($key === '_core')
+ {
+ $code_table = $map['table'] ?? null;
+ continue;
+ }
+
+ if (strpos($map['linkValue'], ':') !== false)
+ {
+ [$table, $field] = explode(':', $map['linkValue']);
+ if ($code_table !== null &&
+ 'guid' === $field &&
+ $table === $code_table)
+ {
+ foreach ($subform as &$row)
+ {
+ if (empty($row['guid']))
+ {
+ $row['guid'] = $this->subform->table($table)->getGuid($field);
+ }
+ }
+ }
+ }
+ }
}
}
diff --git a/script.php b/script.php
index 9c186c0b2..ebbe805fd 100644
--- a/script.php
+++ b/script.php
@@ -10001,7 +10001,7 @@ class Com_ComponentbuilderInstallerScript
echo '
-
Upgrade to Version 3.2.4 Was Successful! Let us know if anything is not working as expected.
';
+ Upgrade to Version 3.2.5-alpha1 Was Successful! Let us know if anything is not working as expected.
';
// Set db if not set already.
if (!isset($db))
diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php
index caaf46e3c..b1ca604df 100644
--- a/site/views/api/view.html.php
+++ b/site/views/api/view.html.php
@@ -54,6 +54,7 @@ class ComponentbuilderViewApi extends HtmlView
throw new \Exception(implode(PHP_EOL, $errors), 500);
}
+ // Display the template
parent::display($tpl);
}