jaxon-php / jaxon-mono

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

Spacing +3 added lines, -3 removed lines

@@ -91,11 +91,11 @@ 
             'export' => $bExport,
             'minify' => $bMinify,
         ];
-        if($sUri !== '')
+        if ($sUri !== '')
         {
             $aJsOptions['uri'] = $sUri;
         }
-        if($sDir !== '')
+        if ($sDir !== '')
         {
             $aJsOptions['dir'] = $sDir;
         }
@@ -151,7 +151,7 @@ 
     {
         // Popping the callbacks makes each of them to be called once.
         $aBootCallbacks = $this->xCallbackManager->popBootCallbacks();
-        foreach($aBootCallbacks as $aBootCallback)
+        foreach ($aBootCallbacks as $aBootCallback)
         {
             call_user_func($aBootCallback);
         }

Switch Indentation +75 added lines, -75 removed lines

@@ -23,58 +23,58 @@ 
 
 class Bootstrap
 {
-    /**
+/**
      * The library options
      *
      * @var array
      */
-    private $aLibOptions = [];
+private $aLibOptions = [];
 
-    /**
+/**
      * The application options
      *
      * @var array
      */
-    private $aAppOptions = [];
+private $aAppOptions = [];
 
-    /**
+/**
      * The class constructor
      *
      * @param ConfigManager $xConfigManager
      * @param PackageManager $xPackageManager
      * @param CallbackManager $xCallbackManager
      */
-    public function __construct(private ConfigManager $xConfigManager,
-        private PackageManager $xPackageManager, private CallbackManager $xCallbackManager)
-    {}
+public function __construct(private ConfigManager $xConfigManager,
+private PackageManager $xPackageManager, private CallbackManager $xCallbackManager)
+{}
 
-    /**
+/**
      * Set the library options
      *
      * @param array $aLibOptions    The library options
      *
      * @return Bootstrap
      */
-    public function lib(array $aLibOptions): Bootstrap
-    {
-        $this->aLibOptions = $aLibOptions;
-        return $this;
-    }
+public function lib(array $aLibOptions): Bootstrap
+{
+$this->aLibOptions = $aLibOptions;
+return $this;
+}
 
-    /**
+/**
      * Set the applications options
      *
      * @param array $aAppOptions    The application options
      *
      * @return Bootstrap
      */
-    public function app(array $aAppOptions): Bootstrap
-    {
-        $this->aAppOptions = $aAppOptions;
-        return $this;
-    }
+public function app(array $aAppOptions): Bootstrap
+{
+$this->aAppOptions = $aAppOptions;
+return $this;
+}
 
-    /**
+/**
      * Set the javascript asset
      *
      * @param bool $bExport    Whether to export the js code in a file
@@ -84,76 +84,76 @@ 
      *
      * @return Bootstrap
      */
-    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): Bootstrap
-    {
-        // Jaxon library settings
-        $aJsOptions = [
-            'export' => $bExport,
-            'minify' => $bMinify,
-        ];
-        if($sUri !== '')
-        {
-            $aJsOptions['uri'] = $sUri;
-        }
-        if($sDir !== '')
-        {
-            $aJsOptions['dir'] = $sDir;
-        }
-        $this->xConfigManager->setOptions($aJsOptions, 'js.app');
-        return $this;
-    }
+public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): Bootstrap
+{
+// Jaxon library settings
+$aJsOptions = [
+'export' => $bExport,
+'minify' => $bMinify,
+];
+if($sUri !== '')
+{
+$aJsOptions['uri'] = $sUri;
+}
+if($sDir !== '')
+{
+$aJsOptions['dir'] = $sDir;
+}
+$this->xConfigManager->setOptions($aJsOptions, 'js.app');
+return $this;
+}
 
-    /**
+/**
      * Set the Jaxon application options.
      *
      * @return void
      * @throws SetupException
      */
-    private function setupApp(): void
-    {
-        // Save the app config.
-        $this->xConfigManager->setAppOptions($this->aAppOptions);
-        // Register user functions and classes
-        $this->xPackageManager->registerFromConfig();
-    }
+private function setupApp(): void
+{
+// Save the app config.
+$this->xConfigManager->setAppOptions($this->aAppOptions);
+// Register user functions and classes
+$this->xPackageManager->registerFromConfig();
+}
 
