jaxon-php / jaxon-mono

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->xConfigManager->getOption('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'),
-            '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->xConfigManager->getOption('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'),
+'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.8/dist';
+const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.0.8/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 $codeGenerator
      *
      * @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 +203 added lines, -203 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 string
      */
-    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,40 +107,40 @@ 
      *
      * @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(function($sClassName) {
-            return $this->getCodeGenerator($sClassName)->getHash();
-        }, $this->aCodeGenerators);
-        $aHashes[] = $this->sVersion;
-        return md5(implode('', $aHashes));
-    }
-
-    /**
+public function getHash(): string
+{
+$aHashes = array_map(function($sClassName) {
+return $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
@@ -148,180 +148,180 @@ 
      *
      * @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;
-        }
-
-        $this->xAssetManager = $this->di->getAssetManager();
-        $this->sJsOptions = $this->xAssetManager->getJsOptions();
-
-        // Sort the code generators by ascending priority
-        ksort($this->aCodeGenerators);
-
-        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;
+}
+
+$this->xAssetManager = $this->di->getAssetManager();
+$this->sJsOptions = $this->xAssetManager->getJsOptions();
+
+// Sort the code generators by ascending priority
+ksort($this->aCodeGenerators);
+
+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
-    {
-        foreach($this->aCodeGenerators as $sClassName)
-        {
-            $xGenerator = $this->getCodeGenerator($sClassName);
-            // Javascript code
-            if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
-            {
-                $aJsScript[] = $sJsScript;
-            }
-        }
-        return implode("\n\n", $aJsScript);
-    }
-
-    /**
+public function getJsScript(): string
+{
+foreach($this->aCodeGenerators as $sClassName)
+{
+$xGenerator = $this->getCodeGenerator($sClassName);
+// Javascript code
+if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
+{
+    $aJsScript[] = $sJsScript;
+}
+}
+return implode("\n\n", $aJsScript);
+}
+
+/**
      * @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
@@ -330,10 +330,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);
+}
 }

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

Switch Indentation +8 added lines, -8 removed lines

@@ -16,31 +16,31 @@
 
 class JsCode
 {
-    /**
+/**
      * The main javascript code
      *
      * @var string
      */
-    public $sJs = '';
+public $sJs = '';
 
-    /**
+/**
      * The js files
      *
      * @var array
      */
-    public $aFiles = [];
+public $aFiles = [];
 
-    /**
+/**
      * The javascript code to be inserted inline before the main code
      *
      * @var string
      */
-    public $sJsBefore = '';
+public $sJsBefore = '';
 
-    /**
+/**
      * The javascript code to be inserted inline after the main code
      *
      * @var string
      */
-    public $sJsAfter = '';
+public $sJsAfter = '';
 }

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

Switch Indentation +5 added lines, -5 removed lines

@@ -18,11 +18,11 @@
 
 class ReadyScriptGenerator extends AbstractCodeGenerator
 {
-    /**
+/**
      * @inheritDoc
      */
-    public function getScript(): string
-    {
-        return "jaxon.dom.ready(() => jaxon.processCustomAttrs());";
-    }
+public function getScript(): string
+{
+return "jaxon.dom.ready(() => jaxon.processCustomAttrs());";
+}
 }

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

Switch Indentation +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 interface MinifierInterface
 {
-    /**
+/**
      * Minify javascript code
      *
      * @param string $sJsFile The javascript file to be minified
@@ -12,5 +12,5 @@ 
      *
      * @return bool
      */
-    public function minify(string $sJsFile, string $sMinFile): bool;
+public function minify(string $sJsFile, string $sMinFile): bool;
 }

jaxon-core/src/Plugin/Response/Pagination/PaginatorPlugin.php

Switch Indentation +30 added lines, -30 removed lines

@@ -43,60 +43,60 @@ 
  */
 class PaginatorPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'pg';
+public const NAME = 'pg';
 
-    /**
+/**
      * The constructor.
      *
      * @param RendererInterface $xRenderer
      */
