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/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

@@ -63,28 +63,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);
         }
     }
 
@@ -99,14 +99,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);
@@ -123,7 +123,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 : '');
         }
@@ -173,12 +173,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]);
@@ -201,7 +201,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);
         }
@@ -220,7 +220,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions)
     {
         $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, AbstractPackage::class))
+        if (!is_subclass_of($sClassName, AbstractPackage::class))
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
             throw new SetupException($sMessage);
@@ -266,7 +266,7 @@ 
 
         // Register packages
         $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $sClassName => $aPkgOptions)
+        foreach ($aPackageConfig as $sClassName => $aPkgOptions)
         {
             $this->registerPackage($sClassName, $aPkgOptions);
         }

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/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/Dialog/Library/DialogLibraryManager.php

Switch Indentation +10 added lines, -10 removed lines

@@ -331,16 +331,16 @@
         $sPrefix = substr($sName, 0, 15);
         switch($sPrefix)
         {
-        case 'dialogs.default':
-            $this->setDefaultLibraries();
-            return;
-        case 'dialogs.lib.ext':
-            $this->registerLibraries();
-            return;
-        case 'dialogs.lib.use':
-            $this->setUsedLibraries();
-            return;
-        default:
+            case 'dialogs.default':
+                $this->setDefaultLibraries();
+                return;
+            case 'dialogs.lib.ext':
+                $this->registerLibraries();
+                return;
+            case 'dialogs.lib.use':
+                $this->setUsedLibraries();
+                return;
+            default:
         }
     }
 }

Spacing +14 added lines, -14 removed lines