-    /**
+/**
      * Wraps the module/package/bundle setup method.
      *
      * @return void
      * @throws SetupException
      */
-    public function setup(): void
-    {
-        // Prevent the Jaxon library from sending the response or exiting
-        $this->xConfigManager->setOptions([
-            'response' => [
-                'send' => false,
-            ],
-            'process' => [
-                'exit' => false,
-            ],
-        ], 'core');
-        // Setup the lib config options.
-        $this->xConfigManager->setOptions($this->aLibOptions);
+public function setup(): void
+{
+// Prevent the Jaxon library from sending the response or exiting
+$this->xConfigManager->setOptions([
+'response' => [
+    'send' => false,
+],
+'process' => [
+    'exit' => false,
+],
+], 'core');
+// Setup the lib config options.
+$this->xConfigManager->setOptions($this->aLibOptions);
 
-        // Setup the app.
-        $this->setupApp();
-        $this->onBoot();
-    }
+// Setup the app.
+$this->setupApp();
+$this->onBoot();
+}
 
-    /**
+/**
      * These callbacks are called once, after the library is initialized.
      *
      * @return void
      */
-    public function onBoot(): void
-    {
-        // Popping the callbacks makes each of them to be called once.
-        $aBootCallbacks = $this->xCallbackManager->popBootCallbacks();
-        foreach($aBootCallbacks as $aBootCallback)
-        {
-            call_user_func($aBootCallback);
-        }
-    }
+public function onBoot(): void
+{
+// Popping the callbacks makes each of them to be called once.
+$aBootCallbacks = $this->xCallbackManager->popBootCallbacks();
+foreach($aBootCallbacks as $aBootCallback)
+{
+call_user_func($aBootCallback);
+}
+}
 }

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

Switch Indentation +31 added lines, -31 removed lines

@@ -21,39 +21,39 @@
 
 class App extends AbstractApp
 {
-    use Traits\SendResponseTrait;
+use Traits\SendResponseTrait;
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function setup(string $sConfigFile = ''): void
-    {
-        if(!file_exists($sConfigFile))
-        {
-            throw new SetupException($this->translator()
-                ->trans('errors.file.access', ['path' => $sConfigFile]));
-        }
-
-        // Read the config options.
-        $aOptions = $this->config()->read($sConfigFile);
-        $aLibOptions = $aOptions['lib'] ?? [];
-        $aAppOptions = $aOptions['app'] ?? [];
-        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']))
-        {
-            $aLibOptions['core']['response']['send'] = true;
-        }
-
-        $this->bootstrap()
-            ->lib($aLibOptions)
-            ->app($aAppOptions)
-            ->setup();
-    }
+public function setup(string $sConfigFile = ''): void
+{
+if(!file_exists($sConfigFile))
+{
+throw new SetupException($this->translator()
+    ->trans('errors.file.access', ['path' => $sConfigFile]));
+}
+
+// Read the config options.
+$aOptions = $this->config()->read($sConfigFile);
+$aLibOptions = $aOptions['lib'] ?? [];
+$aAppOptions = $aOptions['app'] ?? [];
+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']))
+{
+$aLibOptions['core']['response']['send'] = true;
+}
+
+$this->bootstrap()
+->lib($aLibOptions)
+->app($aAppOptions)
+->setup();
+}
 }

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

Switch Indentation +44 added lines, -44 removed lines

@@ -31,69 +31,69 @@
 
 trait SendResponseTrait
 {
-    /**
+/**
      * @return Container
      */
-    abstract public function di(): Container;
+abstract public function di(): Container;
 
-    /**
+/**
      * @return ConfigManager
      */
-    abstract public function config(): ConfigManager;
+abstract public function config(): ConfigManager;
 
-    /**
+/**
      * @return Translator
      */
-    abstract public function translator(): Translator;
+abstract public function translator(): Translator;
 
-    /**
+/**
      * @return ResponseManager
      */
-    abstract public function getResponseManager(): ResponseManager;
+abstract public function getResponseManager(): ResponseManager;
 
-    /**
+/**
      * Prints the response to the output stream, thus sending the response to the browser
      *
      * @return mixed
      * @throws RequestException
      */
-    public function httpResponse(string $sCode = '200'): mixed
-    {
-        if(!$this->config()->getOption('core.response.send', false))
-        {
-            return null;
-        }
+public function httpResponse(string $sCode = '200'): mixed
+{
+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))
-        {
-            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()))
-        {
-            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))
+{
+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()))
+{
+return null;
+}
 
