jaxon-php / jaxon-core

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

Spacing +15 added lines, -15 removed lines

@@ -85,28 +85,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);
         }
     }
 
@@ -121,14 +121,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);
@@ -171,12 +171,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]);
@@ -197,7 +197,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);
@@ -241,7 +241,7 @@ 
 
         // Register packages
         $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $sClassName => $aPkgOptions)
+        foreach ($aPackageConfig as $sClassName => $aPkgOptions)
         {
             $this->registerPackage($sClassName, $aPkgOptions);
         }

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]);

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]);

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/Plugin/Request/CallableClass/CallableClassPlugin.php

Spacing +12 added lines, -12 removed lines

@@ -133,15 +133,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'));
         }
@@ -186,16 +186,16 @@ 
         $sCode = '';
         $aJsClasses = [];
         $aNamespaces = $this->xRepository->getNamespaces();
-        foreach($aNamespaces as $sNamespace)
+        foreach ($aNamespaces as $sNamespace)
         {
             $offset = 0;
             $sJsNamespace = str_replace('\\', '.', $sNamespace);
             $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
             {
                 $sJsClass = substr($sJsNamespace, 0, $dotPosition);
                 // Generate code for this object
-                if(!isset($aJsClasses[$sJsClass]))
+                if (!isset($aJsClasses[$sJsClass]))
                 {
                     $sCode .= $this->sPrefix . "$sJsClass = {};\n";
                     $aJsClasses[$sJsClass] = $sJsClass;
@@ -216,7 +216,7 @@ 
      */
     private function getCallableScript(string $sClassName, CallableObject $xCallableObject): string
     {
-        if($xCallableObject->excluded())
+        if ($xCallableObject->excluded())
         {
             return '';
         }
@@ -244,7 +244,7 @@ 
         });
 
         $sCode = $this->getNamespacesScript();
-        foreach($aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($aCallableObjects as $sClassName => $xCallableObject)
         {
             $sCode .= $this->getCallableScript($sClassName, $xCallableObject);
         }
@@ -257,7 +257,7 @@ 
     public static function canProcessRequest(ServerRequestInterface $xRequest): bool
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             return isset($aBody['jxncls']) && isset($aBody['jxnmthd']);
         }
@@ -271,7 +271,7 @@ 
     public function setTarget(ServerRequestInterface $xRequest)
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             $this->xTarget = Target::makeClass(trim($aBody['jxncls']), trim($aBody['jxnmthd']));
             return;
@@ -290,7 +290,7 @@ 
         $sMethodName = $this->xTarget->getMethodName();
         $this->xTarget->setMethodArgs($this->xParameterReader->args());
 
-        if(!$this->xValidator->validateClass($sClassName) || !$this->xValidator->validateMethod($sMethodName))
+        if (!$this->xValidator->validateClass($sClassName) || !$this->xValidator->validateMethod($sMethodName))
         {
             // Unable to find the requested object or method
             throw new RequestException($this->xTranslator->trans('errors.objects.invalid',
@@ -303,7 +303,7 @@ 
             $xCallableObject = $this->xRegistry->getCallableObject($sClassName);
             return $xCallableObject->call($this->xTarget);
         }
-        catch(ReflectionException|SetupException $e)
+        catch (ReflectionException | SetupException $e)
         {
             // Unable to find the requested class or method
             $this->di->getLogger()->error($e->getMessage());

Braces +2 added lines, -4 removed lines

@@ -140,8 +140,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'));
         }
@@ -302,8 +301,7 @@ 
         {
             $xCallableObject = $this->xRegistry->getCallableObject($sClassName);
             return $xCallableObject->call($this->xTarget);
-        }
-        catch(ReflectionException|SetupException $e)
+        } catch(ReflectionException|SetupException $e)
         {
             // Unable to find the requested class or method
             $this->di->getLogger()->error($e->getMessage());

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'], '/') . '/';