jaxon-php / jaxon-mono

jaxon-core/src/Plugin/Response/Psr/PsrPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function ajaxResponse(): ResponseInterface
     {
         $xPsrResponse = $this->xPsr17Factory->createResponse(200);
-        if($this->xRequest->getMethod() === 'GET')
+        if ($this->xRequest->getMethod() === 'GET')
         {
             $xPsrResponse = $xPsrResponse
                 ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')

Switch Indentation +33 added lines, -33 removed lines

@@ -23,56 +23,56 @@
 
 class PsrPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'psr';
+public const NAME = 'psr';
 
-    /**
+/**
      * The class constructor
      *
      * @param Psr17Factory $xPsr17Factory
      * @param RequestInterface $xRequest
      */
-    public function __construct(private Psr17Factory $xPsr17Factory,
-        private RequestInterface $xRequest)
-    {}
+public function __construct(private Psr17Factory $xPsr17Factory,
+private RequestInterface $xRequest)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '5.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '5.0.0';
+}
 
-    /**
+/**
      * Convert an ajax response to a PSR7 response object
      *
      * @return ResponseInterface
      */
-    public function ajaxResponse(): ResponseInterface
-    {
-        $xPsrResponse = $this->xPsr17Factory->createResponse(200);
-        if($this->xRequest->getMethod() === 'GET')
-        {
-            $xPsrResponse = $xPsrResponse
-                ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')
-                ->withHeader('Last-Modified', gmdate("D, d M Y H:i:s") . ' GMT')
-                ->withHeader('Cache-Control', 'no-cache, must-revalidate')
-                ->withHeader('Pragma', 'no-cache');
-        }
-        return $xPsrResponse
-            ->withHeader('content-type', $this->response()->getContentType())
-            ->withBody(Stream::create($this->response()->getOutput()));
-    }
+public function ajaxResponse(): ResponseInterface
+{
+$xPsrResponse = $this->xPsr17Factory->createResponse(200);
+if($this->xRequest->getMethod() === 'GET')
+{
+$xPsrResponse = $xPsrResponse
+    ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')
+    ->withHeader('Last-Modified', gmdate("D, d M Y H:i:s") . ' GMT')
+    ->withHeader('Cache-Control', 'no-cache, must-revalidate')
+    ->withHeader('Pragma', 'no-cache');
+}
+return $xPsrResponse
+->withHeader('content-type', $this->response()->getContentType())
+->withBody(Stream::create($this->response()->getOutput()));
+}
 }

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.

Switch Indentation +98 added lines, -98 removed lines

