jaxon-php / jaxon-mono

jaxon-core/src/Request/Handler/RequestHandler.php

Switch Indentation +86 added lines, -86 removed lines

@@ -30,14 +30,14 @@ 
 
 class RequestHandler
 {
-    /**
+/**
      * The request plugin that is able to process the current request
      *
      * @var RequestHandlerInterface
      */
-    private $xRequestPlugin = null;
+private $xRequestPlugin = null;
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -46,113 +46,113 @@ 
      * @param CallbackManager $xCallbackManager
      * @param DatabagPlugin $xDatabagPlugin
      */
-    public function __construct(private Container $di, private PluginManager $xPluginManager,
-        private ResponseManager $xResponseManager, private CallbackManager $xCallbackManager,
-        private DatabagPlugin $xDatabagPlugin)
-    {}
+public function __construct(private Container $di, private PluginManager $xPluginManager,
+private ResponseManager $xResponseManager, private CallbackManager $xCallbackManager,
+private DatabagPlugin $xDatabagPlugin)
+{}
 
-    /**
+/**
      * Check if the current request can be processed
      *
      * Calls each of the request plugins and determines if the current request can be processed by one of them.
      *
      * @return bool
      */
-    public function canProcessRequest(): bool
-    {
-        // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
-        {
-            return true;
-        }
+public function canProcessRequest(): bool
+{
+// Return true if the request plugin was already found
+if($this->xRequestPlugin !== null)
+{
+return true;
+}
 
-        // The HTTP request
-        $xRequest = $this->di->getRequest();
+// The HTTP request
+$xRequest = $this->di->getRequest();
 
-        // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
-        {
-            if($sClassName::canProcessRequest($xRequest))
-            {
-                $this->xRequestPlugin = $this->di->g($sClassName);
-                $xTarget = $this->xRequestPlugin->setTarget($xRequest);
-                $xTarget->setMethodArgs($this->di->getRequestArguments());
-                return true;
-            }
-        }
-        return false;
-    }
+// Find a plugin to process the request
+foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
+{
+if($sClassName::canProcessRequest($xRequest))
+{
+    $this->xRequestPlugin = $this->di->g($sClassName);
+    $xTarget = $this->xRequestPlugin->setTarget($xRequest);
+    $xTarget->setMethodArgs($this->di->getRequestArguments());
+    return true;
+}
+}
+return false;
+}
 
-    /**
+/**
      * Process the current request and handle errors and exceptions.
      *
      * @return void
      * @throws RequestException
      */
-    private function _processRequest(): void
-    {
-        // Process the request
-        if($this->xRequestPlugin !== null)
-        {
-            $this->xRequestPlugin->processRequest();
-            // Process the databag
-            $this->xDatabagPlugin->writeCommand();
-        }
-    }
+private function _processRequest(): void
+{
+// Process the request
+if($this->xRequestPlugin !== null)
+{
+$this->xRequestPlugin->processRequest();
+// Process the databag
+$this->xDatabagPlugin->writeCommand();
+}
+}
 
-    /**
+/**
      * Process the current request.
      *
      * @return void
      * @throws RequestException
      */
-    public function processRequest(): void
-    {
-        // We need the library to have been bootstrapped.
-        $this->di->getBootstrap()->onBoot();
+public function processRequest(): void
+{
+// We need the library to have been bootstrapped.
+$this->di->getBootstrap()->onBoot();
 
-        // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
-        {
-            return;
-        }
+// Check if there is a plugin to process this request
+if(!$this->canProcessRequest())
+{
+return;
+}
 
-        try
-        {
-            $bEndRequest = false;
-            // Handle before processing event
-            if($this->xRequestPlugin !== null)
-            {
-                $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
-            }
-            if($bEndRequest)
-            {
-                return;
-            }
+try
+{
+$bEndRequest = false;
+// Handle before processing event
+if($this->xRequestPlugin !== null)
+{
+    $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
+}
+if($bEndRequest)
+{
+    return;
+}
 
-            $this->_processRequest();
+$this->_processRequest();
 
-            // Handle after processing event
-            if($this->xRequestPlugin !== null)
-            {
-                $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
-            }
-        }
-        // An exception was thrown while processing the request.
-        // The request missed the corresponding handler function,
-        // or an error occurred while attempting to execute the handler.
-        catch(RequestException $e)
-        {
-            $this->xResponseManager->error($e->getMessage());
-            $this->xCallbackManager->onInvalid($e);
-        }
-        catch(Exception $e)
-        {
-            $this->xResponseManager->error($e->getMessage());
-            $this->xCallbackManager->onError($e);
-        }
+// Handle after processing event
+if($this->xRequestPlugin !== null)
+{
+    $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
+}
+}
+// An exception was thrown while processing the request.
+// The request missed the corresponding handler function,
+// or an error occurred while attempting to execute the handler.
+catch(RequestException $e)
+{
+$this->xResponseManager->error($e->getMessage());
+$this->xCallbackManager->onInvalid($e);
+}
+catch(Exception $e)
+{
+$this->xResponseManager->error($e->getMessage());
+$this->xCallbackManager->onError($e);
+}
 
-        // Print the debug messages
-        $this->xResponseManager->printDebug();
-    }
+// Print the debug messages
+$this->xResponseManager->printDebug();
+}
 }

