jaxon-php / jaxon-mono

jaxon-core/templates/plugins/includes.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
-<?php foreach($this->aUrls as $sUrl):
+<?php foreach ($this->aUrls as $sUrl):
 $this->include('jaxon::plugins/include.js', ['sUrl' => $sUrl, 'sJsOptions' => $this->sJsOptions]);
 endforeach;

jaxon-core/src/Di/Container.php

Indentation +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
+        $this->xLibContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -198,8 +198,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);

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

Spacing +1 added lines, -2 removed lines

@@ -37,7 +37,6 @@
     public function getMetadataReader(string $sReaderId): MetadataReaderInterface
     {
         return $this->h("metadata_reader_$sReaderId") ?
-            $this->g("metadata_reader_$sReaderId") :
-            $this->g('metadata_reader_null');
+            $this->g("metadata_reader_$sReaderId") : $this->g('metadata_reader_null');
     }
 }

Switch Indentation +28 added lines, -28 removed lines

@@ -9,50 +9,50 @@
 
 trait MetadataTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerMetadataReader(): void
-    {
-        // Metadata cache
-        $this->set(MetadataCache::class, fn($di) =>
-            new MetadataCache($di->g('jaxon_metadata_cache_dir')));
+private function registerMetadataReader(): void
+{
+// Metadata cache
+$this->set(MetadataCache::class, fn($di) =>
+new MetadataCache($di->g('jaxon_metadata_cache_dir')));
 
-        // By default, register a fake metadata reader.
-        $this->set('metadata_reader_null', function() {
-            return new class implements MetadataReaderInterface
-            {
-                public function getAttributes(InputData $xInputData): Metadata
-                {
-                    return new Metadata();
-                }
-            };
-        });
+// By default, register a fake metadata reader.
+$this->set('metadata_reader_null', function() {
+return new class implements MetadataReaderInterface
+{
+    public function getAttributes(InputData $xInputData): Metadata
+    {
+        return new Metadata();
     }
+};
+});
+}
 
-    /**
+/**
      * Get the metadata cache
      *
      * @return MetadataCache
      */
-    public function getMetadataCache(): MetadataCache
-    {
-        return $this->g(MetadataCache::class);
-    }
+public function getMetadataCache(): MetadataCache
+{
+return $this->g(MetadataCache::class);
+}
 
-    /**
+/**
      * Get the metadata reader with the given id
      *
      * @param string $sReaderId
      *
      * @return MetadataReaderInterface
      */
-    public function getMetadataReader(string $sReaderId): MetadataReaderInterface
-    {
-        return $this->h("metadata_reader_$sReaderId") ?
-            $this->g("metadata_reader_$sReaderId") :
-            $this->g('metadata_reader_null');
-    }
+public function getMetadataReader(string $sReaderId): MetadataReaderInterface
+{
+return $this->h("metadata_reader_$sReaderId") ?
+$this->g("metadata_reader_$sReaderId") :
+$this->g('metadata_reader_null');
+}
 }

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

Spacing +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
             $xParameterReader = $di->g(ParameterReader::class);
             $xRequest = $di->g(ServerRequestInterface::class);
             $aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
