Component Builder (v.3.2.0-beta9)
+ Component Builder (v.3.2.0-beta10)
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 73784e07d..959679388 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -1685,4 +1685,22 @@
https://dev.vdm.io
+
+ Component Builder
+ Builds Complex Joomla Components
+ pkg_component_builder
+ package
+ site
+ 3.2.0-beta10
+ https://dev.vdm.io
+
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.0-beta10.zip
+
+
+ beta
+
+ Llewellyn van der Merwe
+ https://dev.vdm.io
+
+
\ No newline at end of file
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
index d244e1d4f..990d0ea4e 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
@@ -31,6 +31,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Service\Library;
use VDM\Joomla\Componentbuilder\Compiler\Service\Customview;
use VDM\Joomla\Componentbuilder\Compiler\Service\Templatelayout;
use VDM\Joomla\Componentbuilder\Compiler\Service\Extension;
+use VDM\Joomla\Componentbuilder\Service\CoreRules;
use VDM\Joomla\Componentbuilder\Compiler\Service\Field;
use VDM\Joomla\Componentbuilder\Compiler\Service\Joomlamodule;
use VDM\Joomla\Componentbuilder\Compiler\Service\Joomlaplugin;
@@ -162,6 +163,7 @@ abstract class Factory implements FactoryInterface
->registerServiceProvider(new Customview())
->registerServiceProvider(new Templatelayout())
->registerServiceProvider(new Extension())
+ ->registerServiceProvider(new CoreRules())
->registerServiceProvider(new Field())
->registerServiceProvider(new Joomlamodule())
->registerServiceProvider(new Joomlaplugin())
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php
index 54a9b7bd6..be0f88fd7 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php
@@ -261,7 +261,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " build edit button";
$addButton[] = Indent::_(4)
- . "\$button[] = 'config->lang_prefix
. "_EDIT_S', \$button_label).'\" style=\"display: none; border-radius: 0px 4px 4px 0px;\" href=\"#\" >";
$addButton[] = Indent::_(5)
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php
index fe5846455..22e61bf14 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php
@@ -261,7 +261,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " build edit button";
$addButton[] = Indent::_(4)
- . "\$button[] = 'config->lang_prefix
. "_EDIT_S', \$button_label).'\" style=\"display: none; border-radius: 0px 4px 4px 0px;\" href=\"#\" >";
$addButton[] = Indent::_(5)
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaThree/InputButton.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaThree/InputButton.php
index fb3ac3a87..4d02833fc 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaThree/InputButton.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaThree/InputButton.php
@@ -263,7 +263,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4)
. "\$button[] = 'config->lang_prefix
- . "_EDIT_S', \$button_label).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
+ . "_EDIT_S', \$button_label).'\" style=\"display: none; padding: 3px 4px 4px 7px;\" href=\"#\" >";
$addButton[] = Indent::_(5)
. "';";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php
index 01292db60..1db4eac27 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php
@@ -25,9 +25,6 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\UniqueName;
use VDM\Joomla\Componentbuilder\Compiler\Field\Rule;
use VDM\Joomla\Componentbuilder\Compiler\Field\Customcode;
use VDM\Joomla\Componentbuilder\Compiler\Field\DatabaseName;
-use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree\CoreRule as J3CoreRule;
-use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour\CoreRule as J4CoreRule;
-use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive\CoreRule as J5CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree\CoreField as J3CoreField;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour\CoreField as J4CoreField;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive\CoreField as J5CoreField;
@@ -35,7 +32,6 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree\InputButton as J3Inpu
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour\InputButton as J4InputButton;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive\InputButton as J5InputButton;
use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreFieldInterface as CoreField;
-use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreRuleInterface as CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\InputButtonInterface as InputButton;
@@ -102,15 +98,6 @@ class Field implements ServiceProviderInterface
$container->alias(DatabaseName::class, 'Field.Database.Name')
->share('Field.Database.Name', [$this, 'getDatabaseName'], true);
- $container->alias(J3CoreRule::class, 'J3.Field.Core.Rule')
- ->share('J3.Field.Core.Rule', [$this, 'getJ3CoreRule'], true);
-
- $container->alias(J4CoreRule::class, 'J4.Field.Core.Rule')
- ->share('J4.Field.Core.Rule', [$this, 'getJ4CoreRule'], true);
-
- $container->alias(J5CoreRule::class, 'J5.Field.Core.Rule')
- ->share('J5.Field.Core.Rule', [$this, 'getJ5CoreRule'], true);
-
$container->alias(J3CoreField::class, 'J3.Field.Core.Field')
->share('J3.Field.Core.Field', [$this, 'getJ3CoreField'], true);
@@ -132,9 +119,6 @@ class Field implements ServiceProviderInterface
$container->alias(CoreField::class, 'Field.Core.Field')
->share('Field.Core.Field', [$this, 'getCoreField'], true);
- $container->alias(CoreRule::class, 'Field.Core.Rule')
- ->share('Field.Core.Rule', [$this, 'getCoreRule'], true);
-
$container->alias(InputButton::class, 'Field.Input.Button')
->share('Field.Input.Button', [$this, 'getInputButton'], true);
}
@@ -308,45 +292,6 @@ class Field implements ServiceProviderInterface
);
}
- /**
- * Get The CoreRule Class.
- *
- * @param Container $container The DI container.
- *
- * @return J3CoreRule
- * @since 3.2.0
- */
- public function getJ3CoreRule(Container $container): J3CoreRule
- {
- return new J3CoreRule();
- }
-
- /**
- * Get The CoreRule Class.
- *
- * @param Container $container The DI container.
- *
- * @return J4CoreRule
- * @since 3.2.0
- */
- public function getJ4CoreRule(Container $container): J4CoreRule
- {
- return new J4CoreRule();
- }
-
- /**
- * Get The CoreRule Class.
- *
- * @param Container $container The DI container.
- *
- * @return J5CoreRule
- * @since 3.2.0
- */
- public function getJ5CoreRule(Container $container): J5CoreRule
- {
- return new J5CoreRule();
- }
-
/**
* Get The CoreField Class.
*
@@ -455,24 +400,6 @@ class Field implements ServiceProviderInterface
return $container->get('J' . $this->currentVersion . '.Field.Core.Field');
}
- /**
- * Get The CoreRuleInterface Class.
- *
- * @param Container $container The DI container.
- *
- * @return CoreRule
- * @since 3.2.0
- */
- public function getCoreRule(Container $container): CoreRule
- {
- if (empty($this->currentVersion))
- {
- $this->currentVersion = Version::MAJOR_VERSION;
- }
-
- return $container->get('J' . $this->currentVersion . '.Field.Core.Rule');
- }
-
/**
* Get The InputButton Class.
*
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Service/CoreRules.php b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Service/CoreRules.php
new file mode 100644
index 000000000..ce8d63343
--- /dev/null
+++ b/libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Service/CoreRules.php
@@ -0,0 +1,119 @@
+
+ * @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\Componentbuilder\Service;
+
+
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\CMS\Version;
+use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree\CoreRule as J3CoreRule;
+use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour\CoreRule as J4CoreRule;
+use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive\CoreRule as J5CoreRule;
+use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreRuleInterface as CoreRule;
+
+
+/**
+ * Joomla Core Rules
+ *
+ * @since 3.2.0
+ */
+class CoreRules implements ServiceProviderInterface
+{
+ /**
+ * Current Joomla Version We are IN
+ *
+ * @var int
+ * @since 3.2.0
+ **/
+ protected $currentVersion;
+
+ /**
+ * Registers the service provider with a DI container.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return void
+ * @since 3.2.0
+ */
+ public function register(Container $container)
+ {
+ $container->alias(J3CoreRule::class, 'J3.Field.Core.Rule')
+ ->share('J3.Field.Core.Rule', [$this, 'getJ3CoreRule'], true);
+
+ $container->alias(J4CoreRule::class, 'J4.Field.Core.Rule')
+ ->share('J4.Field.Core.Rule', [$this, 'getJ4CoreRule'], true);
+
+ $container->alias(J5CoreRule::class, 'J5.Field.Core.Rule')
+ ->share('J5.Field.Core.Rule', [$this, 'getJ5CoreRule'], true);
+
+ $container->alias(CoreRule::class, 'Field.Core.Rule')
+ ->share('Field.Core.Rule', [$this, 'getCoreRule'], true);
+ }
+
+ /**
+ * Get The CoreRule Class.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return J3CoreRule
+ * @since 3.2.0
+ */
+ public function getJ3CoreRule(Container $container): J3CoreRule
+ {
+ return new J3CoreRule();
+ }
+
+ /**
+ * Get The CoreRule Class.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return J4CoreRule
+ * @since 3.2.0
+ */
+ public function getJ4CoreRule(Container $container): J4CoreRule
+ {
+ return new J4CoreRule();
+ }
+
+ /**
+ * Get The CoreRule Class.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return J5CoreRule
+ * @since 3.2.0
+ */
+ public function getJ5CoreRule(Container $container): J5CoreRule
+ {
+ return new J5CoreRule();
+ }
+
+ /**
+ * Get The CoreRuleInterface Class.
+ *
+ * @param Container $container The DI container.
+ *
+ * @return CoreRule
+ * @since 3.2.0
+ */
+ public function getCoreRule(Container $container): CoreRule
+ {
+ if (empty($this->currentVersion))
+ {
+ $this->currentVersion = Version::MAJOR_VERSION;
+ }
+
+ return $container->get('J' . $this->currentVersion . '.Field.Core.Rule');
+ }
+}
+
diff --git a/script.php b/script.php
index 59ffef8c5..bd549fc6c 100644
--- a/script.php
+++ b/script.php
@@ -9618,7 +9618,7 @@ class Com_ComponentbuilderInstallerScript
echo '
-
Upgrade to Version 3.2.0-beta9 Was Successful! Let us know if anything is not working as expected.
';
+ Upgrade to Version 3.2.0-beta10 Was Successful! Let us know if anything is not working as expected.
';
// Set db if not set already.
if (!isset($db))