From 45453f733054d606e78d7d2ec2c3f515fe359694 Mon Sep 17 00:00:00 2001 From: aB0t Date: Tue, 15 Jul 2025 08:05:13 +0000 Subject: [PATCH] Release of v5.1.2-alpha1 Fix the template and layout linker for packages. --- CHANGELOG.md | 4 + ComponentbuilderInstallerScript.php | 2 +- README.md | 6 +- admin/README.txt | 6 +- admin/sql/install.mysql.utf8.sql | 10 +- admin/sql/updates/mysql/5_1_1.sql | 1 + componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 18 ++++ .../Compiler/Helper/Interpretation.php | 14 +-- .../Package/Dependency/Resolver.php | 96 +++++++++++++++++-- .../Package/Service/AdminView.php | 15 ++- .../Package/Service/Component.php | 39 +++++--- .../Package/Service/CustomAdminView.php | 3 +- .../Package/Service/CustomCode.php | 3 +- .../Package/Service/Dependencies.php | 18 ++-- .../Package/Service/DynamicGet.php | 3 +- .../Package/Service/Field.php | 3 +- .../Package/Service/JoomlaModule.php | 9 +- .../Package/Service/JoomlaPlugin.php | 12 ++- .../Package/Service/Layout.php | 3 +- .../Package/Service/Library.php | 9 +- .../Package/Service/SiteView.php | 3 +- .../Package/Service/Template.php | 3 +- .../Repository/Service/Repository.php | 3 +- .../Snippet/Service/Snippet.php | 6 +- 25 files changed, 222 insertions(+), 73 deletions(-) create mode 100644 admin/sql/updates/mysql/5_1_1.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 978f369fe..5ab885d3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v5.1.2-alpha1 + +- Fix the template and layout linker for packages. + # v5.1.1 - Move all banners to GitHub. diff --git a/ComponentbuilderInstallerScript.php b/ComponentbuilderInstallerScript.php index 6d6cd505d..6e55d00bb 100644 --- a/ComponentbuilderInstallerScript.php +++ b/ComponentbuilderInstallerScript.php @@ -3292,7 +3292,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface echo '
-

Upgrade to Version 5.1.1 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 5.1.2-alpha1 Was Successful! Let us know if anything is not working as expected.

