jaxon-php / jaxon-mono

jaxon-storage/src/helpers.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  */
 function storage(): StorageManager
 {
-    if(function_exists('jaxon'))
+    if (function_exists('jaxon'))
     {
         return jaxon()->di()->g(StorageManager::class);
     }

jaxon-core/src/Di/Traits/UtilTrait.php

Switch Indentation +61 added lines, -61 removed lines

@@ -17,88 +17,88 @@
 
 trait UtilTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerUtils(): void
-    {
-        // Translator
-        $this->set(Translator::class, function($di) {
-            $xTranslator = new Translator();
-            $sResourceDir = rtrim(trim($di->g('jaxon.core.dir.translation')), '/\\');
-            // Load the debug translations
-            $xTranslator->loadTranslations("$sResourceDir/en/errors.php", 'en');
-            $xTranslator->loadTranslations("$sResourceDir/fr/errors.php", 'fr');
-            $xTranslator->loadTranslations("$sResourceDir/es/errors.php", 'es');
-            // Load the config translations
-            $xTranslator->loadTranslations("$sResourceDir/en/config.php", 'en');
-            $xTranslator->loadTranslations("$sResourceDir/fr/config.php", 'fr');
-            $xTranslator->loadTranslations("$sResourceDir/es/config.php", 'es');
-            // Load the labels translations
-            $xTranslator->loadTranslations("$sResourceDir/en/labels.php", 'en');
-            $xTranslator->loadTranslations("$sResourceDir/fr/labels.php", 'fr');
-            $xTranslator->loadTranslations("$sResourceDir/es/labels.php", 'es');
+private function registerUtils(): void
+{
+// Translator
+$this->set(Translator::class, function($di) {
+$xTranslator = new Translator();
+$sResourceDir = rtrim(trim($di->g('jaxon.core.dir.translation')), '/\\');
+// Load the debug translations
+$xTranslator->loadTranslations("$sResourceDir/en/errors.php", 'en');
+$xTranslator->loadTranslations("$sResourceDir/fr/errors.php", 'fr');
+$xTranslator->loadTranslations("$sResourceDir/es/errors.php", 'es');
+// Load the config translations
+$xTranslator->loadTranslations("$sResourceDir/en/config.php", 'en');
+$xTranslator->loadTranslations("$sResourceDir/fr/config.php", 'fr');
+$xTranslator->loadTranslations("$sResourceDir/es/config.php", 'es');
+// Load the labels translations
+$xTranslator->loadTranslations("$sResourceDir/en/labels.php", 'en');
+$xTranslator->loadTranslations("$sResourceDir/fr/labels.php", 'fr');
+$xTranslator->loadTranslations("$sResourceDir/es/labels.php", 'es');
 
-            return $xTranslator;
-        });
-        // Define an alis for the translator with the base class name.
-        $this->alias(BaseTranslator::class, Translator::class);
+return $xTranslator;
+});
+// Define an alis for the translator with the base class name.
+$this->alias(BaseTranslator::class, Translator::class);
 
-        // Config reader
-        $this->set(ConfigReader::class, fn($di): ConfigReader =>
-            new ConfigReader($di->g(ConfigSetter::class)));
+// Config reader
+$this->set(ConfigReader::class, fn($di): ConfigReader =>
+new ConfigReader($di->g(ConfigSetter::class)));
 
-        // Config setter
-        $this->set(ConfigSetter::class, fn() => new ConfigSetter());
+// Config setter
+$this->set(ConfigSetter::class, fn() => new ConfigSetter());
 
-        // Template engine
-        $this->set(TemplateEngine::class, function($di) {
-            $xTemplateEngine = new TemplateEngine();
-            $sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
-            $sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
-            $xTemplateEngine->addNamespace('jaxon', $sTemplateDir, '.php');
-            $xTemplateEngine->addNamespace('pagination', $sPaginationDir, '.php');
-            $xTemplateEngine->setDefaultNamespace('jaxon');
+// Template engine
+$this->set(TemplateEngine::class, function($di) {
+$xTemplateEngine = new TemplateEngine();
+$sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
+$sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
+$xTemplateEngine->addNamespace('jaxon', $sTemplateDir, '.php');
+$xTemplateEngine->addNamespace('pagination', $sPaginationDir, '.php');
+$xTemplateEngine->setDefaultNamespace('jaxon');
 
-            return $xTemplateEngine;
-        });
+return $xTemplateEngine;
+});
 
-        // URI detector
-        $this->set(UriDetector::class, fn(): UriDetector => new UriDetector());
+// URI detector
+$this->set(UriDetector::class, fn(): UriDetector => new UriDetector());
 
-        // Temp cache for Jaxon components
-        $this->set(Stash::class, fn(): Stash => new Stash());
+// Temp cache for Jaxon components
+$this->set(Stash::class, fn(): Stash => new Stash());
 
-        // File storage
-        $this->set(StorageManager::class, function($di): StorageManager {
-            $xConfigGetter = function() use($di): Config {
-                $aConfigOptions = $di->config()->getAppOption('storage', []);
-                return $di->g(ConfigSetter::class)->newConfig($aConfigOptions);
-            };
+// File storage
+$this->set(StorageManager::class, function($di): StorageManager {
+$xConfigGetter = function() use($di): Config {
+    $aConfigOptions = $di->config()->getAppOption('storage', []);
+    return $di->g(ConfigSetter::class)->newConfig($aConfigOptions);
+};
 
-            return new StorageManager($xConfigGetter, $di->g(Translator::class));
-        });
-    }
+return new StorageManager($xConfigGetter, $di->g(Translator::class));
+});
+}
 
-    /**
+/**
      * Get the template engine
      *
      * @return TemplateEngine
      */
-    public function getTemplateEngine(): TemplateEngine
-    {
-        return $this->g(TemplateEngine::class);
-    }
+public function getTemplateEngine(): TemplateEngine
+{
+return $this->g(TemplateEngine::class);
+}
 
-    /**
+/**
      * Get the temp cache for Jaxon components
      *
      * @return Stash
      */
-    public function getStash(): Stash
-    {
-        return $this->g(Stash::class);
-    }
+public function getStash(): Stash
+{
+return $this->g(Stash::class);
+}
 }

jaxon-core/src/Di/Container.php

Switch Indentation +130 added lines, -130 removed lines

