jaxon-php / jaxon-mono

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

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

Switch Indentation +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
 interface RendererInterface
 {
-    /**
+/**
      * Render an array of pagination links
      *
      * @param Page[] $aPages
@@ -25,5 +25,5 @@ 
      *
      * @return string
      */
-    public function render(array $aPages, Page $xPrevPage, Page $xNextPage): string;
+public function render(array $aPages, Page $xPrevPage, Page $xNextPage): string;
 }

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

Switch Indentation +22 added lines, -22 removed lines

@@ -21,30 +21,30 @@ 
 
 class Renderer implements RendererInterface
 {
-    /**
+/**
      * The constructor.
      *
      * @param ViewRenderer $xRenderer
      */
-    public function __construct(private ViewRenderer $xRenderer)
-    {
-        $this->xRenderer = $xRenderer;
-    }
+public function __construct(private ViewRenderer $xRenderer)
+{
+$this->xRenderer = $xRenderer;
+}
 
-    /**
+/**
      * @param Page $xPage
      *
      * @return string
      */
-    private function renderPage(Page $xPage): string
-    {
-        return $this->xRenderer->render("pagination::links/{$xPage->sType}", [
-            'page' => $xPage->nNumber,
-            'text' => $xPage->sText,
-        ])->__toString();
-    }
+private function renderPage(Page $xPage): string
+{
+return $this->xRenderer->render("pagination::links/{$xPage->sType}", [
+'page' => $xPage->nNumber,
+'text' => $xPage->sText,
+])->__toString();
+}
 
-    /**
+/**
      * Render an array of pagination links
      *
      * @param Page[] $aPages
@@ -53,12 +53,12 @@ 
      *
      * @return string
      */
-    public function render(array $aPages, Page $xPrevPage, Page $xNextPage): string
-    {
-        return trim($this->xRenderer->render('pagination::wrapper', [
-            'links' => array_map(fn($xPage) => $this->renderPage($xPage), $aPages),
-            'prev' => $this->renderPage($xPrevPage),
-            'next' => $this->renderPage($xNextPage),
-        ])->__toString());
-    }
+public function render(array $aPages, Page $xPrevPage, Page $xNextPage): string
+{
+return trim($this->xRenderer->render('pagination::wrapper', [
+'links' => array_map(fn($xPage) => $this->renderPage($xPage), $aPages),
+'prev' => $this->renderPage($xPrevPage),
+'next' => $this->renderPage($xNextPage),
+])->__toString());
+}
 }

jaxon-core/src/App/I18n/Translator.php

Switch Indentation +9 added lines, -9 removed lines

@@ -20,15 +20,15 @@
 
 class Translator extends BaseTranslator implements ConfigListenerInterface
 {
-    /**
+/**
      * @inheritDoc
      */
-    public function onChange(Config $xConfig, string $sName): void
-    {
-        // Set the library language any time the config is changed.
-        if($sName === '' || $sName === 'core.language')
-        {
-            $this->setLocale($xConfig->getOption('core.language'));
-        }
-    }
+public function onChange(Config $xConfig, string $sName): void
+{
+// Set the library language any time the config is changed.
+if($sName === '' || $sName === 'core.language')
+{
+$this->setLocale($xConfig->getOption('core.language'));
+}
+}
 }

jaxon-core/src/App/Config/ConfigEventManager.php

Switch Indentation +33 added lines, -33 removed lines

