jaxon-php / jaxon-mono

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

Switch Indentation +28 added lines, -28 removed lines

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

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

Switch Indentation +96 added lines, -96 removed lines

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

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

Switch Indentation +62 added lines, -62 removed lines

@@ -16,104 +16,104 @@
 
 trait AppTrait
 {
-    /**
+/**
      * @var string
      */
-    private $sJsLibVersion = 'jaxon_javascript_library_version';
+private $sJsLibVersion = 'jaxon_javascript_library_version';
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerApp(): void
-    {
-        // Config Manager
-        $this->set(ConfigEventManager::class, function($di) {
-            return new ConfigEventManager($di->g(Container::class));
-        });
-        $this->set(ConfigManager::class, function($di) {
-            $aDefaultOptions = require(__DIR__ . '/../../../config/lib.php');
-            return new ConfigManager($aDefaultOptions, $di->g(Translator::class),
-                $di->g(ConfigReader::class), $di->g(ConfigSetter::class),
-                $di->g(ConfigEventManager::class));
-        });
+private function registerApp(): void
+{
+// Config Manager
+$this->set(ConfigEventManager::class, function($di) {
+return new ConfigEventManager($di->g(Container::class));
+});
+$this->set(ConfigManager::class, function($di) {
+$aDefaultOptions = require(__DIR__ . '/../../../config/lib.php');
+return new ConfigManager($aDefaultOptions, $di->g(Translator::class),
+    $di->g(ConfigReader::class), $di->g(ConfigSetter::class),
+    $di->g(ConfigEventManager::class));
+});
 
-        // Jaxon App
-        $this->set(AppInterface::class, fn() => new App());
-        // Jaxon App bootstrap
-        $this->set(Bootstrap::class, function($di) {
-            return new Bootstrap($di->g(ConfigManager::class),
-                $di->g(PackageManager::class), $di->g(CallbackManager::class));
-        });
-        // The javascript library version
-        $this->set($this->sJsLibVersion, function($di) {
-            $xRequest = $di->getRequest();
-            $aParams = $xRequest->getMethod() === 'POST' ?
-                $xRequest->getParsedBody() : $xRequest->getQueryParams();
-            return $aParams['jxnv'] ?? '3.3.0';
-        });
-    }
+// Jaxon App
+$this->set(AppInterface::class, fn() => new App());
+// Jaxon App bootstrap
+$this->set(Bootstrap::class, function($di) {
+return new Bootstrap($di->g(ConfigManager::class),
+    $di->g(PackageManager::class), $di->g(CallbackManager::class));
+});
+// The javascript library version
+$this->set($this->sJsLibVersion, function($di) {
+$xRequest = $di->getRequest();
+$aParams = $xRequest->getMethod() === 'POST' ?
+    $xRequest->getParsedBody() : $xRequest->getQueryParams();
+return $aParams['jxnv'] ?? '3.3.0';
+});
+}
 
-    /**
+/**
      * Register the event handlers
      *
      * @return void
      */
-    private function setEventHandlers(): void
-    {
-        $xEventManager = $this->g(ConfigEventManager::class);
-        $xEventManager->addLibConfigListener(Translator::class);
-    }
+private function setEventHandlers(): void
+{
+$xEventManager = $this->g(ConfigEventManager::class);
+$xEventManager->addLibConfigListener(Translator::class);
+}
 
-    /**
+/**
      * Get the App instance
      *
      * @return AppInterface
      */
-    public function getApp(): AppInterface
-    {
-        return $this->g(AppInterface::class);
-    }
+public function getApp(): AppInterface
+{
+return $this->g(AppInterface::class);
+}
 
-    /**
+/**
      * Get the App bootstrap
      *
      * @return Bootstrap
      */
-    public function getBootstrap(): Bootstrap
-    {
-        return $this->g(Bootstrap::class);
-    }
+public function getBootstrap(): Bootstrap
+{
+return $this->g(Bootstrap::class);
+}
 
-    /**
+/**
      * Get the config manager
      *
      * @return ConfigManager
      */
-    public function config(): ConfigManager
-    {
-        return $this->g(ConfigManager::class);
-    }
+public function config(): ConfigManager
+{
+return $this->g(ConfigManager::class);
+}
 
-    /**
+/**
      * Get the javascript library version
      *
      * @return string
      */
-    public function getJsLibVersion(): string
-    {
-        return $this->g($this->sJsLibVersion);
-    }
+public function getJsLibVersion(): string
+{
+return $this->g($this->sJsLibVersion);
+}
 
-    /**
+/**
      * Get the default request URI
      *
      * @return string
      */
-    public function getRequestUri(): string
-    {
-        return $this->config()->getOption('core.request.uri',
-            $this->getParameterReader()->uri());
-    }
+public function getRequestUri(): string
+{
+return $this->config()->getOption('core.request.uri',
+$this->getParameterReader()->uri());
+}
 }

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

