jaxon-php / jaxon-mono

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

Switch Indentation +9 added lines, -9 removed lines

@@ -7,15 +7,15 @@ 
 
 class Logger
 {
-    use LoggerTrait;
+use LoggerTrait;
 
-    /**
+/**
      * @param LoggerInterface $logger
      */
-    public function __construct(private LoggerInterface $logger)
-    {}
+public function __construct(private LoggerInterface $logger)
+{}
 
-    /**
+/**
      * Logs with an arbitrary level.
      *
      * @param mixed  $level
@@ -24,8 +24,8 @@ 
      *
      * @return void
      */
-    public function log($level, string|\Stringable $message, array $context = []): void
-    {
-        $this->logger->log($level, $message, $context);
-    }
+public function log($level, string|\Stringable $message, array $context = []): void
+{
+$this->logger->log($level, $message, $context);
+}
 }

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

Spacing +6 added lines, -6 removed lines

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

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

Switch Indentation +94 added lines, -94 removed lines

@@ -18,150 +18,150 @@
 
 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) {
-            /** @var ParameterReader */
-            $xParameterReader = $di->g(ParameterReader::class);
-            return $xParameterReader->setRequestParameter($di->g(ServerRequestInterface::class));
-        });
-        // 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) {
+/** @var ParameterReader */
+$xParameterReader = $di->g(ParameterReader::class);
+return $xParameterReader->setRequestParameter($di->g(ServerRequestInterface::class));
+});
+// 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);
+}
 }

jaxon-core/src/App/NodeComponent.php

Switch Indentation +36 added lines, -36 removed lines

@@ -8,71 +8,71 @@
 
 abstract class NodeComponent extends Component\AbstractComponent
 {
-    use Component\HelperTrait;
-    use Component\NodeResponseTrait;
-    use Component\AjaxResponseTrait;
-    use Component\ComponentTrait;
+use Component\HelperTrait;
+use Component\NodeResponseTrait;
+use Component\AjaxResponseTrait;
+use Component\ComponentTrait;
 
-    /**
+/**
      * @inheritDoc
      */
-    final protected function initComponent(Container $di, ComponentHelper $xHelper): void
-    {
-        $this->setHelper($xHelper);
-        $this->setNodeResponse($di);
-        $this->setAjaxResponse($di);
-    }
+final protected function initComponent(Container $di, ComponentHelper $xHelper): void
+{
+$this->setHelper($xHelper);
+$this->setNodeResponse($di);
+$this->setAjaxResponse($di);
+}
 
-    /**
+/**
      * @return string|Stringable
      */
-    abstract public function html(): string|Stringable;
+abstract public function html(): string|Stringable;
 
-    /**
+/**
      * Called before rendering the component.
      *
      * @return void
      */
-    protected function before(): void
-    {}
+protected function before(): void
+{}
 
-    /**
+/**
      * Called after rendering the component.
      *
      * @return void
      */
-    protected function after(): void
-    {}
+protected function after(): void
+{}
 
-    /**
+/**
      * Set the attached DOM node content with the component HTML code.
      *
      * @return void
      */
-    final public function render(): void
-    {
-        $this->before();
-        $this->node()->html((string)$this->html());
-        $this->after();
-    }
+final public function render(): void
+{
+$this->before();
+$this->node()->html((string)$this->html());
+$this->after();
+}
 
-    /**
+/**
      * Clear the attached DOM node content.
      *
      * @return void
      */
-    final public function clear(): void
-    {
-        $this->node()->clear();
-    }
+final public function clear(): void
+{
+$this->node()->clear();
+}
 
-    /**
+/**
      * Show/hide the attached DOM node.
      *
      * @return void
      */
-    final public function visible(bool $bVisible): void
-    {
-        $bVisible ? $this->node()->jq()->show() : $this->node()->jq()->hide();
-    }
+final public function visible(bool $bVisible): void
+{
+$bVisible ? $this->node()->jq()->show() : $this->node()->jq()->hide();
+}
 }

jaxon-core/src/App/Dialog/ModalInterface.php

Switch Indentation +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
 
 interface ModalInterface
 {
-    /**
+/**
      * Show a modal dialog.
      *
      * @param string $sTitle The title of the dialog
@@ -26,12 +26,12 @@ 
      *
      * @return void
      */
-    public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void;
+public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void;
 
-    /**
+/**
      * Hide the modal dialog.
      *
      * @return void
      */
-    public function hide(): void;
+public function hide(): void;
 }

jaxon-core/src/App/Dialog/DialogTrait.php

