jaxon-php / jaxon-mono

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

Switch Indentation +59 added lines, -59 removed lines

@@ -241,83 +241,83 @@
                 $this->aComponentPublicMethods['node'],
             $xReflectionClass->isSubclassOf(FuncComponent::class) =>
                 $this->aComponentPublicMethods['func'],
-            default => [[], []],
-        };
+default => [[], []],
+};
 
-        return [$aMethods, ...$aBaseMethods];
-    }
+return [$aMethods, ...$aBaseMethods];
+}
 
-    /**
+/**
      * @param ReflectionClass $xReflectionClass
      * @param array $aMethods
      * @param array $aOptions
      *
      * @return Metadata|null
      */
-    private function getComponentMetadata(ReflectionClass $xReflectionClass,
-        array $aMethods, array $aOptions): Metadata|null
-    {
-        /** @var Config|null */
-        $xPackageConfig = $aOptions['config'] ?? null;
-        if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
-        {
-            return null;
-        }
-        $sMetadataFormat = $xPackageConfig->getOption('metadata.format');
-        if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
-        {
-            return null;
-        }
+private function getComponentMetadata(ReflectionClass $xReflectionClass,
+array $aMethods, array $aOptions): Metadata|null
+{
+/** @var Config|null */
+$xPackageConfig = $aOptions['config'] ?? null;
+if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
+{
+return null;
+}
+$sMetadataFormat = $xPackageConfig->getOption('metadata.format');
+if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
+{
+return null;
+}
 
-        // Try to get the class metadata from the cache.
-        $di = $this->cn();
-        $xMetadata = null;
-        $xMetadataCache = null;
-        $xConfig = $di->config();
-        if($xConfig->getAppOption('metadata.cache.enabled', false))
-        {
-            if(!$di->h('jaxon_metadata_cache_dir'))
-            {
-                $sCacheDir = $xConfig->getAppOption('metadata.cache.dir');
-                $di->val('jaxon_metadata_cache_dir', $sCacheDir);
-            }
-            $xMetadataCache = $di->getMetadataCache();
-            $xMetadata = $xMetadataCache->read($xReflectionClass->getName());
-            if($xMetadata !== null)
-            {
-                return $xMetadata;
-            }
-        }
+// Try to get the class metadata from the cache.
+$di = $this->cn();
+$xMetadata = null;
+$xMetadataCache = null;
+$xConfig = $di->config();
+if($xConfig->getAppOption('metadata.cache.enabled', false))
+{
+if(!$di->h('jaxon_metadata_cache_dir'))
+{
+    $sCacheDir = $xConfig->getAppOption('metadata.cache.dir');
+    $di->val('jaxon_metadata_cache_dir', $sCacheDir);
+}
+$xMetadataCache = $di->getMetadataCache();
+$xMetadata = $xMetadataCache->read($xReflectionClass->getName());
+if($xMetadata !== null)
+{
+    return $xMetadata;
+}
+}
 
-        $aProperties = array_map(fn($xProperty) => $xProperty->getName(),
-            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
-                ReflectionProperty::IS_PROTECTED));
+$aProperties = array_map(fn($xProperty) => $xProperty->getName(),
+$xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
+    ReflectionProperty::IS_PROTECTED));
 
-        $xMetadataReader = $di->getMetadataReader($sMetadataFormat);
-        $xInput = new InputData($xReflectionClass, $aMethods, $aProperties);
-        $xMetadata = $xMetadataReader->getAttributes($xInput);
+$xMetadataReader = $di->getMetadataReader($sMetadataFormat);
+$xInput = new InputData($xReflectionClass, $aMethods, $aProperties);
+$xMetadata = $xMetadataReader->getAttributes($xInput);
 
-        // Try to save the metadata in the cache
-        if($xMetadataCache !== null)
-        {
-            $xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
-        }
+// Try to save the metadata in the cache
+if($xMetadataCache !== null)
+{
+$xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
+}
 
-        return $xMetadata;
-    }
+return $xMetadata;
+}
 
-    /**
+/**
      * @param ReflectionClass $xReflectionClass
      * @param array $aOptions
      *
      * @return ComponentOptions
      */
-    public function getComponentOptions(ReflectionClass $xReflectionClass,
-        array $aOptions): ComponentOptions
-    {
-        $aMethods = $this->getPublicMethods($xReflectionClass);
-        $xMetadata = $this->getComponentMetadata($xReflectionClass, $aMethods[0], $aOptions);
+public function getComponentOptions(ReflectionClass $xReflectionClass,
+array $aOptions): ComponentOptions
+{
+$aMethods = $this->getPublicMethods($xReflectionClass);
+$xMetadata = $this->getComponentMetadata($xReflectionClass, $aMethods[0], $aOptions);
 
-        return new ComponentOptions($aMethods, $aOptions, $xMetadata);
-    }
+return new ComponentOptions($aMethods, $aOptions, $xMetadata);
+}
 }

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

Switch Indentation +139 added lines, -139 removed lines

@@ -35,154 +35,154 @@ 
 
 trait PluginTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerPlugins(): void
-    {
-        // Plugin manager
-        $this->set(PluginManager::class, function($di) {
-            $xPluginManager = new PluginManager($di->g(Container::class),
-                $di->g(CodeGenerator::class), $di->g(Translator::class));
-            // Register the Jaxon request and response plugins
-            $xPluginManager->registerPlugins();
-            return $xPluginManager;
-        });
-        // Package manager
-        $this->set(PackageManager::class, function($di) {
-            return new PackageManager($di->g(Container::class), $di->g(Translator::class),
-                $di->g(PluginManager::class), $di->g(ConfigManager::class),
-                $di->g(CodeGenerator::class), $di->g(ViewRenderer::class),
-                $di->g(CallbackManager::class), $di->g(ComponentRegistry::class));
-        });
-        // Code Generation
-        $this->set(MinifierInterface::class, function() {
-            return new class extends FileMinifier implements MinifierInterface
-            {};
-        });
-        $this->set(AssetManager::class, function($di) {
-            return new AssetManager($di->g(ConfigManager::class),
-                $di->g(MinifierInterface::class));
-        });
-        $this->set(CodeGenerator::class, function($di) {
-            return new CodeGenerator(Jaxon::VERSION, $di->g(Container::class),
-                $di->g(TemplateEngine::class));
-        });
-        $this->set(ConfigScriptGenerator::class, function($di) {
-            return new ConfigScriptGenerator($di->g(ParameterReader::class),
-                $di->g(TemplateEngine::class), $di->g(ConfigManager::class));
-        });
-        $this->set(ReadyScriptGenerator::class, function($di) {
-            return new ReadyScriptGenerator();
-        });
-
-        // Script response plugin
-        $this->set(ScriptPlugin::class, function($di) {
-            return new ScriptPlugin($di->g(CallFactory::class));
-        });
-        // Databag response plugin
-        $this->set(DatabagPlugin::class, function($di) {
-            return new DatabagPlugin($di->g(Container::class));
-        });
-        // Dialog response plugin
-        $this->set(DialogPlugin::class, function($di) {
-            return new DialogPlugin($di->g(DialogCommand::class));
-        });
-        // Paginator response plugin
-        $this->set(PaginatorPlugin::class, function($di) {
-            return new PaginatorPlugin($di->g(RendererInterface::class));
-        });
-    }
-
-    /**
+private function registerPlugins(): void
+{
+// Plugin manager
+$this->set(PluginManager::class, function($di) {
+$xPluginManager = new PluginManager($di->g(Container::class),
+    $di->g(CodeGenerator::class), $di->g(Translator::class));
+// Register the Jaxon request and response plugins
+$xPluginManager->registerPlugins();
+return $xPluginManager;
+});
+// Package manager
+$this->set(PackageManager::class, function($di) {
+return new PackageManager($di->g(Container::class), $di->g(Translator::class),
+    $di->g(PluginManager::class), $di->g(ConfigManager::class),
+    $di->g(CodeGenerator::class), $di->g(ViewRenderer::class),
+    $di->g(CallbackManager::class), $di->g(ComponentRegistry::class));
+});
+// Code Generation
+$this->set(MinifierInterface::class, function() {
+return new class extends FileMinifier implements MinifierInterface
+{};
+});
+$this->set(AssetManager::class, function($di) {
+return new AssetManager($di->g(ConfigManager::class),
+    $di->g(MinifierInterface::class));
+});
+$this->set(CodeGenerator::class, function($di) {
+return new CodeGenerator(Jaxon::VERSION, $di->g(Container::class),
+    $di->g(TemplateEngine::class));
+});
+$this->set(ConfigScriptGenerator::class, function($di) {
+return new ConfigScriptGenerator($di->g(ParameterReader::class),
+    $di->g(TemplateEngine::class), $di->g(ConfigManager::class));
+});
+$this->set(ReadyScriptGenerator::class, function($di) {
+return new ReadyScriptGenerator();
+});
+
+// Script response plugin
+$this->set(ScriptPlugin::class, function($di) {
+return new ScriptPlugin($di->g(CallFactory::class));
+});
+// Databag response plugin
+$this->set(DatabagPlugin::class, function($di) {
+return new DatabagPlugin($di->g(Container::class));
+});
+// Dialog response plugin
+$this->set(DialogPlugin::class, function($di) {
+return new DialogPlugin($di->g(DialogCommand::class));
+});
+// Paginator response plugin
+$this->set(PaginatorPlugin::class, function($di) {
+return new PaginatorPlugin($di->g(RendererInterface::class));
+});
+}
+
+/**
      * Get the plugin manager
      *
      * @return PluginManager
      */
