diff --git a/src/12234620-f54f-4914-a51a-24f5707cb8a6/README.md b/src/12234620-f54f-4914-a51a-24f5707cb8a6/README.md index bcb68dc..e1c84d5 100644 --- a/src/12234620-f54f-4914-a51a-24f5707cb8a6/README.md +++ b/src/12234620-f54f-4914-a51a-24f5707cb8a6/README.md @@ -8,6 +8,7 @@ ``` # class Load (Details) > namespace: **VDM\Joomla\Componentbuilder\Package\Database** +> extends: **** ```uml @startuml class Load #Gold { diff --git a/src/12234620-f54f-4914-a51a-24f5707cb8a6/code.php b/src/12234620-f54f-4914-a51a-24f5707cb8a6/code.php index 4307c12..57a7e0d 100644 --- a/src/12234620-f54f-4914-a51a-24f5707cb8a6/code.php +++ b/src/12234620-f54f-4914-a51a-24f5707cb8a6/code.php @@ -13,8 +13,8 @@ namespace VDM\Joomla\Componentbuilder\Package\Database; use VDM\Joomla\Componentbuilder\Package\Factory; -use VastDevelopmentMethod\Joomla\Componentbuilder\Table; -use VastDevelopmentMethod\Joomla\Database\Load as Database; +use VDM\Joomla\Componentbuilder\Table; +use VDM\Joomla\Database\Load as Database; /** diff --git a/src/12234620-f54f-4914-a51a-24f5707cb8a6/settings.json b/src/12234620-f54f-4914-a51a-24f5707cb8a6/settings.json index 9c1c8d6..b7ba884 100644 --- a/src/12234620-f54f-4914-a51a-24f5707cb8a6/settings.json +++ b/src/12234620-f54f-4914-a51a-24f5707cb8a6/settings.json @@ -1,7 +1,7 @@ { "add_head": "0", "add_licensing_template": "2", - "extends": "0", + "extends": "", "guid": "12234620-f54f-4914-a51a-24f5707cb8a6", "implements": null, "load_selection": null, @@ -23,6 +23,7 @@ "as": "Database" } }, + "extendsinterfaces": null, "namespace": "VDM\\Joomla\\Componentbuilder.Package.Database.Load", "description": "Package Database Load\r\n\r\n@since 3.2.0", "licensing_template": "\/**\r\n * @package Joomla.Component.Builder\r\n *\r\n * @created 4th September, 2022\r\n * @author Llewellyn van der Merwe \r\n * @git Joomla Component Builder \r\n * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n", diff --git a/src/2e64007d-acac-438c-b719-3e1875784f47/README.md b/src/2e64007d-acac-438c-b719-3e1875784f47/README.md index 30189bc..9082c06 100644 --- a/src/2e64007d-acac-438c-b719-3e1875784f47/README.md +++ b/src/2e64007d-acac-438c-b719-3e1875784f47/README.md @@ -8,6 +8,7 @@ ``` # class Details (Details) > namespace: **VDM\Joomla\Componentbuilder\Package\Display** +> extends: **** ```uml @startuml class Details #Gold { diff --git a/src/2e64007d-acac-438c-b719-3e1875784f47/code.php b/src/2e64007d-acac-438c-b719-3e1875784f47/code.php index 8ba9b77..9b63d9d 100644 --- a/src/2e64007d-acac-438c-b719-3e1875784f47/code.php +++ b/src/2e64007d-acac-438c-b719-3e1875784f47/code.php @@ -11,8 +11,8 @@ namespace VDM\Joomla\Componentbuilder\Package\Display; use Joomla\CMS\Language\Text; -use VastDevelopmentMethod\Joomla\Utilities\StringHelper; -use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper; +use VDM\Joomla\Utilities\StringHelper; +use VDM\Joomla\Utilities\ArrayHelper; /** diff --git a/src/2e64007d-acac-438c-b719-3e1875784f47/settings.json b/src/2e64007d-acac-438c-b719-3e1875784f47/settings.json index e42dc37..3ae08d5 100644 --- a/src/2e64007d-acac-438c-b719-3e1875784f47/settings.json +++ b/src/2e64007d-acac-438c-b719-3e1875784f47/settings.json @@ -1,7 +1,7 @@ { "add_head": "1", "add_licensing_template": "2", - "extends": "0", + "extends": "", "guid": "2e64007d-acac-438c-b719-3e1875784f47", "implements": null, "load_selection": null, @@ -19,6 +19,7 @@ "as": "default" } }, + "extendsinterfaces": null, "namespace": "VDM\\Joomla\\Componentbuilder.Package.Display.Details", "description": "Package Display Details Class\r\n\r\n@since 3.2.0", "licensing_template": "\/**\r\n * @package FrameworkOnFramework\r\n * @subpackage encrypt\r\n * @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos \/ Akeeba Ltd. All rights reserved.\r\n * @license GNU General Public License version 2 or later; see LICENSE.txt\r\n * @note\tThis file has been modified by the Joomla! Project and no longer reflects the original work of its author.\r\n *\/\r\n", diff --git a/src/7d1aeda3-2598-46a6-bec2-7d4c5a65d99c/README.md b/src/7d1aeda3-2598-46a6-bec2-7d4c5a65d99c/README.md index 43c6637..934302e 100644 --- a/src/7d1aeda3-2598-46a6-bec2-7d4c5a65d99c/README.md +++ b/src/7d1aeda3-2598-46a6-bec2-7d4c5a65d99c/README.md @@ -8,6 +8,7 @@ ``` # class Display (Details) > namespace: **VDM\Joomla\Componentbuilder\Package\Service** +> extends: **** ```uml @startuml class Display #Gold { diff --git a/src/7d1aeda3-2598-46a6-bec2-7d4c5a65d99c/settings.json b/src/7d1aeda3-2598-46a6-bec2-7d4c5a65d99c/settings.json index 6157327..5badaca 100644 --- a/src/7d1aeda3-2598-46a6-bec2-7d4c5a65d99c/settings.json +++ b/src/7d1aeda3-2598-46a6-bec2-7d4c5a65d99c/settings.json @@ -1,7 +1,7 @@ { "add_head": "1", "add_licensing_template": "2", - "extends": "0", + "extends": "", "guid": "7d1aeda3-2598-46a6-bec2-7d4c5a65d99c", "implements": [ "-1" @@ -17,6 +17,7 @@ "as": "default" } }, + "extendsinterfaces": null, "namespace": "VDM\\Joomla\\Componentbuilder.Package.Service.Display", "description": "Display Service Provider\r\n\r\n@since 3.2.0", "implements_custom": "ServiceProviderInterface", diff --git a/src/97c8b20c-a35d-47e7-b801-b9c54443e876/README.md b/src/97c8b20c-a35d-47e7-b801-b9c54443e876/README.md index 9843912..93b5f56 100644 --- a/src/97c8b20c-a35d-47e7-b801-b9c54443e876/README.md +++ b/src/97c8b20c-a35d-47e7-b801-b9c54443e876/README.md @@ -8,6 +8,7 @@ ``` # class Database (Details) > namespace: **VDM\Joomla\Componentbuilder\Package\Service** +> extends: **** ```uml @startuml class Database #Gold { diff --git a/src/97c8b20c-a35d-47e7-b801-b9c54443e876/code.php b/src/97c8b20c-a35d-47e7-b801-b9c54443e876/code.php index 0750929..ecae6e5 100644 --- a/src/97c8b20c-a35d-47e7-b801-b9c54443e876/code.php +++ b/src/97c8b20c-a35d-47e7-b801-b9c54443e876/code.php @@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Package\Service; use Joomla\DI\Container; use Joomla\DI\ServiceProviderInterface; -use VastDevelopmentMethod\Joomla\Database\Load; -use VastDevelopmentMethod\Joomla\Database\Insert; +use VDM\Joomla\Database\Load; +use VDM\Joomla\Database\Insert; use VDM\Joomla\Componentbuilder\Package\Database\Load as LoadDatabase; use VDM\Joomla\Componentbuilder\Package\Database\Insert as InsertDatabase; diff --git a/src/97c8b20c-a35d-47e7-b801-b9c54443e876/settings.json b/src/97c8b20c-a35d-47e7-b801-b9c54443e876/settings.json index a21efd4..b2749b1 100644 --- a/src/97c8b20c-a35d-47e7-b801-b9c54443e876/settings.json +++ b/src/97c8b20c-a35d-47e7-b801-b9c54443e876/settings.json @@ -1,7 +1,7 @@ { "add_head": "1", "add_licensing_template": "2", - "extends": "0", + "extends": "", "guid": "97c8b20c-a35d-47e7-b801-b9c54443e876", "implements": [ "-1" @@ -29,6 +29,7 @@ "as": "InsertDatabase" } }, + "extendsinterfaces": null, "namespace": "VDM\\Joomla\\Componentbuilder.Package.Service.Database", "description": "Database Service Provider\r\n\r\n@since 3.2.0", "implements_custom": "ServiceProviderInterface", diff --git a/src/ec804df5-a384-48d7-b709-ae091ddc328a/README.md b/src/ec804df5-a384-48d7-b709-ae091ddc328a/README.md index eb532eb..b6be7f7 100644 --- a/src/ec804df5-a384-48d7-b709-ae091ddc328a/README.md +++ b/src/ec804df5-a384-48d7-b709-ae091ddc328a/README.md @@ -8,29 +8,13 @@ ``` # abstract class Factory (Details) > namespace: **VDM\Joomla\Componentbuilder\Package** +> extends: **ExtendingFactory** ```uml @startuml abstract Factory #Orange { - # static $container - + {static} _(string $key) : Mixed - + {static} getContainer() : Container # {static} createContainer() : Container } -note right of Factory::_ - Get any class from the package container - - since: 3.2.0 - return: Mixed -end note - -note right of Factory::getContainer - Get the global package container - - since: 3.2.0 - return: Container -end note - note right of Factory::createContainer Create a container object diff --git a/src/ec804df5-a384-48d7-b709-ae091ddc328a/code.php b/src/ec804df5-a384-48d7-b709-ae091ddc328a/code.php index 7aa89ad..58a3468 100644 --- a/src/ec804df5-a384-48d7-b709-ae091ddc328a/code.php +++ b/src/ec804df5-a384-48d7-b709-ae091ddc328a/code.php @@ -13,11 +13,12 @@ namespace VDM\Joomla\Componentbuilder\Package; use Joomla\DI\Container; -use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Crypt; +use VDM\Joomla\Componentbuilder\Service\Crypt; use VDM\Joomla\Componentbuilder\Package\Service\Database; -use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Server; +use VDM\Joomla\Componentbuilder\Service\Server; use VDM\Joomla\Componentbuilder\Package\Service\Display; -use VastDevelopmentMethod\Joomla\Interfaces\FactoryInterface; +use VDM\Joomla\Interfaces\FactoryInterface; +use VDM\Joomla\Abstraction\Factory as ExtendingFactory; /** @@ -25,45 +26,8 @@ use VastDevelopmentMethod\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/src/ec804df5-a384-48d7-b709-ae091ddc328a/code.power b/src/ec804df5-a384-48d7-b709-ae091ddc328a/code.power index 2a14df7..699883c 100644 --- a/src/ec804df5-a384-48d7-b709-ae091ddc328a/code.power +++ b/src/ec804df5-a384-48d7-b709-ae091ddc328a/code.power @@ -1,40 +1,3 @@ - /** - * 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/src/ec804df5-a384-48d7-b709-ae091ddc328a/settings.json b/src/ec804df5-a384-48d7-b709-ae091ddc328a/settings.json index df5408c..6698caa 100644 --- a/src/ec804df5-a384-48d7-b709-ae091ddc328a/settings.json +++ b/src/ec804df5-a384-48d7-b709-ae091ddc328a/settings.json @@ -1,7 +1,7 @@ { "add_head": "1", "add_licensing_template": "2", - "extends": "0", + "extends": "2e5bf608-de5c-4b00-a20d-47c26aa350d9", "guid": "ec804df5-a384-48d7-b709-ae091ddc328a", "implements": [ "caf33c5d-858c-4f9a-894f-ab302ec5445a" @@ -29,6 +29,7 @@ "as": "default" } }, + "extendsinterfaces": null, "namespace": "VDM\\Joomla\\Componentbuilder.Package.Factory", "description": "Package Factory\r\n\r\n@since 3.2.0", "licensing_template": "\/**\r\n * @package Joomla.Component.Builder\r\n *\r\n * @created 4th September, 2022\r\n * @author Llewellyn van der Merwe \r\n * @git Joomla Component Builder \r\n * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n", diff --git a/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/README.md b/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/README.md index d6782b8..36a0de4 100644 --- a/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/README.md +++ b/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/README.md @@ -8,6 +8,7 @@ ``` # class Insert (Details) > namespace: **VDM\Joomla\Componentbuilder\Package\Database** +> extends: **** ```uml @startuml class Insert #Gold { diff --git a/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/code.php b/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/code.php index 75ea3c0..800c851 100644 --- a/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/code.php +++ b/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/code.php @@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Package\Database; use Joomla\CMS\Factory as JoomlaFactory; use VDM\Joomla\Componentbuilder\Search\Factory; use VDM\Joomla\Componentbuilder\Search\Config; -use VastDevelopmentMethod\Joomla\Componentbuilder\Table; +use VDM\Joomla\Componentbuilder\Table; use VDM\Joomla\Componentbuilder\Search\Model\Insert as Model; -use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper; +use VDM\Joomla\Utilities\ArrayHelper; /** diff --git a/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/settings.json b/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/settings.json index 22c6f50..af165ef 100644 --- a/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/settings.json +++ b/src/f68aafc4-beec-4bf0-b528-4e2c525f5b7b/settings.json @@ -1,7 +1,7 @@ { "add_head": "1", "add_licensing_template": "2", - "extends": "0", + "extends": "", "guid": "f68aafc4-beec-4bf0-b528-4e2c525f5b7b", "implements": null, "load_selection": null, @@ -31,6 +31,7 @@ "as": "default" } }, + "extendsinterfaces": null, "namespace": "VDM\\Joomla\\Componentbuilder.Package.Database.Insert", "description": "Package Database Insert\r\n\r\n@since 3.2.0", "licensing_template": "\/**\r\n * @package Joomla.Component.Builder\r\n *\r\n * @created 4th September, 2022\r\n * @author Llewellyn van der Merwe \r\n * @git Joomla Component Builder \r\n * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",