jaxon-php / jaxon-mono

jaxon-core/src/App/Databag/Databag.php

Switch Indentation +56 added lines, -56 removed lines

@@ -11,110 +11,110 @@
 
 class Databag implements JsonSerializable
 {
-    /**
+/**
      * @var DatabagPlugin
      */
-    protected $xPlugin;
+protected $xPlugin;
 
-    /**
+/**
      * @var array
      */
-    protected $aData = [];
+protected $aData = [];
 
-    /**
+/**
      * @var bool
      */
-    protected $bTouched = false;
+protected $bTouched = false;
 
-    /**
+/**
      * The constructor
      *
      * @param array $aData
      */
-    public function __construct(DatabagPlugin $xPlugin, array $aData)
-    {
-        $this->xPlugin = $xPlugin;
-        // Ensure all contents are arrays.
-        $this->aData = array_map(function($aValue) {
-            return is_array($aValue) ? $aValue : [];
-        }, $aData);
-    }
+public function __construct(DatabagPlugin $xPlugin, array $aData)
+{
+$this->xPlugin = $xPlugin;
+// Ensure all contents are arrays.
+$this->aData = array_map(function($aValue) {
+return is_array($aValue) ? $aValue : [];
+}, $aData);
+}
 
-    /**
+/**
      * @return bool
      */
-    public function touched(): bool
-    {
-        return $this->bTouched;
-    }
+public function touched(): bool
+{
+return $this->bTouched;
+}
 
-    /**
+/**
      * @return array
      */
-    public function getAll(): array
-    {
-        return $this->aData;
-    }
+public function getAll(): array
+{
+return $this->aData;
+}
 
-    /**
+/**
      * @param string $sBag
      *
      * @return void
      */
-    public function clear(string $sBag): void
-    {
-        $this->aData[$sBag] = [];
-        $this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]);
-    }
+public function clear(string $sBag): void
+{
+$this->aData[$sBag] = [];
+$this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]);
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function set(string $sBag, string $sKey, $xValue): void
-    {
-        $this->bTouched = true;
-        $this->aData[$sBag][$sKey] = $xValue;
-    }
+public function set(string $sBag, string $sKey, $xValue): void
+{
+$this->bTouched = true;
+$this->aData[$sBag][$sKey] = $xValue;
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function new(string $sBag, string $sKey, $xValue): void
-    {
-        // Set the value only if it doesn't already exist.
-        if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
-        {
-            $this->set($sBag, $sKey, $xValue);
-        }
-    }
+public function new(string $sBag, string $sKey, $xValue): void
+{
+// Set the value only if it doesn't already exist.
+if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
+{
+$this->set($sBag, $sKey, $xValue);
+}
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return mixed
      */
-    public function get(string $sBag, string $sKey, $xValue = null): mixed
-    {
-        return $this->aData[$sBag][$sKey] ?? $xValue;
-    }
+public function get(string $sBag, string $sKey, $xValue = null): mixed
+{
+return $this->aData[$sBag][$sKey] ?? $xValue;
+}
 
-    /**
+/**
      * Convert this call to array, when converting the response into json.
      *
      * @return array
      */
-    public function jsonSerialize(): array
-    {
-        return $this->aData;
-    }
+public function jsonSerialize(): array
+{
+return $this->aData;
+}
 }

jaxon-core/src/App/Component/ComponentTrait.php

Switch Indentation +44 added lines, -44 removed lines

@@ -14,41 +14,41 @@ 
 
 trait ComponentTrait
 {
-    /**
+/**
      * Get the component helper
      *
      * @return ComponentHelper
      */
-    abstract protected function helper(): ComponentHelper;
+abstract protected function helper(): ComponentHelper;
 
-    /**
+/**
      * Get the Ajax response
      *
      * @return AjaxResponse
      */
-    abstract protected function response(): AjaxResponse;
+abstract protected function response(): AjaxResponse;
 
-    /**
+/**
      * Get the Jaxon request target
      *
      * @return TargetInterface|null
      */
-    protected function target(): ?TargetInterface
-    {
-        return $this->helper()->xTarget;
-    }
+protected function target(): ?TargetInterface
+{
+return $this->helper()->xTarget;
+}
 
-    /**
+/**
      * Get the temp cache
      *
      * @return Stash
      */
-    protected function stash(): Stash
-    {
-        return $this->helper()->xStash;
-    }
+protected function stash(): Stash
+{
+return $this->helper()->xStash;
+}
 
-    /**
+/**
      * Get an instance of a Jaxon class by name
      *
      * @template T
@@ -57,60 +57,60 @@ 
      * @return T|null
      * @throws SetupException
      */
-    protected function cl(string $sClassName): mixed
-    {
-        return $this->helper()->cl($sClassName);
-    }
+protected function cl(string $sClassName): mixed
+{
+return $this->helper()->cl($sClassName);
+}
 
-    /**
+/**
      * Get the logger
      *
      * @return LoggerInterface
      */
-    protected function logger(): LoggerInterface
-    {
-        return $this->helper()->xLogger;
-    }
+protected function logger(): LoggerInterface
+{
+return $this->helper()->xLogger;
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    protected function view(): ViewRenderer
-    {
-        return $this->helper()->xViewRenderer;
-    }
+protected function view(): ViewRenderer
+{
+return $this->helper()->xViewRenderer;
+}
 
-    /**
+/**
      * Get the session manager
      *
      * @return SessionInterface
      */
-    protected function session(): SessionInterface
-    {
-        return $this->helper()->xSessionManager;
-    }
+protected function session(): SessionInterface
+{
+return $this->helper()->xSessionManager;
+}
 
-    /**
+/**
      * Get the uploaded files
      *
      * @return array
      */
-    protected function files(): array
-    {
-        return $this->helper()->xUploadHandler->files();
-    }
+protected function files(): array
+{
+return $this->helper()->xUploadHandler->files();
+}
 
-    /**
+/**
      * Get a data bag.
      *
      * @param string  $sBagName
      *
      * @return DatabagContext
      */
-    protected function bag(string $sBagName): DatabagContext
-    {
-        return $this->response()->bag($sBagName);
-    }
+protected function bag(string $sBagName): DatabagContext
+{
+return $this->response()->bag($sBagName);
+}
 }

jaxon-core/src/App/Metadata/MetadataReaderInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -16,12 +16,12 @@
 
 interface MetadataReaderInterface
 {
-    /**
+/**
      * Get the component metadata
      *
      * @param InputData $xInput
      *
      * @return Metadata
      */
-    public function getAttributes(InputData $xInput): Metadata;
+public function getAttributes(InputData $xInput): Metadata;
 }

jaxon-core/src/App/Metadata/Data/DatabagData.php

Switch Indentation +33 added lines, -33 removed lines

@@ -22,61 +22,61 @@
 
 class DatabagData extends AbstractData
 {
-    /**
+/**
      * The databag names
      *
      * @var string
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'bags';
-    }
+public function getName(): string
+{
+return 'bags';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return array_values($this->aNames);
-    }
+public function getValue(): mixed
+{
+return array_values($this->aNames);
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    protected function validateName(string $sName): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sName is not a valid \"name\" value for databag");
-    }
+protected function validateName(string $sName): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+{
+return;
+}
+throw new SetupException("$sName is not a valid \"name\" value for databag");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateName($sName);
+public function addValue(string $sName): void
+{
+$this->validateName($sName);
 
-        $this->aNames[$sName] = $sName;
-    }
+$this->aNames[$sName] = $sName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return array_map(fn($sName) =>
-            "{$sVarName}->addValue('$sName');", $this->aNames);
-    }
+public function encode(string $sVarName): array
+{
+return array_map(fn($sName) =>
+"{$sVarName}->addValue('$sName');", $this->aNames);
+}
 }

jaxon-core/src/App/Metadata/Data/CallbackData.php

Switch Indentation +33 added lines, -33 removed lines

@@ -22,61 +22,61 @@
 
 class CallbackData extends AbstractData
 {
-    /**
+/**
      * The callback js objects
      *
      * @var string
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'callback';
-    }
+public function getName(): string
+{
+return 'callback';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return array_values($this->aNames);
-    }
+public function getValue(): mixed
+{
+return array_values($this->aNames);
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    protected function validateObjectName(string $sName): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sName is not a valid \"name\" value for callback");
-    }
+protected function validateObjectName(string $sName): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+{
+return;
+}
+throw new SetupException("$sName is not a valid \"name\" value for callback");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateObjectName($sName);
+public function addValue(string $sName): void
+{
+$this->validateObjectName($sName);
 
-        $this->aNames[$sName] = $sName;
-    }
+$this->aNames[$sName] = $sName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return array_map(fn($sName) =>
-            "{$sVarName}->addValue('$sName');", $this->aNames);
-    }
+public function encode(string $sVarName): array
+{
+return array_map(fn($sName) =>
+"{$sVarName}->addValue('$sName');", $this->aNames);
+}
 }

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 : 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/Di/Traits/CallableTrait.php

Switch Indentation +53 added lines, -53 removed lines

@@ -15,81 +15,81 @@
 
 trait CallableTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerCallables(): void
-    {
-        // Validator
-        $this->set(Validator::class, function($di) {
-            return new Validator($di->g(ConfigManager::class), $di->g(Translator::class));
-        });
-        // Callable objects registry
-        $this->set(ComponentRegistry::class, function($di) {
-            return new ComponentRegistry($di->g(ComponentContainer::class));
-        });
-        // Callable class plugin
-        $this->set(CallableClassPlugin::class, function($di) {
-            $sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.class');
-            return new CallableClassPlugin($sPrefix, $di->getLogger(),
-                $di->g(ComponentContainer::class), $di->g(ComponentRegistry::class),
-                $di->g(Translator::class), $di->g(TemplateEngine::class),
-                $di->g(Validator::class));
-        });
-        // Callable dir plugin
-        $this->set(CallableDirPlugin::class, function($di) {
-            return new CallableDirPlugin($di->g(ComponentContainer::class),
-                $di->g(ComponentRegistry::class), $di->g(Translator::class));
-        });
-        // Callable function plugin
-        $this->set(CallableFunctionPlugin::class, function($di) {
-            $sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.function');
-            $bDebug = $di->g(ConfigManager::class)->getOption('core.debug.on', false);
-            return new CallableFunctionPlugin($sPrefix, $bDebug,
-                $di->g(Container::class), $di->g(TemplateEngine::class),
-                $di->g(Translator::class), $di->g(Validator::class));
-        });
-    }
+private function registerCallables(): void
+{
+// Validator
+$this->set(Validator::class, function($di) {
+return new Validator($di->g(ConfigManager::class), $di->g(Translator::class));
+});
+// Callable objects registry
+$this->set(ComponentRegistry::class, function($di) {
+return new ComponentRegistry($di->g(ComponentContainer::class));
+});
+// Callable class plugin
+$this->set(CallableClassPlugin::class, function($di) {
+$sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.class');
+return new CallableClassPlugin($sPrefix, $di->getLogger(),
+    $di->g(ComponentContainer::class), $di->g(ComponentRegistry::class),
+    $di->g(Translator::class), $di->g(TemplateEngine::class),
+    $di->g(Validator::class));
+});
+// Callable dir plugin
+$this->set(CallableDirPlugin::class, function($di) {
+return new CallableDirPlugin($di->g(ComponentContainer::class),
+    $di->g(ComponentRegistry::class), $di->g(Translator::class));
+});
+// Callable function plugin
+$this->set(CallableFunctionPlugin::class, function($di) {
+$sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.function');
+$bDebug = $di->g(ConfigManager::class)->getOption('core.debug.on', false);
+return new CallableFunctionPlugin($sPrefix, $bDebug,
+    $di->g(Container::class), $di->g(TemplateEngine::class),
+    $di->g(Translator::class), $di->g(Validator::class));
+});
+}
 
-    /**
+/**
      * Get the callable registry
      *
      * @return ComponentRegistry
      */
-    public function getComponentRegistry(): ComponentRegistry
-    {
-        return $this->g(ComponentRegistry::class);
-    }
+public function getComponentRegistry(): ComponentRegistry
+{
+return $this->g(ComponentRegistry::class);
+}
 
-    /**
+/**
      * Get the callable function plugin
      *
      * @return CallableFunctionPlugin
      */
-    public function getCallableFunctionPlugin(): CallableFunctionPlugin
-    {
-        return $this->g(CallableFunctionPlugin::class);
-    }
+public function getCallableFunctionPlugin(): CallableFunctionPlugin
+{
+return $this->g(CallableFunctionPlugin::class);
+}
 
-    /**
+/**
      * Get the callable class plugin
      *
      * @return CallableClassPlugin
      */
-    public function getCallableClassPlugin(): CallableClassPlugin
-    {
-        return $this->g(CallableClassPlugin::class);
-    }
+public function getCallableClassPlugin(): CallableClassPlugin
+{
+return $this->g(CallableClassPlugin::class);
+}
 
-    /**
+/**
      * Get the callable dir plugin
      *
      * @return CallableDirPlugin
      */
-    public function getCallableDirPlugin(): CallableDirPlugin
-    {
-        return $this->g(CallableDirPlugin::class);
-    }
+public function getCallableDirPlugin(): CallableDirPlugin
+{
+return $this->g(CallableDirPlugin::class);
+}
 }

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

Switch Indentation +28 added lines, -28 removed lines

@@ -9,50 +9,50 @@
 
 trait MetadataTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerMetadataReader(): void
-    {
-        // Metadata cache
-        $this->set(MetadataCache::class, fn($di) =>
-            new MetadataCache($di->g('jaxon_metadata_cache_dir')));
+private function registerMetadataReader(): void
+{
+// Metadata cache
+$this->set(MetadataCache::class, fn($di) =>
+new MetadataCache($di->g('jaxon_metadata_cache_dir')));
 
-        // By default, register a fake metadata reader.
-        $this->set('metadata_reader_null', function() {
-            return new class implements MetadataReaderInterface
-            {
-                public function getAttributes(InputData $xInputData): Metadata
-                {
-                    return new Metadata();
-                }
-            };
-        });
+// By default, register a fake metadata reader.
+$this->set('metadata_reader_null', function() {
+return new class implements MetadataReaderInterface
+{
+    public function getAttributes(InputData $xInputData): Metadata
+    {
+        return new Metadata();
     }
+};
+});
+}
 
-    /**
+/**
      * Get the metadata cache
      *
      * @return MetadataCache
      */
-    public function getMetadataCache(): MetadataCache
-    {
-        return $this->g(MetadataCache::class);
-    }
+public function getMetadataCache(): MetadataCache
+{
+return $this->g(MetadataCache::class);
+}
 
-    /**
+/**
      * Get the metadata reader with the given id
      *
      * @param string $sReaderId
      *
      * @return MetadataReaderInterface
      */
-    public function getMetadataReader(string $sReaderId): MetadataReaderInterface
-    {
-        return $this->h("metadata_reader_$sReaderId") ?
-            $this->g("metadata_reader_$sReaderId") :
-            $this->g('metadata_reader_null');
-    }
+public function getMetadataReader(string $sReaderId): MetadataReaderInterface
+{
+return $this->h("metadata_reader_$sReaderId") ?
+$this->g("metadata_reader_$sReaderId") :
+$this->g('metadata_reader_null');
+}
 }

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

Switch Indentation +96 added lines, -96 removed lines

@@ -20,152 +20,152 @@
 
 trait PsrTrait
 {
-    /**
+/**
      * @var string
      */
-    private $sPsrConfig = 'jaxon.psr.config.file';
+private $sPsrConfig = 'jaxon.psr.config.file';
 
-    /**
+/**
      * @var string
      */
-    private $sPsrServerRequest = 'jaxon.psr.server.request';
+private $sPsrServerRequest = 'jaxon.psr.server.request';
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerPsr(): void
-    {
-        // The server request
-        $this->set(Psr17Factory::class, function() {
-            return new Psr17Factory();
-        });
-        $this->set(ServerRequestCreator::class, function($di) {
-            $xPsr17Factory = $di->g(Psr17Factory::class);
-            return new ServerRequestCreator(
-                $xPsr17Factory, // ServerRequestFactory
-                $xPsr17Factory, // UriFactory
-                $xPsr17Factory, // UploadedFileFactory
-                $xPsr17Factory, // StreamFactory
-            );
-        });
-        $this->set(ServerRequestInterface::class, function($di) {
-            return $di->g(ServerRequestCreator::class)->fromGlobals();
-        });
-        // Server request with the Jaxon request parameter as attribute
-        $this->set($this->sPsrServerRequest, function($di) {
-            $xParameterReader = $di->g(ParameterReader::class);
-            $xRequest = $di->g(ServerRequestInterface::class);
-            $aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
-            return !is_array($aRequestParameter) ? $xRequest :
-                $xRequest->withAttribute('jxncall', $aRequestParameter);
-        });
-        // PSR factory
-        $this->set(PsrFactory::class, function($di) {
-            return new PsrFactory($di->g(Container::class));
-        });
-        // PSR request handler
-        $this->set(PsrRequestHandler::class, function($di) {
-            return new PsrRequestHandler($di->g(Container::class), $di->g(RequestHandler::class),
-                $di->g(ResponseManager::class), $di->g(Translator::class));
-        });
-        // PSR config middleware
-        $this->set(PsrConfigMiddleware::class, function($di) {
-            return new PsrConfigMiddleware($di->g(Container::class), $di->g($this->sPsrConfig));
-        });
-        // PSR ajax middleware
-        $this->set(PsrAjaxMiddleware::class, function($di) {
-            return new PsrAjaxMiddleware($di->g(Container::class), $di->g(RequestHandler::class),
-                $di->g(ResponseManager::class));
-        });
-        // The PSR response plugin
-        $this->set(PsrPlugin::class, function($di) {
-            return new PsrPlugin($di->g(Psr17Factory::class), $di->g(ServerRequestInterface::class));
-        });
-    }
+private function registerPsr(): void
+{
+// The server request
+$this->set(Psr17Factory::class, function() {
+return new Psr17Factory();
+});
+$this->set(ServerRequestCreator::class, function($di) {
+$xPsr17Factory = $di->g(Psr17Factory::class);
+return new ServerRequestCreator(
+    $xPsr17Factory, // ServerRequestFactory
+    $xPsr17Factory, // UriFactory
+    $xPsr17Factory, // UploadedFileFactory
+    $xPsr17Factory, // StreamFactory
+);
+});
+$this->set(ServerRequestInterface::class, function($di) {
+return $di->g(ServerRequestCreator::class)->fromGlobals();
+});
+// Server request with the Jaxon request parameter as attribute
+$this->set($this->sPsrServerRequest, function($di) {
+$xParameterReader = $di->g(ParameterReader::class);
+$xRequest = $di->g(ServerRequestInterface::class);
+$aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
+return !is_array($aRequestParameter) ? $xRequest :
+    $xRequest->withAttribute('jxncall', $aRequestParameter);
+});
+// PSR factory
+$this->set(PsrFactory::class, function($di) {
+return new PsrFactory($di->g(Container::class));
+});
+// PSR request handler
+$this->set(PsrRequestHandler::class, function($di) {
+return new PsrRequestHandler($di->g(Container::class), $di->g(RequestHandler::class),
+    $di->g(ResponseManager::class), $di->g(Translator::class));
+});
+// PSR config middleware
+$this->set(PsrConfigMiddleware::class, function($di) {
+return new PsrConfigMiddleware($di->g(Container::class), $di->g($this->sPsrConfig));
+});
+// PSR ajax middleware
+$this->set(PsrAjaxMiddleware::class, function($di) {
+return new PsrAjaxMiddleware($di->g(Container::class), $di->g(RequestHandler::class),
+    $di->g(ResponseManager::class));
+});
+// The PSR response plugin
+$this->set(PsrPlugin::class, function($di) {
+return new PsrPlugin($di->g(Psr17Factory::class), $di->g(ServerRequestInterface::class));
+});
+}
 
-    /**
+/**
      * Get the request
      *
      * @return array
      */
-    public function getServerParams(): array
-    {
-        $xRequest = $this->g(ServerRequestInterface::class);
-        return $xRequest->getServerParams();
-    }
+public function getServerParams(): array
+{
+$xRequest = $this->g(ServerRequestInterface::class);
+return $xRequest->getServerParams();
+}
 
-    /**
+/**
      * Get the request with Jaxon parameter as attribute
      *
      * @return ServerRequestInterface
      */
-    public function getRequest(): ServerRequestInterface
-    {
-        return $this->g($this->sPsrServerRequest);
-    }
+public function getRequest(): ServerRequestInterface
+{
+return $this->g($this->sPsrServerRequest);
+}
 
-    /**
+/**
      * Return the array of arguments from the GET or POST data
      *
      * @return array
      */
-    public function getRequestArguments(): array
-    {
-        return $this->getRequest()->getAttribute('jxncall')['args'] ?? [];
-    }
+public function getRequestArguments(): array
+{
+return $this->getRequest()->getAttribute('jxncall')['args'] ?? [];
+}
 
-    /**
+/**
      * Get the PSR factory
      *
      * @return PsrFactory
      */
-    public function getPsrFactory(): PsrFactory
-    {
-        return $this->g(PsrFactory::class);
-    }
+public function getPsrFactory(): PsrFactory
+{
+return $this->g(PsrFactory::class);
+}
 
-    /**
+/**
      * Get the Psr17 factory
      *
      * @return Psr17Factory
      */
-    public function getPsr17Factory(): Psr17Factory
-    {
-        return $this->g(Psr17Factory::class);
-    }
+public function getPsr17Factory(): Psr17Factory
+{
+return $this->g(Psr17Factory::class);
+}
 
-    /**
+/**
      * Get the PSR request handler
      *
      * @return PsrRequestHandler
      */
-    public function getPsrRequestHandler(): PsrRequestHandler
-    {
-        return $this->g(PsrRequestHandler::class);
-    }
+public function getPsrRequestHandler(): PsrRequestHandler
+{
+return $this->g(PsrRequestHandler::class);
+}
 
-    /**
+/**
      * Get the PSR config middleware
      *
      * @param string $sConfigFile
      *
      * @return PsrConfigMiddleware
      */
-    public function getPsrConfigMiddleware(string $sConfigFile): PsrConfigMiddleware
-    {
-        !$this->h($this->sPsrConfig) && $this->val($this->sPsrConfig, $sConfigFile);
-        return $this->g(PsrConfigMiddleware::class);
-    }
+public function getPsrConfigMiddleware(string $sConfigFile): PsrConfigMiddleware
+{
+!$this->h($this->sPsrConfig) && $this->val($this->sPsrConfig, $sConfigFile);
+return $this->g(PsrConfigMiddleware::class);
+}
 
-    /**
+/**
      * Get the PSR ajax request middleware
      *
      * @return PsrAjaxMiddleware
      */
-    public function getPsrAjaxMiddleware(): PsrAjaxMiddleware
-    {
-        return $this->g(PsrAjaxMiddleware::class);
-    }
+public function getPsrAjaxMiddleware(): PsrAjaxMiddleware
+{
+return $this->g(PsrAjaxMiddleware::class);
+}
 }