jaxon-php / jaxon-core

src/Plugin/Request/CallableFunction/CallableFunctionPlugin.php

Braces +1 added lines, -2 removed lines

@@ -125,8 +125,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'));
         }

Spacing +11 added lines, -11 removed lines

@@ -128,15 +128,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'));
         }
@@ -157,9 +157,9 @@ 
         $sPhpFunction = trim($sCallable);
         $sFunction = $sPhpFunction;
         // Check if an alias is defined
-        if(isset($aOptions['alias']))
+        if (isset($aOptions['alias']))
         {
-            $sFunction = (string)$aOptions['alias'];
+            $sFunction = (string) $aOptions['alias'];
             unset($aOptions['alias']);
         }
         $this->aFunctions[$sFunction] = $sPhpFunction;
@@ -181,13 +181,13 @@ 
     public function getCallable(string $sCallable)
     {
         $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);
         }
@@ -216,7 +216,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);
@@ -230,7 +230,7 @@ 
     public static function canProcessRequest(ServerRequestInterface $xRequest): bool
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             return isset($aBody['jxnfun']);
         }
@@ -244,7 +244,7 @@ 
     public function setTarget(ServerRequestInterface $xRequest)
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             $this->xTarget = Target::makeFunction(trim($aBody['jxnfun']));
             return;
@@ -262,7 +262,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

src/Plugin/Request/CallableFunction/CallableFunction.php

Switch Indentation +9 added lines, -9 removed lines

@@ -114,15 +114,15 @@
     {
         switch($sName)
         {
-        case 'class': // The user function is a method in the given class
-            $this->xPhpFunction = [$sValue, $this->xPhpFunction];
-            break;
-        case 'include':
-            $this->sInclude = $sValue;
-            break;
-        default:
-            $this->aOptions[$sName] = $sValue;
-            break;
+            case 'class': // The user function is a method in the given class
+                $this->xPhpFunction = [$sValue, $this->xPhpFunction];
+                break;
+            case 'include':
+                $this->sInclude = $sValue;
+                break;
+            default:
+                $this->aOptions[$sName] = $sValue;
+                break;
         }
     }
 

Spacing +3 added lines, -3 removed lines

@@ -123,7 +123,7 @@ 
      */
     public function configure(string $sName, string $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'class': // The user function is a method in the given class
             $this->xPhpFunction = [$sValue, $this->xPhpFunction];
@@ -147,12 +147,12 @@ 
      */
     public function call(array $aArgs = [])
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             require_once $this->sInclude;
         }
         // If the function is an alias for a class method, then instantiate the class