Switch Indentation +34 added lines, -34 removed lines

@@ -15,64 +15,64 @@
 
 trait ResponseTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerResponses(): void
-    {
-        // Global Response
-        $this->set(Response::class, function($di) {
-            return new Response($di->g(ResponseManager::class), $di->g(PluginManager::class));
-        });
-        // Response Manager
-        $this->set(ResponseManager::class, function($di) {
-            $sEncoding = trim($di->g(ConfigManager::class)->getOption('core.encoding', ''));
-            return new ResponseManager($di->g(Container::class), $di->g(Translator::class), $sEncoding);
-        });
-    }
+private function registerResponses(): void
+{
+// Global Response
+$this->set(Response::class, function($di) {
+return new Response($di->g(ResponseManager::class), $di->g(PluginManager::class));
+});
+// Response Manager
+$this->set(ResponseManager::class, function($di) {
+$sEncoding = trim($di->g(ConfigManager::class)->getOption('core.encoding', ''));
+return new ResponseManager($di->g(Container::class), $di->g(Translator::class), $sEncoding);
+});
+}
 
-    /**
+/**
      * Get the response manager
      *
      * @return ResponseManager
      */
-    public function getResponseManager(): ResponseManager
-    {
-        return $this->g(ResponseManager::class);
-    }
+public function getResponseManager(): ResponseManager
+{
+return $this->g(ResponseManager::class);
+}
 
-    /**
+/**
      * Get the global Response object
      *
      * @return Response
      */
-    public function getResponse(): Response
-    {
-        return $this->g(Response::class);
-    }
+public function getResponse(): Response
+{
+return $this->g(Response::class);
+}
 
-    /**
+/**
      * Create a new Jaxon response
      *
      * @return Response
      */
-    public function newResponse(): Response
-    {
-        return new Response($this->g(ResponseManager::class), $this->g(PluginManager::class));
-    }
+public function newResponse(): Response
+{
+return new Response($this->g(ResponseManager::class), $this->g(PluginManager::class));
+}
 
-    /**
+/**
      * Create a new reponse for a Jaxon component
      *
      * @param JxnCall $xJxnCall
      *
      * @return NodeResponse
      */
-    public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
-    {
-        return new NodeResponse($this->g(ResponseManager::class),
-            $this->g(PluginManager::class), $xJxnCall);
-    }
+public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
+{
+return new NodeResponse($this->g(ResponseManager::class),
+$this->g(PluginManager::class), $xJxnCall);
+}
 }

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

Switch Indentation +53 added lines, -53 removed lines

@@ -18,78 +18,78 @@
 
 trait ViewTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerViews(): void
