jaxon-php / jaxon-mono

jaxon-attributes/src/AttributeReader.php

Braces +1 added lines, -2 removed lines

@@ -258,8 +258,7 @@
             }
 
             return $this->xMetadata;
-        }
-        catch(Exception|Error $e)
+        } catch(Exception|Error $e)
         {
             throw new SetupException($e->getMessage());
         }

jaxon-core/src/Response/Manager/ResponseManager.php

Braces +1 added lines, -2 removed lines

@@ -214,8 +214,7 @@
         if($this->bOnConfirm)
         {
             $this->aConfirmCommands[] = $xCommand;
-        }
-        else
+        } else
         {
             $this->aCommands[] = $xCommand;
         }

Switch Indentation +175 added lines, -175 removed lines

@@ -38,81 +38,81 @@ 
 
 class ResponseManager
 {
-    /**
+/**
      * The current response object that will be sent back to the browser
      * once the request processing phase is complete
      *
      * @var AjaxResponse|null
      */
-    private $xResponse = null;
+private $xResponse = null;
 
-    /**
+/**
      * The error message
      *
      * @var string
      */
-    private $sErrorMessage = '';
+private $sErrorMessage = '';
 
-    /**
+/**
      * The debug messages
      *
      * @var array
      */
-    private $aDebugMessages = [];
+private $aDebugMessages = [];
 
-    /**
+/**
      * The commands that will be sent to the browser in the response
      *
      * @var array
      */
-    protected $aCommands = [];
+protected $aCommands = [];
 
-    /**
+/**
      * If the commands beeing added are to be confirmed
      *
      * @var bool
      */
-    private $bOnConfirm = false;
+private $bOnConfirm = false;
 
-    /**
+/**
      * The commands that will be sent to the browser in the response
      *
      * @var array
      */
-    private $aConfirmCommands = [];
+private $aConfirmCommands = [];
 
-    /**
+/**
      * @param Container $di
      * @param Translator $xTranslator
      * @param string $sCharacterEncoding
      */
-    public function __construct(private Container $di,
-        private Translator $xTranslator, private string $sCharacterEncoding)
-    {}
+public function __construct(private Container $di,
+private Translator $xTranslator, private string $sCharacterEncoding)
+{}
 
-    /**
+/**
      * Get the configured character encoding
      *
      * @return string
      */
-    public function getCharacterEncoding(): string
-    {
-        return $this->sCharacterEncoding;
-    }
+public function getCharacterEncoding(): string
+{
+return $this->sCharacterEncoding;
+}
 
-    /**
+/**
      * Convert to string
      *
      * @param mixed $xData
      *
      * @return string
      */
-    public function str($xData): string
-    {
-        return trim((string)$xData, " \t\n");
-    }
+public function str($xData): string
+{
+return trim((string)$xData, " \t\n");
+}
 
-    /**
+/**
      * Get a translated string
      *
      * @param string $sText The key of the translated string
@@ -120,81 +120,81 @@ 
      *
      * @return string
      */
-    public function trans(string $sText, array $aPlaceHolders = []): string
-    {
-        return $this->xTranslator->trans($sText, $aPlaceHolders);
-    }
+public function trans(string $sText, array $aPlaceHolders = []): string
+{
+return $this->xTranslator->trans($sText, $aPlaceHolders);
+}
 
-    /**
+/**
      * Set the error message
      *
      * @param string $sErrorMessage
      *
      * @return void
      */
-    public function setErrorMessage(string $sErrorMessage): void
-    {
-        $this->sErrorMessage = $sErrorMessage;
-    }
+public function setErrorMessage(string $sErrorMessage): void
+{
+$this->sErrorMessage = $sErrorMessage;
+}
 
-    /**
+/**
      * Get the error message
      *
      * @return string
      */
-    public function getErrorMessage(): string
-    {
-        return $this->sErrorMessage;
-    }
+public function getErrorMessage(): string
+{
+return $this->sErrorMessage;
+}
 
-    /**
+/**
      * Get the commands in the response
      *
      * @return array
      */
-    public function getCommands(): array
-    {
-        return $this->aCommands;
-    }
+public function getCommands(): array
+{
+return $this->aCommands;
+}
 
-    /**
+/**
      * Get the number of commands in the response
      *
      * @return int
      */
-    public function getCommandCount(): int
-    {
-        return count($this->aCommands);
-    }
+public function getCommandCount(): int
+{
+return count($this->aCommands);
+}
 
-    /**
+/**
      * Clear all the commands already added to the response
      *
      * @return void
      */
-    public function clearCommands(): void
-    {
-        $this->aCommands = [];
-    }
+public function clearCommands(): void
+{
+$this->aCommands = [];
+}
 
-    /**
+/**
      * @param array|JsonSerializable $aArgs    The command arguments
      * @param bool $bRemoveEmpty    If true, remove empty arguments
      *
      * @return array
      */
-    private function getCommandArgs(array|JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
-    {
-        if(!$bRemoveEmpty)
-        {
-            return $aArgs;
-        }
-        return array_filter($aArgs, function($xArg) {
-            return !empty($xArg);
-        });
-    }
-
-    /**
+private function getCommandArgs(array|JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
+{
+if(!$bRemoveEmpty)
+{
+return $aArgs;
+}
+return array_filter($aArgs, function($xArg) {
+return !empty($xArg);
+});
+}
+
+/**
      * Add a response command to the array of commands
      *
      * @param string $sName    The command name
@@ -203,25 +203,25 @@ 
      *
      * @return Command
      */
-    public function addCommand(string $sName, array|JsonSerializable $aArgs,
-        bool $bRemoveEmpty = false): Command
-    {
-        $xCommand = new Command([
-            'name' => $this->str($sName),
-            'args' => $this->getCommandArgs($aArgs, $bRemoveEmpty),
-        ]);
-        if($this->bOnConfirm)
-        {
-            $this->aConfirmCommands[] = $xCommand;
-        }
-        else
-        {
-            $this->aCommands[] = $xCommand;
-        }
-        return $xCommand;
-    }
-
-    /**
+public function addCommand(string $sName, array|JsonSerializable $aArgs,
+bool $bRemoveEmpty = false): Command
+{
+$xCommand = new Command([
+'name' => $this->str($sName),
+'args' => $this->getCommandArgs($aArgs, $bRemoveEmpty),
+]);
+if($this->bOnConfirm)
+{
+$this->aConfirmCommands[] = $xCommand;
+}
+else
+{
+$this->aCommands[] = $xCommand;
+}
+return $xCommand;
+}
+
+/**
      * Response command that prompts user with [ok] [cancel] style message box
      *
      * The provided closure will be called with a response object as unique parameter.
@@ -236,29 +236,29 @@ 
      *
      * @return self
      */
-    public function addConfirmCommand(string $sName, Closure $fConfirm,
-        string $sQuestion, array $aArgs = []): self
-    {
-        if($this->bOnConfirm)
-        {
-            throw new AppException($this->xTranslator->trans('errors.app.confirm.nested'));
-        }
-        $this->bOnConfirm = true;
-        $fConfirm();
-        $this->bOnConfirm = false;
-        if(($nCommandCount = count($this->aConfirmCommands)) > 0)
-        {
-            $aCommand = $this->di->getDialogCommand()->confirm($this->str($sQuestion), $aArgs);
-            $aCommand['count'] = $nCommandCount;
-            // The confirm command must be inserted before the commands to be confirmed.
-            $this->addCommand($sName, $aCommand);
-            $this->aCommands = array_merge($this->aCommands, $this->aConfirmCommands);
-            $this->aConfirmCommands = [];
-        }
-        return $this;
-    }
-
-    /**
+public function addConfirmCommand(string $sName, Closure $fConfirm,
+string $sQuestion, array $aArgs = []): self
+{
+if($this->bOnConfirm)
+{
+throw new AppException($this->xTranslator->trans('errors.app.confirm.nested'));
+}
+$this->bOnConfirm = true;
+$fConfirm();
+$this->bOnConfirm = false;
+if(($nCommandCount = count($this->aConfirmCommands)) > 0)
+{
+$aCommand = $this->di->getDialogCommand()->confirm($this->str($sQuestion), $aArgs);
+$aCommand['count'] = $nCommandCount;
+// The confirm command must be inserted before the commands to be confirmed.
+$this->addCommand($sName, $aCommand);
+$this->aCommands = array_merge($this->aCommands, $this->aConfirmCommands);
+$this->aConfirmCommands = [];
+}
+return $this;
+}
+
+/**
      * Add a command to display an alert message to the user
      *
      * @param string $sName     The command name
@@ -269,56 +269,56 @@ 
      *
      * @return self
      */
-    public function addAlertCommand(string $sName, string $sMessage, array $aArgs = []): self
-    {
-        $aCommand = $this->di->getDialogCommand()->info($this->str($sMessage), $aArgs);
-        $this->addCommand($sName, $aCommand);
-        return $this;
-    }
-
-    /**
+public function addAlertCommand(string $sName, string $sMessage, array $aArgs = []): self
+{
+$aCommand = $this->di->getDialogCommand()->info($this->str($sMessage), $aArgs);
+$this->addCommand($sName, $aCommand);
+return $this;
+}
+
+/**
      * Get the response to the Jaxon request
      *
      * @return Response
      */
-    public function getResponse(): Response
-    {
-        return $this->di->getResponse();
-    }
+public function getResponse(): Response
+{
+return $this->di->getResponse();
+}
 
-    /**
+/**
      * Create a new Jaxon response
      *
      * @return Response
      */
-    public function newResponse(): Response
-    {
-        return $this->xResponse = $this->di->newResponse();
-    }
+public function newResponse(): Response
+{
+return $this->xResponse = $this->di->newResponse();
+}
 
-    /**
+/**
      * Get the Jaxon ajax response returned 
      *
      * @return AjaxResponse
      */
-    public function ajaxResponse(): AjaxResponse
-    {
-        return $this->xResponse ?: $this->di->getResponse();
-    }
+public function ajaxResponse(): AjaxResponse
+{
+return $this->xResponse ?: $this->di->getResponse();
+}
 
-    /**
+/**
      * Create a new reponse for a Jaxon component
      *
      * @param JxnCall $xJxnCall
      *
      * @return NodeResponse
      */
-    public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
-    {
-        return $this->di->newNodeResponse($xJxnCall);
-    }
+public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
+{
+return $this->di->newNodeResponse($xJxnCall);
+}
 
-    /**
+/**
      * Appends a debug message on the end of the debug message queue
      *
      * Debug messages will be sent to the client with the normal response
@@ -328,66 +328,66 @@ 
      *
      * @return void
      */
-    public function debug(string $sMessage): void
-    {
-        $this->aDebugMessages[] = $sMessage;
-    }
+public function debug(string $sMessage): void
+{
+$this->aDebugMessages[] = $sMessage;
+}
 
-    /**
+/**
      * Clear the response and appends a debug message on the end of the debug message queue
      *
      * @param string $sMessage The debug message
      *
      * @return void
      */
-    public function error(string $sMessage): void
-    {
-        $this->clearCommands();
-        $this->debug($sMessage);
-    }
+public function error(string $sMessage): void
+{
+$this->clearCommands();
+$this->debug($sMessage);
+}
 
-    /**
+/**
      * Prints the debug messages into the current response object
      *
      * @return void
      */
-    public function printDebug()
-    {
-        foreach($this->aDebugMessages as $sMessage)
-        {
-            $this->addCommand('script.debug', ['message' => $this->str($sMessage)]);
-        }
-        // $this->aDebugMessages = [];
-    }
-
-    /**
+public function printDebug()
+{
+foreach($this->aDebugMessages as $sMessage)
+{
+$this->addCommand('script.debug', ['message' => $this->str($sMessage)]);
+}
+// $this->aDebugMessages = [];
+}
+
+/**
      * Get the content type of the HTTP response
      *
      * @return string
      */
-    public function getContentType(): string
-    {
-        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() :
-            $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
-    }
+public function getContentType(): string
+{
+return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() :
+$this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
+}
 
-    /**
+/**
      * Get the JSON output of the response
      *
      * @return string
      */
-    public function getOutput(): string
-    {
-        return $this->getResponse()->getOutput();
-    }
+public function getOutput(): string
+{
+return $this->getResponse()->getOutput();
+}
 
-    /**
+/**
      * Get the debug messages
      *
      * @return array
      */
-    public function getDebugMessages(): array
-    {
-        return $this->aDebugMessages;
-    }
+public function getDebugMessages(): array
+{
+return $this->aDebugMessages;
+}
 }

jaxon-core/src/Plugin/Manager/PackageManager.php

Braces +1 added lines, -2 removed lines

@@ -218,8 +218,7 @@
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
-        }
-        elseif(!is_array($aLibOptions))
+        } elseif(!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);