-    public function getPluginManager(): PluginManager
-    {
-        return $this->g(PluginManager::class);
-    }
+public function getPluginManager(): PluginManager
+{
+return $this->g(PluginManager::class);
+}
 
-    /**
+/**
      * Get the package manager
      *
      * @return PackageManager
      */
-    public function getPackageManager(): PackageManager
-    {
-        return $this->g(PackageManager::class);
-    }
+public function getPackageManager(): PackageManager
+{
+return $this->g(PackageManager::class);
+}
 
-    /**
+/**
      * Get the code generator
      *
      * @return CodeGenerator
      */
-    public function getCodeGenerator(): CodeGenerator
-    {
-        return $this->g(CodeGenerator::class);
-    }
+public function getCodeGenerator(): CodeGenerator
+{
+return $this->g(CodeGenerator::class);
+}
 
-    /**
+/**
      * Get the asset manager
      *
      * @return AssetManager
      */
-    public function getAssetManager(): AssetManager
-    {
-        return $this->g(AssetManager::class);
-    }
+public function getAssetManager(): AssetManager
+{
+return $this->g(AssetManager::class);
+}
 
-    /**
+/**
      * Get the jQuery plugin
      *
      * @return ScriptPlugin
      */
-    public function getScriptPlugin(): ScriptPlugin
-    {
-        return $this->g(ScriptPlugin::class);
-    }
+public function getScriptPlugin(): ScriptPlugin
+{
+return $this->g(ScriptPlugin::class);
+}
 
-    /**
+/**
      * Get the dialog plugin
      *
      * @return DialogPlugin
      */
-    public function getDialogPlugin(): DialogPlugin
-    {
-        return $this->g(DialogPlugin::class);
-    }
+public function getDialogPlugin(): DialogPlugin
+{
+return $this->g(DialogPlugin::class);
+}
 
-    /**
+/**
      * @param class-string $sClassName    The package class name
      *
      * @return string
      */
-    private function getPackageConfigKey(string $sClassName): string
-    {
-        return $sClassName . '_PackageConfig';
-    }
+private function getPackageConfigKey(string $sClassName): string
+{
+return $sClassName . '_PackageConfig';
+}
 
-    /**
+/**
      * @param class-string $sClassName    The package class name
      * @param-closure-this AbstractPackage $cSetter
      *
      * @return void
      */
-    private function extendPackage(string $sClassName, Closure $cSetter): void
-    {
-        // Initialize the package instance.
-        $this->xLibContainer->extend($sClassName, function($xPackage) use($cSetter) {
-            // Allow the setter to access protected attributes.
-            call_user_func($cSetter->bindTo($xPackage, $xPackage));
-            return $xPackage;
-        });
-    }
-
-    /**
+private function extendPackage(string $sClassName, Closure $cSetter): void
+{
+// Initialize the package instance.
+$this->xLibContainer->extend($sClassName, function($xPackage) use($cSetter) {
+// Allow the setter to access protected attributes.
+call_user_func($cSetter->bindTo($xPackage, $xPackage));
+return $xPackage;
+});
+}
+
+/**
      * Register a package
      *
      * @param class-string $sClassName    The package class name
@@ -191,45 +191,45 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $aUserOptions): void
-    {
-        // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
-        {
-            $this->set($sClassName, fn() => $this->make($sClassName));
-        }
-
-        // Save the package config in the container.
-        $sConfigKey = $this->getPackageConfigKey($sClassName);
-        $this->set($sConfigKey, function($di) use($aUserOptions) {
-            $xOptionsProvider = $aUserOptions['provider'] ?? null;
-            // The user can provide a callable that returns the package options.
-            if(is_callable($xOptionsProvider))
-            {
-                $aUserOptions = $xOptionsProvider($aUserOptions);
-            }
-            return $di->g(ConfigManager::class)->newConfig($aUserOptions);
-        });
-
-        // Initialize the package instance.
-        $di = $this;
-        $this->extendPackage($sClassName, function() use($di, $sConfigKey) {
-            // $this here refers to the AbstractPackage instance.
-            $this->xPkgConfig = $di->g($sConfigKey);
-            $this->xRenderer = $di->g(ViewRenderer::class);
-            $this->init();
-        });
-    }
-
-    /**
+public function registerPackage(string $sClassName, array $aUserOptions): void
+{
+// Register the user class, but only if the user didn't already.
+if(!$this->h($sClassName))
+{
+$this->set($sClassName, fn() => $this->make($sClassName));
+}
+
+// Save the package config in the container.
+$sConfigKey = $this->getPackageConfigKey($sClassName);
+$this->set($sConfigKey, function($di) use($aUserOptions) {
+$xOptionsProvider = $aUserOptions['provider'] ?? null;
+// The user can provide a callable that returns the package options.
+if(is_callable($xOptionsProvider))
+{
+    $aUserOptions = $xOptionsProvider($aUserOptions);
+}
+return $di->g(ConfigManager::class)->newConfig($aUserOptions);
+});
+
+// Initialize the package instance.
+$di = $this;
+$this->extendPackage($sClassName, function() use($di, $sConfigKey) {
+// $this here refers to the AbstractPackage instance.
+$this->xPkgConfig = $di->g($sConfigKey);
+$this->xRenderer = $di->g(ViewRenderer::class);
+$this->init();
+});
+}
+
+/**
      * Get the config of a package
      *
      * @param class-string $sClassName    The package class name
      *
      * @return Config
      */
-    public function getPackageConfig(string $sClassName): Config
-    {
-        return $this->g($this->getPackageConfigKey($sClassName));
-    }
+public function getPackageConfig(string $sClassName): Config
+{
+return $this->g($this->getPackageConfigKey($sClassName));
+}
 }

