jaxon-php / jaxon-mono

jaxon-core/src/Plugin/Request/CallableClass/CallableClassPlugin.php

Spacing +15 added lines, -17 removed lines

@@ -82,15 +82,15 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(!$this->xValidator->validateClass(trim($sCallable)))
+        if (!$this->xValidator->validateClass(trim($sCallable)))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($xOptions))
+        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'));
         }
@@ -134,15 +134,15 @@ 
      */
     private function addCallable(CallableObject $xCallableObject): void
     {
-        if($xCallableObject->excluded())
+        if ($xCallableObject->excluded())
         {
             return;
         }
 
         $aCallableObject = &$this->aCallableObjects;
-        foreach(explode('.', $xCallableObject->getJsName()) as $sName)
+        foreach (explode('.', $xCallableObject->getJsName()) as $sName)
         {
-            if(!isset($aCallableObject['children'][$sName]))
+            if (!isset($aCallableObject['children'][$sName]))
             {
                 $aCallableObject['children'][$sName] = [];
             }
@@ -160,12 +160,11 @@ 
     private function renderMethod(string $sIndent, array $aTemplateVars): string
     {
         $aOptions = [];
-        foreach($aTemplateVars['aMethod']['options'] as $sKey => $sValue)
+        foreach ($aTemplateVars['aMethod']['options'] as $sKey => $sValue)
         {
             $aOptions[] = "$sKey: $sValue";
         }
-        $aTemplateVars['sArguments'] = count($aOptions) === 0 ? 'args' :
-            'args, { ' . implode(',', $aOptions) . ' }';
+        $aTemplateVars['sArguments'] = count($aOptions) === 0 ? 'args' : 'args, { ' . implode(',', $aOptions) . ' }';
 
         return $sIndent . trim($this->xTemplateEngine
             ->render('jaxon::callables/method.js', $aTemplateVars));
@@ -185,11 +184,10 @@ 
 
         $fMethodCallback = fn($aMethod) => $this->renderMethod($sIndent,
             ['sJsClass' => $sJsClass, 'aMethod' => $aMethod]);
-        $aMethods = !isset($aCallable['methods']) ? [] :
-            array_map($fMethodCallback, $aCallable['methods']);
+        $aMethods = !isset($aCallable['methods']) ? [] : array_map($fMethodCallback, $aCallable['methods']);
 
         $aChildren = [];
-        foreach($aCallable['children'] ?? [] as $sName => $aChild)
+        foreach ($aCallable['children'] ?? [] as $sName => $aChild)
         {
             $aChildren[] = $this->renderChild("$sName:", "$sJsClass.$sName",
                 $aChild, $nRepeat) . ',';
@@ -230,13 +228,13 @@ 
         $this->xRegistry->registerAllComponents();
 
         $this->aCallableObjects = ['children' => []];
-        foreach($this->cdi->getCallableObjects() as $xCallableObject)
+        foreach ($this->cdi->getCallableObjects() as $xCallableObject)
         {
             $this->addCallable($xCallableObject);
         }
 
         $aScripts = [];
-        foreach($this->aCallableObjects['children'] as $sJsClass => $aCallable)
+        foreach ($this->aCallableObjects['children'] as $sJsClass => $aCallable)
         {
             $aScripts[] = $this->renderChild("{$this->sPrefix}$sJsClass =",
                 $sJsClass, $aCallable) . ';';
@@ -292,7 +290,7 @@ 
         // Will be used to print a translated error message.
         $aErrorParams = ['class' => $sClassName, 'method' => $sMethodName];
 
-        if(!$this->xValidator->validateJsObject($sClassName) ||
+        if (!$this->xValidator->validateJsObject($sClassName) ||
             !$this->xValidator->validateMethod($sMethodName))
         {
             // Unable to find the requested object or method
@@ -306,7 +304,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->getCallable($sClassName);
 
-            if($xCallableObject->excluded($sMethodName))
+            if ($xCallableObject->excluded($sMethodName))
             {
                 // Unable to find the requested class or method
                 $this->throwException('', 'errors.objects.excluded', $aErrorParams);
@@ -315,7 +313,7 @@ 
             $sError = 'errors.objects.call';
             $xCallableObject->call($this->xTarget);
         }
-        catch(ReflectionException|SetupException $e)
+        catch (ReflectionException|SetupException $e)
         {
             // Unable to execute the requested class or method
             $this->throwException($e->getMessage(), $sError, $aErrorParams);

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

Spacing +13 added lines, -15 removed lines

@@ -86,15 +86,15 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(!$this->xValidator->validateFunction(trim($sCallable)))
+        if (!$this->xValidator->validateFunction(trim($sCallable)))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($xOptions))
+        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'));
         }
@@ -115,7 +115,7 @@ 
         $sPhpFunction = trim($sCallable);
         $sFunction = $sPhpFunction;
         // Check if an alias is defined
-        if(isset($aOptions['alias']))
+        if (isset($aOptions['alias']))
         {
             $sFunction = (string)$aOptions['alias'];
             unset($aOptions['alias']);
@@ -139,13 +139,13 @@ 
     public function getCallable(string $sCallable): CallableFunction|null
     {
         $sFunction = trim($sCallable);
-        if(!isset($this->aFunctions[$sFunction]))
+        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)
+        foreach ($this->aOptions[$sFunction] as $sName => $sValue)
         {
             $xCallable->configure($sName, $sValue);
         }
@@ -162,7 +162,7 @@ 
     private function getCallableScript(CallableFunction $xFunction): string
     {
         $aOptions = [];
-        foreach($xFunction->getOptions() as $sKey => $sValue)
+        foreach ($xFunction->getOptions() as $sKey => $sValue)
         {
             $aOptions[] = "$sKey: $sValue";
         }
@@ -170,8 +170,7 @@ 
         return $this->xTemplateEngine->render('jaxon::callables/function.js', [
             'sName' => $xFunction->getName(),
             'sJsName' => $xFunction->getJsName(),
-            'sArguments' => count($aOptions) === 0 ? 'args' :
-                'args, { ' . implode(',', $aOptions) . ' }',
+            'sArguments' => count($aOptions) === 0 ? 'args' : 'args, { ' . implode(',', $aOptions) . ' }',
         ]);
     }
 
@@ -181,7 +180,7 @@ 
     public function getScript(): string
     {
         $code = '';
-        foreach(array_keys($this->aFunctions) as $sFunction)
+        foreach (array_keys($this->aFunctions) as $sFunction)
         {
             $xFunction = $this->getCallable($sFunction);
             $code .= $this->getCallableScript($xFunction);
@@ -219,8 +218,7 @@ 
     private function throwException(Exception $xException, string $sErrorMessage): void
     {
         $this->di->getLogger()->error($xException->getMessage());
-        throw new RequestException($sErrorMessage . (!$this->bDebug ? '' :
-            "\n" . $xException->getMessage()));
+        throw new RequestException($sErrorMessage . (!$this->bDebug ? '' : "\n" . $xException->getMessage()));
     }
 
     /**
@@ -232,7 +230,7 @@ 
         $sRequestedFunction = $this->xTarget->getFunctionName();
 
         // Security check: make sure the requested function was registered.
-        if(!$this->xValidator->validateFunction($sRequestedFunction) ||
+        if (!$this->xValidator->validateFunction($sRequestedFunction) ||
             !isset($this->aFunctions[$sRequestedFunction]))
         {
             // Unable to find the requested function
@@ -245,7 +243,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',
@@ -255,7 +253,7 @@ 
         {
             $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/templates/plugins/config.js.php

Spacing +5 added lines, -5 removed lines

@@ -10,20 +10,20 @@
 jxn.config.defaultMethod = "<?php echo $this->sDefaultMethod ?>";
 jxn.config.responseType = "<?php echo $this->sResponseType ?>";
 
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jxn.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
 
-<?php if(($this->bDebug)): ?>
+<?php if (($this->bDebug)): ?>
 jxn.debug.active = true;
-<?php if(($this->sDebugOutputID)): ?>
+<?php if (($this->sDebugOutputID)): ?>
 jxn.debug.outputID = "<?php echo $this->sDebugOutputID ?>";
 <?php endif ?>
-<?php if(($this->bVerboseDebug)): ?>
+<?php if (($this->bVerboseDebug)): ?>
 jxn.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
 
-<?php if(($this->sCsrfMetaName)): ?>
+<?php if (($this->sCsrfMetaName)): ?>
 jxn.setCsrf('<?php echo $this->sCsrfMetaName ?>');
 <?php endif ?>