From cd0cb2ba434d4b80f3d146f18a09a46cce8c67bd Mon Sep 17 00:00:00 2001 From: aB0t Date: Sat, 13 Apr 2024 19:01:25 +0200 Subject: [PATCH] update 2024-04-13 19:01:25 --- src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/README.md | 2 +- src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php | 4 ++-- src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json | 7 +------ src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/README.md | 2 +- src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php | 4 ++-- src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json | 7 +------ src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php | 2 +- src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power | 2 +- 8 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/README.md b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/README.md index 6a069eb..da4c734 100644 --- a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/README.md +++ b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/README.md @@ -8,7 +8,7 @@ ``` # class Upsert (Details) > namespace: **VDM\Joomla\Componentbuilder\Power\Model** -> extends: **AbstractionModel** +> extends: **Model** ```uml @startuml class Upsert #Gold { diff --git a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php index f6862e1..00eda6b 100644 --- a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php +++ b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php @@ -12,11 +12,11 @@ namespace VDM\Joomla\Componentbuilder\Power\Model; -use VDM\Joomla\Abstraction\Model as AbstractionModel; use VDM\Joomla\Utilities\StringHelper; use VDM\Joomla\Utilities\ArrayHelper; use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Interfaces\ModelInterface; +use VDM\Joomla\Abstraction\Model; /** @@ -24,7 +24,7 @@ use VDM\Joomla\Interfaces\ModelInterface; * * @since 3.2.0 */ -class Upsert extends AbstractionModel implements ModelInterface +class Upsert extends Model implements ModelInterface { /** * Model the value diff --git a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json index 277a60f..0a5119a 100644 --- a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json +++ b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json @@ -1,7 +1,7 @@ { "add_head": "0", "add_licensing_template": "2", - "extends": "-1", + "extends": "584747d1-3a86-453d-b7a3-a2219de8d777", "guid": "7c1fb50f-8fb1-4627-8705-6fedf7182ca5", "implements": [ "8aef58c1-3f70-4bd4-b9e4-3f29fcd41cff" @@ -12,10 +12,6 @@ "system_name": "JCB.Power.Model.Upsert", "type": "class", "use_selection": { - "use_selection0": { - "use": "584747d1-3a86-453d-b7a3-a2219de8d777", - "as": "AbstractionModel" - }, "use_selection1": { "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef", "as": "default" @@ -31,7 +27,6 @@ }, "namespace": "VDM\\Joomla\\Componentbuilder.Power.Model.Upsert", "description": "Power Model Update or Insert\r\n\r\n@since 3.2.0", - "extends_custom": "AbstractionModel", "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", "head": "", "composer": "" diff --git a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/README.md b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/README.md index 5062c4d..68cf16c 100644 --- a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/README.md +++ b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/README.md @@ -8,7 +8,7 @@ ``` # abstract class BaseConfig (Details) > namespace: **VDM\Joomla\Componentbuilder\Abstraction** -> extends: **Config** +> extends: **ExtendingBaseConfig** ```uml @startuml abstract BaseConfig #Orange { diff --git a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php index 1319d2c..0d4de7d 100644 --- a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php +++ b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php @@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Abstraction; use Joomla\Registry\Registry as JoomlaRegistry; use Joomla\CMS\Factory; use Joomla\Input\Input; -use VDM\Joomla\Abstraction\BaseConfig as Config; use VDM\Joomla\Utilities\Component\Helper; use VDM\Joomla\Utilities\String\ClassfunctionHelper; +use VDM\Joomla\Abstraction\BaseConfig as ExtendingBaseConfig; /** @@ -25,7 +25,7 @@ use VDM\Joomla\Utilities\String\ClassfunctionHelper; * * @since 3.2.0 */ -abstract class BaseConfig extends Config +abstract class BaseConfig extends ExtendingBaseConfig { /** * Hold a JInput object for easier access to the input variables. diff --git a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json index 06dbf88..6a4cabc 100644 --- a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json +++ b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json @@ -1,7 +1,7 @@ { "add_head": "1", "add_licensing_template": "2", - "extends": "-1", + "extends": "ffbd4e1f-a342-4080-ab7d-1de3741bf319", "guid": "9769f3b2-17bf-4f20-b54b-3a4ebe572b36", "implements": null, "load_selection": null, @@ -10,10 +10,6 @@ "system_name": "JCB.Abstraction.BaseConfig", "type": "abstract class", "use_selection": { - "use_selection0": { - "use": "ffbd4e1f-a342-4080-ab7d-1de3741bf319", - "as": "Config" - }, "use_selection1": { "use": "640b5352-fb09-425f-a26e-cd44eda03f15", "as": "default" @@ -25,7 +21,6 @@ }, "namespace": "VDM\\Joomla\\Componentbuilder.Abstraction.BaseConfig", "description": "Config\r\n\r\n@since 3.2.0", - "extends_custom": "Config", "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", "head": "use Joomla\\Registry\\Registry as JoomlaRegistry;\r\nuse Joomla\\CMS\\Factory;\r\nuse Joomla\\Input\\Input;", "composer": "" diff --git a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php index 8f6e839..41f84ba 100644 --- a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php +++ b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php @@ -799,7 +799,7 @@ class Power implements PowerInterface if ($this->active[$guid]->extends_name === $this->active[$guid]->class_name) { $this->active[$guid]->extends_name = $as[$this->active[$guid]->extends] - = 'Extending' . $this->active[$guid]->extends_name; + = 'Extending' . $this->active[$guid]->class_name; } } } diff --git a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power index 8304965..72e54c7 100644 --- a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power +++ b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power @@ -760,7 +760,7 @@ if ($this->active[$guid]->extends_name === $this->active[$guid]->class_name) { $this->active[$guid]->extends_name = $as[$this->active[$guid]->extends] - = 'Extending' . $this->active[$guid]->extends_name; + = 'Extending' . $this->active[$guid]->class_name; } } }