jaxon-php / jaxon-mono

jaxon-core/src/App/Ajax/Traits/SendResponseTrait.php

Switch Indentation +44 added lines, -44 removed lines

@@ -31,69 +31,69 @@
 
 trait SendResponseTrait
 {
-    /**
+/**
      * @return Container
      */
-    abstract public function di(): Container;
+abstract public function di(): Container;
 
-    /**
+/**
      * @return ConfigManager
      */
-    abstract public function config(): ConfigManager;
+abstract public function config(): ConfigManager;
 
-    /**
+/**
      * @return Translator
      */
-    abstract public function translator(): Translator;
+abstract public function translator(): Translator;
 
-    /**
+/**
      * @return ResponseManager
      */
-    abstract public function getResponseManager(): ResponseManager;
+abstract public function getResponseManager(): ResponseManager;
 
-    /**
+/**
      * Prints the response to the output stream, thus sending the response to the browser
      *
      * @return mixed
      * @throws RequestException
      */
-    public function httpResponse(string $sCode = '200'): mixed
-    {
-        if(!$this->config()->getOption('core.response.send', false))
-        {
-            return null;
-        }
+public function httpResponse(string $sCode = '200'): mixed
+{
+if(!$this->config()->getOption('core.response.send', false))
+{
+return null;
+}
 
-        // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($sFilename, $nLineNumber))
-        {
-            throw new RequestException($this->translator()
-                ->trans('errors.output.already-sent', [
-                    'location' => "$sFilename:$nLineNumber",
-                ]) . "\n" . $this->translator()->trans('errors.output.advice'));
-        }
-        if(empty($sContent = $this->getResponseManager()->getOutput()))
-        {
-            return null;
-        }
+// Check to see if headers have already been sent out, in which case we can't do our job
+if(headers_sent($sFilename, $nLineNumber))
+{
+throw new RequestException($this->translator()
+    ->trans('errors.output.already-sent', [
+        'location' => "$sFilename:$nLineNumber",
+    ]) . "\n" . $this->translator()->trans('errors.output.advice'));
+}
+if(empty($sContent = $this->getResponseManager()->getOutput()))
+{
+return null;
+}
 
-        // Set the HTTP response code
-        http_response_code(intval($sCode));
+// Set the HTTP response code
+http_response_code(intval($sCode));
 
-        if($this->di()->getRequest()->getMethod() === 'GET')
-        {
-            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            header("Cache-Control: no-cache, must-revalidate");
-            header("Pragma: no-cache");
-        }
-        header('Content-Type: ' . $this->getResponseManager()->getContentType());
+if($this->di()->getRequest()->getMethod() === 'GET')
+{
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
+}
+header('Content-Type: ' . $this->getResponseManager()->getContentType());
 
-        print $sContent;
-        if($this->config()->getOption('core.process.exit', false))
-        {
-            exit();
-        }
-        return null;
-    }
+print $sContent;
+if($this->config()->getOption('core.process.exit', false))
+{
+exit();
+}
+return null;
+}
 }

jaxon-core/src/App/Ajax/Traits/DiTrait.php

Switch Indentation +19 added lines, -19 removed lines

@@ -19,41 +19,41 @@
 
 trait DiTrait
 {
-    /**
+/**
      * @var Container
      */
-    private Container $xContainer;
+private Container $xContainer;
 
-    /**
+/**
      * @var ComponentContainer
      */
-    protected ComponentContainer $xComponentContainer;
+protected ComponentContainer $xComponentContainer;
 
-    /**
+/**
      * Get the DI container
      *
      * @return Container
      */
-    public function di(): Container
-    {
-        return $this->xContainer;
-    }
+public function di(): Container
+{
+return $this->xContainer;
+}
 
-    /**
+/**
      * Get the component DI container
      *
      * @return ComponentContainer
      */
-    public function cdi(): ComponentContainer
-    {
-        return $this->xComponentContainer;
-    }
+public function cdi(): ComponentContainer
+{
+return $this->xComponentContainer;
+}
 
-    /**
+/**
      * @return ConfigManager
      */
-    public function config(): ConfigManager
-    {
-        return $this->di()->g(ConfigManager::class);
-    }
+public function config(): ConfigManager
+{
+return $this->di()->g(ConfigManager::class);
+}
 }

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