@@ -26,142 +26,142 @@
 
 class AssetManager
 {
-    use ConfigTrait;
+use ConfigTrait;
 
-    /**
+/**
      * Default library URL
      *
      * @var string
      */
-    const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.0.10/dist';
+const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.0.10/dist';
 
-    /**
+/**
      * The constructor
      *
      * @param ConfigManager $xConfigManager
      * @param MinifierInterface $xMinifier
      */
-    public function __construct(private ConfigManager $xConfigManager,
-        private MinifierInterface $xMinifier)
-    {}
+public function __construct(private ConfigManager $xConfigManager,
+private MinifierInterface $xMinifier)
+{}
 
-    /**
+/**
      * @return ConfigManager
      */
-    protected function config(): ConfigManager
-    {
-        return $this->xConfigManager;
-    }
+protected function config(): ConfigManager
+{
+return $this->xConfigManager;
+}
 
-    /**
+/**
      * Get app js options
      *
      * @return string
      */
-    public function getJsOptions(): string
-    {
-        return $this->getLibOption('js.app.options', '');
-    }
+public function getJsOptions(): string
+{
+return $this->getLibOption('js.app.options', '');
+}
 
-    /**
+/**
      * Check if the assets of this plugin shall be included in Jaxon generated code.
      *
      * @param AbstractPlugin $xPlugin
      *
      * @return bool
      */
-    public function shallIncludeAssets(AbstractPlugin $xPlugin): bool
-    {
-        $sPluginOptionName = 'assets.include.' . $xPlugin->getName();
-        if($this->hasLibOption($sPluginOptionName))
-        {
-            return $this->getLibOption($sPluginOptionName);
-        }
-        return $this->getLibOption('assets.include.all', true);
-    }
-
-    /**
+public function shallIncludeAssets(AbstractPlugin $xPlugin): bool
+{
+$sPluginOptionName = 'assets.include.' . $xPlugin->getName();
+if($this->hasLibOption($sPluginOptionName))
+{
+return $this->getLibOption($sPluginOptionName);
+}
+return $this->getLibOption('assets.include.all', true);
+}
+
+/**
      * Get the HTML tags to include Jaxon javascript files into the page
      *
      * @return array
      */
-    public function getJsLibFiles(): array
-    {
-        $sJsExtension = $this->getLibOption('js.app.minify') ? '.min.js' : '.js';
-        // The URI for the javascript library files
-        $sJsLibUri = $this->getLibOption('js.lib.uri', self::JS_LIB_URL);
-        $sJsLibUri = rtrim($sJsLibUri, '/');
-
-        // Add component files to the javascript file array;
-        $aJsFiles = [
-            $this->getLibOption('js.lib.jq', "$sJsLibUri/libs/chibi/chibi$sJsExtension"),
-            "$sJsLibUri/jaxon.core$sJsExtension",
-        ];
-        if($this->getLibOption('core.debug.on'))
-        {
-            $sLanguage = $this->getLibOption('core.language');
-            $aJsFiles[] = "$sJsLibUri/jaxon.debug$sJsExtension";
-            $aJsFiles[] = "$sJsLibUri/lang/jaxon.$sLanguage$sJsExtension";
-        }
-
-        return $aJsFiles;
-    }
-
-    /**
+public function getJsLibFiles(): array
+{
+$sJsExtension = $this->getLibOption('js.app.minify') ? '.min.js' : '.js';
+// The URI for the javascript library files
+$sJsLibUri = $this->getLibOption('js.lib.uri', self::JS_LIB_URL);
+$sJsLibUri = rtrim($sJsLibUri, '/');
+
+// Add component files to the javascript file array;
+$aJsFiles = [
+$this->getLibOption('js.lib.jq', "$sJsLibUri/libs/chibi/chibi$sJsExtension"),
+"$sJsLibUri/jaxon.core$sJsExtension",
+];
+if($this->getLibOption('core.debug.on'))
+{
+$sLanguage = $this->getLibOption('core.language');
+$aJsFiles[] = "$sJsLibUri/jaxon.debug$sJsExtension";
+$aJsFiles[] = "$sJsLibUri/lang/jaxon.$sLanguage$sJsExtension";
+}
+
+return $aJsFiles;
+}
+
+/**
      * Get the javascript file name
      *
      * @return bool
      */
-    public function shallCreateJsFiles(): bool
-    {
-        // 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) ||
-            !$this->getLibOption('js.app.uri') || !$this->getLibOption('js.app.dir'))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    /**
+public function shallCreateJsFiles(): bool
+{
+// 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) ||
+!$this->getLibOption('js.app.uri') || !$this->getLibOption('js.app.dir'))
+{
+return false;
+}
+return true;
+}
+
+/**
      * Write javascript files and return the corresponding URI
      *
      * @param CodeGenerator $xCodeGenerator
      *
      * @return string
      */
-    public function createJsFiles(CodeGenerator $xCodeGenerator): string
-    {
-        // Check dir access
-        $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))
-        {
-            return '';
-        }
-
-        $sJsFilePath = $sJsDirectory . $sJsFileName . '.js';
-        $sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';
-        $sJsFileUri = rtrim($this->getLibOption('js.app.uri'), '/') . "/$sJsFileName";
-
-        if(!is_file($sJsFilePath) &&
-            !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))
-        {
-            return '';
-        }
-        if(!$this->getLibOption('js.app.minify', false))
-        {
-            return $sJsFileUri . '.js';
-        }
-        if(!is_file($sJsMinFilePath) &&
-            !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))
-        {
-            // If the file cannot be minified, return the plain js file.
-            return $sJsFileUri . '.js';
-        }
-        return $sJsFileUri . '.min.js';
-    }
+public function createJsFiles(CodeGenerator $xCodeGenerator): string
+{
+// Check dir access
+$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))
+{
+return '';
+}
+
+$sJsFilePath = $sJsDirectory . $sJsFileName . '.js';
+$sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';
+$sJsFileUri = rtrim($this->getLibOption('js.app.uri'), '/') . "/$sJsFileName";
+
+if(!is_file($sJsFilePath) &&
+!@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))
+{
+return '';
+}
+if(!$this->getLibOption('js.app.minify', false))
+{
+return $sJsFileUri . '.js';
+}
+if(!is_file($sJsMinFilePath) &&
+!$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))
+{
+// If the file cannot be minified, return the plain js file.
+return $sJsFileUri . '.js';
+}
+return $sJsFileUri . '.min.js';
+}
 }

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

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

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

