jaxon-php / jaxon-mono

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

Switch Indentation +65 added lines, -65 removed lines

@@ -33,111 +33,111 @@
 
 final class Jaxon
 {
-    use Traits\ConfigTrait;
-    use Traits\ServicesTrait;
-    use Traits\PluginTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
-    use Traits\SendResponseTrait;
-
-    /**
+use Traits\ConfigTrait;
+use Traits\ServicesTrait;
+use Traits\PluginTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
+use Traits\SendResponseTrait;
+
+/**
      * @var Jaxon
      */
-    private static $xInstance = null;
+private static $xInstance = null;
 
-    /**
+/**
      * The constructor
      *
      * @param Container $xContainer
      * @param ComponentContainer $xComponentContainer
      */
-    private function __construct(Container $xContainer, ComponentContainer $xComponentContainer)
-    {
-        $this->xContainer = $xContainer;
-        $this->xComponentContainer = $xComponentContainer;
-    }
+private function __construct(Container $xContainer, ComponentContainer $xComponentContainer)
+{
+$this->xContainer = $xContainer;
+$this->xComponentContainer = $xComponentContainer;
+}
 
-    /**
+/**
      * @return Jaxon
      */
-    private static function createInstance(): Jaxon
-    {
-        $xContainer = new Container();
-        $xComponentContainer = new ComponentContainer($xContainer);
-        self::$xInstance = new Jaxon($xContainer, $xComponentContainer);
+private static function createInstance(): Jaxon
+{
+$xContainer = new Container();
+$xComponentContainer = new ComponentContainer($xContainer);
+self::$xInstance = new Jaxon($xContainer, $xComponentContainer);
 
-        // Save the Jaxon and container instances
-        $xContainer->val(Jaxon::class, self::$xInstance);
-        $xContainer->val(ComponentContainer::class, $xComponentContainer);
+// Save the Jaxon and container instances
+$xContainer->val(Jaxon::class, self::$xInstance);
+$xContainer->val(ComponentContainer::class, $xComponentContainer);
 
-        // Make the helpers functions available in the global namespace.
-        self::$xInstance->getCallbackManager()->boot(function() {
-            self::$xInstance->config()->globals();
-        });
+// Make the helpers functions available in the global namespace.
+self::$xInstance->getCallbackManager()->boot(function() {
+self::$xInstance->config()->globals();
+});
 
-        return self::$xInstance;
-    }
+return self::$xInstance;
+}
 
-    /**
+/**
      * @return Jaxon
      */
-    public static function getInstance(): Jaxon
-    {
-        return self::$xInstance ?: self::$xInstance = self::createInstance();
-    }
+public static function getInstance(): Jaxon
+{
+return self::$xInstance ?: self::$xInstance = self::createInstance();
+}
 
-    /**
+/**
      * @return string
      */
-    public function getVersion(): string
-    {
-        return \Jaxon\Jaxon::VERSION;
-    }
+public function getVersion(): string
+{
+return \Jaxon\Jaxon::VERSION;
+}
 
-    /**
+/**
      * @return ConfigManager
      */
-    public function config(): ConfigManager
-    {
-        return $this->di()->g(ConfigManager::class);
-    }
+public function config(): ConfigManager
+{
+return $this->di()->g(ConfigManager::class);
+}
 
-    /**
+/**
      * Set the ajax endpoint URI
      *
      * @param string $sUri    The ajax endpoint URI
      *
      * @return void
      */
-    public function setUri(string $sUri): void
-    {
-        $this->config()->setOption('core.request.uri', $sUri);
-    }
+public function setUri(string $sUri): void
+{
+$this->config()->setOption('core.request.uri', $sUri);
+}
 
-    /**
+/**
      * @return AppInterface
      */
-    public function app(): AppInterface
-    {
-        return $this->xContainer->getApp();
-    }
+public function app(): AppInterface
+{
+return $this->xContainer->getApp();
+}
 
-    /**
+/**
      * Get the callback manager
      *
      * @return CallbackManager
      */
-    public function callback(): CallbackManager
-    {
-        return $this->getCallbackManager();
-    }
+public function callback(): CallbackManager
+{
+return $this->getCallbackManager();
+}
 
-    /**
+/**
      * @return void
      * @throws SetupException
      */
-    public function reset(): void
-    {
-        self::$xInstance = null;
-    }
+public function reset(): void
+{
+self::$xInstance = null;
+}
 }

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);
+}
 }

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 && $xMetadata !== null)
-        {
-            $xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
-        }
+// Try to save the metadata in the cache
+if($xMetadataCache !== null && $xMetadata !== 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/ComponentContainer.php

Switch Indentation +204 added lines, -204 removed lines

@@ -39,73 +39,73 @@ 
 
 class ComponentContainer
 {
-    use Traits\DiAutoTrait;
-    use Traits\ComponentTrait;
+use Traits\DiAutoTrait;
+use Traits\ComponentTrait;
 
-    /**
+/**
      * The Dependency Injection Container for registered classes
      *
      * @var PimpleContainer
      */
-    private $xContainer;
+private $xContainer;
 
-    /**
+/**
      * This will be set only when getting the object targetted by the ajax request.
      *
      * @var Target
      */
-    private $xTarget = null;
+private $xTarget = null;
 
-    /**
+/**
      * The class constructor
      *
      * @param Container $di
      */
-    public function __construct(private Container $di)
-    {
-        $this->xContainer = new PimpleContainer();
-        $this->val(ComponentContainer::class, $this);
-
-        // Register the call factory for registered functions
-        $this->set($this->getRequestFactoryKey(JxnCall::class), fn() =>
-            new JxnCall($this->di->g(ConfigManager::class)
-                ->getOption('core.prefix.function', '')));
-
-        // Register the pagination component, but do not export to js.
-        $this->saveComponent(Pagination::class, [
-            'excluded' => true,
-            'separator' => '.',
-            // The namespace has the same name as the Component class.
-            'namespace' => Component::class,
-        ]);
-
-        $this->setComponentPublicMethods('node', NodeComponent::class, ['item', 'html']);
-        $this->setComponentPublicMethods('func', FuncComponent::class, ['paginator']);
-    }
+public function __construct(private Container $di)
+{
+$this->xContainer = new PimpleContainer();
+$this->val(ComponentContainer::class, $this);
+
+// Register the call factory for registered functions
+$this->set($this->getRequestFactoryKey(JxnCall::class), fn() =>
+new JxnCall($this->di->g(ConfigManager::class)
+    ->getOption('core.prefix.function', '')));
+
+// Register the pagination component, but do not export to js.
+$this->saveComponent(Pagination::class, [
+'excluded' => true,
+'separator' => '.',
+// The namespace has the same name as the Component class.
+'namespace' => Component::class,
+]);
+
+$this->setComponentPublicMethods('node', NodeComponent::class, ['item', 'html']);
+$this->setComponentPublicMethods('func', FuncComponent::class, ['paginator']);
+}
 
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    protected function cn(): Container
-    {
-        return $this->di;
-    }
+protected function cn(): Container
+{
+return $this->di;
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param class-string $sClass    The full class name
      *
      * @return bool
      */
-    public function has(string $sClass): bool
-    {
-        return $this->xContainer->offsetExists($sClass);
-    }
+public function has(string $sClass): bool
+{
+return $this->xContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Save a closure in the container
      *
      * @param class-string $sClass    The full class name
@@ -113,12 +113,12 @@ 
      *
      * @return void
      */
-    public function set(string $sClass, Closure $xClosure)
-    {
-        $this->xContainer->offsetSet($sClass, fn() => $xClosure($this));
-    }
+public function set(string $sClass, Closure $xClosure)
+{
+$this->xContainer->offsetSet($sClass, fn() => $xClosure($this));
+}
 
-    /**
+/**
      * Save a value in the container
      *
      * @param string|class-string $sKey    The key
@@ -126,12 +126,12 @@ 
      *
      * @return void
      */
-    public function val(string $sKey, $xValue)
-    {
-       $this->xContainer->offsetSet($sKey, $xValue);
-    }
+public function val(string $sKey, $xValue)
+{
+$this->xContainer->offsetSet($sKey, $xValue);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -139,12 +139,12 @@ 
      *
      * @return T
      */
-    public function get(string $sClass)
-    {
-        return $this->xContainer->offsetGet($sClass);
-    }
+public function get(string $sClass)
+{
+return $this->xContainer->offsetGet($sClass);
+}
 
-    /**
+/**
      * Get a component when one of its method needs to be called
      *
      * @template T
@@ -153,17 +153,17 @@ 
      *
      * @return T|null
      */
-    public function getTargetComponent(string $sClassName, Target $xTarget): mixed
-    {
-        // Set the target only when getting the object targetted by the ajax request.
-        $this->xTarget = $xTarget;
-        $xComponent = $this->get($sClassName);
-        $this->xTarget = null;
+public function getTargetComponent(string $sClassName, Target $xTarget): mixed
+{
+// Set the target only when getting the object targetted by the ajax request.
+$this->xTarget = $xTarget;
+$xComponent = $this->get($sClassName);
+$this->xTarget = null;
 
-        return $xComponent;
-    }
+return $xComponent;
+}
 
-    /**
+/**
      * Register a component and its options
      *
      * @param class-string $sClassName    The class name
@@ -171,40 +171,40 @@ 
      *
      * @return void
      */
-    public function saveComponent(string $sClassName, array $aOptions): void
-    {
-        try
-        {
-            // Make sure the registered class exists
-            if(isset($aOptions['include']))
-            {
-                require_once $aOptions['include'];
-            }
-            $xReflectionClass = new ReflectionClass($sClassName);
-            // Check if the class is registrable
-            if(!$xReflectionClass->isInstantiable())
-            {
-                return;
-            }
-
-            $this->_saveClassOptions($sClassName, $aOptions);
-
-            $sClassKey = $this->getReflectionClassKey($sClassName);
-            $this->val($sClassKey, $xReflectionClass);
-            // Register the user class, but only if the user didn't already.
-            if(!$this->has($sClassName))
-            {
-                $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
-            }
-        }
-        catch(ReflectionException $e)
-        {
-            throw new SetupException($this->cn()->g(Translator::class)
-                ->trans('errors.class.invalid', ['name' => $sClassName]));
-        }
-    }
+public function saveComponent(string $sClassName, array $aOptions): void
+{
+try
+{
+// Make sure the registered class exists
+if(isset($aOptions['include']))
+{
+    require_once $aOptions['include'];
+}
+$xReflectionClass = new ReflectionClass($sClassName);
+// Check if the class is registrable
+if(!$xReflectionClass->isInstantiable())
+{
+    return;
+}
+
+$this->_saveClassOptions($sClassName, $aOptions);
 
-    /**
+$sClassKey = $this->getReflectionClassKey($sClassName);
+$this->val($sClassKey, $xReflectionClass);
+// Register the user class, but only if the user didn't already.
+if(!$this->has($sClassName))
+{
+    $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
+}
+}
+catch(ReflectionException $e)
+{
+throw new SetupException($this->cn()->g(Translator::class)
+    ->trans('errors.class.invalid', ['name' => $sClassName]));
+}
+}
+
+/**
      * Register a component
      *
      * @param string $sComponentId The component name
@@ -212,74 +212,74 @@ 
      * @return string
      * @throws SetupException
      */
-    private function _registerComponent(string $sComponentId): string
-    {
-        // Replace all separators ('.' or '_') with antislashes, and trim the class name.
-        $sClassName = trim(str_replace(['.', '_'], '\\', $sComponentId), '\\');
-
-        $sComponentObject = $this->getCallableObjectKey($sClassName);
-        // Prevent duplication. It's important not to use the class name here.
-        if($this->has($sComponentObject))
-        {
-            return $sClassName;
-        }
-
-        // Register the helper class
-        $this->set($this->getCallableHelperKey($sClassName), function() use($sClassName) {
-            $xFactory = $this->di->getCallFactory();
-            return new ComponentHelper($this, $xFactory->rq($sClassName),
-                $xFactory, $this->di->getViewRenderer(),
-                $this->di->getLogger(), $this->di->getSessionManager(),
-                $this->di->getStash(), $this->di->getUploadHandler());
-        });
-
-        $this->discoverComponent($sClassName);
-
-        // Register the callable object
-        $this->set($sComponentObject, function() use($sComponentId, $sClassName) {
-            $aOptions = $this->_getClassOptions($sComponentId);
-            $xReflectionClass = $this->get($this->getReflectionClassKey($sClassName));
-            $xOptions = $this->getComponentOptions($xReflectionClass, $aOptions);
-            return new CallableObject($this, $this->di, $xReflectionClass, $xOptions);
-        });
-
-        // Initialize the user class instance
-        $this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
-            if($xClassInstance instanceof AbstractComponent)
-            {
-                $xHelper = $this->get($this->getCallableHelperKey($sClassName));
-                $xHelper->xTarget = $this->xTarget;
-
-                // Call the protected "initComponent()" method of the Component class.
-                $cSetter = function($di, $xHelper) {
-                    $this->initComponent($di, $xHelper);  // "$this" here refers to the Component class.
-                };
-                $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
-                call_user_func($cSetter, $this->di, $xHelper);
-            }
-
-            // Run the callbacks for class initialisation
-            $this->di->g(CallbackManager::class)->onInit($xClassInstance);
-
-            // Set attributes from the DI container.
-            // The class level DI options are set on any component.
-            // The method level DI options are set only on the targetted component.
-            /** @var CallableObject */
-            $xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
-            $xCallableObject->setDiClassAttributes($xClassInstance);
-            if($this->xTarget !== null)
-            {
-                $sMethodName = $this->xTarget->getMethodName();
-                $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
-            }
-
-            return $xClassInstance;
-        });
-
-        return $sClassName;
-    }
+private function _registerComponent(string $sComponentId): string
+{
+// Replace all separators ('.' or '_') with antislashes, and trim the class name.
+$sClassName = trim(str_replace(['.', '_'], '\\', $sComponentId), '\\');
+
+$sComponentObject = $this->getCallableObjectKey($sClassName);
+// Prevent duplication. It's important not to use the class name here.
+if($this->has($sComponentObject))
+{
+return $sClassName;
+}
+
+// Register the helper class
+$this->set($this->getCallableHelperKey($sClassName), function() use($sClassName) {
+$xFactory = $this->di->getCallFactory();
+return new ComponentHelper($this, $xFactory->rq($sClassName),
+    $xFactory, $this->di->getViewRenderer(),
+    $this->di->getLogger(), $this->di->getSessionManager(),
+    $this->di->getStash(), $this->di->getUploadHandler());
+});
+
+$this->discoverComponent($sClassName);
+
+// Register the callable object
+$this->set($sComponentObject, function() use($sComponentId, $sClassName) {
+$aOptions = $this->_getClassOptions($sComponentId);
+$xReflectionClass = $this->get($this->getReflectionClassKey($sClassName));
+$xOptions = $this->getComponentOptions($xReflectionClass, $aOptions);
+return new CallableObject($this, $this->di, $xReflectionClass, $xOptions);
+});
+
+// Initialize the user class instance
+$this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
+if($xClassInstance instanceof AbstractComponent)
+{
+    $xHelper = $this->get($this->getCallableHelperKey($sClassName));
+    $xHelper->xTarget = $this->xTarget;
+
+    // Call the protected "initComponent()" method of the Component class.
+    $cSetter = function($di, $xHelper) {
+        $this->initComponent($di, $xHelper);  // "$this" here refers to the Component class.
+    };
+    $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
+    call_user_func($cSetter, $this->di, $xHelper);
+}
+
+// Run the callbacks for class initialisation
+$this->di->g(CallbackManager::class)->onInit($xClassInstance);
+
+// Set attributes from the DI container.
+// The class level DI options are set on any component.
+// The method level DI options are set only on the targetted component.
+/** @var CallableObject */
+$xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
+$xCallableObject->setDiClassAttributes($xClassInstance);
+if($this->xTarget !== null)
+{
+    $sMethodName = $this->xTarget->getMethodName();
+    $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
+}
+
+return $xClassInstance;
+});
 
-    /**
+return $sClassName;
+}
+
+/**
      * Get the callable object for a given class
      * The callable object is registered if it is not already in the DI.
      *
@@ -288,13 +288,13 @@ 
      * @return CallableObject|null
      * @throws SetupException
      */
-    public function makeCallableObject(string $sComponentId): ?CallableObject
-    {
-        $sClassName = $this->_registerComponent($sComponentId);
-        return $this->get($this->getCallableObjectKey($sClassName));
-    }
+public function makeCallableObject(string $sComponentId): ?CallableObject
+{
+$sClassName = $this->_registerComponent($sComponentId);
+return $this->get($this->getCallableObjectKey($sClassName));
+}
 
-    /**
+/**
      * Get an instance of a component by name
      *
      * @template T
@@ -303,53 +303,53 @@ 
      * @return T|null
      * @throws SetupException
      */
-    public function makeComponent(string $sClassName): mixed
-    {
-        $sComponentId = str_replace('\\', '.', $sClassName);
-        $sClassName = $this->_registerComponent($sComponentId);
-        return $this->get($sClassName);
-    }
+public function makeComponent(string $sClassName): mixed
+{
+$sComponentId = str_replace('\\', '.', $sClassName);
+$sClassName = $this->_registerComponent($sComponentId);
+return $this->get($sClassName);
+}
 
-    /**
+/**
      * Get a factory for a call to a registered function.
      *
      * @return JxnCall
      */
-    public function getFunctionRequestFactory(): JxnCall
-    {
-        return $this->get($this->getRequestFactoryKey(JxnCall::class));
-    }
+public function getFunctionRequestFactory(): JxnCall
+{
+return $this->get($this->getRequestFactoryKey(JxnCall::class));
+}
 
-    /**
+/**
      * Get a factory for a call to a registered component.
      *
      * @param class-string $sClassName
      *
      * @return JxnCall|null
      */
-    public function getComponentRequestFactory(string $sClassName): ?JxnCall
+public function getComponentRequestFactory(string $sClassName): ?JxnCall
+{
+$sClassName = trim($sClassName, " \t");
+if($sClassName === '')
+{
+return null;
+}
+
+$sFactoryKey = $this->getRequestFactoryKey($sClassName);
+if(!$this->has($sFactoryKey))
+{
+$this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
+    $sComponentId = str_replace('\\', '.', $sClassName);
+    if(!($xCallable = $this->makeCallableObject($sComponentId)))
     {
-        $sClassName = trim($sClassName, " \t");
-        if($sClassName === '')
-        {
-            return null;
-        }
-
-        $sFactoryKey = $this->getRequestFactoryKey($sClassName);
-        if(!$this->has($sFactoryKey))
-        {
-            $this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
-                $sComponentId = str_replace('\\', '.', $sClassName);
-                if(!($xCallable = $this->makeCallableObject($sComponentId)))
-                {
-                    return null;
-                }
-
-                $xConfigManager = $this->di->g(ConfigManager::class);
-                $sPrefix = $xConfigManager->getOption('core.prefix.class', '');
-                return new JxnClassCall($sPrefix . $xCallable->getJsName());
-            });
-        }
-        return $this->get($sFactoryKey);
+        return null;
     }
+
+    $xConfigManager = $this->di->g(ConfigManager::class);
+    $sPrefix = $xConfigManager->getOption('core.prefix.class', '');
+    return new JxnClassCall($sPrefix . $xCallable->getJsName());
+});
+}
+return $this->get($sFactoryKey);
+}
 }