Switch Indentation +31 added lines, -31 removed lines

@@ -21,39 +21,39 @@
 
 class App extends AbstractApp
 {
-    use Traits\SendResponseTrait;
+use Traits\SendResponseTrait;
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function setup(string $sConfigFile = ''): void
-    {
-        if(!file_exists($sConfigFile))
-        {
-            throw new SetupException($this->translator()
-                ->trans('errors.file.access', ['path' => $sConfigFile]));
-        }
-
-        // Read the config options.
-        $aOptions = $this->config()->read($sConfigFile);
-        $aLibOptions = $aOptions['lib'] ?? [];
-        $aAppOptions = $aOptions['app'] ?? [];
-        if(!is_array($aLibOptions) || !is_array($aAppOptions))
-        {
-            throw new SetupException($sMessage = $this->translator()
-                ->trans('errors.file.content', ['path' => $sConfigFile]));
-        }
-
-        // The bootstrap set this to false. It needs to be changed.
-        if(!isset($aLibOptions['core']['response']['send']))
-        {
-            $aLibOptions['core']['response']['send'] = true;
-        }
-
-        $this->bootstrap()
-            ->lib($aLibOptions)
-            ->app($aAppOptions)
-            ->setup();
-    }
+public function setup(string $sConfigFile = ''): void
+{
+if(!file_exists($sConfigFile))
+{
+throw new SetupException($this->translator()
+    ->trans('errors.file.access', ['path' => $sConfigFile]));
+}
+
+// Read the config options.
+$aOptions = $this->config()->read($sConfigFile);
+$aLibOptions = $aOptions['lib'] ?? [];
+$aAppOptions = $aOptions['app'] ?? [];
+if(!is_array($aLibOptions) || !is_array($aAppOptions))
+{
+throw new SetupException($sMessage = $this->translator()
+    ->trans('errors.file.content', ['path' => $sConfigFile]));
+}
+
+// The bootstrap set this to false. It needs to be changed.
+if(!isset($aLibOptions['core']['response']['send']))
+{
+$aLibOptions['core']['response']['send'] = true;
+}
+
+$this->bootstrap()
+->lib($aLibOptions)
+->app($aAppOptions)
+->setup();
+}
 }

jaxon-core/src/App/Ajax/AppInterface.php

Switch Indentation +34 added lines, -34 removed lines

