jaxon-php / jaxon-core

src/App/I18n/Translator.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     public function onChange(Config $xConfig, string $sName)
     {
         // Set the library language any time the config is changed.
-        if($sName === '' || $sName === 'core.language')
+        if ($sName === '' || $sName === 'core.language')
         {
             $this->setLocale($xConfig->getOption('core.language'));
         }

src/App/View/ViewTrait.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
     {
         $this->sDirectory = '';
         $this->sExtension = '';
-        if(isset($this->aDirectories[$sNamespace]))
+        if (isset($this->aDirectories[$sNamespace]))
         {
             // Make sure there's only one '/' at the end of the string
             $this->sDirectory = rtrim($this->aDirectories[$sNamespace]['path'], '/') . '/';

src/Plugin/Request/CallableClass/CallableObjectOptions.php

Switch Indentation +27 added lines, -27 removed lines

@@ -231,19 +231,19 @@ 
         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;
+            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;
         }
     }
 
@@ -291,20 +291,20 @@ 
     {
         switch($sOptionName)
         {
-        case 'excluded':
-            if((bool)$xOptionValue)
-            {
-                $this->addProtectedMethods($sFunctionName);
-            }
-            break;
-        // For databags, all the value are merged in a single array.
-        case 'bags':
-            $this->_addJsArrayOption($sFunctionName, $sOptionName, $xOptionValue);
-            return;
-        // For all the other options, including callback, only the last value is kept.
-        case 'callback':
-        default:
-            $this->_setJsOption($sFunctionName, $sOptionName, $xOptionValue);
+            case 'excluded':
+                if((bool)$xOptionValue)
+                {
+                    $this->addProtectedMethods($sFunctionName);
+                }
+                break;
+            // For databags, all the value are merged in a single array.
+            case 'bags':
+                $this->_addJsArrayOption($sFunctionName, $sOptionName, $xOptionValue);
+                return;
+            // For all the other options, including callback, only the last value is kept.
+            case 'callback':
+            default:
+                $this->_setJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
 

Braces +1 added lines, -2 removed lines

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

Spacing +23 added lines, -25 removed lines

@@ -84,29 +84,29 @@ 
      */
     public function __construct(array $aOptions, ?MetadataInterface $xMetadata)
     {
-        $this->bExcluded = ($xMetadata?->isExcluded() ?? false) || (bool)($aOptions['excluded'] ?? false);
-        if($this->bExcluded)
+        $this->bExcluded = ($xMetadata?->isExcluded() ?? false) || (bool) ($aOptions['excluded'] ?? false);
+        if ($this->bExcluded)
         {
             return;
         }
 
         $sSeparator = $aOptions['separator'];
-        if($sSeparator === '_' || $sSeparator === '.')
+        if ($sSeparator === '_' || $sSeparator === '.')
         {
             $this->sSeparator = $sSeparator;
         }
         $this->addProtectedMethods($aOptions['protected']);
         $this->addProtectedMethods($xMetadata?->getProtectedMethods() ?? []);
 
-        foreach($aOptions['functions'] as $sNames => $aFunctionOptions)
+        foreach ($aOptions['functions'] as $sNames => $aFunctionOptions)
         {
             $aFunctionNames = explode(',', $sNames); // Names are in comma-separated list.
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
             }
         }
-        foreach($xMetadata?->getProperties() ?? [] as $sFunctionName => $aFunctionOptions)
+        foreach ($xMetadata?->getProperties() ?? [] as $sFunctionName => $aFunctionOptions)
         {
             $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
         }
@@ -119,14 +119,14 @@ 
      */
     private function addProtectedMethods($xMethods)
     {
-        if(!is_array($xMethods))
+        if (!is_array($xMethods))
         {
-            $this->aProtectedMethods[trim((string)$xMethods)] = true;
+            $this->aProtectedMethods[trim((string) $xMethods)] = true;
             return;
         }
-        foreach($xMethods as $sMethod)
+        foreach ($xMethods as $sMethod)
         {
-            $this->aProtectedMethods[trim((string)$sMethod)] = true;
+            $this->aProtectedMethods[trim((string) $sMethod)] = true;
         }
     }
 
@@ -202,17 +202,17 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue)
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(!isset($aHookMethods[$sCalledMethod]))
+            if (!isset($aHookMethods[$sCalledMethod]))
             {
                 $aHookMethods[$sCalledMethod] = [];
             }
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
             }
-            elseif(is_string($xMethodToCall))
+            elseif (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;
             }
@@ -237,7 +237,7 @@ 
      */
     private function addOption(string $sName, $xValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the methods to call before processing the request
         case '__before':
@@ -265,11 +265,11 @@ 
      */
     private function _addJsArrayOption(string $sFunctionName, string $sOptionName, $xOptionValue)
     {
-        if(is_string($xOptionValue))
+        if (is_string($xOptionValue))
         {
             $xOptionValue = [$xOptionValue];
         }
-        if(!is_array($xOptionValue))
+        if (!is_array($xOptionValue))
         {
             return; // Do not save.
         }
@@ -298,10 +298,10 @@ 
      */
     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue)
     {
-        switch($sOptionName)
+        switch ($sOptionName)
         {
         case 'excluded':
-            if((bool)$xOptionValue)
+            if ((bool) $xOptionValue)
             {
                 $this->addProtectedMethods($sFunctionName);
             }
@@ -325,12 +325,11 @@ 
      */
     private function addFunctionOptions(string $sFunctionName, array $aFunctionOptions)
     {
-        foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+        foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
         {
             substr($sOptionName, 0, 2) === '__' ?
                 // Options for PHP classes. They start with "__".
-                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) :
-                // Options for javascript code.
+                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) : // Options for javascript code.
                 $this->addJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
@@ -346,12 +345,11 @@ 
         $aOptions = array_merge($this->aJsOptions['*'] ?? []); // Clone the array
         // Then add the method options.
         $aMethodOptions = $this->aJsOptions[$sMethodName] ?? [];
-        foreach($aMethodOptions as $sOptionName => $xOptionValue)
+        foreach ($aMethodOptions as $sOptionName => $xOptionValue)
         {
             // For databags, merge the values in a single array.
             // For all the other options, including callback, keep the last value.
-            $aOptions[$sOptionName] = $sOptionName !== 'bags' ? $xOptionValue :
-                array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
+            $aOptions[$sOptionName] = $sOptionName !== 'bags' ? $xOptionValue : array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
         }
         return $aOptions;
     }

src/Di/Container.php

Braces +1 added lines, -2 removed lines

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

Indentation +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
+        $this->xLibContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -158,7 +158,7 @@ 
      */
     public function has(string $sClass): bool
     {
-        if($this->xAppContainer != null && $this->xAppContainer->has($sClass))
+        if ($this->xAppContainer != null && $this->xAppContainer->has($sClass))
         {
             return true;
         }
@@ -189,13 +189,13 @@ 
     {
         try
         {
-            if($this->xAppContainer != null && $this->xAppContainer->has($sClass))
+            if ($this->xAppContainer != null && $this->xAppContainer->has($sClass))
             {
                 return $this->xAppContainer->get($sClass);
             }
             return $this->xLibContainer->offsetGet($sClass);
         }
-        catch(Exception|Throwable $e)
+        catch (Exception | Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);
@@ -263,15 +263,15 @@ 
     {
         $xType = $xParameter->getType();
         // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
+        if ($xType instanceof ReflectionNamedType)
         {
             // Check the class + the name
-            if($this->has($xType->getName() . ' $' . $xParameter->getName()))
+            if ($this->has($xType->getName() . ' $' . $xParameter->getName()))
             {
                 return $this->get($xType->getName() . ' $' . $xParameter->getName());
             }
             // Check the class only
-            if($this->has($xType->getName()))
+            if ($this->has($xType->getName()))
             {
                 return $this->get($xType->getName());
             }
@@ -291,16 +291,16 @@ 
      */
     public function make($xClass)
     {
-        if(is_string($xClass))
+        if (is_string($xClass))
         {
             $xClass = new ReflectionClass($xClass); // Create the reflection class instance
         }
-        if(!($xClass instanceof ReflectionClass))
+        if (!($xClass instanceof ReflectionClass))
         {
             return null;
         }
         // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
+        if (($constructor = $xClass->getConstructor()) === null)
         {
             return $xClass->newInstance();
         }

src/Request/Handler/RequestHandler.php

Braces +1 added lines, -2 removed lines

@@ -211,8 +211,7 @@
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

Spacing +11 added lines, -11 removed lines

@@ -75,7 +75,7 @@ 
     public function canProcessRequest(): bool
     {
         // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             return true;
         }
@@ -84,9 +84,9 @@ 
         $xRequest = $this->di->getRequest();
 
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
+        foreach ($this->xPluginManager->getRequestHandlers() as $sClassName)
         {
-            if($sClassName::canProcessRequest($xRequest))
+            if ($sClassName::canProcessRequest($xRequest))
             {
                 $this->xRequestPlugin = $this->di->g($sClassName);
                 $xTarget = $this->xRequestPlugin->setTarget($xRequest);
@@ -110,13 +110,13 @@ 
 
         // Process uploaded files, if the upload plugin is enabled
         $xUploadHandler = $this->getUploadHandler();
-        if($xUploadHandler !== null && $xUploadHandler->canProcessRequest($xRequest))
+        if ($xUploadHandler !== null && $xUploadHandler->canProcessRequest($xRequest))
         {
             $xUploadHandler->processRequest($xRequest);
         }
 
         // Process the request
-        if(($this->xRequestPlugin))
+        if (($this->xRequestPlugin))
         {
             $this->xRequestPlugin->processRequest();
             // Process the databag
@@ -133,7 +133,7 @@ 
     public function processRequest()
     {
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -142,11 +142,11 @@ 
         {
             $bEndRequest = false;
             // Handle before processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -154,7 +154,7 @@ 
             $this->_processRequest();
 
             // Handle after processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
@@ -162,12 +162,12 @@ 
         // An exception was thrown while processing the request.
         // The request missed the corresponding handler function,
         // or an error occurred while attempting to execute the handler.
-        catch(RequestException $e)
+        catch (RequestException $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

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

Spacing +3 added lines, -3 removed lines

@@ -2,18 +2,18 @@
 <?php
 // An exported PHP class can have the same name as a subdir in the same parent dir.
 // So, we must make sure that embedded js objects do not already exist, before we create them.
-if(strpos($sJsClass, '.') !== false): ?>
+if (strpos($sJsClass, '.') !== false): ?>
 if(<?php echo $sJsClass ?> === undefined) {
     <?php echo $sJsClass ?> = {};
 }
 <?php else: ?>
 <?php echo $sJsClass ?> = {};
 <?php endif ?>
-<?php foreach($this->aMethods as $aMethod): ?>
+<?php foreach ($this->aMethods as $aMethod): ?>
 <?php echo $sJsClass ?>.<?php echo $aMethod['name'] ?> = function() {
     return jaxon.request({ type: 'class', name: '<?php echo $this->sClass ?>', method: '<?php
         echo $aMethod['name'] ?>' }, { parameters: arguments<?php
-        foreach($aMethod['config'] as $sKey => $sValue): ?>, <?php
+        foreach ($aMethod['config'] as $sKey => $sValue): ?>, <?php
         echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> });
 };
 <?php endforeach;

src/Script/AbstractJsCall.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */
     public function __get(string $sAttribute): JsExpr
     {
-        return $this->_expr()->__get( $sAttribute);
+        return $this->_expr()->__get($sAttribute);
     }
 
     /**

src/Script/JsExpr.php

Spacing +6 added lines, -6 removed lines

@@ -91,9 +91,9 @@ 
      */
     public function func(): ?Func
     {
-        foreach($this->aCalls as $xCall)
+        foreach ($this->aCalls as $xCall)
         {
-            if(is_a($xCall, Func::class))
+            if (is_a($xCall, Func::class))
             {
                 return $xCall;
             }
@@ -442,21 +442,21 @@ 
         $aCalls = array_map(function(JsonSerializable $xCall) {
             return $xCall->jsonSerialize();
         }, $this->aCalls);
-        if($this->bToInt)
+        if ($this->bToInt)
         {
             $aCalls[] = $this->toIntCall();
         }
 
         $aJsExpr = ['_type' => $this->getType(), 'calls' => $aCalls];
-        if(($this->aConfirm))
+        if (($this->aConfirm))
         {
             $aJsExpr['question'] = $this->aConfirm;
         }
-        if(($this->aCondition))
+        if (($this->aCondition))
         {
             $aJsExpr['condition'] = $this->aCondition;
         }
-        if(($this->aMessage))
+        if (($this->aMessage))
         {
             $aJsExpr['message'] = $this->aMessage;
         }

src/Script/Call/Selector.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     {
         $sName = trim($sPath) ?: 'this';
         $this->aCall = ['_type' => 'select', '_name' => $sName, 'mode' => $sMode];
-        if(($sPath) && ($xContext))
+        if (($sPath) && ($xContext))
         {
             $this->aCall['context'] = is_a($xContext, JsonSerializable::class) ?
                 $xContext->jsonSerialize() : $xContext;
@@ -51,7 +51,7 @@ 
      */
     private function getPathAsStr(string $sPath, string $sMode, $xContext)
     {
-        if(!$xContext)
+        if (!$xContext)
         {
             return $sMode === 'jq' ? "jaxon.jq('$sPath')" : $sPath;
         }