'; // Add/Update component in the action logs extensions table. $this->setActionLogsExtensions(); diff --git a/README.md b/README.md index 0a374761b..622fca93c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This is a professional-grade [Joomla 5.x](https://extensions.joomla.org/extensio JCB generates native Joomla components, plugins, and modules for Joomla 3.x, 4.x, and 5.x - and is already prepared for Joomla 6. Every compiled project is tailored for the specific version without needing backward compatibility plugins. With integrated version-aware compiling, smart boilerplating, and Git-powered project syncing, JCB is much more than a code generator-it's a **full-stack development pipeline for Joomla extensions**. -You can install this component easily. The latest release (**5.1.1**) is available on [Releases](https://git.vdm.dev/joomla/pkg-component-builder/releases) and updated frequently with full source access. +You can install this component easily. The latest release (**5.1.2-alpha1**) is available on [Releases](https://git.vdm.dev/joomla/pkg-component-builder/releases) and updated frequently with full source access. Upgrades are seamless through Joomla's built-in extension update mechanism. @@ -229,9 +229,9 @@ JCB is developed by developers for developers. Its purpose is to democratize hig * **Company:** [Vast Development Method](https://dev.vdm.io) * **Author:** [Llewellyn van der Merwe](mailto:joomla@vdm.io) * **Component:** [Component Builder](https://git.vdm.dev/joomla/Component-Builder) -* **Created:** 30th April, 2015 · **Last Build:** 3rd July, 2025 · **Version:** 5.1.1 +* **Created:** 30th April, 2015 · **Last Build:** 15th July, 2025 · **Version:** 5.1.2-alpha1 * **License:** GNU General Public License version 2 or later; see LICENSE.txt · **Copyright:** Copyright (C) 2015 Vast Development Method. All rights reserved. -* **Lines:** 1094985 · **Fields:** 2096 · **Files:** 7515 · **Folders:** 728 +* **Lines:** 1095418 · **Fields:** 2096 · **Files:** 7516 · **Folders:** 728 > Generated with [JCB](https://www.joomlacomponentbuilder.com) — The Smartest Way to Build Joomla Extensions. diff --git a/admin/README.txt b/admin/README.txt index 0a374761b..622fca93c 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,7 @@ This is a professional-grade [Joomla 5.x](https://extensions.joomla.org/extensio JCB generates native Joomla components, plugins, and modules for Joomla 3.x, 4.x, and 5.x - and is already prepared for Joomla 6. Every compiled project is tailored for the specific version without needing backward compatibility plugins. With integrated version-aware compiling, smart boilerplating, and Git-powered project syncing, JCB is much more than a code generator-it's a **full-stack development pipeline for Joomla extensions**. -You can install this component easily. The latest release (**5.1.1**) is available on [Releases](https://git.vdm.dev/joomla/pkg-component-builder/releases) and updated frequently with full source access. +You can install this component easily. The latest release (**5.1.2-alpha1**) is available on [Releases](https://git.vdm.dev/joomla/pkg-component-builder/releases) and updated frequently with full source access. Upgrades are seamless through Joomla's built-in extension update mechanism. @@ -229,9 +229,9 @@ JCB is developed by developers for developers. Its purpose is to democratize hig * **Company:** [Vast Development Method](https://dev.vdm.io) * **Author:** [Llewellyn van der Merwe](mailto:joomla@vdm.io) * **Component:** [Component Builder](https://git.vdm.dev/joomla/Component-Builder) -* **Created:** 30th April, 2015 · **Last Build:** 3rd July, 2025 · **Version:** 5.1.1 +* **Created:** 30th April, 2015 · **Last Build:** 15th July, 2025 · **Version:** 5.1.2-alpha1 * **License:** GNU General Public License version 2 or later; see LICENSE.txt · **Copyright:** Copyright (C) 2015 Vast Development Method. All rights reserved. -* **Lines:** 1094985 · **Fields:** 2096 · **Files:** 7515 · **Folders:** 728 +* **Lines:** 1095418 · **Fields:** 2096 · **Files:** 7516 · **Folders:** 728 > Generated with [JCB](https://www.joomlacomponentbuilder.com) — The Smartest Way to Build Joomla Extensions. diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index c07dfc79e..b9e0b698b 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -3002,11 +3002,11 @@ INSERT INTO `#__componentbuilder_repository` (`id`, `system_name`, `organisation (17, 'Openai (codeberg - mirror)', 'joomla', 'openai', 1, 1, 'https://codeberg.org', 'c625381a-7795-4b9f-8b4e-997c9291e3fc', 'master', 1, 17, 1, '2025-06-17 21:47:49', '2024-06-10 11:03:19', NULL, '{}'), (18, 'Joomla Powers (codeberg - mirror)', 'joomla', 'joomla-powers', 2, 1, 'https://codeberg.org', '8ac595d4-0b1d-4877-ba3e-2b815c1c7e3c', 'master', 1, 18, 1, '2025-06-17 21:47:22', '2024-07-08 14:07:31', NULL, '{}'), (19, 'Joomla Field Types (codeberg - mirror)', 'joomla', 'joomla-fieldtypes', 3, 1, 'https://codeberg.org', 'bf4a1d77-e3a4-4aa8-a07f-2b01872bf7e9', 'master', 1, 19, 1, '2025-06-17 21:48:25', '2024-08-23 16:21:35', NULL, '{}'), -(20, 'Packages (github - mirror)', 'joomengine', 'packages', 4, 2, 'https://api.github.com', '562624ab-48bf-4979-9a14-6b10cf3635de', 'master', 1, 20, 1, '2025-06-24 19:43:43', '2025-05-31 08:47:01', NULL, '{}'), -(21, 'Snippets (github - mirror)', 'joomengine', 'snippets', 5, 2, 'https://api.github.com', '70e85588-bc28-4459-9b29-858f68faae8f', 'master', 1, 21, 1, '2025-06-24 15:11:19', '2025-06-18 10:35:14', NULL, '{}'), -(22, 'Repositories (github - mirror)', 'joomengine', 'repoindex', 6, 2, 'https://api.github.com', '8f156882-f299-4be2-ad13-fdb2c40bb207', 'master', 1, 22, 1, '2025-06-25 09:26:32', '2025-06-18 18:43:05', NULL, '{}'), -(23, 'Packages (codeberg - mirror)', 'joomla', 'packages', 4, 1, 'https://codeberg.org', '11298fc6-11a4-4075-bdcb-622ef4f3054d', 'master', 1, 21, 1, '2025-06-24 19:09:18', '2025-06-18 18:43:47', NULL, '{}'), -(24, 'Snippets (codeberg - mirror)', 'joomla', 'snippets', 5, 1, 'https://codeberg.org', '70a9b44b-0802-4b94-9132-e5f360d0215e', 'master', 1, 22, 1, '2025-06-24 19:09:14', '2025-06-24 15:10:05', NULL, '{}'), +(20, 'Packages (github - mirror)', 'joomengine', 'packages', 4, 2, 'https://api.github.com', '562624ab-48bf-4979-9a14-6b10cf3635de', 'master', 1, 23, 1, '2025-07-14 08:44:46', '2025-05-31 08:47:01', NULL, '{}'), +(21, 'Snippets (github - mirror)', 'joomengine', 'snippets', 5, 2, 'https://api.github.com', '70e85588-bc28-4459-9b29-858f68faae8f', 'master', 1, 24, 1, '2025-06-24 15:11:19', '2025-06-18 10:35:14', NULL, '{}'), +(22, 'Repositories (github - mirror)', 'joomengine', 'repoindex', 6, 2, 'https://api.github.com', '8f156882-f299-4be2-ad13-fdb2c40bb207', 'master', 1, 25, 1, '2025-06-25 09:26:32', '2025-06-18 18:43:05', NULL, '{}'), +(23, 'Packages (codeberg - mirror)', 'joomla', 'packages', 4, 1, 'https://codeberg.org', '11298fc6-11a4-4075-bdcb-622ef4f3054d', 'master', 1, 26, 1, '2025-07-14 08:44:46', '2025-06-18 18:43:47', NULL, '{}'), +(24, 'Snippets (codeberg - mirror)', 'joomla', 'snippets', 5, 1, 'https://codeberg.org', '70a9b44b-0802-4b94-9132-e5f360d0215e', 'master', 1, 27, 1, '2025-06-24 19:09:14', '2025-06-24 15:10:05', NULL, '{}'), (25, 'Repositories (codeberg - mirror)', 'joomla', 'repoindex', 6, 1, 'https://codeberg.org', 'a8701724-b77c-4e5a-9efc-61701341e8e5', 'master', 1, 21, 1, '2025-06-24 19:09:09', '2025-06-24 15:10:09', NULL, '{}'); -- diff --git a/admin/sql/updates/mysql/5_1_1.sql b/admin/sql/updates/mysql/5_1_1.sql new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/admin/sql/updates/mysql/5_1_1.sql @@ -0,0 +1 @@ + diff --git a/componentbuilder.xml b/componentbuilder.xml index 370e61f9b..fb72ea892 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 3rd July, 2025 + 15th July, 2025 Llewellyn van der Merwe joomla@vdm.io https://dev.vdm.io Copyright (C) 2015 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 5.1.1 + 5.1.2-alpha1 Component Builder (v.5.1.1) +

Component Builder (v.5.1.2-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 d853ff74f..994c1ad25 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -143,4 +143,22 @@ https://dev.vdm.io + + Component Builder + Builds Complex Joomla Components + pkg_component_builder + package + site + 5.1.2-alpha1 + https://dev.vdm.io + + https://github.com/joomengine/pkg-component-builder/archive/refs/tags/v5.1.2-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/src/Componentbuilder/Compiler/Helper/Interpretation.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php index 1e1a0d7bb..8cf7e5f78 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 @@ -3702,6 +3702,13 @@ class Interpretation extends Fields . "\$db->setQuery(\$query);"; $main .= PHP_EOL . Indent::_(2) . "\$items = \$db->loadObjectList();"; + $main .= PHP_EOL . PHP_EOL . Indent::_(2) + . "if (empty(\$items))"; + $main .= PHP_EOL . Indent::_(2) . "{"; + $main .= PHP_EOL . Indent::_(3) . "return false;"; + $main .= PHP_EOL . Indent::_(2) . "}"; + // SITE_GET_ITEMS <<>> + $main .= $this->setCustomViewGetItems($view, $view->code); // set after items php if (isset($view->add_php_after_getitems) && $view->add_php_after_getitems == 1 @@ -3714,13 +3721,6 @@ class Interpretation extends Fields $view->php_after_getitems ); } - $main .= PHP_EOL . PHP_EOL . Indent::_(2) - . "if (empty(\$items))"; - $main .= PHP_EOL . Indent::_(2) . "{"; - $main .= PHP_EOL . Indent::_(3) . "return false;"; - $main .= PHP_EOL . Indent::_(2) . "}"; - // SITE_GET_ITEMS <<>> - $main .= $this->setCustomViewGetItems($view, $view->code); $main .= PHP_EOL . Indent::_(2) . "//" . Line::_( __LINE__,__CLASS__ ) . " return items"; diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Dependency/Resolver.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Dependency/Resolver.php index 596e1d819..c1eb05fce 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Dependency/Resolver.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Dependency/Resolver.php @@ -17,6 +17,8 @@ use VDM\Joomla\Componentbuilder\Utilities\Normalize; use VDM\Joomla\Interfaces\Registryinterface as Tracker; use VDM\Joomla\Componentbuilder\Power\Interfaces\TableInterface as Table; use VDM\Joomla\Interfaces\Database\LoadInterface as Load; +use VDM\Joomla\Interfaces\Data\ItemsInterface as Items; +use VDM\Joomla\Data\Guid; use VDM\Joomla\Utilities\GetHelper; use VDM\Joomla\Utilities\StringHelper; use VDM\Joomla\Utilities\ArrayHelper; @@ -30,6 +32,13 @@ use VDM\Joomla\Interfaces\Remote\Dependency\ResolverInterface; */ final class Resolver implements ResolverInterface { + /** + * The Globally Unique Identifier. + * + * @since 5.1.2 + */ + use Guid; + /** * The Config Class. * @@ -70,6 +79,14 @@ final class Resolver implements ResolverInterface */ protected Load $load; + /** + * The Items Class. + * + * @var Items + * @since 5.1.2 + */ + protected Items $items; + /** * The parents fields. * @@ -142,6 +159,14 @@ final class Resolver implements ResolverInterface */ protected array $alias_map = []; + /** + * The Target Table name. + * + * @var string + * @since 5.1.2 + */ + protected string $table_name; + /** * The current item dependencies map. * @@ -158,21 +183,38 @@ final class Resolver implements ResolverInterface * @param Tracker $tracker The Tracker Class. * @param Table $table The Table Class. * @param Load $load The Load Class. + * @param Items $items The Items Class. * * @since 5.1.1 */ public function __construct(Config $config, Normalize $normalize, - Tracker $tracker, Table $table, Load $load) + Tracker $tracker, Table $table, Load $load, Items $items) { $this->config = $config; $this->normalize = $normalize; $this->tracker = $tracker; $this->table = $table; $this->load = $load; + $this->items = $items; $this->init(); } + /** + * Set the current active table + * + * @param string $table The table that should be active + * + * @return self + * @since 5.1.2 + */ + public function table(string $table): self + { + $this->table_name = $table; + + return $this; + } + /** * Inspect an item and extract all the dependencies * @@ -577,7 +619,7 @@ final class Resolver implements ResolverInterface $templates = []; $temp1 = GetHelper::allBetween($value, "\$this->load" . "Template('", "')"); - $temp2 = GetHelper::allBetween($value, '$this->load" . "Template("', '")'); + $temp2 = GetHelper::allBetween($value, '$this->load' . 'Template("', '")'); if (!empty($temp1)) { @@ -598,6 +640,7 @@ final class Resolver implements ResolverInterface $guids[$guid] = $guid; } } + return array_values($guids); } @@ -614,10 +657,10 @@ final class Resolver implements ResolverInterface $layouts = []; $patterns = [ - ["Layout" . "Helper::render('", "',"], - ['Layout' . 'Helper::render("', '",'], - ["Joomla__" . "_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('", "',"], - ['Joomla__' . '_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render("', '",'], + ["Layout" . "Helper::render('", "'"], + ['Layout' . 'Helper::render("', '"'], + ["Joomla__" . "_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render('", "'"], + ['Joomla__' . '_7ab82272_0b3d_4bb1_af35_e63a096cfe0b___Power::render("', '"'], ]; foreach ($patterns as [$start, $end]) @@ -1106,12 +1149,22 @@ final class Resolver implements ResolverInterface // now check if key is found foreach(['template', 'layout'] as $table) { - $items = $this->load->items(['guid', 'alias'], [$table]); + $items = $this->load->items(['id', 'guid', 'alias'], [$table]); if ($items !== null) { $this->alias_map[$table] = []; foreach ($items as $item) { + if (empty($item->alias)) + { + continue; + } + + if (empty($item->guid) || !$this->validateGuid($item->guid)) + { + $item->guid = $this->setGuid($item->id, $table); + } + // build the key $k_ey = StringHelper::safe($item->alias); $key = preg_replace("/[^A-Za-z]/", '', (string) $k_ey); @@ -1123,6 +1176,35 @@ final class Resolver implements ResolverInterface } } } + } + + /** + * Set GUID for an item. + * + * @param int $id + * @param string $table + * + * @return string The guid that was set + * @since 5.1.2 + */ + private function setGuid($id, $table): string + { + $guid = $this->table($table)->getGuid('guid'); + + $this->items->table($table)->set([['id' => $id, 'guid' => $guid]], 'id'); + + return $guid; + } + + /** + * Get the current active table + * + * @return string + * @since 5.1.2 + */ + private function getTable(): string + { + return $this->table_name; } } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/AdminView.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/AdminView.php index 5735cba08..8da53fa9e 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/AdminView.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/AdminView.php @@ -128,7 +128,8 @@ class AdminView implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -252,7 +253,8 @@ class AdminView implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -348,7 +350,8 @@ class AdminView implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -444,7 +447,8 @@ class AdminView implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -540,7 +544,8 @@ class AdminView implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Component.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Component.php index 2f2d66bab..bb50c8d3d 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Component.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Component.php @@ -184,7 +184,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -308,7 +309,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -404,7 +406,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -500,7 +503,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -596,7 +600,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -692,7 +697,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -788,7 +794,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -884,7 +891,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -980,7 +988,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -1076,7 +1085,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -1172,7 +1182,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -1268,7 +1279,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -1364,7 +1376,8 @@ class Component implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/CustomAdminView.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/CustomAdminView.php index 7b3470796..2092021f7 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/CustomAdminView.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/CustomAdminView.php @@ -98,7 +98,8 @@ class CustomAdminView implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/CustomCode.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/CustomCode.php index aab78d51c..0348f1cd0 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/CustomCode.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/CustomCode.php @@ -98,7 +98,8 @@ class CustomCode implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Dependencies.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Dependencies.php index f3bc64c9f..452b16d8a 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Dependencies.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Dependencies.php @@ -165,7 +165,8 @@ class Dependencies implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -261,7 +262,8 @@ class Dependencies implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -357,7 +359,8 @@ class Dependencies implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -453,7 +456,8 @@ class Dependencies implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -549,7 +553,8 @@ class Dependencies implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -646,7 +651,8 @@ class Dependencies implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/DynamicGet.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/DynamicGet.php index 4d85353be..7d7de2e58 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/DynamicGet.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/DynamicGet.php @@ -98,7 +98,8 @@ class DynamicGet implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Field.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Field.php index 327196a38..5dbc4abe8 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Field.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Field.php @@ -98,7 +98,8 @@ class Field implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/JoomlaModule.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/JoomlaModule.php index a78eef6b1..74ae0f04d 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/JoomlaModule.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/JoomlaModule.php @@ -114,7 +114,8 @@ class JoomlaModule implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -238,7 +239,8 @@ class JoomlaModule implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -334,7 +336,8 @@ class JoomlaModule implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/JoomlaPlugin.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/JoomlaPlugin.php index e33aaee01..5a7a2a3e3 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/JoomlaPlugin.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/JoomlaPlugin.php @@ -121,7 +121,8 @@ class JoomlaPlugin implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -245,7 +246,8 @@ class JoomlaPlugin implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -341,7 +343,8 @@ class JoomlaPlugin implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -437,7 +440,8 @@ class JoomlaPlugin implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Layout.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Layout.php index 7119ca40e..48a799adc 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Layout.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Layout.php @@ -98,7 +98,8 @@ class Layout implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Library.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Library.php index 006c41629..c3f3e0d50 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Library.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Library.php @@ -114,7 +114,8 @@ class Library implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -238,7 +239,8 @@ class Library implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -334,7 +336,8 @@ class Library implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/SiteView.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/SiteView.php index 834b216fa..1c5cef2dc 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/SiteView.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/SiteView.php @@ -98,7 +98,8 @@ class SiteView implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Template.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Template.php index 4e919df9e..bcdf17cc3 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Template.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Service/Template.php @@ -79,7 +79,8 @@ class Template implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Repository/Service/Repository.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Repository/Service/Repository.php index cdef798ea..136d5165e 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Repository/Service/Repository.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Repository/Service/Repository.php @@ -128,7 +128,8 @@ class Repository implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Snippet/Service/Snippet.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Snippet/Service/Snippet.php index 54a765823..4177f1eaf 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Snippet/Service/Snippet.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Snippet/Service/Snippet.php @@ -156,7 +156,8 @@ class Snippet implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); } @@ -325,7 +326,8 @@ class Snippet implements ServiceProviderInterface $container->get('Utilities.Normalize'), $container->get('Power.Tracker'), $container->get('Power.Table'), - $container->get('Load') + $container->get('Load'), + $container->get('Data.Items') ); }