@@ -19,61 +19,61 @@
 
 class ConfigEventManager
 {
-    /**
+/**
      * @var string[]
      */
-    protected $aLibConfigListeners = [];
+protected $aLibConfigListeners = [];
 
-    /**
+/**
      * @var string[]
      */
-    protected $aAppConfigListeners = [];
+protected $aAppConfigListeners = [];
 
-    /**
+/**
      * @param Container $di
      */
-    public function __construct(private Container $di)
-    {}
+public function __construct(private Container $di)
+{}
 
-    /**
+/**
      * @param string $sClassName
      *
      * @return void
      */
-    public function addLibConfigListener(string $sClassName): void
-    {
-        $this->aLibConfigListeners[] = $sClassName;
-    }
+public function addLibConfigListener(string $sClassName): void
+{
+$this->aLibConfigListeners[] = $sClassName;
+}
 
-    /**
+/**
      * @param string $sClassName
      *
      * @return void
      */
-    public function addAppConfigListener(string $sClassName): void
-    {
-        $this->aAppConfigListeners[] = $sClassName;
-    }
+public function addAppConfigListener(string $sClassName): void
+{
+$this->aAppConfigListeners[] = $sClassName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function libConfigChanged(Config $xConfig, string $sName): void
-    {
-        foreach($this->aLibConfigListeners as $sListener)
-        {
-            $this->di->g($sListener)->onChange($xConfig, $sName);
-        }
-    }
+public function libConfigChanged(Config $xConfig, string $sName): void
+{
+foreach($this->aLibConfigListeners as $sListener)
+{
+$this->di->g($sListener)->onChange($xConfig, $sName);
+}
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function appConfigChanged(Config $xConfig, string $sName): void
-    {
-        foreach($this->aAppConfigListeners as $sListener)
-        {
-            $this->di->g($sListener)->onChange($xConfig, $sName);
-        }
-    }
+public function appConfigChanged(Config $xConfig, string $sName): void
+{
+foreach($this->aAppConfigListeners as $sListener)
+{
+$this->di->g($sListener)->onChange($xConfig, $sName);
+}
+}
 }

jaxon-core/src/App/Config/ConfigListenerInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
 interface ConfigListenerInterface
 {
-    /**
+/**
      * Config option changed, in case of multiple changes, the name is an empty string
      *
      * @param Config $xConfig
@@ -26,5 +26,5 @@ 
      *
      * @return void
      */
-    public function onChange(Config $xConfig, string $sName): void;
+public function onChange(Config $xConfig, string $sName): void;
 }

jaxon-core/src/App/Config/ConfigTrait.php

Switch Indentation +32 added lines, -32 removed lines

@@ -16,12 +16,12 @@ 
 
 trait ConfigTrait
 {
-    /**
+/**
      * @return ConfigManager
      */
-    abstract protected function config(): ConfigManager;
+abstract protected function config(): ConfigManager;
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sName The option name
@@ -29,24 +29,24 @@ 
      *
      * @return mixed
      */
-    public function getLibOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->config()->getOption($sName, $xDefault);
-    }
+public function getLibOption(string $sName, $xDefault = null): mixed
+{
+return $this->config()->getOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of a config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasLibOption(string $sName): bool
-    {
-        return $this->config()->hasOption($sName);
-    }
+public function hasLibOption(string $sName): bool
+{
+return $this->config()->hasOption($sName);
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -54,12 +54,12 @@ 
      *
      * @return void
      */
-    public function setLibOption(string $sName, $xValue): void
-    {
-        $this->config()->setOption($sName, $xValue);
-    }
+public function setLibOption(string $sName, $xValue): void
+{
+$this->config()->setOption($sName, $xValue);
+}
 
-    /**
+/**
      * Get the value of an application config option
      *
      * @param string $sName The option name
@@ -67,24 +67,24 @@ 
      *
      * @return mixed
      */
-    public function getAppOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->config()->getAppOption($sName, $xDefault);
-    }
+public function getAppOption(string $sName, $xDefault = null): mixed
+{
+return $this->config()->getAppOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of an application config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasAppOption(string $sName): bool
-    {
-        return $this->config()->hasAppOption($sName);
-    }
+public function hasAppOption(string $sName): bool
+{
+return $this->config()->hasAppOption($sName);
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -92,8 +92,8 @@ 
      *
      * @return void
      */
-    public function setAppOption(string $sName, $xValue): void
-    {
-        $this->config()->setAppOption($sName, $xValue);
-    }
+public function setAppOption(string $sName, $xValue): void
+{
+$this->config()->setAppOption($sName, $xValue);
+}
 }