jaxon-php / jaxon-mono

jaxon-utils/src/Template/Context.php

Switch Indentation +100 added lines, -100 removed lines

@@ -30,54 +30,54 @@ 
 
 class Context
 {
-    /**
+/**
      * @var Context|null
      */
-    private $__extends__ = null;
+private $__extends__ = null;
 
-    /**
+/**
      * @var string
      */
-    private $__block_name__;
+private $__block_name__;
 
-    /**
+/**
      * @var array
      */
-    private $__properties__ = [];
+private $__properties__ = [];
 
-    /**
+/**
      * The constructor
      *
      * @param array $__namespaces__
      * @param string $__default_namespace__
      * @param string $__template__
      */
-    public function __construct(protected array $__namespaces__,
-        protected string $__default_namespace__, protected string $__template__)
-    {}
+public function __construct(protected array $__namespaces__,
+protected string $__default_namespace__, protected string $__template__)
+{}
 
-    /**
+/**
      * @param string $name
      *
      * @return mixed
      */
-    public function __get(string $name): mixed
-    {
-        return $this->__properties__[$name] ?? '';
-    }
+public function __get(string $name): mixed
+{
+return $this->__properties__[$name] ?? '';
+}
 
-    /**
+/**
      * @param string $name
      * @param mixed $value
      *
      * @return void
      */
-    public function __set(string $name, $value): void
-    {
-        $this->__properties__[$name] = $value;
-    }
+public function __set(string $name, $value): void
+{
+$this->__properties__[$name] = $value;
+}
 
-    /**
+/**
      * Include a template
      *
      * @param string $template The name of template to be rendered
@@ -85,110 +85,110 @@ 
      *
      * @return void
      */
-    protected function include(string $template, array $vars = []): void
-    {
-        $context = new Context($this->__namespaces__,
-            $this->__default_namespace__, $template);
-        echo $context->__render($vars);
-    }
-
-    /**
+protected function include(string $template, array $vars = []): void
+{
+$context = new Context($this->__namespaces__,
+$this->__default_namespace__, $template);
+echo $context->__render($vars);
+}
+
+/**
      * @param string $template The name of template to be rendered
      *
      * @return void
      */
-    public function extends(string $template): void
-    {
-        $this->__extends__ = new Context($this->__namespaces__,
-            $this->__default_namespace__, $template);
-    }
+public function extends(string $template): void
+{
+$this->__extends__ = new Context($this->__namespaces__,
+$this->__default_namespace__, $template);
+}
 
-    /**
+/**
      * Start a new block
      *
      * @param string $name
      *
      * @return void
      */
-    public function block(string $name): void
-    {
-        ob_start();
-        $this->__block_name__ = $name;
-    }
+public function block(string $name): void
+{
+ob_start();
+$this->__block_name__ = $name;
+}
 
-    /**
+/**
      * End the current block
      *
      * @param Closure|null $filter
      *
      * @return void
      */
-    public function endblock(?Closure $filter = null): void
-    {
-        $content = ob_get_clean();
-        $this->__set($this->__block_name__, !$filter ? $content : $filter($content));
-    }
+public function endblock(?Closure $filter = null): void
+{
+$content = ob_get_clean();
+$this->__set($this->__block_name__, !$filter ? $content : $filter($content));
+}
 
-    /**
+/**
      * @return string
      */
-    private function __path(): string
-    {
-        $template = trim($this->__template__);
-        // Get the namespace name
-        $namespace = $this->__default_namespace__;
-        $separatorPosition = strrpos($template, '::');
-        if($separatorPosition !== false)
-        {
-            $namespace = substr($template, 0, $separatorPosition);
-            $template = substr($template, $separatorPosition + 2);
-        }
-        // Check if the namespace is defined
-        if(!isset($this->__namespaces__[$namespace]))
-        {
-            return $template;
-        }
-
-        $namespace = $this->__namespaces__[$namespace];
-        // Get the template path
-        return $namespace['directory'] . $template . $namespace['extension'];
-    }
-
-    /**
+private function __path(): string
+{
+$template = trim($this->__template__);
+// Get the namespace name
+$namespace = $this->__default_namespace__;
+$separatorPosition = strrpos($template, '::');
+if($separatorPosition !== false)
+{
+$namespace = substr($template, 0, $separatorPosition);
+$template = substr($template, $separatorPosition + 2);
+}
+// Check if the namespace is defined
+if(!isset($this->__namespaces__[$namespace]))
+{
+return $template;
+}
+
+$namespace = $this->__namespaces__[$namespace];
+// Get the template path
+return $namespace['directory'] . $template . $namespace['extension'];
+}
+
+/**
      * Render a template
      *
      * @param array $vars The template vars
      *
      * @return string
      */
-    public function __render(array $vars): string
-    {
-        // Get the template path
-        $templatePath = $this->__path();
-        if(!@is_readable($templatePath))
-        {
-            return '';
-        }
-
-        // Save the template properties.
-        foreach($vars as $name => $value)
-        {
-            $this->__set((string)$name, $value);
-        }
-
-        // Render the template
-        $renderer = function() use($templatePath) {
-            ob_start();
-            include $templatePath;
-            $content = ob_get_clean();
-
-            return $this->__extends__ === null ? $content :
-                // Render the extended template with the same properties.
-                $this->__extends__->__render($this->__properties__);
-        };
-
-        // Call the closure in the context of this object.
-        // So the keyword '$this' in the template will refer to this object.
-        return call_user_func($renderer->bindTo($this));
-    }
+public function __render(array $vars): string
+{
+// Get the template path
+$templatePath = $this->__path();
+if(!@is_readable($templatePath))
+{
+return '';
+}
+
+// Save the template properties.
+foreach($vars as $name => $value)
+{
+$this->__set((string)$name, $value);
+}
+
+// Render the template
+$renderer = function() use($templatePath) {
+ob_start();
+include $templatePath;
+$content = ob_get_clean();
+
+return $this->__extends__ === null ? $content :
+    // Render the extended template with the same properties.
+    $this->__extends__->__render($this->__properties__);
+};
+
+// Call the closure in the context of this object.
+// So the keyword '$this' in the template will refer to this object.
+return call_user_func($renderer->bindTo($this));
+}
 }