@@ -106,11 +106,11 @@ 
      */
     public function registerLibrary(string $sClassName, string $sLibraryName)
     {
-        if(isset($this->aLibraries[$sLibraryName]))
+        if (isset($this->aLibraries[$sLibraryName]))
         {
             return;
         }
-        if(!($aInterfaces = class_implements($sClassName)))
+        if (!($aInterfaces = class_implements($sClassName)))
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -120,7 +120,7 @@ 
         $bIsQuestion = in_array(QuestionInterface::class, $aInterfaces);
         $bIsMessage = in_array(MessageInterface::class, $aInterfaces);
         $bIsModal = in_array(ModalInterface::class, $aInterfaces);
-        if(!$bIsQuestion && !$bIsMessage && !$bIsModal)
+        if (!$bIsQuestion && !$bIsMessage && !$bIsModal)
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -148,7 +148,7 @@ 
      */
     public function setQuestionLibrary(string $sLibraryName)
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['question'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['question'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'question', 'name' => $sLibraryName]);
@@ -177,7 +177,7 @@ 
      */
     public function setMessageLibrary(string $sLibraryName)
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['message'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['message'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'message', 'name' => $sLibraryName]);
@@ -206,7 +206,7 @@ 
      */
     public function setModalLibrary(string $sLibraryName)
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'modal', 'name' => $sLibraryName]);
@@ -246,7 +246,7 @@ 
     protected function registerLibraries()
     {
         $aLibraries = $this->xConfigManager->getOption('dialogs.lib.ext', []);
-        foreach($aLibraries as $sLibraryName => $sClassName)
+        foreach ($aLibraries as $sLibraryName => $sClassName)
         {
             $this->registerLibrary($sClassName, $sLibraryName);
         }
@@ -261,19 +261,19 @@ 
     protected function setDefaultLibraries()
     {
         // Set the default modal library
-        if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.modal', '')))
+        if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.modal', '')))
         {
             $this->setModalLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
         }
         // Set the default message library
-        if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.message', '')))
+        if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.message', '')))
         {
             $this->setMessageLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
         }
         // Set the default question library
-        if(($sLibraryName = $this->xConfigManager->getOption('dialogs.default.question', '')))
+        if (($sLibraryName = $this->xConfigManager->getOption('dialogs.default.question', '')))
         {
             $this->setQuestionLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
@@ -289,9 +289,9 @@ 
     {
         // Set the other libraries in use
         $aLibraries = $this->xConfigManager->getOption('dialogs.lib.use', []);
-        foreach($aLibraries as $sLibraryName)
+        foreach ($aLibraries as $sLibraryName)
         {
-            if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
+            if (isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
             {
                 $this->aLibraries[$sLibraryName]['used'] = true;
             }
@@ -320,7 +320,7 @@ 
      */
     public function onChange(Config $xConfig, string $sName)
     {
-        if($sName === '')
+        if ($sName === '')
         {
             // Reset the default libraries any time the config is changed.
             $this->registerLibraries();
@@ -329,7 +329,7 @@ 
             return;
         }
         $sPrefix = substr($sName, 0, 15);
-        switch($sPrefix)
+        switch ($sPrefix)
         {
         case 'dialogs.default':
             $this->setDefaultLibraries();

Braces +3 added lines, -1 removed lines

@@ -291,10 +291,12 @@
         $aLibraries = $this->xConfigManager->getOption('dialogs.lib.use', []);
         foreach($aLibraries as $sLibraryName)
         {
-            if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
+            if(isset($this->aLibraries[$sLibraryName])) {
+                // Make sure the library exists
             {
                 $this->aLibraries[$sLibraryName]['used'] = true;
             }
+            }
         }
     }
 

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/App/Dialog/Library/DialogLibraryHelper.php

Spacing +8 added lines, -8 removed lines

@@ -136,18 +136,18 @@ 
         $aOptions = $this->getOptionNames($sKeyPrefix);
         $sSpaces = str_repeat(' ', $nSpaces);
         $sScript = '';
-        foreach($aOptions as $sShortName => $sFullName)
+        foreach ($aOptions as $sShortName => $sFullName)
         {
             $value = $this->xConfigManager->getOption($sFullName);
-            if(is_string($value))
+            if (is_string($value))
             {
                 $value = "'$value'";
             }
-            elseif(is_bool($value))
+            elseif (is_bool($value))
             {
                 $value = ($value ? 'true' : 'false');
             }
-            elseif(!is_numeric($value))
+            elseif (!is_numeric($value))
             {
                 $value = json_encode($value);
             }
@@ -175,10 +175,10 @@ 
      */
     public function getJsCode(string $sFile): string
     {
-        if($this->hasOption('assets.js'))
+        if ($this->hasOption('assets.js'))
         {
             // If this expression evaluates to false, then the asset is not displayed.
-            if(!($sUri = $this->getOption('assets.js')))
+            if (!($sUri = $this->getOption('assets.js')))
             {
                 return '';
             }
@@ -200,10 +200,10 @@ 
      */
     public function getCssCode(string $sFile): string
     {
-        if($this->hasOption('assets.css'))
+        if ($this->hasOption('assets.css'))
         {
             // If this expression evaluates to false, then the asset is not displayed.
-            if(!($sUri = $this->getOption('assets.css')))
+            if (!($sUri = $this->getOption('assets.css')))
             {
                 return '';
             }

Braces +4 added lines, -8 removed lines

@@ -142,12 +142,10 @@ 
             if(is_string($value))
             {
                 $value = "'$value'";
-            }
-            elseif(is_bool($value))
+            } elseif(is_bool($value))
             {
                 $value = ($value ? 'true' : 'false');
-            }
-            elseif(!is_numeric($value))
+            } elseif(!is_numeric($value))
             {
                 $value = json_encode($value);
             }
@@ -182,8 +180,7 @@ 
             {
                 return '';
             }
-        }
-        else
+        } else
         {
             $sUri = $this->sUri . '/' . ($this->sSubDir ? $this->sSubDir . '/' : '') .
                 ($this->sVersion ? $this->sVersion . '/' : '') . $sFile;
@@ -207,8 +204,7 @@ 
             {
                 return '';
             }
-        }
-        else
+        } else
         {
             $sUri = $this->sUri . '/' . ($this->sSubDir ? $this->sSubDir . '/' : '') .
                 ($this->sVersion ? $this->sVersion . '/' : '') . $sFile;