jaxon-php / jaxon-mono

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

Spacing +17 added lines, -20 removed lines

@@ -128,9 +128,8 @@ 
      */
     private function updatePagesCount(): Paginator
     {
-        $this->nPagesCount = ($this->nItemsPerPage === 0 ? 0 :
-            (int)ceil($this->nItemsCount / $this->nItemsPerPage));
-        if($this->nPageNumber > $this->nPagesCount)
+        $this->nPagesCount = ($this->nItemsPerPage === 0 ? 0 : (int)ceil($this->nItemsCount / $this->nItemsPerPage));
+        if ($this->nPageNumber > $this->nPagesCount)
         {
             $this->nPageNumber = $this->nPagesCount;
         }
@@ -184,8 +183,7 @@ 
     protected function getPrevPage(): Page
     {
         return $this->nPageNumber <= 1 ?
-            new Page('disabled', $this->sPreviousText, 0) :
-            new Page('enabled', $this->sPreviousText, $this->nPageNumber - 1);
+            new Page('disabled', $this->sPreviousText, 0) : new Page('enabled', $this->sPreviousText, $this->nPageNumber - 1);
     }
 
     /**
@@ -196,8 +194,7 @@ 
     protected function getNextPage(): Page
     {
         return $this->nPageNumber >= $this->nPagesCount ?
-            new Page('disabled', $this->sNextText, 0) :
-            new Page('enabled', $this->sNextText, $this->nPageNumber + 1);
+            new Page('disabled', $this->sNextText, 0) : new Page('enabled', $this->sNextText, $this->nPageNumber + 1);
     }
 
     /**
@@ -209,7 +206,7 @@ 
      */
     protected function getPage(int $nNumber): Page
     {
-        if($nNumber < 1)
+        if ($nNumber < 1)
         {
             return new Page('disabled', $this->sEllipsysText, 0);
         }
@@ -228,9 +225,9 @@ 
     {
         $aPageNumbers = [];
 
-        if($this->nPagesCount <= $this->nMaxPages)
+        if ($this->nPagesCount <= $this->nMaxPages)
         {
-            for($i = 0; $i < $this->nPagesCount; $i++)
+            for ($i = 0; $i < $this->nPagesCount; $i++)
             {
                 $aPageNumbers[] = $i + 1;
             }
@@ -243,7 +240,7 @@ 
 
         $nSlidingStart = 1;
         $nSlidingEndOffset = $nNumAdjacents + 3 - $this->nPageNumber;
-        if($nSlidingEndOffset < 0)
+        if ($nSlidingEndOffset < 0)
         {
             $nSlidingStart = $this->nPageNumber - $nNumAdjacents;
             $nSlidingEndOffset = 0;
@@ -251,23 +248,23 @@ 
 
         $nSlidingEnd = $this->nPagesCount;
         $nSlidingStartOffset = $this->nPageNumber + $nNumAdjacents + 2 - $this->nPagesCount;
-        if($nSlidingStartOffset < 0)
+        if ($nSlidingStartOffset < 0)
         {
             $nSlidingEnd = $this->nPageNumber + $nNumAdjacents;
             $nSlidingStartOffset = 0;
         }
 
         // Build the list of page numbers.
-        if($nSlidingStart > 1)
+        if ($nSlidingStart > 1)
         {
             $aPageNumbers[] = 1;
             $aPageNumbers[] = 0; // Ellipsys;
         }
-        for($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
+        for ($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
         {
             $aPageNumbers[] = $i;
         }
-        if($nSlidingEnd < $this->nPagesCount)
+        if ($nSlidingEnd < $this->nPagesCount)
         {
             $aPageNumbers[] = 0; // Ellipsys;
             $aPageNumbers[] = $this->nPagesCount;
@@ -293,7 +290,7 @@ 
      */
     public function pages(): array
     {
-        if($this->nPagesCount < 2)
+        if ($this->nPagesCount < 2)
         {
             return [];
         }
@@ -344,7 +341,7 @@ 
     private function renderLinks(): string
     {
         $aPages = $this->pages();
-        if(count($aPages) === 0)
+        if (count($aPages) === 0)
         {
             return '';
         }
@@ -365,7 +362,7 @@ 
     {
         $sHtml = $this->renderLinks();
         // The HTML code must always be displayed, even if it is empty.
-        if(is_a($this->xPlugin->response(), Response::class))
+        if (is_a($this->xPlugin->response(), Response::class))
         {
             /** @var Response */
             $xResponse = $this->xPlugin->response();
@@ -388,13 +385,13 @@ 
      */
     public function render(JsExpr $xCall, string $sWrapperId = ''): void
     {
-        if(($xFunc = $xCall->func()) === null)
+        if (($xFunc = $xCall->func()) === null)
         {
             return;
         }
 
         $aParams = $this->showLinks(trim($sWrapperId));
-        if($aParams !== null)
+        if ($aParams !== null)
         {
             // Set click handlers on the pagination links
             $aParams['func'] = $xFunc->withPage()->jsonSerialize();

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

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
     {
         $this->sDirectory = '';
         $this->sExtension = '';
-        if(isset($this->aDirectories[$sNamespace]))
+        if (isset($this->aDirectories[$sNamespace]))
         {
             // Make sure there's only one '/' at the end of the string
             $this->sDirectory = rtrim($this->aDirectories[$sNamespace]['path'], '/') . '/';

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

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         $sViewName = $store->getViewName();
         $sNamespace = $store->getNamespace();
         // In this view renderer, the namespace must always be prepended to the view name.
-        if(substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
+        if (substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
         {
             $sViewName = $sNamespace . '::' . $sViewName;
         }

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

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
      */
     public function on(string $event, JsExpr $xJsExpr): self
     {
-        if($this->sSelector === '')
+        if ($this->sSelector === '')
         {
             return $this;
         }

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

Spacing +5 added lines, -8 removed lines

@@ -54,7 +54,7 @@ 
     public function html(JxnCall $xJsCall): string
     {
         $sClassName = $xJsCall->_class();
-        if(!$sClassName)
+        if (!$sClassName)
         {
             return '';
         }
@@ -88,8 +88,7 @@ 
     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());
+        $sComponent = $this->sPaginationComponent ?: ($this->sPaginationComponent = rq(Pagination::class)->_class());
         $sItem = $xJsCall->_class();
         return "jxn-bind=\"$sComponent\" jxn-item=\"$sItem\"";
     }
@@ -154,15 +153,14 @@ 
      */
     private function setEventHandler(array $aHandler, ?EventAttr $xAttr = null): EventAttr|null
     {
-        if(!$this->eventIsValid($aHandler))
+        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);
+            $this->select($sSelector)->on($sEvent, $xJsExpr) : $xAttr->select($sSelector)->on($sEvent, $xJsExpr);
     }
 
     /**
@@ -207,8 +205,7 @@ 
         };
         $sCode = trim($sCode);
 
-        return $sType !== 'ready' || $sCode === '' ? $sCode :
-            // Call the ready code with the jaxon.dom.ready function.
+        return $sType !== 'ready' || $sCode === '' ? $sCode : // Call the ready code with the jaxon.dom.ready function.
             "jaxon.dom.ready(() => $sCode)";
     }
 }

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

Spacing +9 added lines, -9 removed lines

@@ -97,18 +97,18 @@ 
      */
     public function addNamespaces(Config $xAppConfig): void
     {
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
+        if (empty($aNamespaces = $xAppConfig->getOptionNames('views')))
         {
             return;
         }
 
         $sPackage = $xAppConfig->getOption('package', '');
-        foreach($aNamespaces as $sNamespace => $sOption)
+        foreach ($aNamespaces as $sNamespace => $sOption)
         {
             // Save the namespace
             $aNamespace = $xAppConfig->getOption($sOption);
             $aNamespace['package'] = $sPackage;
-            if(!isset($aNamespace['renderer']))
+            if (!isset($aNamespace['renderer']))
             {
                 $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
             }
@@ -147,7 +147,7 @@ 
             $aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
                 return $aOptions['renderer'] === $sId;
             });
-            foreach($aNamespaces as $sName => $aOptions)
+            foreach ($aNamespaces as $sName => $aOptions)
             {
                 $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
             }
@@ -180,7 +180,7 @@ 
      */
     public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
     {
-        if(!isset($this->aNamespaces[$sNamespace]))
+        if (!isset($this->aNamespaces[$sNamespace]))
         {
             return null;
         }
@@ -205,7 +205,7 @@ 
      */
     protected function store(): Store
     {
-        if(!$this->xStore)
+        if (!$this->xStore)
         {
             $this->xStore = new Store();
         }
@@ -249,7 +249,7 @@ 
      */
     public function shareValues(array $aValues): ViewRenderer
     {
-        foreach($aValues as $sName => $xValue)
+        foreach ($aValues as $sName => $xValue)
         {
             $this->share($sName, $xValue);
         }
@@ -273,14 +273,14 @@ 
         $sNamespace = $this->sDefaultNamespace;
         // Get the namespace from the view name
         $nSeparatorPosition = strrpos($sViewName, '::');
-        if($nSeparatorPosition !== false)
+        if ($nSeparatorPosition !== false)
         {
             $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
             $sViewName = substr($sViewName, $nSeparatorPosition + 2);
         }
 
         $xRenderer = $this->getNamespaceRenderer($sNamespace);
-        if(!$xRenderer)
+        if (!$xRenderer)
         {
             // Cannot render a view if there's no renderer corresponding to the namespace.
             return $this->xEmptyStore;

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

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
     public function new(string $sBag, string $sKey, $xValue): void
     {
         // Set the value only if it doesn't already exist.
-        if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
+        if (!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
         {
             $this->set($sBag, $sKey, $xValue);
         }

jaxon-core/src/App/PageDatabagTrait.php

Spacing +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
     private function getPageNumber(int $pageNumber): int
     {
         // If no page number is provided, then get the value from the databag.
-        return $pageNumber > 0 ? $pageNumber :
-            (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
+        return $pageNumber > 0 ? $pageNumber : (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
     }
 
     /**

jaxon-core/src/Request/Handler/Psr/PsrAjaxMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         // and the other classes will get this request from there.
         $this->di->val(ServerRequestInterface::class, $request);
 
-        if(!$this->xRequestHandler->canProcessRequest())
+        if (!$this->xRequestHandler->canProcessRequest())
         {
             // Unable to find a plugin to process the request
             return $handler->handle($request);