-    {
-        // Jaxon template view
-        $this->set(TemplateView::class, function($di) {
-            return new TemplateView($di->g(TemplateEngine::class));
-        });
-        // View Renderer
-        $this->set(ViewRenderer::class, function($di) {
-            $xViewRenderer = new ViewRenderer($di->g(Container::class));
-            // Add the default view renderer
-            $xViewRenderer->addRenderer('jaxon', function($di) {
-                return $di->g(TemplateView::class);
-            });
-            $sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
-            $sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
-            // By default, render pagination templates with Jaxon.
-            $xViewRenderer->addNamespace('jaxon', $sTemplateDir, '.php', 'jaxon');
-            $xViewRenderer->addNamespace('pagination', $sPaginationDir, '.php', 'jaxon');
-            return $xViewRenderer;
-        });
+private function registerViews(): void
+{
+// Jaxon template view
+$this->set(TemplateView::class, function($di) {
+return new TemplateView($di->g(TemplateEngine::class));
+});
+// View Renderer
+$this->set(ViewRenderer::class, function($di) {
+$xViewRenderer = new ViewRenderer($di->g(Container::class));
+// Add the default view renderer
+$xViewRenderer->addRenderer('jaxon', function($di) {
+    return $di->g(TemplateView::class);
+});
+$sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
+$sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
+// By default, render pagination templates with Jaxon.
+$xViewRenderer->addNamespace('jaxon', $sTemplateDir, '.php', 'jaxon');
+$xViewRenderer->addNamespace('pagination', $sPaginationDir, '.php', 'jaxon');
+return $xViewRenderer;
+});
 
-        // By default there is no dialog library registry.
-        $this->set(LibraryRegistryInterface::class, function($di) {
-            return null;
-        });
-        // Dialog command
-        $this->set(DialogCommand::class, function($di) {
-            return new DialogCommand($di->g(LibraryRegistryInterface::class));
-        });
-        // Pagination renderer
-        $this->set(RendererInterface::class, function($di) {
-            return new Renderer($di->g(ViewRenderer::class));
-        });
+// By default there is no dialog library registry.
+$this->set(LibraryRegistryInterface::class, function($di) {
+return null;
+});
+// Dialog command
+$this->set(DialogCommand::class, function($di) {
+return new DialogCommand($di->g(LibraryRegistryInterface::class));
+});
+// Pagination renderer
+$this->set(RendererInterface::class, function($di) {
+return new Renderer($di->g(ViewRenderer::class));
+});
 
-        // Helpers for HTML custom attributes formatting
-        $this->set(HtmlAttrHelper::class, function($di) {
-            return new HtmlAttrHelper($di->g(ComponentContainer::class));
-        });
-    }
+// Helpers for HTML custom attributes formatting
+$this->set(HtmlAttrHelper::class, function($di) {
+return new HtmlAttrHelper($di->g(ComponentContainer::class));
+});
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    public function getViewRenderer(): ViewRenderer
-    {
-        return $this->g(ViewRenderer::class);
-    }
+public function getViewRenderer(): ViewRenderer
+{
+return $this->g(ViewRenderer::class);
+}
 
-    /**
+/**
      * Get the custom attributes helper
      *
      * @return HtmlAttrHelper
      */
-    public function getHtmlAttrHelper(): HtmlAttrHelper
-    {
-        return $this->g(HtmlAttrHelper::class);
-    }
+public function getHtmlAttrHelper(): HtmlAttrHelper
+{
+return $this->g(HtmlAttrHelper::class);
+}
 
-    /**
+/**
      * Get the dialog command
      *
      * @return DialogCommand
      */
-    public function getDialogCommand(): DialogCommand
-    {
-        return $this->g(DialogCommand::class);
-    }
+public function getDialogCommand(): DialogCommand
+{
+return $this->g(DialogCommand::class);
+}
 }

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

Switch Indentation +58 added lines, -58 removed lines

@@ -14,78 +14,78 @@
 
 trait UtilTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerUtils(): void
-    {
-        // Translator
-        $this->set(Translator::class, function($di) {
-            $xTranslator = new Translator();
-            $sResourceDir = rtrim(trim($di->g('jaxon.core.dir.translation')), '/\\');
-            // Load the debug translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/errors.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/errors.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/errors.php', 'es');
-            // Load the config translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/config.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/config.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/config.php', 'es');
-            // Load the labels translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/labels.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/labels.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/labels.php', 'es');
-            return $xTranslator;
-        });
+private function registerUtils(): void
+{
+// Translator
+$this->set(Translator::class, function($di) {
+$xTranslator = new Translator();
+$sResourceDir = rtrim(trim($di->g('jaxon.core.dir.translation')), '/\\');
+// Load the debug translations
+$xTranslator->loadTranslations($sResourceDir . '/en/errors.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/errors.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/errors.php', 'es');
+// Load the config translations
+$xTranslator->loadTranslations($sResourceDir . '/en/config.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/config.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/config.php', 'es');
+// Load the labels translations
+$xTranslator->loadTranslations($sResourceDir . '/en/labels.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/labels.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/labels.php', 'es');
+return $xTranslator;
+});
 
-        // Config reader
-        $this->set(ConfigReader::class, function($di) {
-            return new ConfigReader($di->g(ConfigSetter::class));
-        });
-        // Config setter
-        $this->set(ConfigSetter::class, function() {
-            return new ConfigSetter();
-        });
-        // Template engine
-        $this->set(TemplateEngine::class, function($di) {
-            $xTemplateEngine = new TemplateEngine();
-            $sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
-            $sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
-            $xTemplateEngine->addNamespace('jaxon', $sTemplateDir, '.php');
-            $xTemplateEngine->addNamespace('pagination', $sPaginationDir, '.php');
-            $xTemplateEngine->setDefaultNamespace('jaxon');
-            return $xTemplateEngine;
-        });
-        // URI detector
-        $this->set(UriDetector::class, function() {
-            return new UriDetector();
-        });
+// Config reader
+$this->set(ConfigReader::class, function($di) {
+return new ConfigReader($di->g(ConfigSetter::class));
+});
+// Config setter
+$this->set(ConfigSetter::class, function() {
+return new ConfigSetter();
+});
+// Template engine
+$this->set(TemplateEngine::class, function($di) {
+$xTemplateEngine = new TemplateEngine();
+$sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
+$sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
+$xTemplateEngine->addNamespace('jaxon', $sTemplateDir, '.php');
+$xTemplateEngine->addNamespace('pagination', $sPaginationDir, '.php');
+$xTemplateEngine->setDefaultNamespace('jaxon');
+return $xTemplateEngine;
+});
+// URI detector
+$this->set(UriDetector::class, function() {
+return new UriDetector();
+});
 
-        // Temp cache for Jaxon components
-        $this->set(Stash::class, function() {
-            return new Stash();
-        });
-    }
+// Temp cache for Jaxon components
+$this->set(Stash::class, function() {
+return new Stash();
+});
+}
 
