jaxon-php / jaxon-mono

jaxon-core/src/App/Metadata/Data/CallbackData.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      */
     protected function validateObjectName(string $sName): void
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
         {
             return;
         }

Switch Indentation +33 added lines, -33 removed lines

@@ -22,61 +22,61 @@
 
 class CallbackData extends AbstractData
 {
-    /**
+/**
      * The callback js objects
      *
      * @var string
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'callback';
-    }
+public function getName(): string
+{
+return 'callback';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return array_values($this->aNames);
-    }
+public function getValue(): mixed
+{
+return array_values($this->aNames);
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    protected function validateObjectName(string $sName): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sName is not a valid \"name\" value for callback");
-    }
+protected function validateObjectName(string $sName): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+{
+return;
+}
+throw new SetupException("$sName is not a valid \"name\" value for callback");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateObjectName($sName);
+public function addValue(string $sName): void
+{
+$this->validateObjectName($sName);
 
-        $this->aNames[$sName] = $sName;
-    }
+$this->aNames[$sName] = $sName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return array_map(fn($sName) =>
-            "{$sVarName}->addValue('$sName');", $this->aNames);
-    }
+public function encode(string $sVarName): array
+{
+return array_map(fn($sName) =>
+"{$sVarName}->addValue('$sName');", $this->aNames);
+}
 }

jaxon-core/src/App/Dialog/Manager/DialogCommand.php

Spacing +4 added lines, -8 removed lines

@@ -113,8 +113,7 @@ 
     private function alert(string $sType, string $sMessage, array $aArgs): array
     {
         return [
-            'lib' => $this->getLibrary() ?:
-                ($this->xRegistry?->getAlertLibrary()->getName() ?? ''),
+            'lib' => $this->getLibrary() ?: ($this->xRegistry?->getAlertLibrary()->getName() ?? ''),
             'message' => [
                 'type' => $sType,
                 'title' => $this->getTitle(),
@@ -197,8 +196,7 @@ 
     public function show(string $sTitle, string $sContent, array $aButtons, array $aOptions = []): array
     {
         return [
-            'lib' => $this->getLibrary() ?:
-                ($this->xRegistry?->getModalLibrary()->getName() ?? ''),
+            'lib' => $this->getLibrary() ?: ($this->xRegistry?->getModalLibrary()->getName() ?? ''),
             'dialog' => [
                 'title' => $sTitle,
                 'content' => $sContent,
@@ -216,8 +214,7 @@ 
     public function hide(): array
     {
         return [
-            'lib' => $this->getLibrary() ?:
-                ($this->xRegistry?->getModalLibrary()->getName() ?? ''),
+            'lib' => $this->getLibrary() ?: ($this->xRegistry?->getModalLibrary()->getName() ?? ''),
         ];
     }
 
@@ -232,8 +229,7 @@ 
     public function confirm(string $sQuestion, array $aArgs = []): array
     {
         return [
-            'lib' => $this->getLibrary() ?:
-                ($this->xRegistry?->getConfirmLibrary()->getName() ?? ''),
+            'lib' => $this->getLibrary() ?: ($this->xRegistry?->getConfirmLibrary()->getName() ?? ''),
             'question' => [
                 'title' => $this->getTitle(),
                 'phrase' => $this->phrase($sQuestion, $aArgs),

Switch Indentation +111 added lines, -111 removed lines

@@ -19,89 +19,89 @@ 
 
 class DialogCommand
 {
-    /**
+/**
      * The next alert library
      *
      * @var string
      */
-    private $sLibrary = '';
+private $sLibrary = '';
 
-    /**
+/**
      * The next alert title
      *
      * @var string
      */
-    private $sTitle = '';
+private $sTitle = '';
 
-    /**
+/**
      * The constructor
      *
      * @param LibraryRegistryInterface|null $xRegistry
      */
-    public function __construct(private ?LibraryRegistryInterface $xRegistry)
-    {}
+public function __construct(private ?LibraryRegistryInterface $xRegistry)
+{}
 
-    /**
+/**
      * Set the library for the next alert.
      *
      * @param string $sLibrary     The name of the library
      *
      * @return void
      */
-    public function library(string $sLibrary): void
-    {
-        $this->sLibrary = $sLibrary;
-    }
+public function library(string $sLibrary): void
+{
+$this->sLibrary = $sLibrary;
+}
 
-    /**
+/**
      * Set the title of the next alert.
      *
      * @param string $sTitle     The title of the alert
      *
      * @return void
      */
-    public function title(string $sTitle): void
-    {
-        $this->sTitle = $sTitle;
-    }
+public function title(string $sTitle): void
+{
+$this->sTitle = $sTitle;
+}
 
-    /**
+/**
      * @param string $sStr
      * @param array $aArgs
      *
      * @return array
      */
-    private function phrase(string $sStr, array $aArgs = []): array
-    {
-        return [
-            'str' => $sStr,
-            'args' => array_map(function($xArg) {
-                return TypedValue::make($xArg);
-            }, $aArgs),
-        ];
-    }
-
-    /**
+private function phrase(string $sStr, array $aArgs = []): array
+{
+return [
+'str' => $sStr,
+'args' => array_map(function($xArg) {
+    return TypedValue::make($xArg);
+}, $aArgs),
+];
+}
+
+/**
      * @return string
      */
-    private function getLibrary(): string
-    {
-        $sLibrary = $this->sLibrary;
-        $this->sLibrary = '';
-        return $sLibrary;
-    }
+private function getLibrary(): string
+{
+$sLibrary = $this->sLibrary;
+$this->sLibrary = '';
+return $sLibrary;
+}
 
-    /**
+/**
      * @return string
      */
-    private function getTitle(): string
-    {
-        $sTitle = $this->sTitle;
-        $this->sTitle = '';
-        return $sTitle;
-    }
+private function getTitle(): string
+{
+$sTitle = $this->sTitle;
+$this->sTitle = '';
+return $sTitle;
+}
 
-    /**
+/**
      * Print an alert message.
      *
      * @param string $sType     The type of the message
@@ -110,20 +110,20 @@ 
      *
      * @return array
      */
-    private function alert(string $sType, string $sMessage, array $aArgs): array
-    {
-        return [
-            'lib' => $this->getLibrary() ?:
-                ($this->xRegistry?->getAlertLibrary()->getName() ?? ''),
-            'message' => [
-                'type' => $sType,
-                'title' => $this->getTitle(),
-                'phrase' => $this->phrase($sMessage, $aArgs),
-            ],
-        ];
-    }
-
-    /**
+private function alert(string $sType, string $sMessage, array $aArgs): array
+{
+return [
+'lib' => $this->getLibrary() ?:
+    ($this->xRegistry?->getAlertLibrary()->getName() ?? ''),
+'message' => [
+    'type' => $sType,
+    'title' => $this->getTitle(),
+    'phrase' => $this->phrase($sMessage, $aArgs),
+],
+];
+}
+
+/**
      * Show a success message.
      *
      * @param string $sMessage  The text of the message
@@ -131,12 +131,12 @@ 
      *
      * @return array
      */
-    public function success(string $sMessage, array $aArgs = []): array
-    {
-        return $this->alert('success', $sMessage, $aArgs);
-    }
+public function success(string $sMessage, array $aArgs = []): array
+{
+return $this->alert('success', $sMessage, $aArgs);
+}
 
-    /**
+/**
      * Show an information message.
      *
      * @param string $sMessage  The text of the message
@@ -144,12 +144,12 @@ 
      *
      * @return array
      */
-    public function info(string $sMessage, array $aArgs = []): array
-    {
-        return $this->alert('info', $sMessage, $aArgs);
-    }
+public function info(string $sMessage, array $aArgs = []): array
+{
+return $this->alert('info', $sMessage, $aArgs);
+}
 
-    /**
+/**
      * Show a warning message.
      *
      * @param string $sMessage  The text of the message
@@ -157,12 +157,12 @@ 
      *
      * @return array
      */
-    public function warning(string $sMessage, array $aArgs = []): array
-    {
-        return $this->alert('warning', $sMessage, $aArgs);
-    }
+public function warning(string $sMessage, array $aArgs = []): array
+{
+return $this->alert('warning', $sMessage, $aArgs);
+}
 
-    /**
+/**
      * Show an error message.
      *
      * @param string $sMessage  The text of the message
@@ -170,12 +170,12 @@ 
      *
      * @return array
      */
-    public function error(string $sMessage, array $aArgs = []): array
-    {
-        return $this->alert('error', $sMessage, $aArgs);
-    }
+public function error(string $sMessage, array $aArgs = []): array
+{
+return $this->alert('error', $sMessage, $aArgs);
+}
 
-    /**
+/**
      * Show a modal dialog.
      *
      * @param string $sTitle The title of the dialog
@@ -194,34 +194,34 @@ 
      *
      * @return array
      */
-    public function show(string $sTitle, string $sContent, array $aButtons, array $aOptions = []): array
-    {
-        return [
-            'lib' => $this->getLibrary() ?:
-                ($this->xRegistry?->getModalLibrary()->getName() ?? ''),
-            'dialog' => [
-                'title' => $sTitle,
-                'content' => $sContent,
-                'buttons' => $aButtons,
-                'options' => $aOptions,
-            ],
-        ];
-    }
-
-    /**
+public function show(string $sTitle, string $sContent, array $aButtons, array $aOptions = []): array
+{
+return [
+'lib' => $this->getLibrary() ?:
+    ($this->xRegistry?->getModalLibrary()->getName() ?? ''),
+'dialog' => [
+    'title' => $sTitle,
+    'content' => $sContent,
+    'buttons' => $aButtons,
+    'options' => $aOptions,
+],
+];
+}
+
+/**
      * Hide the modal dialog.
      *
      * @return array
      */
-    public function hide(): array
-    {
-        return [
-            'lib' => $this->getLibrary() ?:
-                ($this->xRegistry?->getModalLibrary()->getName() ?? ''),
-        ];
-    }
+public function hide(): array
+{
+return [
+'lib' => $this->getLibrary() ?:
+    ($this->xRegistry?->getModalLibrary()->getName() ?? ''),
+];
+}
 
-    /**
+/**
      * Add a confirm question to a function call.
      *
      * @param string $sQuestion
@@ -229,15 +229,15 @@ 
      *
      * @return array
      */
-    public function confirm(string $sQuestion, array $aArgs = []): array
-    {
-        return [
-            'lib' => $this->getLibrary() ?:
-                ($this->xRegistry?->getConfirmLibrary()->getName() ?? ''),
-            'question' => [
-                'title' => $this->getTitle(),
-                'phrase' => $this->phrase($sQuestion, $aArgs),
-            ],
-        ];
-    }
+public function confirm(string $sQuestion, array $aArgs = []): array
+{
+return [
+'lib' => $this->getLibrary() ?:
+    ($this->xRegistry?->getConfirmLibrary()->getName() ?? ''),
+'question' => [
+    'title' => $this->getTitle(),
+    'phrase' => $this->phrase($sQuestion, $aArgs),
+],
+];
+}
 }

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();

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/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'], '/') . '/';