Switch Indentation +12 added lines, -12 removed lines

@@ -6,24 +6,24 @@
 
 trait DialogTrait
 {
-    /**
+/**
      * @return AjaxResponse
      */
-    abstract protected function response(): AjaxResponse;
+abstract protected function response(): AjaxResponse;
 
-    /**
+/**
      * @return AlertInterface
      */
-    protected function alert(): AlertInterface
-    {
-        return $this->response()->dialog;
-    }
+protected function alert(): AlertInterface
+{
+return $this->response()->dialog;
+}
 
-    /**
+/**
      * @return ModalInterface
      */
-    protected function modal(): ModalInterface
-    {
-        return $this->response()->dialog;
-    }
+protected function modal(): ModalInterface
+{
+return $this->response()->dialog;
+}
 }

jaxon-core/src/App/Dialog/AlertInterface.php

Switch Indentation +10 added lines, -10 removed lines

@@ -16,16 +16,16 @@ 
 
 interface AlertInterface
 {
-    /**
+/**
      * Set the title of the next message.
      *
      * @param string $sTitle     The title of the message
      *
      * @return AlertInterface
      */
-    public function title(string $sTitle): AlertInterface;
+public function title(string $sTitle): AlertInterface;
 
-    /**
+/**
      * Show a success message.
      *
      * @param string $sMessage  The text of the message
@@ -33,9 +33,9 @@ 
      *
      * @return void
      */
-    public function success(string $sMessage, ...$aArgs): void;
+public function success(string $sMessage, ...$aArgs): void;
 
-    /**
+/**
      * Show an information message.
      *
      * @param string $sMessage  The text of the message
@@ -43,9 +43,9 @@ 
      *
      * @return void
      */
-    public function info(string $sMessage, ...$aArgs): void;
+public function info(string $sMessage, ...$aArgs): void;
 
-    /**
+/**
      * Show a warning message.
      *
      * @param string $sMessage  The text of the message
@@ -53,9 +53,9 @@ 
      *
      * @return void
      */
-    public function warning(string $sMessage, ...$aArgs): void;
+public function warning(string $sMessage, ...$aArgs): void;
 
-    /**
+/**
      * Show an error message.
      *
      * @param string $sMessage  The text of the message
@@ -63,5 +63,5 @@ 
      *
      * @return void
      */
-    public function error(string $sMessage, ...$aArgs): void;
+public function error(string $sMessage, ...$aArgs): void;
 }

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

Switch Indentation +70 added lines, -70 removed lines

