jaxon-php / jaxon-core

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 +13 added lines, -13 removed lines

@@ -107,7 +107,7 @@ 
         $this->xUploadHandler = $this->di->getUploadHandler();
 
         // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             return true;
         }
@@ -115,9 +115,9 @@ 
         // The HTTP request
         $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);
                 $this->xRequestPlugin->setTarget($xRequest);
@@ -126,7 +126,7 @@ 
         }
 
         // Check if the upload plugin is enabled
-        if($this->xUploadHandler === null)
+        if ($this->xUploadHandler === null)
         {
             return false;
         }
@@ -148,15 +148,15 @@ 
         // The HTTP request
         $xRequest = $this->di->getRequest();
         // Process uploaded files, if the upload plugin is enabled
-        if($this->xUploadHandler !== null && $this->xUploadHandler->canProcessRequest($xRequest))
+        if ($this->xUploadHandler !== null && $this->xUploadHandler->canProcessRequest($xRequest))
         {
             $this->xUploadHandler->processRequest($xRequest);
         }
         // Process the request
-        if(($this->xRequestPlugin))
+        if (($this->xRequestPlugin))
         {
             $xResponse = $this->xRequestPlugin->processRequest();
-            if(($xResponse))
+            if (($xResponse))
             {
                 $this->xResponseManager->setResponse($xResponse);
             }
@@ -177,7 +177,7 @@ 
     public function processRequest()
     {
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -186,11 +186,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;
             }
@@ -198,7 +198,7 @@ 
             $this->_processRequest();
 
             // Handle after processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
@@ -206,12 +206,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);

src/Plugin/Request/CallableClass/CallableDirPlugin.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
     private function checkDirectory(string $sDirectory): string
     {
         $sDirectory = rtrim(trim($sDirectory), '/\\');
-        if(!is_dir($sDirectory))
+        if (!is_dir($sDirectory))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -93,11 +93,11 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(is_string($xOptions))
+        if (is_string($xOptions))
         {
             $xOptions = ['namespace' => $xOptions];
         }
-        if(!is_array($xOptions))
+        if (!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -105,14 +105,14 @@ 
         $xOptions['directory'] = $this->checkDirectory($sCallable);
         // Check the namespace
         $sNamespace = $xOptions['namespace'] ?? '';
-        if(!($xOptions['namespace'] = trim($sNamespace, ' \\')))
+        if (!($xOptions['namespace'] = trim($sNamespace, ' \\')))
         {
             $xOptions['namespace'] = '';
         }
 
         // Change the keys in $xOptions to have "\" as separator
         $_aOptions = [];
-        foreach($xOptions as $sName => $aOption)
+        foreach ($xOptions as $sName => $aOption)
         {
             $sName = trim(str_replace('.', '\\', $sName), ' \\');
             $_aOptions[$sName] = $aOption;
@@ -125,7 +125,7 @@ 
      */
     public function register(string $sType, string $sCallable, array $aOptions): bool
     {
-        if(($aOptions['namespace']))
+        if (($aOptions['namespace']))
         {
             $this->xRegistry->addNamespace($aOptions['namespace'], $aOptions);
             return true;

templates/callables/object.js.php

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({ jxncls: '<?php echo $this->sClass ?>', jxnmthd: '<?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;

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

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/JxnCall.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  * @link https://github.com/jaxon-php/jaxon-core
  */
 
- use Jaxon\App\Dialog\DialogManager;
+    use Jaxon\App\Dialog\DialogManager;
 
 class JxnCall extends AbstractCall
 {

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

src/Script/Call/Attr.php

Spacing +2 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
      */
     public function jsonSerialize(): array
     {
-        if(isset($this->aValue['value']))
+        if (isset($this->aValue['value']))
         {
             $this->aValue['value'] = $this->aValue['value']->jsonSerialize();
         }
@@ -80,7 +80,6 @@ 
      */
     public function __toString(): string
     {
-        return !isset($this->aValue['value']) ? $this->aValue['_name'] :
-            $this->aValue['_name'] . ' = ' . $this->aValue['value']->__toString();
+        return !isset($this->aValue['value']) ? $this->aValue['_name'] : $this->aValue['_name'] . ' = ' . $this->aValue['value']->__toString();
     }
 }