jaxon-php / jaxon-mono

jaxon-core/src/Di/Traits/RequestTrait.php

Switch Indentation +61 added lines, -61 removed lines

@@ -20,99 +20,99 @@
 
 trait RequestTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerRequests(): void
-    {
-        // The parameter reader
-        $this->set(ParameterReader::class, function($di) {
-            return new ParameterReader($di->g(Container::class), $di->g(Translator::class),
-                $di->g(ConfigManager::class), $di->g(UriDetector::class));
-        });
-        // Callback Manager
-        $this->set(CallbackManager::class, function($di) {
-            return new CallbackManager($di->g(ResponseManager::class));
-        });
-        // By default, register a null upload handler
-        $this->set(UploadHandlerInterface::class, function() {
-            return null;
-        });
-        // Request Handler
-        $this->set(RequestHandler::class, function($di) {
-            return new RequestHandler($di->g(Container::class), $di->g(PluginManager::class),
-                $di->g(ResponseManager::class), $di->g(CallbackManager::class),
-                $di->g(DatabagPlugin::class));
-        });
-        // Requests and calls Factory
-        $this->set(CallFactory::class, function($di) {
-            return new CallFactory($di->g(ComponentContainer::class), $di->g(DialogCommand::class));
-        });
-        // Factory for function parameters
-        $this->set(ParameterFactory::class, function() {
-            return new ParameterFactory();
-        });
-    }
+private function registerRequests(): void
+{
+// The parameter reader
+$this->set(ParameterReader::class, function($di) {
+return new ParameterReader($di->g(Container::class), $di->g(Translator::class),
+    $di->g(ConfigManager::class), $di->g(UriDetector::class));
+});
+// Callback Manager
+$this->set(CallbackManager::class, function($di) {
+return new CallbackManager($di->g(ResponseManager::class));
+});
+// By default, register a null upload handler
+$this->set(UploadHandlerInterface::class, function() {
+return null;
+});
+// Request Handler
+$this->set(RequestHandler::class, function($di) {
+return new RequestHandler($di->g(Container::class), $di->g(PluginManager::class),
+    $di->g(ResponseManager::class), $di->g(CallbackManager::class),
+    $di->g(DatabagPlugin::class));
+});
+// Requests and calls Factory
+$this->set(CallFactory::class, function($di) {
+return new CallFactory($di->g(ComponentContainer::class), $di->g(DialogCommand::class));
+});
+// Factory for function parameters
+$this->set(ParameterFactory::class, function() {
+return new ParameterFactory();
+});
+}
 
-    /**
+/**
      * Get the callback manager
      *
      * @return CallbackManager
      */
-    public function callback(): CallbackManager
-    {
-        return $this->g(CallbackManager::class);
-    }
+public function callback(): CallbackManager
+{
+return $this->g(CallbackManager::class);
+}
 
-    /**
+/**
      * Get the js call factory
      *
      * @return CallFactory
      */
-    public function getCallFactory(): CallFactory
-    {
-        return $this->g(CallFactory::class);
-    }
+public function getCallFactory(): CallFactory
+{
+return $this->g(CallFactory::class);
+}
 
-    /**
+/**
      * Get the js call parameter factory
      *
      * @return ParameterFactory
      */
-    public function getParameterFactory(): ParameterFactory
-    {
-        return $this->g(ParameterFactory::class);
-    }
+public function getParameterFactory(): ParameterFactory
+{
+return $this->g(ParameterFactory::class);
+}
 
-    /**
+/**
      * Get the request handler
      *
      * @return RequestHandler
      */
-    public function getRequestHandler(): RequestHandler
-    {
-        return $this->g(RequestHandler::class);
-    }
+public function getRequestHandler(): RequestHandler
+{
+return $this->g(RequestHandler::class);
+}
 
-    /**
+/**
      * Get the upload handler
      *
      * @return UploadHandlerInterface|null
      */
-    public function getUploadHandler(): ?UploadHandlerInterface
-    {
-        return $this->g(UploadHandlerInterface::class);
-    }
+public function getUploadHandler(): ?UploadHandlerInterface
+{
+return $this->g(UploadHandlerInterface::class);
+}
 
-    /**
+/**
      * Get the parameter reader
      *
      * @return ParameterReader
      */
-    public function getParameterReader(): ParameterReader
-    {
-        return $this->g(ParameterReader::class);
-    }
+public function getParameterReader(): ParameterReader
+{
+return $this->g(ParameterReader::class);
+}
 }

jaxon-core/src/Di/Traits/DiAutoTrait.php

Switch Indentation +47 added lines, -47 removed lines