Switch Indentation +24 added lines, -24 removed lines

@@ -7,28 +7,28 @@ 
 
 trait ViewTrait
 {
-    /**
+/**
      * The template directories
      *
      * @var array
      */
-    protected $aDirectories = [];
+protected $aDirectories = [];
 
-    /**
+/**
      * The directory of the current template
      *
      * @var string
      */
-    protected $sDirectory = '';
+protected $sDirectory = '';
 
-    /**
+/**
      * The extension of the current template
      *
      * @var string
      */
-    protected $sExtension = '';
+protected $sExtension = '';
 
-    /**
+/**
      * Add a namespace to the view renderer
      *
      * @param string $sNamespace    The namespace name
@@ -37,28 +37,28 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void
-    {
-        $this->aDirectories[$sNamespace] = ['path' => $sDirectory, 'ext' => $sExtension];
-    }
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void
+{
+$this->aDirectories[$sNamespace] = ['path' => $sDirectory, 'ext' => $sExtension];
+}
 
-    /**
+/**
      * Set the namespace of the template being rendered
      *
      * @param string $sNamespace    The namespace name
      *
      * @return void
      */
-    public function setCurrentNamespace(string $sNamespace): void
-    {
-        $this->sDirectory = '';
-        $this->sExtension = '';
-        if(isset($this->aDirectories[$sNamespace]))
-        {
-            // Make sure there's only one '/' at the end of the string
-            $this->sDirectory = rtrim($this->aDirectories[$sNamespace]['path'], '/') . '/';
-            // Make sure there's only one '.' at the beginning of the string
-            $this->sExtension = '.' . ltrim($this->aDirectories[$sNamespace]['ext'], '.');
-        }
-    }
+public function setCurrentNamespace(string $sNamespace): void
+{
+$this->sDirectory = '';
+$this->sExtension = '';
+if(isset($this->aDirectories[$sNamespace]))
+{
+// Make sure there's only one '/' at the end of the string
+$this->sDirectory = rtrim($this->aDirectories[$sNamespace]['path'], '/') . '/';
+// Make sure there's only one '.' at the beginning of the string
+$this->sExtension = '.' . ltrim($this->aDirectories[$sNamespace]['ext'], '.');
+}
+}
 }

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