jaxon-core/src/App/View/Store.php

Switch Indentation +55 added lines, -55 removed lines

@@ -9,35 +9,35 @@ 
 
 class Store implements JsonSerializable, Stringable
 {
-    /**
+/**
      * The view renderer
      *
      * @var ViewInterface|null
      */
-    protected $xRenderer = null;
+protected $xRenderer = null;
 
-    /**
+/**
      * The view namespace
      *
      * @var string
      */
-    protected $sNamespace;
+protected $sNamespace;
 
-    /**
+/**
      * The view name
      *
      * @var string
      */
-    protected $sViewName;
+protected $sViewName;
 
-    /**
+/**
      * The view data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -45,26 +45,26 @@ 
      *
      * @return Store
      */
-    public function with(string $sName, $xValue): Store
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function with(string $sName, $xValue): Store
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Set the data to be rendered
      *
      * @param array $aViewData    The view data
      *
      * @return Store
      */
-    public function setData(array $aViewData): Store
-    {
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setData(array $aViewData): Store
+{
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Set the view to be rendered, with optional data
      *
      * @param ViewInterface $xRenderer    The view renderer
@@ -74,65 +74,65 @@ 
      *
      * @return Store
      */
-    public function setView(ViewInterface $xRenderer,
-        string $sNamespace, string $sViewName, array $aViewData = []): Store
-    {
-        $this->xRenderer = $xRenderer;
-        $this->sNamespace = trim($sNamespace);
-        $this->sViewName = trim($sViewName);
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setView(ViewInterface $xRenderer,
+string $sNamespace, string $sViewName, array $aViewData = []): Store
+{
+$this->xRenderer = $xRenderer;
+$this->sNamespace = trim($sNamespace);
+$this->sViewName = trim($sViewName);
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Get the view namespace
      *
      * @return string        The view namespace
      */
-    public function getNamespace(): string
-    {
-        return $this->sNamespace;
-    }
+public function getNamespace(): string
+{
+return $this->sNamespace;
+}
 
-    /**
+/**
      * Get the view name
      *
      * @return string        The view name
      */
-    public function getViewName(): string
-    {
-        return $this->sViewName;
-    }
+public function getViewName(): string
+{
+return $this->sViewName;
+}
 
-    /**
+/**
      * Get the view data
      *
      * @return array         The view data
      */
-    public function getViewData(): array
-    {
-        return $this->aViewData;
-    }
+public function getViewData(): array
+{
+return $this->aViewData;
+}
 
-    /**
+/**
      * Render a view using third party view system
      *
      * @return string        The string representation of the view
      */
-    public function __toString(): string
-    {
-        return !$this->xRenderer ? '' : $this->xRenderer->render($this);
-    }
+public function __toString(): string
+{
+return !$this->xRenderer ? '' : $this->xRenderer->render($this);
+}
 
-    /**
+/**
      * Convert this object to string for json.
      *
      * This is a method of the JsonSerializable interface.
      *
      * @return string
      */
-    public function jsonSerialize(): string
-    {
-        return $this->__toString();
-    }
+public function jsonSerialize(): string
+{
+return $this->__toString();
+}
 }

jaxon-core/src/App/View/ViewRenderer.php

Switch Indentation +151 added lines, -151 removed lines

@@ -13,58 +13,58 @@ 
 
 class ViewRenderer
 {
-    /**
+/**
      * @var Container
      */
-    protected $di;
+protected $di;
 
-    /**
+/**
      * The view data store
      *
      * @var Store|null
      */
-    protected $xStore = null;
+protected $xStore = null;
 
-    /**
+/**
      * The view data store
      *
      * @var Store
      */
-    protected $xEmptyStore = null;
+protected $xEmptyStore = null;
 
-    /**
+/**
      * The view namespaces
      *
      * @var array
      */
-    protected $aNamespaces = [];
+protected $aNamespaces = [];
 
-    /**
+/**
      * The default namespace
      *
      * @var string
      */
-    protected $sDefaultNamespace = 'jaxon';
+protected $sDefaultNamespace = 'jaxon';
 
-    /**
+/**
      * The view global data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * The class constructor
      *
      * @param Container $di
      */
-    public function __construct(Container $di)
-    {
-        $this->di = $di;
-        $this->xEmptyStore = new Store();
-    }
+public function __construct(Container $di)
+{
+$this->di = $di;
+$this->xEmptyStore = new Store();
+}
 
-    /**
+/**
      * Add a view namespace, and set the corresponding renderer.
      *
      * @param string $sNamespace    The namespace name
@@ -74,59 +74,59 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory,
-        string $sExtension, string $sRenderer): void
-    {
-        $aNamespace = [
-            'directory' => $sDirectory,
-            'extension' => $sExtension,
-            'renderer' => $sRenderer,
-        ];
-        $this->aNamespaces[$sNamespace] = $aNamespace;
-    }
+public function addNamespace(string $sNamespace, string $sDirectory,
+string $sExtension, string $sRenderer): void
+{
+$aNamespace = [
+'directory' => $sDirectory,
+'extension' => $sExtension,
+'renderer' => $sRenderer,
+];
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
 
-    /**
+/**
      * Set the view namespaces.
      *
      * @param Config $xAppConfig    The config options provided in the library
      *
      * @return void
      */
-    public function addNamespaces(Config $xAppConfig): void
-    {
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
-        {
-            return;
-        }
+public function addNamespaces(Config $xAppConfig): void
+{
+if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
+{
+return;
+}
 
-        $sPackage = $xAppConfig->getOption('package', '');
-        foreach($aNamespaces as $sNamespace => $sOption)
-        {
-            // Save the namespace
-            $aNamespace = $xAppConfig->getOption($sOption);
-            $aNamespace['package'] = $sPackage;
-            if(!isset($aNamespace['renderer']))
-            {
-                $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
-            }
-            $this->aNamespaces[$sNamespace] = $aNamespace;
-        }
-    }
+$sPackage = $xAppConfig->getOption('package', '');
+foreach($aNamespaces as $sNamespace => $sOption)
+{
+// Save the namespace
+$aNamespace = $xAppConfig->getOption($sOption);
+$aNamespace['package'] = $sPackage;
+if(!isset($aNamespace['renderer']))
+{
+    $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
+}
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @param string $sId    The unique identifier of the view renderer
      *
      * @return ViewInterface
      */
-    public function getRenderer(string $sId): ViewInterface
-    {
-        // Return the view renderer with the given id
-        return $this->di->g("jaxon.app.view.$sId");
-    }
+public function getRenderer(string $sId): ViewInterface
+{
+// Return the view renderer with the given id
+return $this->di->g("jaxon.app.view.$sId");
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -134,25 +134,25 @@ 
      *
      * @return void
      */
-    public function addRenderer(string $sId, Closure $xClosure): void
-    {
-        // Return the initialized view renderer
-        $this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
-            // Get the defined renderer
-            $xRenderer = $xClosure($di);
-            // Init the renderer with the template namespaces
-            $aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
-                return $aOptions['renderer'] === $sId;
-            });
-            foreach($aNamespaces as $sName => $aOptions)
-            {
-                $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
-            }
-            return $xRenderer;
-        });
-    }
+public function addRenderer(string $sId, Closure $xClosure): void
+{
+// Return the initialized view renderer
+$this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
+// Get the defined renderer
+$xRenderer = $xClosure($di);
+// Init the renderer with the template namespaces
+$aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
+    return $aOptions['renderer'] === $sId;
+});
+foreach($aNamespaces as $sName => $aOptions)
+{
+    $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
+}
+return $xRenderer;
+});
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -161,55 +161,55 @@ 
      *
      * @return void
      */
-    public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
-    {
-        $this->setDefaultNamespace($sId);
-        $this->addNamespace($sId, '', $sExtension, $sId);
-        $this->addRenderer($sId, $xClosure);
-    }
+public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
+{
+$this->setDefaultNamespace($sId);
+$this->addNamespace($sId, '', $sExtension, $sId);
+$this->addRenderer($sId, $xClosure);
+}
 
-    /**
+/**
      * Get the view renderer for a given namespace
      *
      * @param string $sNamespace    The namespace name
      *
      * @return ViewInterface|null
      */
-    public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
-    {
-        if(!isset($this->aNamespaces[$sNamespace]))
-        {
-            return null;
-        }
-        // Return the view renderer with the configured id
-        return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
-    }
+public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
+{
+if(!isset($this->aNamespaces[$sNamespace]))
+{
+return null;
+}
+// Return the view renderer with the configured id
+return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
+}
 
-    /**
+/**
      * Set the default namespace
      *
      * @param string $sDefaultNamespace
      */
-    public function setDefaultNamespace(string $sDefaultNamespace): void
-    {
-        $this->sDefaultNamespace = $sDefaultNamespace;
-    }
+public function setDefaultNamespace(string $sDefaultNamespace): void
+{
+$this->sDefaultNamespace = $sDefaultNamespace;
+}
 
-    /**
+/**
      * Get the current store or create a new store
      *
      * @return Store
      */
-    protected function store(): Store
-    {
-        if(!$this->xStore)
-        {
-            $this->xStore = new Store();
-        }
-        return $this->xStore;
-    }
+protected function store(): Store
+{
+if(!$this->xStore)
+{
+$this->xStore = new Store();
+}
+return $this->xStore;
+}
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -217,13 +217,13 @@ 
      *
      * @return ViewRenderer
      */
-    public function set(string $sName, $xValue): ViewRenderer
-    {
-        $this->store()->with($sName, $xValue);
-        return $this;
-    }
+public function set(string $sName, $xValue): ViewRenderer
+{
+$this->store()->with($sName, $xValue);
+return $this;
+}
 
-    /**
+/**
      * Make a piece of data available for all views
      *
      * @param string $sName    The data name
@@ -231,29 +231,29 @@ 
      *
      * @return ViewRenderer
      */
-    public function share(string $sName, $xValue): ViewRenderer
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function share(string $sName, $xValue): ViewRenderer
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Make an array of data available for all views
      *
      * @param array $aValues    The data values
      *
      * @return ViewRenderer
      */
-    public function shareValues(array $aValues): ViewRenderer
-    {
-        foreach($aValues as $sName => $xValue)
-        {
-            $this->share($sName, $xValue);
-        }
-        return $this;
-    }
+public function shareValues(array $aValues): ViewRenderer
+{
+foreach($aValues as $sName => $xValue)
+{
+$this->share($sName, $xValue);
+}
+return $this;
+}
 
-    /**
+/**
      * Render a view using a store
      *
      * The store returned by this function will later be used with the make() method to render the view.
@@ -263,32 +263,32 @@ 
      *
      * @return Store   A store populated with the view data
      */
-    public function render(string $sViewName, array $aViewData = []): Store
-    {
-        $xStore = $this->store();
-        // Get the default view namespace
-        $sNamespace = $this->sDefaultNamespace;
-        // Get the namespace from the view name
-        $nSeparatorPosition = strrpos($sViewName, '::');
-        if($nSeparatorPosition !== false)
-        {
-            $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
-            $sViewName = substr($sViewName, $nSeparatorPosition + 2);
-        }
+public function render(string $sViewName, array $aViewData = []): Store
+{
+$xStore = $this->store();
+// Get the default view namespace
+$sNamespace = $this->sDefaultNamespace;
+// Get the namespace from the view name
+$nSeparatorPosition = strrpos($sViewName, '::');
+if($nSeparatorPosition !== false)
+{
+$sNamespace = substr($sViewName, 0, $nSeparatorPosition);
+$sViewName = substr($sViewName, $nSeparatorPosition + 2);
+}
 
-        $xRenderer = $this->getNamespaceRenderer($sNamespace);
-        if(!$xRenderer)
-        {
-            // Cannot render a view if there's no renderer corresponding to the namespace.
-            return $this->xEmptyStore;
-        }
+$xRenderer = $this->getNamespaceRenderer($sNamespace);
+if(!$xRenderer)
+{
+// Cannot render a view if there's no renderer corresponding to the namespace.
+return $this->xEmptyStore;
+}
 
-        $xStore->setData(array_merge($this->aViewData, $aViewData))
-            ->setView($xRenderer, $sNamespace, $sViewName);
+$xStore->setData(array_merge($this->aViewData, $aViewData))
+->setView($xRenderer, $sNamespace, $sViewName);
 
-        // Set the store to null so a new store will be created for the next view.
-        $this->xStore = null;
-        // Return the store
-        return $xStore;
-    }
+// Set the store to null so a new store will be created for the next view.
+$this->xStore = null;
+// Return the store
+return $xStore;
+}
 }

