jaxon-php / jaxon-mono

jaxon-core/src/Di/ComponentContainer.php

Braces +1 added lines, -2 removed lines

@@ -189,8 +189,7 @@
             {
                 $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
             }
-        }
-        catch(ReflectionException $e)
+        } catch(ReflectionException $e)
         {
             throw new SetupException($this->cn()->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));

Indentation +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
      */
     public function val(string $sKey, $xValue): void
     {
-       $this->xContainer->offsetSet($sKey, $xValue);
+        $this->xContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Switch Indentation +216 added lines, -216 removed lines

@@ -40,85 +40,85 @@ 
 
 class ComponentContainer
 {
-    use Traits\DiAutoTrait;
-    use Traits\ComponentTrait;
+use Traits\DiAutoTrait;
+use Traits\ComponentTrait;
 
-    /**
+/**
      * The Dependency Injection Container for registered classes
      *
      * @var PimpleContainer
      */
-    private $xContainer;
+private $xContainer;
 
-    /**
+/**
      * This will be set only when getting the object targetted by the ajax request.
      *
      * @var Target|null
      */
-    private $xTarget = null;
+private $xTarget = null;
 
-    /**
+/**
      * The class constructor
      *
      * @param Container $di
      */
-    public function __construct(private Container $di)
-    {
-        $this->xContainer = new PimpleContainer();
-        $this->val(ComponentContainer::class, $this);
-
-        // Register the call factory for registered functions
-        $this->set($this->getRequestFactoryKey(JxnCall::class), fn() =>
-            new JxnCall($this->di->g(ConfigManager::class)
-                ->getOption('core.prefix.function', '')));
-
-        // Register the pagination component, but do not export to js.
-        $this->saveComponent(Pagination::class, [
-            'excluded' => true,
-            'separator' => '.',
-            // The namespace has the same name as the Component class.
-            'namespace' => Component::class,
-        ]);
-
-        // Register the logger component, and export to js.
-        $this->di->callback()->boot(function() {
-            if($this->di->config()->loggingEnabled())
-            {
-                $this->saveComponent(LoggerComponent::class, [
-                    'separator' => '.',
-                    // The namespace has the same name as the Component class.
-                    'namespace' => Component::class,
-                ]);
-            }
-        });
-
-        $this->setComponentPublicMethods('node', NodeComponent::class, ['item', 'html']);
-        $this->setComponentPublicMethods('func', FuncComponent::class, ['paginator']);
-    }
+public function __construct(private Container $di)
+{
+$this->xContainer = new PimpleContainer();
+$this->val(ComponentContainer::class, $this);
+
+// Register the call factory for registered functions
+$this->set($this->getRequestFactoryKey(JxnCall::class), fn() =>
+new JxnCall($this->di->g(ConfigManager::class)
+    ->getOption('core.prefix.function', '')));
+
+// Register the pagination component, but do not export to js.
+$this->saveComponent(Pagination::class, [
+'excluded' => true,
+'separator' => '.',
+// The namespace has the same name as the Component class.
+'namespace' => Component::class,
+]);
+
+// Register the logger component, and export to js.
+$this->di->callback()->boot(function() {
+if($this->di->config()->loggingEnabled())
+{
+    $this->saveComponent(LoggerComponent::class, [
+        'separator' => '.',
+        // The namespace has the same name as the Component class.
+        'namespace' => Component::class,
+    ]);
+}
+});
+
+$this->setComponentPublicMethods('node', NodeComponent::class, ['item', 'html']);
+$this->setComponentPublicMethods('func', FuncComponent::class, ['paginator']);
+}
 
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    protected function cn(): Container
-    {
-        return $this->di;
-    }
+protected function cn(): Container
+{
+return $this->di;
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param class-string $sClass    The full class name
      *
      * @return bool
      */
-    public function has(string $sClass): bool
-    {
-        return $this->xContainer->offsetExists($sClass);
-    }
+public function has(string $sClass): bool
+{
+return $this->xContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Save a closure in the container
      *
      * @param class-string $sClass    The full class name
@@ -126,12 +126,12 @@ 
      *
      * @return void
      */
-    public function set(string $sClass, Closure $xClosure): void
-    {
-        $this->xContainer->offsetSet($sClass, fn() => $xClosure($this));
-    }
+public function set(string $sClass, Closure $xClosure): void
+{
+$this->xContainer->offsetSet($sClass, fn() => $xClosure($this));
+}
 
-    /**
+/**
      * Save a value in the container
      *
      * @param string|class-string $sKey    The key
@@ -139,12 +139,12 @@ 
      *
      * @return void
      */
-    public function val(string $sKey, $xValue): void
-    {
-       $this->xContainer->offsetSet($sKey, $xValue);
-    }
+public function val(string $sKey, $xValue): void
+{
+$this->xContainer->offsetSet($sKey, $xValue);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -152,12 +152,12 @@ 
      *
      * @return T
      */
-    public function get(string $sClass): mixed
-    {
-        return $this->xContainer->offsetGet($sClass);
-    }
+public function get(string $sClass): mixed
+{
+return $this->xContainer->offsetGet($sClass);
+}
 
-    /**
+/**
      * Get a component when one of its method needs to be called
      *
      * @template T
@@ -166,17 +166,17 @@ 
      *
      * @return T|null
      */
-    public function getTargetComponent(string $sClassName, Target $xTarget): mixed
-    {
-        // Set the target only when getting the object targetted by the ajax request.
-        $this->xTarget = $xTarget;
-        $xComponent = $this->get($sClassName);
-        $this->xTarget = null;
+public function getTargetComponent(string $sClassName, Target $xTarget): mixed
+{
+// Set the target only when getting the object targetted by the ajax request.
+$this->xTarget = $xTarget;
+$xComponent = $this->get($sClassName);
+$this->xTarget = null;
 
-        return $xComponent;
-    }
+return $xComponent;
+}
 
-    /**
+/**
      * Register a component and its options
      *
      * @param class-string $sClassName    The class name
@@ -184,40 +184,40 @@ 
      *
      * @return void
      */
-    public function saveComponent(string $sClassName, array $aOptions): void
-    {
-        try
-        {
-            // Make sure the registered class exists
-            if(isset($aOptions['include']))
-            {
-                require_once $aOptions['include'];
-            }
-            $xReflectionClass = new ReflectionClass($sClassName);
-            // Check if the class is registrable
-            if(!$xReflectionClass->isInstantiable())
-            {
-                return;
-            }
-
-            $this->_saveClassOptions($sClassName, $aOptions);
-
-            $sClassKey = $this->getReflectionClassKey($sClassName);
-            $this->val($sClassKey, $xReflectionClass);
-            // Register the user class, but only if the user didn't already.
-            if(!$this->has($sClassName))
-            {
-                $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
-            }
-        }
-        catch(ReflectionException $e)
-        {
-            throw new SetupException($this->cn()->g(Translator::class)
-                ->trans('errors.class.invalid', ['name' => $sClassName]));
-        }
-    }
+public function saveComponent(string $sClassName, array $aOptions): void
+{
+try
+{
+// Make sure the registered class exists
+if(isset($aOptions['include']))
+{
+    require_once $aOptions['include'];
+}
+$xReflectionClass = new ReflectionClass($sClassName);
+// Check if the class is registrable
+if(!$xReflectionClass->isInstantiable())
+{
+    return;
+}
 
-    /**
+$this->_saveClassOptions($sClassName, $aOptions);
+
+$sClassKey = $this->getReflectionClassKey($sClassName);
+$this->val($sClassKey, $xReflectionClass);
+// Register the user class, but only if the user didn't already.
+if(!$this->has($sClassName))
+{
+    $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
+}
+}
+catch(ReflectionException $e)
+{
+throw new SetupException($this->cn()->g(Translator::class)
+    ->trans('errors.class.invalid', ['name' => $sClassName]));
+}
+}
+
+/**
      * Register a component
      *
      * @param string $sComponentId The component name
@@ -225,74 +225,74 @@ 
      * @return string
      * @throws SetupException
      */
-    private function _registerComponent(string $sComponentId): string
-    {
-        // Replace all separators ('.' or '_') with antislashes, and trim the class name.
-        $sClassName = trim(str_replace(['.', '_'], '\\', $sComponentId), '\\');
-
-        $sComponentObject = $this->getCallableObjectKey($sClassName);
-        // Prevent duplication. It's important not to use the class name here.
-        if($this->has($sComponentObject))
-        {
-            return $sClassName;
-        }
-
-        // Register the helper class
-        $this->set($this->getCallableHelperKey($sClassName), function() use($sClassName) {
-            $xFactory = $this->di->getCallFactory();
-            return new ComponentHelper($this, $xFactory->rq($sClassName),
-                $xFactory, $this->di->getViewRenderer(),
-                $this->di->getLogger(), $this->di->getSessionManager(),
-                $this->di->getStash(), $this->di->getUploadHandler());
-        });
-
-        $this->discoverComponent($sClassName);
-
-        // Register the callable object
-        $this->set($sComponentObject, function() use($sComponentId, $sClassName) {
-            $aOptions = $this->_getClassOptions($sComponentId);
-            $xReflectionClass = $this->get($this->getReflectionClassKey($sClassName));
-            $xOptions = $this->getComponentOptions($xReflectionClass, $aOptions);
-            return new CallableObject($this, $this->di, $xReflectionClass, $xOptions);
-        });
-
-        // Initialize the user class instance
-        $this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
-            if($xClassInstance instanceof AbstractComponent)
-            {
-                $xHelper = $this->get($this->getCallableHelperKey($sClassName));
-                $xHelper->xTarget = $this->xTarget;
-
-                // Call the protected "initComponent()" method of the Component class.
-                $cSetter = function($di, $xHelper) {
-                    $this->initComponent($di, $xHelper);  // "$this" here refers to the Component class.
-                };
-                $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
-                call_user_func($cSetter, $this->di, $xHelper);
-            }
-
-            // Run the callbacks for class initialisation
-            $this->di->g(CallbackManager::class)->onInit($xClassInstance);
-
-            // Set attributes from the DI container.
-            // The class level DI options are set on any component.
-            // The method level DI options are set only on the targetted component.
-            /** @var CallableObject */
-            $xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
-            $xCallableObject->setDiClassAttributes($xClassInstance);
-            if($this->xTarget !== null)
-            {
-                $sMethodName = $this->xTarget->getMethodName();
-                $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
-            }
-
-            return $xClassInstance;
-        });
-
-        return $sClassName;
-    }
+private function _registerComponent(string $sComponentId): string
+{
+// Replace all separators ('.' or '_') with antislashes, and trim the class name.
+$sClassName = trim(str_replace(['.', '_'], '\\', $sComponentId), '\\');
+
+$sComponentObject = $this->getCallableObjectKey($sClassName);
+// Prevent duplication. It's important not to use the class name here.
+if($this->has($sComponentObject))
+{
+return $sClassName;
+}
+
+// Register the helper class
+$this->set($this->getCallableHelperKey($sClassName), function() use($sClassName) {
+$xFactory = $this->di->getCallFactory();
+return new ComponentHelper($this, $xFactory->rq($sClassName),
+    $xFactory, $this->di->getViewRenderer(),
+    $this->di->getLogger(), $this->di->getSessionManager(),
+    $this->di->getStash(), $this->di->getUploadHandler());
+});
+
+$this->discoverComponent($sClassName);
+
+// Register the callable object
+$this->set($sComponentObject, function() use($sComponentId, $sClassName) {
+$aOptions = $this->_getClassOptions($sComponentId);
+$xReflectionClass = $this->get($this->getReflectionClassKey($sClassName));
+$xOptions = $this->getComponentOptions($xReflectionClass, $aOptions);
+return new CallableObject($this, $this->di, $xReflectionClass, $xOptions);
+});
+
+// Initialize the user class instance
+$this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
+if($xClassInstance instanceof AbstractComponent)
+{
+    $xHelper = $this->get($this->getCallableHelperKey($sClassName));
+    $xHelper->xTarget = $this->xTarget;
+
+    // Call the protected "initComponent()" method of the Component class.
+    $cSetter = function($di, $xHelper) {
+        $this->initComponent($di, $xHelper);  // "$this" here refers to the Component class.
+    };
+    $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
+    call_user_func($cSetter, $this->di, $xHelper);
+}
+
+// Run the callbacks for class initialisation
+$this->di->g(CallbackManager::class)->onInit($xClassInstance);
+
+// Set attributes from the DI container.
+// The class level DI options are set on any component.
+// The method level DI options are set only on the targetted component.
+/** @var CallableObject */
+$xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
+$xCallableObject->setDiClassAttributes($xClassInstance);
+if($this->xTarget !== null)
+{
+    $sMethodName = $this->xTarget->getMethodName();
+    $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
+}
+
+return $xClassInstance;
+});
+
+return $sClassName;
+}
 
-    /**
+/**
      * Get the callable object for a given class
      * The callable object is registered if it is not already in the DI.
      *
@@ -301,13 +301,13 @@ 
      * @return CallableObject|null
      * @throws SetupException
      */
-    public function makeCallableObject(string $sComponentId): ?CallableObject
-    {
-        $sClassName = $this->_registerComponent($sComponentId);
-        return $this->get($this->getCallableObjectKey($sClassName));
-    }
+public function makeCallableObject(string $sComponentId): ?CallableObject
+{
+$sClassName = $this->_registerComponent($sComponentId);
+return $this->get($this->getCallableObjectKey($sClassName));
+}
 
-    /**
+/**
      * Get an instance of a component by name
      *
      * @template T
@@ -316,53 +316,53 @@ 
      * @return T|null
      * @throws SetupException
      */
-    public function makeComponent(string $sClassName): mixed
-    {
-        $sComponentId = str_replace('\\', '.', $sClassName);
-        $sClassName = $this->_registerComponent($sComponentId);
-        return $this->get($sClassName);
-    }
+public function makeComponent(string $sClassName): mixed
+{
+$sComponentId = str_replace('\\', '.', $sClassName);
+$sClassName = $this->_registerComponent($sComponentId);
+return $this->get($sClassName);
+}
 
-    /**
+/**
      * Get a factory for a call to a registered function.
      *
      * @return JxnCall
      */
-    public function getFunctionRequestFactory(): JxnCall
-    {
-        return $this->get($this->getRequestFactoryKey(JxnCall::class));
-    }
+public function getFunctionRequestFactory(): JxnCall
+{
+return $this->get($this->getRequestFactoryKey(JxnCall::class));
+}
 
-    /**
+/**
      * Get a factory for a call to a registered component.
      *
      * @param class-string $sClassName
      *
      * @return JxnCall|null
      */
-    public function getComponentRequestFactory(string $sClassName): ?JxnCall
+public function getComponentRequestFactory(string $sClassName): ?JxnCall
+{
+$sClassName = trim($sClassName, " \t");
+if($sClassName === '')
+{
+return null;
+}
+
+$sFactoryKey = $this->getRequestFactoryKey($sClassName);
+if(!$this->has($sFactoryKey))
+{
+$this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
+    $sComponentId = str_replace('\\', '.', $sClassName);
+    if(!($xCallable = $this->makeCallableObject($sComponentId)))
     {
-        $sClassName = trim($sClassName, " \t");
-        if($sClassName === '')
-        {
-            return null;
-        }
-
-        $sFactoryKey = $this->getRequestFactoryKey($sClassName);
-        if(!$this->has($sFactoryKey))
-        {
-            $this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
-                $sComponentId = str_replace('\\', '.', $sClassName);
-                if(!($xCallable = $this->makeCallableObject($sComponentId)))
-                {
-                    return null;
-                }
-
-                $xConfigManager = $this->di->g(ConfigManager::class);
-                $sPrefix = $xConfigManager->getOption('core.prefix.class', '');
-                return new JxnClassCall($sPrefix . $xCallable->getJsName());
-            });
-        }
-        return $this->get($sFactoryKey);
+        return null;
     }
+
+    $xConfigManager = $this->di->g(ConfigManager::class);
+    $sPrefix = $xConfigManager->getOption('core.prefix.class', '');
+    return new JxnClassCall($sPrefix . $xCallable->getJsName());
+});
+}
+return $this->get($sFactoryKey);
+}
 }

