jaxon-php / jaxon-core

src/Plugin/Response/Pagination/Paginator.php

Spacing +18 added lines, -21 removed lines

@@ -127,9 +127,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;
         }
@@ -183,8 +182,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);
     }
 
     /**
@@ -195,8 +193,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);
     }
 
     /**
@@ -208,7 +205,7 @@ 
      */
     protected function getPage(int $nNumber): Page
     {
-        if($nNumber < 1)
+        if ($nNumber < 1)
         {
             return new Page('disabled', $this->sEllipsysText, 0);
         }
@@ -227,9 +224,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;
             }
@@ -238,11 +235,11 @@ 
         }
 
         // Determine the sliding range, centered around the current page.
-        $nNumAdjacents = (int)floor(($this->nMaxPages - 4) / 2);
+        $nNumAdjacents = (int) floor(($this->nMaxPages - 4) / 2);
 
         $nSlidingStart = 1;
         $nSlidingEndOffset = $nNumAdjacents + 3 - $this->nPageNumber;
-        if($nSlidingEndOffset < 0)
+        if ($nSlidingEndOffset < 0)
         {
             $nSlidingStart = $this->nPageNumber - $nNumAdjacents;
             $nSlidingEndOffset = 0;
@@ -250,23 +247,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;
@@ -282,7 +279,7 @@ 
      */
     public function pages(): array
     {
-        if($this->nPagesCount < 2)
+        if ($this->nPagesCount < 2)
         {
             return [];
         }
@@ -333,14 +330,14 @@ 
      */
     public function render(JsExpr $xCall, string $sWrapperId = '')
     {
-        if(($xFunc = $xCall->func()) === null)
+        if (($xFunc = $xCall->func()) === null)
         {
             return;
         }
 
         $sHtml = '';
         $aPages = $this->pages();
-        if(count($aPages) > 0)
+        if (count($aPages) > 0)
         {
             $xRenderer = $this->xPlugin->renderer();
             $aPages = array_map(function($xPage) use($xRenderer) {
@@ -359,7 +356,7 @@ 
         }
         // The HTML code must always be displayed, even if it is empty.
         $aParams = $this->showLinks($sHtml, trim($sWrapperId));
-        if($sHtml !== '')
+        if ($sHtml !== '')
         {
             // Set click handlers on the pagination links
             $aParams['func'] = $xFunc->withPage()->jsonSerialize();
@@ -377,7 +374,7 @@ 
      */
     private function showLinks(string $sHtml, string $sWrapperId): array
     {
-        if(is_a($this->xPlugin->response(), Response::class))
+        if (is_a($this->xPlugin->response(), Response::class))
         {
             /** @var Response */
             $xResponse = $this->xPlugin->response();

src/Plugin/Response/Script/ScriptPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         $this->xFactory = $xFactory;
         $this->xCallback = function(JsExpr $xJsExpr) {
             // Add the newly created expression to the response
-            $this->addCommand('script.exec', ['expr' => $xJsExpr]);;
+            $this->addCommand('script.exec', ['expr' => $xJsExpr]); ;
         };
     }
 

src/Plugin/Response/Psr/PsrPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     public function ajax(): ResponseInterface
     {
         $xPsrResponse = $this->xPsr17Factory->createResponse(200);
-        if($this->xRequest->getMethod() === 'GET')
+        if ($this->xRequest->getMethod() === 'GET')
         {
             $xPsrResponse = $xPsrResponse
                 ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')

src/Plugin/Response/DataBag/DataBagPlugin.php

Spacing +4 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
      */
     private function initDataBag()
     {
-        if($this->xDataBag !== null)
+        if ($this->xDataBag !== null)
         {
             return;
         }
@@ -49,8 +49,7 @@ 
         $aBody = $xRequest->getParsedBody();
         $aParams = $xRequest->getQueryParams();
         $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
+            $this->readData($aBody['jxnbags'] ?? []) : $this->readData($aParams['jxnbags'] ?? []);
         $this->xDataBag = new DataBag($this, $aData);
     }
 
@@ -71,8 +70,7 @@ 
     {
         // Todo: clean input data.
         return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
+            (json_decode($xData, true) ?: []) : (is_array($xData) ? $xData : []);
     }
 
     /**
@@ -90,7 +88,7 @@ 
     public function writeCommand()
     {
         $this->initDataBag();
-        if($this->xDataBag->touched())
+        if ($this->xDataBag->touched())
         {
             $this->addCommand('databag.set', ['values' => $this->xDataBag]);
         }

src/Response/AjaxResponse.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
     {
         $aArgs = func_get_args();
         array_shift($aArgs);
-        $this->addCommand('script.call', ['func' => $this->str($sFunc),'args' => $aArgs]);
+        $this->addCommand('script.call', ['func' => $this->str($sFunc), 'args' => $aArgs]);
         return $this;
     }
 
@@ -135,7 +135,7 @@ 
     {
         $xResponse = $this->newResponse();
         $fConfirm($xResponse);
-        if($xResponse->nCommandCount > 0)
+        if ($xResponse->nCommandCount > 0)
         {
             // The confirm command must be inserted before the commands to be confirmed.
             $this->insertCommand('script.confirm', [

src/Response/AbstractResponse.php

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
      */
     protected function str($xData): string
     {
-        return trim((string)$xData, " \t\n");
+        return trim((string) $xData, " \t\n");
     }
 
     /**
@@ -105,7 +105,7 @@ 
      *
      * @return void
      */
-    public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
+    public function addCommand(string $sName, array | JsonSerializable $aArgs = [],
         bool $bRemoveEmpty = false)
     {
         $this->nCommandCount++;
@@ -122,7 +122,7 @@ 
      *
      * @return void
      */
-    public function insertCommand(string $sName, array|JsonSerializable $aArgs,
+    public function insertCommand(string $sName, array | JsonSerializable $aArgs,
         int $nBefore, bool $bRemoveEmpty = false)
     {
         $this->nCommandCount++;
@@ -137,7 +137,7 @@ 
      *
      * @return void
      */
-    public function setOption(string $sName, string|array|JsonSerializable $xValue)
+    public function setOption(string $sName, string | array | JsonSerializable $xValue)
     {
         $this->xManager->setOption($sName, $xValue);
     }
@@ -183,7 +183,7 @@ 
     public function plugin(string $sName): ?AbstractResponsePlugin
     {
         $xResponsePlugin = $this->xPluginManager->getResponsePlugin($sName);
-        if($xResponsePlugin !== null)
+        if ($xResponsePlugin !== null)
         {
             $xResponsePlugin->setResponse($this);
         }

src/Response/ComponentResponse.php

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
      *
      * @return void
      */
-    public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
+    public function addCommand(string $sName, array | JsonSerializable $aArgs = [],
         bool $bRemoveEmpty = false)
     {
         parent::addCommand($sName, $aArgs, $bRemoveEmpty);
@@ -94,7 +94,7 @@ 
      *
      * @return void
      */
-    public function insertCommand(string $sName, array|JsonSerializable $aArgs,
+    public function insertCommand(string $sName, array | JsonSerializable $aArgs,
         int $nBefore, bool $bRemoveEmpty = false)
     {
         parent::insertCommand($sName, $aArgs, $nBefore, $bRemoveEmpty);

src/Response/ResponseManager.php

Spacing +13 added lines, -14 removed lines

@@ -103,7 +103,7 @@ 
      */
     protected function str($xData): string
     {
-        return trim((string)$xData, " \t\n");
+        return trim((string) $xData, " \t\n");
     }
 
     /**
@@ -164,9 +164,9 @@ 
      *
      * @return array
      */
-    private function getCommandArgs(array|JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
+    private function getCommandArgs(array | JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
     {
-        if(!$bRemoveEmpty)
+        if (!$bRemoveEmpty)
         {
             return $aArgs;
         }
@@ -184,7 +184,7 @@ 
      *
      * @return void
      */
-    public function addCommand(string $sName, array|JsonSerializable $aArgs,
+    public function addCommand(string $sName, array | JsonSerializable $aArgs,
         bool $bRemoveEmpty = false)
     {
         $this->nLastCommandPos = count($this->aCommands);
@@ -204,16 +204,16 @@ 
      *
      * @return void
      */
-    public function insertCommand(string $sName, array|JsonSerializable $aArgs,
+    public function insertCommand(string $sName, array | JsonSerializable $aArgs,
         int $nBefore, bool $bRemoveEmpty = false)
     {
         $nInsertPosition = count($this->aCommands) - $nBefore;
-        if($nInsertPosition < 0)
+        if ($nInsertPosition < 0)
         {
             return;
         }
         // Move the commands after the insert position.
-        for($nPos = count($this->aCommands); $nPos > $nInsertPosition; $nPos--)
+        for ($nPos = count($this->aCommands); $nPos > $nInsertPosition; $nPos--)
         {
             $this->aCommands[$nPos] = $this->aCommands[$nPos - 1];
         }
@@ -233,7 +233,7 @@ 
      */
     public function setComponent(array $aComponent)
     {
-        if($this->nLastCommandPos >= 0)
+        if ($this->nLastCommandPos >= 0)
         {
             $this->aCommands[$this->nLastCommandPos]['component'] = $aComponent;
         }
@@ -247,12 +247,12 @@ 
      *
      * @return void
      */
-    public function setOption(string $sName, string|array|JsonSerializable $xValue)
+    public function setOption(string $sName, string | array | JsonSerializable $xValue)
     {
-        if($this->nLastCommandPos >= 0)
+        if ($this->nLastCommandPos >= 0)
         {
             $aCommand = &$this->aCommands[$this->nLastCommandPos];
-            if(isset($aCommand['options']))
+            if (isset($aCommand['options']))
             {
                 $aCommand['options'][$this->str($sName)] = $xValue;
                 return;
@@ -340,7 +340,7 @@ 
      */
     public function printDebug()
     {
-        foreach($this->aDebugMessages as $sMessage)
+        foreach ($this->aDebugMessages as $sMessage)
         {
             $this->addCommand('script.debug', ['message' => $this->str($sMessage)]);
         }
@@ -354,8 +354,7 @@ 
      */
     public function getContentType(): string
     {
-        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() :
-            $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
+        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() : $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
     }
 
     /**

templates/plugins/config.js.php

Spacing +5 added lines, -5 removed lines

@@ -6,19 +6,19 @@
 jaxon.config.defaultMethod = "<?php echo $this->sDefaultMethod ?>";
 jaxon.config.responseType = "<?php echo $this->sResponseType ?>";
 
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jaxon.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
 
-<?php if(($this->bDebug)): ?>
-<?php if(($this->sDebugOutputID)): ?>
+<?php if (($this->bDebug)): ?>
+<?php if (($this->sDebugOutputID)): ?>
 jaxon.debug.outputID = "<?php echo $this->sDebugOutputID ?>";
 <?php endif ?>
-<?php if(($this->bVerboseDebug)): ?>
+<?php if (($this->bVerboseDebug)): ?>
 jaxon.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
 
-<?php if(($this->sCsrfMetaName)): ?>
+<?php if (($this->sCsrfMetaName)): ?>
 jaxon.setCsrf('<?php echo $this->sCsrfMetaName ?>');
 <?php endif ?>