-        // Set the HTTP response code
-        http_response_code(intval($sCode));
+// Set the HTTP response code
+http_response_code(intval($sCode));
 
-        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");
-            header("Cache-Control: no-cache, must-revalidate");
-            header("Pragma: no-cache");
-        }
-        header('Content-Type: ' . $this->getResponseManager()->getContentType());
+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");
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
+}
+header('Content-Type: ' . $this->getResponseManager()->getContentType());
 
-        print $sContent;
-        if($this->config()->getOption('core.process.exit', false))
-        {
-            exit();
-        }
-        return null;
-    }
+print $sContent;
+if($this->config()->getOption('core.process.exit', false))
+{
+exit();
+}
+return null;
+}
 }

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,

Switch Indentation +180 added lines, -180 removed lines

@@ -29,17 +29,17 @@ 
 
 class ConfigManager
 {
-    /**
+/**
      * @var Config
      */
-    protected $xLibConfig;
+protected $xLibConfig;
 
-    /**
+/**
      * @var Config
      */
-    protected $xAppConfig;
+protected $xAppConfig;
 
-    /**
+/**
      * The constructor
      *
      * @param array $aDefaultOptions
@@ -48,15 +48,15 @@ 
      * @param ConfigSetter $xConfigSetter
      * @param ConfigEventManager $xEventManager
      */
-    public function __construct(array $aDefaultOptions, private Translator $xTranslator,
-        private ConfigReader $xConfigReader, private ConfigSetter $xConfigSetter,
-        private ConfigEventManager $xEventManager)
-    {
-        $this->xLibConfig = $xConfigSetter->newConfig($aDefaultOptions);
-        $this->xAppConfig = $xConfigSetter->newConfig();
-    }
+public function __construct(array $aDefaultOptions, private Translator $xTranslator,
+private ConfigReader $xConfigReader, private ConfigSetter $xConfigSetter,
+private ConfigEventManager $xEventManager)
+{
+$this->xLibConfig = $xConfigSetter->newConfig($aDefaultOptions);
+$this->xAppConfig = $xConfigSetter->newConfig();
+}
 
-    /**
+/**
      * Read a config file
      *
      * @param string $sConfigFile
@@ -64,35 +64,35 @@ 
      * @return array
      * @throws SetupException
      */
-    public function read(string $sConfigFile): array
-    {
-        try
-        {
-            return $this->xConfigReader->read($sConfigFile);
-        }
-        catch(YamlExtension $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.yaml.install');
-            throw new SetupException($sMessage);
-        }
-        catch(FileExtension $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
-            throw new SetupException($sMessage);
-        }
-        catch(FileAccess $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
-            throw new SetupException($sMessage);
-        }
-        catch(FileContent $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function read(string $sConfigFile): array
+{
+try
+{
+return $this->xConfigReader->read($sConfigFile);
+}
+catch(YamlExtension $e)
+{
+$sMessage = $this->xTranslator->trans('errors.yaml.install');
+throw new SetupException($sMessage);
+}
+catch(FileExtension $e)
+{
+$sMessage = $this->xTranslator->trans('errors.file.extension', ['path' => $sConfigFile]);
+throw new SetupException($sMessage);
+}
+catch(FileAccess $e)
+{
+$sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
+throw new SetupException($sMessage);
+}
+catch(FileContent $e)
+{
+$sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Read options from a config file and set the library config
      *
      * @param string $sConfigFile The full path to the config file
@@ -101,27 +101,27 @@ 
      * @return void
      * @throws SetupException
      */
-    public function load(string $sConfigFile, string $sConfigSection = ''): void
-    {
-        try
-        {
-            // Read the options and save in the config.
-            $this->xLibConfig = $this->xConfigSetter
-                ->setOptions($this->xLibConfig, $this->read($sConfigFile), $sConfigSection);
-            // Call the config change listeners.
-            $this->xEventManager->libConfigChanged($this->xLibConfig, '');
-        }
-        catch(DataDepth $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.data.depth', [
-                'key' => $e->sPrefix,
-                'depth' => $e->nDepth,
-            ]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function load(string $sConfigFile, string $sConfigSection = ''): void
+{
+try
+{
+// Read the options and save in the config.
+$this->xLibConfig = $this->xConfigSetter
+    ->setOptions($this->xLibConfig, $this->read($sConfigFile), $sConfigSection);
+// Call the config change listeners.
+$this->xEventManager->libConfigChanged($this->xLibConfig, '');
+}
+catch(DataDepth $e)
+{
+$sMessage = $this->xTranslator->trans('errors.data.depth', [
+    'key' => $e->sPrefix,
+    'depth' => $e->nDepth,
+]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Set the config options of the library
      *
      * @param array $aOptions
@@ -130,27 +130,27 @@ 
      * @return bool
      * @throws SetupException
      */
-    public function setOptions(array $aOptions, string $sNamePrefix = ''): bool
-    {
-        try
-        {
-            $this->xLibConfig = $this->xConfigSetter
-                ->setOptions($this->xLibConfig, $aOptions, $sNamePrefix);
-            // Call the config change listeners.
-            $this->xEventManager->libConfigChanged($this->xLibConfig, '');
-            return $this->xLibConfig->changed();
-        }
-        catch(DataDepth $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.data.depth', [
-                'key' => $e->sPrefix,
-                'depth' => $e->nDepth,
-            ]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function setOptions(array $aOptions, string $sNamePrefix = ''): bool
+{
+try
+{
+$this->xLibConfig = $this->xConfigSetter
+    ->setOptions($this->xLibConfig, $aOptions, $sNamePrefix);
+// Call the config change listeners.
+$this->xEventManager->libConfigChanged($this->xLibConfig, '');
+return $this->xLibConfig->changed();
+}
+catch(DataDepth $e)
+{
+$sMessage = $this->xTranslator->trans('errors.data.depth', [
+    'key' => $e->sPrefix,
+    'depth' => $e->nDepth,
+]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -158,15 +158,15 @@ 
      *
      * @return void
      */
-    public function setOption(string $sName, $xValue): void
-    {
-        $this->xLibConfig = $this->xConfigSetter
-            ->setOption($this->xLibConfig, $sName, $xValue);
-        // Call the config change listeners.
-        $this->xEventManager->libConfigChanged($this->xLibConfig, $sName);
-    }
+public function setOption(string $sName, $xValue): void
+{
+$this->xLibConfig = $this->xConfigSetter
+->setOption($this->xLibConfig, $sName, $xValue);
+// Call the config change listeners.
+$this->xEventManager->libConfigChanged($this->xLibConfig, $sName);
+}
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sName The option name
@@ -174,36 +174,36 @@ 
      *
      * @return mixed
      */
-    public function getOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->xLibConfig->getOption($sName, $xDefault);
-    }
+public function getOption(string $sName, $xDefault = null): mixed
+{
+return $this->xLibConfig->getOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of a config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasOption(string $sName): bool
-    {
-        return $this->xLibConfig->hasOption($sName);
-    }
+public function hasOption(string $sName): bool
+{
+return $this->xLibConfig->hasOption($sName);
+}
 
-    /**
+/**
      * Get the names of the options matching a given prefix
      *
      * @param string $sPrefix The prefix to match
      *
      * @return array
      */
-    public function getOptionNames(string $sPrefix): array
-    {
-        return $this->xLibConfig->getOptionNames($sPrefix);
-    }
+public function getOptionNames(string $sPrefix): array
+{
+return $this->xLibConfig->getOptionNames($sPrefix);
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -211,25 +211,25 @@ 
      *
      * @return void
      */
-    public function setAppOption(string $sName, $xValue): void
-    {
-        $this->xAppConfig = $this->xConfigSetter
-            ->setOption($this->xAppConfig, $sName, $xValue);
-        // Call the config change listeners.
-        $this->xEventManager->appConfigChanged($this->xAppConfig, $sName);
-    }
+public function setAppOption(string $sName, $xValue): void
+{
+$this->xAppConfig = $this->xConfigSetter
+->setOption($this->xAppConfig, $sName, $xValue);
+// Call the config change listeners.
+$this->xEventManager->appConfigChanged($this->xAppConfig, $sName);
+}
 
-    /**
+/**
      * Get the application config
      *
      * @return Config
      */
-    public function getAppConfig(): Config
-    {
-        return $this->xAppConfig;
-    }
+public function getAppConfig(): Config
+{
+return $this->xAppConfig;
+}
 
-    /**
+/**
      * Set the application config options
      *
      * @param array $aAppOptions
@@ -237,27 +237,27 @@ 
      *
      * @return bool
      */
-    public function setAppOptions(array $aAppOptions, string $sNamePrefix = ''): bool
-    {
-        try
-        {
-            $this->xAppConfig = $this->xConfigSetter
-                ->setOptions($this->xAppConfig, $aAppOptions, $sNamePrefix);
-            // Call the config change listeners.
-            $this->xEventManager->appConfigChanged($this->xAppConfig, '');
-            return $this->xAppConfig->changed();
-        }
-        catch(DataDepth $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.data.depth', [
-                'key' => $e->sPrefix,
-                'depth' => $e->nDepth,
-            ]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function setAppOptions(array $aAppOptions, string $sNamePrefix = ''): bool
+{
+try
+{
+$this->xAppConfig = $this->xConfigSetter
+    ->setOptions($this->xAppConfig, $aAppOptions, $sNamePrefix);
+// Call the config change listeners.
+$this->xEventManager->appConfigChanged($this->xAppConfig, '');
+return $this->xAppConfig->changed();
+}
+catch(DataDepth $e)
+{
+$sMessage = $this->xTranslator->trans('errors.data.depth', [
+    'key' => $e->sPrefix,
+    'depth' => $e->nDepth,
+]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Get the value of an application config option
      *
      * @param string $sName The option name
@@ -265,24 +265,24 @@ 
      *
      * @return mixed
      */
-    public function getAppOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->xAppConfig->getOption($sName, $xDefault);
-    }
+public function getAppOption(string $sName, $xDefault = null): mixed
+{
+return $this->xAppConfig->getOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of an application config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasAppOption(string $sName): bool
-    {
-        return $this->xAppConfig->hasOption($sName);
-    }
+public function hasAppOption(string $sName): bool
+{
+return $this->xAppConfig->hasOption($sName);
+}
 
-    /**
+/**
      * Create a new the config object
      *
      * @param array $aOptions     The options array
@@ -291,54 +291,54 @@ 
      * @return Config
      * @throws SetupException
      */
-    public function newConfig(array $aOptions = [], string $sNamePrefix = ''): Config
-    {
-        try
-        {
-            return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
-        }
-        catch(DataDepth $e)
-        {
-            $sMessage = $this->xTranslator->trans('errors.data.depth', [
-                'key' => $e->sPrefix,
-                'depth' => $e->nDepth,
-            ]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function newConfig(array $aOptions = [], string $sNamePrefix = ''): Config
+{
+try
+{
+return $this->xConfigSetter->newConfig($aOptions, $sNamePrefix);
+}
+catch(DataDepth $e)
+{
+$sMessage = $this->xTranslator->trans('errors.data.depth', [
+    'key' => $e->sPrefix,
+    'depth' => $e->nDepth,
+]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * @param string $sClassName
      *
      * @return void
      */
-    public function addLibEventListener(string $sClassName): void
-    {
-        $this->xEventManager->addLibConfigListener($sClassName);
-    }
+public function addLibEventListener(string $sClassName): void
+{
+$this->xEventManager->addLibConfigListener($sClassName);
+}
 
-    /**
+/**
      * @param string $sClassName
      *
      * @return void
      */
-    public function addAppEventListener(string $sClassName): void
-    {
-        $this->xEventManager->addAppConfigListener($sClassName);
-    }
+public function addAppEventListener(string $sClassName): void
+{
+$this->xEventManager->addAppConfigListener($sClassName);
+}
 
-    /**
+/**
      * Make the helpers functions available in the global namespace.
      *
      * @param bool $bForce
      *
      * @return void
      */
-    public function globals(bool $bForce = false): void
-    {
-        if($bForce || $this->getAppOption('helpers.global', true))
-        {
-            require_once dirname(__DIR__, 2) . '/globals.php';
-        }
-    }
+public function globals(bool $bForce = false): void
+{
+if($bForce || $this->getAppOption('helpers.global', true))
+{
+require_once dirname(__DIR__, 2) . '/globals.php';
+}
+}
 }

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

Switch Indentation +33 added lines, -33 removed lines

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

jaxon-core/src/App/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

@@ -22,61 +22,61 @@
 
 class CallbackData extends AbstractData
 {
-    /**
+/**
      * The callback js objects
      *
      * @var array
      */
-    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);
+}
+}
 }