-    /**
+/**
      * Get the template engine
      *
      * @return TemplateEngine
      */
-    public function getTemplateEngine(): TemplateEngine
-    {
-        return $this->g(TemplateEngine::class);
-    }
+public function getTemplateEngine(): TemplateEngine
+{
+return $this->g(TemplateEngine::class);
+}
 
-    /**
+/**
      * Get the temp cache for Jaxon components
      *
      * @return Stash
      */
-    public function getStash(): Stash
-    {
-        return $this->g(Stash::class);
-    }
+public function getStash(): Stash
+{
+return $this->g(Stash::class);
+}
 }

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

Switch Indentation +61 added lines, -61 removed lines

@@ -20,99 +20,99 @@
 
 trait RequestTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerRequests(): void
-    {
-        // The parameter reader
-        $this->set(ParameterReader::class, function($di) {
-            return new ParameterReader($di->g(Container::class), $di->g(Translator::class),
-                $di->g(ConfigManager::class), $di->g(UriDetector::class));
-        });
-        // Callback Manager
-        $this->set(CallbackManager::class, function($di) {
-            return new CallbackManager($di->g(ResponseManager::class));
-        });
-        // By default, register a null upload handler
-        $this->set(UploadHandlerInterface::class, function() {
-            return null;
-        });
-        // Request Handler
-        $this->set(RequestHandler::class, function($di) {
-            return new RequestHandler($di->g(Container::class), $di->g(PluginManager::class),
-                $di->g(ResponseManager::class), $di->g(CallbackManager::class),
-                $di->g(DatabagPlugin::class));
-        });
-        // Requests and calls Factory
-        $this->set(CallFactory::class, function($di) {
-            return new CallFactory($di->g(ComponentContainer::class), $di->g(DialogCommand::class));
-        });
-        // Factory for function parameters
-        $this->set(ParameterFactory::class, function() {
-            return new ParameterFactory();
-        });
-    }
+private function registerRequests(): void
+{
+// The parameter reader
+$this->set(ParameterReader::class, function($di) {
+return new ParameterReader($di->g(Container::class), $di->g(Translator::class),
+    $di->g(ConfigManager::class), $di->g(UriDetector::class));
+});
+// Callback Manager
+$this->set(CallbackManager::class, function($di) {
+return new CallbackManager($di->g(ResponseManager::class));
+});
+// By default, register a null upload handler
+$this->set(UploadHandlerInterface::class, function() {
+return null;
+});
+// Request Handler
+$this->set(RequestHandler::class, function($di) {
+return new RequestHandler($di->g(Container::class), $di->g(PluginManager::class),
+    $di->g(ResponseManager::class), $di->g(CallbackManager::class),
+    $di->g(DatabagPlugin::class));
+});
+// Requests and calls Factory
+$this->set(CallFactory::class, function($di) {
+return new CallFactory($di->g(ComponentContainer::class), $di->g(DialogCommand::class));
+});
+// Factory for function parameters
+$this->set(ParameterFactory::class, function() {
+return new ParameterFactory();
+});
+}
 
-    /**
+/**
      * Get the js call factory
      *
      * @return CallFactory
      */
-    public function getCallFactory(): CallFactory
-    {
-        return $this->g(CallFactory::class);
-    }
+public function getCallFactory(): CallFactory
+{
+return $this->g(CallFactory::class);
+}
 
-    /**
+/**
      * Get the js call parameter factory
      *
      * @return ParameterFactory
      */
-    public function getParameterFactory(): ParameterFactory
-    {
-        return $this->g(ParameterFactory::class);
-    }
+public function getParameterFactory(): ParameterFactory
+{
+return $this->g(ParameterFactory::class);
+}
 
-    /**
+/**
      * Get the request handler
      *
      * @return RequestHandler
      */
-    public function getRequestHandler(): RequestHandler
-    {
-        return $this->g(RequestHandler::class);
-    }
+public function getRequestHandler(): RequestHandler
+{
+return $this->g(RequestHandler::class);
+}
 
-    /**
+/**
      * Get the upload handler
      *
      * @return UploadHandlerInterface|null
      */
-    public function getUploadHandler(): ?UploadHandlerInterface
-    {
-        return $this->g(UploadHandlerInterface::class);
-    }
+public function getUploadHandler(): ?UploadHandlerInterface
+{
+return $this->g(UploadHandlerInterface::class);
+}
 
