jaxon-php / jaxon-mono

jaxon-core/src/Plugin/Code/AssetManager.php

Spacing +7 added lines, -7 removed lines

@@ -73,7 +73,7 @@ 
     public function shallIncludeAssets(AbstractPlugin $xPlugin): bool
     {
         $sPluginOptionName = 'assets.include.' . $xPlugin->getName();
-        if($this->hasLibOption($sPluginOptionName))
+        if ($this->hasLibOption($sPluginOptionName))
         {
             return $this->getLibOption($sPluginOptionName);
         }
@@ -97,7 +97,7 @@ 
             $this->getLibOption('js.lib.jq', "$sJsLibUri/libs/chibi/chibi$sJsExtension"),
             "$sJsLibUri/jaxon.core$sJsExtension",
         ];
-        if($this->getLibOption('core.debug.on'))
+        if ($this->getLibOption('core.debug.on'))
         {
             $sLanguage = $this->getLibOption('core.language');
             $aJsFiles[] = "$sJsLibUri/jaxon.debug$sJsExtension";
@@ -117,7 +117,7 @@ 
         // Check config options
         // - The js.app.export option must be set to true
         // - The js.app.uri and js.app.dir options must be set to non null values
-        if(!$this->getLibOption('js.app.export', false) ||
+        if (!$this->getLibOption('js.app.export', false) ||
             !$this->getLibOption('js.app.uri') || !$this->getLibOption('js.app.dir'))
         {
             return false;
@@ -138,7 +138,7 @@ 
         $sJsFileName = $this->getLibOption('js.app.file') ?: $xCodeGenerator->getHash();
         $sJsDirectory = rtrim($this->getLibOption('js.app.dir'), '\/') . DIRECTORY_SEPARATOR;
         // - The js.app.dir must be writable
-        if(!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))
+        if (!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))
         {
             return '';
         }
@@ -147,16 +147,16 @@ 
         $sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';
         $sJsFileUri = rtrim($this->getLibOption('js.app.uri'), '/') . "/$sJsFileName";
 
-        if(!is_file($sJsFilePath) &&
+        if (!is_file($sJsFilePath) &&
             !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))
         {
             return '';
         }
-        if(!$this->getLibOption('js.app.minify', false))
+        if (!$this->getLibOption('js.app.minify', false))
         {
             return $sJsFileUri . '.js';
         }
-        if(!is_file($sJsMinFilePath) &&
+        if (!is_file($sJsMinFilePath) &&
             !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))
         {
             // If the file cannot be minified, return the plain js file.

jaxon-core/src/Plugin/Request/CallableClass/ComponentOptions.php

Braces +1 added lines, -2 removed lines

@@ -226,8 +226,7 @@
             if(is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
-            }
-            elseif(is_string($xMethodToCall))
+            } elseif(is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;
             }

Spacing +21 added lines, -23 removed lines

@@ -88,29 +88,29 @@ 
         array $aProtectedMethods = [], array $aProperties = [])
     {
         $this->bExcluded = $bExcluded || (bool)($aOptions['excluded'] ?? false);
-        if($this->bExcluded)
+        if ($this->bExcluded)
         {
             return;
         }
 
         $sSeparator = $aOptions['separator'];
-        if($sSeparator === '_' || $sSeparator === '.')
+        if ($sSeparator === '_' || $sSeparator === '.')
         {
             $this->sSeparator = $sSeparator;
         }
         $this->addProtectedMethods($aOptions['protected']);
         $this->addProtectedMethods($aProtectedMethods);
 
-        foreach($aOptions['functions'] as $sNames => $aFunctionOptions)
+        foreach ($aOptions['functions'] as $sNames => $aFunctionOptions)
         {
             // Names are in a comma-separated list.
             $aFunctionNames = explode(',', $sNames);
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
             }
         }
-        foreach($aProperties as $sFunctionName => $aFunctionOptions)
+        foreach ($aProperties as $sFunctionName => $aFunctionOptions)
         {
             $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
         }