Switch Indentation +25 added lines, -25 removed lines

@@ -18,22 +18,22 @@ 
 
 class TemplateView implements ViewInterface
 {
-    /**
+/**
      * The Jaxon template engine
      *
      * @var TemplateEngine
      */
-    protected $xTemplateEngine;
+protected $xTemplateEngine;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct(TemplateEngine $xTemplateEngine)
-    {
-        $this->xTemplateEngine = $xTemplateEngine;
-    }
+public function __construct(TemplateEngine $xTemplateEngine)
+{
+$this->xTemplateEngine = $xTemplateEngine;
+}
 
-    /**
+/**
      * Add a namespace to this view renderer
      *
      * @param string $sNamespace    The namespace name
@@ -42,28 +42,28 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void
-    {
-        $this->xTemplateEngine->addNamespace($sNamespace, $sDirectory, $sExtension);
-    }
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void
+{
+$this->xTemplateEngine->addNamespace($sNamespace, $sDirectory, $sExtension);
+}
 
-    /**
+/**
      * Render a view
      *
      * @param Store $store    A store populated with the view data
      *
      * @return string        The string representation of the view
      */
-    public function render(Store $store): string
-    {
-        $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 . '::')
-        {
-            $sViewName = $sNamespace . '::' . $sViewName;
-        }
-        // Render the template
-        return trim($this->xTemplateEngine->render($sViewName, $store->getViewData()), " \t\n");
-    }
+public function render(Store $store): string
+{
+$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 . '::')
+{
+$sViewName = $sNamespace . '::' . $sViewName;
+}
+// Render the template
+return trim($this->xTemplateEngine->render($sViewName, $store->getViewData()), " \t\n");
+}
 }

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

