jaxon-php / jaxon-mono

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

Switch Indentation +33 added lines, -33 removed lines

@@ -19,61 +19,61 @@
 
 class ConfigEventManager
 {
-    /**
+/**
      * @var string[]
      */
-    protected $aLibConfigListeners = [];
+protected $aLibConfigListeners = [];
 
-    /**
+/**
      * @var string[]
      */
-    protected $aAppConfigListeners = [];
+protected $aAppConfigListeners = [];
 
-    /**
+/**
      * @param Container $di
      */
-    public function __construct(private Container $di)
-    {}
+public function __construct(private Container $di)
+{}
 
-    /**
+/**
      * @param string $sClassName
      *
      * @return void
      */
-    public function addLibConfigListener(string $sClassName): void
-    {
-        $this->aLibConfigListeners[] = $sClassName;
-    }
+public function addLibConfigListener(string $sClassName): void
+{
+$this->aLibConfigListeners[] = $sClassName;
+}
 
-    /**
+/**
      * @param string $sClassName
      *
      * @return void
      */
-    public function addAppConfigListener(string $sClassName): void
-    {
-        $this->aAppConfigListeners[] = $sClassName;
-    }
+public function addAppConfigListener(string $sClassName): void
+{
+$this->aAppConfigListeners[] = $sClassName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function libConfigChanged(Config $xConfig, string $sName): void
-    {
-        foreach($this->aLibConfigListeners as $sListener)
-        {
-            $this->di->g($sListener)->onChange($xConfig, $sName);
-        }
-    }
+public function libConfigChanged(Config $xConfig, string $sName): void
+{
+foreach($this->aLibConfigListeners as $sListener)
+{
+$this->di->g($sListener)->onChange($xConfig, $sName);
+}
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function appConfigChanged(Config $xConfig, string $sName): void
-    {
-        foreach($this->aAppConfigListeners as $sListener)
-        {
-            $this->di->g($sListener)->onChange($xConfig, $sName);
-        }
-    }
+public function appConfigChanged(Config $xConfig, string $sName): void
+{
+foreach($this->aAppConfigListeners as $sListener)
+{
+$this->di->g($sListener)->onChange($xConfig, $sName);
+}
+}
 }

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

Switch Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
 interface ConfigListenerInterface
 {
-    /**
+/**
      * Config option changed, in case of multiple changes, the name is an empty string
      *
      * @param Config $xConfig
@@ -26,5 +26,5 @@ 
      *
      * @return void
      */
-    public function onChange(Config $xConfig, string $sName): void;
+public function onChange(Config $xConfig, string $sName): void;
 }

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

Switch Indentation +180 added lines, -180 removed lines

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

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

Switch Indentation +32 added lines, -32 removed lines

@@ -16,12 +16,12 @@ 
 
 trait ConfigTrait
 {
-    /**
+/**
      * @return ConfigManager
      */
-    abstract protected function config(): ConfigManager;
+abstract protected function config(): ConfigManager;
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sName The option name
@@ -29,24 +29,24 @@ 
      *
      * @return mixed
      */
-    public function getLibOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->config()->getOption($sName, $xDefault);
-    }
+public function getLibOption(string $sName, $xDefault = null): mixed
+{
+return $this->config()->getOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of a config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasLibOption(string $sName): bool
-    {
-        return $this->config()->hasOption($sName);
-    }
+public function hasLibOption(string $sName): bool
+{
+return $this->config()->hasOption($sName);
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -54,12 +54,12 @@ 
      *
      * @return void
      */
-    public function setLibOption(string $sName, $xValue): void
-    {
-        $this->config()->setOption($sName, $xValue);
-    }
+public function setLibOption(string $sName, $xValue): void
+{
+$this->config()->setOption($sName, $xValue);
+}
 
-    /**
+/**
      * Get the value of an application config option
      *
      * @param string $sName The option name
@@ -67,24 +67,24 @@ 
      *
      * @return mixed
      */
-    public function getAppOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->config()->getAppOption($sName, $xDefault);
-    }
+public function getAppOption(string $sName, $xDefault = null): mixed
+{
+return $this->config()->getAppOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of an application config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasAppOption(string $sName): bool
-    {
-        return $this->config()->hasAppOption($sName);
-    }
+public function hasAppOption(string $sName): bool
+{
+return $this->config()->hasAppOption($sName);
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -92,8 +92,8 @@ 
      *
      * @return void
      */
-    public function setAppOption(string $sName, $xValue): void
-    {
-        $this->config()->setAppOption($sName, $xValue);
-    }
+public function setAppOption(string $sName, $xValue): void
+{
+$this->config()->setAppOption($sName, $xValue);
+}
 }

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

Switch Indentation +116 added lines, -116 removed lines

@@ -21,186 +21,186 @@
 
 class Metadata
 {
-    /**
+/**
      * @var array<string, array<string, Data\AbstractData>>
      */
-    private array $aAttributes = [
-        'exclude' => [],
-        'export' => [],
-        'container' => [],
-        'databag' => [],
-        'callback' => [],
-        'before' => [],
-        'after' => [],
-        'upload' => [],
-    ];
-
-    /**
+private array $aAttributes = [
+'exclude' => [],
+'export' => [],
+'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\ExportData
      */
-    public function export(string $sMethod = '*'): Data\ExportData
-    {
-        $sMethod = '*'; // On classes only
-        return $this->aAttributes['export'][$sMethod] ??
-            $this->aAttributes['export'][$sMethod] = new Data\ExportData();
-    }
+public function export(string $sMethod = '*'): Data\ExportData
+{
+$sMethod = '*'; // On classes only
+return $this->aAttributes['export'][$sMethod] ??
+$this->aAttributes['export'][$sMethod] = new Data\ExportData();
+}
 
-    /**
+/**
      * @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 methods in the export attributes
      *
      * @return array
      */
-    public function getExportMethods(): array
-    {
-        /** @var Data\ExportData */
-        $xExportData = $this->aAttributes['export']['*'] ?? null;
-        return $xExportData?->getMethods() ?? [];
-    }
+public function getExportMethods(): array
+{
+/** @var Data\ExportData */
+$xExportData = $this->aAttributes['export']['*'] ?? null;
+return $xExportData?->getMethods() ?? [];
+}
 
-    /**
+/**
      * 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-core/src/App/Metadata/Data/HookData.php

Switch Indentation +35 added lines, -35 removed lines

@@ -21,59 +21,59 @@
 
 abstract class HookData extends AbstractData
 {
-    /**
+/**
      * @var array
      */
-    protected $aCalls = [];
+protected $aCalls = [];
 
-    /**
+/**
      * @return string
      */
-    abstract protected function getType(): string;
+abstract protected function getType(): string;
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return '__' . $this->getType();
-    }
+public function getName(): string
+{
+return '__' . $this->getType();
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aCalls;
-    }
+public function getValue(): mixed
+{
+return $this->aCalls;
+}
 
-    /**
+/**
      * @param string $sMethod
      * @param array $aParams
      *
      * @return void
      */
-    public function addCall(string $sMethod, array $aParams): void
-    {
-        if(!$this->validateMethod($sMethod))
-        {
-            $sType = $this->getType();
-            throw new SetupException("'$sMethod' is not a valid \"call\" value for $sType.");
-        }
-        $this->aCalls[$sMethod] = $aParams;
-    }
+public function addCall(string $sMethod, array $aParams): void
+{
+if(!$this->validateMethod($sMethod))
+{
+$sType = $this->getType();
+throw new SetupException("'$sMethod' is not a valid \"call\" value for $sType.");
+}
+$this->aCalls[$sMethod] = $aParams;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $aCalls = [];
-        foreach($this->aCalls as $sMethod => $aParams)
-        {
-            $sParams = addslashes(json_encode($aParams));
-            $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";
-        }
-        return $aCalls;
-    }
+public function encode(string $sVarName): array
+{
+$aCalls = [];
+foreach($this->aCalls as $sMethod => $aParams)
+{
+$sParams = addslashes(json_encode($aParams));
+$aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";
+}
+return $aCalls;
+}
 }

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

Switch Indentation +7 added lines, -7 removed lines

@@ -18,22 +18,22 @@
 
 abstract class AbstractData
 {
-    /**
+/**
      * Generate the PHP code to populate a Metadata object
      *
      * @param string $sVarName
      *
      * @return array
      */
-    abstract public function encode(string $sVarName): array;
+abstract public function encode(string $sVarName): array;
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return bool
      */
-    protected function validateMethod(string $sMethod): bool
-    {
-        return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0;
-    }
+protected function validateMethod(string $sMethod): bool
+{
+return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0;
+}
 }

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

Switch Indentation +31 added lines, -31 removed lines

@@ -22,53 +22,53 @@
 
 class ExportData extends AbstractData
 {
-    /**
+/**
      * @var array
      */
-    private array $aMethods = [];
+private array $aMethods = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'export';
-    }
+public function getName(): string
+{
+return 'export';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getMethods(): mixed
-    {
-        return $this->aMethods;
-    }
+public function getMethods(): mixed
+{
+return $this->aMethods;
+}
 
-    /**
+/**
      * @param array $aMethods
      *
      * @return void
      */
-    public function setMethods(array $aMethods): void
+public function setMethods(array $aMethods): void
+{
+foreach(['base', 'only', 'except'] as $sKey)
+{
+foreach($aMethods[$sKey] as $sMethod)
+{
+    if(!is_string($sMethod) || !$this->validateMethod($sMethod))
     {
-        foreach(['base', 'only', 'except'] as $sKey)
-        {
-            foreach($aMethods[$sKey] as $sMethod)
-            {
-                if(!is_string($sMethod) || !$this->validateMethod($sMethod))
-                {
-                    throw new SetupException("'$sMethod' is not a valid method name.");
-                }
-            }
-        }
-        $this->aMethods = $aMethods;
+        throw new SetupException("'$sMethod' is not a valid method name.");
     }
+}
+}
+$this->aMethods = $aMethods;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $sMethods = addslashes(json_encode($this->aMethods));
-        return ["{$sVarName}->setMethods(json_decode(\"$sMethods\", true));"];
-    }
+public function encode(string $sVarName): array
+{
+$sMethods = addslashes(json_encode($this->aMethods));
+return ["{$sVarName}->setMethods(json_decode(\"$sMethods\", true));"];
+}
 }

jaxon-core/src/App/FuncComponent.php

Switch Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@ 
 
 class FuncComponent extends Component\AbstractComponent
 {
-    use Component\HelperTrait;
-    use Component\AjaxResponseTrait;
-    use Component\ComponentTrait;
+use Component\HelperTrait;
+use Component\AjaxResponseTrait;
+use Component\ComponentTrait;
 
-    /**
+/**
      * @inheritDoc
      */
-    final protected function initComponent(Container $di, ComponentHelper $xHelper): void
-    {
-        $this->setHelper($xHelper);
-        $this->setAjaxResponse($di);
-    }
+final protected function initComponent(Container $di, ComponentHelper $xHelper): void
+{
+$this->setHelper($xHelper);
+$this->setAjaxResponse($di);
+}
 
-    /**
+/**
      * Create a paginator.
      *
      * @param int $nPageNumber     The current page number
@@ -30,8 +30,8 @@ 
      *
      * @return Paginator
      */
-    final public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
-    {
-        return $this->response->paginator($nPageNumber, $nItemsPerPage, $nTotalItems);
-    }
+final public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
+{
+return $this->response->paginator($nPageNumber, $nItemsPerPage, $nTotalItems);
+}
 }