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/templates/callables/object.js.php

Braces +3 added lines, -1 removed lines

@@ -6,7 +6,8 @@ 
 if(<?php echo $sJsClass ?> === undefined) {
     <?php echo $sJsClass ?> = {};
 }
-<?php else: ?>
+<?php else {
+    : ?>
 <?php echo $sJsClass ?> = {};
 <?php endif ?>
 <?php foreach($this->aMethods as $aMethod): ?>
@@ -17,3 +18,4 @@ 
         echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> });
 };
 <?php endforeach;
+}

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

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

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',

Switch Indentation +142 added lines, -142 removed lines

@@ -42,21 +42,21 @@ 
 
 class CallableFunctionPlugin extends AbstractRequestPlugin
 {
-    /**
+/**
      * The registered functions names
      *
      * @var array
      */
-    protected $aFunctions = [];
+protected $aFunctions = [];
 
-    /**
+/**
      * The registered functions options
      *
      * @var array
      */
-    protected $aOptions = [];
+protected $aOptions = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sPrefix
@@ -66,41 +66,41 @@ 
      * @param Translator $xTranslator
      * @param Validator $xValidator
      */
-    public function __construct(private string $sPrefix, private bool $bDebug,
-        private Container $di, private TemplateEngine $xTemplateEngine,
-        private Translator $xTranslator, private Validator $xValidator)
-    {}
+public function __construct(private string $sPrefix, private bool $bDebug,
+private Container $di, private TemplateEngine $xTemplateEngine,
+private Translator $xTranslator, private Validator $xValidator)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return Jaxon::CALLABLE_FUNCTION;
-    }
+public function getName(): string
+{
+return Jaxon::CALLABLE_FUNCTION;
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function checkOptions(string $sCallable, $xOptions): array
-    {
-        if(!$this->xValidator->validateFunction(trim($sCallable)))
-        {
-            throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
-        }
-        if(is_string($xOptions))
-        {
-            $xOptions = ['include' => $xOptions];
-        }
-        elseif(!is_array($xOptions))
-        {
-            throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
-        }
-        return $xOptions;
-    }
+public function checkOptions(string $sCallable, $xOptions): array
+{
+if(!$this->xValidator->validateFunction(trim($sCallable)))
+{
+throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
+}
+if(is_string($xOptions))
+{
+$xOptions = ['include' => $xOptions];
+}
+elseif(!is_array($xOptions))
+{
+throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
+}
+return $xOptions;
+}
 
-    /**
+/**
      * Register a user defined function
      *
      * @param string $sType    The type of request handler being registered
@@ -109,149 +109,149 @@ 
      *
      * @return bool
      */
-    public function register(string $sType, string $sCallable, array $aOptions): bool
-    {
-        $sPhpFunction = trim($sCallable);
-        $sFunction = $sPhpFunction;
-        // Check if an alias is defined
-        if(isset($aOptions['alias']))
-        {
-            $sFunction = (string)$aOptions['alias'];
-            unset($aOptions['alias']);
-        }
-        $this->aFunctions[$sFunction] = $sPhpFunction;
-        $this->aOptions[$sFunction] = $aOptions;
-        return true;
-    }
+public function register(string $sType, string $sCallable, array $aOptions): bool
+{
+$sPhpFunction = trim($sCallable);
+$sFunction = $sPhpFunction;
+// Check if an alias is defined
+if(isset($aOptions['alias']))
+{
+$sFunction = (string)$aOptions['alias'];
+unset($aOptions['alias']);
+}
+$this->aFunctions[$sFunction] = $sPhpFunction;
+$this->aOptions[$sFunction] = $aOptions;
+return true;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        return md5(implode('', array_keys($this->aFunctions)));
-    }
+public function getHash(): string
+{
+return md5(implode('', array_keys($this->aFunctions)));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getCallable(string $sCallable): CallableFunction|null
-    {
-        $sFunction = trim($sCallable);
-        if(!isset($this->aFunctions[$sFunction]))
-        {
-            return null;
-        }
-        $xCallable = new CallableFunction($this->di, $sFunction,
-            $this->sPrefix . $sFunction, $this->aFunctions[$sFunction]);
-        foreach($this->aOptions[$sFunction] as $sName => $sValue)
-        {
-            $xCallable->configure($sName, $sValue);
-        }
-        return $xCallable;
-    }
+public function getCallable(string $sCallable): CallableFunction|null
+{
+$sFunction = trim($sCallable);
+if(!isset($this->aFunctions[$sFunction]))
+{
+return null;
+}
+$xCallable = new CallableFunction($this->di, $sFunction,
+$this->sPrefix . $sFunction, $this->aFunctions[$sFunction]);
+foreach($this->aOptions[$sFunction] as $sName => $sValue)
+{
+$xCallable->configure($sName, $sValue);
+}
+return $xCallable;
+}
 
-    /**
+/**
      * Generate the javascript function stub that is sent to the browser on initial page load
      *
      * @param CallableFunction $xFunction
      *
      * @return string
      */
-    private function getCallableScript(CallableFunction $xFunction): string
-    {
-        return $this->xTemplateEngine->render('jaxon::callables/function.js', [
-            'sName' => $xFunction->getName(),
-            'sJsName' => $xFunction->getJsName(),
-            'aOptions' => $xFunction->getOptions(),
-        ]);
-    }
+private function getCallableScript(CallableFunction $xFunction): string
+{
+return $this->xTemplateEngine->render('jaxon::callables/function.js', [
+'sName' => $xFunction->getName(),
+'sJsName' => $xFunction->getJsName(),
+'aOptions' => $xFunction->getOptions(),
+]);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getScript(): string
-    {
-        $code = '';
-        foreach(array_keys($this->aFunctions) as $sFunction)
-        {
-            $xFunction = $this->getCallable($sFunction);
-            $code .= $this->getCallableScript($xFunction);
-        }
-        return $code;
-    }
+public function getScript(): string
+{
+$code = '';
+foreach(array_keys($this->aFunctions) as $sFunction)
+{
+$xFunction = $this->getCallable($sFunction);
+$code .= $this->getCallableScript($xFunction);
+}
+return $code;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function canProcessRequest(ServerRequestInterface $xRequest): bool
-    {
-        $aCall = $xRequest->getAttribute('jxncall');
-        // throw new \Exception(json_encode(['call' => $aCall]));
-        return $aCall !== null && ($aCall['type'] ?? '') === 'func' && isset($aCall['name']);
-    }
+public static function canProcessRequest(ServerRequestInterface $xRequest): bool
+{
+$aCall = $xRequest->getAttribute('jxncall');
+// throw new \Exception(json_encode(['call' => $aCall]));
+return $aCall !== null && ($aCall['type'] ?? '') === 'func' && isset($aCall['name']);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function setTarget(ServerRequestInterface $xRequest): Target
-    {
-        $aCall = $xRequest->getAttribute('jxncall');
-        $this->xTarget = Target::makeFunction(trim($aCall['name']));
-        return $this->xTarget;
-    }
+public function setTarget(ServerRequestInterface $xRequest): Target
+{
+$aCall = $xRequest->getAttribute('jxncall');
+$this->xTarget = Target::makeFunction(trim($aCall['name']));
+return $this->xTarget;
+}
 
-    /**
+/**
      * @param Exception $xException
      * @param string $sErrorMessage
      *
      * @throws RequestException
      * @return void
      */
-    private function throwException(Exception $xException, string $sErrorMessage): void
-    {
-        $this->di->getLogger()->error($xException->getMessage());
-        throw new RequestException($sErrorMessage . (!$this->bDebug ? '' :
-            "\n" . $xException->getMessage()));
-    }
+private function throwException(Exception $xException, string $sErrorMessage): void
+{
+$this->di->getLogger()->error($xException->getMessage());
+throw new RequestException($sErrorMessage . (!$this->bDebug ? '' :
+"\n" . $xException->getMessage()));
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws RequestException
      */
-    public function processRequest(): void
-    {
-        $sRequestedFunction = $this->xTarget->getFunctionName();
+public function processRequest(): void
+{
+$sRequestedFunction = $this->xTarget->getFunctionName();
 
-        // Security check: make sure the requested function was registered.
-        if(!$this->xValidator->validateFunction($sRequestedFunction) ||
-            !isset($this->aFunctions[$sRequestedFunction]))
-        {
-            // Unable to find the requested function
-            throw new RequestException($this->xTranslator->trans('errors.functions.invalid',
-                ['name' => $sRequestedFunction]));
-        }
+// Security check: make sure the requested function was registered.
+if(!$this->xValidator->validateFunction($sRequestedFunction) ||
+!isset($this->aFunctions[$sRequestedFunction]))
+{
+// Unable to find the requested function
+throw new RequestException($this->xTranslator->trans('errors.functions.invalid',
+    ['name' => $sRequestedFunction]));
+}
 
-        try
-        {
-            /** @var CallableFunction */
-            $xFunction = $this->getCallable($sRequestedFunction);
-        }
-        catch(Exception $e)
-        {
-            // Unable to find the requested function
-            $this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
-                ['name' => $sRequestedFunction]));
-        }
-        try
-        {
-            $xFunction->call($this->xTarget->args());
-        }
-        catch(Exception $e)
-        {
-            // Unable to execute the requested function
-            $this->throwException($e, $this->xTranslator->trans('errors.functions.call',
-                ['name' => $sRequestedFunction]));
-        }
-    }
+try
+{
+/** @var CallableFunction */
+$xFunction = $this->getCallable($sRequestedFunction);
+}
+catch(Exception $e)
+{
+// Unable to find the requested function
+$this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
+    ['name' => $sRequestedFunction]));
+}
+try
+{
+$xFunction->call($this->xTarget->args());
+}
+catch(Exception $e)
+{
+// Unable to execute the requested function
+$this->throwException($e, $this->xTranslator->trans('errors.functions.call',
+    ['name' => $sRequestedFunction]));
+}
+}
 }

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