Spacing +10 added lines, -10 removed lines

@@ -61,7 +61,7 @@ 
     public function canProcessRequest(): bool
     {
         // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             return true;
         }
@@ -70,9 +70,9 @@ 
         $xRequest = $this->di->getRequest();
 
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
+        foreach ($this->xPluginManager->getRequestHandlers() as $sClassName)
         {
-            if($sClassName::canProcessRequest($xRequest))
+            if ($sClassName::canProcessRequest($xRequest))
             {
                 $this->xRequestPlugin = $this->di->g($sClassName);
                 $xTarget = $this->xRequestPlugin->setTarget($xRequest);
@@ -92,7 +92,7 @@ 
     private function _processRequest(): void
     {
         // Process the request
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             $this->xRequestPlugin->processRequest();
             // Process the databag
@@ -112,7 +112,7 @@ 
         $this->di->getBootstrap()->onBoot();
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -121,11 +121,11 @@ 
         {
             $bEndRequest = false;
             // Handle before processing event
-            if($this->xRequestPlugin !== null)
+            if ($this->xRequestPlugin !== null)
             {
                 $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -133,7 +133,7 @@ 
             $this->_processRequest();
 
             // Handle after processing event
-            if($this->xRequestPlugin !== null)
+            if ($this->xRequestPlugin !== null)
             {
                 $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
@@ -141,12 +141,12 @@ 
         // An exception was thrown while processing the request.
         // The request missed the corresponding handler function,
         // or an error occurred while attempting to execute the handler.
-        catch(RequestException $e)
+        catch (RequestException $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

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

Switch Indentation +32 added lines, -32 removed lines

@@ -22,53 +22,53 @@
 
 class ConfigScriptGenerator extends AbstractCodeGenerator
 {
-    /**
+/**
      * The constructor
      *
      * @param ParameterReader $xParameterReader
      * @param TemplateEngine $xTemplateEngine
      * @param ConfigManager $xConfigManager
      */
-    public function __construct(private ParameterReader $xParameterReader,
-        private TemplateEngine $xTemplateEngine, private ConfigManager $xConfigManager)
-    {}
+public function __construct(private ParameterReader $xParameterReader,
+private TemplateEngine $xTemplateEngine, private ConfigManager $xConfigManager)
+{}
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sName The option name
      *
      * @return mixed
      */
-    private function option(string $sName): mixed
-    {
-        return $this->xConfigManager->getOption($sName);
-    }
+private function option(string $sName): mixed
+{
+return $this->xConfigManager->getOption($sName);
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws UriException
      */
-    public function getScript(): string
-    {
-        // It is important to call $this->xParameterReader->uri() only if necessary.
-        $sUri = $this->option('core.request.uri') ?: $this->xParameterReader->uri();
-        $aOptions = [
-            'sResponseType'      => 'JSON',
-            'sVersion'           => $this->option('core.version'),
-            'sLanguage'          => $this->option('core.language'),
-            'sRequestURI'        => $sUri,
-            'sDefaultMode'       => $this->option('core.request.mode'),
-            'sDefaultMethod'     => $this->option('core.request.method'),
-            'sCsrfMetaName'      => $this->option('core.request.csrf_meta'),
-            'bLoggingEnabled'    => $this->xConfigManager->loggingEnabled(),
-            'bDebug'             => $this->option('core.debug.on'),
-            'bVerboseDebug'      => $this->option('core.debug.verbose'),
-            'sDebugOutputID'     => $this->option('core.debug.output_id'),
-            'nResponseQueueSize' => $this->option('js.lib.queue_size'),
-            'sStatusMessages'    => $this->option('js.lib.show_status') ? 'true' : 'false',
-            'sWaitCursor'        => $this->option('js.lib.show_cursor') ? 'true' : 'false',
-        ];
-        return $this->xTemplateEngine->render('jaxon::plugins/config.js', $aOptions);
-    }
+public function getScript(): string
+{
+// It is important to call $this->xParameterReader->uri() only if necessary.
+$sUri = $this->option('core.request.uri') ?: $this->xParameterReader->uri();
+$aOptions = [
+'sResponseType'      => 'JSON',
+'sVersion'           => $this->option('core.version'),
+'sLanguage'          => $this->option('core.language'),
+'sRequestURI'        => $sUri,
+'sDefaultMode'       => $this->option('core.request.mode'),
+'sDefaultMethod'     => $this->option('core.request.method'),
+'sCsrfMetaName'      => $this->option('core.request.csrf_meta'),
+'bLoggingEnabled'    => $this->xConfigManager->loggingEnabled(),
+'bDebug'             => $this->option('core.debug.on'),
+'bVerboseDebug'      => $this->option('core.debug.verbose'),
+'sDebugOutputID'     => $this->option('core.debug.output_id'),
+'nResponseQueueSize' => $this->option('js.lib.queue_size'),
+'sStatusMessages'    => $this->option('js.lib.show_status') ? 'true' : 'false',
+'sWaitCursor'        => $this->option('js.lib.show_cursor') ? 'true' : 'false',
+];
+return $this->xTemplateEngine->render('jaxon::plugins/config.js', $aOptions);
+}
 }

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

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/Code/CodeGenerator.php

Switch Indentation +207 added lines, -207 removed lines

@@ -31,75 +31,75 @@ 
 
 class CodeGenerator
 {
-    /**
+/**
      * @var AssetManager
      */
-    private $xAssetManager;
+private $xAssetManager;
 
-    /**
+/**
      * The classes that generate code
      *
      * @var array<string>
      */
-    protected $aCodeGenerators = [];
+protected $aCodeGenerators = [];
 
-    /**
+/**
      * @var string
      */
-    protected $sJsOptions;
+protected $sJsOptions;
 
-    /**
+/**
      * @var array
      */
-    protected $aCss = [];
+protected $aCss = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aJs = [];
+protected $aJs = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJs = [];
+protected $aCodeJs = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsBefore = [];
+protected $aCodeJsBefore = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsAfter = [];
+protected $aCodeJsAfter = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsFiles = [];
+protected $aCodeJsFiles = [];
 
-    /**
+/**
      * @var bool
      */
-    protected $bGenerated = false;
+protected $bGenerated = false;
 
-    /**
+/**
      * The constructor
      *
      * @param string $sVersion
      * @param Container $di
      * @param TemplateEngine $xTemplateEngine
      */
-    public function __construct(private string $sVersion, private Container $di,
-        private TemplateEngine $xTemplateEngine)
-    {
-        // The Jaxon library config is on top.
-        $this->addCodeGenerator(ConfigScriptGenerator::class, 0);
-        // The ready script comes after.
-        $this->addCodeGenerator(ReadyScriptGenerator::class, 200);
-    }
-
-    /**
+public function __construct(private string $sVersion, private Container $di,
+private TemplateEngine $xTemplateEngine)
+{
+// The Jaxon library config is on top.
+$this->addCodeGenerator(ConfigScriptGenerator::class, 0);
+// The ready script comes after.
+$this->addCodeGenerator(ReadyScriptGenerator::class, 200);
+}
+
+/**
      * Add a code generator to the list
      *
      * @param string $sClassName    The code generator class
@@ -107,39 +107,39 @@ 
      *
      * @return void
      */
-    public function addCodeGenerator(string $sClassName, int $nPriority): void
-    {
-        while(isset($this->aCodeGenerators[$nPriority]))
-        {
-            $nPriority++;
-        }
-        $this->aCodeGenerators[$nPriority] = $sClassName;
-    }
-
-    /**
+public function addCodeGenerator(string $sClassName, int $nPriority): void
+{
+while(isset($this->aCodeGenerators[$nPriority]))
+{
+$nPriority++;
+}
+$this->aCodeGenerators[$nPriority] = $sClassName;
+}
+
+/**
      * @param string $sClassName
      *
      * @return CodeGeneratorInterface
      */
-    private function getCodeGenerator(string $sClassName): CodeGeneratorInterface
-    {
-        return $this->di->g($sClassName);
-    }
+private function getCodeGenerator(string $sClassName): CodeGeneratorInterface
+{
+return $this->di->g($sClassName);
+}
 
-    /**
+/**
      * Generate a hash for all the javascript code generated by the library
      *
      * @return string
      */
-    public function getHash(): string
-    {
-        $aHashes = array_map(fn($sClassName) =>
-            $this->getCodeGenerator($sClassName)->getHash(), $this->aCodeGenerators);
-        $aHashes[] = $this->sVersion;
-        return md5(implode('', $aHashes));
-    }
-
-    /**
+public function getHash(): string
+{
+$aHashes = array_map(fn($sClassName) =>
+$this->getCodeGenerator($sClassName)->getHash(), $this->aCodeGenerators);
+$aHashes[] = $this->sVersion;
+return md5(implode('', $aHashes));
+}
+
+/**
      * Render a template in the 'plugins' subdir
      *
      * @param string $sTemplate    The template filename
@@ -147,185 +147,185 @@ 
      *
      * @return string
      */
-    private function render(string $sTemplate, array $aVars = []): string
-    {
-        $aVars['sJsOptions'] = $this->sJsOptions;
-        return $this->xTemplateEngine->render("jaxon::plugins/$sTemplate", $aVars);
-    }
+private function render(string $sTemplate, array $aVars = []): string
+{
+$aVars['sJsOptions'] = $this->sJsOptions;
+return $this->xTemplateEngine->render("jaxon::plugins/$sTemplate", $aVars);
+}
 
-    /**
+/**
      * Generate the Jaxon CSS and js codes for a given plugin
      *
      * @param CodeGeneratorInterface $xGenerator
      *
      * @return void
      */
-    private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
-    {
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
-            $this->xAssetManager->shallIncludeAssets($xGenerator))
-        {
-            // HTML tags for CSS
-            if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
-            {
-                $this->aCss[] = $sCss;
-            }
-            // HTML tags for js
-            if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
-            {
-                $this->aJs[] = $sJs;
-            }
-        }
-
-        // Additional js codes
-        if(($xJsCode = $xGenerator->getJsCode()) !== null)
-        {
-            if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
-            {
-                $this->aCodeJs[] = $sJs;
-            }
-            if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
-            {
-                $this->aCodeJsBefore[] = $sJsBefore;
-            }
-            if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
-            {
-                $this->aCodeJsAfter[] = $sJsAfter;
-            }
-            $this->aCodeJsFiles = array_merge($this->aCodeJsFiles, $xJsCode->aFiles);
-        }
-    }
-
-    /**
+private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
+{
+if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
+$this->xAssetManager->shallIncludeAssets($xGenerator))
+{
+// HTML tags for CSS
+if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
+{
+    $this->aCss[] = $sCss;
+}
+// HTML tags for js
+if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
+{
+    $this->aJs[] = $sJs;
+}
+}
+
+// Additional js codes
+if(($xJsCode = $xGenerator->getJsCode()) !== null)
+{
+if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
+{
+    $this->aCodeJs[] = $sJs;
+}
+if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
+{
+    $this->aCodeJsBefore[] = $sJsBefore;
+}
+if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
+{
+    $this->aCodeJsAfter[] = $sJsAfter;
+}
+$this->aCodeJsFiles = array_merge($this->aCodeJsFiles, $xJsCode->aFiles);
+}
+}
+
+/**
      * Generate the Jaxon CSS ans js codes
      *
      * @return void
      * @throws UriException
      */
-    private function generateCodes(): void
-    {
-        if($this->bGenerated)
-        {
-            return;
-        }
-
-        // We need the library to have been bootstrapped.
-        $this->di->getBootstrap()->onBoot();
-
-        // Sort the code generators by ascending priority
-        ksort($this->aCodeGenerators);
-
-        // Cannot be injected because of dependency loop.
-        $this->xAssetManager = $this->di->getAssetManager();
-
-        $this->sJsOptions = $this->xAssetManager->getJsOptions();
-        foreach($this->aCodeGenerators as $sClassName)
-        {
-            $this->generatePluginCodes($this->getCodeGenerator($sClassName));
-        }
-
-        // Load the Jaxon lib js files, after the other libs js files.
-        $this->aJs[] = trim($this->render('includes.js', [
-            'aUrls' => $this->xAssetManager->getJsLibFiles(),
-        ]));
-
-        // The codes are already generated.
-        $this->bGenerated = true;
-    }
-
-    /**
+private function generateCodes(): void
+{
+if($this->bGenerated)
+{
+return;
+}
+
+// We need the library to have been bootstrapped.
+$this->di->getBootstrap()->onBoot();
+
+// Sort the code generators by ascending priority
+ksort($this->aCodeGenerators);
+
+// Cannot be injected because of dependency loop.
+$this->xAssetManager = $this->di->getAssetManager();
+
+$this->sJsOptions = $this->xAssetManager->getJsOptions();
+foreach($this->aCodeGenerators as $sClassName)
+{
+$this->generatePluginCodes($this->getCodeGenerator($sClassName));
+}
+
+// Load the Jaxon lib js files, after the other libs js files.
+$this->aJs[] = trim($this->render('includes.js', [
+'aUrls' => $this->xAssetManager->getJsLibFiles(),
+]));
+
+// The codes are already generated.
+$this->bGenerated = true;
+}
+
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page
      *
      * @return string
      * @throws UriException
      */
-    public function getCss(): string
-    {
-        $this->generateCodes();
-        return implode("\n\n", $this->aCss);
-    }
+public function getCss(): string
+{
+$this->generateCodes();
+return implode("\n\n", $this->aCss);
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page
      *
      * @return string
      * @throws UriException
      */
-    public function getJs(): string
-    {
-        $this->generateCodes();
-        return implode("\n\n", $this->aJs);
-    }
+public function getJs(): string
+{
+$this->generateCodes();
+return implode("\n\n", $this->aJs);
+}
 
-    /**
+/**
      * Get the Javascript code
      *
      * @return string
      */
-    public function getJsScript(): string
-    {
-        $aJsScripts = [];
-        foreach($this->aCodeGenerators as $sClassName)
-        {
-            $xGenerator = $this->getCodeGenerator($sClassName);
-            // Javascript code
-            if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
-            {
-                $aJsScripts[] = $sJsScript;
-            }
-        }
-        return implode("\n\n", $aJsScripts);
-    }
-
-    /**
+public function getJsScript(): string
+{
+$aJsScripts = [];
+foreach($this->aCodeGenerators as $sClassName)
+{
+$xGenerator = $this->getCodeGenerator($sClassName);
+// Javascript code
+if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
+{
+    $aJsScripts[] = $sJsScript;
+}
+}
+return implode("\n\n", $aJsScripts);
+}
+
+/**
      * @param bool $bIncludeJs Also get the JS files
      * @param bool $bIncludeCss Also get the CSS files
      *
      * @return array<string>
      */
-    private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
-    {
-        $aCodes = [];
-        if($bIncludeCss)
-        {
-            $aCodes[] = $this->getCss();
-        }
-        if($bIncludeJs)
-        {
-            $aCodes[] = $this->getJs();
-        }
-
-        $sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' :
-            $this->xAssetManager->createJsFiles($this);
-        // Wrap the js code into the corresponding HTML tag.
-        $aCodes[] = $sUrl !== '' ?
-            $this->render('include.js', ['sUrl' => $sUrl]) :
-            $this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
-
-        // Wrap the js codes into HTML tags.
-        if(count($this->aCodeJsBefore) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJsBefore);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        if(count($this->aCodeJs) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJs);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        if(count($this->aCodeJsFiles) > 0)
-        {
-            $aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
-        }
-        if(count($this->aCodeJsAfter) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJsAfter);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        return $aCodes;
-    }
-
-    /**
+private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
+{
+$aCodes = [];
+if($bIncludeCss)
+{
+$aCodes[] = $this->getCss();
+}
+if($bIncludeJs)
+{
+$aCodes[] = $this->getJs();
+}
+
+$sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' :
+$this->xAssetManager->createJsFiles($this);
+// Wrap the js code into the corresponding HTML tag.
+$aCodes[] = $sUrl !== '' ?
+$this->render('include.js', ['sUrl' => $sUrl]) :
+$this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
+
+// Wrap the js codes into HTML tags.
+if(count($this->aCodeJsBefore) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJsBefore);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+if(count($this->aCodeJs) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJs);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+if(count($this->aCodeJsFiles) > 0)
+{
+$aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
+}
+if(count($this->aCodeJsAfter) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJsAfter);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+return $aCodes;
+}
+
+/**
      * Get the javascript code to be sent to the browser
      *
      * @param bool $bIncludeJs Also get the JS files
@@ -334,10 +334,10 @@ 
      * @return string
      * @throws UriException
      */
-    public function getScript(bool $bIncludeJs, bool $bIncludeCss): string
-    {
-        $this->generateCodes();
-        $aCodes = $this->renderCodes($bIncludeJs, $bIncludeCss);
-        return implode("\n\n", $aCodes);
-    }
+public function getScript(bool $bIncludeJs, bool $bIncludeCss): string
+{
+$this->generateCodes();
+$aCodes = $this->renderCodes($bIncludeJs, $bIncludeCss);
+return implode("\n\n", $aCodes);
+}
 }

Spacing +20 added lines, -22 removed lines

@@ -109,7 +109,7 @@ 
      */
     public function addCodeGenerator(string $sClassName, int $nPriority): void
     {
-        while(isset($this->aCodeGenerators[$nPriority]))
+        while (isset($this->aCodeGenerators[$nPriority]))
         {
             $nPriority++;
         }
@@ -162,33 +162,33 @@ 
      */
     private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
     {
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
+        if (!is_subclass_of($xGenerator, AbstractPlugin::class) ||
             $this->xAssetManager->shallIncludeAssets($xGenerator))
         {
             // HTML tags for CSS
-            if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
+            if (($sCss = trim($xGenerator->getCss(), " \n")) !== '')
             {
                 $this->aCss[] = $sCss;
             }
             // HTML tags for js
-            if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
+            if (($sJs = trim($xGenerator->getJs(), " \n")) !== '')
             {
                 $this->aJs[] = $sJs;
             }
         }
 
         // Additional js codes
-        if(($xJsCode = $xGenerator->getJsCode()) !== null)
+        if (($xJsCode = $xGenerator->getJsCode()) !== null)
         {
-            if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
+            if (($sJs = trim($xJsCode->sJs, " \n")) !== '')
             {
                 $this->aCodeJs[] = $sJs;
             }
-            if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
+            if (($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
             {
                 $this->aCodeJsBefore[] = $sJsBefore;
             }
-            if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
+            if (($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
             {
                 $this->aCodeJsAfter[] = $sJsAfter;
             }
@@ -204,7 +204,7 @@ 
      */
     private function generateCodes(): void
     {
-        if($this->bGenerated)
+        if ($this->bGenerated)
         {
             return;
         }
@@ -219,7 +219,7 @@ 
         $this->xAssetManager = $this->di->getAssetManager();
 
         $this->sJsOptions = $this->xAssetManager->getJsOptions();
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $this->generatePluginCodes($this->getCodeGenerator($sClassName));
         }
@@ -265,11 +265,11 @@ 
     public function getJsScript(): string
     {
         $aJsScripts = [];
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $xGenerator = $this->getCodeGenerator($sClassName);
             // Javascript code
-            if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
+            if (($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
             {
                 $aJsScripts[] = $sJsScript;
             }
@@ -286,38 +286,36 @@ 
     private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
     {
         $aCodes = [];
-        if($bIncludeCss)
+        if ($bIncludeCss)
         {
             $aCodes[] = $this->getCss();
         }
-        if($bIncludeJs)
+        if ($bIncludeJs)
         {
             $aCodes[] = $this->getJs();
         }
 
-        $sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' :
-            $this->xAssetManager->createJsFiles($this);
+        $sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' : $this->xAssetManager->createJsFiles($this);
         // Wrap the js code into the corresponding HTML tag.
         $aCodes[] = $sUrl !== '' ?
-            $this->render('include.js', ['sUrl' => $sUrl]) :
-            $this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
+            $this->render('include.js', ['sUrl' => $sUrl]) : $this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
 
         // Wrap the js codes into HTML tags.
-        if(count($this->aCodeJsBefore) > 0)
+        if (count($this->aCodeJsBefore) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJsBefore);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
         }
-        if(count($this->aCodeJs) > 0)
+        if (count($this->aCodeJs) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJs);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
         }
-        if(count($this->aCodeJsFiles) > 0)
+        if (count($this->aCodeJsFiles) > 0)
         {
             $aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
         }
-        if(count($this->aCodeJsAfter) > 0)
+        if (count($this->aCodeJsAfter) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJsAfter);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);

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

Spacing +15 added lines, -17 removed lines

@@ -82,15 +82,15 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(!$this->xValidator->validateClass(trim($sCallable)))
+        if (!$this->xValidator->validateClass(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'));
         }
@@ -135,15 +135,15 @@ 
     private function addCallable(CallableObject $xCallableObject): void
     {
         $aCallableMethods = $xCallableObject->getCallableMethods();
-        if($xCallableObject->excluded() || count($aCallableMethods) === 0)
+        if ($xCallableObject->excluded() || count($aCallableMethods) === 0)
         {
             return;
         }
 
         $aCallableObject = &$this->aCallableObjects;
-        foreach(explode('.', $xCallableObject->getJsName()) as $sName)
+        foreach (explode('.', $xCallableObject->getJsName()) as $sName)
         {
-            if(!isset($aCallableObject['children'][$sName]))
+            if (!isset($aCallableObject['children'][$sName]))
             {
                 $aCallableObject['children'][$sName] = [];
             }
@@ -161,12 +161,11 @@ 
     private function renderMethod(string $sIndent, array $aTemplateVars): string
     {
         $aOptions = [];
-        foreach($aTemplateVars['aMethod']['options'] as $sKey => $sValue)
+        foreach ($aTemplateVars['aMethod']['options'] as $sKey => $sValue)
         {
             $aOptions[] = "$sKey: $sValue";
         }
-        $aTemplateVars['sArguments'] = count($aOptions) === 0 ? 'args' :
-            'args, { ' . implode(',', $aOptions) . ' }';
+        $aTemplateVars['sArguments'] = count($aOptions) === 0 ? 'args' : 'args, { ' . implode(',', $aOptions) . ' }';
 
         return $sIndent . trim($this->xTemplateEngine
             ->render('jaxon::callables/method.js', $aTemplateVars));
@@ -186,11 +185,10 @@ 
 
         $fMethodCallback = fn($aMethod) => $this->renderMethod($sIndent,
             ['sJsClass' => $sJsClass, 'aMethod' => $aMethod]);
-        $aMethods = !isset($aCallable['methods']) ? [] :
-            array_map($fMethodCallback, $aCallable['methods']);
+        $aMethods = !isset($aCallable['methods']) ? [] : array_map($fMethodCallback, $aCallable['methods']);
 
         $aChildren = [];
-        foreach($aCallable['children'] ?? [] as $sName => $aChild)
+        foreach ($aCallable['children'] ?? [] as $sName => $aChild)
         {
             $aChildren[] = $this->renderChild("$sName:", "$sJsClass.$sName",
                 $aChild, $nRepeat) . ',';
@@ -231,13 +229,13 @@ 
         $this->xRegistry->registerAllComponents();
 
         $this->aCallableObjects = ['children' => []];
-        foreach($this->cdi->getCallableObjects() as $xCallableObject)
+        foreach ($this->cdi->getCallableObjects() as $xCallableObject)
         {
             $this->addCallable($xCallableObject);
         }
 
         $aScripts = [];
-        foreach($this->aCallableObjects['children'] as $sJsClass => $aCallable)
+        foreach ($this->aCallableObjects['children'] as $sJsClass => $aCallable)
         {
             $aScripts[] = $this->renderChild("{$this->sPrefix}$sJsClass =",
                 $sJsClass, $aCallable) . ';';
@@ -293,7 +291,7 @@ 
         // Will be used to print a translated error message.
         $aErrorParams = ['class' => $sClassName, 'method' => $sMethodName];
 
-        if(!$this->xValidator->validateJsObject($sClassName) ||
+        if (!$this->xValidator->validateJsObject($sClassName) ||
             !$this->xValidator->validateMethod($sMethodName))
         {
             // Unable to find the requested object or method
@@ -307,7 +305,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->getCallable($sClassName);
 
-            if($xCallableObject->excluded($sMethodName))
+            if ($xCallableObject->excluded($sMethodName))
             {
                 // Unable to find the requested class or method
                 $this->throwException('', 'errors.objects.excluded', $aErrorParams);
@@ -316,7 +314,7 @@ 
             $sError = 'errors.objects.call';
             $xCallableObject->call($this->xTarget);
         }
-        catch(ReflectionException|SetupException $e)
+        catch (ReflectionException|SetupException $e)
         {
             // Unable to execute the requested class or method
             $this->throwException($e->getMessage(), $sError, $aErrorParams);

jaxon-core/templates/plugins/config.js.php

Spacing +6 added lines, -6 removed lines

@@ -10,24 +10,24 @@
 jxn.config.defaultMethod = '<?php echo $this->sDefaultMethod ?>';
 jxn.config.responseType = '<?php echo $this->sResponseType ?>';
 
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jxn.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
 
-<?php if($this->bLoggingEnabled): ?>
+<?php if ($this->bLoggingEnabled): ?>
 jxn.debug.logger = '<?php echo Jaxon\rq(Jaxon\App\Component\Logger::class)->_class() ?>';
 <?php endif ?>
 
-<?php if($this->bDebug): ?>
+<?php if ($this->bDebug): ?>
 jxn.debug.active = true;
-<?php if($this->sDebugOutputID): ?>
+<?php if ($this->sDebugOutputID): ?>
 jxn.debug.outputID = '<?php echo $this->sDebugOutputID ?>';
 <?php endif ?>
-<?php if($this->bVerboseDebug): ?>
+<?php if ($this->bVerboseDebug): ?>
 jxn.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
 
-<?php if($this->sCsrfMetaName): ?>
+<?php if ($this->sCsrfMetaName): ?>
 jxn.setCsrf('<?php echo $this->sCsrfMetaName ?>');
 <?php endif ?>