@@ -40,7 +40,7 @@ 
 
 class ParameterReader
 {
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -48,28 +48,28 @@ 
      * @param ConfigManager $xConfigManager
      * @param UriDetector $xUriDetector
      */
-    public function __construct(private Container $di, private Translator $xTranslator,
-        private ConfigManager $xConfigManager, private UriDetector $xUriDetector)
-    {}
+public function __construct(private Container $di, private Translator $xTranslator,
+private ConfigManager $xConfigManager, private UriDetector $xUriDetector)
+{}
 
-    /**
+/**
      * Decode input data.
      *
      * @param string $sStr
      *
      * @return string
      */
-    private function decodeStr(string $sStr): string
-    {
-        $aServerParams = $this->di->getServerParams();
-        $sContentType = $aServerParams['CONTENT_TYPE'] ?? $aServerParams['HTTP_CONTENT_TYPE'] ?? '';
-        $sType = 'multipart/form-data';
-        // Parameters are url encoded when uploading files
-        return strncmp($sContentType, $sType, strlen($sType)) !== 0 ?
-            $sStr : urldecode($sStr);
-    }
+private function decodeStr(string $sStr): string
+{
+$aServerParams = $this->di->getServerParams();
+$sContentType = $aServerParams['CONTENT_TYPE'] ?? $aServerParams['HTTP_CONTENT_TYPE'] ?? '';
+$sType = 'multipart/form-data';
+// Parameters are url encoded when uploading files
+return strncmp($sContentType, $sType, strlen($sType)) !== 0 ?
+$sStr : urldecode($sStr);
+}
 
-    /**
+/**
      * Decode input data.
      *
      * @param string $sStr
@@ -77,83 +77,83 @@ 
      * @return string
      * @throws RequestException
      */
-    private function decoderUtf8Str(string $sStr): string
-    {
-        $sEncoding = $this->xConfigManager->getOption('core.encoding', '');
-        if(function_exists('iconv'))
-        {
-            return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
-        }
-        if(function_exists('mb_convert_encoding'))
-        {
-            return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
-        }
-        // By default, no decoding
-        // return $sStr;
-        throw new RequestException($this->xTranslator->trans('errors.request.conversion'));
-    }
+private function decoderUtf8Str(string $sStr): string
+{
+$sEncoding = $this->xConfigManager->getOption('core.encoding', '');
+if(function_exists('iconv'))
+{
+return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
+}
+if(function_exists('mb_convert_encoding'))
+{
+return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
+}
+// By default, no decoding
+// return $sStr;
+throw new RequestException($this->xTranslator->trans('errors.request.conversion'));
+}
 
-    /**
+/**
      * Choose the function to use to decode input data.
      *
      * @param string $sParam
      *
      * @return string
      */
-    private function decodeRequestParameter(string $sParam): string
-    {
-        $sParam = $this->decodeStr($sParam);
-        if(!$this->xConfigManager->getOption('core.decode_utf8'))
-        {
-            return $sParam;
-        }
-        $this->xConfigManager->setOption('core.decode_utf8', false);
-        return $this->decoderUtf8Str($sParam);
-    }
+private function decodeRequestParameter(string $sParam): string
+{
+$sParam = $this->decodeStr($sParam);
+if(!$this->xConfigManager->getOption('core.decode_utf8'))
+{
+return $sParam;
+}
+$this->xConfigManager->setOption('core.decode_utf8', false);
+return $this->decoderUtf8Str($sParam);
+}
 
-    /**
+/**
      * @param ServerRequestInterface $xRequest
      *
      * @return ServerRequestInterface
      */
-    public function setRequestParameter(ServerRequestInterface $xRequest): ServerRequestInterface
-    {
-        $aBody = $xRequest->getParsedBody();
-        $aParams = is_array($aBody) ? $aBody : $xRequest->getQueryParams();
-        // Check if Jaxon call parameters are present.
-        if(isset($aParams['jxncall']) && is_string($aParams['jxncall']))
-        {
-            $xRequest = $xRequest->withAttribute('jxncall', json_decode($this
-                ->decodeRequestParameter($aParams['jxncall']), true));
-        }
-        // Check if Jaxon bags parameters are present.
-        if(isset($aParams['jxnbags']) && is_string($aParams['jxnbags']))
-        {
-            $xRequest = $xRequest->withAttribute('jxnbags', json_decode($this
-                ->decodeRequestParameter($aParams['jxnbags']), true));
-        }
-        return $xRequest;
-    }
+public function setRequestParameter(ServerRequestInterface $xRequest): ServerRequestInterface
+{
+$aBody = $xRequest->getParsedBody();
+$aParams = is_array($aBody) ? $aBody : $xRequest->getQueryParams();
+// Check if Jaxon call parameters are present.
+if(isset($aParams['jxncall']) && is_string($aParams['jxncall']))
+{
+$xRequest = $xRequest->withAttribute('jxncall', json_decode($this
+    ->decodeRequestParameter($aParams['jxncall']), true));
+}
+// Check if Jaxon bags parameters are present.
+if(isset($aParams['jxnbags']) && is_string($aParams['jxnbags']))
+{
+$xRequest = $xRequest->withAttribute('jxnbags', json_decode($this
+    ->decodeRequestParameter($aParams['jxnbags']), true));
+}
+return $xRequest;
+}
 
-    /**
+/**
      * Get the URI of the current request
      *
      * @throws UriException
      */
-    public function uri(): string
-    {
-        return $this->xUriDetector->detect($this->di->getServerParams());
-    }
+public function uri(): string
+{
+return $this->xUriDetector->detect($this->di->getServerParams());
+}
 
-    /**
+/**
      * Make the specified URL suitable for redirect
      *
      * @param string $sURL    The relative or fully qualified URL
      *
      * @return string
      */
-    public function parseUrl(string $sURL): string
-    {
-        return $this->xUriDetector->redirect($sURL, $this->di->getServerParams());
-    }
+public function parseUrl(string $sURL): string
+{
+return $this->xUriDetector->redirect($sURL, $this->di->getServerParams());
+}
 }

Spacing +5 added lines, -5 removed lines