Spacing +13 added lines, -15 removed lines

@@ -86,15 +86,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'));
         }
@@ -115,7 +115,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']);
@@ -139,13 +139,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);
         }
@@ -162,7 +162,7 @@ 
     private function getCallableScript(CallableFunction $xFunction): string
     {
         $aOptions = [];
-        foreach($xFunction->getOptions() as $sKey => $sValue)
+        foreach ($xFunction->getOptions() as $sKey => $sValue)
         {
             $aOptions[] = "$sKey: $sValue";
         }
@@ -170,8 +170,7 @@ 
         return $this->xTemplateEngine->render('jaxon::callables/function.js', [
             'sName' => $xFunction->getName(),
             'sJsName' => $xFunction->getJsName(),
-            'sArguments' => count($aOptions) === 0 ? 'args' :
-                'args, { ' . implode(',', $aOptions) . ' }',
+            'sArguments' => count($aOptions) === 0 ? 'args' : 'args, { ' . implode(',', $aOptions) . ' }',
         ]);
     }
 
@@ -181,7 +180,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);
@@ -219,8 +218,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()));
     }
 
     /**
@@ -232,7 +230,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
@@ -245,7 +243,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',
@@ -255,7 +253,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',

Switch Indentation +148 added lines, -148 removed lines

@@ -43,21 +43,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
@@ -67,41 +67,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
@@ -110,156 +110,156 @@ 
      *
      * @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
-    {
-        $aOptions = [];
-        foreach($xFunction->getOptions() as $sKey => $sValue)
-        {
-            $aOptions[] = "$sKey: $sValue";
-        }
+private function getCallableScript(CallableFunction $xFunction): string
+{
+$aOptions = [];
+foreach($xFunction->getOptions() as $sKey => $sValue)
+{
+$aOptions[] = "$sKey: $sValue";
+}
 
-        return $this->xTemplateEngine->render('jaxon::callables/function.js', [
-            'sName' => $xFunction->getName(),
-            'sJsName' => $xFunction->getJsName(),
-            'sArguments' => count($aOptions) === 0 ? 'args' :
-                'args, { ' . implode(',', $aOptions) . ' }',
-        ]);
-    }
+return $this->xTemplateEngine->render('jaxon::callables/function.js', [
+'sName' => $xFunction->getName(),
+'sJsName' => $xFunction->getJsName(),
+'sArguments' => count($aOptions) === 0 ? 'args' :
+    'args, { ' . implode(',', $aOptions) . ' }',
+]);
+}
 
-    /**
+/**
      * @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 never
      */
-    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 +74 added lines, -74 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,75 +84,75 @@ 
      *
      * @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();
-    }
+// Setup the app.
+$this->setupApp();
+}
 
-    /**
+/**
      * 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);
+}
+}
 }