jaxon-utils/src/Template/TemplateEngine.php

Switch Indentation +24 added lines, -24 removed lines

@@ -19,33 +19,33 @@ 
 
 class TemplateEngine
 {
-    /**
+/**
      * The default namespace
      *
      * @var string
      */
-    protected $sDefaultNamespace = '';
+protected $sDefaultNamespace = '';
 
-    /**
+/**
      * The namespaces
      *
      * @var array
      */
-    protected $aNamespaces;
+protected $aNamespaces;
 
-    /**
+/**
      * Set the default namespace
      *
      * @param string $sDefaultNamespace
      *
      * @return void
      */
-    public function setDefaultNamespace(string $sDefaultNamespace): void
-    {
-        $this->sDefaultNamespace = $sDefaultNamespace;
-    }
+public function setDefaultNamespace(string $sDefaultNamespace): void
+{
+$this->sDefaultNamespace = $sDefaultNamespace;
+}
 
-    /**
+/**
      * Add a namespace to the template system
      *
      * @param string $sNamespace The namespace name
@@ -54,16 +54,16 @@ 
      *
      * @return static
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): static
-    {
-        $this->aNamespaces[$sNamespace] = [
-            'directory' => rtrim(trim($sDirectory), "/\\") . DIRECTORY_SEPARATOR,
-            'extension' => $sExtension,
-        ];
-        return $this;
-    }
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): static
+{
+$this->aNamespaces[$sNamespace] = [
+'directory' => rtrim(trim($sDirectory), "/\\") . DIRECTORY_SEPARATOR,
+'extension' => $sExtension,
+];
+return $this;
+}
 
-    /**
+/**
      * Render a template
      *
      * @param string $sTemplate The name of template to be rendered
@@ -71,9 +71,9 @@ 
      *
      * @return string
      */
-    public function render(string $sTemplate, array $aVars = []): string
-    {
-        $context = new Context($this->aNamespaces, $this->sDefaultNamespace, $sTemplate);
-        return $context->__render($aVars);
-    }
+public function render(string $sTemplate, array $aVars = []): string
+{
+$context = new Context($this->aNamespaces, $this->sDefaultNamespace, $sTemplate);
+return $context->__render($aVars);
+}
 }

jaxon-utils/src/Translation/Translator.php

Switch Indentation +95 added lines, -95 removed lines

