jaxon-php / jaxon-mono

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

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function setup(string $sConfigFile = ''): void
     {
-        if(!file_exists($sConfigFile))
+        if (!file_exists($sConfigFile))
         {
             throw new SetupException($this->translator()
                 ->trans('errors.file.access', ['path' => $sConfigFile]));
@@ -39,14 +39,14 @@ 
         $aOptions = $this->config()->read($sConfigFile);
         $aLibOptions = $aOptions['lib'] ?? [];
         $aAppOptions = $aOptions['app'] ?? [];
-        if(!is_array($aLibOptions) || !is_array($aAppOptions))
+        if (!is_array($aLibOptions) || !is_array($aAppOptions))
         {
             throw new SetupException($sMessage = $this->translator()
                 ->trans('errors.file.content', ['path' => $sConfigFile]));
         }
 
         // The bootstrap set this to false. It needs to be changed.
-        if(!isset($aLibOptions['core']['response']['send']))
+        if (!isset($aLibOptions['core']['response']['send']))
         {
             $aLibOptions['core']['response']['send'] = true;
         }

jaxon-core/src/App/Ajax/Traits/SendResponseTrait.php

Spacing +5 added lines, -5 removed lines

@@ -59,20 +59,20 @@ 
      */
     public function httpResponse(string $sCode = '200'): mixed
     {
-        if(!$this->config()->getOption('core.response.send', false))
+        if (!$this->config()->getOption('core.response.send', false))
         {
             return null;
         }
 
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($sFilename, $nLineNumber))
+        if (headers_sent($sFilename, $nLineNumber))
         {
             throw new RequestException($this->translator()
                 ->trans('errors.output.already-sent', [
                     'location' => "$sFilename:$nLineNumber",
                 ]) . "\n" . $this->translator()->trans('errors.output.advice'));
         }
-        if(empty($sContent = $this->getResponseManager()->getOutput()))
+        if (empty($sContent = $this->getResponseManager()->getOutput()))
         {
             return null;
         }
@@ -80,7 +80,7 @@ 
         // Set the HTTP response code
         http_response_code(intval($sCode));
 
-        if($this->di()->getRequest()->getMethod() === 'GET')
+        if ($this->di()->getRequest()->getMethod() === 'GET')
         {
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -90,7 +90,7 @@ 
         header('Content-Type: ' . $this->getResponseManager()->getContentType());
 
         print $sContent;
-        if($this->config()->getOption('core.process.exit', false))
+        if ($this->config()->getOption('core.process.exit', false))
         {
             exit();
         }

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

Spacing +9 added lines, -9 removed lines

@@ -70,22 +70,22 @@ 
         {
             return $this->xConfigReader->read($sConfigFile);
         }
-        catch(YamlExtension $e)
+        catch (YamlExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.yaml.install');
             throw new SetupException($sMessage);
         }
-        catch(FileExtension $e)
+        catch (FileExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
         }
-        catch(FileAccess $e)
+        catch (FileAccess $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
         }
-        catch(FileContent $e)
+        catch (FileContent $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
@@ -111,7 +111,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -140,7 +140,7 @@ 
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
             return $this->xLibConfig->changed();
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -247,7 +247,7 @@ 
             $this->xEventManager->appConfigChanged($this->xAppConfig, '');
             return $this->xAppConfig->changed();
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -297,7 +297,7 @@ 
         {
             return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -336,7 +336,7 @@ 
      */
     public function globals(bool $bForce = false): void
     {
-        if($bForce || $this->getAppOption('helpers.global', true))
+        if ($bForce || $this->getAppOption('helpers.global', true))
         {
             require_once dirname(__DIR__, 2) . '/globals.php';
         }

Braces +8 added lines, -16 removed lines

@@ -69,23 +69,19 @@ 
         try
         {
             return $this->xConfigReader->read($sConfigFile);
-        }
-        catch(YamlExtension $e)
+        } catch(YamlExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.yaml.install');
             throw new SetupException($sMessage);
-        }
-        catch(FileExtension $e)
+        } catch(FileExtension $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
-        }
-        catch(FileAccess $e)
+        } catch(FileAccess $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
-        }
-        catch(FileContent $e)
+        } catch(FileContent $e)
         {
             $sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
@@ -110,8 +106,7 @@ 
                 ->setOptions($this->xLibConfig, $this->read($sConfigFile), $sConfigSection);
             // Call the config change listeners.
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -139,8 +134,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->libConfigChanged($this->xLibConfig, '');
             return $this->xLibConfig->changed();
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -246,8 +240,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->appConfigChanged($this->xAppConfig, '');
             return $this->xAppConfig->changed();
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,
@@ -296,8 +289,7 @@ 
         try
         {
             return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth', [
                 'key' => $e->sPrefix,

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

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function libConfigChanged(Config $xConfig, string $sName): void
     {
-        foreach($this->aLibConfigListeners as $sListener)
+        foreach ($this->aLibConfigListeners as $sListener)
         {
             $this->di->g($sListener)->onChange($xConfig, $sName);
         }
@@ -71,7 +71,7 @@ 
      */
     public function appConfigChanged(Config $xConfig, string $sName): void
     {
-        foreach($this->aAppConfigListeners as $sListener)
+        foreach ($this->aAppConfigListeners as $sListener)
         {
             $this->di->g($sListener)->onChange($xConfig, $sName);
         }

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

Spacing +1 added lines, -1 removed lines

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

Switch Indentation +33 added lines, -33 removed lines

@@ -20,61 +20,61 @@
 
 class UploadData extends AbstractData
 {
-    /**
+/**
      * The id of the upload field
      *
      * @var string
      */
-    protected $sField = '';
+protected $sField = '';
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'upload';
-    }
+public function getName(): string
+{
+return 'upload';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        // The field id is surrounded with simple quotes.
-        return "'{$this->sField}'";
-    }
+public function getValue(): mixed
+{
+// The field id is surrounded with simple quotes.
+return "'{$this->sField}'";
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    protected function validateField(string $sField): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sField is not a valid \"field\" value for upload");
-    }
+protected function validateField(string $sField): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
+{
+return;
+}
+throw new SetupException("$sField is not a valid \"field\" value for upload");
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    public function setValue(string $sField): void
-    {
-        $this->validateField($sField);
+public function setValue(string $sField): void
+{
+$this->validateField($sField);
 
-        $this->sField = $sField;
-    }
+$this->sField = $sField;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return ["{$sVarName}->setValue('{$this->sField}');"];
-    }
+public function encode(string $sVarName): array
+{
+return ["{$sVarName}->setValue('{$this->sField}');"];
+}
 }

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

@@ -21,61 +21,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 $this->aNames;
-    }
+public function getValue(): mixed
+{
+return $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;
-    }
+$this->aNames[] = $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();

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