-    public function __construct(protected RendererInterface $xRenderer)
-    {}
+public function __construct(protected RendererInterface $xRenderer)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        return '5.0.0'; // Use the version number as hash
-    }
+public function getHash(): string
+{
+return '5.0.0'; // Use the version number as hash
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getCss(): string
-    {
-        return '
+public function getCss(): string
+{
+return '
 <style>
   .pagination li a {
     cursor: pointer;
   }
 </style>
 ';
-    }
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return RendererInterface
      */
-    public function renderer(): RendererInterface
-    {
-        return $this->xRenderer;
-    }
+public function renderer(): RendererInterface
+{
+return $this->xRenderer;
+}
 
-    /**
+/**
      * Create a paginator
      *
      * @param int $nPageNumber     The current page number
@@ -105,8 +105,8 @@ 
      *
      * @return Paginator
      */
-    public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
-    {
-        return new Paginator($this, $nPageNumber, $nItemsPerPage, $nTotalItems);
-    }
+public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
+{
+return new Paginator($this, $nPageNumber, $nItemsPerPage, $nTotalItems);
+}
 }

jaxon-core/src/Plugin/Response/Script/ScriptPlugin.php

Switch Indentation +47 added lines, -47 removed lines

@@ -26,56 +26,56 @@ 
 
 class ScriptPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'script';
+public const NAME = 'script';
 
-    /**
+/**
      * The class constructor
      *
      * @param CallFactory $xFactory
      */
-    public function __construct(private CallFactory $xFactory)
-    {}
+public function __construct(private CallFactory $xFactory)
+{}
 
-    /**
+/**
      * @return Closure
      */
-    private function getCallback(): Closure
-    {
-        // The closure needs to capture the response object the script plugin is called with.
-        $xResponse = $this->response();
-        return function(JsExpr $xJsExpr) use($xResponse) {
-            // Add the newly created expression to the response
-            $aOptions = [
-                'expr' => $xJsExpr,
-                'context' => is_a($xResponse, NodeResponse::class) ?
-                    ['component' => true] : [],
-            ];
-            $xResponse->addCommand('script.exec.expr', $aOptions)
-                ->setOption('plugin', $this->getName());
-        };
-    }
+private function getCallback(): Closure
+{
+// The closure needs to capture the response object the script plugin is called with.
+$xResponse = $this->response();
+return function(JsExpr $xJsExpr) use($xResponse) {
+// Add the newly created expression to the response
+$aOptions = [
+    'expr' => $xJsExpr,
+    'context' => is_a($xResponse, NodeResponse::class) ?
+        ['component' => true] : [],
+];
+$xResponse->addCommand('script.exec.expr', $aOptions)
+    ->setOption('plugin', $this->getName());
+};
+}
 
-    /**
+/**
      * @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';
+}
 
-    /**
+/**
      * Create a JQuery selector expression, and link it to the current response.
      *
      * @param string $sPath    The jQuery selector path
@@ -83,32 +83,32 @@ 
      *
      * @return JqSelectorCall
      */
-    public function jq(string $sPath = '', $xContext = null): JqSelectorCall
-    {
-        return $this->xFactory->jq($sPath, $xContext, $this->getCallback());
-    }
+public function jq(string $sPath = '', $xContext = null): JqSelectorCall
+{
+return $this->xFactory->jq($sPath, $xContext, $this->getCallback());
+}
 
-    /**
+/**
      * Create a Javascript object expression, and link it to the current response.
      *
      * @param string $sObject
      *
      * @return JsObjectCall
      */
-    public function jo(string $sObject = ''): JsObjectCall
-    {
-        return $this->xFactory->jo($sObject, $this->getCallback());
-    }
+public function jo(string $sObject = ''): JsObjectCall
+{
+return $this->xFactory->jo($sObject, $this->getCallback());
+}
 
-    /**
+/**
      * Create a Javascript element selector expression, and link it to the current response.
      *
      * @param string $sElementId
      *
      * @return JsSelectorCall
      */
-    public function je(string $sElementId = ''): JsSelectorCall
-    {
-        return $this->xFactory->je($sElementId, $this->getCallback());
-    }
+public function je(string $sElementId = ''): JsSelectorCall
+{
+return $this->xFactory->je($sElementId, $this->getCallback());
+}
 }