@@ -26,43 +26,43 @@ 
 
 class Translator
 {
-    /**
+/**
      * The default locale
      *
      * @var string
      */
-    protected $sDefaultLocale = 'en';
+protected $sDefaultLocale = 'en';
 
-    /**
+/**
      * The translations in a flattened array
      *
      * @var array
      */
-    protected $aTranslations = [];
+protected $aTranslations = [];
 
-    /**
+/**
      * The translations as received as input
      *
      * @var array
      */
-    protected $aRawTranslations = [];
+protected $aRawTranslations = [];
 
-    /**
+/**
      * Set the default locale
      *
      * @param string $sLocale
      *
      * @return void
      */
-    public function setLocale(string $sLocale): void
-    {
-        if(($sLocale = trim($sLocale)))
-        {
-            $this->sDefaultLocale = $sLocale;
-        }
-    }
+public function setLocale(string $sLocale): void
+{
+if(($sLocale = trim($sLocale)))
+{
+$this->sDefaultLocale = $sLocale;
+}
+}
 
-    /**
+/**
      * Recursively load translated strings from an array
      *
      * @param string $sLanguage The language of the translations
@@ -71,26 +71,26 @@ 
      *
      * @return void
      */
-    private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
-    {
-        foreach($aTranslations as $sKey => $xTranslation)
-        {
-            $sKey = trim($sKey);
-            $sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
-            if(is_array($xTranslation))
-            {
-                // Recursively read the translations in the array
-                $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
-            }
-            else
-            {
-                // Save this translation
-                $this->aTranslations[$sLanguage][$sKey] = $xTranslation;
-            }
-        }
-    }
+private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
+{
+foreach($aTranslations as $sKey => $xTranslation)
+{
+$sKey = trim($sKey);
+$sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
+if(is_array($xTranslation))
+{
+    // Recursively read the translations in the array
+    $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
+}
+else
+{
+    // Save this translation
+    $this->aTranslations[$sLanguage][$sKey] = $xTranslation;
+}
+}
+}
 
-    /**
+/**
      * Load translated strings from a file
      *
      * @param string $sFilePath The file full path
@@ -98,30 +98,30 @@ 
      *
      * @return bool
      */
-    public function loadTranslations(string $sFilePath, string $sLanguage): bool
-    {
-        if(!file_exists($sFilePath))
-        {
-            return false;
-        }
-        $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
-        {
-            return false;
-        }
+public function loadTranslations(string $sFilePath, string $sLanguage): bool
+{
+if(!file_exists($sFilePath))
+{
+return false;
+}
+$aTranslations = require($sFilePath);
+if(!is_array($aTranslations))
+{
+return false;
+}
 
-        // Load the translations
-        if(!isset($this->aTranslations[$sLanguage]))
-        {
-            $this->aTranslations[$sLanguage] = [];
-        }
-        $this->aRawTranslations[$sLanguage] =
-            array_merge($this->aRawTranslations[$sLanguage] ?? [], $aTranslations);
-        $this->_loadTranslations($sLanguage, '', $aTranslations);
-        return true;
-    }
+// Load the translations
+if(!isset($this->aTranslations[$sLanguage]))
+{
+$this->aTranslations[$sLanguage] = [];
+}
+$this->aRawTranslations[$sLanguage] =
+array_merge($this->aRawTranslations[$sLanguage] ?? [], $aTranslations);
+$this->_loadTranslations($sLanguage, '', $aTranslations);
+return true;
+}
 
-    /**
+/**
      * Get a translated string
      *
      * @param string $sText The key of the translated string
@@ -130,29 +130,29 @@ 
      *
      * @return string
      */
-    public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
-    {
-        $sText = trim($sText);
-        if(empty($sLanguage))
-        {
-            $sLanguage = $this->sDefaultLocale;
-        }
-        if(!isset($this->aTranslations[$sLanguage][$sText]))
-        {
-            return $sText;
-        }
-        $sMessage = $this->aTranslations[$sLanguage][$sText];
-        if(!empty($aPlaceHolders))
-        {
-            $aVars = array_map(function($sVar) {
-                return ':' . $sVar;
-            }, array_keys($aPlaceHolders));
-            $sMessage = str_replace($aVars, array_values($aPlaceHolders), $sMessage);
-        }
-        return $sMessage;
-    }
+public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
+{
+$sText = trim($sText);
+if(empty($sLanguage))
+{
+$sLanguage = $this->sDefaultLocale;
+}
+if(!isset($this->aTranslations[$sLanguage][$sText]))
+{
+return $sText;
+}
+$sMessage = $this->aTranslations[$sLanguage][$sText];
+if(!empty($aPlaceHolders))
+{
+$aVars = array_map(function($sVar) {
+    return ':' . $sVar;
+}, array_keys($aPlaceHolders));
+$sMessage = str_replace($aVars, array_values($aPlaceHolders), $sMessage);
+}
+return $sMessage;
+}
 
-    /**
+/**
      * Get all the translations under a given key
      *
      * @param string $sKey
@@ -160,22 +160,22 @@ 
      *
      * @return array
      */
-    public function translations(string $sKey, string $sLanguage = ''): array
-    {
-        if(empty($sLanguage))
-        {
-            $sLanguage = $this->sDefaultLocale;
-        }
-        $aKeys = explode('.', $sKey);
+public function translations(string $sKey, string $sLanguage = ''): array
+{
+if(empty($sLanguage))
+{
+$sLanguage = $this->sDefaultLocale;
+}
+$aKeys = explode('.', $sKey);
 
-        $aTranslations = $this->aRawTranslations[$sLanguage];
-        foreach($aKeys as $sKey)
-        {
-            if($sKey !== '')
-            {
-                $aTranslations = $aTranslations[$sKey] ?? [];
-            }
-        }
-        return $aTranslations;
-    }
+$aTranslations = $this->aRawTranslations[$sLanguage];
+foreach($aKeys as $sKey)
+{
+if($sKey !== '')
+{
+    $aTranslations = $aTranslations[$sKey] ?? [];
+}
+}
+return $aTranslations;
+}
 }