-        if(is_array($this->xPhpFunction) && is_string($this->xPhpFunction[0]))
+        if (is_array($this->xPhpFunction) && is_string($this->xPhpFunction[0]))
         {
             $sClassName = $this->xPhpFunction[0];
             $this->xPhpFunction[0] = $this->di->h($sClassName) ?

src/Plugin/Request/CallableDir/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;

src/Plugin/Response/DataBag/DataBagPlugin.php

Spacing +4 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function setDataBag()
     {
-        if($this->xDataBag !== null)
+        if ($this->xDataBag !== null)
         {
             return;
         }
@@ -48,8 +48,7 @@ 
         $aBody = $xRequest->getParsedBody();
         $aParams = $xRequest->getQueryParams();
         $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
+            $this->readData($aBody['jxnbags'] ?? []) : $this->readData($aParams['jxnbags'] ?? []);
         $this->xDataBag = new DataBag($aData);
     }
 
@@ -69,7 +68,7 @@ 
     private function readData($xData): array
     {
         // Todo: clean input data.
-        if(is_string($xData))
+        if (is_string($xData))
         {
             return json_decode($xData, true) ?: [];
         }
@@ -105,7 +104,7 @@ 
     public function writeCommand()
     {
         $this->setDataBag();
-        if($this->xDataBag->touched())
+        if ($this->xDataBag->touched())
         {
             $this->addCommand(['cmd' => 'bags.set'], $this->xDataBag->getAll());
         }

src/Plugin/Response/Dialog/DialogPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
      */
     private function getLibraries(): array
     {
-        if($this->aLibraries === null)
+        if ($this->aLibraries === null)
         {
             $this->aLibraries = $this->xLibraryManager->getLibraries();
         }

src/Plugin/Manager/PackageManager.php

Braces +2 added lines, -4 removed lines

@@ -127,8 +127,7 @@ 
             {
                 // Register a function without options
                 $this->xPluginManager->registerCallable($sCallableType, $xValue);
-            }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            } elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
@@ -175,8 +174,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]);

Spacing +17 added lines, -17 removed lines

@@ -103,28 +103,28 @@ 
     private function updateContainer(Config $xConfig)
     {
         $aOptions = $xConfig->getOption('container.set', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
-            $this->di->set((string)$xKey, $xValue);
+            $this->di->set((string) $xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.val', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
-            $this->di->val((string)$xKey, $xValue);
+            $this->di->val((string) $xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.auto', []);
-        foreach($aOptions as $xValue)
+        foreach ($aOptions as $xValue)
         {
             // The key is the class name. It must be a string.
-            $this->di->auto((string)$xValue);
+            $this->di->auto((string) $xValue);
         }
         $aOptions = $xConfig->getOption('container.alias', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
-            $this->di->alias((string)$xKey, (string)$xValue);
+            $this->di->alias((string) $xKey, (string) $xValue);
         }
     }
 
@@ -139,14 +139,14 @@ 
      */
     private function registerCallables(array $aOptions, string $sCallableType)
     {
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->xPluginManager->registerCallable($sCallableType, $xValue);
             }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            elseif (is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
@@ -163,7 +163,7 @@ 
      */
     private function registerExceptionHandlers(Config $xConfig)
     {
-        foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
+        foreach ($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
         {
             $this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
         }
@@ -206,12 +206,12 @@ 
     {
         // $this->aPackages contains packages config file paths.
         $aLibOptions = $sClassName::config();
-        if(is_string($aLibOptions))
+        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))
+        elseif (!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -234,7 +234,7 @@ 
     {
         $xOptionsProvider = $aUserOptions['provider'] ?? null;
         // The user can provide a callable that returns the package options.
-        if(is_callable($xOptionsProvider))
+        if (is_callable($xOptionsProvider))
         {
             $aUserOptions = $xOptionsProvider($aUserOptions);
         }
@@ -253,7 +253,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions)
     {
         $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, Package::class))
+        if (!is_subclass_of($sClassName, Package::class))
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
             throw new SetupException($sMessage);
@@ -297,7 +297,7 @@ 
 
         // Register packages
         $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $sClassName => $aPkgOptions)
+        foreach ($aPackageConfig as $sClassName => $aPkgOptions)
         {
             $this->registerPackage($sClassName, $aPkgOptions);
         }

src/Request/Factory/Factory.php

Spacing +2 added lines, -2 removed lines

@@ -62,12 +62,12 @@
     public function request(string $sClassName = ''): ?RequestFactory
     {
         $sClassName = trim($sClassName);
-        if(!$sClassName)
+        if (!$sClassName)
         {
             // There is a single request factory for all callable functions.
             return $this->xRequestFactory->noPrefix(false);
         }
-        if($sClassName === '.')
+        if ($sClassName === '.')
         {
             // The request factory is for a js function, not a Jaxon call.
             return $this->xRequestFactory->noPrefix(true);

src/App/Config/ConfigEventManager.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      */
     public function onChange(Config $xConfig, string $sName)
     {
-        foreach($this->aListeners as $sListener)
+        foreach ($this->aListeners as $sListener)
         {
             $this->di->g($sListener)->onChange($xConfig, $sName);
         }

src/App/Config/ConfigManager.php

Spacing +8 added lines, -8 removed lines

@@ -75,22 +75,22 @@ 
         {
             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);
@@ -115,7 +115,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->onChange($this->xConfig, '');
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);
@@ -136,7 +136,7 @@ 
     {
         try
         {
-            if(!$this->xConfig->setOptions($aOptions, $sKeys))
+            if (!$this->xConfig->setOptions($aOptions, $sKeys))
             {
                 return false;
             }
@@ -144,7 +144,7 @@ 
             $this->xEventManager->onChange($this->xConfig, '');
             return true;
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);
@@ -219,7 +219,7 @@ 
         {
             return new Config($aOptions, $sKeys);
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);

Braces +7 added lines, -14 removed lines

@@ -74,23 +74,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);
@@ -114,8 +110,7 @@ 
             $this->xConfig->setOptions($this->read($sConfigFile), $sConfigSection);
             // Call the config change listeners.
             $this->xEventManager->onChange($this->xConfig, '');
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);
@@ -143,8 +138,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->onChange($this->xConfig, '');
             return true;
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);
@@ -218,8 +212,7 @@ 
         try
         {
             return new Config($aOptions, $sKeys);
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);