@@ -26,44 +26,44 @@ 
 
 trait DiAutoTrait
 {
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    abstract protected function cn(): Container;
+abstract protected function cn(): Container;
 
-    /**
+/**
      * @param ReflectionClass $xClass
      * @param ReflectionParameter $xParameter
      *
      * @return mixed
      * @throws SetupException
      */
-    private function getParameter(ReflectionClass $xClass, ReflectionParameter $xParameter)
-    {
-        $xType = $xParameter->getType();
-        $sParameterName = '$' . $xParameter->getName();
-        // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
-        {
-            $sParameterType = $xType->getName();
-            // The class + the name
-            if($this->cn()->has("$sParameterType $sParameterName"))
-            {
-                return $this->cn()->get("$sParameterType $sParameterName");
-            }
-            // The class only
-            if($this->cn()->has($sParameterType))
-            {
-                return $this->cn()->get($sParameterType);
-            }
-        }
-        // Check the name only
-        return $this->cn()->get($sParameterName);
-    }
+private function getParameter(ReflectionClass $xClass, ReflectionParameter $xParameter)
+{
+$xType = $xParameter->getType();
+$sParameterName = '$' . $xParameter->getName();
+// Check the parameter class first.
+if($xType instanceof ReflectionNamedType)
+{
+$sParameterType = $xType->getName();
+// The class + the name
+if($this->cn()->has("$sParameterType $sParameterName"))
+{
+    return $this->cn()->get("$sParameterType $sParameterName");
+}
+// The class only
+if($this->cn()->has($sParameterType))
+{
+    return $this->cn()->get($sParameterType);
+}
+}
+// Check the name only
+return $this->cn()->get($sParameterName);
+}
 
-    /**
+/**
      * Create an instance of a class, getting the constructor parameters from the DI container
      *
      * @param class-string|ReflectionClass $xClass The class name or the reflection class
@@ -72,33 +72,33 @@ 
      * @throws ReflectionException
      * @throws SetupException
      */
-    public function make(string|ReflectionClass $xClass): mixed
-    {
-        if(is_string($xClass))
-        {
-            // Create the reflection class instance
-            $xClass = new ReflectionClass($xClass);
-        }
-        // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
-        {
-            return $xClass->newInstance();
-        }
+public function make(string|ReflectionClass $xClass): mixed
+{
+if(is_string($xClass))
+{
+// Create the reflection class instance
+$xClass = new ReflectionClass($xClass);
+}
+// Use the Reflection class to get the parameters of the constructor
+if(($constructor = $xClass->getConstructor()) === null)
+{
+return $xClass->newInstance();
+}
 
-        $aParameters = array_map(fn($xParameter) =>
-            $this->getParameter($xClass, $xParameter), $constructor->getParameters());
-        return $xClass->newInstanceArgs($aParameters);
-    }
+$aParameters = array_map(fn($xParameter) =>
+$this->getParameter($xClass, $xParameter), $constructor->getParameters());
+return $xClass->newInstanceArgs($aParameters);
+}
 
-    /**
+/**
      * Create an instance of a class by automatically fetching the dependencies in the constructor.
      *
      * @param class-string $sClass    The class name
      *
      * @return void
      */
-    public function auto(string $sClass): void
-    {
-        $this->set($sClass, fn() => $this->make($sClass));
-    }
+public function auto(string $sClass): void
+{
+$this->set($sClass, fn() => $this->make($sClass));
+}
 }

Spacing +5 added lines, -5 removed lines

@@ -45,16 +45,16 @@ 
         $xType = $xParameter->getType();
         $sParameterName = '$' . $xParameter->getName();
         // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