Switch Indentation +38 added lines, -38 removed lines

@@ -23,33 +23,33 @@ 
 
 class EventAttr
 {
-    /**
+/**
      * @var array
      */
-    private array $aHandlers = [];
+private array $aHandlers = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sSelector
      */
-    public function __construct(private string $sSelector)
-    {}
+public function __construct(private string $sSelector)
+{}
 
-    /**
+/**
      * Set a selector for the next event handler
      *
      * @param string $sSelector
      *
      * @return self
      */
-    public function select(string $sSelector): self
-    {
-        $this->sSelector = trim($sSelector);
-        return $this;
-    }
+public function select(string $sSelector): self
+{
+$this->sSelector = trim($sSelector);
+return $this;
+}
 
-    /**
+/**
      * Set an event handler with the "on" keyword
      *
      * @param string $event
@@ -57,43 +57,43 @@ 
      *
      * @return self
      */
-    public function on(string $event, JsExpr $xJsExpr): self
-    {
-        if($this->sSelector === '')
-        {
-            return $this;
-        }
+public function on(string $event, JsExpr $xJsExpr): self
+{
+if($this->sSelector === '')
+{
+return $this;
+}
 
-        $this->aHandlers[] = [
-            'select' => $this->sSelector,
-            'event' => trim($event),
-            'handler' => $xJsExpr,
-        ];
-        $this->sSelector = '';
-        return $this;
-    }
+$this->aHandlers[] = [
+'select' => $this->sSelector,
+'event' => trim($event),
+'handler' => $xJsExpr,
+];
+$this->sSelector = '';
+return $this;
+}
 
-    /**
+/**
      * Shortcut to set a click event handler
      *
      * @param JsExpr $xJsExpr
      *
      * @return self
      */
-    public function click(JsExpr $xJsExpr): self
-    {
-        return $this->on('click', $xJsExpr);
-    }
+public function click(JsExpr $xJsExpr): self
+{
+return $this->on('click', $xJsExpr);
+}
 
-    /**
+/**
      * Convert to string.
      *
      * @return string
      */
-    public function __toString(): string
-    {
-        // No output if no handler is defined.
-        return count($this->aHandlers) === 0 ? '' : 'jxn-event="' .
-            htmlentities(json_encode($this->aHandlers)) . '"';
-    }
+public function __toString(): string
+{
+// No output if no handler is defined.
+return count($this->aHandlers) === 0 ? '' : 'jxn-event="' .
+htmlentities(json_encode($this->aHandlers)) . '"';
+}
 }

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

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

Switch Indentation +101 added lines, -101 removed lines