Spacing +12 added lines, -12 removed lines

@@ -82,7 +82,7 @@ 
 
         // Register the logger component, and export to js.
         $this->di->callback()->boot(function() {
-            if($this->di->config()->loggingEnabled())
+            if ($this->di->config()->loggingEnabled())
             {
                 $this->saveComponent(LoggerComponent::class, [
                     'separator' => '.',
@@ -189,13 +189,13 @@ 
         try
         {
             // Make sure the registered class exists
-            if(isset($aOptions['include']))
+            if (isset($aOptions['include']))
             {
                 require_once $aOptions['include'];
             }
             $xReflectionClass = new ReflectionClass($sClassName);
             // Check if the class is registrable
-            if(!$xReflectionClass->isInstantiable())
+            if (!$xReflectionClass->isInstantiable())
             {
                 return;
             }
@@ -205,12 +205,12 @@ 
             $sClassKey = $this->getReflectionClassKey($sClassName);
             $this->val($sClassKey, $xReflectionClass);
             // Register the user class, but only if the user didn't already.
-            if(!$this->has($sClassName))
+            if (!$this->has($sClassName))
             {
                 $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
             }
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             throw new SetupException($this->cn()->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));
@@ -232,7 +232,7 @@ 
 
         $sComponentObject = $this->getCallableObjectKey($sClassName);
         // Prevent duplication. It's important not to use the class name here.
-        if($this->has($sComponentObject))
+        if ($this->has($sComponentObject))
         {
             return $sClassName;
         }
@@ -258,14 +258,14 @@ 
 
         // Initialize the user class instance
         $this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
-            if($xClassInstance instanceof AbstractComponent)
+            if ($xClassInstance instanceof AbstractComponent)
             {
                 $xHelper = $this->get($this->getCallableHelperKey($sClassName));
                 $xHelper->xTarget = $this->xTarget;
 
                 // Call the protected "initComponent()" method of the Component class.
                 $cSetter = function($di, $xHelper) {
-                    $this->initComponent($di, $xHelper);  // "$this" here refers to the Component class.
+                    $this->initComponent($di, $xHelper); // "$this" here refers to the Component class.
                 };
                 $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
                 call_user_func($cSetter, $this->di, $xHelper);
@@ -280,7 +280,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
             $xCallableObject->setDiClassAttributes($xClassInstance);
-            if($this->xTarget !== null)
+            if ($this->xTarget !== null)
             {
                 $sMethodName = $this->xTarget->getMethodName();
                 $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
@@ -343,17 +343,17 @@ 
     public function getComponentRequestFactory(string $sClassName): ?JxnCall
     {
         $sClassName = trim($sClassName, " \t");
-        if($sClassName === '')
+        if ($sClassName === '')
         {
             return null;
         }
 
         $sFactoryKey = $this->getRequestFactoryKey($sClassName);
-        if(!$this->has($sFactoryKey))
+        if (!$this->has($sFactoryKey))
         {
             $this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
                 $sComponentId = str_replace('\\', '.', $sClassName);
-                if(!($xCallable = $this->makeCallableObject($sComponentId)))
+                if (!($xCallable = $this->makeCallableObject($sComponentId)))
                 {
                     return null;
                 }

jaxon-core/src/Jaxon.php

Switch Indentation +8 added lines, -8 removed lines

@@ -16,23 +16,23 @@
 
 class Jaxon
 {
-    /**
+/**
      * @const string
      */
-    public const VERSION = 'Jaxon 5.x';
+public const VERSION = 'Jaxon 5.x';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_CLASS = 'CallableClass';
+public const CALLABLE_CLASS = 'CallableClass';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_DIR = 'CallableDir';
+public const CALLABLE_DIR = 'CallableDir';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_FUNCTION = 'CallableFunction';
+public const CALLABLE_FUNCTION = 'CallableFunction';
 }

jaxon-core/src/Request/Target.php

Switch Indentation +73 added lines, -73 removed lines

@@ -17,56 +17,56 @@ 
 
 class Target implements TargetInterface
 {
-    /**
+/**
      * The target type for function.
      *
      * @var string
      */
-    const TYPE_FUNCTION = 'TargetFunction';
+const TYPE_FUNCTION = 'TargetFunction';
 
-    /**
+/**
      * The target type for class.
      *
      * @var string
      */
-    const TYPE_CLASS = 'TargetClass';
+const TYPE_CLASS = 'TargetClass';
 
-    /**
+/**
      * The target type.
      *
      * @var string
      */
-    private $sType = '';
+private $sType = '';
 
-    /**
+/**
      * The target function name.
      *
      * @var string
      */
-    private $sFunctionName = '';
+private $sFunctionName = '';
 
-    /**
+/**
      * The target class name.
      *
      * @var string
      */
-    private $sClassName = '';
+private $sClassName = '';
 
-    /**
+/**
      * The target method name.
      *
      * @var string
      */
-    private $sMethodName = '';
+private $sMethodName = '';
 
-    /**
+/**
      * The target method args.
      *
      * @var array
      */
-    private $aMethodArgs = [];
+private $aMethodArgs = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sType    The target type
@@ -75,116 +75,116 @@ 
      * @param string $sMethodName    The method name
      * @param array $aMethodArgs    The method args
      */
-    private function __construct(string $sType, string $sFunctionName, string $sClassName, string $sMethodName, array $aMethodArgs = [])
-    {
-        $this->sType = $sType;
-        $this->sFunctionName = $sFunctionName;
-        $this->sClassName = $sClassName;
-        $this->sMethodName = $sMethodName;
-        $this->aMethodArgs = $aMethodArgs;
-    }
+private function __construct(string $sType, string $sFunctionName, string $sClassName, string $sMethodName, array $aMethodArgs = [])
+{
+$this->sType = $sType;
+$this->sFunctionName = $sFunctionName;
+$this->sClassName = $sClassName;
+$this->sMethodName = $sMethodName;
+$this->aMethodArgs = $aMethodArgs;
+}
 
-    /**
+/**
      * Create a target of type Function
      *
      * @param string $sFunctionName    The function name
      *
      * @return Target
      */
-    public static function makeFunction(string $sFunctionName): Target
-    {
-        return new Target(self::TYPE_FUNCTION, $sFunctionName, '', '');
-    }
+public static function makeFunction(string $sFunctionName): Target
+{
+return new Target(self::TYPE_FUNCTION, $sFunctionName, '', '');
+}
 
-    /**
+/**
      * Create a target of type Class
      *
      * @param array $aCall
      *
      * @return Target
      */
-    public static function makeClass(array $aCall): Target
-    {
-        return new Target(self::TYPE_CLASS, '', trim($aCall['name']), trim($aCall['method']));
-    }
+public static function makeClass(array $aCall): Target
+{
+return new Target(self::TYPE_CLASS, '', trim($aCall['name']), trim($aCall['method']));
+}
 
-    /**
+/**
      * Check if the target type is Function.
      *
      * @return bool
      */
-    public function isFunction(): bool
-    {
-        return $this->sType === self::TYPE_FUNCTION;
-    }
+public function isFunction(): bool
+{
+return $this->sType === self::TYPE_FUNCTION;
+}
 
-    /**
+/**
      * Check if the target type is Class.
      *
      * @return bool
      */
-    public function isClass(): bool
-    {
-        return $this->sType === self::TYPE_CLASS;
-    }
+public function isClass(): bool
+{
+return $this->sType === self::TYPE_CLASS;
+}
 
-    /**
+/**
      * The target function name.
      *
      * @return string
      */
-    public function getFunctionName(): string
-    {
-        return $this->sFunctionName;
-    }
+public function getFunctionName(): string
+{
+return $this->sFunctionName;
+}
 
-    /**
+/**
      * The target class name.
      *
      * @return string
      */
-    public function getClassName(): string
-    {
-        return $this->sClassName;
-    }
+public function getClassName(): string
+{
+return $this->sClassName;
+}
 
-    /**
+/**
      * The target method name.
      *
      * @return string
      */
-    public function getMethodName(): string
-    {
-        return $this->sMethodName;
-    }
+public function getMethodName(): string
+{
+return $this->sMethodName;
+}
 
-    /**
+/**
      * Set the target method name.
      *
      * @param array $aMethodArgs
      */
-    public function setMethodArgs(array $aMethodArgs): void
-    {
-        $this->aMethodArgs = $aMethodArgs;
-    }
+public function setMethodArgs(array $aMethodArgs): void
+{
+$this->aMethodArgs = $aMethodArgs;
+}
 
-    /**
+/**
      * The target method name.
      *
      * @return string
      */
-    public function method(): string
-    {
-        return $this->sMethodName;
-    }
+public function method(): string
+{
+return $this->sMethodName;
+}
 
-    /**
+/**
      * The target method args.
      *
      * @return array
      */
-    public function args(): array
-    {
-        return $this->aMethodArgs;
-    }
+public function args(): array
+{
+return $this->aMethodArgs;
+}
 }

jaxon-core/src/Plugin/Request/CallableClass/ComponentRegistry.php

Spacing +30 added lines, -30 removed lines

@@ -110,7 +110,7 @@ 
     public function __construct(protected ComponentContainer $cdi)
     {
         // Set the composer autoloader
-        if(file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
+        if (file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../../vendor/autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../vendor/autoload.php')))
         {
@@ -179,15 +179,15 @@ 
      */
     private function makeClassOptions(string $sClassName, array $aClassOptions, array $aDirectoryOptions): array
     {
-        foreach($this->aDefaultClassOptions as $sOption => $xValue)
+        foreach ($this->aDefaultClassOptions as $sOption => $xValue)
         {
-            if(!isset($aClassOptions[$sOption]))
+            if (!isset($aClassOptions[$sOption]))
             {
                 $aClassOptions[$sOption] = $xValue;
             }
         }
         $aClassOptions['excluded'] = (bool)($aClassOptions['excluded'] ?? false); // Convert to bool.
-        if(is_string($aClassOptions['protected']))
+        if (is_string($aClassOptions['protected']))
         {
             $aClassOptions['protected'] = [$aClassOptions['protected']]; // Convert to array.
         }
@@ -198,30 +198,30 @@ 
             $aDirectoryOptions['classes']['*'] ?? [], // Options for all classes
             $aDirectoryOptions['classes'][$sClassName] ?? [], // Options for this specific class
         ];
-        foreach($aOptionGroups as $aOptionGroup)
+        foreach ($aOptionGroups as $aOptionGroup)
         {
-            if(isset($aOptionGroup['separator']))
+            if (isset($aOptionGroup['separator']))
             {
                 $aClassOptions['separator'] = (string)$aOptionGroup['separator'];
             }
-            if(isset($aOptionGroup['excluded']))
+            if (isset($aOptionGroup['excluded']))
             {
                 $aClassOptions['excluded'] = (bool)$aOptionGroup['excluded'];
             }
-            if(isset($aOptionGroup['protected']))
+            if (isset($aOptionGroup['protected']))
             {
-                if(is_string($aOptionGroup['protected']))
+                if (is_string($aOptionGroup['protected']))
                 {
                     $aOptionGroup['protected'] = [$aOptionGroup['protected']]; // Convert to array.
                 }
                 $aClassOptions['protected'] = array_merge($aClassOptions['protected'], $aOptionGroup['protected']);
             }
-            if(isset($aOptionGroup['functions']))
+            if (isset($aOptionGroup['functions']))
             {
                 $aClassOptions['functions'] = array_merge($aClassOptions['functions'], $aOptionGroup['functions']);
             }
         }
-        if(isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
+        if (isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
         {
             $aClassOptions['config'] = $aDirectoryOptions['config'];
         }
@@ -243,7 +243,7 @@ 
     {
         $aOptions = $this->makeClassOptions($sClassName, $aClassOptions, $aDirectoryOptions);
         $this->cdi->saveComponent($sClassName, $aOptions);
-        if($this->bUpdateHash)
+        if ($this->bUpdateHash)
         {
             $this->sHash .= $sClassName . $aOptions['timestamp'];
         }
@@ -261,7 +261,7 @@ 
     {
         // For classes, the underscore is used as separator.
         $aClassOptions['separator'] = '_';
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aClassOptions['config'] = $this->xPackageConfig;
         }
@@ -278,10 +278,10 @@ 
     public function getNamespaceComponentOptions(string $sClassName): ?array
     {
         // Find the corresponding namespace
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             // Check if the namespace matches the class.
-            if(strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
+            if (strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
             {
                 // Save the class options
                 $aClassOptions = ['namespace' => $sNamespace];
@@ -304,11 +304,11 @@ 
         // For directories without namespace, the underscore is used as separator.
         $aOptions['separator'] = '_';
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aOptions['config'] = $this->xPackageConfig;
         }
@@ -342,16 +342,16 @@ 
         // For namespaces, the dot is used as separator.
         $aOptions['separator'] = '.';
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aOptions['config'] = $this->xPackageConfig;
         }
         // Register the dir with PSR4 autoloading
-        if(($aOptions['autoload']) && $this->xAutoloader != null)
+        if (($aOptions['autoload']) && $this->xAutoloader != null)
         {
             $this->xAutoloader->setPsr4($sNamespace . '\\', $aOptions['directory']);
         }
@@ -367,7 +367,7 @@ 
     public function registerComponentsInNamespaces(): void
     {
         // This is to be done only once.
-        if($this->bNamespacesParsed)
+        if ($this->bNamespacesParsed)
         {
             return;
         }
@@ -375,17 +375,17 @@ 
 
         // Browse directories with namespaces and read all the files.
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             $this->addNamespace($sNamespace, ['separator' => '.']);
 
             // Iterate on dir content
             $sDirectory = $aDirectoryOptions['directory'];
             $itFile = new SortedFileIterator($sDirectory);
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
@@ -394,7 +394,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath !== '')
+                if ($sRelativePath !== '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
@@ -420,21 +420,21 @@ 
     public function registerComponentsInDirectories(): void
     {
         // This is to be done only once.
-        if($this->bDirectoriesParsed)
+        if ($this->bDirectoriesParsed)
         {
             return;
         }
         $this->bDirectoriesParsed = true;
 
         // Browse directories without namespaces and read all the files.
-        foreach($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
+        foreach ($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
         {
             $itFile = new SortedFileIterator($sDirectory);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // Skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
@@ -444,7 +444,7 @@ 
                     'separator' => '.',
                     'timestamp' => $xFile->getMTime(),
                 ];
-                if(($aDirectoryOptions['autoload']) && $this->xAutoloader !== null)
+                if (($aDirectoryOptions['autoload']) && $this->xAutoloader !== null)
                 {
                     // Set classmap autoloading. Must be done before registering the class.
                     $this->xAutoloader->addClassMap([$sClassName => $xFile->getPathname()]);

jaxon-core/src/App/Databag/Databag.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
     public function new(string $sBag, string $sKey, $xValue): void
     {
         // Set the value only if it doesn't already exist.
-        if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
+        if (!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
         {
             $this->set($sBag, $sKey, $xValue);
         }

Switch Indentation +56 added lines, -56 removed lines

@@ -11,110 +11,110 @@
 
 class Databag implements JsonSerializable
 {
-    /**
+/**
      * @var DatabagPlugin
      */
-    protected $xPlugin;
+protected $xPlugin;
 
-    /**
+/**
      * @var array
      */
-    protected $aData = [];
+protected $aData = [];
 
-    /**
+/**
      * @var bool
      */
-    protected $bTouched = false;
+protected $bTouched = false;
 
-    /**
+/**
      * The constructor
      *
      * @param array $aData
      */
-    public function __construct(DatabagPlugin $xPlugin, array $aData)
-    {
-        $this->xPlugin = $xPlugin;
-        // Ensure all contents are arrays.
-        $this->aData = array_map(function($aValue) {
-            return is_array($aValue) ? $aValue : [];
-        }, $aData);
-    }
+public function __construct(DatabagPlugin $xPlugin, array $aData)
+{
+$this->xPlugin = $xPlugin;
+// Ensure all contents are arrays.
+$this->aData = array_map(function($aValue) {
+return is_array($aValue) ? $aValue : [];
+}, $aData);
+}
 
-    /**
+/**
      * @return bool
      */
-    public function touched(): bool
-    {
-        return $this->bTouched;
-    }
+public function touched(): bool
+{
+return $this->bTouched;
+}
 
-    /**
+/**
      * @return array
      */
-    public function getAll(): array
-    {
-        return $this->aData;
-    }
+public function getAll(): array
+{
+return $this->aData;
+}
 
-    /**
+/**
      * @param string $sBag
      *
      * @return void
      */
-    public function clear(string $sBag): void
-    {
-        $this->aData[$sBag] = [];
-        $this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]);
-    }
+public function clear(string $sBag): void
+{
+$this->aData[$sBag] = [];
+$this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]);
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function set(string $sBag, string $sKey, $xValue): void
-    {
-        $this->bTouched = true;
-        $this->aData[$sBag][$sKey] = $xValue;
-    }
+public function set(string $sBag, string $sKey, $xValue): void
+{
+$this->bTouched = true;
+$this->aData[$sBag][$sKey] = $xValue;
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function new(string $sBag, string $sKey, $xValue): void
-    {
-        // Set the value only if it doesn't already exist.
-        if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
-        {
-            $this->set($sBag, $sKey, $xValue);
-        }
-    }
+public function new(string $sBag, string $sKey, $xValue): void
+{
+// Set the value only if it doesn't already exist.
+if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
+{
+$this->set($sBag, $sKey, $xValue);
+}
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return mixed
      */
-    public function get(string $sBag, string $sKey, $xValue = null): mixed
-    {
-        return $this->aData[$sBag][$sKey] ?? $xValue;
-    }
+public function get(string $sBag, string $sKey, $xValue = null): mixed
+{
+return $this->aData[$sBag][$sKey] ?? $xValue;
+}
 
-    /**
+/**
      * Convert this call to array, when converting the response into json.
      *
      * @return array
      */
-    public function jsonSerialize(): array
-    {
-        return $this->aData;
-    }
+public function jsonSerialize(): array
+{
+return $this->aData;
+}
 }

jaxon-core/src/Plugin/Response/Databag/DatabagPlugin.php

Switch Indentation +59 added lines, -59 removed lines

@@ -13,94 +13,94 @@
 
 class DatabagPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'bags';
+public const NAME = 'bags';
 
-    /**
+/**
      * @var Databag
      */
-    protected $xDatabag = null;
+protected $xDatabag = null;
 
-    /**
+/**
      * The constructor
      */
-    public function __construct(protected Container $di)
-    {}
+public function __construct(protected Container $di)
+{}
 
-    /**
+/**
      * @return void
      */
-    private function initDatabag(): void
-    {
-        if($this->xDatabag !== null)
-        {
-            return;
-        }
+private function initDatabag(): void
+{
+if($this->xDatabag !== null)
+{
+return;
+}
 
-        // Get the databag contents from the HTTP request parameters.
-        $xRequest = $this->di->getRequest();
-        $aBody = $xRequest->getParsedBody();
-        $aParams = $xRequest->getQueryParams();
-        $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
-        $this->xDatabag = new Databag($this, $aData);
-    }
+// Get the databag contents from the HTTP request parameters.
+$xRequest = $this->di->getRequest();
+$aBody = $xRequest->getParsedBody();
+$aParams = $xRequest->getQueryParams();
+$aData = is_array($aBody) ?
+$this->readData($aBody['jxnbags'] ?? []) :
+$this->readData($aParams['jxnbags'] ?? []);
+$this->xDatabag = new Databag($this, $aData);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @param mixed $xData
      *
      * @return array
      */
-    private function readData($xData): array
-    {
-        // Todo: clean input data.
-        // Todo: verify the checksums.
-        return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
-    }
+private function readData($xData): array
+{
+// Todo: clean input data.
+// Todo: verify the checksums.
+return is_string($xData) ?
+(json_decode($xData, true) ?: []) :
+(is_array($xData) ? $xData : []);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '4.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '4.0.0';
+}
 
-    /**
+/**
      * @return void
      */
-    public function writeCommand(): void
-    {
-        $this->initDatabag();
-        if($this->xDatabag->touched())
-        {
-            // Todo: calculate the checksums.
-            $this->addCommand('databag.set', ['values' => $this->xDatabag]);
-        }
-    }
+public function writeCommand(): void
+{
+$this->initDatabag();
+if($this->xDatabag->touched())
+{
+// Todo: calculate the checksums.
+$this->addCommand('databag.set', ['values' => $this->xDatabag]);
+}
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return DatabagContext
      */
-    public function bag(string $sName): DatabagContext
-    {
-        $this->initDatabag();
-        return new DatabagContext($this->xDatabag, $sName);
-    }
+public function bag(string $sName): DatabagContext
+{
+$this->initDatabag();
+return new DatabagContext($this->xDatabag, $sName);
+}
 }

Spacing +4 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
      */
     private function initDatabag(): void
     {
-        if($this->xDatabag !== null)
+        if ($this->xDatabag !== null)
         {
             return;
         }
@@ -44,8 +44,7 @@ 
         $aBody = $xRequest->getParsedBody();
         $aParams = $xRequest->getQueryParams();
         $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
+            $this->readData($aBody['jxnbags'] ?? []) : $this->readData($aParams['jxnbags'] ?? []);
         $this->xDatabag = new Databag($this, $aData);
     }
 
@@ -67,8 +66,7 @@ 
         // Todo: clean input data.
         // Todo: verify the checksums.
         return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
+            (json_decode($xData, true) ?: []) : (is_array($xData) ? $xData : []);
     }
 
     /**
@@ -86,7 +84,7 @@ 
     public function writeCommand(): void
     {
         $this->initDatabag();
-        if($this->xDatabag->touched())
+        if ($this->xDatabag->touched())
         {
             // Todo: calculate the checksums.
             $this->addCommand('databag.set', ['values' => $this->xDatabag]);

jaxon-attributes/src/Attribute/Databag.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 use Jaxon\App\Metadata\Metadata;
 use Attribute;
 
-#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
+#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_METHOD|Attribute::IS_REPEATABLE)]
 class Databag extends AbstractAttribute
 {
     /**

jaxon-annotations/src/Annotation/DatabagAnnotation.php

Switch Indentation +22 added lines, -22 removed lines

@@ -28,40 +28,40 @@
  */
 class DatabagAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * The data bag name
      *
      * @var string
      */
-    protected $sName = '';
+protected $sName = '';
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
-        {
-            throw new AnnotationException('The @databag annotation requires a property "name" of type string');
-        }
-        $this->sName = $properties['name'];
-    }
+public function initAnnotation(array $properties)
+{
+if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+{
+throw new AnnotationException('The @databag annotation requires a property "name" of type string');
+}
+$this->sName = $properties['name'];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->databag($sMethod)->addValue($this->sName);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->databag($sMethod)->addValue($this->sName);
+}
 }

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      */
     public function initAnnotation(array $properties)
     {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+        if (count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
         {
             throw new AnnotationException('The @databag annotation requires a property "name" of type string');
         }

jaxon-core/src/App/Databag/DatabagContext.php

Switch Indentation +25 added lines, -25 removed lines

@@ -4,58 +4,58 @@
 
 class DatabagContext
 {
-    /**
+/**
      * @var Databag
      */
-    protected $xDatabag;
+protected $xDatabag;
 
-    /**
+/**
      * @var string
      */
-    protected $sName;
+protected $sName;
 
-    /**
+/**
      * The constructor
      *
      * @param Databag $xDatabag
      * @param string $sName
      */
-    public function __construct(Databag $xDatabag, string $sName)
-    {
-        $this->xDatabag = $xDatabag;
-        $this->sName = $sName;
-    }
+public function __construct(Databag $xDatabag, string $sName)
+{
+$this->xDatabag = $xDatabag;
+$this->sName = $sName;
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function set(string $sKey, $xValue): void
-    {
-        $this->xDatabag->set($this->sName, $sKey, $xValue);
-    }
+public function set(string $sKey, $xValue): void
+{
+$this->xDatabag->set($this->sName, $sKey, $xValue);
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function new(string $sKey, $xValue): void
-    {
-        $this->xDatabag->new($this->sName, $sKey, $xValue);
-    }
+public function new(string $sKey, $xValue): void
+{
+$this->xDatabag->new($this->sName, $sKey, $xValue);
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return mixed
      */
-    public function get(string $sKey, $xValue = null): mixed
-    {
-        return $this->xDatabag->get($this->sName, $sKey, $xValue);
-    }
+public function get(string $sKey, $xValue = null): mixed
+{
+return $this->xDatabag->get($this->sName, $sKey, $xValue);
+}
 }