@@ -80,11 +80,11 @@ 
     private function decoderUtf8Str(string $sStr): string
     {
         $sEncoding = $this->xConfigManager->getOption('core.encoding', '');
-        if(function_exists('iconv'))
+        if (function_exists('iconv'))
         {
             return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
         }
-        if(function_exists('mb_convert_encoding'))
+        if (function_exists('mb_convert_encoding'))
         {
             return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
         }
@@ -103,7 +103,7 @@ 
     private function decodeRequestParameter(string $sParam): string
     {
         $sParam = $this->decodeStr($sParam);
-        if(!$this->xConfigManager->getOption('core.decode_utf8'))
+        if (!$this->xConfigManager->getOption('core.decode_utf8'))
         {
             return $sParam;
         }
@@ -121,13 +121,13 @@ 
         $aBody = $xRequest->getParsedBody();
         $aParams = is_array($aBody) ? $aBody : $xRequest->getQueryParams();
         // Check if Jaxon call parameters are present.
-        if(isset($aParams['jxncall']) && is_string($aParams['jxncall']))
+        if (isset($aParams['jxncall']) && is_string($aParams['jxncall']))
         {
             $xRequest = $xRequest->withAttribute('jxncall', json_decode($this
                 ->decodeRequestParameter($aParams['jxncall']), true));
         }
         // Check if Jaxon bags parameters are present.
-        if(isset($aParams['jxnbags']) && is_string($aParams['jxnbags']))
+        if (isset($aParams['jxnbags']) && is_string($aParams['jxnbags']))
         {
             $xRequest = $xRequest->withAttribute('jxnbags', json_decode($this
                 ->decodeRequestParameter($aParams['jxnbags']), true));

jaxon-core/src/Plugin/Response/Databag/DatabagPlugin.php

Switch Indentation +54 added lines, -54 removed lines

@@ -13,89 +13,89 @@
 
 class DatabagPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'bags';
+public const NAME = 'bags';
 
-    /**
+/**
      * @var Databag
      */
-    protected $xDatabag = null;
+protected $xDatabag = null;
 
-    /**
+/**
      * The constructor
      */
-    public function __construct(protected Container $di)
-    {}
+public function __construct(protected Container $di)
+{}
 
-    /**
+/**
      * @return void
      */
-    private function initDatabag(): void
-    {
-        if($this->xDatabag !== null)
-        {
-            return;
-        }
+private function initDatabag(): void
+{
+if($this->xDatabag !== null)
+{
+return;
+}
 
-        // Get the databag contents from the HTTP request parameters.
-        $aBags = $this->di->getRequest()->getAttribute('jxnbags', []);
-        $this->xDatabag = new Databag($this, $this->readData($aBags));
-    }
+// Get the databag contents from the HTTP request parameters.
+$aBags = $this->di->getRequest()->getAttribute('jxnbags', []);
+$this->xDatabag = new Databag($this, $this->readData($aBags));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @param mixed $xData
      *
      * @return array
      */
-    private function readData($xData): array
-    {
-        // Todo: clean input data.
-        // Todo: verify the checksums.
-        return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
-    }
+private function readData($xData): array
+{
+// Todo: clean input data.
+// Todo: verify the checksums.
+return is_string($xData) ?
+(json_decode($xData, true) ?: []) :
+(is_array($xData) ? $xData : []);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '4.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '4.0.0';
+}
 
-    /**
+/**
      * @return void
      */
-    public function writeCommand(): void
-    {
-        $this->initDatabag();
-        if($this->xDatabag->touched())
-        {
-            // Todo: calculate the checksums.
-            $this->addCommand('databag.set', ['values' => $this->xDatabag]);
-        }
-    }
+public function writeCommand(): void
+{
+$this->initDatabag();
+if($this->xDatabag->touched())
+{
+// Todo: calculate the checksums.
+$this->addCommand('databag.set', ['values' => $this->xDatabag]);
+}
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return DatabagContext
      */
-    public function bag(string $sName): DatabagContext
-    {
-        $this->initDatabag();
-        return new DatabagContext($this->xDatabag, $sName);
-    }
+public function bag(string $sName): DatabagContext
+{
+$this->initDatabag();
+return new DatabagContext($this->xDatabag, $sName);
+}
 }

Spacing +3 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      */
     private function initDatabag(): void
     {
-        if($this->xDatabag !== null)
+        if ($this->xDatabag !== null)
         {
             return;
         }
@@ -62,8 +62,7 @@ 
         // Todo: clean input data.
         // Todo: verify the checksums.
         return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
+            (json_decode($xData, true) ?: []) : (is_array($xData) ? $xData : []);
     }
 
     /**
@@ -81,7 +80,7 @@ 
     public function writeCommand(): void
     {
         $this->initDatabag();
-        if($this->xDatabag->touched())
+        if ($this->xDatabag->touched())
         {
             // Todo: calculate the checksums.
             $this->addCommand('databag.set', ['values' => $this->xDatabag]);