jaxon-core/src/Plugin/Manager/PluginManager.php

Switch Indentation +119 added lines, -119 removed lines

@@ -45,49 +45,49 @@ 
 
 class PluginManager
 {
-    /**
+/**
      * Request plugins, indexed by name
      *
      * @var array<string>
      */
-    private $aRegistryPlugins = [];
+private $aRegistryPlugins = [];
 
-    /**
+/**
      * Request handlers, indexed by name
      *
      * @var array<string>
      */
-    private $aRequestHandlers = [];
+private $aRequestHandlers = [];
 
-    /**
+/**
      * Response plugins, indexed by name
      *
      * @var array<string>
      */
-    private $aResponsePlugins = [];
+private $aResponsePlugins = [];
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
      * @param CodeGenerator $xCodeGenerator
      * @param Translator $xTranslator
      */
-    public function __construct(private Container $di,
-        private CodeGenerator $xCodeGenerator, private Translator $xTranslator)
-    {}
+public function __construct(private Container $di,
+private CodeGenerator $xCodeGenerator, private Translator $xTranslator)
+{}
 
-    /**
+/**
      * Get the request plugins
      *
      * @return array<class-string>
      */
-    public function getRequestHandlers(): array
-    {
-        return $this->aRequestHandlers;
-    }
+public function getRequestHandlers(): array
+{
+return $this->aRequestHandlers;
+}
 
-    /**
+/**
      * Register a plugin
      *
      * @param class-string $sClassName    The plugin class
@@ -97,40 +97,40 @@ 
      * @return int
      * @throws SetupException
      */
-    private function _registerPlugin(string $sClassName, string $sPluginName, array $aInterfaces): int
-    {
-        // Any plugin must implement the PluginInterface interface.
-        if(!in_array(PluginInterface::class, $aInterfaces))
-        {
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', [
-                'name' => $sClassName,
-            ]);
-            throw new SetupException($sMessage);
-        }
-
-        // Response plugin.
-        if(in_array(ResponsePluginInterface::class, $aInterfaces))
-        {
-            $this->aResponsePlugins[$sPluginName] = $sClassName;
-            return 1;
-        }
-
-        // Request plugin.
-        $nCount = 0;
-        if(in_array(CallableRegistryInterface::class, $aInterfaces))
-        {
-            $this->aRegistryPlugins[$sPluginName] = $sClassName;
-            $nCount++;
-        }
-        if(in_array(RequestHandlerInterface::class, $aInterfaces))
-        {
-            $this->aRequestHandlers[$sPluginName] = $sClassName;
-            $nCount++;
-        }
-        return $nCount;
-    }
-
-    /**
+private function _registerPlugin(string $sClassName, string $sPluginName, array $aInterfaces): int
+{
+// Any plugin must implement the PluginInterface interface.
+if(!in_array(PluginInterface::class, $aInterfaces))
+{
+$sMessage = $this->xTranslator->trans('errors.register.invalid', [
+    'name' => $sClassName,
+]);
+throw new SetupException($sMessage);
+}
+
+// Response plugin.
+if(in_array(ResponsePluginInterface::class, $aInterfaces))
+{
+$this->aResponsePlugins[$sPluginName] = $sClassName;
+return 1;
+}
+
+// Request plugin.
+$nCount = 0;
+if(in_array(CallableRegistryInterface::class, $aInterfaces))
+{
+$this->aRegistryPlugins[$sPluginName] = $sClassName;
+$nCount++;
+}
+if(in_array(RequestHandlerInterface::class, $aInterfaces))
+{
+$this->aRequestHandlers[$sPluginName] = $sClassName;
+$nCount++;
+}
+return $nCount;
+}
+
+/**
      * Register a plugin
      *
      * Below is a table for priorities and their description:
@@ -145,34 +145,34 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000): void
-    {
-        $aInterfaces = class_implements($sClassName);
-        $nCount = $this->_registerPlugin($sClassName, $sPluginName, $aInterfaces);
-
-        // Any plugin can implement the CodeGeneratorInterface interface.
-        if(in_array(CodeGeneratorInterface::class, $aInterfaces))
-        {
-            $this->xCodeGenerator->addCodeGenerator($sClassName, $nPriority);
-            $nCount++;
-        }
-        // The class is not a valid plugin.
-        if($nCount === 0)
-        {
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', [
-                'name' => $sClassName,
-            ]);
-            throw new SetupException($sMessage);
-        }
-
-        // Register the plugin in the DI container, if necessary
-        if(!$this->di->has($sClassName))
-        {
-            $this->di->auto($sClassName);
-        }
-    }
-
-    /**
+public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000): void
+{
+$aInterfaces = class_implements($sClassName);
+$nCount = $this->_registerPlugin($sClassName, $sPluginName, $aInterfaces);
+
+// Any plugin can implement the CodeGeneratorInterface interface.
+if(in_array(CodeGeneratorInterface::class, $aInterfaces))
+{
+$this->xCodeGenerator->addCodeGenerator($sClassName, $nPriority);
+$nCount++;
+}
+// The class is not a valid plugin.
+if($nCount === 0)
+{
+$sMessage = $this->xTranslator->trans('errors.register.invalid', [
+    'name' => $sClassName,
+]);
+throw new SetupException($sMessage);
+}
+
+// Register the plugin in the DI container, if necessary
+if(!$this->di->has($sClassName))
+{
+$this->di->auto($sClassName);
+}
+}
+
+/**
      * Find the specified response plugin by name or class name
      *
      * @template R of ResponsePluginInterface
@@ -180,14 +180,14 @@ 
      *
      * @return ($sName is class-string ? R|null : ResponsePluginInterface|null)
      */