Switch Indentation +179 added lines, -179 removed lines

@@ -34,7 +34,7 @@ 
 
 class PackageManager
 {
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -46,48 +46,48 @@ 
      * @param CallbackManager $xCallbackManager
      * @param ComponentRegistry $xRegistry
      */
-    public function __construct(private Container $di, private Translator $xTranslator,
-        private PluginManager $xPluginManager, private ConfigManager $xConfigManager,
-        private CodeGenerator $xCodeGenerator, private ViewRenderer $xViewRenderer,
-        private CallbackManager $xCallbackManager, private ComponentRegistry $xRegistry)
-    {}
+public function __construct(private Container $di, private Translator $xTranslator,
+private PluginManager $xPluginManager, private ConfigManager $xConfigManager,
+private CodeGenerator $xCodeGenerator, private ViewRenderer $xViewRenderer,
+private CallbackManager $xCallbackManager, private ComponentRegistry $xRegistry)
+{}
 
-    /**
+/**
      * Save items in the DI container
      *
      * @param Config $xConfig
      *
      * @return void
      */
-    private function updateContainer(Config $xConfig): void
-    {
-        $aOptions = $xConfig->getOption('container.set', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->set((string)$xKey, $xValue);
-        }
-        $aOptions = $xConfig->getOption('container.val', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->val((string)$xKey, $xValue);
-        }
-        $aOptions = $xConfig->getOption('container.auto', []);
-        foreach($aOptions as $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->auto((string)$xValue);
-        }
-        $aOptions = $xConfig->getOption('container.alias', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->alias((string)$xKey, (string)$xValue);
-        }
-    }
+private function updateContainer(Config $xConfig): void
+{
+$aOptions = $xConfig->getOption('container.set', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->set((string)$xKey, $xValue);
+}
+$aOptions = $xConfig->getOption('container.val', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->val((string)$xKey, $xValue);
+}
+$aOptions = $xConfig->getOption('container.auto', []);
+foreach($aOptions as $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->auto((string)$xValue);
+}
+$aOptions = $xConfig->getOption('container.alias', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->alias((string)$xKey, (string)$xValue);
+}
+}
 
-    /**
+/**
      * Register callables from a section of the config
      *
      * @param array $aOptions    The content of the config section
@@ -96,41 +96,41 @@ 
      * @return void
      * @throws SetupException
      */
-    private function registerCallables(array $aOptions, string $sCallableType): void
-    {
-        foreach($aOptions as $xKey => $xValue)
-        {
-            if(is_integer($xKey) && is_string($xValue))
-            {
-                // Register a function without options
-                $this->xPluginManager->registerCallable($sCallableType, $xValue);
-                continue;
-            }
+private function registerCallables(array $aOptions, string $sCallableType): void
+{
+foreach($aOptions as $xKey => $xValue)
+{
+if(is_integer($xKey) && is_string($xValue))
+{
+    // Register a function without options
+    $this->xPluginManager->registerCallable($sCallableType, $xValue);
+    continue;
+}
 
-            if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
-            {
-                // Register a function with options
-                $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
-            }
-        }
-    }
+if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+{
+    // Register a function with options
+    $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
+}
+}
+}
 
-    /**
+/**
      * Register exceptions handlers
      *
      * @param Config $xConfig
      *
      * @return void
      */
-    private function registerExceptionHandlers(Config $xConfig): void
-    {
-        foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
-        {
-            $this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
-        }
-    }
+private function registerExceptionHandlers(Config $xConfig): void
+{
+foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
+{
+$this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
+}
+}
 
-    /**
+/**
      * Get a callable list from config
      *
      * @param Config $xConfig
@@ -140,36 +140,36 @@ 
      *
      * @return void
      */
-    private function registerCallablesFromConfig(Config $xConfig,
-        string $sOptionName, string $sOptionKey, string $sCallableType): void
-    {
-        // The callable (directory path, class or function name) can be used as the
-        // key of the array item, a string as the value of an entry without a key,
-        // or set with the key $sOptionKey in an array entry without a key.
-        $aCallables = [];
-        foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
-        {
-            if(is_string($xKey))
-            {
-                $aCallables[$xKey] = $xValue;
-                continue;
-            }
-            if(is_string($xValue))
-            {
-                $aCallables[] = $xValue;
-                continue;
-            }
+private function registerCallablesFromConfig(Config $xConfig,
+string $sOptionName, string $sOptionKey, string $sCallableType): void
+{
+// The callable (directory path, class or function name) can be used as the
+// key of the array item, a string as the value of an entry without a key,
+// or set with the key $sOptionKey in an array entry without a key.
+$aCallables = [];
+foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
+{
+if(is_string($xKey))
+{
+    $aCallables[$xKey] = $xValue;
+    continue;
+}
+if(is_string($xValue))
+{
+    $aCallables[] = $xValue;
+    continue;
+}
 
-            if(is_array($xValue) && isset($xValue[$sOptionKey]))
-            {
-                $aCallables[$xValue[$sOptionKey]] = $xValue;
-            }
-            // Invalid values are ignored.
-        }
-        $this->registerCallables($aCallables, $sCallableType);
-    }
+if(is_array($xValue) && isset($xValue[$sOptionKey]))
+{
+    $aCallables[$xValue[$sOptionKey]] = $xValue;
+}
+// Invalid values are ignored.
+}
+$this->registerCallables($aCallables, $sCallableType);
+}
 
-    /**
+/**
      * Read and set Jaxon options from a JSON config file
      *
      * @param Config $xConfig The config options
@@ -177,33 +177,33 @@ 
      * @return void
      * @throws SetupException
      */
-    private function registerItemsFromConfig(Config $xConfig): void
-    {
-        // Set the config for the registered callables.
-        $this->xRegistry->setPackageConfig($xConfig);
+private function registerItemsFromConfig(Config $xConfig): void
+{
+// Set the config for the registered callables.
+$this->xRegistry->setPackageConfig($xConfig);
 
-        // Register functions, classes and directories
-        $this->registerCallablesFromConfig($xConfig,
-            'functions', 'name', Jaxon::CALLABLE_FUNCTION);
-        $this->registerCallablesFromConfig($xConfig,
-            'classes', 'name', Jaxon::CALLABLE_CLASS);
-        $this->registerCallablesFromConfig($xConfig,
-            'directories', 'path', Jaxon::CALLABLE_DIR);
+// Register functions, classes and directories
+$this->registerCallablesFromConfig($xConfig,
+'functions', 'name', Jaxon::CALLABLE_FUNCTION);
+$this->registerCallablesFromConfig($xConfig,
+'classes', 'name', Jaxon::CALLABLE_CLASS);
+$this->registerCallablesFromConfig($xConfig,
+'directories', 'path', Jaxon::CALLABLE_DIR);
 
-        // Unset the current config.
-        $this->xRegistry->unsetPackageConfig();
+// Unset the current config.
+$this->xRegistry->unsetPackageConfig();
 
-        // Register the view namespaces
-        // Note: the $xUserConfig can provide a "template" option, which is used to customize
-        // the user defined view namespaces. That's why it is needed here.
-        $this->xViewRenderer->addNamespaces($xConfig);
-        // Save items in the DI container
-        $this->updateContainer($xConfig);
-        // Register the exception handlers
-        $this->registerExceptionHandlers($xConfig);
-    }
+// Register the view namespaces
+// Note: the $xUserConfig can provide a "template" option, which is used to customize
+// the user defined view namespaces. That's why it is needed here.
+$this->xViewRenderer->addNamespaces($xConfig);
+// Save items in the DI container
+$this->updateContainer($xConfig);
+// Register the exception handlers
+$this->registerExceptionHandlers($xConfig);
+}
 
-    /**
+/**
      * Get the options provided by the package library
      *
      * @param class-string $sClassName    The package class
@@ -211,27 +211,27 @@ 
      * @return Config
      * @throws SetupException
      */
-    private function getPackageLibConfig(string $sClassName): Config
-    {
-        // $this->aPackages contains packages config file paths.
-        $aLibOptions = $sClassName::config();
-        if(is_string($aLibOptions))
-        {
-            // A string is supposed to be the path to a config file.
-            $aLibOptions = $this->xConfigManager->read($aLibOptions);
-        }
-        elseif(!is_array($aLibOptions))
-        {
-            // Otherwise, anything else than an array is not accepted.
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
-        // Add the package name to the config
-        $aLibOptions['package'] = $sClassName;
-        return $this->xConfigManager->newConfig($aLibOptions);
-    }
+private function getPackageLibConfig(string $sClassName): Config
+{
+// $this->aPackages contains packages config file paths.
+$aLibOptions = $sClassName::config();
+if(is_string($aLibOptions))
+{
+// A string is supposed to be the path to a config file.
+$aLibOptions = $this->xConfigManager->read($aLibOptions);
+}
+elseif(!is_array($aLibOptions))
+{
+// Otherwise, anything else than an array is not accepted.
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
+// Add the package name to the config
+$aLibOptions['package'] = $sClassName;
+return $this->xConfigManager->newConfig($aLibOptions);
+}
 
-    /**
+/**
      * Register a package
      *
      * @param class-string $sClassName    The package class
@@ -240,27 +240,27 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $aUserOptions = []): void
-    {
-        $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, AbstractPackage::class))
-        {
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
+public function registerPackage(string $sClassName, array $aUserOptions = []): void
+{
+$sClassName = trim($sClassName, '\\ ');
+if(!is_subclass_of($sClassName, AbstractPackage::class))
+{
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
 
-        // Register the declarations in the package config.
-        $xAppConfig = $this->getPackageLibConfig($sClassName);
-        $this->registerItemsFromConfig($xAppConfig);
+// Register the declarations in the package config.
+$xAppConfig = $this->getPackageLibConfig($sClassName);
+$this->registerItemsFromConfig($xAppConfig);
 
-        // Register the package and its options in the DI
-        $this->di->registerPackage($sClassName, $aUserOptions);
+// Register the package and its options in the DI
+$this->di->registerPackage($sClassName, $aUserOptions);
 
-        // Register the package as a code generator.
-        $this->xCodeGenerator->addCodeGenerator($sClassName, 500);
-    }
+// Register the package as a code generator.
+$this->xCodeGenerator->addCodeGenerator($sClassName, 500);
+}
 
-    /**
+/**
      * Get a package instance
      *
      * @template T of AbstractPackage
@@ -268,42 +268,42 @@ 
      *
      * @return T|null
      */
-    public function getPackage(string $sClassName): ?AbstractPackage
-    {
-        $sClassName = trim($sClassName, '\\ ');
-        return $this->di->h($sClassName) ? $this->di->g($sClassName) : null;
-    }
+public function getPackage(string $sClassName): ?AbstractPackage
+{
+$sClassName = trim($sClassName, '\\ ');
+return $this->di->h($sClassName) ? $this->di->g($sClassName) : null;
+}
 
-    /**
+/**
      * Read and set Jaxon options from the config
      *
      * @return void
      * @throws SetupException
      */
-    public function registerFromConfig(): void
-    {
-        $xAppConfig = $this->xConfigManager->getAppConfig();
-        $this->registerItemsFromConfig($xAppConfig);
+public function registerFromConfig(): void
+{
+$xAppConfig = $this->xConfigManager->getAppConfig();
+$this->registerItemsFromConfig($xAppConfig);
 
-        // Register packages
-        $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $xKey => $xValue)
-        {
-            if(is_integer($xKey) && is_string($xValue))
-            {
-                // Register a package without options
-                $sClassName = $xValue;
-                $this->registerPackage($sClassName);
-                continue;
-            }
+// Register packages
+$aPackageConfig = $xAppConfig->getOption('packages', []);
+foreach($aPackageConfig as $xKey => $xValue)
+{
+if(is_integer($xKey) && is_string($xValue))
+{
+    // Register a package without options
+    $sClassName = $xValue;
+    $this->registerPackage($sClassName);
+    continue;
+}
 
-            if(is_string($xKey) && is_array($xValue))
-            {
-                // Register a package with options
-                $sClassName = $xKey;
-                $aPkgOptions = $xValue;
-                $this->registerPackage($sClassName, $aPkgOptions);
-            }
-        }
-    }
+if(is_string($xKey) && is_array($xValue))
+{
+    // Register a package with options
+    $sClassName = $xKey;
+    $aPkgOptions = $xValue;
+    $this->registerPackage($sClassName, $aPkgOptions);
+}
+}
+}
 }

jaxon-core/src/Plugin/Request/CallableFunction/CallableFunctionPlugin.php

Braces +3 added lines, -6 removed lines

@@ -92,8 +92,7 @@ 
         if(is_string($xOptions))
         {
             $xOptions = ['include' => $xOptions];
-        }
-        elseif(!is_array($xOptions))
+        } elseif(!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -236,8 +235,7 @@ 
         {
             /** @var CallableFunction */
             $xFunction = $this->getCallable($sRequestedFunction);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             // Unable to find the requested function
             $this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
@@ -246,8 +244,7 @@ 
         try
         {
             $xFunction->call($this->xTarget->args());
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             // Unable to execute the requested function
             $this->throwException($e, $this->xTranslator->trans('errors.functions.call',

jaxon-core/src/App/Config/ConfigManager.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/View/Helper/HtmlAttrHelper.php

Switch Indentation +7 added lines, -7 removed lines

@@ -203,12 +203,12 @@
         $sCode = match($sType) {
             'html' => jaxon()->package($sClass)?->getHtml() ?? '',
             'ready' => jaxon()->package($sClass)?->getReadyScript() ?? '',
-            default => ''
-        };
-        $sCode = trim($sCode);
+default => ''
+};
+$sCode = trim($sCode);
 
-        return $sType !== 'ready' || $sCode === '' ? $sCode :
-            // Call the ready code with the jaxon.dom.ready function.
-            "jaxon.dom.ready(() => $sCode)";
-    }
+return $sType !== 'ready' || $sCode === '' ? $sCode :
+// Call the ready code with the jaxon.dom.ready function.
+"jaxon.dom.ready(() => $sCode)";
+}
 }

jaxon-core/src/App/PageComponent.php

Switch Indentation +23 added lines, -23 removed lines

@@ -6,53 +6,53 @@
 
 abstract class PageComponent extends NodeComponent
 {
-    /**
+/**
      * The current page number.
      *
      * @var int
      */
-    private int $currentPage = 1;
+private int $currentPage = 1;
 
-    /**
+/**
      * Get the total number of items to paginate.
      *
      * @return int
      */
-    abstract protected function count(): int;
+abstract protected function count(): int;
 
-    /**
+/**
      * Get the max number of items per page.
      *
      * @return int
      */
-    abstract protected function limit(): int;
+abstract protected function limit(): int;
 
-    /**
+/**
      * Get the paginator for the component.
      *
      * @param int $pageNumber
      *
      * @return Paginator
      */
-    protected function paginator(int $pageNumber): Paginator
-    {
-        return $this->cl(Component\Pagination::class)
-            // Use the js class name as component item identifier.
-            ->item($this->rq()->_class())
-            ->paginator($pageNumber > 0 ? $pageNumber : 1, $this->limit(), $this->count())
-            // This callback will receive the final value of the current page number.
-            ->page(function(int $currentPage) {
-                $this->currentPage = $currentPage;
-            });
-    }
+protected function paginator(int $pageNumber): Paginator
+{
+return $this->cl(Component\Pagination::class)
+// Use the js class name as component item identifier.
+->item($this->rq()->_class())
+->paginator($pageNumber > 0 ? $pageNumber : 1, $this->limit(), $this->count())
+// This callback will receive the final value of the current page number.
+->page(function(int $currentPage) {
+    $this->currentPage = $currentPage;
+});
+}
 
-    /**
+/**
      * Get the current page number
      *
      * @return int
      */
-    protected function currentPage(): int
-    {
-        return $this->currentPage;
-    }
+protected function currentPage(): int
+{
+return $this->currentPage;
+}
 }

jaxon-core/src/App/PageDatabagTrait.php

Switch Indentation +37 added lines, -37 removed lines

@@ -6,81 +6,81 @@
 
 trait PageDatabagTrait
 {
-    /**
+/**
      * The current page number.
      *
      * @var int
      */
-    private int $currentPage = 1;
+private int $currentPage = 1;
 
-    /**
+/**
      * Get the pagination databag name.
      *
      * @return string
      */
-    abstract protected function bagName(): string;
+abstract protected function bagName(): string;
 
-    /**
+/**
      * Get the pagination databag attribute.
      *
      * @return string
      */
-    abstract protected function bagAttr(): string;
+abstract protected function bagAttr(): string;
 
-    /**
+/**
      * Get the page number.
      *
      * @param int $pageNumber
      *
      * @return int
      */
-    private function getPageNumber(int $pageNumber): int
-    {
-        // If no page number is provided, then get the value from the databag.
-        return $pageNumber > 0 ? $pageNumber :
-            (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
-    }
+private function getPageNumber(int $pageNumber): int
+{
+// If no page number is provided, then get the value from the databag.
+return $pageNumber > 0 ? $pageNumber :
+(int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
+}
 
-    /**
+/**
      * Set the page number.
      *
      * @param int $currentPage
      *
      * @return void
      */
-    private function setCurrentPage(int $currentPage): void
-    {
-        // Save the current page in the databag.
-        $this->bag($this->bagName())->set($this->bagAttr(), $currentPage);
-        $this->currentPage = $currentPage;
-    }
+private function setCurrentPage(int $currentPage): void
+{
+// Save the current page in the databag.
+$this->bag($this->bagName())->set($this->bagAttr(), $currentPage);
+$this->currentPage = $currentPage;
+}
 
-    /**
+/**
      * Get the paginator for the component.
      *
      * @param int $pageNumber
      *
      * @return Paginator
      */
-    protected function paginator(int $pageNumber): Paginator
-    {
-        return $this->cl(Component\Pagination::class)
-            // Use the js class name as component item identifier.
-            ->item($this->rq()->_class())
-            ->paginator($this->getPageNumber($pageNumber), $this->limit(), $this->count())
-            // This callback will receive the final value of the current page number.
-            ->page(function(int $currentPage) {
-                $this->setCurrentPage($currentPage);
-            });
-    }
+protected function paginator(int $pageNumber): Paginator
+{
+return $this->cl(Component\Pagination::class)
+// Use the js class name as component item identifier.
+->item($this->rq()->_class())
+->paginator($this->getPageNumber($pageNumber), $this->limit(), $this->count())
+// This callback will receive the final value of the current page number.
+->page(function(int $currentPage) {
+    $this->setCurrentPage($currentPage);
+});
+}
 
-    /**
+/**
      * Get the current page number
      *
      * @return int
      */
-    protected function currentPage(): int
-    {
-        return $this->currentPage;
-    }
+protected function currentPage(): int
+{
+return $this->currentPage;
+}
 }

jaxon-core/src/jaxon_ns.php

Switch Indentation +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
  */
 function jaxon(): JaxonLib
 {
-    return JaxonLib::getInstance();
+return JaxonLib::getInstance();
 }
 
 /**
@@ -44,7 +44,7 @@ 
  */
 function cl(string $sClassName): mixed
 {
-    return jaxon()->cdi()->makeComponent($sClassName);
+return jaxon()->cdi()->makeComponent($sClassName);
 }
 
 /**
@@ -56,7 +56,7 @@ 
  */
 function rq(string $sClassName = ''): JxnCall
 {
-    return jaxon()->di()->getCallFactory()->rq($sClassName);
+return jaxon()->di()->getCallFactory()->rq($sClassName);
 }
 
 /**
@@ -68,7 +68,7 @@ 
  */
 function jo(string $sJsObject = ''): JsObjectCall
 {
-    return jaxon()->di()->getCallFactory()->jo($sJsObject);
+return jaxon()->di()->getCallFactory()->jo($sJsObject);
 }
 
 /**
@@ -81,7 +81,7 @@ 
  */
 function jq(string $sPath = '', $xContext = null): JqSelectorCall
 {
-    return jaxon()->di()->getCallFactory()->jq($sPath, $xContext);
+return jaxon()->di()->getCallFactory()->jq($sPath, $xContext);
 }
 
 /**
@@ -93,7 +93,7 @@ 
  */
 function je(string $sElementId = ''): JsSelectorCall
 {
-    return jaxon()->di()->getCallFactory()->je($sElementId);
+return jaxon()->di()->getCallFactory()->je($sElementId);
 }
 
 /**
@@ -103,7 +103,7 @@ 
  */
 function attr(): HtmlAttrHelper
 {
-    return jaxon()->di()->getHtmlAttrHelper();
+return jaxon()->di()->getHtmlAttrHelper();
 }
 
 /**
@@ -114,5 +114,5 @@ 
  */
 function pm(): ParameterFactory
 {
-    return jaxon()->di()->getParameterFactory();
+return jaxon()->di()->getParameterFactory();
 }