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-core/src/App/Metadata/Metadata.php

Switch Indentation +101 added lines, -101 removed lines

@@ -21,161 +21,161 @@
 
 class Metadata
 {
-    /**
+/**
      * @var array<string, array<string, Data\AbstractData>>
      */
-    private array $aAttributes = [
-        'exclude' => [],
-        'container' => [],
-        'databag' => [],
-        'callback' => [],
-        'before' => [],
-        'after' => [],
-        'upload' => [],
-    ];
-
-    /**
+private array $aAttributes = [
+'exclude' => [],
+'container' => [],
+'databag' => [],
+'callback' => [],
+'before' => [],
+'after' => [],
+'upload' => [],
+];
+
+/**
      * @return array<string, array<string, Data\AbstractData>>
      */
-    public function getAttributes(): array
-    {
-        return $this->aAttributes;
-    }
+public function getAttributes(): array
+{
+return $this->aAttributes;
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExcludeData
      */
-    public function exclude(string $sMethod = '*'): Data\ExcludeData
-    {
-        return $this->aAttributes['exclude'][$sMethod] ??
-            $this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
-    }
+public function exclude(string $sMethod = '*'): Data\ExcludeData
+{
+return $this->aAttributes['exclude'][$sMethod] ??
+$this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ContainerData
      */
-    public function container(string $sMethod = '*'): Data\ContainerData
-    {
-        return $this->aAttributes['container'][$sMethod] ??
-            $this->aAttributes['container'][$sMethod] = new Data\ContainerData();
-    }
+public function container(string $sMethod = '*'): Data\ContainerData
+{
+return $this->aAttributes['container'][$sMethod] ??
+$this->aAttributes['container'][$sMethod] = new Data\ContainerData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\DatabagData
      */
-    public function databag(string $sMethod = '*'): Data\DatabagData
-    {
-        return $this->aAttributes['databag'][$sMethod] ??
-            $this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
-    }
+public function databag(string $sMethod = '*'): Data\DatabagData
+{
+return $this->aAttributes['databag'][$sMethod] ??
+$this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\CallbackData
      */
-    public function callback(string $sMethod = '*'): Data\CallbackData
-    {
-        return $this->aAttributes['callback'][$sMethod] ??
-            $this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
-    }
+public function callback(string $sMethod = '*'): Data\CallbackData
+{
+return $this->aAttributes['callback'][$sMethod] ??
+$this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\BeforeData
      */
-    public function before(string $sMethod = '*'): Data\BeforeData
-    {
-        return $this->aAttributes['before'][$sMethod] ??
-            $this->aAttributes['before'][$sMethod] = new Data\BeforeData();
-    }
+public function before(string $sMethod = '*'): Data\BeforeData
+{
+return $this->aAttributes['before'][$sMethod] ??
+$this->aAttributes['before'][$sMethod] = new Data\BeforeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\AfterData
      */
-    public function after(string $sMethod = '*'): Data\AfterData
-    {
-        return $this->aAttributes['after'][$sMethod] ??
-            $this->aAttributes['after'][$sMethod] = new Data\AfterData();
-    }
+public function after(string $sMethod = '*'): Data\AfterData
+{
+return $this->aAttributes['after'][$sMethod] ??
+$this->aAttributes['after'][$sMethod] = new Data\AfterData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\UploadData
      */
-    public function upload(string $sMethod = '*'): Data\UploadData
-    {
-        return $this->aAttributes['upload'][$sMethod] ??
-            $this->aAttributes['upload'][$sMethod] = new Data\UploadData();
-    }
+public function upload(string $sMethod = '*'): Data\UploadData
+{
+return $this->aAttributes['upload'][$sMethod] ??
+$this->aAttributes['upload'][$sMethod] = new Data\UploadData();
+}
 
-    /**
+/**
      * True if the class is excluded
      *
      * @return bool
      */
-    public function isExcluded(): bool
-    {
-        $xData = $this->aAttributes['exclude']['*'] ?? null;
-        return $xData !== null && $xData->getValue() === true;
-    }
+public function isExcluded(): bool
+{
+$xData = $this->aAttributes['exclude']['*'] ?? null;
+return $xData !== null && $xData->getValue() === true;
+}
 
-    /**
+/**
      * Get the properties of the class methods
      *
      * @return array
      */
-    public function getProperties(): array
+public function getProperties(): array
+{
+$aProperties = [];
+$aClassProperties = [];
+foreach($this->aAttributes as $sType => $aValues)
+{
+if($sType === 'exclude')
+{
+    continue;
+}
+
+foreach($aValues as $sMethod => $xData)
+{
+    if($sMethod === '*')
     {
-        $aProperties = [];
-        $aClassProperties = [];
-        foreach($this->aAttributes as $sType => $aValues)
-        {
-            if($sType === 'exclude')
-            {
-                continue;
-            }
-
-            foreach($aValues as $sMethod => $xData)
-            {
-                if($sMethod === '*')
-                {
-                    $aClassProperties[$xData->getName()] = $xData->getValue();
-                    continue;
-                }
-                $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
-            }
-        }
-
-        if(count($aClassProperties) > 0)
-        {
-            $aProperties['*'] = $aClassProperties;
-        }
-
-        return $aProperties;
+        $aClassProperties[$xData->getName()] = $xData->getValue();
+        continue;
     }
+    $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
+}
+}
+
+if(count($aClassProperties) > 0)
+{
+$aProperties['*'] = $aClassProperties;
+}
+
+return $aProperties;
+}
 
-    /**
+/**
      * Get the protected methods
      *
      * @return array
      */
-    public function getProtectedMethods(): array
-    {
-        /** @var array<Data\ExcludeData> */
-        $aAttributes = $this->aAttributes['exclude'];
-        $aMethods = array_keys($aAttributes);
-        return array_values(array_filter($aMethods, fn(string $sName) =>
-            $sName !== '*' && $aAttributes[$sName]->getValue() === true));
-    }
+public function getProtectedMethods(): array
+{
+/** @var array<Data\ExcludeData> */
+$aAttributes = $this->aAttributes['exclude'];
+$aMethods = array_keys($aAttributes);
+return array_values(array_filter($aMethods, fn(string $sName) =>
+$sName !== '*' && $aAttributes[$sName]->getValue() === true));
+}
 }

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/Metadata/MetadataReaderInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -16,12 +16,12 @@
 
 interface MetadataReaderInterface
 {
-    /**
+/**
      * Get the component metadata
      *
      * @param InputData $xInput
      *
      * @return Metadata|null
      */
-    public function getAttributes(InputData $xInput): ?Metadata;
+public function getAttributes(InputData $xInput): ?Metadata;
 }

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

Switch Indentation +41 added lines, -41 removed lines

@@ -24,58 +24,58 @@ 
 
 class MetadataCache
 {
-    /**
+/**
      * @param string $sCacheDir
      */
-    public function __construct(private string $sCacheDir)
-    {}
+public function __construct(private string $sCacheDir)
+{}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return string
      */
-    private function filepath(string $sClass): string
-    {
-        $sFilename = str_replace(['\\', '.'], '_', strtolower($sClass));
-        return "{$this->sCacheDir}/jaxon_metadata_{$sFilename}.php";
-    }
+private function filepath(string $sClass): string
+{
+$sFilename = str_replace(['\\', '.'], '_', strtolower($sClass));
+return "{$this->sCacheDir}/jaxon_metadata_{$sFilename}.php";
+}
 
-    /**
+/**
      * Generate the PHP code to create a metadata object.
      *
      * @return array
      */
-    private function encode(Metadata $xMetadata): array
+private function encode(Metadata $xMetadata): array
+{
+$sMetadataVar = '$xMetadata';
+$sDataVar = '$xData';
+$aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
+foreach($xMetadata->getAttributes() as $sType => $aValues)
+{
+foreach($aValues as $sMethod => $xData)
+{
+    $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
+    foreach($xData->encode($sDataVar) as $sCall)
     {
-        $sMetadataVar = '$xMetadata';
-        $sDataVar = '$xData';
-        $aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
-        foreach($xMetadata->getAttributes() as $sType => $aValues)
-        {
-            foreach($aValues as $sMethod => $xData)
-            {
-                $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
-                foreach($xData->encode($sDataVar) as $sCall)
-                {
-                    $aCalls[] = $sCall;
-                }
-            }
-        }
-        $aCalls[] = "return $sMetadataVar;";
-        return $aCalls;
+        $aCalls[] = $sCall;
     }
+}
+}
+$aCalls[] = "return $sMetadataVar;";
+return $aCalls;
+}
 
-    /**
+/**
      * @param string $sClass
      * @param Metadata $xMetadata
      *
      * @return void
      */
-    public function save(string $sClass, Metadata $xMetadata): void
-    {
-        $sDataCode = implode("\n    ", $this->encode($xMetadata));
-        $sPhpCode = <<<CODE
+public function save(string $sClass, Metadata $xMetadata): void
+{
+$sDataCode = implode("\n    ", $this->encode($xMetadata));
+$sPhpCode = <<<CODE
 <?php
 
 return function() {
@@ -83,18 +83,18 @@ 
 };
 
 CODE;
-        file_put_contents($this->filepath($sClass), $sPhpCode);
-    }
+file_put_contents($this->filepath($sClass), $sPhpCode);
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return Metadata|null
      */
-    public function read(string $sClass): ?Metadata
-    {
-        $sPath = $this->filepath($sClass);
-        $fCreator = file_exists($sPath) ? require $sPath : null;
-        return $fCreator instanceof Closure ? $fCreator() : null;
-    }
+public function read(string $sClass): ?Metadata
+{
+$sPath = $this->filepath($sClass);
+$fCreator = file_exists($sPath) ? require $sPath : null;
+return $fCreator instanceof Closure ? $fCreator() : null;
+}
 }

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/DatabagData.php

Switch Indentation +33 added lines, -33 removed lines

@@ -21,61 +21,61 @@
 
 class DatabagData extends AbstractData
 {
-    /**
+/**
      * The databag names
      *
      * @var string
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'bags';
-    }
+public function getName(): string
+{
+return 'bags';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aNames;
-    }
+public function getValue(): mixed
+{
+return $this->aNames;
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    protected function validateName(string $sName): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sName is not a valid \"name\" value for databag");
-    }
+protected function validateName(string $sName): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+{
+return;
+}
+throw new SetupException("$sName is not a valid \"name\" value for databag");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateName($sName);
+public function addValue(string $sName): void
+{
+$this->validateName($sName);
 
-        $this->aNames[] = $sName;
-    }
+$this->aNames[] = $sName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return array_map(fn($sName) =>
-            "{$sVarName}->addValue('$sName');", $this->aNames);
-    }
+public function encode(string $sVarName): array
+{
+return array_map(fn($sName) =>
+"{$sVarName}->addValue('$sName');", $this->aNames);
+}
 }