@@ -123,13 +123,13 @@ 
      */
     private function addProtectedMethods(array|string $xMethods): void
     {
-        if(!is_array($xMethods))
+        if (!is_array($xMethods))
         {
             $this->aProtectedMethods[trim((string)$xMethods)] = true;
             return;
         }
 
-        foreach($xMethods as $sMethod)
+        foreach ($xMethods as $sMethod)
         {
             $this->aProtectedMethods[trim((string)$sMethod)] = true;
         }
@@ -206,17 +206,17 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue): void
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(!isset($aHookMethods[$sCalledMethod]))
+            if (!isset($aHookMethods[$sCalledMethod]))
             {
                 $aHookMethods[$sCalledMethod] = [];
             }
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
             }
-            elseif(is_string($xMethodToCall))
+            elseif (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;
             }
@@ -241,7 +241,7 @@ 
      */
     private function addOption(string $sName, $xValue): void
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the methods to call before processing the request
         case '__before':
@@ -269,11 +269,11 @@ 
      */
     private function _addJsArrayOption(string $sFunctionName, string $sOptionName, $xOptionValue): void
     {
-        if(is_string($xOptionValue))
+        if (is_string($xOptionValue))
         {
             $xOptionValue = [$xOptionValue];
         }
-        if(!is_array($xOptionValue))
+        if (!is_array($xOptionValue))
         {
             return; // Do not save.
         }
@@ -303,10 +303,10 @@ 
      */
     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue): void
     {
-        switch($sOptionName)
+        switch ($sOptionName)
         {
         case 'excluded':
-            if((bool)$xOptionValue)
+            if ((bool)$xOptionValue)
             {
                 $this->addProtectedMethods($sFunctionName);
             }
@@ -330,12 +330,11 @@ 
      */
     private function addFunctionOptions(string $sFunctionName, array $aFunctionOptions): void
     {
-        foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+        foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
         {
             substr($sOptionName, 0, 2) === '__' ?
                 // Options for PHP classes. They start with "__".
-                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) :
-                // Options for javascript code.
+                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) : // Options for javascript code.
                 $this->addJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
@@ -351,16 +350,15 @@ 
         $aOptions = array_merge($this->aJsOptions['*'] ?? []); // Clone the array
         // Then add the method options.
         $aMethodOptions = $this->aJsOptions[$sMethodName] ?? [];
-        foreach($aMethodOptions as $sOptionName => $xOptionValue)
+        foreach ($aMethodOptions as $sOptionName => $xOptionValue)
         {
             // For databags and callbacks, merge the values in a single array.
             // For all the other options, keep the last value.
             $aOptions[$sOptionName] = !in_array($sOptionName, ['bags', 'callback']) ?
-                $xOptionValue :
-                array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
+                $xOptionValue : array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
         }
         // Since callbacks are js object names, they need a special formatting.
-        if(isset($aOptions['callback']))
+        if (isset($aOptions['callback']))
         {
             $aOptions['callback'] = str_replace('"', '', json_encode($aOptions['callback']));
         }

jaxon-core/src/Plugin/Request/CallableClass/ComponentRegistry.php

Spacing +33 added lines, -33 removed lines

@@ -111,7 +111,7 @@ 
     public function __construct(protected ComponentContainer $cdi)
     {
         // Set the composer autoloader
-        if(file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
+        if (file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../../vendor/autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../vendor/autoload.php')))
         {
@@ -180,15 +180,15 @@ 
      */
     private function makeClassOptions(string $sClassName, array $aClassOptions, array $aDirectoryOptions): array
     {
-        foreach($this->aDefaultClassOptions as $sOption => $xValue)
+        foreach ($this->aDefaultClassOptions as $sOption => $xValue)
         {
-            if(!isset($aClassOptions[$sOption]))
+            if (!isset($aClassOptions[$sOption]))
             {
                 $aClassOptions[$sOption] = $xValue;
             }
         }
         $aClassOptions['excluded'] = (bool)($aClassOptions['excluded'] ?? false); // Convert to bool.
-        if(is_string($aClassOptions['protected']))
+        if (is_string($aClassOptions['protected']))
         {
             $aClassOptions['protected'] = [$aClassOptions['protected']]; // Convert to array.
         }
@@ -199,30 +199,30 @@ 
             $aDirectoryOptions['classes']['*'] ?? [], // Options for all classes
             $aDirectoryOptions['classes'][$sClassName] ?? [], // Options for this specific class
         ];
-        foreach($aOptionGroups as $aOptionGroup)
+        foreach ($aOptionGroups as $aOptionGroup)
         {
-            if(isset($aOptionGroup['separator']))
+            if (isset($aOptionGroup['separator']))
             {
                 $aClassOptions['separator'] = (string)$aOptionGroup['separator'];
             }
-            if(isset($aOptionGroup['excluded']))
+            if (isset($aOptionGroup['excluded']))
             {
                 $aClassOptions['excluded'] = (bool)$aOptionGroup['excluded'];
             }
-            if(isset($aOptionGroup['protected']))
+            if (isset($aOptionGroup['protected']))
             {
-                if(is_string($aOptionGroup['protected']))
+                if (is_string($aOptionGroup['protected']))
                 {
                     $aOptionGroup['protected'] = [$aOptionGroup['protected']]; // Convert to array.
                 }
                 $aClassOptions['protected'] = array_merge($aClassOptions['protected'], $aOptionGroup['protected']);
             }
-            if(isset($aOptionGroup['functions']))
+            if (isset($aOptionGroup['functions']))
             {
                 $aClassOptions['functions'] = array_merge($aClassOptions['functions'], $aOptionGroup['functions']);
             }
         }
-        if(isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
+        if (isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
         {
             $aClassOptions['config'] = $aDirectoryOptions['config'];
         }
@@ -244,7 +244,7 @@ 
     {
         $aOptions = $this->makeClassOptions($sClassName, $aClassOptions, $aDirectoryOptions);
         $this->cdi->registerComponent($sClassName, $aOptions);
-        if($this->bUpdateHash)
+        if ($this->bUpdateHash)
         {
             $this->sHash .= $sClassName . $aOptions['timestamp'];
         }
@@ -260,7 +260,7 @@ 
      */
     public function registerComponent(string $sClassName, array $aClassOptions): void
     {
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aClassOptions['config'] = $this->xPackageConfig;
         }
@@ -277,10 +277,10 @@ 
     public function getNamespaceComponentOptions(string $sClassName): ?array
     {
         // Find the corresponding namespace
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             // Check if the namespace matches the class.
-            if(strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
+            if (strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
             {
                 // Save the class options
                 $aClassOptions = ['namespace' => $sNamespace];
@@ -301,11 +301,11 @@ 
     public function registerDirectory(string $sDirectory, array $aOptions): void
     {
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aOptions['config'] = $this->xPackageConfig;
         }
@@ -337,30 +337,30 @@ 
     public function registerNamespace(string $sNamespace, array $aOptions): void
     {
         // Separator default value
-        if(!isset($aOptions['separator']))
+        if (!isset($aOptions['separator']))
         {
             $aOptions['separator'] = '.';
         }
         $aOptions['separator'] = trim($aOptions['separator']);
-        if(!in_array($aOptions['separator'], ['.', '_']))
+        if (!in_array($aOptions['separator'], ['.', '_']))
         {
             $aOptions['separator'] = '.';
         }
-        if($aOptions['separator'] === '_')
+        if ($aOptions['separator'] === '_')
         {
             $this->cdi->useUnderscore();
         }
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aOptions['config'] = $this->xPackageConfig;
         }
         // Register the dir with PSR4 autoloading
-        if(($aOptions['autoload']) && $this->xAutoloader != null)
+        if (($aOptions['autoload']) && $this->xAutoloader != null)
         {
             $this->xAutoloader->setPsr4($sNamespace . '\\', $aOptions['directory']);
         }
@@ -376,28 +376,28 @@ 
     public function registerComponentsInDirectories(): void
     {
         // This is to be done only once.
-        if($this->bDirectoriesParsed)
+        if ($this->bDirectoriesParsed)
         {
             return;
         }
         $this->bDirectoriesParsed = true;
 
         // Browse directories without namespaces and read all the files.
-        foreach($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
+        foreach ($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
         {
             $itFile = new SortedFileIterator($sDirectory);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // Skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
 
                 $sClassName = $xFile->getBasename('.php');
                 $aClassOptions = ['timestamp' => $xFile->getMTime()];
-                if(($aDirectoryOptions['autoload']) && $this->xAutoloader !== null)
+                if (($aDirectoryOptions['autoload']) && $this->xAutoloader !== null)
                 {
                     // Set classmap autoloading. Must be done before registering the class.
                     $this->xAutoloader->addClassMap([$sClassName => $xFile->getPathname()]);
@@ -415,7 +415,7 @@ 
     public function registerComponentsInNamespaces(): void
     {
         // This is to be done only once.
-        if($this->bNamespacesParsed)
+        if ($this->bNamespacesParsed)
         {
             return;
         }
@@ -423,17 +423,17 @@ 
 
         // Browse directories with namespaces and read all the files.
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             $this->addNamespace($sNamespace, ['separator' => $aDirectoryOptions['separator']]);
 
             // Iterate on dir content
             $sDirectory = $aDirectoryOptions['directory'];
             $itFile = new SortedFileIterator($sDirectory);
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
@@ -442,7 +442,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath !== '')
+                if ($sRelativePath !== '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }

jaxon-core/src/Plugin/Request/CallableClass/SortedFileIterator.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     public function __construct(string $sDirectory)
     {
         $itFile = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($sDirectory));
-        foreach($itFile as $xFile)
+        foreach ($itFile as $xFile)
         {
             $this->insert($xFile);
         }

jaxon-core/src/Plugin/Request/CallableClass/CallableDirPlugin.php

Spacing +6 added lines, -6 removed lines

@@ -68,7 +68,7 @@ 
     private function checkDirectory(string $sDirectory): string
     {
         $sDirectory = rtrim(trim($sDirectory), '/\\');
-        if(!is_dir($sDirectory))
+        if (!is_dir($sDirectory))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -81,11 +81,11 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(is_string($xOptions))
+        if (is_string($xOptions))
         {
             $xOptions = ['namespace' => $xOptions];
         }
-        if(!is_array($xOptions))
+        if (!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -93,14 +93,14 @@ 
         $xOptions['directory'] = $this->checkDirectory($sCallable);
         // Check the namespace
         $sNamespace = $xOptions['namespace'] ?? '';
-        if(!($xOptions['namespace'] = trim($sNamespace, ' \\')))
+        if (!($xOptions['namespace'] = trim($sNamespace, ' \\')))
         {
             $xOptions['namespace'] = '';
         }
 
         // Change the keys in $xOptions to have "\" as separator
         $_aOptions = [];
-        foreach($xOptions as $sName => $aOption)
+        foreach ($xOptions as $sName => $aOption)
         {
             $sName = trim(str_replace('.', '\\', $sName), ' \\');
             $_aOptions[$sName] = $aOption;
@@ -114,7 +114,7 @@ 
     public function register(string $sType, string $sCallable, array $aOptions): bool
     {
         // The $sCallable var is not used here because the checkOptions() method copied it into the $aOptions array.
-        if(($aOptions['namespace']))
+        if (($aOptions['namespace']))
         {
             $this->xRegistry->registerNamespace($aOptions['namespace'], $aOptions);
             return true;

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) ?

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',

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

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.