-    public function getResponsePlugin(string $sName): ?ResponsePluginInterface
-    {
-        return $this->di->h($sName) ? $this->di->g($sName) :
-            (!isset($this->aResponsePlugins[$sName]) ? null :
-            $this->di->g($this->aResponsePlugins[$sName]));
-    }
-
-    /**
+public function getResponsePlugin(string $sName): ?ResponsePluginInterface
+{
+return $this->di->h($sName) ? $this->di->g($sName) :
+(!isset($this->aResponsePlugins[$sName]) ? null :
+$this->di->g($this->aResponsePlugins[$sName]));
+}
+
+/**
      * Register a callable function or class
      *
      * Call the request plugin with the $sType defined as name.
@@ -199,46 +199,46 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerCallable(string $sType, string $sCallable, $xOptions = []): void
-    {
-        if(isset($this->aRegistryPlugins[$sType]) &&
-            ($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
-        {
-            $xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));
-            return;
-        }
-        throw new SetupException($this->xTranslator->trans('errors.register.plugin',
-            ['name' => $sType, 'callable' => $sCallable]));
-    }
-
-    /**
+public function registerCallable(string $sType, string $sCallable, $xOptions = []): void
+{
+if(isset($this->aRegistryPlugins[$sType]) &&
+($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
+{
+$xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));
+return;
+}
+throw new SetupException($this->xTranslator->trans('errors.register.plugin',
+['name' => $sType, 'callable' => $sCallable]));
+}
+
+/**
      * Register the Jaxon request plugins
      *
      * @return void
      * @throws SetupException
      */
-    public function registerPlugins(): void
-    {
-        // Request plugins
-        $this->registerPlugin(CallableClassPlugin::class, Jaxon::CALLABLE_CLASS, 101);
-        $this->registerPlugin(CallableFunctionPlugin::class, Jaxon::CALLABLE_FUNCTION, 102);
-        $this->registerPlugin(CallableDirPlugin::class, Jaxon::CALLABLE_DIR, 103);
-
-        // Response plugins
-        $this->registerPlugin(ScriptPlugin::class, ScriptPlugin::NAME, 700);
-        $this->registerPlugin(DatabagPlugin::class, DatabagPlugin::NAME, 700);
-        $this->registerPlugin(DialogPlugin::class, DialogPlugin::NAME, 750);
-        $this->registerPlugin(PaginatorPlugin::class, PaginatorPlugin::NAME, 800);
-        $this->registerPlugin(PsrPlugin::class, PsrPlugin::NAME, 850);
-    }
-
-    /**
+public function registerPlugins(): void
+{
+// Request plugins
+$this->registerPlugin(CallableClassPlugin::class, Jaxon::CALLABLE_CLASS, 101);
+$this->registerPlugin(CallableFunctionPlugin::class, Jaxon::CALLABLE_FUNCTION, 102);
+$this->registerPlugin(CallableDirPlugin::class, Jaxon::CALLABLE_DIR, 103);
+
+// Response plugins
+$this->registerPlugin(ScriptPlugin::class, ScriptPlugin::NAME, 700);
+$this->registerPlugin(DatabagPlugin::class, DatabagPlugin::NAME, 700);
+$this->registerPlugin(DialogPlugin::class, DialogPlugin::NAME, 750);
+$this->registerPlugin(PaginatorPlugin::class, PaginatorPlugin::NAME, 800);
+$this->registerPlugin(PsrPlugin::class, PsrPlugin::NAME, 850);
+}
+
+/**
      * Get the parameter reader
      *
      * @return ParameterReader
      */
-    public function getParameterReader(): ParameterReader
-    {
-        return $this->di->g(ParameterReader::class);
-    }
+public function getParameterReader(): ParameterReader
+{
+return $this->di->g(ParameterReader::class);
+}
 }

jaxon-core/src/Plugin/AbstractPackage.php

Switch Indentation +45 added lines, -45 removed lines

