jaxon-php / jaxon-mono

jaxon-core/src/Plugin/Request/CallableFunction/CallableFunction.php

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
      */
     public function configure(string $sName, string $sValue): void
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'class': // The user function is a method in the given class
             $this->xPhpFunction = [$sValue, $this->xPhpFunction];
@@ -128,12 +128,12 @@ 
      */
     public function call(array $aArgs = []): void
     {
-        if($this->sInclude !== '')
+        if ($this->sInclude !== '')
         {
             require_once $this->sInclude;
         }
         // If the function is an alias for a class method, then instantiate the class
-        if(is_array($this->xPhpFunction) && is_string($this->xPhpFunction[0]))
+        if (is_array($this->xPhpFunction) && is_string($this->xPhpFunction[0]))
         {
             $sClassName = $this->xPhpFunction[0];
             $this->xPhpFunction[0] = $this->di->h($sClassName) ?

Switch Indentation +42 added lines, -42 removed lines

@@ -28,29 +28,29 @@ 
 
 class CallableFunction
 {
-    /**
+/**
      * A string or an array which defines the registered PHP function
      *
      * @var string|array
      */
-    private $xPhpFunction;
+private $xPhpFunction;
 
-    /**
+/**
      * The path and file name of the include file where the function is defined
      *
      * @var string
      */
-    private $sInclude = '';
+private $sInclude = '';
 
-    /**
+/**
      * An associative array containing call options that will be sent
      * to the browser with the client script.
      *
      * @var array
      */
-    private $aOptions = [];
+private $aOptions = [];
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -58,43 +58,43 @@ 
      * @param string $sJsFunction
      * @param string $sPhpFunction
      */
-    public function __construct(private Container $di, private string $sFunction,
-        private string $sJsFunction, string $sPhpFunction)
-    {
-        $this->xPhpFunction = $sPhpFunction;
-    }
+public function __construct(private Container $di, private string $sFunction,
+private string $sJsFunction, string $sPhpFunction)
+{
+$this->xPhpFunction = $sPhpFunction;
+}
 
-    /**
+/**
      * Get the name of the function being referenced
      *
      * @return string
      */
-    public function getName(): string
-    {
-        return $this->sFunction;
-    }
+public function getName(): string
+{
+return $this->sFunction;
+}
 
-    /**
+/**
      * Get name of the corresponding javascript function
      *
      * @return string
      */
-    public function getJsName(): string
-    {
-        return $this->sJsFunction;
-    }
+public function getJsName(): string
+{
+return $this->sJsFunction;
+}
 
-    /**
+/**
      * Get the config options of the function being referenced
      *
      * @return array
      */
-    public function getOptions(): array
-    {
-        return $this->aOptions;
-    }
+public function getOptions(): array
+{
+return $this->aOptions;
+}
 
-    /**
+/**
      * Set call options for this instance
      *
      * @param string $sName    The name of the configuration option
@@ -102,20 +102,20 @@ 
      *
      * @return void
      */
-    public function configure(string $sName, string $sValue): void
-    {
-        switch($sName)
-        {
-        case 'class': // The user function is a method in the given class
-            $this->xPhpFunction = [$sValue, $this->xPhpFunction];
-            break;
-        case 'include':
-            $this->sInclude = $sValue;
-            break;
-        default:
-            $this->aOptions[$sName] = $sValue;
-            break;
-        }
+public function configure(string $sName, string $sValue): void
+{
+switch($sName)
+{
+case 'class': // The user function is a method in the given class
+$this->xPhpFunction = [$sValue, $this->xPhpFunction];
+break;
+case 'include':
+$this->sInclude = $sValue;
+break;
+default:
+$this->aOptions[$sName] = $sValue;
+break;
+}
     }
 
     /**

jaxon-core/src/Plugin/Request/CallableFunction/CallableFunctionPlugin.php

Spacing +11 added lines, -12 removed lines

@@ -85,15 +85,15 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(!$this->xValidator->validateFunction(trim($sCallable)))
+        if (!$this->xValidator->validateFunction(trim($sCallable)))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($xOptions))
+        if (is_string($xOptions))
         {
             $xOptions = ['include' => $xOptions];
         }
-        elseif(!is_array($xOptions))
+        elseif (!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -114,7 +114,7 @@ 
         $sPhpFunction = trim($sCallable);
         $sFunction = $sPhpFunction;
         // Check if an alias is defined
-        if(isset($aOptions['alias']))
+        if (isset($aOptions['alias']))
         {
             $sFunction = (string)$aOptions['alias'];
             unset($aOptions['alias']);
@@ -138,13 +138,13 @@ 
     public function getCallable(string $sCallable): CallableFunction|null
     {
         $sFunction = trim($sCallable);
-        if(!isset($this->aFunctions[$sFunction]))
+        if (!isset($this->aFunctions[$sFunction]))
         {
             return null;
         }
         $xCallable = new CallableFunction($this->di, $sFunction,
             $this->sPrefix . $sFunction, $this->aFunctions[$sFunction]);
-        foreach($this->aOptions[$sFunction] as $sName => $sValue)
+        foreach ($this->aOptions[$sFunction] as $sName => $sValue)
         {
             $xCallable->configure($sName, $sValue);
         }
@@ -173,7 +173,7 @@ 
     public function getScript(): string
     {
         $code = '';
-        foreach(array_keys($this->aFunctions) as $sFunction)
+        foreach (array_keys($this->aFunctions) as $sFunction)
         {
             $xFunction = $this->getCallable($sFunction);
             $code .= $this->getCallableScript($xFunction);
@@ -211,8 +211,7 @@ 
     private function throwException(Exception $xException, string $sErrorMessage): void
     {
         $this->di->getLogger()->error($xException->getMessage());
-        throw new RequestException($sErrorMessage . (!$this->bDebug ? '' :
-            "\n" . $xException->getMessage()));
+        throw new RequestException($sErrorMessage . (!$this->bDebug ? '' : "\n" . $xException->getMessage()));
     }
 
     /**
@@ -224,7 +223,7 @@ 
         $sRequestedFunction = $this->xTarget->getFunctionName();
 
         // Security check: make sure the requested function was registered.
-        if(!$this->xValidator->validateFunction($sRequestedFunction) ||
+        if (!$this->xValidator->validateFunction($sRequestedFunction) ||
             !isset($this->aFunctions[$sRequestedFunction]))
         {
             // Unable to find the requested function
@@ -237,7 +236,7 @@ 
             /** @var CallableFunction */
             $xFunction = $this->getCallable($sRequestedFunction);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             // Unable to find the requested function
             $this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
@@ -247,7 +246,7 @@ 
         {
             $xFunction->call($this->xTarget->args());
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             // Unable to execute the requested function
             $this->throwException($e, $this->xTranslator->trans('errors.functions.call',

Braces +3 added lines, -6 removed lines

@@ -92,8 +92,7 @@ 
         if(is_string($xOptions))
         {
             $xOptions = ['include' => $xOptions];
-        }
-        elseif(!is_array($xOptions))
+        } elseif(!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -236,8 +235,7 @@ 
         {
             /** @var CallableFunction */
             $xFunction = $this->getCallable($sRequestedFunction);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             // Unable to find the requested function
             $this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
@@ -246,8 +244,7 @@ 
         try
         {
             $xFunction->call($this->xTarget->args());
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             // Unable to execute the requested function
             $this->throwException($e, $this->xTranslator->trans('errors.functions.call',

Switch Indentation +142 added lines, -142 removed lines

@@ -42,21 +42,21 @@ 
 
 class CallableFunctionPlugin extends AbstractRequestPlugin
 {
-    /**
+/**
      * The registered functions names
      *
      * @var array
      */
-    protected $aFunctions = [];
+protected $aFunctions = [];
 
-    /**
+/**
      * The registered functions options
      *
      * @var array
      */
-    protected $aOptions = [];
+protected $aOptions = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sPrefix
@@ -66,41 +66,41 @@ 
      * @param Translator $xTranslator
      * @param Validator $xValidator
      */
-    public function __construct(private string $sPrefix, private bool $bDebug,
-        private Container $di, private TemplateEngine $xTemplateEngine,
-        private Translator $xTranslator, private Validator $xValidator)
-    {}
+public function __construct(private string $sPrefix, private bool $bDebug,
+private Container $di, private TemplateEngine $xTemplateEngine,
+private Translator $xTranslator, private Validator $xValidator)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return Jaxon::CALLABLE_FUNCTION;
-    }
+public function getName(): string
+{
+return Jaxon::CALLABLE_FUNCTION;
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function checkOptions(string $sCallable, $xOptions): array
-    {
-        if(!$this->xValidator->validateFunction(trim($sCallable)))
-        {
-            throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
-        }
-        if(is_string($xOptions))
-        {
-            $xOptions = ['include' => $xOptions];
-        }
-        elseif(!is_array($xOptions))
-        {
-            throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
-        }
-        return $xOptions;
-    }
+public function checkOptions(string $sCallable, $xOptions): array
+{
+if(!$this->xValidator->validateFunction(trim($sCallable)))
+{
+throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
+}
+if(is_string($xOptions))
+{
+$xOptions = ['include' => $xOptions];
+}
+elseif(!is_array($xOptions))
+{
+throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
+}
+return $xOptions;
+}
 
-    /**
+/**
      * Register a user defined function
      *
      * @param string $sType    The type of request handler being registered
@@ -109,149 +109,149 @@ 
      *
      * @return bool
      */
-    public function register(string $sType, string $sCallable, array $aOptions): bool
-    {
-        $sPhpFunction = trim($sCallable);
-        $sFunction = $sPhpFunction;
-        // Check if an alias is defined
-        if(isset($aOptions['alias']))
-        {
-            $sFunction = (string)$aOptions['alias'];
-            unset($aOptions['alias']);
-        }
-        $this->aFunctions[$sFunction] = $sPhpFunction;
-        $this->aOptions[$sFunction] = $aOptions;
-        return true;
-    }
+public function register(string $sType, string $sCallable, array $aOptions): bool
+{
+$sPhpFunction = trim($sCallable);
+$sFunction = $sPhpFunction;
+// Check if an alias is defined
+if(isset($aOptions['alias']))
+{
+$sFunction = (string)$aOptions['alias'];
+unset($aOptions['alias']);
+}
+$this->aFunctions[$sFunction] = $sPhpFunction;
+$this->aOptions[$sFunction] = $aOptions;
+return true;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        return md5(implode('', array_keys($this->aFunctions)));
-    }
+public function getHash(): string
+{
+return md5(implode('', array_keys($this->aFunctions)));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getCallable(string $sCallable): CallableFunction|null
-    {
-        $sFunction = trim($sCallable);
-        if(!isset($this->aFunctions[$sFunction]))
-        {
-            return null;
-        }
-        $xCallable = new CallableFunction($this->di, $sFunction,
-            $this->sPrefix . $sFunction, $this->aFunctions[$sFunction]);
-        foreach($this->aOptions[$sFunction] as $sName => $sValue)
-        {
-            $xCallable->configure($sName, $sValue);
-        }
-        return $xCallable;
-    }
+public function getCallable(string $sCallable): CallableFunction|null
+{
+$sFunction = trim($sCallable);
+if(!isset($this->aFunctions[$sFunction]))
+{
+return null;
+}
+$xCallable = new CallableFunction($this->di, $sFunction,
+$this->sPrefix . $sFunction, $this->aFunctions[$sFunction]);
+foreach($this->aOptions[$sFunction] as $sName => $sValue)
+{
+$xCallable->configure($sName, $sValue);
+}
+return $xCallable;
+}
 
-    /**
+/**
      * Generate the javascript function stub that is sent to the browser on initial page load
      *
      * @param CallableFunction $xFunction
      *
      * @return string
      */
-    private function getCallableScript(CallableFunction $xFunction): string
-    {
-        return $this->xTemplateEngine->render('jaxon::callables/function.js', [
-            'sName' => $xFunction->getName(),
-            'sJsName' => $xFunction->getJsName(),
-            'aOptions' => $xFunction->getOptions(),
-        ]);
-    }
+private function getCallableScript(CallableFunction $xFunction): string
+{
+return $this->xTemplateEngine->render('jaxon::callables/function.js', [
+'sName' => $xFunction->getName(),
+'sJsName' => $xFunction->getJsName(),
+'aOptions' => $xFunction->getOptions(),
+]);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getScript(): string
-    {
-        $code = '';
-        foreach(array_keys($this->aFunctions) as $sFunction)
-        {
-            $xFunction = $this->getCallable($sFunction);
-            $code .= $this->getCallableScript($xFunction);
-        }
-        return $code;
-    }
+public function getScript(): string
+{
+$code = '';
+foreach(array_keys($this->aFunctions) as $sFunction)
+{
+$xFunction = $this->getCallable($sFunction);
+$code .= $this->getCallableScript($xFunction);
+}
+return $code;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function canProcessRequest(ServerRequestInterface $xRequest): bool
-    {
-        $aCall = $xRequest->getAttribute('jxncall');
-        // throw new \Exception(json_encode(['call' => $aCall]));
-        return $aCall !== null && ($aCall['type'] ?? '') === 'func' && isset($aCall['name']);
-    }
+public static function canProcessRequest(ServerRequestInterface $xRequest): bool
+{
+$aCall = $xRequest->getAttribute('jxncall');
+// throw new \Exception(json_encode(['call' => $aCall]));
+return $aCall !== null && ($aCall['type'] ?? '') === 'func' && isset($aCall['name']);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function setTarget(ServerRequestInterface $xRequest): Target
-    {
-        $aCall = $xRequest->getAttribute('jxncall');
-        $this->xTarget = Target::makeFunction(trim($aCall['name']));
-        return $this->xTarget;
-    }
+public function setTarget(ServerRequestInterface $xRequest): Target
+{
+$aCall = $xRequest->getAttribute('jxncall');
+$this->xTarget = Target::makeFunction(trim($aCall['name']));
+return $this->xTarget;
+}
 
-    /**
+/**
      * @param Exception $xException
      * @param string $sErrorMessage
      *
      * @throws RequestException
      * @return void
      */
-    private function throwException(Exception $xException, string $sErrorMessage): void
-    {
-        $this->di->getLogger()->error($xException->getMessage());
-        throw new RequestException($sErrorMessage . (!$this->bDebug ? '' :
-            "\n" . $xException->getMessage()));
-    }
+private function throwException(Exception $xException, string $sErrorMessage): void
+{
+$this->di->getLogger()->error($xException->getMessage());
+throw new RequestException($sErrorMessage . (!$this->bDebug ? '' :
+"\n" . $xException->getMessage()));
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws RequestException
      */
-    public function processRequest(): void
-    {
-        $sRequestedFunction = $this->xTarget->getFunctionName();
+public function processRequest(): void
+{
+$sRequestedFunction = $this->xTarget->getFunctionName();
 
-        // Security check: make sure the requested function was registered.
-        if(!$this->xValidator->validateFunction($sRequestedFunction) ||
-            !isset($this->aFunctions[$sRequestedFunction]))
-        {
-            // Unable to find the requested function
-            throw new RequestException($this->xTranslator->trans('errors.functions.invalid',
-                ['name' => $sRequestedFunction]));
-        }
+// Security check: make sure the requested function was registered.
+if(!$this->xValidator->validateFunction($sRequestedFunction) ||
+!isset($this->aFunctions[$sRequestedFunction]))
+{
+// Unable to find the requested function
+throw new RequestException($this->xTranslator->trans('errors.functions.invalid',
+    ['name' => $sRequestedFunction]));
+}
 
-        try
-        {
-            /** @var CallableFunction */
-            $xFunction = $this->getCallable($sRequestedFunction);
-        }
-        catch(Exception $e)
-        {
-            // Unable to find the requested function
-            $this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
-                ['name' => $sRequestedFunction]));
-        }
-        try
-        {
-            $xFunction->call($this->xTarget->args());
-        }
-        catch(Exception $e)
-        {
-            // Unable to execute the requested function
-            $this->throwException($e, $this->xTranslator->trans('errors.functions.call',
-                ['name' => $sRequestedFunction]));
-        }
-    }
+try
+{
+/** @var CallableFunction */
+$xFunction = $this->getCallable($sRequestedFunction);
+}
+catch(Exception $e)
+{
+// Unable to find the requested function
+$this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
+    ['name' => $sRequestedFunction]));
+}
+try
+{
+$xFunction->call($this->xTarget->args());
+}
+catch(Exception $e)
+{
+// Unable to execute the requested function
+$this->throwException($e, $this->xTranslator->trans('errors.functions.call',
+    ['name' => $sRequestedFunction]));
+}
+}
 }

jaxon-core/src/App/I18n/Translator.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     public function onChange(Config $xConfig, string $sName): void
     {
         // Set the library language any time the config is changed.
-        if($sName === '' || $sName === 'core.language')
+        if ($sName === '' || $sName === 'core.language')
         {
             $this->setLocale($xConfig->getOption('core.language'));
         }

Switch Indentation +9 added lines, -9 removed lines

@@ -20,15 +20,15 @@
 
 class Translator extends BaseTranslator implements ConfigListenerInterface
 {
-    /**
+/**
      * @inheritDoc
      */
-    public function onChange(Config $xConfig, string $sName): void
-    {
-        // Set the library language any time the config is changed.
-        if($sName === '' || $sName === 'core.language')
-        {
-            $this->setLocale($xConfig->getOption('core.language'));
-        }
-    }
+public function onChange(Config $xConfig, string $sName): void
+{
+// Set the library language any time the config is changed.
+if($sName === '' || $sName === 'core.language')
+{
+$this->setLocale($xConfig->getOption('core.language'));
+}
+}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public function get(string $key, mixed $default = null): mixed
     {
         $value = $this->values[$key] ?? $default;
-        if(is_callable($value))
+        if (is_callable($value))
         {
             $value = $value();
             // Save the value returned by the callback in the stash.

Switch Indentation +19 added lines, -19 removed lines

@@ -6,38 +6,38 @@
 
 class Stash
 {
-    /**
+/**
      * @var array
      */
-    private array $values = [];
+private array $values = [];
 
-    /**
+/**
      * @param string $key
      * @param mixed $value
      *
      * @return void
      */
-    public function set(string $key, mixed $value): void
-    {
-        $this->values[$key] = $value;
-    }
+public function set(string $key, mixed $value): void
+{
+$this->values[$key] = $value;
+}
 
-    /**
+/**
      * @param string $key
      * @param mixed $default
      *
      * @return mixed
      */
-    public function get(string $key, mixed $default = null): mixed
-    {
-        $value = $this->values[$key] ?? $default;
-        if(is_callable($value))
-        {
-            $value = $value();
-            // Save the value returned by the callback in the stash.
-            $this->values[$key] = $value;
-        }
+public function get(string $key, mixed $default = null): mixed
+{
+$value = $this->values[$key] ?? $default;
+if(is_callable($value))
+{
+$value = $value();
+// Save the value returned by the callback in the stash.
+$this->values[$key] = $value;
+}
 
-        return $value;
-    }
+return $value;
+}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -91,11 +91,11 @@ 
             'export' => $bExport,
             'minify' => $bMinify,
         ];
-        if($sUri !== '')
+        if ($sUri !== '')
         {
             $aJsOptions['uri'] = $sUri;
         }
-        if($sDir !== '')
+        if ($sDir !== '')
         {
             $aJsOptions['dir'] = $sDir;
         }
@@ -151,7 +151,7 @@ 
     {
         // Popping the callbacks makes each of them to be called once.
         $aBootCallbacks = $this->xCallbackManager->popBootCallbacks();
-        foreach($aBootCallbacks as $aBootCallback)
+        foreach ($aBootCallbacks as $aBootCallback)
         {
             call_user_func($aBootCallback);
         }

Switch Indentation +75 added lines, -75 removed lines

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

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

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function setup(string $sConfigFile = ''): void
     {
-        if(!file_exists($sConfigFile))
+        if (!file_exists($sConfigFile))
         {
             throw new SetupException($this->translator()
                 ->trans('errors.file.access', ['path' => $sConfigFile]));
@@ -39,14 +39,14 @@ 
         $aOptions = $this->config()->read($sConfigFile);
         $aLibOptions = $aOptions['lib'] ?? [];
         $aAppOptions = $aOptions['app'] ?? [];
-        if(!is_array($aLibOptions) || !is_array($aAppOptions))
+        if (!is_array($aLibOptions) || !is_array($aAppOptions))
         {
             throw new SetupException($sMessage = $this->translator()
                 ->trans('errors.file.content', ['path' => $sConfigFile]));
         }
 
         // The bootstrap set this to false. It needs to be changed.
-        if(!isset($aLibOptions['core']['response']['send']))
+        if (!isset($aLibOptions['core']['response']['send']))
         {
             $aLibOptions['core']['response']['send'] = true;
         }

Switch Indentation +31 added lines, -31 removed lines

@@ -21,39 +21,39 @@
 
 class App extends AbstractApp
 {
-    use Traits\SendResponseTrait;
+use Traits\SendResponseTrait;
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function setup(string $sConfigFile = ''): void
-    {
-        if(!file_exists($sConfigFile))
-        {
-            throw new SetupException($this->translator()
-                ->trans('errors.file.access', ['path' => $sConfigFile]));
-        }
-
-        // Read the config options.
-        $aOptions = $this->config()->read($sConfigFile);
-        $aLibOptions = $aOptions['lib'] ?? [];
-        $aAppOptions = $aOptions['app'] ?? [];
-        if(!is_array($aLibOptions) || !is_array($aAppOptions))
-        {
-            throw new SetupException($sMessage = $this->translator()
-                ->trans('errors.file.content', ['path' => $sConfigFile]));
-        }
-
-        // The bootstrap set this to false. It needs to be changed.
-        if(!isset($aLibOptions['core']['response']['send']))
-        {
-            $aLibOptions['core']['response']['send'] = true;
-        }
-
-        $this->bootstrap()
-            ->lib($aLibOptions)
-            ->app($aAppOptions)
-            ->setup();
-    }
+public function setup(string $sConfigFile = ''): void
+{
+if(!file_exists($sConfigFile))
+{
+throw new SetupException($this->translator()
+    ->trans('errors.file.access', ['path' => $sConfigFile]));
+}
+
+// Read the config options.
+$aOptions = $this->config()->read($sConfigFile);
+$aLibOptions = $aOptions['lib'] ?? [];
+$aAppOptions = $aOptions['app'] ?? [];
+if(!is_array($aLibOptions) || !is_array($aAppOptions))
+{
+throw new SetupException($sMessage = $this->translator()
+    ->trans('errors.file.content', ['path' => $sConfigFile]));
+}
+
+// The bootstrap set this to false. It needs to be changed.
+if(!isset($aLibOptions['core']['response']['send']))
+{
+$aLibOptions['core']['response']['send'] = true;
+}
+
+$this->bootstrap()
+->lib($aLibOptions)
+->app($aAppOptions)
+->setup();
+}
 }

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

Spacing +5 added lines, -5 removed lines

@@ -59,20 +59,20 @@ 
      */
     public function httpResponse(string $sCode = '200'): mixed
     {
-        if(!$this->config()->getOption('core.response.send', false))
+        if (!$this->config()->getOption('core.response.send', false))
         {
             return null;
         }
 
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($sFilename, $nLineNumber))
+        if (headers_sent($sFilename, $nLineNumber))
         {
             throw new RequestException($this->translator()
                 ->trans('errors.output.already-sent', [
                     'location' => "$sFilename:$nLineNumber",
                 ]) . "\n" . $this->translator()->trans('errors.output.advice'));
         }
-        if(empty($sContent = $this->getResponseManager()->getOutput()))
+        if (empty($sContent = $this->getResponseManager()->getOutput()))
         {
             return null;
         }
@@ -80,7 +80,7 @@ 
         // Set the HTTP response code
         http_response_code(intval($sCode));
 
-        if($this->di()->getRequest()->getMethod() === 'GET')
+        if ($this->di()->getRequest()->getMethod() === 'GET')
         {
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -90,7 +90,7 @@ 
         header('Content-Type: ' . $this->getResponseManager()->getContentType());
 
         print $sContent;
-        if($this->config()->getOption('core.process.exit', false))
+        if ($this->config()->getOption('core.process.exit', false))
         {
             exit();
         }

Switch Indentation +44 added lines, -44 removed lines

@@ -31,69 +31,69 @@
 
 trait SendResponseTrait
 {
-    /**
+/**
      * @return Container
      */
-    abstract public function di(): Container;
+abstract public function di(): Container;
 
-    /**
+/**
      * @return ConfigManager
      */
-    abstract public function config(): ConfigManager;
+abstract public function config(): ConfigManager;
 
-    /**
+/**
      * @return Translator
      */
-    abstract public function translator(): Translator;
+abstract public function translator(): Translator;
 
-    /**
+/**
      * @return ResponseManager
      */
-    abstract public function getResponseManager(): ResponseManager;
+abstract public function getResponseManager(): ResponseManager;
 
-    /**
+/**
      * Prints the response to the output stream, thus sending the response to the browser
      *
      * @return mixed
      * @throws RequestException
      */
-    public function httpResponse(string $sCode = '200'): mixed
-    {
-        if(!$this->config()->getOption('core.response.send', false))
-        {
-            return null;
-        }
+public function httpResponse(string $sCode = '200'): mixed
+{
+if(!$this->config()->getOption('core.response.send', false))
+{
+return null;
+}
 
-        // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($sFilename, $nLineNumber))
-        {
-            throw new RequestException($this->translator()
-                ->trans('errors.output.already-sent', [
-                    'location' => "$sFilename:$nLineNumber",
-                ]) . "\n" . $this->translator()->trans('errors.output.advice'));
-        }
-        if(empty($sContent = $this->getResponseManager()->getOutput()))
-        {
-            return null;
-        }
+// Check to see if headers have already been sent out, in which case we can't do our job
+if(headers_sent($sFilename, $nLineNumber))
+{
+throw new RequestException($this->translator()
+    ->trans('errors.output.already-sent', [
+        'location' => "$sFilename:$nLineNumber",
+    ]) . "\n" . $this->translator()->trans('errors.output.advice'));
+}
+if(empty($sContent = $this->getResponseManager()->getOutput()))
+{
+return null;
+}
 
-        // Set the HTTP response code
-        http_response_code(intval($sCode));
+// Set the HTTP response code
+http_response_code(intval($sCode));
 
-        if($this->di()->getRequest()->getMethod() === 'GET')
-        {
-            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            header("Cache-Control: no-cache, must-revalidate");
-            header("Pragma: no-cache");
-        }
-        header('Content-Type: ' . $this->getResponseManager()->getContentType());
+if($this->di()->getRequest()->getMethod() === 'GET')
+{
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
+}
+header('Content-Type: ' . $this->getResponseManager()->getContentType());
 
-        print $sContent;
-        if($this->config()->getOption('core.process.exit', false))
-        {
-            exit();
-        }
-        return null;
-    }
+print $sContent;
+if($this->config()->getOption('core.process.exit', false))
+{
+exit();
+}
+return null;
+}
 }

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

Spacing +9 added lines, -9 removed lines

@@ -70,22 +70,22 @@ 
         {
             return $this->xConfigReader->read($sConfigFile);
         }
-        catch(YamlExtension $e)
+        catch (YamlExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.yaml.install');
             throw new SetupException($sMessage);
         }
-        catch(FileExtension $e)
+        catch (FileExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
         }
-        catch(FileAccess $e)
+        catch (FileAccess $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
         }
-        catch(FileContent $e)
+        catch (FileContent $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
@@ -111,7 +111,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -140,7 +140,7 @@ 
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
             return $this->xLibConfig->changed();
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -247,7 +247,7 @@ 
             $this->xEventManager->appConfigChanged($this->xAppConfig, '');
             return $this->xAppConfig->changed();
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -297,7 +297,7 @@ 
         {
             return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -336,7 +336,7 @@ 
      */
     public function globals(bool $bForce = false): void
     {
-        if($bForce || $this->getAppOption('helpers.global', true))
+        if ($bForce || $this->getAppOption('helpers.global', true))
         {
             require_once dirname(__DIR__, 2) . '/globals.php';
         }

Braces +8 added lines, -16 removed lines

@@ -69,23 +69,19 @@ 
         try
         {
             return $this->xConfigReader->read($sConfigFile);
-        }
-        catch(YamlExtension $e)
+        } catch(YamlExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.yaml.install');
             throw new SetupException($sMessage);
-        }
-        catch(FileExtension $e)
+        } catch(FileExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
-        }
-        catch(FileAccess $e)
+        } catch(FileAccess $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
-        }
-        catch(FileContent $e)
+        } catch(FileContent $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
@@ -110,8 +106,7 @@ 
                 ->setOptions($this->xLibConfig, $this->read($sConfigFile), $sConfigSection);
             // Call the config change listeners.
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -139,8 +134,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
             return $this->xLibConfig->changed();
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -246,8 +240,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->appConfigChanged($this->xAppConfig, '');
             return $this->xAppConfig->changed();
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -296,8 +289,7 @@ 
         try
         {
             return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,

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

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function libConfigChanged(Config $xConfig, string $sName): void
     {
-        foreach($this->aLibConfigListeners as $sListener)
+        foreach ($this->aLibConfigListeners as $sListener)
         {
             $this->di->g($sListener)->onChange($xConfig, $sName);
         }
@@ -71,7 +71,7 @@ 
      */
     public function appConfigChanged(Config $xConfig, string $sName): void
     {
-        foreach($this->aAppConfigListeners as $sListener)
+        foreach ($this->aAppConfigListeners as $sListener)
         {
             $this->di->g($sListener)->onChange($xConfig, $sName);
         }

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