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/Di/Container.php

Braces +1 added lines, -2 removed lines

@@ -199,8 +199,7 @@
         {
             return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
                 $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
-        }
-        catch(Exception|Throwable $e)
+        } catch(Exception|Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);

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

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/CallableClass/ComponentOptions.php

Braces +1 added lines, -2 removed lines

@@ -226,8 +226,7 @@
             if(is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
-            }
-            elseif(is_string($xMethodToCall))
+            } elseif(is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;
             }

Switch Indentation +137 added lines, -137 removed lines

@@ -27,56 +27,56 @@ 
 
 class ComponentOptions
 {
-    /**
+/**
      * Check if the js code for this object must be generated
      *
      * @var bool
      */
-    private $bExcluded = false;
+private $bExcluded = false;
 
-    /**
+/**
      * The character to use as separator in javascript class names
      *
      * @var string
      */
-    private $sSeparator = '.';
+private $sSeparator = '.';
 
-    /**
+/**
      * A list of methods of the user registered callable object the library must not export to javascript
      *
      * @var array
      */
-    private $aProtectedMethods = [];
+private $aProtectedMethods = [];
 
-    /**
+/**
      * A list of methods to call before processing the request
      *
      * @var array
      */
-    private $aBeforeMethods = [];
+private $aBeforeMethods = [];
 
-    /**
+/**
      * A list of methods to call after processing the request
      *
      * @var array
      */
-    private $aAfterMethods = [];
+private $aAfterMethods = [];
 
-    /**
+/**
      * The javascript class options
      *
      * @var array
      */
-    private $aJsOptions = [];
+private $aJsOptions = [];
 
-    /**
+/**
      * The DI options
      *
      * @var array
      */
-    private $aDiOptions = [];
+private $aDiOptions = [];
 
-    /**
+/**
      * The constructor
      *
      * @param array $aOptions
@@ -84,119 +84,119 @@ 
      * @param array $aProtectedMethods
      * @param array $aProperties
      */
-    public function __construct(array $aOptions, bool $bExcluded = false,
-        array $aProtectedMethods = [], array $aProperties = [])
-    {
-        $this->bExcluded = $bExcluded || (bool)($aOptions['excluded'] ?? false);
-        if($this->bExcluded)
-        {
-            return;
-        }
+public function __construct(array $aOptions, bool $bExcluded = false,
+array $aProtectedMethods = [], array $aProperties = [])
+{
+$this->bExcluded = $bExcluded || (bool)($aOptions['excluded'] ?? false);
+if($this->bExcluded)
+{
+return;
+}
 
-        $sSeparator = $aOptions['separator'];
-        if($sSeparator === '_' || $sSeparator === '.')
-        {
-            $this->sSeparator = $sSeparator;
-        }
-        $this->addProtectedMethods($aOptions['protected']);
-        $this->addProtectedMethods($aProtectedMethods);
+$sSeparator = $aOptions['separator'];
+if($sSeparator === '_' || $sSeparator === '.')
+{
+$this->sSeparator = $sSeparator;
+}
+$this->addProtectedMethods($aOptions['protected']);
+$this->addProtectedMethods($aProtectedMethods);
 
-        foreach($aOptions['functions'] as $sNames => $aFunctionOptions)
-        {
-            // Names are in a comma-separated list.
-            $aFunctionNames = explode(',', $sNames);
-            foreach($aFunctionNames as $sFunctionName)
-            {
-                $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
-            }
-        }
-        foreach($aProperties as $sFunctionName => $aFunctionOptions)
-        {
-            $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
-        }
-    }
+foreach($aOptions['functions'] as $sNames => $aFunctionOptions)
+{
+// Names are in a comma-separated list.
+$aFunctionNames = explode(',', $sNames);
+foreach($aFunctionNames as $sFunctionName)
+{
+    $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
+}
+}
+foreach($aProperties as $sFunctionName => $aFunctionOptions)
+{
+$this->addFunctionOptions($sFunctionName, $aFunctionOptions);
+}
+}
 
-    /**
+/**
      * @param array|string $xMethods
      *
      * @return void
      */
-    private function addProtectedMethods(array|string $xMethods): void
-    {
-        if(!is_array($xMethods))
-        {
-            $this->aProtectedMethods[trim((string)$xMethods)] = true;
-            return;
-        }
+private function addProtectedMethods(array|string $xMethods): void
+{
+if(!is_array($xMethods))
+{
+$this->aProtectedMethods[trim((string)$xMethods)] = true;
+return;
+}
 
-        foreach($xMethods as $sMethod)
-        {
-            $this->aProtectedMethods[trim((string)$sMethod)] = true;
-        }
-    }
+foreach($xMethods as $sMethod)
+{
+$this->aProtectedMethods[trim((string)$sMethod)] = true;
+}
+}
 
-    /**
+/**
      * @param string $sMethodName
      *
      * @return bool
      */
-    public function isProtectedMethod(string $sMethodName): bool
-    {
-        return isset($this->aProtectedMethods['*']) ||
-            isset($this->aProtectedMethods[$sMethodName]);
-    }
+public function isProtectedMethod(string $sMethodName): bool
+{
+return isset($this->aProtectedMethods['*']) ||
+isset($this->aProtectedMethods[$sMethodName]);
+}
 
-    /**
+/**
      * Check if the js code for this object must be generated
      *
      * @return bool
      */
-    public function excluded(): bool
-    {
-        return $this->bExcluded;
-    }
+public function excluded(): bool
+{
+return $this->bExcluded;
+}
 
-    /**
+/**
      * @return string
      */
-    public function separator(): string
-    {
-        return $this->sSeparator;
-    }
+public function separator(): string
+{
+return $this->sSeparator;
+}
 
-    /**
+/**
      * @return array
      */
-    public function beforeMethods(): array
-    {
-        return $this->aBeforeMethods;
-    }
+public function beforeMethods(): array
+{
+return $this->aBeforeMethods;
+}
 
-    /**
+/**
      * @return array
      */
-    public function afterMethods(): array
-    {
-        return $this->aAfterMethods;
-    }
+public function afterMethods(): array
+{
+return $this->aAfterMethods;
+}
 
-    /**
+/**
      * @return array
      */
-    public function diOptions(): array
-    {
-        return $this->aDiOptions;
-    }
+public function diOptions(): array
+{
+return $this->aDiOptions;
+}
 
-    /**
+/**
      * @return array
      */
-    public function jsOptions(): array
-    {
-        return $this->aJsOptions;
-    }
+public function jsOptions(): array
+{
+return $this->aJsOptions;
+}
 
-    /**
+/**
      * Set hook methods
      *
      * @param array $aHookMethods    The array of hook methods
@@ -204,34 +204,34 @@ 
      *
      * @return void
      */
-    private function setHookMethods(array &$aHookMethods, $xValue): void
-    {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
-        {
-            if(!isset($aHookMethods[$sCalledMethod]))
-            {
-                $aHookMethods[$sCalledMethod] = [];
-            }
-            if(is_array($xMethodToCall))
-            {
-                $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
-            }
-            elseif(is_string($xMethodToCall))
-            {
-                $aHookMethods[$sCalledMethod][] = $xMethodToCall;
-            }
-        }
-    }
+private function setHookMethods(array &$aHookMethods, $xValue): void
+{
+foreach($xValue as $sCalledMethod => $xMethodToCall)
+{
+if(!isset($aHookMethods[$sCalledMethod]))
+{
+    $aHookMethods[$sCalledMethod] = [];
+}
+if(is_array($xMethodToCall))
+{
+    $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
+}
+elseif(is_string($xMethodToCall))
+{
+    $aHookMethods[$sCalledMethod][] = $xMethodToCall;
+}
+}
+}
 
-    /**
+/**
      * @param array $aDiOptions
      */
-    private function addDiOption(array $aDiOptions): void
-    {
-        $this->aDiOptions = array_merge($this->aDiOptions, $aDiOptions);
-    }
+private function addDiOption(array $aDiOptions): void
+{
+$this->aDiOptions = array_merge($this->aDiOptions, $aDiOptions);
+}
 
-    /**
+/**
      * Set configuration options / call options for each method
      *
      * @param string $sName    The name of the configuration option
@@ -239,25 +239,25 @@ 
      *
      * @return void
      */
-    private function addOption(string $sName, $xValue): void
-    {
-        switch($sName)
-        {
-        // Set the methods to call before processing the request
-        case '__before':
-            $this->setHookMethods($this->aBeforeMethods, $xValue);
-            break;
-        // Set the methods to call after processing the request
-        case '__after':
-            $this->setHookMethods($this->aAfterMethods, $xValue);
-            break;
-        // Set the attributes to inject in the callable object
-        case '__di':
-            $this->addDiOption($xValue);
-            break;
-        default:
-            break;
-        }
+private function addOption(string $sName, $xValue): void
+{
+switch($sName)
+{
+// Set the methods to call before processing the request
+case '__before':
+$this->setHookMethods($this->aBeforeMethods, $xValue);
+break;
+// Set the methods to call after processing the request
+case '__after':
+$this->setHookMethods($this->aAfterMethods, $xValue);
+break;
+// Set the attributes to inject in the callable object
+case '__di':
+$this->addDiOption($xValue);
+break;
+default:
+break;
+}
     }
 
     /**

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/View/ViewRenderer.php

Switch Indentation +151 added lines, -151 removed lines

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