jaxon-annotations/src/register.php

Switch Indentation +14 added lines, -14 removed lines

@@ -16,27 +16,27 @@
  */
 function _register(): void
 {
-    $di = jaxon()->di();
+$di = jaxon()->di();
 
-    $di->set(AnnotationReader::class, function($c) {
-        $sKey = 'jaxon_annotations_cache_dir';
-        $sCacheDir = $c->h($sKey) ? $c->g($sKey) : sys_get_temp_dir();
-        $xAnnotationManager = new AnnotationManager();
-        $xAnnotationManager->cache = new AnnotationCache($sCacheDir);
+$di->set(AnnotationReader::class, function($c) {
+$sKey = 'jaxon_annotations_cache_dir';
+$sCacheDir = $c->h($sKey) ? $c->g($sKey) : sys_get_temp_dir();
+$xAnnotationManager = new AnnotationManager();
+$xAnnotationManager->cache = new AnnotationCache($sCacheDir);
 
-        return new AnnotationReader($xAnnotationManager);
-    });
+return new AnnotationReader($xAnnotationManager);
+});
 
-    $di->alias('metadata_reader_annotations', AnnotationReader::class);
+$di->alias('metadata_reader_annotations', AnnotationReader::class);
 }
 
 function register(): void
 {
-    // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
-    {
-        _register();
-    };
+// Do nothing if running in cli.
+if(php_sapi_name() !== 'cli')
+{
+_register();
+};
 }
 
 register();

jaxon-core/src/App/View/TemplateView.php

Switch Indentation +25 added lines, -25 removed lines