@@ -19,46 +19,46 @@ 
 
 abstract class AbstractPackage extends AbstractCodeGenerator
 {
-    /**
+/**
      * The configuration options of the package
      *
      * @var Config
      */
-    protected $xPkgConfig;
+protected $xPkgConfig;
 
-    /**
+/**
      * The view renderer
      *
      * @var ViewRenderer
      */
-    protected $xRenderer;
+protected $xRenderer;
 
-    /**
+/**
      * Get the path to the config file, or the config options in an array.
      *
      * @return string|array
      */
-    abstract public static function config(): string|array;
+abstract public static function config(): string|array;
 
-    /**
+/**
      * Get the package config object
      *
      * @return Config
      */
-    final public function getConfig(): Config
-    {
-        return $this->xPkgConfig;
-    }
+final public function getConfig(): Config
+{
+return $this->xPkgConfig;
+}
 
-    /**
+/**
      * This method is automatically called after the package instance is created and configured.
      *
      * @return void
      */
-    protected function init(): void
-    {}
+protected function init(): void
+{}
 
-    /**
+/**
      * Get the value of a given package option
      *
      * @param string $sOption    The option name
@@ -66,59 +66,59 @@ 
      *
      * @return mixed
      */
-    final public function getOption(string $sOption, $xDefault = null): mixed
-    {
-        return $this->xPkgConfig->getOption($sOption, $xDefault);
-    }
+final public function getOption(string $sOption, $xDefault = null): mixed
+{
+return $this->xPkgConfig->getOption($sOption, $xDefault);
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    final public function view(): ViewRenderer
-    {
-        return $this->xRenderer;
-    }
+final public function view(): ViewRenderer
+{
+return $this->xRenderer;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    final public function getHash(): string
-    {
-        // Packages do not generate hash on their own. So we make this method final.
-        return '';
-    }
+final public function getHash(): string
+{
+// Packages do not generate hash on their own. So we make this method final.
+return '';
+}
 
-    /**
+/**
      * Get the HTML code of the package home page
      *
      * @return string|Stringable
      */
-    public function getHtml(): string|Stringable
-    {
-        return '';
-    }
+public function getHtml(): string|Stringable
+{
+return '';
+}
 
-    /**
+/**
      * Get the HTML code of the package home page
      *
      * This method is an alias for getHtml().
      *
      * @return string|Stringable
      */
-    public function html(): string|Stringable
-    {
-        return $this->getHtml();
-    }
+public function html(): string|Stringable
+{
+return $this->getHtml();
+}
 
-    /**
+/**
      * Get the Js code of the ready() callback
      *
      * @return string|Stringable
      */
-    public function getReadyScript(): string|Stringable
-    {
-        return '';
-    }
+public function getReadyScript(): string|Stringable
+{
+return '';
+}
 }

jaxon-core/src/Response/Manager/ResponseManager.php

Switch Indentation +175 added lines, -175 removed lines

@@ -38,81 +38,81 @@ 
 
 class ResponseManager
 {
-    /**
+/**
      * The current response object that will be sent back to the browser
      * once the request processing phase is complete
      *
      * @var AjaxResponse|null
      */
-    private $xResponse = null;
+private $xResponse = null;
 
-    /**
+/**
      * The error message
      *
      * @var string
      */
-    private $sErrorMessage = '';
+private $sErrorMessage = '';
 
-    /**
+/**
      * The debug messages
      *
      * @var array
      */
-    private $aDebugMessages = [];
+private $aDebugMessages = [];
 
-    /**
+/**
      * The commands that will be sent to the browser in the response
      *
      * @var array
      */
-    protected $aCommands = [];
+protected $aCommands = [];
 
-    /**
+/**
      * If the commands beeing added are to be confirmed
      *
      * @var bool
      */
-    private $bOnConfirm = false;
+private $bOnConfirm = false;
 
-    /**
+/**
      * The commands that will be sent to the browser in the response
      *
      * @var array
      */
-    private $aConfirmCommands = [];
+private $aConfirmCommands = [];
 
-    /**
+/**
      * @param Container $di
      * @param Translator $xTranslator
      * @param string $sCharacterEncoding
      */
-    public function __construct(private Container $di,
-        private Translator $xTranslator, private string $sCharacterEncoding)
-    {}
+public function __construct(private Container $di,
+private Translator $xTranslator, private string $sCharacterEncoding)
+{}
 
-    /**
+/**
      * Get the configured character encoding
      *
      * @return string
      */
-    public function getCharacterEncoding(): string
-    {
-        return $this->sCharacterEncoding;
-    }
+public function getCharacterEncoding(): string
+{
+return $this->sCharacterEncoding;
+}
 
-    /**
+/**
      * Convert to string
      *
      * @param mixed $xData
      *
      * @return string
      */
-    public function str($xData): string
-    {
-        return trim((string)$xData, " \t\n");
-    }
+public function str($xData): string
+{
+return trim((string)$xData, " \t\n");
+}
 
-    /**
+/**
      * Get a translated string
      *
      * @param string $sText The key of the translated string
@@ -120,81 +120,81 @@ 
      *
      * @return string
      */
-    public function trans(string $sText, array $aPlaceHolders = []): string
-    {
-        return $this->xTranslator->trans($sText, $aPlaceHolders);
-    }
+public function trans(string $sText, array $aPlaceHolders = []): string
+{
+return $this->xTranslator->trans($sText, $aPlaceHolders);
+}
 
-    /**
+/**
      * Set the error message
      *
      * @param string $sErrorMessage
      *
      * @return void
      */
-    public function setErrorMessage(string $sErrorMessage): void
-    {
-        $this->sErrorMessage = $sErrorMessage;
-    }
+public function setErrorMessage(string $sErrorMessage): void
+{
+$this->sErrorMessage = $sErrorMessage;
+}
 
-    /**
+/**
      * Get the error message
      *
      * @return string
      */
-    public function getErrorMessage(): string
-    {
-        return $this->sErrorMessage;
-    }
+public function getErrorMessage(): string
+{
+return $this->sErrorMessage;
+}
 
-    /**
+/**
      * Get the commands in the response
      *
      * @return array
      */
-    public function getCommands(): array
-    {
-        return $this->aCommands;
-    }
+public function getCommands(): array
+{
+return $this->aCommands;
+}
 
-    /**
+/**
      * Get the number of commands in the response
      *
      * @return int
      */
-    public function getCommandCount(): int
-    {
-        return count($this->aCommands);
-    }
+public function getCommandCount(): int
+{
+return count($this->aCommands);
+}
 
-    /**
+/**
      * Clear all the commands already added to the response
      *
      * @return void
      */
-    public function clearCommands(): void
-    {
-        $this->aCommands = [];
-    }
+public function clearCommands(): void
+{
+$this->aCommands = [];
+}
 
-    /**
+/**
      * @param array|JsonSerializable $aArgs    The command arguments
      * @param bool $bRemoveEmpty    If true, remove empty arguments
      *
      * @return array
      */
-    private function getCommandArgs(array|JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
-    {
-        if(!$bRemoveEmpty)
-        {
-            return $aArgs;
-        }
-        return array_filter($aArgs, function($xArg) {
-            return !empty($xArg);
-        });
-    }
-
-    /**
+private function getCommandArgs(array|JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
+{
+if(!$bRemoveEmpty)
+{
+return $aArgs;
+}
+return array_filter($aArgs, function($xArg) {
+return !empty($xArg);
+});
+}
+
+/**
      * Add a response command to the array of commands
      *
      * @param string $sName    The command name
@@ -203,25 +203,25 @@ 
      *
      * @return Command
      */
-    public function addCommand(string $sName, array|JsonSerializable $aArgs,
-        bool $bRemoveEmpty = false): Command
-    {
-        $xCommand = new Command([
-            'name' => $this->str($sName),
-            'args' => $this->getCommandArgs($aArgs, $bRemoveEmpty),
-        ]);
-        if($this->bOnConfirm)
-        {
-            $this->aConfirmCommands[] = $xCommand;
-        }
-        else
-        {
-            $this->aCommands[] = $xCommand;
-        }
-        return $xCommand;
-    }
-
-    /**
+public function addCommand(string $sName, array|JsonSerializable $aArgs,
+bool $bRemoveEmpty = false): Command
+{
+$xCommand = new Command([
+'name' => $this->str($sName),
+'args' => $this->getCommandArgs($aArgs, $bRemoveEmpty),
+]);
+if($this->bOnConfirm)
+{
+$this->aConfirmCommands[] = $xCommand;
+}
+else
+{
+$this->aCommands[] = $xCommand;
+}
+return $xCommand;
+}
+
+/**
      * Response command that prompts user with [ok] [cancel] style message box
      *
      * The provided closure will be called with a response object as unique parameter.
@@ -236,29 +236,29 @@ 
      *
      * @return self
      */
-    public function addConfirmCommand(string $sName, Closure $fConfirm,
-        string $sQuestion, array $aArgs = []): self
-    {
-        if($this->bOnConfirm)
-        {
-            throw new AppException($this->xTranslator->trans('errors.app.confirm.nested'));
-        }
-        $this->bOnConfirm = true;
-        $fConfirm();
-        $this->bOnConfirm = false;
-        if(($nCommandCount = count($this->aConfirmCommands)) > 0)
-        {
-            $aCommand = $this->di->getDialogCommand()->confirm($this->str($sQuestion), $aArgs);
-            $aCommand['count'] = $nCommandCount;
-            // The confirm command must be inserted before the commands to be confirmed.
-            $this->addCommand($sName, $aCommand);
-            $this->aCommands = array_merge($this->aCommands, $this->aConfirmCommands);
-            $this->aConfirmCommands = [];
-        }
-        return $this;
-    }
-
-    /**
+public function addConfirmCommand(string $sName, Closure $fConfirm,
+string $sQuestion, array $aArgs = []): self
+{
+if($this->bOnConfirm)
+{
+throw new AppException($this->xTranslator->trans('errors.app.confirm.nested'));
+}
+$this->bOnConfirm = true;
+$fConfirm();
+$this->bOnConfirm = false;
+if(($nCommandCount = count($this->aConfirmCommands)) > 0)
+{
+$aCommand = $this->di->getDialogCommand()->confirm($this->str($sQuestion), $aArgs);
+$aCommand['count'] = $nCommandCount;
+// The confirm command must be inserted before the commands to be confirmed.
+$this->addCommand($sName, $aCommand);
+$this->aCommands = array_merge($this->aCommands, $this->aConfirmCommands);
+$this->aConfirmCommands = [];
+}
+return $this;
+}
+
+/**
      * Add a command to display an alert message to the user
      *
      * @param string $sName     The command name
@@ -269,56 +269,56 @@ 
      *
      * @return self
      */
-    public function addAlertCommand(string $sName, string $sMessage, array $aArgs = []): self
-    {
-        $aCommand = $this->di->getDialogCommand()->info($this->str($sMessage), $aArgs);
-        $this->addCommand($sName, $aCommand);
-        return $this;
-    }
-
-    /**
+public function addAlertCommand(string $sName, string $sMessage, array $aArgs = []): self
+{
+$aCommand = $this->di->getDialogCommand()->info($this->str($sMessage), $aArgs);
+$this->addCommand($sName, $aCommand);
+return $this;
+}
+
+/**
      * Get the response to the Jaxon request
      *
      * @return Response
      */
-    public function getResponse(): Response
-    {
-        return $this->di->getResponse();
-    }
+public function getResponse(): Response
+{
+return $this->di->getResponse();
+}
 
-    /**
+/**
      * Create a new Jaxon response
      *
      * @return Response
      */
-    public function newResponse(): Response
-    {
-        return $this->xResponse = $this->di->newResponse();
-    }
+public function newResponse(): Response
+{
+return $this->xResponse = $this->di->newResponse();
+}
 
-    /**
+/**
      * Get the Jaxon ajax response returned 
      *
      * @return AjaxResponse
      */
-    public function ajaxResponse(): AjaxResponse
-    {
-        return $this->xResponse ?: $this->di->getResponse();
-    }
+public function ajaxResponse(): AjaxResponse
+{
+return $this->xResponse ?: $this->di->getResponse();
+}
 
-    /**
+/**
      * Create a new reponse for a Jaxon component
      *
      * @param JxnCall $xJxnCall
      *
      * @return NodeResponse
      */
-    public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
-    {
-        return $this->di->newNodeResponse($xJxnCall);
-    }
+public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
+{
+return $this->di->newNodeResponse($xJxnCall);
+}
 
-    /**
+/**
      * Appends a debug message on the end of the debug message queue
      *
      * Debug messages will be sent to the client with the normal response
@@ -328,66 +328,66 @@ 
      *
      * @return void
      */
-    public function debug(string $sMessage): void
-    {
-        $this->aDebugMessages[] = $sMessage;
-    }
+public function debug(string $sMessage): void
+{
+$this->aDebugMessages[] = $sMessage;
+}
 
-    /**
+/**
      * Clear the response and appends a debug message on the end of the debug message queue
      *
      * @param string $sMessage The debug message
      *
      * @return void
      */
-    public function error(string $sMessage): void
-    {
-        $this->clearCommands();
-        $this->debug($sMessage);
-    }
+public function error(string $sMessage): void
+{
+$this->clearCommands();
+$this->debug($sMessage);
+}
 
-    /**
+/**
      * Prints the debug messages into the current response object
      *
      * @return void
      */
-    public function printDebug()
-    {
-        foreach($this->aDebugMessages as $sMessage)
-        {
-            $this->addCommand('script.debug', ['message' => $this->str($sMessage)]);
-        }
-        // $this->aDebugMessages = [];
-    }
-
-    /**
+public function printDebug()
+{
+foreach($this->aDebugMessages as $sMessage)
+{
+$this->addCommand('script.debug', ['message' => $this->str($sMessage)]);
+}
+// $this->aDebugMessages = [];
+}
+
+/**
      * Get the content type of the HTTP response
      *
      * @return string
      */
-    public function getContentType(): string
-    {
-        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() :
-            $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
-    }
+public function getContentType(): string
+{
+return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() :
+$this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
+}
 
-    /**
+/**
      * Get the JSON output of the response
      *
      * @return string
      */
-    public function getOutput(): string
-    {
-        return $this->getResponse()->getOutput();
-    }
+public function getOutput(): string
+{
+return $this->getResponse()->getOutput();
+}
 
-    /**
+/**
      * Get the debug messages
      *
      * @return array
      */
-    public function getDebugMessages(): array
-    {
-        return $this->aDebugMessages;
-    }
+public function getDebugMessages(): array
+{
+return $this->aDebugMessages;
+}
 }

jaxon-core/src/Response/Manager/Command.php

Switch Indentation +49 added lines, -49 removed lines

@@ -21,42 +21,42 @@ 
 
 class Command implements ArrayAccess, JsonSerializable
 {
-    /**
+/**
      * @var array
      */
-    private $aCommand;
+private $aCommand;
 
-    public function __construct(array $aCommand)
-    {
-        $this->aCommand = $aCommand;
-    }
+public function __construct(array $aCommand)
+{
+$this->aCommand = $aCommand;
+}
 
-    /**
+/**
      * Set a component on the command
      *
      * @param array $aComponent
      *
      * @return Command
      */
-    public function setComponent(array $aComponent): Command
-    {
-        $this->aCommand['component'] = $aComponent;
-        return $this;
-    }
+public function setComponent(array $aComponent): Command
+{
+$this->aCommand['component'] = $aComponent;
+return $this;
+}
 
-    /**
+/**
      * Convert to string
      *
      * @param mixed $xData
      *
      * @return string
      */
-    private function str($xData): string
-    {
-        return trim((string)$xData, " \t\n");
-    }
+private function str($xData): string
+{
+return trim((string)$xData, " \t\n");
+}
 
-    /**
+/**
      * Add an option to the command
      *
      * @param string $sName    The option name
@@ -64,50 +64,50 @@ 
      *
      * @return Command
      */
-    public function setOption(string $sName, string|array|JsonSerializable $xValue): Command
-    {
-        if(isset($this->aCommand['options']))
-        {
-            $this->aCommand['options'][$this->str($sName)] = $xValue;
-            return $this;
-        }
-        $this->aCommand['options'] = [$this->str($sName) => $xValue];
-        return $this;
-    }
+public function setOption(string $sName, string|array|JsonSerializable $xValue): Command
+{
+if(isset($this->aCommand['options']))
+{
+$this->aCommand['options'][$this->str($sName)] = $xValue;
+return $this;
+}
+$this->aCommand['options'] = [$this->str($sName) => $xValue];
+return $this;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function jsonSerialize(): array
-    {
-        return $this->aCommand;
-    }
+public function jsonSerialize(): array
+{
+return $this->aCommand;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function offsetExists($offset): bool
-    {
-        return isset($this->aCommand[$offset]);
-    }
+public function offsetExists($offset): bool
+{
+return isset($this->aCommand[$offset]);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function offsetGet($offset): mixed
-    {
-        return $this->aCommand[$offset] ?? null;
-    }
+public function offsetGet($offset): mixed
+{
+return $this->aCommand[$offset] ?? null;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function offsetSet($offset, $value): void
-    {} // Not implemented
+public function offsetSet($offset, $value): void
+{} // Not implemented
 
-    /**
+/**
      * @inheritDoc
      */
-    public function offsetUnset($offset): void
-    {} // Not implemented
+public function offsetUnset($offset): void
+{} // Not implemented
 }

jaxon-core/src/Response/NodeResponse.php

Switch Indentation +85 added lines, -85 removed lines

@@ -28,40 +28,40 @@ 
 
 class NodeResponse extends AjaxResponse
 {
-    /**
+/**
      * @var array
      */
-    private $aComponent = [];
+private $aComponent = [];
 
-    /**
+/**
      * The constructor
      *
      * @param ResponseManager $xManager
      * @param PluginManager $xPluginManager
      * @param JxnCall $xJxnCall
      */
-    public function __construct(ResponseManager $xManager,
-        PluginManager $xPluginManager, JxnCall $xJxnCall)
-    {
-        parent::__construct($xManager, $xPluginManager);
-        // The js class name is also the component name.
-        $this->aComponent['name'] = $this->str($xJxnCall->_class());
-    }
+public function __construct(ResponseManager $xManager,
+PluginManager $xPluginManager, JxnCall $xJxnCall)
+{
+parent::__construct($xManager, $xPluginManager);
+// The js class name is also the component name.
+$this->aComponent['name'] = $this->str($xJxnCall->_class());
+}
 
-    /**
+/**
      * Set the component item
      *
      * @param string $sItem
      *
      * @return self
      */
-    public function item(string $sItem = 'main'): self
-    {
-        $this->aComponent['item'] = $this->str($sItem);
-        return $this;
-    }
+public function item(string $sItem = 'main'): self
+{
+$this->aComponent['item'] = $this->str($sItem);
+return $this;
+}
 
-    /**
+/**
      * Add a response command to the array of commands
      *
      * @param string $sName    The command name
@@ -70,15 +70,15 @@ 
      *
      * @return Command
      */
-    public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
-        bool $bRemoveEmpty = false): Command
-    {
-        return $this->xManager
-            ->addCommand($sName, $aArgs, $bRemoveEmpty)
-            ->setComponent($this->aComponent);
-    }
+public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
+bool $bRemoveEmpty = false): Command
+{
+return $this->xManager
+->addCommand($sName, $aArgs, $bRemoveEmpty)
+->setComponent($this->aComponent);
+}
 
-    /**
+/**
      * Add a command to assign the specified value to the given element's attribute
      *
      * @param string $sAttribute    The attribute to be assigned
@@ -86,16 +86,16 @@ 
      *
      * @return self
      */
-    public function assign(string $sAttribute, string $sValue): self
-    {
-        $this->addCommand('node.assign', [
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function assign(string $sAttribute, string $sValue): self
+{
+$this->addCommand('node.assign', [
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to assign the specified HTML content to the given element
      *
      * This is a shortcut for assign() on the innerHTML attribute.
@@ -104,12 +104,12 @@ 
      *
      * @return self
      */
-    public function html(string $sValue): self
-    {
-        return $this->assign('innerHTML', $sValue);
-    }
+public function html(string $sValue): self
+{
+return $this->assign('innerHTML', $sValue);
+}
 
-    /**
+/**
      * Add a command to assign the specified value to the given CSS attribute
      *
      * @param string $sCssAttribute    The CSS attribute to be assigned
@@ -117,12 +117,12 @@ 
      *
      * @return self
      */
-    public function style(string $sCssAttribute, string $sValue): self
-    {
-        return $this->assign("style.$sCssAttribute", $sValue);
-    }
+public function style(string $sCssAttribute, string $sValue): self
+{
+return $this->assign("style.$sCssAttribute", $sValue);
+}
 
-    /**
+/**
      * Add a command to append the specified data to the given element's attribute
      *
      * @param string $sAttribute    The name of the attribute to be appended to
@@ -130,16 +130,16 @@ 
      *
      * @return self
      */
-    public function append(string $sAttribute, string $sValue): self
-    {
-        $this->addCommand('node.append', [
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function append(string $sAttribute, string $sValue): self
+{
+$this->addCommand('node.append', [
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to prepend the specified data to the given element's attribute
      *
      * @param string $sAttribute    The name of the attribute to be prepended to
@@ -147,16 +147,16 @@ 
      *
      * @return self
      */
-    public function prepend(string $sAttribute, string $sValue): self
-    {
-        $this->addCommand('node.prepend', [
-            'attr' => $this->str($sAttribute),
-            'value' => $this->str($sValue),
-        ]);
-        return $this;
-    }
+public function prepend(string $sAttribute, string $sValue): self
+{
+$this->addCommand('node.prepend', [
+'attr' => $this->str($sAttribute),
+'value' => $this->str($sValue),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to replace a specified value with another value within the given element's attribute
      *
      * @param string $sAttribute    The attribute to be updated
@@ -165,39 +165,39 @@ 
      *
      * @return self
      */
-    public function replace(string $sAttribute, string $sSearch, string $sReplace): self
-    {
-        $this->addCommand('node.replace', [
-            'attr' => $this->str($sAttribute),
-            'search' => $this->str($sSearch),
-            'replace' => $this->str($sReplace),
-        ]);
-        return $this;
-    }
+public function replace(string $sAttribute, string $sSearch, string $sReplace): self
+{
+$this->addCommand('node.replace', [
+'attr' => $this->str($sAttribute),
+'search' => $this->str($sSearch),
+'replace' => $this->str($sReplace),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to clear the specified attribute of the given element
      *
      * @param string $sAttribute    The attribute to be cleared
      *
      * @return self
      */
-    public function clear(string $sAttribute = 'innerHTML'): self
-    {
-        $this->addCommand('node.clear', [
-            'attr' => $this->str($sAttribute),
-        ]);
-        return $this;
-    }
+public function clear(string $sAttribute = 'innerHTML'): self
+{
+$this->addCommand('node.clear', [
+'attr' => $this->str($sAttribute),
+]);
+return $this;
+}
 
-    /**
+/**
      * Add a command to remove an element from the document
      *
      * @return self
      */
-    public function remove(): self
-    {
-        $this->addCommand('node.remove', []);
-        return $this;
-    }
+public function remove(): self
+{
+$this->addCommand('node.remove', []);
+return $this;
+}
 }