@@ -30,148 +30,148 @@ 
 
 class Container implements ContainerInterface
 {
-    use Traits\AppTrait;
-    use Traits\PsrTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
-    use Traits\PluginTrait;
-    use Traits\CallableTrait;
-    use Traits\ViewTrait;
-    use Traits\UtilTrait;
-    use Traits\MetadataTrait;
-    use Traits\DiAutoTrait;
+use Traits\AppTrait;
+use Traits\PsrTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
+use Traits\PluginTrait;
+use Traits\CallableTrait;
+use Traits\ViewTrait;
+use Traits\UtilTrait;
+use Traits\MetadataTrait;
+use Traits\DiAutoTrait;
 
-    /**
+/**
      * The library Dependency Injection Container
      *
      * @var PimpleContainer
      */
-    private $xLibContainer;
+private $xLibContainer;
 
-    /**
+/**
      * The application or framework Dependency Injection Container
      *
      * @var ContainerInterface
      */
-    private $xAppContainer = null;
+private $xAppContainer = null;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct()
-    {
-        $this->xLibContainer = new PimpleContainer();
+public function __construct()
+{
+$this->xLibContainer = new PimpleContainer();
 
-        // The container instance is saved in the container.
-        $this->val(Container::class, $this);
+// The container instance is saved in the container.
+$this->val(Container::class, $this);
 
-        // Register the null logger by default
-        $this->setLogger(new NullLogger());
+// Register the null logger by default
+$this->setLogger(new NullLogger());
 
-        // Setup the logger facade. Don't overwrite if it's already set.
-        ContainerWrapper::setContainer($this, false);
+// Setup the logger facade. Don't overwrite if it's already set.
+ContainerWrapper::setContainer($this, false);
 
-        $sBaseDir = dirname(__DIR__, 2);
-        // Template directory
-        $this->val('jaxon.core.dir.template', "$sBaseDir/templates");
+$sBaseDir = dirname(__DIR__, 2);
+// Template directory
+$this->val('jaxon.core.dir.template', "$sBaseDir/templates");
 
-        // Translation directory
-        $this->val('jaxon.core.dir.translation', "$sBaseDir/translations");
+// Translation directory
+$this->val('jaxon.core.dir.translation', "$sBaseDir/translations");
 
-        $this->registerAll();
-        $this->setEventHandlers();
-    }
+$this->registerAll();
+$this->setEventHandlers();
+}
 
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    protected function cn(): Container
-    {
-        return $this;
-    }
+protected function cn(): Container
+{
+return $this;
+}
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerAll()
-    {
-        $this->registerApp();
-        $this->registerPsr();
-        $this->registerRequests();
-        $this->registerResponses();
-        $this->registerPlugins();
-        $this->registerCallables();
-        $this->registerViews();
-        $this->registerUtils();
-        $this->registerMetadataReader();
-    }
+private function registerAll()
+{
+$this->registerApp();
+$this->registerPsr();
+$this->registerRequests();
+$this->registerResponses();
+$this->registerPlugins();
+$this->registerCallables();
+$this->registerViews();
+$this->registerUtils();
+$this->registerMetadataReader();
+}
 
-    /**
+/**
      * Set the logger
      *
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger)
-    {
-        is_a($xLogger, LoggerInterface::class) ?
-            $this->val(LoggerInterface::class, $xLogger) :
-            $this->set(LoggerInterface::class, $xLogger);
-    }
+public function setLogger(LoggerInterface|Closure $xLogger)
+{
+is_a($xLogger, LoggerInterface::class) ?
+$this->val(LoggerInterface::class, $xLogger) :
+$this->set(LoggerInterface::class, $xLogger);
+}
 
-    /**
+/**
      * Get the logger
      *
      * @return LoggerInterface
      */
-    public function getLogger(): LoggerInterface
-    {
-        return $this->get(LoggerInterface::class);
-    }
+public function getLogger(): LoggerInterface
+{
+return $this->get(LoggerInterface::class);
+}
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer)
-    {
-        $this->xAppContainer = $xContainer;
-    }
+public function setContainer(ContainerInterface $xContainer)
+{
+$this->xAppContainer = $xContainer;
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param string $sClass    The full class name
      *
      * @return bool
      */
-    public function h(string $sClass): bool
-    {
-        return $this->xLibContainer->offsetExists($sClass);
-    }
+public function h(string $sClass): bool
+{
+return $this->xLibContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param string $sClass    The full class name
      *
      * @return bool
      */
-    public function has(string $sClass): bool
-    {
-        return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
-            true : $this->xLibContainer->offsetExists($sClass);
-    }
+public function has(string $sClass): bool
+{
+return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
+true : $this->xLibContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -179,12 +179,12 @@ 
      *
      * @return T
      */
-    public function g(string $sClass): mixed
-    {
-        return $this->xLibContainer->offsetGet($sClass);
-    }
+public function g(string $sClass): mixed
+{
+return $this->xLibContainer->offsetGet($sClass);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -193,24 +193,24 @@ 
      * @return T
      * @throws SetupException
      */
-    public function get(string $sClass): mixed
-    {
-        try
-        {
-            return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
-                $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
-        }
-        catch(Throwable $e)
-        {
-            $xLogger = $this->g(LoggerInterface::class);
-            $xTranslator = $this->g(Translator::class);
-            $sMessage = $e->getMessage() . ': ' . $xTranslator->trans('errors.class.container', ['name' => $sClass]);
-            $xLogger->error($e->getMessage(), ['message' => $sMessage]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function get(string $sClass): mixed
+{
+try
+{
+return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
+    $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
+}
+catch(Throwable $e)
+{
+$xLogger = $this->g(LoggerInterface::class);
+$xTranslator = $this->g(Translator::class);
+$sMessage = $e->getMessage() . ': ' . $xTranslator->trans('errors.class.container', ['name' => $sClass]);
+$xLogger->error($e->getMessage(), ['message' => $sMessage]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Save a closure in the container
      *
      * @param string|class-string $sClass    The full class name
@@ -219,15 +219,15 @@ 
      *
      * @return void
      */
-    public function set(string $sClass, Closure $xClosure, bool $bIsSingleton = true)
-    {
-        // Wrap the user closure into a new closure, so it can take this container as a parameter.
-        $xClosure = fn() => $xClosure($this);
-        $this->xLibContainer->offsetSet($sClass, $bIsSingleton ?
-            $xClosure : $this->xLibContainer->factory($xClosure));
-    }
+public function set(string $sClass, Closure $xClosure, bool $bIsSingleton = true)
+{
+// Wrap the user closure into a new closure, so it can take this container as a parameter.
+$xClosure = fn() => $xClosure($this);
+$this->xLibContainer->offsetSet($sClass, $bIsSingleton ?
+$xClosure : $this->xLibContainer->factory($xClosure));
+}
 
-    /**
+/**
      * Save a value in the container
      *
      * @param string|class-string $sKey    The key
@@ -235,12 +235,12 @@ 
      *
      * @return void
      */
-    public function val(string $sKey, $xValue)
-    {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
-    }
+public function val(string $sKey, $xValue)
+{
+$this->xLibContainer->offsetSet($sKey, $xValue);
+}
 
-    /**
+/**
      * Set an alias in the container
      *
      * @param string|class-string $sAlias    The alias name
@@ -248,32 +248,32 @@ 
      *
      * @return void
      */
-    public function alias(string $sAlias, string $sClass)
-    {
-        $this->set($sAlias, function($di) use ($sClass) {
-            return $di->get($sClass);
-        });
-    }
+public function alias(string $sAlias, string $sClass)
+{
+$this->set($sAlias, function($di) use ($sClass) {
+return $di->get($sClass);
+});
+}
 
-    /**
+/**
      * Get the session manager
      *
      * @return SessionInterface|null
      */
-    public function getSessionManager(): ?SessionInterface
-    {
-        return $this->h(SessionInterface::class) ? $this->g(SessionInterface::class) : null;
-    }
+public function getSessionManager(): ?SessionInterface
+{
+return $this->h(SessionInterface::class) ? $this->g(SessionInterface::class) : null;
+}
 
-    /**
+/**
      * Set the session manager
      *
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure)
-    {
-        $this->set(SessionInterface::class, $xClosure);
-    }
+public function setSessionManager(Closure $xClosure)
+{
+$this->set(SessionInterface::class, $xClosure);
+}
 }

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

Switch Indentation +289 added lines, -289 removed lines

@@ -35,328 +35,328 @@ 
 
 class AssetManager
 {
-    /**
+/**
      * @var array<Filesystem>
      */
-    protected array $aStorage = [];
+protected array $aStorage = [];
 
-    /**
+/**
      * Default library URL
      *
      * @var string
      */
-    private const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.1.1/dist';
+private const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.1.1/dist';
 
-    /**
+/**
      * The constructor
      *
      * @param ConfigManager $xConfigManager
      * @param StorageManager $xStorageManager
      * @param MinifierInterface $xMinifier
      */
-    public function __construct(private ConfigManager $xConfigManager,
-        private StorageManager $xStorageManager, private MinifierInterface $xMinifier)
-    {}
+public function __construct(private ConfigManager $xConfigManager,
+private StorageManager $xStorageManager, private MinifierInterface $xMinifier)
+{}
 
-    /**
+/**
      * @return Config
      */
-    protected function config(): Config
-    {
-        return $this->xConfigManager->getExportConfig();
-    }
+protected function config(): Config
+{
+return $this->xConfigManager->getExportConfig();
+}
 
-    /**
+/**
      * @param string $sAsset "js" or "css"
      *
      * @return Filesystem
      */
-    protected function _storage(string $sAsset): Filesystem
-    {
-        if($this->config()->hasOption('storage'))
-        {
-            return $this->xStorageManager->get($this->config()->getOption('storage'));
-        }
-
-        $sRootDir = $this->getAssetDir($sAsset);
-        // Fylsystem options: we don't want the root dir to be created if it doesn't exist.
-        $aAdapterOptions = ['lazyRootCreation' => true];
-        $aDirOptions = [
-            'config' => [
-                'public_url' => $this->getAssetUri($sAsset),
-            ],
-        ];
-        return $this->xStorageManager
-            ->adapter('local', $aAdapterOptions)
-            ->make($sRootDir, $aDirOptions);
-    }
-
-    /**
+protected function _storage(string $sAsset): Filesystem
+{
+if($this->config()->hasOption('storage'))
+{
+return $this->xStorageManager->get($this->config()->getOption('storage'));
+}
+
+$sRootDir = $this->getAssetDir($sAsset);
+// Fylsystem options: we don't want the root dir to be created if it doesn't exist.
+$aAdapterOptions = ['lazyRootCreation' => true];
+$aDirOptions = [
+'config' => [
+    'public_url' => $this->getAssetUri($sAsset),
+],
+];
+return $this->xStorageManager
+->adapter('local', $aAdapterOptions)
+->make($sRootDir, $aDirOptions);
+}
+
+/**
      * @param string $sAsset "js" or "css"
      *
      * @return Filesystem
      */
-    protected function storage(string $sAsset): Filesystem
-    {
-        return $this->aStorage[$sAsset] ??= $this->_storage($sAsset);
-    }
+protected function storage(string $sAsset): Filesystem
+{
+return $this->aStorage[$sAsset] ??= $this->_storage($sAsset);
+}
 
-    /**
+/**
      * @param array $aValues
      *
      * @return string
      */
-    public function makeFileOptions(array $aValues): string
-    {
-        if(!isset($aValues['options']) || !$aValues['options'])
-        {
-            return '';
-        }
-        if(is_array($aValues['options']))
-        {
-            $aOptions = [];
-            foreach($aValues['options'] as $sName => $sValue)
-            {
-                $aOptions[] = "{$sName}=\"" . trim($sValue) . '"';
-            }
-            return implode(' ', $aOptions);
-        }
-        if(is_string($aValues['options']))
-        {
-            return trim($aValues['options']);
-        }
-        return '';
-    }
-
-    /**
+public function makeFileOptions(array $aValues): string
+{
+if(!isset($aValues['options']) || !$aValues['options'])
+{
+return '';
+}
+if(is_array($aValues['options']))
+{
+$aOptions = [];
+foreach($aValues['options'] as $sName => $sValue)
+{
+    $aOptions[] = "{$sName}=\"" . trim($sValue) . '"';
+}
+return implode(' ', $aOptions);
+}
+if(is_string($aValues['options']))
+{
+return trim($aValues['options']);
+}
+return '';
+}
+
+/**
      * Get app js options
      *
      * @return string
      */
-    public function getJsOptions(): string
-    {
-        // Revert to the options in the "lib" section in the config,
-        // if there is no options defined in the 'app' section.
-        if(!$this->xConfigManager->hasAppOption('assets'))
-        {
-            $sOptions = trim($this->config()->getOption('js.options', ''));
-            return $sOptions === '' ? 'charset="UTF-8"' : "$sOptions charset=\"UTF-8\"";
-        }
-
-        return $this->makeFileOptions([
-            'options' => $this->config()->getOption('js.options', ''),
-        ]);
-    }
-
-    /**
+public function getJsOptions(): string
+{
+// Revert to the options in the "lib" section in the config,
+// if there is no options defined in the 'app' section.
+if(!$this->xConfigManager->hasAppOption('assets'))
+{
+$sOptions = trim($this->config()->getOption('js.options', ''));
+return $sOptions === '' ? 'charset="UTF-8"' : "$sOptions charset=\"UTF-8\"";
+}
+
+return $this->makeFileOptions([
+'options' => $this->config()->getOption('js.options', ''),
+]);
+}
+
+/**
      * Get app js options
      *
      * @return string
      */
-    public function getCssOptions(): string
-    {
-        return $this->makeFileOptions([
-            'options' => $this->config()->getOption('css.options', ''),
-        ]);
-    }
-
-    /**
+public function getCssOptions(): string
+{
+return $this->makeFileOptions([
+'options' => $this->config()->getOption('css.options', ''),
+]);
+}
+
+/**
      * Check if the assets of this plugin shall be included in Jaxon generated code.
      *
      * @param Generator|CssGenerator|JsGenerator $xGenerator
      *
      * @return bool
      */
-    public function shallIncludeAssets(Generator|CssGenerator|JsGenerator $xGenerator): bool
-    {
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class))
-        {
-            return true;
-        }
-
-        /** @var AbstractPlugin */
-        $xPlugin = $xGenerator;
-        $sPluginOptionName = 'include.' . $xPlugin->getName();
-
-        return $this->config()->hasOption($sPluginOptionName) ?
-            $this->config()->getOption($sPluginOptionName) :
-            $this->config()->getOption('include.all', true);
-    }
-
-    /**
+public function shallIncludeAssets(Generator|CssGenerator|JsGenerator $xGenerator): bool
+{
+if(!is_subclass_of($xGenerator, AbstractPlugin::class))
+{
+return true;
+}
+
+/** @var AbstractPlugin */
+$xPlugin = $xGenerator;
+$sPluginOptionName = 'include.' . $xPlugin->getName();
+
+return $this->config()->hasOption($sPluginOptionName) ?
+$this->config()->getOption($sPluginOptionName) :
+$this->config()->getOption('include.all', true);
+}
+
+/**
      * Get the HTML tags to include Jaxon javascript files into the page
      *
      * @return array
      */
-    public function getJsLibUrls(): array
-    {
-        $sJsExtension = $this->config()->getOption('minify') ? '.min.js' : '.js';
-        // The URI for the javascript library files
-        $sJsLibUri = $this->xConfigManager->getOption('js.lib.uri', self::JS_LIB_URL);
-        $sJsLibUri = rtrim($sJsLibUri, '/');
-
-        // Add component files to the javascript file array.
-        $sChibiUrl = "$sJsLibUri/libs/chibi/chibi$sJsExtension";
-        $aJsUrls = [
-            $this->xConfigManager->getOption('js.lib.jq', $sChibiUrl),
-            "$sJsLibUri/jaxon.core$sJsExtension",
-        ];
-        if($this->xConfigManager->getOption('core.debug.on'))
-        {
-            $sLanguage = $this->xConfigManager->getOption('core.language');
-            $aJsUrls[] = "$sJsLibUri/jaxon.debug$sJsExtension";
-            $aJsUrls[] = "$sJsLibUri/lang/jaxon.$sLanguage$sJsExtension";
-        }
-
-        return $aJsUrls;
-    }
-
-    /**
+public function getJsLibUrls(): array
+{
+$sJsExtension = $this->config()->getOption('minify') ? '.min.js' : '.js';
+// The URI for the javascript library files
+$sJsLibUri = $this->xConfigManager->getOption('js.lib.uri', self::JS_LIB_URL);
+$sJsLibUri = rtrim($sJsLibUri, '/');
+
+// Add component files to the javascript file array.
+$sChibiUrl = "$sJsLibUri/libs/chibi/chibi$sJsExtension";
+$aJsUrls = [
+$this->xConfigManager->getOption('js.lib.jq', $sChibiUrl),
+"$sJsLibUri/jaxon.core$sJsExtension",
+];
+if($this->xConfigManager->getOption('core.debug.on'))
+{
+$sLanguage = $this->xConfigManager->getOption('core.language');
+$aJsUrls[] = "$sJsLibUri/jaxon.debug$sJsExtension";
+$aJsUrls[] = "$sJsLibUri/lang/jaxon.$sLanguage$sJsExtension";
+}
+
+return $aJsUrls;
+}
+
+/**
      * @param string $sAsset "js" or "css"
      *
      * @return string
      */
-    private function getAssetUri(string $sAsset): string
-    {
-        return rtrim($this->config()->hasOption("$sAsset.uri") ?
-            $this->config()->getOption("$sAsset.uri") :
-            $this->config()->getOption('uri', ''), '/');
-    }
-
-    /**
+private function getAssetUri(string $sAsset): string
+{
+return rtrim($this->config()->hasOption("$sAsset.uri") ?
+$this->config()->getOption("$sAsset.uri") :
+$this->config()->getOption('uri', ''), '/');
+}
+
+/**
      * @param string $sAsset "js" or "css"
      *
      * @return string
      */
-    private function getAssetDir(string $sAsset): string
-    {
-        return rtrim($this->config()->hasOption("$sAsset.dir") ?
-            $this->config()->getOption("$sAsset.dir") :
-            $this->config()->getOption('dir', ''), '/\/');
-    }
-
-    /**
+private function getAssetDir(string $sAsset): string
+{
+return rtrim($this->config()->hasOption("$sAsset.dir") ?
+$this->config()->getOption("$sAsset.dir") :
+$this->config()->getOption('dir', ''), '/\/');
+}
+
+/**
      * @param Closure $cGetHash
      * @param string $sAsset "js" or "css"
      *
      * @return string
      */
-    private function getAssetFile(Closure $cGetHash, string $sAsset): string
-    {
-        return $this->config()->hasOption("$sAsset.file") ?
-            $this->config()->getOption("$sAsset.file") :
-            // Make sure to call invoke callback only if required.
-            ($this->config()->hasOption("file") ?
-            $this->config()->getOption("file") : $cGetHash());
-    }
-
-    /**
+private function getAssetFile(Closure $cGetHash, string $sAsset): string
+{
+return $this->config()->hasOption("$sAsset.file") ?
+$this->config()->getOption("$sAsset.file") :
+// Make sure to call invoke callback only if required.
+($this->config()->hasOption("file") ?
+$this->config()->getOption("file") : $cGetHash());
+}
+
+/**
      * @param string $sAsset "js" or "css"
      *
      * @return bool
      */
-    private function minifyEnabled(string $sAsset): bool
-    {
-        return $this->config()->hasOption("$sAsset.minify") ?
-            $this->config()->getOption("$sAsset.minify") :
-            $this->config()->getOption('minify', false);
-    }
-
-    /**
+private function minifyEnabled(string $sAsset): bool
+{
+return $this->config()->hasOption("$sAsset.minify") ?
+$this->config()->getOption("$sAsset.minify") :
+$this->config()->getOption('minify', false);
+}
+
+/**
      * @param string $sAsset "js" or "css"
      *
      * @return bool
      */
-    private function exportEnabled(string $sAsset): bool
-    {
-        return $this->config()->hasOption("$sAsset.export") ?
-            $this->config()->getOption("$sAsset.export") :
-            $this->config()->getOption('export', false);
-    }
-
-    /**
+private function exportEnabled(string $sAsset): bool
+{
+return $this->config()->hasOption("$sAsset.export") ?
+$this->config()->getOption("$sAsset.export") :
+$this->config()->getOption('export', false);
+}
+
+/**
      * @param Filesystem $xStorage
      * @param string $sFilePath
      *
      * @return bool
      */
-    private function fileExists(Filesystem $xStorage, string $sFilePath): bool
-    {
-        try
-        {
-            return $xStorage->fileExists($sFilePath);
-        }
-        catch(Throwable $e)
-        {
-            Logger::warning("Unable to check asset file at $sFilePath.", [
-                'error' => $e->getMessage(),
-            ]);
-            return false;
-        }
-    }
-
-    /**
+private function fileExists(Filesystem $xStorage, string $sFilePath): bool
+{
+try
+{
+return $xStorage->fileExists($sFilePath);
+}
+catch(Throwable $e)
+{
+Logger::warning("Unable to check asset file at $sFilePath.", [
+    'error' => $e->getMessage(),
+]);
+return false;
+}
+}
+
+/**
      * @param Filesystem $xStorage
      * @param string $sFilePath
      * @param string $sContent
      *
      * @return bool
      */
-    private function writeFile(Filesystem $xStorage, string $sFilePath, string $sContent): bool
-    {
-        try
-        {
-            $xStorage->write($sFilePath, $sContent);
-            return true;
-        }
-        catch(Throwable $e)
-        {
-            Logger::warning("Unable to write to asset file at $sFilePath.", [
-                'error' => $e->getMessage(),
-            ]);
-            return false;
-        }
-    }
-
-    /**
+private function writeFile(Filesystem $xStorage, string $sFilePath, string $sContent): bool
+{
+try
+{
+$xStorage->write($sFilePath, $sContent);
+return true;
+}
+catch(Throwable $e)
+{
+Logger::warning("Unable to write to asset file at $sFilePath.", [
+    'error' => $e->getMessage(),
+]);
+return false;
+}
+}
+
+/**
      * @param string $sAsset "js" or "css"
      * @param string $sFilePath
      * @param string $sMinFilePath
      *
      * @return bool
      */
-    private function minifyAsset(string $sAsset, string $sFilePath, string $sMinFilePath): bool
-    {
-        if(!$this->minifyEnabled($sAsset))
-        {
-            return false;
-        }
-
-        $xStorage = $this->storage($sAsset);
-        if($xStorage->fileExists($sMinFilePath))
-        {
-            return true;
-        }
-
-        $sMinContent = $sAsset === 'js' ?
-            $this->xMinifier->minifyJsCode($xStorage->read($sFilePath)) :
-            $this->xMinifier->minifyCssCode($xStorage->read($sFilePath));
-        if($sMinContent === false || $sMinContent === '')
-        {
-            return false;
-        }
-
-        return $this->writeFile($xStorage, $sMinFilePath, $sMinContent);
-    }
-
-    private function getPublicUrl(string $sFilePath, string $sAsset): string
-    {
-        $sUri = $this->getAssetUri($sAsset);
-        return $sUri !== '' ? "$sUri/$sFilePath" :
-            $this->storage($sAsset)->publicUrl($sFilePath);
-    }
-
-    /**
+private function minifyAsset(string $sAsset, string $sFilePath, string $sMinFilePath): bool
+{
+if(!$this->minifyEnabled($sAsset))
+{
+return false;
+}
+
+$xStorage = $this->storage($sAsset);
+if($xStorage->fileExists($sMinFilePath))
+{
+return true;
+}
+
+$sMinContent = $sAsset === 'js' ?
+$this->xMinifier->minifyJsCode($xStorage->read($sFilePath)) :
+$this->xMinifier->minifyCssCode($xStorage->read($sFilePath));
+if($sMinContent === false || $sMinContent === '')
+{
+return false;
+}
+
+return $this->writeFile($xStorage, $sMinFilePath, $sMinContent);
+}
+
+private function getPublicUrl(string $sFilePath, string $sAsset): string
+{
+$sUri = $this->getAssetUri($sAsset);
+return $sUri !== '' ? "$sUri/$sFilePath" :
+$this->storage($sAsset)->publicUrl($sFilePath);
+}
+
+/**
      * Write javascript or css files and return the corresponding URI
      *
      * @param Closure $cGetHash
@@ -365,49 +365,49 @@ 
      *
      * @return string
      */
-    public function createFiles(Closure $cGetHash, Closure $cGetCode, string $sAsset): string
-    {
-        // Check if the config options allow the file creation.
-        // - The assets.js.export option must be set to true
-        // - The assets.js.uri and assets.js.dir options must be set to non null values
-        if(!$this->exportEnabled($sAsset) ||
-            // $this->getAssetUri($sAsset) === '' ||
-            $this->getAssetDir($sAsset) === '')
-        {
-            return '';
-        }
-
-        // Check dir access
-        $xStorage = $this->storage($sAsset);
-        $sFileName = $this->getAssetFile($cGetHash, $sAsset);
-        // - The assets.js.dir must be writable
-        if(!$sFileName || !$xStorage->directoryExists('') /*|| $xStorage->visibility('') !== 'public'*/)
-        {
-            return '';
-        }
-
-        $sFilePath = "{$sFileName}.{$sAsset}";
-        $sMinFilePath = "{$sFileName}.min.{$sAsset}";
-
-        // Try to create the file and write the code, if it doesn't exist.
-        if(!$this->fileExists($xStorage, $sFilePath) &&
-            !$this->writeFile($xStorage, $sFilePath, $cGetCode()))
-        {
-            return '';
-        }
-
-        if(!$this->minifyEnabled($sAsset))
-        {
-            return $this->getPublicUrl($sFilePath, $sAsset);
-        }
-
-        // If the file cannot be minified, return the plain js file.
-        return $this->minifyAsset($sAsset, $sFilePath, $sMinFilePath) ?
-            $this->getPublicUrl($sMinFilePath, $sAsset) :
-            $this->getPublicUrl($sFilePath, $sAsset);
-    }
-
-    /**
+public function createFiles(Closure $cGetHash, Closure $cGetCode, string $sAsset): string
+{
+// Check if the config options allow the file creation.
+// - The assets.js.export option must be set to true
+// - The assets.js.uri and assets.js.dir options must be set to non null values
+if(!$this->exportEnabled($sAsset) ||
+// $this->getAssetUri($sAsset) === '' ||
+$this->getAssetDir($sAsset) === '')
+{
+return '';
+}
+
+// Check dir access
+$xStorage = $this->storage($sAsset);
+$sFileName = $this->getAssetFile($cGetHash, $sAsset);
+// - The assets.js.dir must be writable
+if(!$sFileName || !$xStorage->directoryExists('') /*|| $xStorage->visibility('') !== 'public'*/)
+{
+return '';
+}
+
+$sFilePath = "{$sFileName}.{$sAsset}";
+$sMinFilePath = "{$sFileName}.min.{$sAsset}";
+
+// Try to create the file and write the code, if it doesn't exist.
+if(!$this->fileExists($xStorage, $sFilePath) &&
+!$this->writeFile($xStorage, $sFilePath, $cGetCode()))
+{
+return '';
+}
+
+if(!$this->minifyEnabled($sAsset))
+{
+return $this->getPublicUrl($sFilePath, $sAsset);
+}
+
+// If the file cannot be minified, return the plain js file.
+return $this->minifyAsset($sAsset, $sFilePath, $sMinFilePath) ?
+$this->getPublicUrl($sMinFilePath, $sAsset) :
+$this->getPublicUrl($sFilePath, $sAsset);
+}
+
+/**
      * Write javascript files and return the corresponding URI
      *
      * @param Closure $cGetHash
@@ -415,13 +415,13 @@ 
      *
      * @return string
      */
-    public function createJsFiles(Closure $cGetHash, Closure $cGetCode): string
-    {
-        // Using closures, so the code generator is actually called only if it is really required.
-        return $this->createFiles($cGetHash, $cGetCode, 'js');
-    }
+public function createJsFiles(Closure $cGetHash, Closure $cGetCode): string
+{
+// Using closures, so the code generator is actually called only if it is really required.
+return $this->createFiles($cGetHash, $cGetCode, 'js');
+}
 
-    /**
+/**
      * Write javascript files and return the corresponding URI
      *
      * @param Closure $cGetHash
@@ -429,9 +429,9 @@ 
      *
      * @return string
      */
-    public function createCssFiles(Closure $cGetHash, Closure $cGetCode): string
-    {
-        // Using closures, so the code generator is actually called only if it is really required.
-        return $this->createFiles($cGetHash, $cGetCode, 'css');
-    }
+public function createCssFiles(Closure $cGetHash, Closure $cGetCode): string
+{
+// Using closures, so the code generator is actually called only if it is really required.
+return $this->createFiles($cGetHash, $cGetCode, 'css');
+}
 }

Spacing +26 added lines, -35 removed lines

@@ -73,7 +73,7 @@ 
      */
     protected function _storage(string $sAsset): Filesystem
     {
-        if($this->config()->hasOption('storage'))
+        if ($this->config()->hasOption('storage'))
         {
             return $this->xStorageManager->get($this->config()->getOption('storage'));
         }
@@ -108,20 +108,20 @@ 
      */
     public function makeFileOptions(array $aValues): string
     {
-        if(!isset($aValues['options']) || !$aValues['options'])
+        if (!isset($aValues['options']) || !$aValues['options'])
         {
             return '';
         }
-        if(is_array($aValues['options']))
+        if (is_array($aValues['options']))
         {
             $aOptions = [];
-            foreach($aValues['options'] as $sName => $sValue)
+            foreach ($aValues['options'] as $sName => $sValue)
             {
                 $aOptions[] = "{$sName}=\"" . trim($sValue) . '"';
             }
             return implode(' ', $aOptions);
         }
-        if(is_string($aValues['options']))
+        if (is_string($aValues['options']))
         {
             return trim($aValues['options']);
         }
@@ -137,7 +137,7 @@ 
     {
         // Revert to the options in the "lib" section in the config,
         // if there is no options defined in the 'app' section.
-        if(!$this->xConfigManager->hasAppOption('assets'))
+        if (!$this->xConfigManager->hasAppOption('assets'))
         {
             $sOptions = trim($this->config()->getOption('js.options', ''));
             return $sOptions === '' ? 'charset="UTF-8"' : "$sOptions charset=\"UTF-8\"";
@@ -169,7 +169,7 @@ 
      */
     public function shallIncludeAssets(Generator|CssGenerator|JsGenerator $xGenerator): bool
     {
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class))
+        if (!is_subclass_of($xGenerator, AbstractPlugin::class))
         {
             return true;
         }
@@ -179,8 +179,7 @@ 
         $sPluginOptionName = 'include.' . $xPlugin->getName();
 
         return $this->config()->hasOption($sPluginOptionName) ?
-            $this->config()->getOption($sPluginOptionName) :
-            $this->config()->getOption('include.all', true);
+            $this->config()->getOption($sPluginOptionName) : $this->config()->getOption('include.all', true);
     }
 
     /**
@@ -201,7 +200,7 @@ 
             $this->xConfigManager->getOption('js.lib.jq', $sChibiUrl),
             "$sJsLibUri/jaxon.core$sJsExtension",
         ];
-        if($this->xConfigManager->getOption('core.debug.on'))
+        if ($this->xConfigManager->getOption('core.debug.on'))
         {
             $sLanguage = $this->xConfigManager->getOption('core.language');
             $aJsUrls[] = "$sJsLibUri/jaxon.debug$sJsExtension";
@@ -219,8 +218,7 @@ 
     private function getAssetUri(string $sAsset): string
     {
         return rtrim($this->config()->hasOption("$sAsset.uri") ?
-            $this->config()->getOption("$sAsset.uri") :
-            $this->config()->getOption('uri', ''), '/');
+            $this->config()->getOption("$sAsset.uri") : $this->config()->getOption('uri', ''), '/');
     }
 
     /**
@@ -231,8 +229,7 @@ 
     private function getAssetDir(string $sAsset): string
     {
         return rtrim($this->config()->hasOption("$sAsset.dir") ?
-            $this->config()->getOption("$sAsset.dir") :
-            $this->config()->getOption('dir', ''), '/\/');
+            $this->config()->getOption("$sAsset.dir") : $this->config()->getOption('dir', ''), '/\/');
     }
 
     /**
@@ -244,8 +241,7 @@ 
     private function getAssetFile(Closure $cGetHash, string $sAsset): string
     {
         return $this->config()->hasOption("$sAsset.file") ?
-            $this->config()->getOption("$sAsset.file") :
-            // Make sure to call invoke callback only if required.
+            $this->config()->getOption("$sAsset.file") : // Make sure to call invoke callback only if required.
             ($this->config()->hasOption("file") ?
             $this->config()->getOption("file") : $cGetHash());
     }
@@ -258,8 +254,7 @@ 
     private function minifyEnabled(string $sAsset): bool
     {
         return $this->config()->hasOption("$sAsset.minify") ?
-            $this->config()->getOption("$sAsset.minify") :
-            $this->config()->getOption('minify', false);
+            $this->config()->getOption("$sAsset.minify") : $this->config()->getOption('minify', false);
     }
 
     /**
@@ -270,8 +265,7 @@ 
     private function exportEnabled(string $sAsset): bool
     {
         return $this->config()->hasOption("$sAsset.export") ?
-            $this->config()->getOption("$sAsset.export") :
-            $this->config()->getOption('export', false);
+            $this->config()->getOption("$sAsset.export") : $this->config()->getOption('export', false);
     }
 
     /**
@@ -286,7 +280,7 @@ 
         {
             return $xStorage->fileExists($sFilePath);
         }
-        catch(Throwable $e)
+        catch (Throwable $e)
         {
             Logger::warning("Unable to check asset file at $sFilePath.", [
                 'error' => $e->getMessage(),
@@ -309,7 +303,7 @@ 
             $xStorage->write($sFilePath, $sContent);
             return true;
         }
-        catch(Throwable $e)
+        catch (Throwable $e)
         {
             Logger::warning("Unable to write to asset file at $sFilePath.", [
                 'error' => $e->getMessage(),
@@ -327,21 +321,20 @@ 
      */
     private function minifyAsset(string $sAsset, string $sFilePath, string $sMinFilePath): bool
     {
-        if(!$this->minifyEnabled($sAsset))
+        if (!$this->minifyEnabled($sAsset))
         {
             return false;
         }
 
         $xStorage = $this->storage($sAsset);
-        if($xStorage->fileExists($sMinFilePath))
+        if ($xStorage->fileExists($sMinFilePath))
         {
             return true;
         }
 
         $sMinContent = $sAsset === 'js' ?
-            $this->xMinifier->minifyJsCode($xStorage->read($sFilePath)) :
-            $this->xMinifier->minifyCssCode($xStorage->read($sFilePath));
-        if($sMinContent === false || $sMinContent === '')
+            $this->xMinifier->minifyJsCode($xStorage->read($sFilePath)) : $this->xMinifier->minifyCssCode($xStorage->read($sFilePath));
+        if ($sMinContent === false || $sMinContent === '')
         {
             return false;
         }
@@ -352,8 +345,7 @@ 
     private function getPublicUrl(string $sFilePath, string $sAsset): string
     {
         $sUri = $this->getAssetUri($sAsset);
-        return $sUri !== '' ? "$sUri/$sFilePath" :
-            $this->storage($sAsset)->publicUrl($sFilePath);
+        return $sUri !== '' ? "$sUri/$sFilePath" : $this->storage($sAsset)->publicUrl($sFilePath);
     }
 
     /**
@@ -370,7 +362,7 @@ 
         // Check if the config options allow the file creation.
         // - The assets.js.export option must be set to true
         // - The assets.js.uri and assets.js.dir options must be set to non null values
-        if(!$this->exportEnabled($sAsset) ||
+        if (!$this->exportEnabled($sAsset) ||
             // $this->getAssetUri($sAsset) === '' ||
             $this->getAssetDir($sAsset) === '')
         {
@@ -381,7 +373,7 @@ 
         $xStorage = $this->storage($sAsset);
         $sFileName = $this->getAssetFile($cGetHash, $sAsset);
         // - The assets.js.dir must be writable
-        if(!$sFileName || !$xStorage->directoryExists('') /*|| $xStorage->visibility('') !== 'public'*/)
+        if (!$sFileName || !$xStorage->directoryExists('') /*|| $xStorage->visibility('') !== 'public'*/)
         {
             return '';
         }
@@ -390,21 +382,20 @@ 
         $sMinFilePath = "{$sFileName}.min.{$sAsset}";
 
         // Try to create the file and write the code, if it doesn't exist.
-        if(!$this->fileExists($xStorage, $sFilePath) &&
+        if (!$this->fileExists($xStorage, $sFilePath) &&
             !$this->writeFile($xStorage, $sFilePath, $cGetCode()))
         {
             return '';
         }
 
-        if(!$this->minifyEnabled($sAsset))
+        if (!$this->minifyEnabled($sAsset))
         {
             return $this->getPublicUrl($sFilePath, $sAsset);
         }
 
         // If the file cannot be minified, return the plain js file.
         return $this->minifyAsset($sAsset, $sFilePath, $sMinFilePath) ?
-            $this->getPublicUrl($sMinFilePath, $sAsset) :
-            $this->getPublicUrl($sFilePath, $sAsset);
+            $this->getPublicUrl($sMinFilePath, $sAsset) : $this->getPublicUrl($sFilePath, $sAsset);
     }
 
     /**

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

Switch Indentation +58 added lines, -58 removed lines

@@ -165,68 +165,68 @@
                 $aCssFile = match(true) {
                     is_string($xUrl) => ['uri' => $xUrl, 'options' => []],
                     is_array($xUrl) => $xUrl,
-                    default => null,
-                };
-                if($aCssFile !== null)
-                {
-                    // Save the HTML tag for the file.
-                    $this->aCssTags[] = $renderTag($aCssFile);
-                }
-            }
-        }
-        // CSS code
-        if(($aCssCode = trim($xCode->code(), self::TRIM)) !== '')
-        {
-            $this->aCssCodes[] = $aCssCode;
-        }
-    }
+default => null,
+};
+if($aCssFile !== null)
+{
+// Save the HTML tag for the file.
+$this->aCssTags[] = $renderTag($aCssFile);
+}
+}
+}
+// CSS code
+if(($aCssCode = trim($xCode->code(), self::TRIM)) !== '')
+{
+$this->aCssCodes[] = $aCssCode;
+}
+}
 
-    /**
+/**
      * @param CodeGeneratorInterface $xCodeGenerator
      * @param Closure $renderTag
      *
      * @return void
      */
-    public function mergeJsCode(JsCodeGeneratorInterface $xGenerator,
-        Closure $renderTag, bool $bIncludeAssets): void
-    {
-        $xCode = $xGenerator->getJsCode();
-        if($bIncludeAssets)
-        {
-            // Javascript html tags
-            if(($aJsHtml = trim($xCode->html(), self::TRIM)) !== '')
-            {
-                $this->aJsTags[] = $aJsHtml;
-            }
-            // HTML tags for js
-            foreach($xCode->urls() as $xUrl)
-            {
-                $aJsFile = match(true) {
-                    is_string($xUrl) => ['uri' => $xUrl, 'options' => []],
-                    is_array($xUrl) => $xUrl,
-                    default => null,
-                };
-                if($aJsFile !== null)
-                {
-                    // Save the HTML tag for the file.
-                    $this->aJsTags[] = $renderTag($aJsFile);
-                }
-            }
-        }
-        // Javascript codes
-        if(($aJsCode = trim($xCode->code(), self::TRIM)) !== '')
-        {
-            $this->aJsCodes[] = $aJsCode;
-        }
-        // Javascript codes before the main code
-        if(($aJsCode = trim($xCode->before(), self::TRIM)) !== '')
-        {
-            $this->aJsCodesBefore[] = $aJsCode;
-        }
-        // Javascript codes after the main code
-        if(($aJsCode = trim($xCode->after(), self::TRIM)) !== '')
-        {
-            $this->aJsCodesAfter[] = $aJsCode;
-        }
-    }
+public function mergeJsCode(JsCodeGeneratorInterface $xGenerator,
+Closure $renderTag, bool $bIncludeAssets): void
+{
+$xCode = $xGenerator->getJsCode();
+if($bIncludeAssets)
+{
+// Javascript html tags
+if(($aJsHtml = trim($xCode->html(), self::TRIM)) !== '')
+{
+$this->aJsTags[] = $aJsHtml;
+}
+// HTML tags for js
+foreach($xCode->urls() as $xUrl)
+{
+$aJsFile = match(true) {
+is_string($xUrl) => ['uri' => $xUrl, 'options' => []],
+is_array($xUrl) => $xUrl,
+default => null,
+};
+if($aJsFile !== null)
+{
+// Save the HTML tag for the file.
+$this->aJsTags[] = $renderTag($aJsFile);
+}
+}
+}
+// Javascript codes
+if(($aJsCode = trim($xCode->code(), self::TRIM)) !== '')
+{
+$this->aJsCodes[] = $aJsCode;
+}
+// Javascript codes before the main code
+if(($aJsCode = trim($xCode->before(), self::TRIM)) !== '')
+{
+$this->aJsCodesBefore[] = $aJsCode;
+}
+// Javascript codes after the main code
+if(($aJsCode = trim($xCode->after(), self::TRIM)) !== '')
+{
+$this->aJsCodesAfter[] = $aJsCode;
+}
+}
 }

Spacing +16 added lines, -16 removed lines

@@ -122,21 +122,21 @@ 
      */
     public function mergeCode(CodeGeneratorInterface $xGenerator, bool $bIncludeAssets): void
     {
-        if($bIncludeAssets)
+        if ($bIncludeAssets)
         {
             // HTML tags for CSS
-            if(($sCssTags = trim($xGenerator->getCss(), self::TRIM)) !== '')
+            if (($sCssTags = trim($xGenerator->getCss(), self::TRIM)) !== '')
             {
                 $this->aCssTags[] = $sCssTags;
             }
             // HTML tags for js
-            if(($sJsTags = trim($xGenerator->getJs(), self::TRIM)) !== '')
+            if (($sJsTags = trim($xGenerator->getJs(), self::TRIM)) !== '')
             {
                 $this->aJsTags[] = $sJsTags;
             }
         }
         // Javascript code
-        if(($sJsScript = trim($xGenerator->getScript(), self::TRIM)) !== '')
+        if (($sJsScript = trim($xGenerator->getScript(), self::TRIM)) !== '')
         {
             $this->aJsCodes[] = $sJsScript;
         }
@@ -152,22 +152,22 @@ 
         Closure $renderTag, bool $bIncludeAssets): void
     {
         $xCode = $xGenerator->getCssCode();
-        if($bIncludeAssets)
+        if ($bIncludeAssets)
         {
             // CSS html tags
-            if(($aCssHtml = trim($xCode->html(), self::TRIM)) !== '')
+            if (($aCssHtml = trim($xCode->html(), self::TRIM)) !== '')
             {
                 $this->aCssTags[] = $aCssHtml;
             }
             // HTML tags for CSS
-            foreach($xCode->urls() as $xUrl)
+            foreach ($xCode->urls() as $xUrl)
             {
                 $aCssFile = match(true) {
                     is_string($xUrl) => ['uri' => $xUrl, 'options' => []],
                     is_array($xUrl) => $xUrl,
                     default => null,
                 };
-                if($aCssFile !== null)
+                if ($aCssFile !== null)
                 {
                     // Save the HTML tag for the file.
                     $this->aCssTags[] = $renderTag($aCssFile);
@@ -175,7 +175,7 @@ 
             }
         }
         // CSS code
-        if(($aCssCode = trim($xCode->code(), self::TRIM)) !== '')
+        if (($aCssCode = trim($xCode->code(), self::TRIM)) !== '')
         {
             $this->aCssCodes[] = $aCssCode;
         }
@@ -191,22 +191,22 @@ 
         Closure $renderTag, bool $bIncludeAssets): void
     {
         $xCode = $xGenerator->getJsCode();
-        if($bIncludeAssets)
+        if ($bIncludeAssets)
         {
             // Javascript html tags
-            if(($aJsHtml = trim($xCode->html(), self::TRIM)) !== '')
+            if (($aJsHtml = trim($xCode->html(), self::TRIM)) !== '')
             {
                 $this->aJsTags[] = $aJsHtml;
             }
             // HTML tags for js
-            foreach($xCode->urls() as $xUrl)
+            foreach ($xCode->urls() as $xUrl)
             {
                 $aJsFile = match(true) {
                     is_string($xUrl) => ['uri' => $xUrl, 'options' => []],
                     is_array($xUrl) => $xUrl,
                     default => null,
                 };
-                if($aJsFile !== null)
+                if ($aJsFile !== null)
                 {
                     // Save the HTML tag for the file.
                     $this->aJsTags[] = $renderTag($aJsFile);
@@ -214,17 +214,17 @@ 
             }
         }
         // Javascript codes
-        if(($aJsCode = trim($xCode->code(), self::TRIM)) !== '')
+        if (($aJsCode = trim($xCode->code(), self::TRIM)) !== '')
         {
             $this->aJsCodes[] = $aJsCode;
         }
         // Javascript codes before the main code
-        if(($aJsCode = trim($xCode->before(), self::TRIM)) !== '')
+        if (($aJsCode = trim($xCode->before(), self::TRIM)) !== '')
         {
             $this->aJsCodesBefore[] = $aJsCode;
         }
         // Javascript codes after the main code
-        if(($aJsCode = trim($xCode->after(), self::TRIM)) !== '')
+        if (($aJsCode = trim($xCode->after(), self::TRIM)) !== '')
         {
             $this->aJsCodesAfter[] = $aJsCode;
         }

jaxon-core/src/Plugin/JsCode.php

Switch Indentation +30 added lines, -30 removed lines

@@ -16,75 +16,75 @@
 
 class JsCode
 {
-    /**
+/**
      * @param string $sCode
      * @param string $sHtml
      * @param array $aUrls
      * @param string $sCodeBefore
      * @param string $sCodeAfter
      */
-    public function __construct(protected string $sCode = '',
-        protected string $sHtml = '', protected array $aUrls = [],
-        protected string $sCodeBefore = '', protected string $sCodeAfter = '')
-    {}
+public function __construct(protected string $sCode = '',
+protected string $sHtml = '', protected array $aUrls = [],
+protected string $sCodeBefore = '', protected string $sCodeAfter = '')
+{}
 
-    /**
+/**
      * Get the javascript files to include into the page
      *
      * Each entry can be a string or an array with "uri" and "options".
      *
      * @return array
      */
-    public function urls(): array
-    {
-        return $this->aUrls;
-    }
+public function urls(): array
+{
+return $this->aUrls;
+}
 
-    /**
+/**
      * Get the javascript code to include into the page
      *
      * The code must NOT be enclosed in HTML tags.
      *
      * @return string
      */
-    public function code(): string
-    {
-        return $this->sCode;
-    }
+public function code(): string
+{
+return $this->sCode;
+}
 
-    /**
+/**
      * Get the javascript code to include into the page
      *
      * The code must be enclosed in HTML tags.
      *
      * @return string
      */
-    public function html(): string
-    {
-        return $this->sHtml;
-    }
+public function html(): string
+{
+return $this->sHtml;
+}
 
-    /**
+/**
      * Get the javascript code to be inserted inline before the main code
      *
      * The code must NOT be enclosed in HTML tags.
      *
      * @return string
      */
-    public function before(): string
-    {
-        return $this->sCodeBefore;
-    }
+public function before(): string
+{
+return $this->sCodeBefore;
+}
 
-    /**
+/**
      * Get the javascript code to be inserted inline after the main code
      *
      * The code must NOT be enclosed in HTML tags.
      *
      * @return string
      */
-    public function after(): string
-    {
-        return $this->sCodeAfter;
-    }
+public function after(): string
+{
+return $this->sCodeAfter;
+}
 }