joomla/Component-Builder
40
26
Fork 12
Code Issues 79 Pull Requests 2 Projects 4 Wiki Activity

Moved some class around for better structure in the jcb_powers of JCB. Fixed small issue with JCB package export.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2022-10-23 23:18:02 +02:00
parent d4843d6696
commit 869a1879cb
18 changed files with 136 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Config.php
View File

@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
use VDM\Joomla\Utilities\GetHelper;
use VDM\Joomla\Utilities\StringHelper;
use VDM\Joomla\Componentbuilder\Abstraction\Registry;
use VDM\Joomla\Componentbuilder\Abstraction\BaseConfig;
/**
@@ -22,7 +22,7 @@ use VDM\Joomla\Componentbuilder\Abstraction\Registry;
*
* @since 3.2.0
*/
class Config extends Registry
class Config extends BaseConfig
{
/**
* get posted component id

35
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
View File

@@ -13,6 +13,16 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
use Joomla\DI\Container;
use VDM\Joomla\Componentbuilder\Compiler\Service\Compiler;
use VDM\Joomla\Componentbuilder\Compiler\Service\Event;
use VDM\Joomla\Componentbuilder\Compiler\Service\History;
use VDM\Joomla\Componentbuilder\Compiler\Service\Language;
use VDM\Joomla\Componentbuilder\Compiler\Service\Placeholder;
use VDM\Joomla\Componentbuilder\Compiler\Service\Customcode;
use VDM\Joomla\Componentbuilder\Compiler\Service\Power;
use VDM\Joomla\Componentbuilder\Compiler\Service\Component;
use VDM\Joomla\Componentbuilder\Compiler\Service\Extension;
use VDM\Joomla\Componentbuilder\Compiler\Service\Field;
/**
@@ -43,7 +53,7 @@ abstract class Factory
*
* @param string $key The container class key
*
* @return Mixed
* @return mixed
* @since 3.2.0
*/
public static function _($key)
@@ -56,7 +66,7 @@ abstract class Factory
*
* @param string $key The container class key
*
* @return Mixed
* @return mixed
* @since 3.2.0
*/
public static function _J($key)
@@ -94,20 +104,19 @@ abstract class Factory
protected static function createContainer(): Container
{
$container = (new Container())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Compiler())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Event())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\History())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Language())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Placeholder())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Customcode())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Power())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Component())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Extension())
->registerServiceProvider(new \VDM\Joomla\Componentbuilder\Compiler\Service\Field());
->registerServiceProvider(new Compiler())
->registerServiceProvider(new Event())
->registerServiceProvider(new History())
->registerServiceProvider(new Language())
->registerServiceProvider(new Placeholder())
->registerServiceProvider(new Customcode())
->registerServiceProvider(new Power())
->registerServiceProvider(new Component())
->registerServiceProvider(new Extension())
->registerServiceProvider(new Field());
return $container;
}
}

27
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Registry.php
View File

@@ -12,18 +12,16 @@
namespace VDM\Joomla\Componentbuilder\Compiler;
use Joomla\Registry\Registry as JoomlaRegistry;
use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
use VDM\Joomla\Componentbuilder\Abstraction\BaseRegistry;
/**
* Compiler Registry
*
* So we have full control over this class
*
* @since 3.2.0
*/
class Registry extends JoomlaRegistry implements \JsonSerializable, \ArrayAccess, \IteratorAggregate, \Countable
class Registry extends BaseRegistry
{
/**
* Default indentation value
@@ -33,27 +31,6 @@ class Registry extends JoomlaRegistry implements \JsonSerializable, \ArrayAccess
*/
protected $indent = 2;
/**
* Method to iterate over any part of the registry
*
* @param string $path Registry path (e.g. joomla.content.showauthor)
*
* @return \ArrayIterator This object represented as an ArrayIterator.
*
* @since 3.4.0
*/
public function _($path)
{
$data = $this->extract($path);
if ($data === null)
{
return null;
}
return $data->getIterator();
}
/**
* Method to export a set of values to a PHP array
*