@@ -31,40 +31,40 @@ 
 
 class HtmlAttrHelper
 {
-    /**
+/**
      * @var string|null
      */
-    private string|null $sPaginationComponent = null;
+private string|null $sPaginationComponent = null;
 
-    /**
+/**
      * The constructor
      *
      * @param ComponentContainer $cdi
      */
-    public function __construct(protected ComponentContainer $cdi)
-    {}
+public function __construct(protected ComponentContainer $cdi)
+{}
 
-    /**
+/**
      * Get the component HTML code
      *
      * @param JxnCall $xJsCall
      *
      * @return string
      */
-    public function html(JxnCall $xJsCall): string
-    {
-        $sClassName = $xJsCall->_class();
-        if(!$sClassName)
-        {
-            return '';
-        }
-
-        $xComponent = $this->cdi->makeComponent($sClassName);
-        return is_a($xComponent, NodeComponent::class) ?
-            (string)$xComponent->html() : '';
-    }
-
-    /**
+public function html(JxnCall $xJsCall): string
+{
+$sClassName = $xJsCall->_class();
+if(!$sClassName)
+{
+return '';
+}
+
+$xComponent = $this->cdi->makeComponent($sClassName);
+return is_a($xComponent, NodeComponent::class) ?
+(string)$xComponent->html() : '';
+}
+
+/**
      * Attach a component to a DOM node
      *
      * @param JxnCall $xJsCall
@@ -72,41 +72,41 @@ 
      *
      * @return string
      */
-    public function bind(JxnCall $xJsCall, string $item = ''): string
-    {
-        $item = trim($item);
-        return 'jxn-bind="' . $xJsCall->_class() . (!$item ? '"' : '" jxn-item="' . $item . '"');
-    }
+public function bind(JxnCall $xJsCall, string $item = ''): string
+{
+$item = trim($item);
+return 'jxn-bind="' . $xJsCall->_class() . (!$item ? '"' : '" jxn-item="' . $item . '"');
+}
 
-    /**
+/**
      * Attach the pagination component to a DOM node
      *
      * @param JxnCall $xJsCall
      *
      * @return string
      */
-    public function pagination(JxnCall $xJsCall): string
-    {
-        // The pagination is always rendered with the same Pagination component.
-        $sComponent = $this->sPaginationComponent ?:
-            ($this->sPaginationComponent = rq(Pagination::class)->_class());
-        $sItem = $xJsCall->_class();
-        return "jxn-bind=\"$sComponent\" jxn-item=\"$sItem\"";
-    }
-
-    /**
+public function pagination(JxnCall $xJsCall): string
+{
+// The pagination is always rendered with the same Pagination component.
+$sComponent = $this->sPaginationComponent ?:
+($this->sPaginationComponent = rq(Pagination::class)->_class());
+$sItem = $xJsCall->_class();
+return "jxn-bind=\"$sComponent\" jxn-item=\"$sItem\"";
+}
+
+/**
      * Set a selector for the next event handler
      *
      * @param string $sSelector
      *
      * @return EventAttr
      */
-    public function select(string $sSelector): EventAttr
-    {
-        return new EventAttr($sSelector);
-    }
+public function select(string $sSelector): EventAttr
+{
+return new EventAttr($sSelector);
+}
 
-    /**
+/**
      * Set an event handler
      *
      * @param string $event
@@ -114,83 +114,83 @@ 
      *
      * @return string
      */
-    public function on(string $event, JsExpr $xJsExpr): string
-    {
-        $event = trim($event);
-        $sCall = htmlentities(json_encode($xJsExpr->jsonSerialize()));
-        return "jxn-on=\"$event\" jxn-call=\"$sCall\"";
-    }
-
-    /**
+public function on(string $event, JsExpr $xJsExpr): string
+{
+$event = trim($event);
+$sCall = htmlentities(json_encode($xJsExpr->jsonSerialize()));
+return "jxn-on=\"$event\" jxn-call=\"$sCall\"";
+}
+
+/**
      * Shortcut to set a click event handler
      *
      * @param JsExpr $xJsExpr
      *
      * @return string
      */
-    public function click(JsExpr $xJsExpr): string
-    {
-        return $this->on('click', $xJsExpr);
-    }
+public function click(JsExpr $xJsExpr): string
+{
+return $this->on('click', $xJsExpr);
+}
 
-    /**
+/**
      * @param array $aHandler
      *
      * @return bool
      */
-    private function eventIsValid(array $aHandler): bool
-    {
-        return count($aHandler) === 3 &&
-            isset($aHandler[0]) && isset($aHandler[1]) && isset($aHandler[2]) &&
-            is_string($aHandler[0]) && is_string($aHandler[1]) &&
-            is_a($aHandler[2], JsExpr::class);
-    }
-
-    /**
+private function eventIsValid(array $aHandler): bool
+{
+return count($aHandler) === 3 &&
+isset($aHandler[0]) && isset($aHandler[1]) && isset($aHandler[2]) &&
+is_string($aHandler[0]) && is_string($aHandler[1]) &&
+is_a($aHandler[2], JsExpr::class);
+}
+
+/**
      * @param array $aHandler
      * @param EventAttr|null $xAttr
      *
      * @return EventAttr|null
      */
-    private function setEventHandler(array $aHandler, ?EventAttr $xAttr = null): EventAttr|null
-    {
-        if(!$this->eventIsValid($aHandler))
-        {
-            return $xAttr;
-        }
-        // The array content is valid.
-        [$sSelector, $sEvent, $xJsExpr] = $aHandler;
-        return !$xAttr ?
-            $this->select($sSelector)->on($sEvent, $xJsExpr) :
-            $xAttr->select($sSelector)->on($sEvent, $xJsExpr);
-    }
-
-    /**
+private function setEventHandler(array $aHandler, ?EventAttr $xAttr = null): EventAttr|null
+{
+if(!$this->eventIsValid($aHandler))
+{
+return $xAttr;
+}
+// The array content is valid.
+[$sSelector, $sEvent, $xJsExpr] = $aHandler;
+return !$xAttr ?
+$this->select($sSelector)->on($sEvent, $xJsExpr) :
+$xAttr->select($sSelector)->on($sEvent, $xJsExpr);
+}
+
+/**
      * Set an event handler
      *
      * @param array $aHandler
      *
      * @return string
      */
-    public function event(array $aHandler): string
-    {
-        return $this->setEventHandler($aHandler)?->__toString() ?? '';
-    }
+public function event(array $aHandler): string
+{
+return $this->setEventHandler($aHandler)?->__toString() ?? '';
+}
 
-    /**
+/**
      * Set event handlers
      *
      * @param array $aHandlers
      *
      * @return string
      */
-    public function events(array $aHandlers): string
-    {
-        return array_reduce($aHandlers, fn(EventAttr|null $xAttr, array $aHandler)
-            => $this->setEventHandler($aHandler, $xAttr), null)?->__toString() ?? '';
-    }
+public function events(array $aHandlers): string
+{
+return array_reduce($aHandlers, fn(EventAttr|null $xAttr, array $aHandler)
+=> $this->setEventHandler($aHandler, $xAttr), null)?->__toString() ?? '';
+}
 
-    /**
+/**
      * Get the HTML or Javascript ready code for a package
      *
      * @param string $sClass
@@ -198,17 +198,17 @@ 
      *
      * @return string
      */
-    public function package(string $sClass, string $sType = 'html'): string
-    {
-        $sCode = match($sType) {
-            'html' => jaxon()->package($sClass)?->getHtml() ?? '',
-            'ready' => jaxon()->package($sClass)?->getReadyScript() ?? '',
-            default => ''
-        };
-        $sCode = trim($sCode);
-
-        return $sType !== 'ready' || $sCode === '' ? $sCode :
-            // Call the ready code with the jaxon.dom.ready function.
-            "jaxon.dom.ready(() => $sCode)";
-    }
+public function package(string $sClass, string $sType = 'html'): string
+{
+$sCode = match($sType) {
+'html' => jaxon()->package($sClass)?->getHtml() ?? '',
+'ready' => jaxon()->package($sClass)?->getReadyScript() ?? '',
+default => ''
+};
+$sCode = trim($sCode);
+
+return $sType !== 'ready' || $sCode === '' ? $sCode :
+// Call the ready code with the jaxon.dom.ready function.
+"jaxon.dom.ready(() => $sCode)";
+}
 }

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