@@ -18,22 +18,22 @@ 
 
 class TemplateView implements ViewInterface
 {
-    /**
+/**
      * The Jaxon template engine
      *
      * @var TemplateEngine
      */
-    protected $xTemplateEngine;
+protected $xTemplateEngine;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct(TemplateEngine $xTemplateEngine)
-    {
-        $this->xTemplateEngine = $xTemplateEngine;
-    }
+public function __construct(TemplateEngine $xTemplateEngine)
+{
+$this->xTemplateEngine = $xTemplateEngine;
+}
 
-    /**
+/**
      * Add a namespace to this view renderer
      *
      * @param string $sNamespace    The namespace name
@@ -42,28 +42,28 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void
-    {
-        $this->xTemplateEngine->addNamespace($sNamespace, $sDirectory, $sExtension);
-    }
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void
+{
+$this->xTemplateEngine->addNamespace($sNamespace, $sDirectory, $sExtension);
+}
 
-    /**
+/**
      * Render a view
      *
      * @param Store $store    A store populated with the view data
      *
      * @return string        The string representation of the view
      */
-    public function render(Store $store): string
-    {
-        $sViewName = $store->getViewName();
-        $sNamespace = $store->getNamespace();
-        // In this view renderer, the namespace must always be prepended to the view name.
-        if(substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
-        {
-            $sViewName = $sNamespace . '::' . $sViewName;
-        }
-        // Render the template
-        return trim($this->xTemplateEngine->render($sViewName, $store->getViewData()), " \t\n");
-    }
+public function render(Store $store): string
+{
+$sViewName = $store->getViewName();
+$sNamespace = $store->getNamespace();
+// In this view renderer, the namespace must always be prepended to the view name.
+if(substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
+{
+$sViewName = $sNamespace . '::' . $sViewName;
+}
+// Render the template
+return trim($this->xTemplateEngine->render($sViewName, $store->getViewData()), " \t\n");
+}
 }

jaxon-core/src/App/Metadata/InputData.php

Switch Indentation +24 added lines, -24 removed lines

@@ -20,50 +20,50 @@
 
 class InputData
 {
-    /**
+/**
      * @var ReflectionClass
      */
-    private $xReflectionClass;
+private $xReflectionClass;
 
-    /**
+/**
      * @param ReflectionClass|string $xClass
      * @param array $aMethods
      * @param array $aProperties
      */
-    public function __construct(ReflectionClass|string $xClass,
-        private array $aMethods = [], private array $aProperties = [])
-    {
-        $this->xReflectionClass = is_string($xClass) ?
-            new ReflectionClass($xClass) : $xClass;
-    }
+public function __construct(ReflectionClass|string $xClass,
+private array $aMethods = [], private array $aProperties = [])
+{
+$this->xReflectionClass = is_string($xClass) ?
+new ReflectionClass($xClass) : $xClass;
+}
 
-    /**
+/**
      * Get the reflection class
      *
      * @return ReflectionClass
      */
-    public function getReflectionClass(): ReflectionClass
-    {
-        return $this->xReflectionClass;
-    }
+public function getReflectionClass(): ReflectionClass
+{
+return $this->xReflectionClass;
+}
 
-    /**
+/**
      * The methods to check for metadata
      *
      * @return array
      */
-    public function getMethods(): array
-    {
-        return $this->aMethods;
-    }
+public function getMethods(): array
+{
+return $this->aMethods;
+}
 
-    /**
+/**
      * The properties to check for metadata
      *
      * @return array
      */
-    public function getProperties(): array
-    {
-        return $this->aProperties;
-    }
+public function getProperties(): array
+{
+return $this->aProperties;
+}
 }

jaxon-core/src/App/Metadata/Data/ExcludeData.php

Switch Indentation +22 added lines, -22 removed lines

@@ -16,42 +16,42 @@
 
 class ExcludeData extends AbstractData
 {
-    /**
+/**
      * @var bool
      */
-    private bool $bValue = true;
+private bool $bValue = true;
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'protected';
-    }
+public function getName(): string
+{
+return 'protected';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->bValue;
-    }
+public function getValue(): mixed
+{
+return $this->bValue;
+}
 
-    /**
+/**
      * @param bool $bValue
      *
      * @return void
      */
-    public function setValue(bool $bValue): void
-    {
-        $this->bValue = $bValue;
-    }
+public function setValue(bool $bValue): void
+{
+$this->bValue = $bValue;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return ["{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");"];
-    }
+public function encode(string $sVarName): array
+{
+return ["{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");"];
+}
 }

jaxon-core/src/App/Metadata/Data/UploadData.php

Switch Indentation +33 added lines, -33 removed lines

@@ -20,61 +20,61 @@
 
 class UploadData extends AbstractData
 {
-    /**
+/**
      * The id of the upload field
      *
      * @var string
      */
-    protected $sField = '';
+protected $sField = '';
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'upload';
-    }
+public function getName(): string
+{
+return 'upload';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        // The field id is surrounded with simple quotes.
-        return "'{$this->sField}'";
-    }
+public function getValue(): mixed
+{
+// The field id is surrounded with simple quotes.
+return "'{$this->sField}'";
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    protected function validateField(string $sField): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sField is not a valid \"field\" value for upload");
-    }
+protected function validateField(string $sField): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
+{
+return;
+}
+throw new SetupException("$sField is not a valid \"field\" value for upload");
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    public function setValue(string $sField): void
-    {
-        $this->validateField($sField);
+public function setValue(string $sField): void
+{
+$this->validateField($sField);
 
-        $this->sField = $sField;
-    }
+$this->sField = $sField;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return ["{$sVarName}->setValue('{$this->sField}');"];
-    }
+public function encode(string $sVarName): array
+{
+return ["{$sVarName}->setValue('{$this->sField}');"];
+}
 }

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

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);
+}
+}
+}
 }