jaxon-core/src/Plugin/Response/Dialog/DialogPlugin.php

Switch Indentation +60 added lines, -60 removed lines

@@ -24,107 +24,107 @@
 
 class DialogPlugin implements PluginInterface, ResponsePluginInterface, ModalInterface, AlertInterface
 {
-    use ResponsePluginTrait;
+use ResponsePluginTrait;
 
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'dialog';
+public const NAME = 'dialog';
 
-    /**
+/**
      * The constructor
      *
      * @param DialogCommand $xDialogCommand
      */
-    public function __construct(private DialogCommand $xDialogCommand)
-    {}
+public function __construct(private DialogCommand $xDialogCommand)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * Initialize the plugin
      *
      * @return void
      */
-    protected function init(): void
-    {}
+protected function init(): void
+{}
 
-    /**
+/**
      * Set the library to use for the next call.
      *
      * @param string $sLibrary The name of the library
      *
      * @return DialogPlugin
      */
-    public function with(string $sLibrary): DialogPlugin
-    {
-        $this->xDialogCommand->library($sLibrary);
-        return $this;
-    }
+public function with(string $sLibrary): DialogPlugin
+{
+$this->xDialogCommand->library($sLibrary);
+return $this;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void
-    {
-        // Show the modal dialog
-        $this->addCommand('dialog.modal.show',
-            $this->xDialogCommand->show($sTitle, $sContent, $aButtons, $aOptions));
-    }
-
-    /**
+public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void
+{
+// Show the modal dialog
+$this->addCommand('dialog.modal.show',
+$this->xDialogCommand->show($sTitle, $sContent, $aButtons, $aOptions));
+}
+
+/**
      * @inheritDoc
      */
-    public function hide(): void
-    {
-        // Hide the modal dialog
-        $this->addCommand('dialog.modal.hide', $this->xDialogCommand->hide());
-    }
+public function hide(): void
+{
+// Hide the modal dialog
+$this->addCommand('dialog.modal.hide', $this->xDialogCommand->hide());
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function title(string $sTitle): AlertInterface
-    {
-        $this->xDialogCommand->title($sTitle);
-        return $this;
-    }
+public function title(string $sTitle): AlertInterface
+{
+$this->xDialogCommand->title($sTitle);
+return $this;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function success(string $sMessage, ...$aArgs): void
-    {
-        $this->addCommand('dialog.alert.show', $this->xDialogCommand->success($sMessage, $aArgs));
-    }
+public function success(string $sMessage, ...$aArgs): void
+{
+$this->addCommand('dialog.alert.show', $this->xDialogCommand->success($sMessage, $aArgs));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function info(string $sMessage, ...$aArgs): void
-    {
-        $this->addCommand('dialog.alert.show', $this->xDialogCommand->info($sMessage, $aArgs));
-    }
+public function info(string $sMessage, ...$aArgs): void
+{
+$this->addCommand('dialog.alert.show', $this->xDialogCommand->info($sMessage, $aArgs));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function warning(string $sMessage, ...$aArgs): void
-    {
-        $this->addCommand('dialog.alert.show', $this->xDialogCommand->warning($sMessage, $aArgs));
-    }
+public function warning(string $sMessage, ...$aArgs): void
+{
+$this->addCommand('dialog.alert.show', $this->xDialogCommand->warning($sMessage, $aArgs));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function error(string $sMessage, ...$aArgs): void
-    {
-        $this->addCommand('dialog.alert.show', $this->xDialogCommand->error($sMessage, $aArgs));
-    }
+public function error(string $sMessage, ...$aArgs): void
+{
+$this->addCommand('dialog.alert.show', $this->xDialogCommand->error($sMessage, $aArgs));
+}
 }