-    /**
+/**
      * Get the callback manager
      *
      * @return CallbackManager
      */
-    public function getCallbackManager(): CallbackManager
-    {
-        return $this->g(CallbackManager::class);
-    }
+public function getCallbackManager(): CallbackManager
+{
+return $this->g(CallbackManager::class);
+}
 
-    /**
+/**
      * Get the parameter reader
      *
      * @return ParameterReader
      */
-    public function getParameterReader(): ParameterReader
-    {
-        return $this->g(ParameterReader::class);
-    }
+public function getParameterReader(): ParameterReader
+{
+return $this->g(ParameterReader::class);
+}
 }

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

Switch Indentation +27 added lines, -27 removed lines

@@ -24,14 +24,14 @@ 
 
 trait DiAutoTrait
 {
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    abstract protected function cn(): Container;
+abstract protected function cn(): Container;
 
-    /**
+/**
      * Create an instance of a class, getting the constructor parameters from the DI container
      *
      * @param class-string|ReflectionClass $xClass The class name or the reflection class
@@ -40,36 +40,36 @@ 
      * @throws ReflectionException
      * @throws SetupException
      */
-    public function make(string|ReflectionClass $xClass): mixed
-    {
-        if(is_string($xClass))
-        {
-            // Create the reflection class instance
-            $xClass = new ReflectionClass($xClass);
-        }
-        // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
-        {
-            return $xClass->newInstance();
-        }
+public function make(string|ReflectionClass $xClass): mixed
+{
+if(is_string($xClass))
+{
+// Create the reflection class instance
+$xClass = new ReflectionClass($xClass);
+}
+// Use the Reflection class to get the parameters of the constructor
+if(($constructor = $xClass->getConstructor()) === null)
+{
+return $xClass->newInstance();
+}
 
-        $aParameters = array_map(function($xParameter) use($xClass) {
-            return $this->cn()->getParameter($xClass, $xParameter);
-        }, $constructor->getParameters());
-        return $xClass->newInstanceArgs($aParameters);
-    }
+$aParameters = array_map(function($xParameter) use($xClass) {
+return $this->cn()->getParameter($xClass, $xParameter);
+}, $constructor->getParameters());
+return $xClass->newInstanceArgs($aParameters);
+}
 
-    /**
+/**
      * Create an instance of a class by automatically fetching the dependencies in the constructor.
      *
      * @param class-string $sClass    The class name
      *
      * @return void
      */
-    public function auto(string $sClass): void
-    {
-        $this->set($sClass, function() use ($sClass) {
-            return $this->make($sClass);
-        });
-    }
+public function auto(string $sClass): void
+{
+$this->set($sClass, function() use ($sClass) {
+return $this->make($sClass);
+});
+}
 }

jaxon-core/src/App/Pagination/Paginator.php

Switch Indentation +223 added lines, -223 removed lines