@@ -22,58 +22,58 @@ 
 
 interface AppInterface
 {
-    /**
+/**
      * Set the logger.
      *
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger): void;
+public function setLogger(LoggerInterface|Closure $xLogger): void;
 
-    /**
+/**
      * Get the configured character encoding
      *
      * @return string
      */
-    public function getCharacterEncoding(): string;
+public function getCharacterEncoding(): string;
 
-    /**
+/**
      * Get the content type of the HTTP response
      *
      * @return string
      */
-    public function getContentType(): string;
+public function getContentType(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string
      */
-    public function getJs(): string;
+public function getJs(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string  the javascript code
      */
-    public function js(): string;
+public function js(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string
      */
-    public function getCss(): string;
+public function getCss(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string  the javascript code
      */
-    public function css(): string;
+public function css(): string;
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * The javascript code returned by this function is dependent on the plugins
@@ -84,9 +84,9 @@ 
      *
      * @return string
      */
-    public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
+public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * @param bool $bIncludeJs    Also get the JS files
@@ -95,46 +95,46 @@ 
      * @return string  the javascript code
      * @throws UriException
      */
-    public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
+public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
 
-    /**
+/**
      * Determine if a call is a jaxon request or a page load request
      *
      * @return bool
      */
-    public function canProcessRequest(): bool;
+public function canProcessRequest(): bool;
 
-    /**
+/**
      * Process an incoming Jaxon request, and return the response.
      *
      * @return mixed
      */
-    public function processRequest(): mixed;
+public function processRequest(): mixed;
 
-    /**
+/**
      * Get the Jaxon ajax response
      *
      * @return AjaxResponse
      */
-    public function ajaxResponse(): AjaxResponse;
+public function ajaxResponse(): AjaxResponse;
 
-    /**
+/**
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure);
+public function setSessionManager(Closure $xClosure);
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer);
+public function setContainer(ContainerInterface $xContainer);
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sRenderer    The renderer name
@@ -143,9 +143,9 @@ 
      *
      * @return void
      */
-    public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure);
+public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure);
 
-    /**
+/**
      * Set the javascript asset
      *
      * @param bool $bExport    Whether to export the js code in a file
@@ -155,14 +155,14 @@ 
      *
      * @return void
      */
-    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void;
+public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void;
 
-    /**
+/**
      * Read config options from a config file and set up the library
      *
      * @param string $sConfigFile    The full path to the config file
      *
      * @return void
      */
-    public function setup(string $sConfigFile = ''): void;
+public function setup(string $sConfigFile = ''): void;
 }

jaxon-core/src/App/Ajax/AbstractApp.php

Switch Indentation +29 added lines, -29 removed lines

@@ -20,32 +20,32 @@ 
 
 abstract class AbstractApp implements AppInterface
 {
-    use Traits\ServicesTrait;
-    use Traits\PluginTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
+use Traits\ServicesTrait;
+use Traits\PluginTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct()
-    {
-        // Declared in DiTrait.
-        $this->xContainer = Jaxon::getInstance()->di();
-        $this->xComponentContainer = Jaxon::getInstance()->cdi();
-    }
+public function __construct()
+{
+// Declared in DiTrait.
+$this->xContainer = Jaxon::getInstance()->di();
+$this->xComponentContainer = Jaxon::getInstance()->cdi();
+}
 
-    /**
+/**
      * Get the Jaxon application bootstrapper.
      *
      * @return Bootstrap
      */
-    protected function bootstrap(): Bootstrap
-    {
-        return $this->xContainer->getBootstrap();
-    }
+protected function bootstrap(): Bootstrap
+{
+return $this->xContainer->getBootstrap();
+}
 
-    /**
+/**
      * Set the javascript asset
      *
      * @param bool $bExport    Whether to export the js code in a file
@@ -55,26 +55,26 @@ 
      *
      * @return void
      */
-    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void
-    {
-        $this->bootstrap()->asset($bExport, $bMinify, $sUri, $sDir);
-    }
+public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void
+{
+$this->bootstrap()->asset($bExport, $bMinify, $sUri, $sDir);
+}
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer): void
-    {
-        $this->di()->setContainer($xContainer);
-    }
+public function setContainer(ContainerInterface $xContainer): void
+{
+$this->di()->setContainer($xContainer);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function setup(string $sConfigFile = ''): void
-    {}
+public function setup(string $sConfigFile = ''): void
+{}
 }

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

Switch Indentation +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 
 interface ViewInterface
 {
-    /**
+/**
      * Add a namespace to the view renderer
      *
      * @param string $sNamespace    The namespace name
@@ -13,14 +13,14 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void;
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void;
 
-    /**
+/**
      * Render a view
      *
      * @param Store $store    A store populated with the view data
      *
      * @return string
      */
-    public function render(Store $store): string;
+public function render(Store $store): string;
 }

jaxon-core/src/App/View/Helper/EventAttr.php

Switch Indentation +38 added lines, -38 removed lines

@@ -23,33 +23,33 @@ 
 
 class EventAttr
 {
-    /**
+/**
      * @var array
      */
-    private array $aHandlers = [];
+private array $aHandlers = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sSelector
      */
-    public function __construct(private string $sSelector)
-    {}
+public function __construct(private string $sSelector)
+{}
 
-    /**
+/**
      * Set a selector for the next event handler
      *
      * @param string $sSelector
      *
      * @return self
      */
-    public function select(string $sSelector): self
-    {
-        $this->sSelector = trim($sSelector);
-        return $this;
-    }
+public function select(string $sSelector): self
+{
+$this->sSelector = trim($sSelector);
+return $this;
+}
 
-    /**
+/**
      * Set an event handler with the "on" keyword
      *
      * @param string $event
@@ -57,43 +57,43 @@ 
      *
      * @return self
      */
-    public function on(string $event, JsExpr $xJsExpr): self
-    {
-        if($this->sSelector === '')
-        {
-            return $this;
-        }
+public function on(string $event, JsExpr $xJsExpr): self
+{
+if($this->sSelector === '')
+{
+return $this;
+}
 
-        $this->aHandlers[] = [
-            'select' => $this->sSelector,
-            'event' => trim($event),
-            'handler' => $xJsExpr,
-        ];
-        $this->sSelector = '';
-        return $this;
-    }
+$this->aHandlers[] = [
+'select' => $this->sSelector,
+'event' => trim($event),
+'handler' => $xJsExpr,
+];
+$this->sSelector = '';
+return $this;
+}
 
-    /**
+/**
      * Shortcut to set a click event handler
      *
      * @param JsExpr $xJsExpr
      *
      * @return self
      */
-    public function click(JsExpr $xJsExpr): self
-    {
-        return $this->on('click', $xJsExpr);
-    }
+public function click(JsExpr $xJsExpr): self
+{
+return $this->on('click', $xJsExpr);
+}
 
-    /**
+/**
      * Convert to string.
      *
      * @return string
      */
-    public function __toString(): string
-    {
-        // No output if no handler is defined.
-        return count($this->aHandlers) === 0 ? '' : 'jxn-event="' .
-            htmlentities(json_encode($this->aHandlers)) . '"';
-    }
+public function __toString(): string
+{
+// No output if no handler is defined.
+return count($this->aHandlers) === 0 ? '' : 'jxn-event="' .
+htmlentities(json_encode($this->aHandlers)) . '"';
+}
 }

jaxon-core/src/App/View/Helper/HtmlAttrHelper.php

Switch Indentation +101 added lines, -101 removed lines

@@ -31,40 +31,40 @@ 
 
 class HtmlAttrHelper
 {
-    /**
+/**
      * @var string|null
      */
-    private string|null $sPaginationComponent = null;
+private string|null $sPaginationComponent = null;
 
-    /**
+/**
      * The constructor
      *
      * @param ComponentContainer $cdi
      */
-    public function __construct(protected ComponentContainer $cdi)
-    {}
+public function __construct(protected ComponentContainer $cdi)
+{}
 
-    /**
+/**
      * Get the component HTML code
      *
      * @param JxnCall $xJsCall
      *
      * @return string
      */
-    public function html(JxnCall $xJsCall): string
-    {
-        $sClassName = $xJsCall->_class();
-        if(!$sClassName)
-        {
-            return '';
-        }
-
-        $xComponent = $this->cdi->makeComponent($sClassName);
-        return is_a($xComponent, NodeComponent::class) ?
-            (string)$xComponent->html() : '';
-    }
-
-    /**
+public function html(JxnCall $xJsCall): string
+{
+$sClassName = $xJsCall->_class();
+if(!$sClassName)
+{
+return '';
+}
+
+$xComponent = $this->cdi->makeComponent($sClassName);
+return is_a($xComponent, NodeComponent::class) ?
+(string)$xComponent->html() : '';
+}
+
+/**
      * Attach a component to a DOM node
      *
      * @param JxnCall $xJsCall
@@ -72,41 +72,41 @@ 
      *
      * @return string
      */
-    public function bind(JxnCall $xJsCall, string $item = ''): string
-    {
-        $item = trim($item);
-        return 'jxn-bind="' . $xJsCall->_class() . (!$item ? '"' : '" jxn-item="' . $item . '"');
-    }
+public function bind(JxnCall $xJsCall, string $item = ''): string
+{
+$item = trim($item);
+return 'jxn-bind="' . $xJsCall->_class() . (!$item ? '"' : '" jxn-item="' . $item . '"');
+}
 
-    /**
+/**
      * Attach the pagination component to a DOM node
      *
      * @param JxnCall $xJsCall
      *
      * @return string
      */
-    public function pagination(JxnCall $xJsCall): string
-    {
-        // The pagination is always rendered with the same Pagination component.
-        $sComponent = $this->sPaginationComponent ?:
-            ($this->sPaginationComponent = rq(Pagination::class)->_class());
-        $sItem = $xJsCall->_class();
-        return "jxn-bind=\"$sComponent\" jxn-item=\"$sItem\"";
-    }
-
-    /**
+public function pagination(JxnCall $xJsCall): string
+{
+// The pagination is always rendered with the same Pagination component.
+$sComponent = $this->sPaginationComponent ?:
+($this->sPaginationComponent = rq(Pagination::class)->_class());
+$sItem = $xJsCall->_class();
+return "jxn-bind=\"$sComponent\" jxn-item=\"$sItem\"";
+}
+
+/**
      * Set a selector for the next event handler
      *
      * @param string $sSelector
      *
      * @return EventAttr
      */
-    public function select(string $sSelector): EventAttr
-    {
-        return new EventAttr($sSelector);
-    }
+public function select(string $sSelector): EventAttr
+{
+return new EventAttr($sSelector);
+}
 
-    /**
+/**
      * Set an event handler
      *
      * @param string $event
@@ -114,83 +114,83 @@ 
      *
      * @return string
      */
-    public function on(string $event, JsExpr $xJsExpr): string
-    {
-        $event = trim($event);
-        $sCall = htmlentities(json_encode($xJsExpr->jsonSerialize()));
-        return "jxn-on=\"$event\" jxn-call=\"$sCall\"";
-    }
-
-    /**
+public function on(string $event, JsExpr $xJsExpr): string
+{
+$event = trim($event);
+$sCall = htmlentities(json_encode($xJsExpr->jsonSerialize()));
+return "jxn-on=\"$event\" jxn-call=\"$sCall\"";
+}
+
+/**
      * Shortcut to set a click event handler
      *
      * @param JsExpr $xJsExpr
      *
      * @return string
      */
-    public function click(JsExpr $xJsExpr): string
-    {
-        return $this->on('click', $xJsExpr);
-    }
+public function click(JsExpr $xJsExpr): string
+{
+return $this->on('click', $xJsExpr);
+}
 
-    /**
+/**
      * @param array $aHandler
      *
      * @return bool
      */
-    private function eventIsValid(array $aHandler): bool
-    {
-        return count($aHandler) === 3 &&
-            isset($aHandler[0]) && isset($aHandler[1]) && isset($aHandler[2]) &&
-            is_string($aHandler[0]) && is_string($aHandler[1]) &&
-            is_a($aHandler[2], JsExpr::class);
-    }
-
-    /**
+private function eventIsValid(array $aHandler): bool
+{
+return count($aHandler) === 3 &&
+isset($aHandler[0]) && isset($aHandler[1]) && isset($aHandler[2]) &&
+is_string($aHandler[0]) && is_string($aHandler[1]) &&
+is_a($aHandler[2], JsExpr::class);
+}
+
+/**
      * @param array $aHandler
      * @param EventAttr|null $xAttr
      *
      * @return EventAttr|null
      */
-    private function setEventHandler(array $aHandler, ?EventAttr $xAttr = null): EventAttr|null
-    {
-        if(!$this->eventIsValid($aHandler))
-        {
-            return $xAttr;
-        }
-        // The array content is valid.
-        [$sSelector, $sEvent, $xJsExpr] = $aHandler;
-        return !$xAttr ?
-            $this->select($sSelector)->on($sEvent, $xJsExpr) :
-            $xAttr->select($sSelector)->on($sEvent, $xJsExpr);
-    }
-
-    /**
+private function setEventHandler(array $aHandler, ?EventAttr $xAttr = null): EventAttr|null
+{
+if(!$this->eventIsValid($aHandler))
+{
+return $xAttr;
+}
+// The array content is valid.
+[$sSelector, $sEvent, $xJsExpr] = $aHandler;
+return !$xAttr ?
+$this->select($sSelector)->on($sEvent, $xJsExpr) :
+$xAttr->select($sSelector)->on($sEvent, $xJsExpr);
+}
+
+/**
      * Set an event handler
      *
      * @param array $aHandler
      *
      * @return string
      */
-    public function event(array $aHandler): string
-    {
-        return $this->setEventHandler($aHandler)?->__toString() ?? '';
-    }
+public function event(array $aHandler): string
+{
+return $this->setEventHandler($aHandler)?->__toString() ?? '';
+}
 
-    /**
+/**
      * Set event handlers
      *
      * @param array $aHandlers
      *
      * @return string
      */
-    public function events(array $aHandlers): string
-    {
-        return array_reduce($aHandlers, fn(EventAttr|null $xAttr, array $aHandler)
-            => $this->setEventHandler($aHandler, $xAttr), null)?->__toString() ?? '';
-    }
+public function events(array $aHandlers): string
+{
+return array_reduce($aHandlers, fn(EventAttr|null $xAttr, array $aHandler)
+=> $this->setEventHandler($aHandler, $xAttr), null)?->__toString() ?? '';
+}
 
-    /**
+/**
      * Get the HTML or Javascript ready code for a package
      *
      * @param string $sClass
@@ -198,17 +198,17 @@ 
      *
      * @return string
      */
-    public function package(string $sClass, string $sType = 'html'): string
-    {
-        $sCode = match($sType) {
-            'html' => jaxon()->package($sClass)?->getHtml() ?? '',
-            'ready' => jaxon()->package($sClass)?->getReadyScript() ?? '',
-            default => ''
-        };
-        $sCode = trim($sCode);
-
-        return $sType !== 'ready' || $sCode === '' ? $sCode :
-            // Call the ready code with the jaxon.dom.ready function.
-            "jaxon.dom.ready(() => $sCode)";
-    }
+public function package(string $sClass, string $sType = 'html'): string
+{
+$sCode = match($sType) {
+'html' => jaxon()->package($sClass)?->getHtml() ?? '',
+'ready' => jaxon()->package($sClass)?->getReadyScript() ?? '',
+default => ''
+};
+$sCode = trim($sCode);
+
+return $sType !== 'ready' || $sCode === '' ? $sCode :
+// Call the ready code with the jaxon.dom.ready function.
+"jaxon.dom.ready(() => $sCode)";
+}
 }

jaxon-annotations/src/Annotation/ExportAnnotation.php

Switch Indentation +25 added lines, -25 removed lines

@@ -26,41 +26,41 @@
  */
 class ExportAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * @var array
      */
-    private $aMethods = [];
+private $aMethods = [];
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = json_decode($value, true);
-        return is_array($aParams) ? $aParams : [];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = json_decode($value, true);
+return is_array($aParams) ? $aParams : [];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        foreach(['base', 'only', 'except'] as $key)
-        {
-            if(isset($properties[$key]) && is_array($properties[$key]) &&
-                count($properties[$key]) > 0)
-            {
-                $this->aMethods[$key] = $properties[$key];
-            }
-        }
-    }
+public function initAnnotation(array $properties)
+{
+foreach(['base', 'only', 'except'] as $key)
+{
+if(isset($properties[$key]) && is_array($properties[$key]) &&
+    count($properties[$key]) > 0)
+{
+    $this->aMethods[$key] = $properties[$key];
+}
+}
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->export($sMethod)->setMethods($this->aMethods);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->export($sMethod)->setMethods($this->aMethods);
+}
 }