-            return !is_array($aRequestParameter) ? $xRequest :
-                $xRequest->withAttribute('jxncall', $aRequestParameter);
+            return !is_array($aRequestParameter) ? $xRequest : $xRequest->withAttribute('jxncall', $aRequestParameter);
         });
         // PSR factory
         $this->set(PsrFactory::class, function($di) {

Switch Indentation +96 added lines, -96 removed lines

@@ -20,152 +20,152 @@
 
 trait PsrTrait
 {
-    /**
+/**
      * @var string
      */
-    private $sPsrConfig = 'jaxon.psr.config.file';
+private $sPsrConfig = 'jaxon.psr.config.file';
 
-    /**
+/**
      * @var string
      */
-    private $sPsrServerRequest = 'jaxon.psr.server.request';
+private $sPsrServerRequest = 'jaxon.psr.server.request';
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerPsr(): void
-    {
-        // The server request
-        $this->set(Psr17Factory::class, function() {
-            return new Psr17Factory();
-        });
-        $this->set(ServerRequestCreator::class, function($di) {
-            $xPsr17Factory = $di->g(Psr17Factory::class);
-            return new ServerRequestCreator(
-                $xPsr17Factory, // ServerRequestFactory
-                $xPsr17Factory, // UriFactory
-                $xPsr17Factory, // UploadedFileFactory
-                $xPsr17Factory, // StreamFactory
-            );
-        });
-        $this->set(ServerRequestInterface::class, function($di) {
-            return $di->g(ServerRequestCreator::class)->fromGlobals();
-        });
-        // Server request with the Jaxon request parameter as attribute
-        $this->set($this->sPsrServerRequest, function($di) {
-            $xParameterReader = $di->g(ParameterReader::class);
-            $xRequest = $di->g(ServerRequestInterface::class);
-            $aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
-            return !is_array($aRequestParameter) ? $xRequest :
-                $xRequest->withAttribute('jxncall', $aRequestParameter);
-        });
-        // PSR factory
-        $this->set(PsrFactory::class, function($di) {
-            return new PsrFactory($di->g(Container::class));
-        });
-        // PSR request handler
-        $this->set(PsrRequestHandler::class, function($di) {
-            return new PsrRequestHandler($di->g(Container::class), $di->g(RequestHandler::class),
-                $di->g(ResponseManager::class), $di->g(Translator::class));
-        });
-        // PSR config middleware
-        $this->set(PsrConfigMiddleware::class, function($di) {
-            return new PsrConfigMiddleware($di->g(Container::class), $di->g($this->sPsrConfig));
-        });
-        // PSR ajax middleware
-        $this->set(PsrAjaxMiddleware::class, function($di) {
-            return new PsrAjaxMiddleware($di->g(Container::class), $di->g(RequestHandler::class),
-                $di->g(ResponseManager::class));
-        });
-        // The PSR response plugin
-        $this->set(PsrPlugin::class, function($di) {
-            return new PsrPlugin($di->g(Psr17Factory::class), $di->g(ServerRequestInterface::class));
-        });
-    }
+private function registerPsr(): void
+{
+// The server request
+$this->set(Psr17Factory::class, function() {
+return new Psr17Factory();
+});
+$this->set(ServerRequestCreator::class, function($di) {
+$xPsr17Factory = $di->g(Psr17Factory::class);
+return new ServerRequestCreator(
+    $xPsr17Factory, // ServerRequestFactory
+    $xPsr17Factory, // UriFactory
+    $xPsr17Factory, // UploadedFileFactory
+    $xPsr17Factory, // StreamFactory
+);
+});
+$this->set(ServerRequestInterface::class, function($di) {
+return $di->g(ServerRequestCreator::class)->fromGlobals();
+});
+// Server request with the Jaxon request parameter as attribute
+$this->set($this->sPsrServerRequest, function($di) {
+$xParameterReader = $di->g(ParameterReader::class);
+$xRequest = $di->g(ServerRequestInterface::class);
+$aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
+return !is_array($aRequestParameter) ? $xRequest :
+    $xRequest->withAttribute('jxncall', $aRequestParameter);
+});
+// PSR factory
+$this->set(PsrFactory::class, function($di) {
+return new PsrFactory($di->g(Container::class));
+});
+// PSR request handler
+$this->set(PsrRequestHandler::class, function($di) {
+return new PsrRequestHandler($di->g(Container::class), $di->g(RequestHandler::class),
+    $di->g(ResponseManager::class), $di->g(Translator::class));
+});
+// PSR config middleware
+$this->set(PsrConfigMiddleware::class, function($di) {
+return new PsrConfigMiddleware($di->g(Container::class), $di->g($this->sPsrConfig));
+});
+// PSR ajax middleware
+$this->set(PsrAjaxMiddleware::class, function($di) {
+return new PsrAjaxMiddleware($di->g(Container::class), $di->g(RequestHandler::class),
+    $di->g(ResponseManager::class));
+});
+// The PSR response plugin
+$this->set(PsrPlugin::class, function($di) {
+return new PsrPlugin($di->g(Psr17Factory::class), $di->g(ServerRequestInterface::class));
+});
+}
 
-    /**
+/**
      * Get the request
      *
      * @return array
      */
-    public function getServerParams(): array
-    {
-        $xRequest = $this->g(ServerRequestInterface::class);
-        return $xRequest->getServerParams();
-    }
+public function getServerParams(): array
+{
+$xRequest = $this->g(ServerRequestInterface::class);
+return $xRequest->getServerParams();
+}
 
-    /**
+/**
      * Get the request with Jaxon parameter as attribute
      *
      * @return ServerRequestInterface
      */
-    public function getRequest(): ServerRequestInterface
-    {
-        return $this->g($this->sPsrServerRequest);
-    }
+public function getRequest(): ServerRequestInterface
+{
+return $this->g($this->sPsrServerRequest);
+}
 
-    /**
+/**
      * Return the array of arguments from the GET or POST data
      *
      * @return array
      */
-    public function getRequestArguments(): array
-    {
-        return $this->getRequest()->getAttribute('jxncall')['args'] ?? [];
-    }
+public function getRequestArguments(): array
+{
+return $this->getRequest()->getAttribute('jxncall')['args'] ?? [];
+}
 
-    /**
+/**
      * Get the PSR factory
      *
      * @return PsrFactory
      */
-    public function getPsrFactory(): PsrFactory
-    {
-        return $this->g(PsrFactory::class);
-    }
+public function getPsrFactory(): PsrFactory
+{
+return $this->g(PsrFactory::class);
+}
 
-    /**
+/**
      * Get the Psr17 factory
      *
      * @return Psr17Factory
      */
-    public function getPsr17Factory(): Psr17Factory
-    {
-        return $this->g(Psr17Factory::class);
-    }
+public function getPsr17Factory(): Psr17Factory
+{
+return $this->g(Psr17Factory::class);
+}
 
-    /**
+/**
      * Get the PSR request handler
      *
      * @return PsrRequestHandler
      */
-    public function getPsrRequestHandler(): PsrRequestHandler
-    {
-        return $this->g(PsrRequestHandler::class);
-    }
+public function getPsrRequestHandler(): PsrRequestHandler
+{
+return $this->g(PsrRequestHandler::class);
+}
 
-    /**
+/**
      * Get the PSR config middleware
      *
      * @param string $sConfigFile
      *
      * @return PsrConfigMiddleware
      */
-    public function getPsrConfigMiddleware(string $sConfigFile): PsrConfigMiddleware
-    {
-        !$this->h($this->sPsrConfig) && $this->val($this->sPsrConfig, $sConfigFile);
-        return $this->g(PsrConfigMiddleware::class);
-    }
+public function getPsrConfigMiddleware(string $sConfigFile): PsrConfigMiddleware
+{
+!$this->h($this->sPsrConfig) && $this->val($this->sPsrConfig, $sConfigFile);
+return $this->g(PsrConfigMiddleware::class);
+}
 
-    /**
+/**
      * Get the PSR ajax request middleware
      *
      * @return PsrAjaxMiddleware
      */
-    public function getPsrAjaxMiddleware(): PsrAjaxMiddleware
-    {
-        return $this->g(PsrAjaxMiddleware::class);
-    }
+public function getPsrAjaxMiddleware(): PsrAjaxMiddleware
+{
+return $this->g(PsrAjaxMiddleware::class);
+}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -193,7 +193,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions): void
     {
         // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
+        if (!$this->h($sClassName))
         {
             $this->set($sClassName, fn() => $this->make($sClassName));
         }
@@ -203,7 +203,7 @@ 
         $this->set($sConfigKey, function($di) use($aUserOptions) {
             $xOptionsProvider = $aUserOptions['provider'] ?? null;
             // The user can provide a callable that returns the package options.
-            if(is_callable($xOptionsProvider))
+            if (is_callable($xOptionsProvider))
             {
                 $aUserOptions = $xOptionsProvider($aUserOptions);
             }

Switch Indentation +139 added lines, -139 removed lines

@@ -35,154 +35,154 @@ 
 
 trait PluginTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerPlugins(): void
-    {
-        // Plugin manager
-        $this->set(PluginManager::class, function($di) {
-            $xPluginManager = new PluginManager($di->g(Container::class),
-                $di->g(CodeGenerator::class), $di->g(Translator::class));
-            // Register the Jaxon request and response plugins
-            $xPluginManager->registerPlugins();
-            return $xPluginManager;
-        });
-        // Package manager
-        $this->set(PackageManager::class, function($di) {
-            return new PackageManager($di->g(Container::class), $di->g(Translator::class),
-                $di->g(PluginManager::class), $di->g(ConfigManager::class),
-                $di->g(CodeGenerator::class), $di->g(ViewRenderer::class),
-                $di->g(CallbackManager::class), $di->g(ComponentRegistry::class));
-        });
-        // Code Generation
-        $this->set(MinifierInterface::class, function() {
-            return new class extends FileMinifier implements MinifierInterface
-            {};
-        });
-        $this->set(AssetManager::class, function($di) {
-            return new AssetManager($di->g(ConfigManager::class),
-                $di->g(MinifierInterface::class));
-        });
-        $this->set(CodeGenerator::class, function($di) {
-            return new CodeGenerator(Jaxon::VERSION, $di->g(Container::class),
-                $di->g(TemplateEngine::class));
-        });
-        $this->set(ConfigScriptGenerator::class, function($di) {
-            return new ConfigScriptGenerator($di->g(ParameterReader::class),
-                $di->g(TemplateEngine::class), $di->g(ConfigManager::class));
-        });
-        $this->set(ReadyScriptGenerator::class, function($di) {
-            return new ReadyScriptGenerator();
-        });
-
-        // Script response plugin
-        $this->set(ScriptPlugin::class, function($di) {
-            return new ScriptPlugin($di->g(CallFactory::class));
-        });
-        // Databag response plugin
-        $this->set(DatabagPlugin::class, function($di) {
-            return new DatabagPlugin($di->g(Container::class));
-        });
-        // Dialog response plugin
-        $this->set(DialogPlugin::class, function($di) {
-            return new DialogPlugin($di->g(DialogCommand::class));
-        });
-        // Paginator response plugin
-        $this->set(PaginatorPlugin::class, function($di) {
-            return new PaginatorPlugin($di->g(RendererInterface::class));
-        });
-    }
-
-    /**
+private function registerPlugins(): void
+{
+// Plugin manager
+$this->set(PluginManager::class, function($di) {
+$xPluginManager = new PluginManager($di->g(Container::class),
+    $di->g(CodeGenerator::class), $di->g(Translator::class));
+// Register the Jaxon request and response plugins
+$xPluginManager->registerPlugins();
+return $xPluginManager;
+});
+// Package manager
+$this->set(PackageManager::class, function($di) {
+return new PackageManager($di->g(Container::class), $di->g(Translator::class),
+    $di->g(PluginManager::class), $di->g(ConfigManager::class),
+    $di->g(CodeGenerator::class), $di->g(ViewRenderer::class),
+    $di->g(CallbackManager::class), $di->g(ComponentRegistry::class));
+});
+// Code Generation
+$this->set(MinifierInterface::class, function() {
+return new class extends FileMinifier implements MinifierInterface
+{};
+});
+$this->set(AssetManager::class, function($di) {
+return new AssetManager($di->g(ConfigManager::class),
+    $di->g(MinifierInterface::class));
+});
+$this->set(CodeGenerator::class, function($di) {
+return new CodeGenerator(Jaxon::VERSION, $di->g(Container::class),
+    $di->g(TemplateEngine::class));
+});
+$this->set(ConfigScriptGenerator::class, function($di) {
+return new ConfigScriptGenerator($di->g(ParameterReader::class),
+    $di->g(TemplateEngine::class), $di->g(ConfigManager::class));
+});
+$this->set(ReadyScriptGenerator::class, function($di) {
+return new ReadyScriptGenerator();
+});
+
+// Script response plugin
+$this->set(ScriptPlugin::class, function($di) {
+return new ScriptPlugin($di->g(CallFactory::class));
+});
+// Databag response plugin
+$this->set(DatabagPlugin::class, function($di) {
+return new DatabagPlugin($di->g(Container::class));
+});
+// Dialog response plugin
+$this->set(DialogPlugin::class, function($di) {
+return new DialogPlugin($di->g(DialogCommand::class));
+});
+// Paginator response plugin
+$this->set(PaginatorPlugin::class, function($di) {
+return new PaginatorPlugin($di->g(RendererInterface::class));
+});
+}
+
+/**
      * Get the plugin manager
      *
      * @return PluginManager
      */
-    public function getPluginManager(): PluginManager
-    {
-        return $this->g(PluginManager::class);
-    }
+public function getPluginManager(): PluginManager
+{
+return $this->g(PluginManager::class);
+}
 
-    /**
+/**
      * Get the package manager
      *
      * @return PackageManager
      */
-    public function getPackageManager(): PackageManager
-    {
-        return $this->g(PackageManager::class);
-    }
+public function getPackageManager(): PackageManager
+{
+return $this->g(PackageManager::class);
+}
 
-    /**
+/**
      * Get the code generator
      *
      * @return CodeGenerator
      */
-    public function getCodeGenerator(): CodeGenerator
-    {
-        return $this->g(CodeGenerator::class);
-    }
+public function getCodeGenerator(): CodeGenerator
+{
+return $this->g(CodeGenerator::class);
+}
 
-    /**
+/**
      * Get the asset manager
      *
      * @return AssetManager
      */
-    public function getAssetManager(): AssetManager
-    {
-        return $this->g(AssetManager::class);
-    }
+public function getAssetManager(): AssetManager
+{
+return $this->g(AssetManager::class);
+}
 
-    /**
+/**
      * Get the jQuery plugin
      *
      * @return ScriptPlugin
      */
-    public function getScriptPlugin(): ScriptPlugin
-    {
-        return $this->g(ScriptPlugin::class);
-    }
+public function getScriptPlugin(): ScriptPlugin
+{
+return $this->g(ScriptPlugin::class);
+}
 
-    /**
+/**
      * Get the dialog plugin
      *
      * @return DialogPlugin
      */
-    public function getDialogPlugin(): DialogPlugin
-    {
-        return $this->g(DialogPlugin::class);
-    }
+public function getDialogPlugin(): DialogPlugin
+{
+return $this->g(DialogPlugin::class);
+}
 
-    /**
+/**
      * @param class-string $sClassName    The package class name
      *
      * @return string
      */
-    private function getPackageConfigKey(string $sClassName): string
-    {
-        return $sClassName . '_PackageConfig';
-    }
+private function getPackageConfigKey(string $sClassName): string
+{
+return $sClassName . '_PackageConfig';
+}
 
-    /**
+/**
      * @param class-string $sClassName    The package class name
      * @param-closure-this AbstractPackage $cSetter
      *
      * @return void
      */
-    private function extendPackage(string $sClassName, Closure $cSetter): void
-    {
-        // Initialize the package instance.
-        $this->xLibContainer->extend($sClassName, function($xPackage) use($cSetter) {
-            // Allow the setter to access protected attributes.
-            call_user_func($cSetter->bindTo($xPackage, $xPackage));
-            return $xPackage;
-        });
-    }
-
-    /**
+private function extendPackage(string $sClassName, Closure $cSetter): void
+{
+// Initialize the package instance.
+$this->xLibContainer->extend($sClassName, function($xPackage) use($cSetter) {
+// Allow the setter to access protected attributes.
+call_user_func($cSetter->bindTo($xPackage, $xPackage));
+return $xPackage;
+});
+}
+
+/**
      * Register a package
      *
      * @param class-string $sClassName    The package class name
@@ -191,45 +191,45 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $aUserOptions): void
-    {
-        // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
-        {
-            $this->set($sClassName, fn() => $this->make($sClassName));
-        }
-
-        // Save the package config in the container.
-        $sConfigKey = $this->getPackageConfigKey($sClassName);
-        $this->set($sConfigKey, function($di) use($aUserOptions) {
-            $xOptionsProvider = $aUserOptions['provider'] ?? null;
-            // The user can provide a callable that returns the package options.
-            if(is_callable($xOptionsProvider))
-            {
-                $aUserOptions = $xOptionsProvider($aUserOptions);
-            }
-            return $di->g(ConfigManager::class)->newConfig($aUserOptions);
-        });
-
-        // Initialize the package instance.
-        $di = $this;
-        $this->extendPackage($sClassName, function() use($di, $sConfigKey) {
-            // $this here refers to the AbstractPackage instance.
-            $this->xPkgConfig = $di->g($sConfigKey);
-            $this->xRenderer = $di->g(ViewRenderer::class);
-            $this->init();
-        });
-    }
-
-    /**
+public function registerPackage(string $sClassName, array $aUserOptions): void
+{
+// Register the user class, but only if the user didn't already.
+if(!$this->h($sClassName))
+{
+$this->set($sClassName, fn() => $this->make($sClassName));
+}
+
+// Save the package config in the container.
+$sConfigKey = $this->getPackageConfigKey($sClassName);
+$this->set($sConfigKey, function($di) use($aUserOptions) {
+$xOptionsProvider = $aUserOptions['provider'] ?? null;
+// The user can provide a callable that returns the package options.
+if(is_callable($xOptionsProvider))
+{
+    $aUserOptions = $xOptionsProvider($aUserOptions);
+}
+return $di->g(ConfigManager::class)->newConfig($aUserOptions);
+});
+
+// Initialize the package instance.
+$di = $this;
+$this->extendPackage($sClassName, function() use($di, $sConfigKey) {
+// $this here refers to the AbstractPackage instance.
+$this->xPkgConfig = $di->g($sConfigKey);
+$this->xRenderer = $di->g(ViewRenderer::class);
+$this->init();
+});
+}
+
+/**
      * Get the config of a package
      *
      * @param class-string $sClassName    The package class name
      *
      * @return Config
      */
-    public function getPackageConfig(string $sClassName): Config
-    {
-        return $this->g($this->getPackageConfigKey($sClassName));
-    }
+public function getPackageConfig(string $sClassName): Config
+{
+return $this->g($this->getPackageConfigKey($sClassName));
+}
 }

jaxon-core/src/Response/Manager/ResponseManager.php

Spacing +6 added lines, -7 removed lines

@@ -186,7 +186,7 @@ 
      */
     private function getCommandArgs(array|JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
     {
-        if(!$bRemoveEmpty)
+        if (!$bRemoveEmpty)
         {
             return $aArgs;
         }
@@ -211,7 +211,7 @@ 
             'name' => $this->str($sName),
             'args' => $this->getCommandArgs($aArgs, $bRemoveEmpty),
         ]);
-        if($this->bOnConfirm)
+        if ($this->bOnConfirm)
         {
             $this->aConfirmCommands[] = $xCommand;
         }
@@ -240,14 +240,14 @@ 
     public function addConfirmCommand(string $sName, Closure $fConfirm,
         string $sQuestion, array $aArgs = []): self
     {
-        if($this->bOnConfirm)
+        if ($this->bOnConfirm)
         {
             throw new AppException($this->xTranslator->trans('errors.app.confirm.nested'));
         }
         $this->bOnConfirm = true;
         $fConfirm();
         $this->bOnConfirm = false;
-        if(($nCommandCount = count($this->aConfirmCommands)) > 0)
+        if (($nCommandCount = count($this->aConfirmCommands)) > 0)
         {
             $aCommand = $this->di->getDialogCommand()->confirm($this->str($sQuestion), $aArgs);
             $aCommand['count'] = $nCommandCount;
@@ -354,7 +354,7 @@ 
      */
     public function printDebug()
     {
-        foreach($this->aDebugMessages as $sMessage)
+        foreach ($this->aDebugMessages as $sMessage)
         {
             $this->addCommand('script.debug', ['message' => $this->str($sMessage)]);
         }
@@ -368,8 +368,7 @@ 
      */
     public function getContentType(): string
     {
-        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() :
-            $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
+        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() : $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -214,8 +214,7 @@
         if($this->bOnConfirm)
         {
             $this->aConfirmCommands[] = $xCommand;
-        }
-        else
+        } else
         {
             $this->aCommands[] = $xCommand;
         }

jaxon-core/src/Response/Manager/Command.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      */
     public function setOption(string $sName, string|array|JsonSerializable $xValue): Command
     {
-        if(isset($this->aCommand['options']))
+        if (isset($this->aCommand['options']))
         {
             $this->aCommand['options'][$this->str($sName)] = $xValue;
             return $this;

jaxon-core/src/Response/AbstractResponse.php

Indentation +9 added lines, -9 removed lines

@@ -91,15 +91,15 @@
         return $this->xManager->getErrorMessage();
     }
 
-     /**
-     * Add a response command to the array of commands
-     *
-     * @param string $sName    The command name
-     * @param array|JsonSerializable $aArgs    The command arguments
-     * @param bool $bRemoveEmpty
-     *
-     * @return Command
-     */
+        /**
+         * Add a response command to the array of commands
+         *
+         * @param string $sName    The command name
+         * @param array|JsonSerializable $aArgs    The command arguments
+         * @param bool $bRemoveEmpty
+         *
+         * @return Command
+         */
     public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
         bool $bRemoveEmpty = false): Command
     {

jaxon-core/src/Plugin/Manager/PackageManager.php

Braces +1 added lines, -2 removed lines

@@ -218,8 +218,7 @@
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
-        }
-        elseif(!is_array($aLibOptions))
+        } elseif(!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);

Spacing +18 added lines, -18 removed lines

@@ -62,25 +62,25 @@ 
     private function updateContainer(Config $xConfig): void
     {
         $aOptions = $xConfig->getOption('container.set', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->set((string)$xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.val', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->val((string)$xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.auto', []);
-        foreach($aOptions as $xValue)
+        foreach ($aOptions as $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->auto((string)$xValue);
         }
         $aOptions = $xConfig->getOption('container.alias', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->alias((string)$xKey, (string)$xValue);
@@ -98,16 +98,16 @@ 
      */
     private function registerCallables(array $aOptions, string $sCallableType): void
     {
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->xPluginManager->registerCallable($sCallableType, $xValue);
                 continue;
             }
 
-            if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            if (is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
@@ -124,7 +124,7 @@ 
      */
     private function registerExceptionHandlers(Config $xConfig): void
     {
-        foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
+        foreach ($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
         {
             $this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
         }
@@ -147,20 +147,20 @@ 
         // key of the array item, a string as the value of an entry without a key,
         // or set with the key $sOptionKey in an array entry without a key.
         $aCallables = [];
-        foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
+        foreach ($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
         {
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $aCallables[$xKey] = $xValue;
                 continue;
             }
-            if(is_string($xValue))
+            if (is_string($xValue))
             {
                 $aCallables[] = $xValue;
                 continue;
             }
 
-            if(is_array($xValue) && isset($xValue[$sOptionKey]))
+            if (is_array($xValue) && isset($xValue[$sOptionKey]))
             {
                 $aCallables[$xValue[$sOptionKey]] = $xValue;
             }
@@ -215,12 +215,12 @@ 
     {
         // $this->aPackages contains packages config file paths.
         $aLibOptions = $sClassName::config();
-        if(is_string($aLibOptions))
+        if (is_string($aLibOptions))
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
         }
-        elseif(!is_array($aLibOptions))
+        elseif (!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -243,7 +243,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions = []): void
     {
         $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, AbstractPackage::class))
+        if (!is_subclass_of($sClassName, AbstractPackage::class))
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
             throw new SetupException($sMessage);
@@ -287,9 +287,9 @@ 
 
         // Register packages
         $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $xKey => $xValue)
+        foreach ($aPackageConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a package without options
                 $sClassName = $xValue;
@@ -297,7 +297,7 @@ 
                 continue;
             }
 
-            if(is_string($xKey) && is_array($xValue))
+            if (is_string($xKey) && is_array($xValue))
             {
                 // Register a package with options
                 $sClassName = $xKey;

Switch Indentation +179 added lines, -179 removed lines

@@ -34,7 +34,7 @@ 
 
 class PackageManager
 {
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -46,48 +46,48 @@ 
      * @param CallbackManager $xCallbackManager
      * @param ComponentRegistry $xRegistry
      */
-    public function __construct(private Container $di, private Translator $xTranslator,
-        private PluginManager $xPluginManager, private ConfigManager $xConfigManager,
-        private CodeGenerator $xCodeGenerator, private ViewRenderer $xViewRenderer,
-        private CallbackManager $xCallbackManager, private ComponentRegistry $xRegistry)
-    {}
+public function __construct(private Container $di, private Translator $xTranslator,
+private PluginManager $xPluginManager, private ConfigManager $xConfigManager,
+private CodeGenerator $xCodeGenerator, private ViewRenderer $xViewRenderer,
+private CallbackManager $xCallbackManager, private ComponentRegistry $xRegistry)
+{}
 
-    /**
+/**
      * Save items in the DI container
      *
      * @param Config $xConfig
      *
      * @return void
      */
-    private function updateContainer(Config $xConfig): void
-    {
-        $aOptions = $xConfig->getOption('container.set', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->set((string)$xKey, $xValue);
-        }
-        $aOptions = $xConfig->getOption('container.val', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->val((string)$xKey, $xValue);
-        }
-        $aOptions = $xConfig->getOption('container.auto', []);
-        foreach($aOptions as $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->auto((string)$xValue);
-        }
-        $aOptions = $xConfig->getOption('container.alias', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->alias((string)$xKey, (string)$xValue);
-        }
-    }
+private function updateContainer(Config $xConfig): void
+{
+$aOptions = $xConfig->getOption('container.set', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->set((string)$xKey, $xValue);
+}
+$aOptions = $xConfig->getOption('container.val', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->val((string)$xKey, $xValue);
+}
+$aOptions = $xConfig->getOption('container.auto', []);
+foreach($aOptions as $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->auto((string)$xValue);
+}
+$aOptions = $xConfig->getOption('container.alias', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->alias((string)$xKey, (string)$xValue);
+}
+}
 
-    /**
+/**
      * Register callables from a section of the config
      *
      * @param array $aOptions    The content of the config section
@@ -96,41 +96,41 @@ 
      * @return void
      * @throws SetupException
      */
-    private function registerCallables(array $aOptions, string $sCallableType): void
-    {
-        foreach($aOptions as $xKey => $xValue)
-        {
-            if(is_integer($xKey) && is_string($xValue))
-            {
-                // Register a function without options
-                $this->xPluginManager->registerCallable($sCallableType, $xValue);
-                continue;
-            }
+private function registerCallables(array $aOptions, string $sCallableType): void
+{
+foreach($aOptions as $xKey => $xValue)
+{
+if(is_integer($xKey) && is_string($xValue))
+{
+    // Register a function without options
+    $this->xPluginManager->registerCallable($sCallableType, $xValue);
+    continue;
+}
 
-            if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
-            {
-                // Register a function with options
-                $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
-            }
-        }
-    }
+if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+{
+    // Register a function with options
+    $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
+}
+}
+}
 
-    /**
+/**
      * Register exceptions handlers
      *
      * @param Config $xConfig
      *
      * @return void
      */
-    private function registerExceptionHandlers(Config $xConfig): void
-    {
-        foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
-        {
-            $this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
-        }
-    }
+private function registerExceptionHandlers(Config $xConfig): void
+{
+foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
+{
+$this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
+}
+}
 
-    /**
+/**
      * Get a callable list from config
      *
      * @param Config $xConfig
@@ -140,36 +140,36 @@ 
      *
      * @return void
      */
-    private function registerCallablesFromConfig(Config $xConfig,
-        string $sOptionName, string $sOptionKey, string $sCallableType): void
-    {
-        // The callable (directory path, class or function name) can be used as the
-        // key of the array item, a string as the value of an entry without a key,
-        // or set with the key $sOptionKey in an array entry without a key.
-        $aCallables = [];
-        foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
-        {
-            if(is_string($xKey))
-            {
-                $aCallables[$xKey] = $xValue;
-                continue;
-            }
-            if(is_string($xValue))
-            {
-                $aCallables[] = $xValue;
-                continue;
-            }
+private function registerCallablesFromConfig(Config $xConfig,
+string $sOptionName, string $sOptionKey, string $sCallableType): void
+{
+// The callable (directory path, class or function name) can be used as the
+// key of the array item, a string as the value of an entry without a key,
+// or set with the key $sOptionKey in an array entry without a key.
+$aCallables = [];
+foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
+{
+if(is_string($xKey))
+{
+    $aCallables[$xKey] = $xValue;
+    continue;
+}
+if(is_string($xValue))
+{
+    $aCallables[] = $xValue;
+    continue;
+}
 
-            if(is_array($xValue) && isset($xValue[$sOptionKey]))
-            {
-                $aCallables[$xValue[$sOptionKey]] = $xValue;
-            }
-            // Invalid values are ignored.
-        }
-        $this->registerCallables($aCallables, $sCallableType);
-    }
+if(is_array($xValue) && isset($xValue[$sOptionKey]))
+{
+    $aCallables[$xValue[$sOptionKey]] = $xValue;
+}
+// Invalid values are ignored.
+}
+$this->registerCallables($aCallables, $sCallableType);
+}
 
-    /**
+/**
      * Read and set Jaxon options from a JSON config file
      *
      * @param Config $xConfig The config options
@@ -177,33 +177,33 @@ 
      * @return void
      * @throws SetupException
      */
-    private function registerItemsFromConfig(Config $xConfig): void
-    {
-        // Set the config for the registered callables.
-        $this->xRegistry->setPackageConfig($xConfig);
+private function registerItemsFromConfig(Config $xConfig): void
+{
+// Set the config for the registered callables.
+$this->xRegistry->setPackageConfig($xConfig);
 
-        // Register functions, classes and directories
-        $this->registerCallablesFromConfig($xConfig,
-            'functions', 'name', Jaxon::CALLABLE_FUNCTION);
-        $this->registerCallablesFromConfig($xConfig,
-            'classes', 'name', Jaxon::CALLABLE_CLASS);
-        $this->registerCallablesFromConfig($xConfig,
-            'directories', 'path', Jaxon::CALLABLE_DIR);
+// Register functions, classes and directories
+$this->registerCallablesFromConfig($xConfig,
+'functions', 'name', Jaxon::CALLABLE_FUNCTION);
+$this->registerCallablesFromConfig($xConfig,
+'classes', 'name', Jaxon::CALLABLE_CLASS);
+$this->registerCallablesFromConfig($xConfig,
+'directories', 'path', Jaxon::CALLABLE_DIR);
 
-        // Unset the current config.
-        $this->xRegistry->unsetPackageConfig();
+// Unset the current config.
+$this->xRegistry->unsetPackageConfig();
 
-        // Register the view namespaces
-        // Note: the $xUserConfig can provide a "template" option, which is used to customize
-        // the user defined view namespaces. That's why it is needed here.
-        $this->xViewRenderer->addNamespaces($xConfig);
-        // Save items in the DI container
-        $this->updateContainer($xConfig);
-        // Register the exception handlers
-        $this->registerExceptionHandlers($xConfig);
-    }
+// Register the view namespaces
+// Note: the $xUserConfig can provide a "template" option, which is used to customize
+// the user defined view namespaces. That's why it is needed here.
+$this->xViewRenderer->addNamespaces($xConfig);
+// Save items in the DI container
+$this->updateContainer($xConfig);
+// Register the exception handlers
+$this->registerExceptionHandlers($xConfig);
+}
 
-    /**
+/**
      * Get the options provided by the package library
      *
      * @param class-string $sClassName    The package class
@@ -211,27 +211,27 @@ 
      * @return Config
      * @throws SetupException
      */
-    private function getPackageLibConfig(string $sClassName): Config
-    {
-        // $this->aPackages contains packages config file paths.
-        $aLibOptions = $sClassName::config();
-        if(is_string($aLibOptions))
-        {
-            // A string is supposed to be the path to a config file.
-            $aLibOptions = $this->xConfigManager->read($aLibOptions);
-        }
-        elseif(!is_array($aLibOptions))
-        {
-            // Otherwise, anything else than an array is not accepted.
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
-        // Add the package name to the config
-        $aLibOptions['package'] = $sClassName;
-        return $this->xConfigManager->newConfig($aLibOptions);
-    }
+private function getPackageLibConfig(string $sClassName): Config
+{
+// $this->aPackages contains packages config file paths.
+$aLibOptions = $sClassName::config();
+if(is_string($aLibOptions))
+{
+// A string is supposed to be the path to a config file.
+$aLibOptions = $this->xConfigManager->read($aLibOptions);
+}
+elseif(!is_array($aLibOptions))
+{
+// Otherwise, anything else than an array is not accepted.
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
+// Add the package name to the config
+$aLibOptions['package'] = $sClassName;
+return $this->xConfigManager->newConfig($aLibOptions);
+}
 
-    /**
+/**
      * Register a package
      *
      * @param class-string $sClassName    The package class
@@ -240,27 +240,27 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $aUserOptions = []): void
-    {
-        $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, AbstractPackage::class))
-        {
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
+public function registerPackage(string $sClassName, array $aUserOptions = []): void
+{
+$sClassName = trim($sClassName, '\\ ');
+if(!is_subclass_of($sClassName, AbstractPackage::class))
+{
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
 
-        // Register the declarations in the package config.
-        $xAppConfig = $this->getPackageLibConfig($sClassName);
-        $this->registerItemsFromConfig($xAppConfig);
+// Register the declarations in the package config.
+$xAppConfig = $this->getPackageLibConfig($sClassName);
+$this->registerItemsFromConfig($xAppConfig);
 
-        // Register the package and its options in the DI
-        $this->di->registerPackage($sClassName, $aUserOptions);
+// Register the package and its options in the DI
+$this->di->registerPackage($sClassName, $aUserOptions);
 
-        // Register the package as a code generator.
-        $this->xCodeGenerator->addCodeGenerator($sClassName, 500);
-    }
+// Register the package as a code generator.
+$this->xCodeGenerator->addCodeGenerator($sClassName, 500);
+}
 
-    /**
+/**
      * Get a package instance
      *
      * @template T of AbstractPackage
@@ -268,42 +268,42 @@ 
      *
      * @return T|null
      */
-    public function getPackage(string $sClassName): ?AbstractPackage
-    {
-        $sClassName = trim($sClassName, '\\ ');
-        return $this->di->h($sClassName) ? $this->di->g($sClassName) : null;
-    }
+public function getPackage(string $sClassName): ?AbstractPackage
+{
+$sClassName = trim($sClassName, '\\ ');
+return $this->di->h($sClassName) ? $this->di->g($sClassName) : null;
+}
 
-    /**
+/**
      * Read and set Jaxon options from the config
      *
      * @return void
      * @throws SetupException
      */
-    public function registerFromConfig(): void
-    {
-        $xAppConfig = $this->xConfigManager->getAppConfig();
-        $this->registerItemsFromConfig($xAppConfig);
+public function registerFromConfig(): void
+{
+$xAppConfig = $this->xConfigManager->getAppConfig();
+$this->registerItemsFromConfig($xAppConfig);
 
-        // Register packages
-        $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $xKey => $xValue)
-        {
-            if(is_integer($xKey) && is_string($xValue))
-            {
-                // Register a package without options
-                $sClassName = $xValue;
-                $this->registerPackage($sClassName);
-                continue;
-            }
+// Register packages
+$aPackageConfig = $xAppConfig->getOption('packages', []);
+foreach($aPackageConfig as $xKey => $xValue)
+{
+if(is_integer($xKey) && is_string($xValue))
+{
+    // Register a package without options
+    $sClassName = $xValue;
+    $this->registerPackage($sClassName);
+    continue;
+}
 
-            if(is_string($xKey) && is_array($xValue))
-            {
-                // Register a package with options
-                $sClassName = $xKey;
-                $aPkgOptions = $xValue;
-                $this->registerPackage($sClassName, $aPkgOptions);
-            }
-        }
-    }
+if(is_string($xKey) && is_array($xValue))
+{
+    // Register a package with options
+    $sClassName = $xKey;
+    $aPkgOptions = $xValue;
+    $this->registerPackage($sClassName, $aPkgOptions);
+}
+}
+}
 }