+        if ($xType instanceof ReflectionNamedType)
         {
             $sParameterType = $xType->getName();
             // The class + the name
-            if($this->cn()->has("$sParameterType $sParameterName"))
+            if ($this->cn()->has("$sParameterType $sParameterName"))
             {
                 return $this->cn()->get("$sParameterType $sParameterName");
             }
             // The class only
-            if($this->cn()->has($sParameterType))
+            if ($this->cn()->has($sParameterType))
             {
                 return $this->cn()->get($sParameterType);
             }
@@ -74,13 +74,13 @@ 
      */
     public function make(string|ReflectionClass $xClass): mixed
     {
-        if(is_string($xClass))
+        if (is_string($xClass))
         {
             // Create the reflection class instance
             $xClass = new ReflectionClass($xClass);
         }
         // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
+        if (($constructor = $xClass->getConstructor()) === null)
         {
             return $xClass->newInstance();
         }

jaxon-core/src/Di/ComponentContainer.php

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/Di/Container.php

Switch Indentation +128 added lines, -128 removed lines

@@ -29,145 +29,145 @@ 
 
 class Container
 {
-    use Traits\AppTrait;
-    use Traits\PsrTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
-    use Traits\PluginTrait;
-    use Traits\CallableTrait;
-    use Traits\ViewTrait;
-    use Traits\UtilTrait;
-    use Traits\MetadataTrait;
-    use Traits\DiAutoTrait;
+use Traits\AppTrait;
+use Traits\PsrTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
+use Traits\PluginTrait;
+use Traits\CallableTrait;
+use Traits\ViewTrait;
+use Traits\UtilTrait;
+use Traits\MetadataTrait;
+use Traits\DiAutoTrait;
 
-    /**
+/**
      * The library Dependency Injection Container
      *
      * @var PimpleContainer
      */
-    private $xLibContainer;
+private $xLibContainer;
 
-    /**
+/**
      * The application or framework Dependency Injection Container
      *
      * @var ContainerInterface
      */
-    private $xAppContainer = null;
+private $xAppContainer = null;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct()
-    {
-        $this->xLibContainer = new PimpleContainer();
+public function __construct()
+{
+$this->xLibContainer = new PimpleContainer();
 
-        $this->val(Container::class, $this);
+$this->val(Container::class, $this);
 
-        // Register the null logger by default
-        $this->setLogger(new NullLogger());
+// Register the null logger by default
+$this->setLogger(new NullLogger());
 
-        // Template directory
-        $sTemplateDir = realpath(__DIR__ . '/../../templates');
-        $this->val('jaxon.core.dir.template', $sTemplateDir);
+// Template directory
+$sTemplateDir = realpath(__DIR__ . '/../../templates');
+$this->val('jaxon.core.dir.template', $sTemplateDir);
 
-        // Translation directory
-        $sTranslationDir = realpath(__DIR__ . '/../../translations');
-        $this->val('jaxon.core.dir.translation', $sTranslationDir);
+// Translation directory
+$sTranslationDir = realpath(__DIR__ . '/../../translations');
+$this->val('jaxon.core.dir.translation', $sTranslationDir);
 
-        $this->registerAll();
-        $this->setEventHandlers();
-    }
+$this->registerAll();
+$this->setEventHandlers();
+}
 
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    protected function cn(): Container
-    {
-        return $this;
-    }
+protected function cn(): Container
+{
+return $this;
+}
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerAll()
-    {
-        $this->registerApp();
-        $this->registerPsr();
-        $this->registerRequests();
-        $this->registerResponses();
-        $this->registerPlugins();
-        $this->registerCallables();
-        $this->registerViews();
-        $this->registerUtils();
-        $this->registerMetadataReader();
-    }
+private function registerAll()
+{
+$this->registerApp();
+$this->registerPsr();
+$this->registerRequests();
+$this->registerResponses();
+$this->registerPlugins();
+$this->registerCallables();
+$this->registerViews();
+$this->registerUtils();
+$this->registerMetadataReader();
+}
 
-    /**
+/**
      * Set the logger
      *
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger)
-    {
-        is_a($xLogger, LoggerInterface::class) ?
-            $this->val(LoggerInterface::class, $xLogger) :
-            $this->set(LoggerInterface::class, $xLogger);
-    }
+public function setLogger(LoggerInterface|Closure $xLogger)
+{
+is_a($xLogger, LoggerInterface::class) ?
+$this->val(LoggerInterface::class, $xLogger) :
+$this->set(LoggerInterface::class, $xLogger);
+}
 
-    /**
+/**
      * Get the logger
      *
      * @return LoggerInterface
      */
-    public function getLogger(): LoggerInterface
-    {
-        return $this->get(LoggerInterface::class);
-    }
+public function getLogger(): LoggerInterface
+{
+return $this->get(LoggerInterface::class);
+}
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer)
-    {
-        $this->xAppContainer = $xContainer;
-    }
+public function setContainer(ContainerInterface $xContainer)
+{
+$this->xAppContainer = $xContainer;
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param string $sClass    The full class name
      *
      * @return bool
      */
-    public function h(string $sClass): bool
-    {
-        return $this->xLibContainer->offsetExists($sClass);
-    }
+public function h(string $sClass): bool
+{
+return $this->xLibContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param string $sClass    The full class name
      *
      * @return bool
      */
-    public function has(string $sClass): bool
-    {
-        return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
-            true : $this->xLibContainer->offsetExists($sClass);
-    }
+public function has(string $sClass): bool
+{
+return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
+true : $this->xLibContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -175,12 +175,12 @@ 
      *
      * @return T
      */
-    public function g(string $sClass): mixed
-    {
-        return $this->xLibContainer->offsetGet($sClass);
-    }
+public function g(string $sClass): mixed
+{
+return $this->xLibContainer->offsetGet($sClass);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -189,24 +189,24 @@ 
      * @return T
      * @throws SetupException
      */
-    public function get(string $sClass): mixed
-    {
-        try
-        {
-            return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
-                $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
-        }
-        catch(Throwable $e)
-        {
-            $xLogger = $this->g(LoggerInterface::class);
-            $xTranslator = $this->g(Translator::class);
-            $sMessage = $e->getMessage() . ': ' . $xTranslator->trans('errors.class.container', ['name' => $sClass]);
-            $xLogger->error($e->getMessage(), ['message' => $sMessage]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function get(string $sClass): mixed
+{
+try
+{
+return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
+    $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
+}
+catch(Throwable $e)
+{
+$xLogger = $this->g(LoggerInterface::class);
+$xTranslator = $this->g(Translator::class);
+$sMessage = $e->getMessage() . ': ' . $xTranslator->trans('errors.class.container', ['name' => $sClass]);
+$xLogger->error($e->getMessage(), ['message' => $sMessage]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Save a closure in the container
      *
      * @param string|class-string $sClass    The full class name
@@ -215,15 +215,15 @@ 
      *
      * @return void
      */
-    public function set(string $sClass, Closure $xClosure, bool $bIsSingleton = true)
-    {
-        // Wrap the user closure into a new closure, so it can take this container as a parameter.
-        $xClosure = fn() => $xClosure($this);
-        $this->xLibContainer->offsetSet($sClass, $bIsSingleton ?
-            $xClosure : $this->xLibContainer->factory($xClosure));
-    }
+public function set(string $sClass, Closure $xClosure, bool $bIsSingleton = true)
+{
+// Wrap the user closure into a new closure, so it can take this container as a parameter.
+$xClosure = fn() => $xClosure($this);
+$this->xLibContainer->offsetSet($sClass, $bIsSingleton ?
+$xClosure : $this->xLibContainer->factory($xClosure));
+}
 
-    /**
+/**
      * Save a value in the container
      *
      * @param string|class-string $sKey    The key
@@ -231,12 +231,12 @@ 
      *
      * @return void
      */
-    public function val(string $sKey, $xValue)
-    {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
-    }
+public function val(string $sKey, $xValue)
+{
+$this->xLibContainer->offsetSet($sKey, $xValue);
+}
 
-    /**
+/**
      * Set an alias in the container
      *
      * @param string|class-string $sAlias    The alias name
@@ -244,32 +244,32 @@ 
      *
      * @return void
      */
-    public function alias(string $sAlias, string $sClass)
-    {
-        $this->set($sAlias, function($di) use ($sClass) {
-            return $di->get($sClass);
-        });
-    }
+public function alias(string $sAlias, string $sClass)
+{
+$this->set($sAlias, function($di) use ($sClass) {
+return $di->get($sClass);
+});
+}
 
-    /**
+/**
      * Get the session manager
      *
      * @return SessionInterface|null
      */
-    public function getSessionManager(): ?SessionInterface
-    {
-        return $this->h(SessionInterface::class) ? $this->g(SessionInterface::class) : null;
-    }
+public function getSessionManager(): ?SessionInterface
+{
+return $this->h(SessionInterface::class) ? $this->g(SessionInterface::class) : null;
+}
 
-    /**
+/**
      * Set the session manager
      *
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure)
-    {
-        $this->set(SessionInterface::class, $xClosure);
-    }
+public function setSessionManager(Closure $xClosure)
+{
+$this->set(SessionInterface::class, $xClosure);
+}
 }

Spacing +2 added lines, -3 removed lines

@@ -116,8 +116,7 @@ 
     public function setLogger(LoggerInterface|Closure $xLogger)
     {
         is_a($xLogger, LoggerInterface::class) ?
-            $this->val(LoggerInterface::class, $xLogger) :
-            $this->set(LoggerInterface::class, $xLogger);
+            $this->val(LoggerInterface::class, $xLogger) : $this->set(LoggerInterface::class, $xLogger);
     }
 
     /**
@@ -196,7 +195,7 @@ 
             return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
                 $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
         }
-        catch(Throwable $e)
+        catch (Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);

jaxon-core/src/App/Component/Logger.php

Switch Indentation +9 added lines, -9 removed lines

@@ -7,15 +7,15 @@ 
 
 class Logger
 {
-    use LoggerTrait;
+use LoggerTrait;
 
-    /**
+/**
      * @param LoggerInterface $logger
      */
-    public function __construct(private LoggerInterface $logger)
-    {}
+public function __construct(private LoggerInterface $logger)
+{}
 
-    /**
+/**
      * Logs with an arbitrary level.
      *
      * @param mixed  $level
@@ -24,8 +24,8 @@ 
      *
      * @return void
      */
-    public function log($level, string|\Stringable $message, array $context = [])
-    {
-        $this->logger->log($level, $message, $context);
-    }
+public function log($level, string|\Stringable $message, array $context = [])
+{
+$this->logger->log($level, $message, $context);
+}
 }

jaxon-core/src/App/Config/ConfigManager.php

Switch Indentation +185 added lines, -185 removed lines

@@ -29,17 +29,17 @@ 
 
 class ConfigManager
 {
-    /**
+/**
      * @var Config
      */
-    protected $xLibConfig;
+protected $xLibConfig;
 
-    /**
+/**
      * @var Config
      */
-    protected $xAppConfig;
+protected $xAppConfig;
 
-    /**
+/**
      * The constructor
      *
      * @param array $aDefaultOptions
@@ -48,15 +48,15 @@ 
      * @param ConfigSetter $xConfigSetter
      * @param ConfigEventManager $xEventManager
      */
-    public function __construct(array $aDefaultOptions, private Translator $xTranslator,
-        private ConfigReader $xConfigReader, private ConfigSetter $xConfigSetter,
-        private ConfigEventManager $xEventManager)
-    {
-        $this->xLibConfig = $xConfigSetter->newConfig($aDefaultOptions);
-        $this->xAppConfig = $xConfigSetter->newConfig();
-    }
+public function __construct(array $aDefaultOptions, private Translator $xTranslator,
+private ConfigReader $xConfigReader, private ConfigSetter $xConfigSetter,
+private ConfigEventManager $xEventManager)
+{
+$this->xLibConfig = $xConfigSetter->newConfig($aDefaultOptions);
+$this->xAppConfig = $xConfigSetter->newConfig();
+}
 
-    /**
+/**
      * Read a config file
      *
      * @param string $sConfigFile
@@ -64,35 +64,35 @@ 
      * @return array
      * @throws SetupException
      */
-    public function read(string $sConfigFile): array
-    {
-        try
-        {
-            return $this->xConfigReader->read($sConfigFile);
-        }
-        catch(YamlExtension $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.yaml.install');
-            throw new SetupException($sMessage);
-        }
-        catch(FileExtension $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
-            throw new SetupException($sMessage);
-        }
-        catch(FileAccess $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
-            throw new SetupException($sMessage);
-        }
-        catch(FileContent $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function read(string $sConfigFile): array
+{
+try
+{
+return $this->xConfigReader->read($sConfigFile);
+}
+catch(YamlExtension $e)
+{
+$sMessage = $this->xTranslator->trans('errors.yaml.install');
+throw new SetupException($sMessage);
+}
+catch(FileExtension $e)
+{
+$sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
+throw new SetupException($sMessage);
+}
+catch(FileAccess $e)
+{
+$sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
+throw new SetupException($sMessage);
+}
+catch(FileContent $e)
+{
+$sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Read options from a config file and set the library config
      *
      * @param string $sConfigFile The full path to the config file
@@ -101,27 +101,27 @@ 
      * @return void
      * @throws SetupException
      */
-    public function load(string $sConfigFile, string $sConfigSection = ''): void
-    {
-        try
-        {
-            // Read the options and save in the config.
-            $this->xLibConfig = $this->xConfigSetter
-                ->setOptions($this->xLibConfig, $this->read($sConfigFile), $sConfigSection);
-            // Call the config change listeners.
-            $this->xEventManager->libConfigChanged($this->xLibConfig, '');
-        }
-        catch(DataDepth $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.data.depth', [
-                'key' => $e->sPrefix,
-                'depth' => $e->nDepth,
-            ]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function load(string $sConfigFile, string $sConfigSection = ''): void
+{
+try
+{
+// Read the options and save in the config.
+$this->xLibConfig = $this->xConfigSetter
+    ->setOptions($this->xLibConfig, $this->read($sConfigFile), $sConfigSection);
+// Call the config change listeners.
+$this->xEventManager->libConfigChanged($this->xLibConfig, '');
+}
+catch(DataDepth $e)
+{
+$sMessage = $this->xTranslator->trans('errors.data.depth', [
+    'key' => $e->sPrefix,
+    'depth' => $e->nDepth,
+]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Set the config options of the library
      *
      * @param array $aOptions
@@ -130,27 +130,27 @@ 
      * @return bool
      * @throws SetupException
      */
-    public function setOptions(array $aOptions, string $sNamePrefix = ''): bool
-    {
-        try
-        {
-            $this->xLibConfig = $this->xConfigSetter
-                ->setOptions($this->xLibConfig, $aOptions, $sNamePrefix);
-            // Call the config change listeners.
-            $this->xEventManager->libConfigChanged($this->xLibConfig, '');
-            return $this->xLibConfig->changed();
-        }
-        catch(DataDepth $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.data.depth', [
-                'key' => $e->sPrefix,
-                'depth' => $e->nDepth,
-            ]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function setOptions(array $aOptions, string $sNamePrefix = ''): bool
+{
+try
+{
+$this->xLibConfig = $this->xConfigSetter
+    ->setOptions($this->xLibConfig, $aOptions, $sNamePrefix);
+// Call the config change listeners.
+$this->xEventManager->libConfigChanged($this->xLibConfig, '');
+return $this->xLibConfig->changed();
+}
+catch(DataDepth $e)
+{
+$sMessage = $this->xTranslator->trans('errors.data.depth', [
+    'key' => $e->sPrefix,
+    'depth' => $e->nDepth,
+]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -158,15 +158,15 @@ 
      *
      * @return void
      */
-    public function setOption(string $sName, $xValue): void
-    {
-        $this->xLibConfig = $this->xConfigSetter
-            ->setOption($this->xLibConfig, $sName, $xValue);
-        // Call the config change listeners.
-        $this->xEventManager->libConfigChanged($this->xLibConfig, $sName);
-    }
+public function setOption(string $sName, $xValue): void
+{
+$this->xLibConfig = $this->xConfigSetter
+->setOption($this->xLibConfig, $sName, $xValue);
+// Call the config change listeners.
+$this->xEventManager->libConfigChanged($this->xLibConfig, $sName);
+}
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sName The option name
@@ -174,36 +174,36 @@ 
      *
      * @return mixed
      */
-    public function getOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->xLibConfig->getOption($sName, $xDefault);
-    }
+public function getOption(string $sName, $xDefault = null): mixed
+{
+return $this->xLibConfig->getOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of a config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasOption(string $sName): bool
-    {
-        return $this->xLibConfig->hasOption($sName);
-    }
+public function hasOption(string $sName): bool
+{
+return $this->xLibConfig->hasOption($sName);
+}
 
-    /**
+/**
      * Get the names of the options matching a given prefix
      *
      * @param string $sPrefix The prefix to match
      *
      * @return array
      */
-    public function getOptionNames(string $sPrefix): array
-    {
-        return $this->xLibConfig->getOptionNames($sPrefix);
-    }
+public function getOptionNames(string $sPrefix): array
+{
+return $this->xLibConfig->getOptionNames($sPrefix);
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -211,25 +211,25 @@ 
      *
      * @return void
      */
-    public function setAppOption(string $sName, $xValue): void
-    {
-        $this->xAppConfig = $this->xConfigSetter
-            ->setOption($this->xAppConfig, $sName, $xValue);
-        // Call the config change listeners.
-        $this->xEventManager->appConfigChanged($this->xAppConfig, $sName);
-    }
+public function setAppOption(string $sName, $xValue): void
+{
+$this->xAppConfig = $this->xConfigSetter
+->setOption($this->xAppConfig, $sName, $xValue);
+// Call the config change listeners.
+$this->xEventManager->appConfigChanged($this->xAppConfig, $sName);
+}
 
-    /**
+/**
      * Get the application config
      *
      * @return Config
      */
-    public function getAppConfig(): Config
-    {
-        return $this->xAppConfig;
-    }
+public function getAppConfig(): Config
+{
+return $this->xAppConfig;
+}
 
-    /**
+/**
      * Set the application config options
      *
      * @param array $aAppOptions
@@ -237,27 +237,27 @@ 
      *
      * @return bool
      */
-    public function setAppOptions(array $aAppOptions, string $sNamePrefix = ''): bool
-    {
-        try
-        {
-            $this->xAppConfig = $this->xConfigSetter
-                ->setOptions($this->xAppConfig, $aAppOptions, $sNamePrefix);
-            // Call the config change listeners.
-            $this->xEventManager->appConfigChanged($this->xAppConfig, '');
-            return $this->xAppConfig->changed();
-        }
-        catch(DataDepth $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.data.depth', [
-                'key' => $e->sPrefix,
-                'depth' => $e->nDepth,
-            ]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function setAppOptions(array $aAppOptions, string $sNamePrefix = ''): bool
+{
+try
+{
+$this->xAppConfig = $this->xConfigSetter
+    ->setOptions($this->xAppConfig, $aAppOptions, $sNamePrefix);
+// Call the config change listeners.
+$this->xEventManager->appConfigChanged($this->xAppConfig, '');
+return $this->xAppConfig->changed();
+}
+catch(DataDepth $e)
+{
+$sMessage = $this->xTranslator->trans('errors.data.depth', [
+    'key' => $e->sPrefix,
+    'depth' => $e->nDepth,
+]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Get the value of an application config option
      *
      * @param string $sName The option name
@@ -265,24 +265,24 @@ 
      *
      * @return mixed
      */
-    public function getAppOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->xAppConfig->getOption($sName, $xDefault);
-    }
+public function getAppOption(string $sName, $xDefault = null): mixed
+{
+return $this->xAppConfig->getOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of an application config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasAppOption(string $sName): bool
-    {
-        return $this->xAppConfig->hasOption($sName);
-    }
+public function hasAppOption(string $sName): bool
+{
+return $this->xAppConfig->hasOption($sName);
+}
 
-    /**
+/**
      * Create a new the config object
      *
      * @param array $aOptions     The options array
@@ -291,64 +291,64 @@ 
      * @return Config
      * @throws SetupException
      */
-    public function newConfig(array $aOptions = [], string $sNamePrefix = ''): Config
-    {
-        try
-        {
-            return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
-        }
-        catch(DataDepth $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.data.depth', [
-                'key' => $e->sPrefix,
-                'depth' => $e->nDepth,
-            ]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function newConfig(array $aOptions = [], string $sNamePrefix = ''): Config
+{
+try
+{
+return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
+}
+catch(DataDepth $e)
+{
+$sMessage = $this->xTranslator->trans('errors.data.depth', [
+    'key' => $e->sPrefix,
+    'depth' => $e->nDepth,
+]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Check if the remote logging is enabled
      *
      * @return bool
      */
-    public function loggingEnabled(): bool
-    {
-        return $this->getAppOption('options.logging.enabled', false);
-    }
+public function loggingEnabled(): bool
+{
+return $this->getAppOption('options.logging.enabled', false);
+}
 
-    /**
+/**
      * @param string $sClassName
      *
      * @return void
      */
-    public function addLibEventListener(string $sClassName): void
-    {
-        $this->xEventManager->addLibConfigListener($sClassName);
-    }
+public function addLibEventListener(string $sClassName): void
+{
+$this->xEventManager->addLibConfigListener($sClassName);
+}
 
-    /**
+/**
      * @param string $sClassName
      *
      * @return void
      */
-    public function addAppEventListener(string $sClassName): void
-    {
-        $this->xEventManager->addAppConfigListener($sClassName);
-    }
+public function addAppEventListener(string $sClassName): void
+{
+$this->xEventManager->addAppConfigListener($sClassName);
+}
 
-    /**
+/**
      * Make the helpers functions available in the global namespace.
      *
      * @param bool $bForce
      *
      * @return void
      */
-    public function globals(bool $bForce = false): void
-    {
-        if($bForce || $this->getAppOption('helpers.global', true))
-        {
-            require_once dirname(__DIR__, 2) . '/globals.php';
-        }
-    }
+public function globals(bool $bForce = false): void
+{
+if($bForce || $this->getAppOption('helpers.global', true))
+{
+require_once dirname(__DIR__, 2) . '/globals.php';
+}
+}
 }

jaxon-core/src/App/Ajax/Traits/ServicesTrait.php

Switch Indentation +81 added lines, -81 removed lines

@@ -31,73 +31,73 @@ 
 
 trait ServicesTrait
 {
-    use DiTrait;
+use DiTrait;
 
-    /**
+/**
      * @return Translator
      */
-    public function translator(): Translator
-    {
-        return $this->di()->g(Translator::class);
-    }
+public function translator(): Translator
+{
+return $this->di()->g(Translator::class);
+}
 
-    /**
+/**
      * @return LoggerInterface
      */
-    public function logger(): LoggerInterface
-    {
-        return $this->di()->getLogger();
-    }
+public function logger(): LoggerInterface
+{
+return $this->di()->getLogger();
+}
 
-    /**
+/**
      * @return Bootstrap
      */
-    protected function getBootstrap(): Bootstrap
-    {
-        return $this->di()->getBootstrap();
-    }
+protected function getBootstrap(): Bootstrap
+{
+return $this->di()->getBootstrap();
+}
 
-    /**
+/**
      * @return PluginManager
      */
-    protected function getPluginManager(): PluginManager
-    {
-        return $this->di()->getPluginManager();
-    }
+protected function getPluginManager(): PluginManager
+{
+return $this->di()->getPluginManager();
+}
 
-    /**
+/**
      * @return RequestHandler
      */
-    protected function getRequestHandler(): RequestHandler
-    {
-        return $this->di()->getRequestHandler();
-    }
+protected function getRequestHandler(): RequestHandler
+{
+return $this->di()->getRequestHandler();
+}
 
-    /**
+/**
      * @return ResponseManager
      */
-    protected function getResponseManager(): ResponseManager
-    {
-        return $this->di()->getResponseManager();
-    }
+protected function getResponseManager(): ResponseManager
+{
+return $this->di()->getResponseManager();
+}
 
-    /**
+/**
      * @return PackageManager
      */
-    protected function getPackageManager(): PackageManager
-    {
-        return $this->di()->getPackageManager();
-    }
+protected function getPackageManager(): PackageManager
+{
+return $this->di()->getPackageManager();
+}
 
-    /**
+/**
      * @return CodeGenerator
      */
-    protected function getCodeGenerator(): CodeGenerator
-    {
-        return $this->di()->getCodeGenerator();
-    }
+protected function getCodeGenerator(): CodeGenerator
+{
+return $this->di()->getCodeGenerator();
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sRenderer    The renderer name
@@ -106,70 +106,70 @@ 
      *
      * @return void
      */
-    public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure): void
-    {
-        $this->view()->setDefaultRenderer($sRenderer, $sExtension, $xClosure);
-    }
+public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure): void
+{
+$this->view()->setDefaultRenderer($sRenderer, $sExtension, $xClosure);
+}
 
-    /**
+/**
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger): void
-    {
-        $this->di()->setLogger($xLogger);
-    }
+public function setLogger(LoggerInterface|Closure $xLogger): void
+{
+$this->di()->setLogger($xLogger);
+}
 
-    /**
+/**
      * Set the session manager
      *
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure): void
-    {
-        $this->di()->setSessionManager($xClosure);
-    }
+public function setSessionManager(Closure $xClosure): void
+{
+$this->di()->setSessionManager($xClosure);
+}
 
-    /**
+/**
      * @return UploadHandlerInterface|null
      */
-    public function upload(): ?UploadHandlerInterface
-    {
-        return $this->di()->getUploadHandler();
-    }
+public function upload(): ?UploadHandlerInterface
+{
+return $this->di()->getUploadHandler();
+}
 
-    /**
+/**
      * @return PsrFactory
      */
-    public function psr(): PsrFactory
-    {
-        return $this->di()->getPsrFactory();
-    }
+public function psr(): PsrFactory
+{
+return $this->di()->getPsrFactory();
+}
 
-    /**
+/**
      * @return TemplateEngine
      */
-    public function template(): TemplateEngine
-    {
-        return $this->di()->getTemplateEngine();
-    }
+public function template(): TemplateEngine
+{
+return $this->di()->getTemplateEngine();
+}
 
-    /**
+/**
      * @return ViewRenderer
      */
-    public function view(): ViewRenderer
-    {
-        return $this->di()->getViewRenderer();
-    }
+public function view(): ViewRenderer
+{
+return $this->di()->getViewRenderer();
+}
 
-    /**
+/**
      * @return SessionInterface|null
      */
-    public function session(): ?SessionInterface
-    {
-        return $this->di()->getSessionManager();
-    }
+public function session(): ?SessionInterface
+{
+return $this->di()->getSessionManager();
+}
 }

jaxon-core/src/App/Ajax/Traits/PluginTrait.php

Switch Indentation +63 added lines, -63 removed lines

@@ -28,27 +28,27 @@ 
 
 trait PluginTrait
 {
-    /**
+/**
      * @return PluginManager
      */
-    abstract public function getPluginManager(): PluginManager;
+abstract public function getPluginManager(): PluginManager;
 
-    /**
+/**
      * @return PackageManager
      */
-    abstract public function getPackageManager(): PackageManager;
+abstract public function getPackageManager(): PackageManager;
 
-    /**
+/**
      * @return CodeGenerator
      */
-    abstract public function getCodeGenerator(): CodeGenerator;
+abstract public function getCodeGenerator(): CodeGenerator;
 
-    /**
+/**
      * @return Bootstrap
      */
-    abstract protected function getBootstrap(): Bootstrap;
+abstract protected function getBootstrap(): Bootstrap;
 
-    /**
+/**
      * Register request handlers, including functions, callable classes and directories.
      *
      * @param string $sType    The type of request handler being registered
@@ -65,12 +65,12 @@ 
      * @return void
      * @throws SetupException
      */
-    public function register(string $sType, string $sName, $xOptions = []): void
-    {
-        $this->getPluginManager()->registerCallable($sType, $sName, $xOptions);
-    }
+public function register(string $sType, string $sName, $xOptions = []): void
+{
+$this->getPluginManager()->registerCallable($sType, $sName, $xOptions);
+}
 
-    /**
+/**
      * Register a plugin
      *
      * Below is a table for priorities and their description:
@@ -85,12 +85,12 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000)
-    {
-        $this->getPluginManager()->registerPlugin($sClassName, $sPluginName, $nPriority);
-    }
+public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000)
+{
+$this->getPluginManager()->registerPlugin($sClassName, $sPluginName, $nPriority);
+}
 
-    /**
+/**
      * Register a package
      *
      * @param string $sClassName    The package class
@@ -99,12 +99,12 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $xPkgOptions = [])
-    {
-        $this->getPackageManager()->registerPackage($sClassName, $xPkgOptions);
-    }
+public function registerPackage(string $sClassName, array $xPkgOptions = [])
+{
+$this->getPackageManager()->registerPackage($sClassName, $xPkgOptions);
+}
 
-    /**
+/**
      * Find a response plugin by name or class name
      *
      * @template R of ResponsePluginInterface
@@ -112,12 +112,12 @@ 
      *
      * @return ($sName is class-string ? R : ResponsePluginInterface)|null
      */
-    public function plugin(string $sName): ResponsePluginInterface|null
-    {
-        return $this->getPluginManager()->getResponsePlugin($sName);
-    }
+public function plugin(string $sName): ResponsePluginInterface|null
+{
+return $this->getPluginManager()->getResponsePlugin($sName);
+}
 
-    /**
+/**
      * Get a package instance
      *
      * @template P of AbstractPackage
@@ -125,52 +125,52 @@ 
      *
      * @return P|null
      */
-    public function package(string $sClassName): ?AbstractPackage
-    {
-        return $this->getPackageManager()->getPackage($sClassName);
-    }
+public function package(string $sClassName): ?AbstractPackage
+{
+return $this->getPackageManager()->getPackage($sClassName);
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string
      */
-    public function getJs(): string
-    {
-        return $this->getCodeGenerator()->getJs();
-    }
+public function getJs(): string
+{
+return $this->getCodeGenerator()->getJs();
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string  the javascript code
      */
-    public function js(): string
-    {
-        return $this->getCodeGenerator()->getJs();
-    }
+public function js(): string
+{
+return $this->getCodeGenerator()->getJs();
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string
      */
-    public function getCss(): string
-    {
-        return $this->getCodeGenerator()->getCss();
-    }
+public function getCss(): string
+{
+return $this->getCodeGenerator()->getCss();
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string
      */
-    public function css(): string
-    {
-        return $this->getCodeGenerator()->getCss();
-    }
+public function css(): string
+{
+return $this->getCodeGenerator()->getCss();
+}
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * The javascript code returned by this function depends on the plugins
@@ -182,12 +182,12 @@ 
      * @return string
      * @throws UriException
      */
-    public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string
-    {
-        return $this->getCodeGenerator()->getScript($bIncludeJs, $bIncludeCss);
-    }
+public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string
+{
+return $this->getCodeGenerator()->getScript($bIncludeJs, $bIncludeCss);
+}
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * @param bool $bIncludeJs    Also get the js code
@@ -196,8 +196,8 @@ 
      * @return string  the javascript code
      * @throws UriException
      */
-    public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string
-    {
-        return $this->getCodeGenerator()->getScript($bIncludeJs, $bIncludeCss);
-    }
+public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string
+{
+return $this->getCodeGenerator()->getScript($bIncludeJs, $bIncludeCss);
+}
 }

jaxon-core/src/App/Ajax/Bootstrap.php

Switch Indentation +74 added lines, -74 removed lines

@@ -23,58 +23,58 @@ 
 
 class Bootstrap
 {
-    /**
+/**
      * The library options
      *
      * @var array
      */
-    private $aLibOptions = [];
+private $aLibOptions = [];
 
-    /**
+/**
      * The application options
      *
      * @var array
      */
-    private $aAppOptions = [];
+private $aAppOptions = [];
 
-    /**
+/**
      * The class constructor
      *
      * @param ConfigManager $xConfigManager
      * @param PackageManager $xPackageManager
      * @param CallbackManager $xCallbackManager
      */
-    public function __construct(private ConfigManager $xConfigManager,
-        private PackageManager $xPackageManager, private CallbackManager $xCallbackManager)
-    {}
+public function __construct(private ConfigManager $xConfigManager,
+private PackageManager $xPackageManager, private CallbackManager $xCallbackManager)
+{}
 
-    /**
+/**
      * Set the library options
      *
      * @param array $aLibOptions    The library options
      *
      * @return Bootstrap
      */
-    public function lib(array $aLibOptions): Bootstrap
-    {
-        $this->aLibOptions = $aLibOptions;
-        return $this;
-    }
+public function lib(array $aLibOptions): Bootstrap
+{
+$this->aLibOptions = $aLibOptions;
+return $this;
+}
 
-    /**
+/**
      * Set the applications options
      *
      * @param array $aAppOptions    The application options
      *
      * @return Bootstrap
      */
-    public function app(array $aAppOptions): Bootstrap
-    {
-        $this->aAppOptions = $aAppOptions;
-        return $this;
-    }
+public function app(array $aAppOptions): Bootstrap
+{
+$this->aAppOptions = $aAppOptions;
+return $this;
+}
 
-    /**
+/**
      * Set the javascript asset
      *
      * @param bool $bExport    Whether to export the js code in a file
@@ -84,75 +84,75 @@ 
      *
      * @return Bootstrap
      */
-    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): Bootstrap
-    {
-        // Jaxon library settings
-        $aJsOptions = [
-            'export' => $bExport,
-            'minify' => $bMinify,
-        ];
-        if($sUri !== '')
-        {
-            $aJsOptions['uri'] = $sUri;
-        }
-        if($sDir !== '')
-        {
-            $aJsOptions['dir'] = $sDir;
-        }
-        $this->xConfigManager->setOptions($aJsOptions, 'js.app');
-        return $this;
-    }
+public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): Bootstrap
+{
+// Jaxon library settings
+$aJsOptions = [
+'export' => $bExport,
+'minify' => $bMinify,
+];
+if($sUri !== '')
+{
+$aJsOptions['uri'] = $sUri;
+}
+if($sDir !== '')
+{
+$aJsOptions['dir'] = $sDir;
+}
+$this->xConfigManager->setOptions($aJsOptions, 'js.app');
+return $this;
+}
 
-    /**
+/**
      * Set the Jaxon application options.
      *
      * @return void
      * @throws SetupException
      */
-    private function setupApp(): void
-    {
-        // Save the app config.
-        $this->xConfigManager->setAppOptions($this->aAppOptions);
-        // Register user functions and classes
-        $this->xPackageManager->registerFromConfig();
-    }
+private function setupApp(): void
+{
+// Save the app config.
+$this->xConfigManager->setAppOptions($this->aAppOptions);
+// Register user functions and classes
+$this->xPackageManager->registerFromConfig();
+}
 
-    /**
+/**
      * Wraps the module/package/bundle setup method.
      *
      * @return void
      * @throws SetupException
      */
-    public function setup(): void
-    {
-        // Prevent the Jaxon library from sending the response or exiting
-        $this->xConfigManager->setOptions([
-            'response' => [
-                'send' => false,
-            ],
-            'process' => [
-                'exit' => false,
-            ],
-        ], 'core');
-        // Setup the lib config options.
-        $this->xConfigManager->setOptions($this->aLibOptions);
+public function setup(): void
+{
+// Prevent the Jaxon library from sending the response or exiting
+$this->xConfigManager->setOptions([
+'response' => [
+    'send' => false,
+],
+'process' => [
+    'exit' => false,
+],
+], 'core');
+// Setup the lib config options.
+$this->xConfigManager->setOptions($this->aLibOptions);
 
-        // Setup the app.
-        $this->setupApp();
-    }
+// Setup the app.
+$this->setupApp();
+}
 
-    /**
+/**
      * These callbacks are called once, after the library is initialized.
      *
      * @return void
      */
-    public function onBoot(): void
-    {
-        // Popping the callbacks makes each of them to be called once.
-        $aBootCallbacks = $this->xCallbackManager->popBootCallbacks();
-        foreach($aBootCallbacks as $aBootCallback)
-        {
-            call_user_func($aBootCallback);
-        }
-    }
+public function onBoot(): void
+{
+// Popping the callbacks makes each of them to be called once.
+$aBootCallbacks = $this->xCallbackManager->popBootCallbacks();
+foreach($aBootCallbacks as $aBootCallback)
+{
+call_user_func($aBootCallback);
+}
+}
 }