@@ -59,52 +59,52 @@ 
 
 class Paginator
 {
-    /**
+/**
      * @var integer
      */
-    protected $nItemsCount = 0;
+protected $nItemsCount = 0;
 
-    /**
+/**
      * @var integer
      */
-    protected $nPagesCount = 0;
+protected $nPagesCount = 0;
 
-    /**
+/**
      * @var integer
      */
-    protected $nItemsPerPage = 0;
+protected $nItemsPerPage = 0;
 
-    /**
+/**
      * @var integer
      */
-    protected $nPageNumber = 0;
+protected $nPageNumber = 0;
 
-    /**
+/**
      * @var integer
      */
-    protected $nMaxPages = 10;
+protected $nMaxPages = 10;
 
-    /**
+/**
      * @var string
      */
-    protected $sPreviousText = '«';
+protected $sPreviousText = '«';
 
-    /**
+/**
      * @var string
      */
-    protected $sNextText = '»';
+protected $sNextText = '»';
 
-    /**
+/**
      * @var string
      */
-    protected $sEllipsysText = '...';
+protected $sEllipsysText = '...';
 
-    /**
+/**
      * @var PaginatorPlugin
      */
-    private $xPlugin;
+private $xPlugin;
 
-    /**
+/**
      * The constructor.
      *
      * @param PaginatorPlugin $xPlugin
@@ -112,293 +112,293 @@ 
      * @param int $nItemsPerPage    The number of items per page
      * @param int $nItemsCount      The total number of items
      */
-    public function __construct(PaginatorPlugin $xPlugin, int $nPageNumber, int $nItemsPerPage, int $nItemsCount)
-    {
-        $this->xPlugin = $xPlugin;
-        $this->nItemsPerPage = $nItemsPerPage > 0 ? $nItemsPerPage : 0;
-        $this->nItemsCount = $nItemsCount > 0 ? $nItemsCount : 0;
-        $this->nPageNumber = $nPageNumber < 1 ? 1 : $nPageNumber;
-        $this->updatePagesCount();
-    }
-
-    /**
+public function __construct(PaginatorPlugin $xPlugin, int $nPageNumber, int $nItemsPerPage, int $nItemsCount)
+{
+$this->xPlugin = $xPlugin;
+$this->nItemsPerPage = $nItemsPerPage > 0 ? $nItemsPerPage : 0;
+$this->nItemsCount = $nItemsCount > 0 ? $nItemsCount : 0;
+$this->nPageNumber = $nPageNumber < 1 ? 1 : $nPageNumber;
+$this->updatePagesCount();
+}
+
+/**
      * Update the number of pages
      *
      * @return Paginator
      */
-    private function updatePagesCount(): Paginator
-    {
-        $this->nPagesCount = ($this->nItemsPerPage === 0 ? 0 :
-            (int)ceil($this->nItemsCount / $this->nItemsPerPage));
-        if($this->nPageNumber > $this->nPagesCount)
-        {
-            $this->nPageNumber = $this->nPagesCount;
-        }
-        return $this;
-    }
-
-    /**
+private function updatePagesCount(): Paginator
+{
+$this->nPagesCount = ($this->nItemsPerPage === 0 ? 0 :
+(int)ceil($this->nItemsCount / $this->nItemsPerPage));
+if($this->nPageNumber > $this->nPagesCount)
+{
+$this->nPageNumber = $this->nPagesCount;
+}
+return $this;
+}
+
+/**
      * Set the text for the previous page link
      *
      * @param string $sText    The text for the previous page link
      *
      * @return Paginator
      */
-    public function setPreviousText(string $sText): Paginator
-    {
-        $this->sPreviousText = $sText;
-        return $this;
-    }
+public function setPreviousText(string $sText): Paginator
+{
+$this->sPreviousText = $sText;
+return $this;
+}
 
-    /**
+/**
      * Set the text for the next page link
      *
      * @param string $sText    The text for the previous page link
      *
      * @return Paginator
      */
-    public function setNextText(string $sText): Paginator
-    {
-        $this->sNextText = $sText;
-        return $this;
-    }
+public function setNextText(string $sText): Paginator
+{
+$this->sNextText = $sText;
+return $this;
+}
 
-    /**
+/**
      * Set the max number of pages to show
      *
      * @param int $nMaxPages    The max number of pages to show
      *
      * @return Paginator
      */
-    public function setMaxPages(int $nMaxPages): Paginator
-    {
-        $this->nMaxPages = max($nMaxPages, 4);
-        return $this;
-    }
+public function setMaxPages(int $nMaxPages): Paginator
+{
+$this->nMaxPages = max($nMaxPages, 4);
+return $this;
+}
 
-    /**
+/**
      * Get the previous page data.
      *
      * @return Page
      */
-    protected function getPrevPage(): Page
-    {
-        return $this->nPageNumber <= 1 ?
-            new Page('disabled', $this->sPreviousText, 0) :
-            new Page('enabled', $this->sPreviousText, $this->nPageNumber - 1);
-    }
-
-    /**
+protected function getPrevPage(): Page
+{
+return $this->nPageNumber <= 1 ?
+new Page('disabled', $this->sPreviousText, 0) :
+new Page('enabled', $this->sPreviousText, $this->nPageNumber - 1);
+}
+
+/**
      * Get the next page data.
      *
      * @return Page
      */
-    protected function getNextPage(): Page
-    {
-        return $this->nPageNumber >= $this->nPagesCount ?
-            new Page('disabled', $this->sNextText, 0) :
-            new Page('enabled', $this->sNextText, $this->nPageNumber + 1);
-    }
-
-    /**
+protected function getNextPage(): Page
+{
+return $this->nPageNumber >= $this->nPagesCount ?
+new Page('disabled', $this->sNextText, 0) :
+new Page('enabled', $this->sNextText, $this->nPageNumber + 1);
+}
+
+/**
      * Get a page data.
      *
      * @param integer $nNumber    The page number
      *
      * @return Page
      */
-    protected function getPage(int $nNumber): Page
-    {
-        if($nNumber < 1)
-        {
-            return new Page('disabled', $this->sEllipsysText, 0);
-        }
-        $sType = ($nNumber === $this->nPageNumber ? 'current' : 'enabled');
-        return new Page($sType, "$nNumber", $nNumber);
-    }
-
-    /**
+protected function getPage(int $nNumber): Page
+{
+if($nNumber < 1)
+{
+return new Page('disabled', $this->sEllipsysText, 0);
+}
+$sType = ($nNumber === $this->nPageNumber ? 'current' : 'enabled');
+return new Page($sType, "$nNumber", $nNumber);
+}
+
+/**
      * Get the array of page numbers to be printed.
      *
      * Example: [1, 0, 4, 5, 6, 0, 10]
      *
      * @return array
      */
-    protected function getPageNumbers(): array
-    {
-        $aPageNumbers = [];
-
-        if($this->nPagesCount <= $this->nMaxPages)
-        {
-            for($i = 0; $i < $this->nPagesCount; $i++)
-            {
-                $aPageNumbers[] = $i + 1;
-            }
-
-            return $aPageNumbers;
-        }
-
-        // Determine the sliding range, centered around the current page.
-        $nNumAdjacents = (int)floor(($this->nMaxPages - 4) / 2);
-
-        $nSlidingStart = 1;
-        $nSlidingEndOffset = $nNumAdjacents + 3 - $this->nPageNumber;
-        if($nSlidingEndOffset < 0)
-        {
-            $nSlidingStart = $this->nPageNumber - $nNumAdjacents;
-            $nSlidingEndOffset = 0;
-        }
-
-        $nSlidingEnd = $this->nPagesCount;
-        $nSlidingStartOffset = $this->nPageNumber + $nNumAdjacents + 2 - $this->nPagesCount;
-        if($nSlidingStartOffset < 0)
-        {
-            $nSlidingEnd = $this->nPageNumber + $nNumAdjacents;
-            $nSlidingStartOffset = 0;
-        }
-
-        // Build the list of page numbers.
-        if($nSlidingStart > 1)
-        {
-            $aPageNumbers[] = 1;
-            $aPageNumbers[] = 0; // Ellipsys;
-        }
-        for($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
-        {
-            $aPageNumbers[] = $i;
-        }
-        if($nSlidingEnd < $this->nPagesCount)
-        {
-            $aPageNumbers[] = 0; // Ellipsys;
-            $aPageNumbers[] = $this->nPagesCount;
-        }
-
-        return $aPageNumbers;
-    }
-
-    /**
+protected function getPageNumbers(): array
+{
+$aPageNumbers = [];
+
+if($this->nPagesCount <= $this->nMaxPages)
+{
+for($i = 0; $i < $this->nPagesCount; $i++)
+{
+    $aPageNumbers[] = $i + 1;
+}
+
+return $aPageNumbers;
+}
+
+// Determine the sliding range, centered around the current page.
+$nNumAdjacents = (int)floor(($this->nMaxPages - 4) / 2);
+
+$nSlidingStart = 1;
+$nSlidingEndOffset = $nNumAdjacents + 3 - $this->nPageNumber;
+if($nSlidingEndOffset < 0)
+{
+$nSlidingStart = $this->nPageNumber - $nNumAdjacents;
+$nSlidingEndOffset = 0;
+}
+
+$nSlidingEnd = $this->nPagesCount;
+$nSlidingStartOffset = $this->nPageNumber + $nNumAdjacents + 2 - $this->nPagesCount;
+if($nSlidingStartOffset < 0)
+{
+$nSlidingEnd = $this->nPageNumber + $nNumAdjacents;
+$nSlidingStartOffset = 0;
+}
+
+// Build the list of page numbers.
+if($nSlidingStart > 1)
+{
+$aPageNumbers[] = 1;
+$aPageNumbers[] = 0; // Ellipsys;
+}
+for($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
+{
+$aPageNumbers[] = $i;
+}
+if($nSlidingEnd < $this->nPagesCount)
+{
+$aPageNumbers[] = 0; // Ellipsys;
+$aPageNumbers[] = $this->nPagesCount;
+}
+
+return $aPageNumbers;
+}
+
+/**
      * Get the current page number.
      *
      * @return int
      */
-    public function currentPage(): int
-    {
-        return $this->nPageNumber;
-    }
+public function currentPage(): int
+{
+return $this->nPageNumber;
+}
 
-    /**
+/**
      * Get the links (pages raw data).
      *
      * @return array<Page>
      */
-    public function pages(): array
-    {
-        if($this->nPagesCount < 2)
-        {
-            return [];
-        }
-
-        $aPageNumbers = $this->getPageNumbers();
-        $aPages = [$this->getPrevPage()];
-        array_walk($aPageNumbers, function($nNumber) use(&$aPages) {
-            $aPages[] = $this->getPage($nNumber);
-        });
-        $aPages[] = $this->getNextPage();
-
-        return $aPages;
-    }
-
-    /**
+public function pages(): array
+{
+if($this->nPagesCount < 2)
+{
+return [];
+}
+
+$aPageNumbers = $this->getPageNumbers();
+$aPages = [$this->getPrevPage()];
+array_walk($aPageNumbers, function($nNumber) use(&$aPages) {
+$aPages[] = $this->getPage($nNumber);
+});
+$aPages[] = $this->getNextPage();
+
+return $aPages;
+}
+
+/**
      * Call a closure that will receive the page number as parameter.
      *
      * @param Closure $fPageCallback
      *
      * @return Paginator
      */
-    public function page(Closure $fPageCallback): Paginator
-    {
-        $fPageCallback($this->nPageNumber);
+public function page(Closure $fPageCallback): Paginator
+{
+$fPageCallback($this->nPageNumber);
 
-        return $this;
-    }
+return $this;
+}
 
-    /**
+/**
      * Call a closure that will receive the pagination offset as parameter.
      *
      * @param Closure $fOffsetCallback
      *
      * @return Paginator
      */
-    public function offset(Closure $fOffsetCallback): Paginator
-    {
-        $fOffsetCallback(($this->nPageNumber - 1) * $this->nItemsPerPage);
+public function offset(Closure $fOffsetCallback): Paginator
+{
+$fOffsetCallback(($this->nPageNumber - 1) * $this->nItemsPerPage);
 
-        return $this;
-    }
+return $this;
+}
 
-    /**
+/**
      * Show the pagination links
      *
      * @return string
      */
-    private function renderLinks(): string
-    {
-        $aPages = $this->pages();
-        if(count($aPages) === 0)
-        {
-            return '';
-        }
-
-        $xPrevPage = array_shift($aPages); // The first entry in the array
-        $xNextPage = array_pop($aPages); // The last entry in the array
-        return $this->xPlugin->renderer()->render($aPages, $xPrevPage, $xNextPage);
-    }
-
-    /**
+private function renderLinks(): string
+{
+$aPages = $this->pages();
+if(count($aPages) === 0)
+{
+return '';
+}
+
+$xPrevPage = array_shift($aPages); // The first entry in the array
+$xNextPage = array_pop($aPages); // The last entry in the array
+return $this->xPlugin->renderer()->render($aPages, $xPrevPage, $xNextPage);
+}
+
+/**
      * Show the pagination links
      *
      * @param string $sWrapperId
      *
      * @return array|null
      */
-    private function showLinks(string $sWrapperId): ?array
-    {
-        $sHtml = $this->renderLinks();
-        // The HTML code must always be displayed, even if it is empty.
-        if(is_a($this->xPlugin->response(), Response::class))
-        {
-            /** @var Response */
-            $xResponse = $this->xPlugin->response();
-            $xResponse->html($sWrapperId, $sHtml);
-            return !$sHtml ? null : ['id' => $sWrapperId];
-        }
-
-        // The wrapper id is not needed for the NodeResponse
-        /** @var NodeResponse */
-        $xResponse = $this->xPlugin->response();
-        $xResponse->html($sHtml);
-        return !$sHtml ? null : [];
-    }
-
-    /**
+private function showLinks(string $sWrapperId): ?array
+{
+$sHtml = $this->renderLinks();
+// The HTML code must always be displayed, even if it is empty.
+if(is_a($this->xPlugin->response(), Response::class))
+{
+/** @var Response */
+$xResponse = $this->xPlugin->response();
+$xResponse->html($sWrapperId, $sHtml);
+return !$sHtml ? null : ['id' => $sWrapperId];
+}
+
+// The wrapper id is not needed for the NodeResponse
+/** @var NodeResponse */
+$xResponse = $this->xPlugin->response();
+$xResponse->html($sHtml);
+return !$sHtml ? null : [];
+}
+
+/**
      * @param JsExpr $xCall
      * @param string $sWrapperId
      *
      * @return void
      */
-    public function render(JsExpr $xCall, string $sWrapperId = ''): void
-    {
-        if(($xFunc = $xCall->func()) === null)
-        {
-            return;
-        }
-
-        $aParams = $this->showLinks(trim($sWrapperId));
-        if($aParams !== null)
-        {
-            // Set click handlers on the pagination links
-            $aParams['func'] = $xFunc->withPage()->jsonSerialize();
-            $this->xPlugin->addCommand('pg.paginate', $aParams);
-        }
-    }
+public function render(JsExpr $xCall, string $sWrapperId = ''): void
+{
+if(($xFunc = $xCall->func()) === null)
+{
+return;
+}
+
+$aParams = $this->showLinks(trim($sWrapperId));
+if($aParams !== null)
+{
+// Set click handlers on the pagination links
+$aParams['func'] = $xFunc->withPage()->jsonSerialize();
+$this->xPlugin->addCommand('pg.paginate', $aParams);
+}
+}
 }