Switch Indentation +55 added lines, -55 removed lines

@@ -9,35 +9,35 @@ 
 
 class Store implements JsonSerializable, Stringable
 {
-    /**
+/**
      * The view renderer
      *
      * @var ViewInterface
      */
-    protected $xRenderer;
+protected $xRenderer;
 
-    /**
+/**
      * The view namespace
      *
      * @var string
      */
-    protected $sNamespace;
+protected $sNamespace;
 
-    /**
+/**
      * The view name
      *
      * @var string
      */
-    protected $sViewName;
+protected $sViewName;
 
-    /**
+/**
      * The view data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -45,26 +45,26 @@ 
      *
      * @return Store
      */
-    public function with(string $sName, $xValue): Store
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function with(string $sName, $xValue): Store
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Set the data to be rendered
      *
      * @param array $aViewData    The view data
      *
      * @return Store
      */
-    public function setData(array $aViewData): Store
-    {
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setData(array $aViewData): Store
+{
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Set the view to be rendered, with optional data
      *
      * @param ViewInterface $xRenderer    The view renderer
@@ -74,65 +74,65 @@ 
      *
      * @return Store
      */
-    public function setView(ViewInterface $xRenderer,
-        string $sNamespace, string $sViewName, array $aViewData = []): Store
-    {
-        $this->xRenderer = $xRenderer;
-        $this->sNamespace = trim($sNamespace);
-        $this->sViewName = trim($sViewName);
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setView(ViewInterface $xRenderer,
+string $sNamespace, string $sViewName, array $aViewData = []): Store
+{
+$this->xRenderer = $xRenderer;
+$this->sNamespace = trim($sNamespace);
+$this->sViewName = trim($sViewName);
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Get the view namespace
      *
      * @return string        The view namespace
      */
-    public function getNamespace(): string
-    {
-        return $this->sNamespace;
-    }
+public function getNamespace(): string
+{
+return $this->sNamespace;
+}
 
-    /**
+/**
      * Get the view name
      *
      * @return string        The view name
      */
-    public function getViewName(): string
-    {
-        return $this->sViewName;
-    }
+public function getViewName(): string
+{
+return $this->sViewName;
+}
 
-    /**
+/**
      * Get the view data
      *
      * @return array         The view data
      */
-    public function getViewData(): array
-    {
-        return $this->aViewData;
-    }
+public function getViewData(): array
+{
+return $this->aViewData;
+}
 
-    /**
+/**
      * Render a view using third party view system
      *
      * @return string        The string representation of the view
      */
-    public function __toString(): string
-    {
-        return !$this->xRenderer ? '' : $this->xRenderer->render($this);
-    }
+public function __toString(): string
+{
+return !$this->xRenderer ? '' : $this->xRenderer->render($this);
+}
 
-    /**
+/**
      * Convert this object to string for json.
      *
      * This is a method of the JsonSerializable interface.
      *
      * @return string
      */
-    public function jsonSerialize(): string
-    {
-        return $this->__toString();
-    }
+public function jsonSerialize(): string
+{
+return $this->__toString();
+}
 }

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

Switch Indentation +151 added lines, -151 removed lines

@@ -16,58 +16,58 @@ 
 
 class ViewRenderer
 {
-    /**
+/**
      * @var Container
      */
-    protected $di;
+protected $di;
 
-    /**
+/**
      * The view data store
      *
      * @var Store
      */
-    protected $xStore = null;
+protected $xStore = null;
 
-    /**
+/**
      * The view data store
      *
      * @var Store
      */
-    protected $xEmptyStore = null;
+protected $xEmptyStore = null;
 
-    /**
+/**
      * The view namespaces
      *
      * @var array
      */
-    protected $aNamespaces = [];
+protected $aNamespaces = [];
 
-    /**
+/**
      * The default namespace
      *
      * @var string
      */
-    protected $sDefaultNamespace = 'jaxon';
+protected $sDefaultNamespace = 'jaxon';
 
-    /**
+/**
      * The view global data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * The class constructor
      *
      * @param Container $di
      */
-    public function __construct(Container $di)
-    {
-        $this->di = $di;
-        $this->xEmptyStore = new Store();
-    }
+public function __construct(Container $di)
+{
+$this->di = $di;
+$this->xEmptyStore = new Store();
+}
 
-    /**
+/**
      * Add a view namespace, and set the corresponding renderer.
      *
      * @param string $sNamespace    The namespace name
@@ -77,59 +77,59 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory,
-        string $sExtension, string $sRenderer): void
-    {
-        $aNamespace = [
-            'directory' => $sDirectory,
-            'extension' => $sExtension,
-            'renderer' => $sRenderer,
-        ];
-        $this->aNamespaces[$sNamespace] = $aNamespace;
-    }
+public function addNamespace(string $sNamespace, string $sDirectory,
+string $sExtension, string $sRenderer): void
+{
+$aNamespace = [
+'directory' => $sDirectory,
+'extension' => $sExtension,
+'renderer' => $sRenderer,
+];
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
 
-    /**
+/**
      * Set the view namespaces.
      *
      * @param Config $xAppConfig    The config options provided in the library
      *
      * @return void
      */
-    public function addNamespaces(Config $xAppConfig): void
-    {
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
-        {
-            return;
-        }
+public function addNamespaces(Config $xAppConfig): void
+{
+if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
+{
+return;
+}
 
-        $sPackage = $xAppConfig->getOption('package', '');
-        foreach($aNamespaces as $sNamespace => $sOption)
-        {
-            // Save the namespace
-            $aNamespace = $xAppConfig->getOption($sOption);
-            $aNamespace['package'] = $sPackage;
-            if(!isset($aNamespace['renderer']))
-            {
-                $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
-            }
-            $this->aNamespaces[$sNamespace] = $aNamespace;
-        }
-    }
+$sPackage = $xAppConfig->getOption('package', '');
+foreach($aNamespaces as $sNamespace => $sOption)
+{
+// Save the namespace
+$aNamespace = $xAppConfig->getOption($sOption);
+$aNamespace['package'] = $sPackage;
+if(!isset($aNamespace['renderer']))
+{
+    $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
+}
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @param string $sId    The unique identifier of the view renderer
      *
      * @return ViewInterface
      */
-    public function getRenderer(string $sId): ViewInterface
-    {
-        // Return the view renderer with the given id
-        return $this->di->g("jaxon.app.view.$sId");
-    }
+public function getRenderer(string $sId): ViewInterface
+{
+// Return the view renderer with the given id
+return $this->di->g("jaxon.app.view.$sId");
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -137,25 +137,25 @@ 
      *
      * @return void
      */
-    public function addRenderer(string $sId, Closure $xClosure): void
-    {
-        // Return the initialized view renderer
-        $this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
-            // Get the defined renderer
-            $xRenderer = $xClosure($di);
-            // Init the renderer with the template namespaces
-            $aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
-                return $aOptions['renderer'] === $sId;
-            });
-            foreach($aNamespaces as $sName => $aOptions)
-            {
-                $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
-            }
-            return $xRenderer;
-        });
-    }
+public function addRenderer(string $sId, Closure $xClosure): void
+{
+// Return the initialized view renderer
+$this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
+// Get the defined renderer
+$xRenderer = $xClosure($di);
+// Init the renderer with the template namespaces
+$aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
+    return $aOptions['renderer'] === $sId;
+});
+foreach($aNamespaces as $sName => $aOptions)
+{
+    $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
+}
+return $xRenderer;
+});
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -164,55 +164,55 @@ 
      *
      * @return void
      */
-    public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
-    {
-        $this->setDefaultNamespace($sId);
-        $this->addNamespace($sId, '', $sExtension, $sId);
-        $this->addRenderer($sId, $xClosure);
-    }
+public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
+{
+$this->setDefaultNamespace($sId);
+$this->addNamespace($sId, '', $sExtension, $sId);
+$this->addRenderer($sId, $xClosure);
+}
 
-    /**
+/**
      * Get the view renderer for a given namespace
      *
      * @param string $sNamespace    The namespace name
      *
      * @return ViewInterface|null
      */
-    public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
-    {
-        if(!isset($this->aNamespaces[$sNamespace]))
-        {
-            return null;
-        }
-        // Return the view renderer with the configured id
-        return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
-    }
+public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
+{
+if(!isset($this->aNamespaces[$sNamespace]))
+{
+return null;
+}
+// Return the view renderer with the configured id
+return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
+}
 
-    /**
+/**
      * Set the default namespace
      *
      * @param string $sDefaultNamespace
      */
-    public function setDefaultNamespace(string $sDefaultNamespace): void
-    {
-        $this->sDefaultNamespace = $sDefaultNamespace;
-    }
+public function setDefaultNamespace(string $sDefaultNamespace): void
+{
+$this->sDefaultNamespace = $sDefaultNamespace;
+}
 
-    /**
+/**
      * Get the current store or create a new store
      *
      * @return Store
      */
-    protected function store(): Store
-    {
-        if(!$this->xStore)
-        {
-            $this->xStore = new Store();
-        }
-        return $this->xStore;
-    }
+protected function store(): Store
+{
+if(!$this->xStore)
+{
+$this->xStore = new Store();
+}
+return $this->xStore;
+}
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -220,13 +220,13 @@ 
      *
      * @return ViewRenderer
      */
-    public function set(string $sName, $xValue): ViewRenderer
-    {
-        $this->store()->with($sName, $xValue);
-        return $this;
-    }
+public function set(string $sName, $xValue): ViewRenderer
+{
+$this->store()->with($sName, $xValue);
+return $this;
+}
 
-    /**
+/**
      * Make a piece of data available for all views
      *
      * @param string $sName    The data name
@@ -234,29 +234,29 @@ 
      *
      * @return ViewRenderer
      */
-    public function share(string $sName, $xValue): ViewRenderer
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function share(string $sName, $xValue): ViewRenderer
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Make an array of data available for all views
      *
      * @param array $aValues    The data values
      *
      * @return ViewRenderer
      */
-    public function shareValues(array $aValues): ViewRenderer
-    {
-        foreach($aValues as $sName => $xValue)
-        {
-            $this->share($sName, $xValue);
-        }
-        return $this;
-    }
+public function shareValues(array $aValues): ViewRenderer
+{
+foreach($aValues as $sName => $xValue)
+{
+$this->share($sName, $xValue);
+}
+return $this;
+}
 
-    /**
+/**
      * Render a view using a store
      *
      * The store returned by this function will later be used with the make() method to render the view.
@@ -266,32 +266,32 @@ 
      *
      * @return Store   A store populated with the view data
      */
-    public function render(string $sViewName, array $aViewData = []): Store
-    {
-        $xStore = $this->store();
-        // Get the default view namespace
-        $sNamespace = $this->sDefaultNamespace;
-        // Get the namespace from the view name
-        $nSeparatorPosition = strrpos($sViewName, '::');
-        if($nSeparatorPosition !== false)
-        {
-            $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
-            $sViewName = substr($sViewName, $nSeparatorPosition + 2);
-        }
+public function render(string $sViewName, array $aViewData = []): Store
+{
+$xStore = $this->store();
+// Get the default view namespace
+$sNamespace = $this->sDefaultNamespace;
+// Get the namespace from the view name
+$nSeparatorPosition = strrpos($sViewName, '::');
+if($nSeparatorPosition !== false)
+{
+$sNamespace = substr($sViewName, 0, $nSeparatorPosition);
+$sViewName = substr($sViewName, $nSeparatorPosition + 2);
+}
 
-        $xRenderer = $this->getNamespaceRenderer($sNamespace);
-        if(!$xRenderer)
-        {
-            // Cannot render a view if there's no renderer corresponding to the namespace.
-            return $this->xEmptyStore;
-        }
+$xRenderer = $this->getNamespaceRenderer($sNamespace);
+if(!$xRenderer)
+{
+// Cannot render a view if there's no renderer corresponding to the namespace.
+return $this->xEmptyStore;
+}
 
-        $xStore->setData(array_merge($this->aViewData, $aViewData))
-            ->setView($xRenderer, $sNamespace, $sViewName);
+$xStore->setData(array_merge($this->aViewData, $aViewData))
+->setView($xRenderer, $sNamespace, $sViewName);
 
-        // Set the store to null so a new store will be created for the next view.
-        $this->xStore = null;
-        // Return the store
-        return $xStore;
-    }
+// Set the store to null so a new store will be created for the next view.
+$this->xStore = null;
+// Return the store
+return $xStore;
+}
 }

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;