Component Builder (v.3.2.2-alpha5)
+ Component Builder (v.3.2.2-alpha6)
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 1965a894c..eb06f8aa4 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -151,7 +151,7 @@
3.2.2-alpha
https://dev.vdm.io
- https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.2-alpha5.zip
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.2-alpha6.zip
alpha
@@ -166,10 +166,10 @@
pkg_component_builder
package
site
- 3.2.2-alpha5
+ 3.2.2-alpha6
https://dev.vdm.io
- https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.2-alpha5.zip
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.2-alpha6.zip
alpha
diff --git a/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php b/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php
index 78918e811..1376a814d 100644
--- a/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php
@@ -25,6 +25,7 @@ use VDM\Joomla\Gitea\Service\Notifications;
use VDM\Joomla\Gitea\Service\Miscellaneous;
use VDM\Joomla\Gitea\Service\Admin;
use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
/**
@@ -32,45 +33,8 @@ use VDM\Joomla\Interfaces\FactoryInterface;
*
* @since 3.2.0
*/
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
{
- /**
- * Global Package Container
- *
- * @var Container
- * @since 3.2.0
- **/
- protected static $container = null;
-
- /**
- * Get any class from the package container
- *
- * @param string $key The container class key
- *
- * @return Mixed
- * @since 3.2.0
- */
- public static function _($key)
- {
- return self::getContainer()->get($key);
- }
-
- /**
- * Get the global package container
- *
- * @return Container
- * @since 3.2.0
- */
- public static function getContainer(): Container
- {
- if (!self::$container)
- {
- self::$container = self::createContainer();
- }
-
- return self::$container;
- }
-
/**
* 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 246a934e2..203712e80 100644
--- a/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php
@@ -16,6 +16,7 @@ use Joomla\DI\Container;
use VDM\Joomla\Openai\Service\Api;
use VDM\Joomla\Openai\Service\Utilities;
use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
/**
@@ -23,45 +24,8 @@ use VDM\Joomla\Interfaces\FactoryInterface;
*
* @since 3.2.0
*/
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
{
- /**
- * Global Package Container
- *
- * @var Container
- * @since 3.2.0
- **/
- protected static $container = null;
-
- /**
- * Get any class from the package container
- *
- * @param string $key The container class key
- *
- * @return Mixed
- * @since 3.2.0
- */
- public static function _($key)
- {
- return self::getContainer()->get($key);
- }
-
- /**
- * Get the global package container
- *
- * @return Container
- * @since 3.2.0
- */
- public static function getContainer(): Container
- {
- if (!self::$container)
- {
- self::$container = self::createContainer();
- }
-
- return self::$container;
- }
-
/**
* 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
new file mode 100644
index 000000000..a3e8c3cbd
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php
@@ -0,0 +1,83 @@
+
+ * @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
+ */
+
+namespace VDM\Joomla\Abstraction;
+
+
+use Joomla\DI\Container;
+use VDM\Joomla\Interfaces\FactoryInterface;
+
+
+/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **
+ ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **
+ **
+ ** In realms of code where purists frown, the anti-pattern wears a crown,
+ ** A paradox of chaos bright, where complex paths lose all its slight.
+ ** For in its tangled, wild embrace, lies raw creativity's face,
+ ** No rigid forms, no strict decree, just boundless, daring artistry.
+ ** In flaws, we find the freedom's key, where messy code and brilliance spree,
+ ** A dance of thought, unchained, unbound, in anti-pattern, beauty's found.
+ **
+ ** Perfect Paradox and True Nature of the Anti-Pattern by ChatGPT
+ **
+ ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **
+ ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **
+ **
+ ** @since 0.0.0
+ **/
+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
+ *
+ * @param string $key The container class key
+ *
+ * @return Mixed
+ * @since 0.0.0
+ */
+ public static function _($key)
+ {
+ return static::getContainer()->get($key);
+ }
+
+ /**
+ * Get the global package container
+ *
+ * @return Container
+ * @since 0.0.0
+ */
+ public static function getContainer(): Container
+ {
+ if (!static::$container)
+ {
+ static::$container = static::createContainer();
+ }
+
+ return static::$container;
+ }
+
+ /**
+ * Create a container object
+ *
+ * @return Container
+ * @since 0.0.0
+ */
+ abstract protected static function createContainer(): Container;
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Model.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Model.php
index f74eba0f3..7a3b40203 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Model.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Model.php
@@ -107,6 +107,69 @@ abstract class Model implements ModelInterface
*/
abstract public function value($value, string $field, ?string $table = null);
+ /**
+ * Model a value of multiple items
+ * Example: $this->items(Array, 'value_key', 'table_name');
+ *
+ * @param array|null $items The array of values
+ * @param string $field The field key
+ * @param string|null $table The table
+ *
+ * @return array|null
+ * @since 3.2.2
+ */
+ public function values(?array $items = null, string $field, ?string $table = null): ?array
+ {
+ // check if this is a valid table
+ if (ArrayHelper::check($items))
+ {
+ // set the table name
+ if (empty($table))
+ {
+ $table = $this->getTable();
+ }
+
+ // validate if field exist in table
+ if (!$this->table->exist($table, $field))
+ {
+ return null;
+ }
+
+ // value counter
+ $value_number = 0;
+
+ // check if this is a valid table
+ $item_bucket = [];
+
+ foreach ($items as $value)
+ {
+ if (!$this->validateBefore($value, $field, $table))
+ {
+ continue;
+ }
+
+ $value = $this->value($value, $field, $table);
+
+ if (!$this->validateAfter($value, $field, $table))
+ {
+ continue;
+ }
+
+ $item_bucket[] = $value;
+
+ $value_number++;
+ }
+
+ // do we have any values left
+ if ($value_number > 0)
+ {
+ return $item_bucket;
+ }
+ }
+
+ return null;
+ }
+
/**
* Model the values of an item
* Example: $this->item(Object, 'table_name');
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Registry.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Registry.php
index e48829abd..903fd911c 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Registry.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Registry.php
@@ -40,10 +40,10 @@ abstract class Registry extends ActiveRegistry implements Registryinterface
* @param mixed $value Value of entry
*
* @throws \InvalidArgumentException If any of the path values are not a number or string.
- * @return $this
+ * @return self
* @since 3.2.0
*/
- public function set(string $path, $value): static
+ public function set(string $path, $value): self
{
if (($keys = $this->getActiveKeys($path)) === null)
{
@@ -66,10 +66,10 @@ abstract class Registry extends ActiveRegistry implements Registryinterface
* Override in child class allowed set class property $addAsArray = true.
*
* @throws \InvalidArgumentException If any of the path values are not a number or string.
- * @return $this
+ * @return self
* @since 3.2.0
*/
- public function add(string $path, $value, ?bool $asArray = null): static
+ public function add(string $path, $value, ?bool $asArray = null): self
{
if (($keys = $this->getActiveKeys($path)) === null)
{
@@ -107,10 +107,10 @@ abstract class Registry extends ActiveRegistry implements Registryinterface
* @param string $path Registry path (e.g. vdm.content.builder)
*
* @throws \InvalidArgumentException If any of the path values are not a number or string.
- * @return $this
+ * @return self
* @since 3.2.0
*/
- public function remove(string $path): static
+ public function remove(string $path): self
{
if (($keys = $this->getActiveKeys($path)) === null)
{
@@ -146,10 +146,10 @@ abstract class Registry extends ActiveRegistry implements Registryinterface
*
* @param string|null $value The value to set.
*
- * @return $this
+ * @return self
* @since 3.2.0
*/
- public function setSeparator(?string $value): static
+ public function setSeparator(?string $value): self
{
$this->separator = $value;
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 a01ff5670..41613ad22 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
@@ -56,6 +56,7 @@ use VDM\Joomla\Gitea\Service\Notifications as GiteNotifi;
use VDM\Joomla\Gitea\Service\Miscellaneous as GiteaMisc;
use VDM\Joomla\Gitea\Service\Admin as GiteaAdmin;
use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
/**
@@ -63,16 +64,8 @@ use VDM\Joomla\Interfaces\FactoryInterface;
*
* @since 3.2.0
*/
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
{
- /**
- * Global Compiler Container
- *
- * @var Container
- * @since 3.2.0
- **/
- protected static ?Container $container = null;
-
/**
* Current Joomla Version Being Build
*
@@ -81,19 +74,6 @@ abstract class Factory implements FactoryInterface
**/
protected static int $JoomlaVersion;
- /**
- * Get any class from the compiler container
- *
- * @param string $key The container class key
- *
- * @return mixed
- * @since 3.2.0
- */
- public static function _($key)
- {
- return self::getContainer()->get($key);
- }
-
/**
* Get array of all keys in container
*
@@ -123,22 +103,6 @@ abstract class Factory implements FactoryInterface
return self::getContainer()->get('J' . self::$JoomlaVersion . '.' . $key);
}
- /**
- * Get the global compiler container
- *
- * @return Container
- * @since 3.2.0
- */
- public static function getContainer(): Container
- {
- if (!self::$container)
- {
- self::$container = self::createContainer();
- }
-
- return self::$container;
- }
-
/**
* 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 6215236c9..fabd0f5e0 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php
@@ -21,6 +21,7 @@ use VDM\Joomla\Componentbuilder\Service\Gitea;
use VDM\Joomla\Componentbuilder\Power\Service\Gitea as GiteaPower;
use VDM\Joomla\Gitea\Service\Utilities as GiteaUtilities;
use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
/**
@@ -28,45 +29,8 @@ use VDM\Joomla\Interfaces\FactoryInterface;
*
* @since 3.2.0
*/
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
{
- /**
- * Global Package Container
- *
- * @var Container
- * @since 3.2.0
- **/
- protected static $container = null;
-
- /**
- * Get any class from the package container
- *
- * @param string $key The container class key
- *
- * @return Mixed
- * @since 3.2.0
- */
- public static function _($key)
- {
- return self::getContainer()->get($key);
- }
-
- /**
- * Get the global package container
- *
- * @return Container
- * @since 3.2.0
- */
- public static function getContainer(): Container
- {
- if (!self::$container)
- {
- self::$container = self::createContainer();
- }
-
- return self::$container;
- }
-
/**
* 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 f6710bb4c..58a3468ca 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php
@@ -18,6 +18,7 @@ use VDM\Joomla\Componentbuilder\Package\Service\Database;
use VDM\Joomla\Componentbuilder\Service\Server;
use VDM\Joomla\Componentbuilder\Package\Service\Display;
use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
/**
@@ -25,45 +26,8 @@ use VDM\Joomla\Interfaces\FactoryInterface;
*
* @since 3.2.0
*/
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
{
- /**
- * Global Package Container
- *
- * @var Container
- * @since 3.2.0
- **/
- protected static $container = null;
-
- /**
- * Get any class from the package container
- *
- * @param string $key The container class key
- *
- * @return Mixed
- * @since 3.2.0
- */
- public static function _($key)
- {
- return self::getContainer()->get($key);
- }
-
- /**
- * Get the global package container
- *
- * @return Container
- * @since 3.2.0
- */
- public static function getContainer(): Container
- {
- if (!self::$container)
- {
- self::$container = self::createContainer();
- }
-
- return self::$container;
- }
-
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Config.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Config.php
index 633215b60..b0ad88ef6 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Config.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Config.php
@@ -240,6 +240,17 @@ class Config extends BaseConfig
}
return array_values($approved);
+ }
+
+ /**
+ * get indentation value
+ *
+ * @return string Indentation value
+ * @since 3.2.2
+ */
+ protected function getIndentationvalue(): string
+ {
+ return "\t";
}
}
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 3803bf75d..c5b08cd7f 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php
@@ -22,6 +22,7 @@ use VDM\Joomla\Componentbuilder\Service\Gitea;
use VDM\Joomla\Componentbuilder\Power\Service\Gitea as GiteaPower;
use VDM\Joomla\Gitea\Service\Utilities as GiteaUtilities;
use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
/**
@@ -29,45 +30,8 @@ use VDM\Joomla\Interfaces\FactoryInterface;
*
* @since 3.2.0
*/
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
{
- /**
- * Global Package Container
- *
- * @var Container
- * @since 3.2.0
- **/
- protected static $container = null;
-
- /**
- * Get any class from the package container
- *
- * @param string $key The container class key
- *
- * @return Mixed
- * @since 3.2.0
- */
- public static function _($key)
- {
- return self::getContainer()->get($key);
- }
-
- /**
- * Get the global package container
- *
- * @return Container
- * @since 3.2.0
- */
- public static function getContainer(): Container
- {
- if (!self::$container)
- {
- self::$container = self::createContainer();
- }
-
- return self::$container;
- }
-
/**
* 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 a12ee8c23..46223d162 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php
@@ -18,6 +18,7 @@ use VDM\Joomla\Componentbuilder\Search\Service\Model;
use VDM\Joomla\Componentbuilder\Search\Service\Database;
use VDM\Joomla\Componentbuilder\Search\Service\Agent;
use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
/**
@@ -25,45 +26,8 @@ use VDM\Joomla\Interfaces\FactoryInterface;
*
* @since 3.2.0
*/
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
{
- /**
- * Global Search Container
- *
- * @var Container
- * @since 3.2.0
- **/
- protected static $container = null;
-
- /**
- * Get any class from the search container
- *
- * @param string $key The container class key
- *
- * @return Mixed
- * @since 3.2.0
- */
- public static function _(string $key)
- {
- return self::getContainer()->get($key);
- }
-
- /**
- * Get the global search container
- *
- * @return Container
- * @since 3.2.0
- */
- public static function getContainer(): Container
- {
- if (!self::$container)
- {
- self::$container = self::createContainer();
- }
-
- return self::$container;
- }
-
/**
* Create a container object
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
index 004ac74b0..17510e42e 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
@@ -17,11 +17,11 @@ use VDM\Joomla\Abstraction\BaseTable;
/**
- * JCB Tables
+ * Componentbuilder Tables
*
* @since 3.2.0
*/
-class Table extends BaseTable implements Tableinterface
+final class Table extends BaseTable implements Tableinterface
{
/**
* All areas/views/tables with their field details
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Schema.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Schema.php
index 200e3303a..9fb540c69 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Schema.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Schema.php
@@ -18,7 +18,7 @@ use VDM\Joomla\Abstraction\Schema as ExtendingSchema;
/**
- * JCB Tables Schema
+ * Componentbuilder Tables Schema
*
* @since 3.2.1
*/
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/index.html b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/index.html
new file mode 100644
index 000000000..fa6d84e80
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/Action/Load.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/Action/Load.php
index 6b1426c4d..83b481e40 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Data/Action/Load.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/Action/Load.php
@@ -112,6 +112,33 @@ class Load implements LoadInterface
);
}
+ /**
+ * Get a value from multiple rows from a given table
+ * Example: $this->values(
+ * [
+ * 'guid' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+ * ], 'value_key'
+ * );
+ *
+ * @param array $keys The item keys
+ * @param string $field The field key
+ *
+ * @return array|null
+ * @since 3.2.2
+ */
+ public function values(array $keys, string $field): ?array
+ {
+ return $this->model->values(
+ $this->load->values(
+ ["a.{$field}" => $field],
+ ['a' => $this->getTable()],
+ $this->prefix($keys)
+ ),
+ $field,
+ $this->getTable()
+ );
+ }
+
/**
* Get values from a given table
* Example: $this->item(
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php
new file mode 100644
index 000000000..25bb3f807
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php
@@ -0,0 +1,46 @@
+
+ * @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
+ */
+
+namespace VDM\Joomla\Data;
+
+
+use Joomla\DI\Container;
+use VDM\Joomla\Service\Table;
+use VDM\Joomla\Service\Database;
+use VDM\Joomla\Service\Model;
+use VDM\Joomla\Service\Data;
+use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
+
+
+/**
+ * Data Factory
+ *
+ * @since 3.2.2
+ */
+abstract class Factory extends ExtendingFactory implements FactoryInterface
+{
+ /**
+ * Create a container object
+ *
+ * @return Container
+ * @since 3.2.2
+ */
+ protected static function createContainer(): Container
+ {
+ return (new Container())
+ ->registerServiceProvider(new Table())
+ ->registerServiceProvider(new Database())
+ ->registerServiceProvider(new Model())
+ ->registerServiceProvider(new Data());
+ }
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/Item.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/Item.php
index cae444207..4acc9fa6d 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Data/Item.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/Item.php
@@ -142,22 +142,7 @@ final class Item implements ItemInterface
*/
public function value(string $value, string $key = 'guid', string $get = 'id')
{
- // Perform the database query
- $value = $this->database->value(
- ["a.$get" => $get],
- ["a" => $this->getTable()],
- ["a.$key" => $value]
- );
-
- // Check if rows are found
- if ($value !== null)
- {
- // Return the value
- return $value;
- }
-
- // Return null if no rows are found
- return null;
+ return $this->load->table($this->getTable())->value([$key => $value], $get);
}
/**
@@ -243,7 +228,13 @@ final class Item implements ItemInterface
*/
private function action(string $value, string $key): string
{
- if (($id = $this->value($value, $key, 'id')) !== null && $id > 0)
+ $id = $this->database->value(
+ ["a.id" => 'id'],
+ ["a" => $this->getTable()],
+ ["a.$key" => $value]
+ );
+
+ if ($id !== null && $id > 0)
{
return 'update';
}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/Items.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/Items.php
index 2e960b265..61b0c2485 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Data/Items.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/Items.php
@@ -142,32 +142,18 @@ final class Items implements ItemsInterface
* @param string $key The key on which the values being searched.
* @param string $get The key of the values we want back
*
- * @return array|null The array of found values.
+ * @return array|null The array of found values.
* @since 3.2.2
*/
public function values(array $values, string $key = 'guid', string $get = 'id'): ?array
{
// Perform the database query
- $rows = $this->database->rows(
- ["a.$get" => $get],
- ["a" => $this->getTable()],
- ["a.$key" => ['operator' => 'IN', 'value' => $values]]
- );
-
- // Check if rows are found
- if ($rows !== null)
- {
- // Return the values from the found rows
- return array_values(
- array_map(
- fn($row) => $row[$get],
- $rows
- )
- );
- }
-
- // Return null if no rows are found
- return null;
+ return $this->load->table($this->getTable())->values([
+ $key => [
+ 'operator' => 'IN',
+ 'value' => array_values($values)
+ ]
+ ], $get);
}
/**
@@ -202,7 +188,7 @@ final class Items implements ItemsInterface
* @return bool
* @since 3.2.2
*/
- public function delete(string $values, string $key = 'guid'): bool
+ public function delete(array $values, string $key = 'guid'): bool
{
return $this->delete->table($this->getTable())->items([$key => ['operator' => 'IN', 'value' => $values]]);
}
@@ -269,7 +255,12 @@ final class Items implements ItemsInterface
];
// Check for existing items.
- $existingItems = $this->values($values, $key, $key);
+ $existingItems = $this->database->values(
+ ["a.$key" => $key],
+ ["a" => $this->getTable()],
+ ["a.$key" => ['operator' => 'IN', 'value' => $values]]
+ );
+
if ($existingItems !== null)
{
$sets['update'] = $this->extractSet($items, $existingItems, $key) ?? [];
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php
new file mode 100644
index 000000000..e875d2b1b
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php
@@ -0,0 +1,511 @@
+
+ * @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
+ */
+
+namespace VDM\Joomla\Data;
+
+
+use VDM\Joomla\Interfaces\Data\SubformInterface as Subform;
+use VDM\Joomla\Interfaces\Data\MultiSubformInterface;
+
+
+/**
+ * CRUD the data of multi subform to another views (tables)
+ *
+ * @since 3.2.2
+ */
+final class MultiSubform implements MultiSubformInterface
+{
+ /**
+ * The Subform Class.
+ *
+ * @var Subform
+ * @since 3.2.2
+ */
+ protected Subform $subform;
+
+ /**
+ * Constructor.
+ *
+ * @param Subform $subform The Subform Class.
+ *
+ * @since 3.2.2
+ */
+ public function __construct(Subform $subform)
+ {
+ $this->subform = $subform;
+ }
+
+ /**
+ * Get a subform items
+ *
+ * @param array $getMap The the map to get the subfrom data
+ *
+ * Example:
+ * $getMap = [
+ * '_core' => [
+ * 'table' =>'data',
+ * 'linkValue' => $item->guid ?? '',
+ * 'linkKey' => 'look',
+ * 'field' => 'data',
+ * 'get' => ['guid','email','image','mobile_phone','website','dateofbirth']
+ * ],
+ * 'countries' => [
+ * 'table' =>'data_country',
+ * 'linkValue' => 'data:guid', // coretable:fieldname
+ * 'linkKey' => 'data',
+ * 'get' => ['guid','country','currency']
+ * ]
+ * ];
+ *
+ * @return array|null The subform
+ * @since 3.2.2
+ */
+ public function get(array $getMap): ?array
+ {
+ // Validate the core map presence and structure
+ if (!isset($getMap['_core']) || !is_array($getMap['_core']) || !$this->validGetMap($getMap['_core']))
+ {
+ return null;
+ }
+
+ // Initialize the core data
+ $coreData = $this->getSubformData($getMap['_core']);
+
+ // Return null if fetching core data fails
+ if (null === $coreData)
+ {
+ return null;
+ }
+ $table = $getMap['_core']['table'];
+ unset($getMap['_core']);
+
+ // Recursively get data for all nested subforms
+ return $this->getNestedSubforms($getMap, $coreData, $table);
+ }
+
+ /**
+ * Set a subform items
+ *
+ * @param array $items The list of items from the subform to set
+ * @param array $setMap The the map to set the subfrom data
+ *
+ * Example:
+ * $items,
+ * $setMap = [
+ * '_core' => [
+ * 'table' =>'data',
+ * 'indexKey' => 'guid',
+ * 'linkKey' => 'look',
+ * 'linkValue' => $data['guid'] ?? ''
+ * ],
+ * 'countries' => [
+ * 'table' =>'data_country',
+ * 'indexKey' => 'guid',
+ * 'linkKey' => 'data',
+ * 'linkValue' => 'data:guid' // coretable:fieldname
+ * ]
+ * ];
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ public function set(array $items, array $setMap): bool
+ {
+ // Validate the core map presence and structure
+ if (!isset($setMap['_core']) || !is_array($setMap['_core']) || !$this->validSetMap($setMap['_core']))
+ {
+ return false;
+ }
+
+ // Save the core data
+ if (!$this->setSubformData($items, $setMap['_core']))
+ {
+ return false;
+ }
+ $table = $setMap['_core']['table'];
+ unset($setMap['_core']);
+
+ // Recursively set data for all nested subforms
+ return $this->setNestedSubforms($setMap, $items, $table);
+ }
+
+ /**
+ * Fetch data based on provided map configuration.
+ *
+ * @param array $map Map configuration
+ * @param array|null $coreData The core data to be appended with subform data
+ *
+ * @return array|null Fetched data or null on failure
+ * @since 3.2.2
+ */
+ private function getSubformData(array $map, ?array $coreData = null): ?array
+ {
+ $map['linkValue'] = $this->setLinkValue($map['linkValue'], $coreData);
+
+ if (empty($map['linkValue']) || strpos($map['linkValue'], ':') !== false)
+ {
+ return null;
+ }
+
+ return $this->subform->table($map['table'])->get(
+ $map['linkValue'],
+ $map['linkKey'],
+ $map['field'],
+ $map['get']
+ );
+ }
+
+ /**
+ * Set data based on provided map configuration.
+ *
+ * @param array $items The list of items from the subform to set
+ * @param array $map The the map to set the subfrom data
+ * @param array|null $coreData The core data to be appended with subform data
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ private function setSubformData(array $items, array $map, ?array $coreData = null): bool
+ {
+ $map['linkValue'] = $this->setLinkValue($map['linkValue'], $coreData);
+
+ if (empty($map['linkValue']) || strpos($map['linkValue'], ':') !== false)
+ {
+ return false;
+ }
+
+ return $this->subform->table($map['table'])->set(
+ $items,
+ $map['indexKey'],
+ $map['linkKey'],
+ $map['linkValue']
+ );
+ }
+
+ /**
+ * Set the linked value if needed, and posible.
+ *
+ * @param string $linkValue The current linkValue
+ * @param array|null $data The already found data as table => dataSet[field] => value
+ *
+ * @return string|null The actual linkValue
+ * @since 3.2.2
+ */
+ private function setLinkValue(string $linkValue, ?array $data = null): ?string
+ {
+ if ($data !== null && strpos($linkValue, ':') !== false)
+ {
+ [$table, $field] = explode(':', $linkValue);
+ $linkValue = $data[$table][$field] ?? null;
+ }
+
+ return $linkValue;
+ }
+
+ /**
+ * Recursively process additional subform data.
+ *
+ * @param array $getMap The nested map of data to process
+ * @param array $subformData The core subform data
+ * @param string $table The core table
+ *
+ * @return array The core data with nested subforms included
+ * @since 3.2.2
+ */
+ private function getNestedSubforms(array $getMap, array $subformData, string $table): array
+ {
+ foreach ($subformData as &$subform)
+ {
+ $subform = $this->processGetSubform($getMap, $subform, $table);
+ }
+
+ return $subformData;
+ }
+
+ /**
+ * Recursively process additional subform data.
+ *
+ * @param array $setMap The nested map of data to process
+ * @param array $subformData The core subform data
+ * @param string $table The core table
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ private function setNestedSubforms(array $setMap, array $subformData, string $table): bool
+ {
+ $status = true;
+ foreach ($subformData as $subform)
+ {
+ if (!$this->processSetSubform($setMap, $subform, $table))
+ {
+ $status = false;
+ }
+ }
+
+ return $status;
+ }
+
+ /**
+ * Process each subform entry based on the map.
+ *
+ * @param array $getMap Mapping data for processing subforms
+ * @param array $subform A single subform entry
+ * @param string $table The table name used for linking values
+ *
+ * @return array Updated subform
+ * @since 3.2.2
+ */
+ private function processGetSubform(array $getMap, array $subform, string $table): array
+ {
+ foreach ($getMap as $key => $map)
+ {
+ if (!is_array($map) || isset($subform[$key]))
+ {
+ continue;
+ }
+
+ $this->processGetMap($subform, $map, $key, $table);
+ }
+
+ return $subform;
+ }
+
+ /**
+ * Process each subform entry based on the map.
+ *
+ * @param array $setMap Mapping data for processing subforms
+ * @param array $subform A single subform entry
+ * @param string $table The table name used for linking values
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ private function processSetSubform(array $setMap, array $subform, string $table): bool
+ {
+ $status = true;
+ foreach ($setMap as $key => $map)
+ {
+ if (!is_array($map) || !isset($subform[$key]))
+ {
+ continue;
+ }
+
+ if (!$this->processSetMap($subform, $map, $key, $table))
+ {
+ $status = false;
+ }
+ }
+
+ return $status;
+ }
+
+ /**
+ * Process a given map by either fetching nested subforms or handling them directly.
+ *
+ * @param array &$subform Reference to subform data
+ * @param array $map Map configuration for subform processing
+ * @param string $key Key associated with the map
+ * @param string $table Core table name for linking values
+ *
+ * @return void
+ * @since 3.2.2
+ */
+ private function processGetMap(array &$subform, array $map, string $key, string $table): void
+ {
+ if (isset($map['_core']))
+ {
+ $this->handleCoreGetMap($subform, $map, $key, $table);
+ }
+ else
+ {
+ $this->handleRegularGetMap($subform, $map, $key, $table);
+ }
+ }
+
+ /**
+ * Process a given map by either setting nested subforms or handling them directly.
+ *
+ * @param array $subform Subform data
+ * @param array $map Map configuration for subform processing
+ * @param string $key Key associated with the map
+ * @param string $table Core table name for linking values
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ private function processSetMap(array $subform, array $map, string $key, string $table): bool
+ {
+ if (isset($map['_core']))
+ {
+ return $this->handleCoreSetMap($subform, $map, $key, $table);
+ }
+
+ return $this->handleRegularSetMap($subform, $map, $key, $table);
+ }
+
+ /**
+ * Handle the processing of '_core' maps in a subform.
+ *
+ * @param array &$subform Reference to subform data
+ * @param array $map Map configuration for core subform processing
+ * @param string $key Key associated with the map
+ * @param string $table Core table name for linking values
+ *
+ * @return void
+ * @since 3.2.2
+ */
+ private function handleCoreGetMap(array &$subform, array $map, string $key, string $table): void
+ {
+ if (is_array($map['_core']) && $this->validGetMap($map['_core']))
+ {
+ $map['_core']['linkValue'] = $this->setLinkValue($map['_core']['linkValue'], [$table => $subform]);
+
+ $subCoreData = $this->get($map);
+ if ($subCoreData !== null)
+ {
+ $subform[$key] = $subCoreData;
+ }
+ }
+ }
+
+ /**
+ * Handle the processing of '_core' maps in a subform.
+ *
+ * @param array $subform Subform data
+ * @param array $map Map configuration for core subform processing
+ * @param string $key Key associated with the map
+ * @param string $table Core table name for linking values
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ private function handleCoreSetMap(array $subform, array $map, string $key, string $table): bool
+ {
+ if (is_array($map['_core']) && $this->validGetMap($map['_core']))
+ {
+ $map['_core']['linkValue'] = $this->setLinkValue($map['_core']['linkValue'], [$table => $subform]);
+
+ return $this->set($subform[$key], $map);
+ }
+
+ return false;
+ }
+
+ /**
+ * Handle the processing of regular maps in a subform.
+ *
+ * @param array &$subform Reference to subform data
+ * @param array $map Map configuration for regular subform processing
+ * @param string $key Key associated with the map
+ * @param string $table Core table name for linking values
+ *
+ * @return void
+ * @since 3.2.2
+ */
+ private function handleRegularGetMap(array &$subform, array $map, string $key, string $table): void
+ {
+ $map['field'] = $key;
+ if ($this->validGetMap($map))
+ {
+ $subformData = $this->getSubformData($map, [$table => $subform]);
+ if ($subformData !== null)
+ {
+ $subform[$key] = $subformData;
+ }
+ }
+ }
+
+ /**
+ * Handle the processing of regular maps in a subform.
+ *
+ * @param array $subform Subform data
+ * @param array $map Map configuration for regular subform processing
+ * @param string $key Key associated with the map
+ * @param string $table Core table name for linking values
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ private function handleRegularSetMap(array $subform, array $map, string $key, string $table): bool
+ {
+ if ($this->validSetMap($map))
+ {
+ return $this->setSubformData($subform[$key], $map, [$table => $subform]);
+ }
+
+ return false;
+ }
+
+ /**
+ * Validate the get map configuration for fetching subform data.
+ * Ensures all required keys are present and have valid values.
+ *
+ * @param array $map The map configuration to validate.
+ *
+ * @return bool Returns true if the map is valid, false otherwise.
+ * @since 3.2.2
+ */
+ private function validGetMap(array $map): bool
+ {
+ // List of required keys with their expected types or validation functions
+ $requiredKeys = [
+ 'table' => 'is_string',
+ 'linkValue' => 'is_string',
+ 'linkKey' => 'is_string',
+ 'field' => 'is_string',
+ 'get' => 'is_array'
+ ];
+
+ // Iterate through each required key and validate
+ foreach ($requiredKeys as $key => $validator)
+ {
+ if (empty($map[$key]) || !$validator($map[$key]))
+ {
+ return false; // Key missing or validation failed
+ }
+ }
+
+ return true; // All checks passed
+ }
+
+ /**
+ * Validate the set map configuration for fetching subform data.
+ * Ensures all required keys are present and have valid values.
+ *
+ * @param array $map The map configuration to validate.
+ *
+ * @return bool Returns true if the map is valid, false otherwise.
+ * @since 3.2.2
+ */
+ private function validSetMap(array $map): bool
+ {
+ // List of required keys with their expected types or validation functions
+ $requiredKeys = [
+ 'table' => 'is_string',
+ 'indexKey' => 'is_string',
+ 'linkKey' => 'is_string',
+ 'linkValue' => 'is_string'
+ ];
+
+ // Iterate through each required key and validate
+ foreach ($requiredKeys as $key => $validator)
+ {
+ if (empty($map[$key]) || !$validator($map[$key]))
+ {
+ return false; // Key missing or validation failed
+ }
+ }
+
+ return true; // All checks passed
+ }
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/Subform.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/Subform.php
new file mode 100644
index 000000000..7aaeefe75
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/Subform.php
@@ -0,0 +1,310 @@
+
+ * @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
+ */
+
+namespace VDM\Joomla\Data;
+
+
+use VDM\Joomla\Interfaces\Data\ItemsInterface as Items;
+use VDM\Joomla\Interfaces\Data\SubformInterface;
+
+
+/**
+ * CRUD the data of any sub-form to another view (table)
+ *
+ * @since 3.2.2
+ */
+final class Subform implements SubformInterface
+{
+ /**
+ * The ItemsInterface Class.
+ *
+ * @var Items
+ * @since 3.2.2
+ */
+ protected Items $items;
+
+ /**
+ * Table Name
+ *
+ * @var string
+ * @since 3.2.1
+ */
+ protected string $table;
+
+ /**
+ * Constructor.
+ *
+ * @param Items $items The ItemsInterface Class.
+ * @param string|null $table The table name.
+ *
+ * @since 3.2.2
+ */
+ public function __construct(Items $items, ?string $table = null)
+ {
+ $this->items = $items;
+ if ($table !== null)
+ {
+ $this->table = $table;
+ }
+ }
+
+ /**
+ * Set the current active table
+ *
+ * @param string $table The table that should be active
+ *
+ * @return self
+ * @since 3.2.2
+ */
+ public function table(string $table): self
+ {
+ $this->table = $table;
+
+ return $this;
+ }
+
+ /**
+ * Get a subform items
+ *
+ * @param string $linkValue The value of the link key in child table.
+ * @param string $linkKey The link key on which the items where linked in the child table.
+ * @param string $field The parent field name of the subform in the parent view.
+ * @param array $get The array get:set of the keys of each row in the subform.
+ *
+ * @return array|null The subform
+ * @since 3.2.2
+ */
+ public function get(string $linkValue, string $linkKey, string $field, array $get): ?array
+ {
+ if (($items = $this->items->table($this->getTable())->get([$linkValue], $linkKey)) !== null)
+ {
+ return $this->converter($items, $get, $field);
+ }
+ return null;
+ }
+
+ /**
+ * Set a subform items
+ *
+ * @param array $items The list of items from the subform to set
+ * @param string $indexKey The index key on which the items should be observed as it relates to insert/update/delete.
+ * @param string $linkKey The link key on which the items where linked in the child table.
+ * @param string $linkValue The value of the link key in child table.
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ public function set(array $items, string $indexKey, string $linkKey, string $linkValue): bool
+ {
+ $items = $this->process($items, $indexKey, $linkKey, $linkValue);
+
+ $this->purge($items, $indexKey, $linkKey, $linkValue);
+
+ return $this->items->table($this->getTable())->set(
+ $items, $indexKey
+ );
+ }
+
+ /**
+ * Get the current active table
+ *
+ * @return string
+ * @since 3.2.2
+ */
+ public function getTable(): string
+ {
+ return $this->table;
+ }
+
+ /**
+ * Purge all items no longer in subform
+ *
+ * @param array $items The list of items to set.
+ * @param string $indexKey The index key on which the items should be observed as it relates to insert/update/delete
+ * @param string $linkKey The link key on which the items where linked in the child table.
+ * @param string $linkValue The value of the link key in child table.
+ *
+ * @return void
+ * @since 3.2.2
+ */
+ private function purge(array $items, string $indexKey, string $linkKey, string $linkValue): void
+ {
+ // Get the current index values from the database
+ $currentIndexValues = $this->items->table($this->getTable())->values([$linkValue], $linkKey, $indexKey);
+
+ if ($currentIndexValues !== null)
+ {
+ // Extract the index values from the items array
+ $activeIndexValues = array_values(array_map(function($item) use ($indexKey) {
+ return $item[$indexKey] ?? null;
+ }, $items));
+
+ // Find the index values that are no longer in the items array
+ $inactiveIndexValues = array_diff($currentIndexValues, $activeIndexValues);
+
+ // Delete the inactive index values
+ if (!empty($inactiveIndexValues))
+ {
+ $this->items->table($this->getTable())->delete($inactiveIndexValues, $indexKey);
+ }
+ }
+ }
+
+ /**
+ * Filters the specified keys from an array of objects or arrays, converts them to arrays,
+ * and sets them by association with a specified key and an incrementing integer.
+ *
+ * @param array $items Array of objects or arrays to be filtered.
+ * @param array $keySet Array of keys to retain in each item.
+ * @param string $field The field prefix for the resulting associative array.
+ *
+ * @return array Array of filtered arrays set by association.
+ * @since 3.2.2
+ */
+ private function converter(array $items, array $keySet, string $field): array
+ {
+ /**
+ * Filters keys for a single item and converts it to an array.
+ *
+ * @param object|array $item The item to filter.
+ * @param array $keySet The keys to retain.
+ *
+ * @return array The filtered array.
+ * @since 3.2.2
+ */
+ $filterKeys = function ($item, array $keySet) {
+ $filteredArray = [];
+ foreach ($keySet as $key) {
+ if (is_object($item) && property_exists($item, $key)) {
+ $filteredArray[$key] = $item->{$key};
+ } elseif (is_array($item) && array_key_exists($key, $item)) {
+ $filteredArray[$key] = $item[$key];
+ }
+ }
+ return $filteredArray;
+ };
+
+ $result = [];
+ foreach ($items as $index => $item)
+ {
+ $filteredArray = $filterKeys($item, $keySet);
+ $result[$field . $index] = $filteredArray;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Processes an array of arrays based on the specified key.
+ *
+ * @param array $items Array of arrays to be processed.
+ * @param string $indexKey The index key on which the items should be observed as it relates to insert/update/delete
+ * @param string $linkKey The link key on which the items where linked in the child table.
+ * @param string $linkValue The value of the link key in child table.
+ *
+ * @return array The processed array of arrays.
+ * @since 3.2.2
+ */
+ private function process(array $items, string $indexKey, string $linkKey, string $linkValue): array
+ {
+ foreach ($items as &$item)
+ {
+ $value = $item[$indexKey] ?? '';
+ switch ($indexKey) {
+ case 'guid':
+ if (empty($value))
+ {
+ // set INDEX
+ $item[$indexKey] = $this->setGuid($indexKey);
+ }
+ break;
+ case 'id':
+ if (empty($value))
+ {
+ $item[$indexKey] = 0;
+ }
+ break;
+ default:
+ // No action for other keys if empty
+ break;
+ }
+ // set LINK
+ $item[$linkKey] = $linkValue;
+ }
+
+ return array_values($items);
+ }
+
+ /**
+ * Returns a GUIDv4 string
+ *
+ * Thanks to Dave Pearson (and other)
+ * https://www.php.net/manual/en/function.com-create-guid.php#119168
+ *
+ * Uses the best cryptographically secure method
+ * for all supported platforms with fallback to an older,
+ * less secure version.
+ *
+ * @param string $key The key to check and modify values.
+ * @param bool $trim
+ *
+ * @return string
+ *
+ * @since 3.0.9
+ */
+ private function setGuid(string $key, bool $trim = true): string
+ {
+ // Windows
+ if (function_exists('com_create_guid'))
+ {
+ if ($trim)
+ {
+ return trim(\com_create_guid(), '{}');
+ }
+ return \com_create_guid();
+ }
+
+ // set the braces if needed
+ $lbrace = $trim ? "" : chr(123); // "{"
+ $rbrace = $trim ? "" : chr(125); // "}"
+
+ // OSX/Linux
+ if (function_exists('openssl_random_pseudo_bytes'))
+ {
+ $data = \openssl_random_pseudo_bytes(16);
+ $data[6] = chr( ord($data[6]) & 0x0f | 0x40); // set version to 0100
+ $data[8] = chr( ord($data[8]) & 0x3f | 0x80); // set bits 6-7 to 10
+ return $lbrace . vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4)) . $lbrace;
+ }
+
+ // Fallback (PHP 4.2+)
+ mt_srand((double) microtime() * 10000);
+ $charid = strtolower( md5( uniqid( rand(), true)));
+ $hyphen = chr(45); // "-"
+ $guidv4 = $lbrace.
+ substr($charid, 0, 8). $hyphen.
+ substr($charid, 8, 4). $hyphen.
+ substr($charid, 12, 4). $hyphen.
+ substr($charid, 16, 4). $hyphen.
+ substr($charid, 20, 12).
+ $rbrace;
+
+ // check that it does not already exist (one in a billion chance ;)
+ // but we do it any way...
+ if ($this->items->table($this->getTable())->values([$guidv4], $key))
+ {
+ return $this->setGuid($key);
+ }
+
+ return $guidv4;
+ }
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/index.html b/libraries/vendor_jcb/VDM.Joomla/src/Data/index.html
new file mode 100644
index 000000000..fa6d84e80
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Database/Load.php b/libraries/vendor_jcb/VDM.Joomla/src/Database/Load.php
index ab7b5ff80..1670adcc9 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Database/Load.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Database/Load.php
@@ -216,6 +216,31 @@ final class Load extends Database implements LoadInterface
return null;
}
+ /**
+ * Load values from multiple rows
+ *
+ * @param array $select Array of selection keys
+ * @param array $tables Array of tables to search
+ * @param array|null $where Array of where key=>value match exist
+ * @param array|null $order Array of how to order the data
+ * @param int|null $limit Limit the number of values returned
+ *
+ * @return array|null
+ * @since 3.2.2
+ **/
+ public function values(array $select, array $tables, ?array $where = null,
+ ?array $order = null, ?int $limit = null): ?array
+ {
+ // check if we can get many rows
+ if ($this->many($select, $tables, $where, $order, $limit))
+ {
+ return $this->db->loadColumn();
+ }
+
+ // data does not exist
+ return null;
+ }
+
/**
* Load many
*
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/ItemsInterface.php b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/ItemsInterface.php
index 62e2f0880..408d13262 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/ItemsInterface.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/ItemsInterface.php
@@ -72,7 +72,7 @@ interface ItemsInterface
* @return bool
* @since 3.2.2
*/
- public function delete(string $values, string $key = 'guid'): bool;
+ public function delete(array $values, string $key = 'guid'): bool;
/**
* Get the current active table
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/LoadInterface.php b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/LoadInterface.php
index f43616fbf..2eec35ce2 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/LoadInterface.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/LoadInterface.php
@@ -45,6 +45,22 @@ interface LoadInterface
*/
public function value(array $keys, string $field);
+ /**
+ * Get a value from multiple rows from a given table
+ * Example: $this->values(
+ * [
+ * 'guid' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+ * ], 'value_key'
+ * );
+ *
+ * @param array $keys The item keys
+ * @param string $field The field key
+ *
+ * @return array|null
+ * @since 3.2.2
+ */
+ public function values(array $keys, string $field): ?array;
+
/**
* Get values from a given table
* Example: $this->item(
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/MultiSubformInterface.php b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/MultiSubformInterface.php
new file mode 100644
index 000000000..285318d65
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/MultiSubformInterface.php
@@ -0,0 +1,77 @@
+
+ * @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
+ */
+
+namespace VDM\Joomla\Interfaces\Data;
+
+
+/**
+ * Data Multi Subform Interface
+ *
+ * @since 3.2.2
+ */
+interface MultiSubformInterface
+{
+ /**
+ * Get a subform items
+ *
+ * @param array $getMap The the map to get the subfrom data
+ *
+ * Example:
+ * $getMap = [
+ * '_core' => [
+ * 'table' =>'data',
+ * 'linkValue' => $item->guid ?? '',
+ * 'linkKey' => 'look',
+ * 'field' => 'data',
+ * 'get' => ['guid','email','image','mobile_phone','website','dateofbirth']
+ * ],
+ * 'countries' => [
+ * 'table' =>'data_country',
+ * 'linkValue' => 'data:guid', // coretable:fieldname
+ * 'linkKey' => 'data',
+ * 'get' => ['guid','country','currency']
+ * ]
+ * ];
+ *
+ * @return array|null The subform
+ * @since 3.2.2
+ */
+ public function get(array $getMap): ?array;
+
+ /**
+ * Set a subform items
+ *
+ * @param array $items The list of items from the subform to set
+ * @param array $setMap The the map to set the subfrom data
+ *
+ * Example:
+ * $items,
+ * $setMap = [
+ * '_core' => [
+ * 'table' =>'data',
+ * 'indexKey' => 'guid',
+ * 'linkKey' => 'look',
+ * 'linkValue' => $data['guid'] ?? ''
+ * ],
+ * 'countries' => [
+ * 'table' =>'data_country',
+ * 'indexKey' => 'guid',
+ * 'linkKey' => 'data',
+ * 'linkValue' => 'data:guid' // coretable:fieldname
+ * ]
+ * ];
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ public function set(array $items, array $setMap): bool;
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/SubformInterface.php b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/SubformInterface.php
new file mode 100644
index 000000000..ce4264281
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Data/SubformInterface.php
@@ -0,0 +1,66 @@
+
+ * @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
+ */
+
+namespace VDM\Joomla\Interfaces\Data;
+
+
+/**
+ * Data Subform Interface
+ *
+ * @since 3.2.2
+ */
+interface SubformInterface
+{
+ /**
+ * Set the current active table
+ *
+ * @param string $table The table that should be active
+ *
+ * @return self
+ * @since 3.2.2
+ */
+ public function table(string $table): self;
+
+ /**
+ * Get a subform items
+ *
+ * @param string $linkValue The value of the link key in child table.
+ * @param string $linkKey The link key on which the items where linked in the child table.
+ * @param string $field The parent field name of the subform in the parent view.
+ * @param array $set The array SET of the keys of each row in the subform.
+ *
+ * @return array|null The subform
+ * @since 3.2.2
+ */
+ public function get(string $linkValue, string $linkKey, string $field, array $set): ?array;
+
+ /**
+ * Set a subform items
+ *
+ * @param array $items The list of items from the subform to set
+ * @param string $indexKey The index key on which the items should be observed as it relates to insert/update/delete.
+ * @param string $linkKey The link key on which the items where linked in the child table.
+ * @param string $linkValue The value of the link key in child table.
+ *
+ * @return bool
+ * @since 3.2.2
+ */
+ public function set(array $items, string $indexKey, string $linkKey, string $linkValue): bool;
+
+ /**
+ * Get the current active table
+ *
+ * @return string
+ * @since 3.2.2
+ */
+ public function getTable(): string;
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/FactoryInterface.php b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/FactoryInterface.php
index 0dd2e4cf7..d623032da 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/FactoryInterface.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/FactoryInterface.php
@@ -16,7 +16,9 @@ use Joomla\DI\Container;
/**
- * The Container Factory Interface
+ * The Container Factory Interface
+ *
+ * @since 0.0.0
*/
interface FactoryInterface
{
@@ -26,7 +28,7 @@ interface FactoryInterface
* @param string $key The container class key
*
* @return Mixed
- * @since 3.2.0
+ * @since 0.0.0
*/
public static function _(string $key);
@@ -34,7 +36,7 @@ interface FactoryInterface
* Get the global container
*
* @return Container
- * @since 3.2.0
+ * @since 0.0.0
*/
public static function getContainer(): Container;
}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/LoadInterface.php b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/LoadInterface.php
index 31017c584..2bff03f33 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/LoadInterface.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/LoadInterface.php
@@ -109,6 +109,21 @@ interface LoadInterface
* @return mixed
* @since 3.2.0
**/
- public function value(array $select, array $tables, ?array $where = null, ?array $order = null);
+ public function value(array $select, array $tables, ?array $where = null, ?array $order = null);
+
+ /**
+ * Load values from multiple rows
+ *
+ * @param array $select Array of selection keys
+ * @param array $tables Array of tables to search
+ * @param array|null $where Array of where key=>value match exist
+ * @param array|null $order Array of how to order the data
+ * @param int|null $limit Limit the number of values returned
+ *
+ * @return array|null
+ * @since 3.2.2
+ **/
+ public function values(array $select, array $tables, ?array $where = null,
+ ?array $order = null, ?int $limit = null): ?array;
}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/ModelInterface.php b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/ModelInterface.php
index c93e80a04..bb02cfa77 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/ModelInterface.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/ModelInterface.php
@@ -42,6 +42,19 @@ interface ModelInterface
*/
public function value($value, string $field, ?string $table = null);
+ /**
+ * Model a value of multiple items
+ * Example: $this->items(Array, 'value_key', 'table_name');
+ *
+ * @param array|null $items The array of values
+ * @param string $field The field key
+ * @param string|null $table The table
+ *
+ * @return array|null
+ * @since 3.2.0
+ */
+ public function values(?array $items = null, string $field, ?string $table = null): ?array;
+
/**
* Model the values of an item
* Example: $this->item(Object, 'table_name');
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Registryinterface.php b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Registryinterface.php
index c41162d59..58aae26a2 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Registryinterface.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Interfaces/Registryinterface.php
@@ -29,10 +29,10 @@ interface Registryinterface extends Activeregistryinterface
* @param mixed $value Value of entry
*
* @throws \InvalidArgumentException If any of the path values are not a number or string.
- * @return $this
+ * @return self
* @since 3.2.0
*/
- public function set(string $path, $value): static;
+ public function set(string $path, $value): self;
/**
* Adds content into the registry. If a key exists,
@@ -45,10 +45,10 @@ interface Registryinterface extends Activeregistryinterface
* Override in child class allowed set class property $addAsArray = true.
*
* @throws \InvalidArgumentException If any of the path values are not a number or string.
- * @return $this
+ * @return self
* @since 3.2.0
*/
- public function add(string $path, $value, ?bool $asArray = null): static;
+ public function add(string $path, $value, ?bool $asArray = null): self;
/**
* Retrieves a value (or sub-array) from the registry using multiple keys.
@@ -68,10 +68,10 @@ interface Registryinterface extends Activeregistryinterface
* @param string $path Registry path (e.g. vdm.content.builder)
*
* @throws \InvalidArgumentException If any of the path values are not a number or string.
- * @return $this
+ * @return self
* @since 3.2.0
*/
- public function remove(string $path): static;
+ public function remove(string $path): self;
/**
* Checks the existence of a particular location in the registry using multiple keys.
@@ -89,9 +89,9 @@ interface Registryinterface extends Activeregistryinterface
*
* @param string|null $value The value to set.
*
- * @return $this
+ * @return self
* @since 3.2.0
*/
- public function setSeparator(?string $value): static;
+ public function setSeparator(?string $value): self;
}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Service/Data.php b/libraries/vendor_jcb/VDM.Joomla/src/Service/Data.php
index d05319a77..7d305c11c 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Service/Data.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Service/Data.php
@@ -20,6 +20,8 @@ use VDM\Joomla\Data\Action\Update;
use VDM\Joomla\Data\Action\Delete;
use VDM\Joomla\Data\Item;
use VDM\Joomla\Data\Items;
+use VDM\Joomla\Data\Subform;
+use VDM\Joomla\Data\MultiSubform;
/**
@@ -56,6 +58,12 @@ class Data implements ServiceProviderInterface
$container->alias(Items::class, 'Data.Items')
->share('Data.Items', [$this, 'getItems'], true);
+
+ $container->alias(Subform::class, 'Data.Subform')
+ ->share('Data.Subform', [$this, 'getSubform'], true);
+
+ $container->alias(MultiSubform::class, 'Data.MultiSubform')
+ ->share('Data.MultiSubform', [$this, 'getMultiSubform'], true);
}
/**
@@ -157,6 +165,36 @@ class Data implements ServiceProviderInterface
$container->get('Data.Delete'),
$container->get('Load')
);
+ }
+
+ /**
+ * Get The Subform Class.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return Subform
+ * @since 3.2.0
+ */
+ public function getSubform(Container $container): Subform
+ {
+ return new Subform(
+ $container->get('Data.Items')
+ );
+ }
+
+ /**
+ * Get The MultiSubform Class.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return MultiSubform
+ * @since 3.2.0
+ */
+ public function getMultiSubform(Container $container): MultiSubform
+ {
+ return new MultiSubform(
+ $container->get('Data.Subform')
+ );
}
}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Service/Table.php b/libraries/vendor_jcb/VDM.Joomla/src/Service/Table.php
new file mode 100644
index 000000000..eaf4110de
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Service/Table.php
@@ -0,0 +1,73 @@
+
+ * @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
+ */
+
+namespace VDM\Joomla\Service;
+
+
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use VDM\Joomla\Componentbuilder\Table as DataTable;
+use VDM\Joomla\Componentbuilder\Table\Schema;
+
+
+/**
+ * Table Service Provider
+ *
+ * @since 3.2.2
+ */
+class Table implements ServiceProviderInterface
+{
+ /**
+ * Registers the service provider with a DI container.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return void
+ * @since 3.2.2
+ */
+ public function register(Container $container)
+ {
+ $container->alias(DataTable::class, 'Table')
+ ->share('Table', [$this, 'getTable'], true);
+
+ $container->alias(Schema::class, 'Table.Schema')
+ ->share('Table.Schema', [$this, 'getSchema'], true);
+ }
+
+ /**
+ * Get The Componentbuilder Data Table Class.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return DataTable
+ * @since 3.2.2
+ */
+ public function getTable(Container $container): DataTable
+ {
+ return new DataTable();
+ }
+
+ /**
+ * Get The Schema Class.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return Schema
+ * @since 3.2.2
+ */
+ public function getSchema(Container $container): Schema
+ {
+ return new Schema(
+ $container->get('Table')
+ );
+ }
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/GetHelper.php b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/GetHelper.php
index 1f89e7b87..d3bfcdfd7 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/GetHelper.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/GetHelper.php
@@ -14,6 +14,7 @@ namespace VDM\Joomla\Utilities;
use Joomla\CMS\Factory;
use VDM\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Data\Factory as Data;
/**
@@ -35,6 +36,8 @@ abstract class GetHelper
*
* @return mixed string/int/float
* @since 3.0.9
+ *
+ * @deprecated 5.1 Use Data::_('Load')->table($table)->value(...)
*/
public static function var(?string $table = null, $where = null,
string $whereString = 'user', string $what = 'id',
@@ -103,6 +106,8 @@ abstract class GetHelper
*
* @return array|null
* @since 3.0.9
+ *
+ * @deprecated 5.1 Use Data::_('Load')->table($table)->values(...)
*/
public static function vars(?string $table = null, $where = null,
string $whereString = 'user', string $what = 'id', string $operator = 'IN',
diff --git a/script.php b/script.php
index 59f378c84..cfd89e2dc 100644
--- a/script.php
+++ b/script.php
@@ -9979,7 +9979,7 @@ class Com_ComponentbuilderInstallerScript
echo '
-
Upgrade to Version 3.2.2-alpha5 Was Successful! Let us know if anything is not working as expected.
';
+ Upgrade to Version 3.2.2-alpha6 Was Successful! Let us know if anything is not working as expected.
';
// Set db if not set already.
if (!isset($db))