jaxon-php / jaxon-core

src/Plugin/Response/JQuery/DomSelector.php

Braces +2 added lines, -4 removed lines

@@ -63,12 +63,10 @@
         if(!$sPath)
         {
             $this->sPath = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
-        }
-        elseif(($sContext))
+        } elseif(($sContext))
         {
             $this->sPath = "$jQueryNs('" . $sPath . "', $jQueryNs('" . $sContext . "'))";
-        }
-        else
+        } else
         {
             $this->sPath = "$jQueryNs('" . $sPath . "')";
         }

Spacing +3 added lines, -3 removed lines

@@ -67,11 +67,11 @@ 
         $sContext = trim($sContext, " \t");
         $this->aCalls = [];
 
-        if(!$sPath)
+        if (!$sPath)
         {
             $this->sPath = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
         }
-        elseif(($sContext))
+        elseif (($sContext))
         {
             $this->sPath = "$jQueryNs('" . $sPath . "', $jQueryNs('" . $sContext . "'))";
         }
@@ -145,7 +145,7 @@ 
     public function getScript(): string
     {
         $sScript = $this->sPath;
-        if(count($this->aCalls) > 0)
+        if (count($this->aCalls) > 0)
         {
             $sScript .= '.' . implode('.', $this->aCalls);
         }

src/Plugin/Response/JQuery/JQueryPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     public function selector(string $sPath = '', string $sContext = ''): DomSelector
     {
         $xSelector = new DomSelector($this->jQueryNs, $sPath, $sContext);
-        if($this->bCommand && $this->response() !== null)
+        if ($this->bCommand && $this->response() !== null)
         {
             $this->addCommand(['cmd' => 'jquery'], $xSelector);
         }

src/Plugin/Manager/PluginManager.php

Spacing +10 added lines, -10 removed lines

@@ -104,7 +104,7 @@ 
      */
     public function addCodeGenerator(string $sClassName, int $nPriority)
     {
-        while(isset($this->aCodeGenerators[$nPriority]))
+        while (isset($this->aCodeGenerators[$nPriority]))
         {
             $nPriority++;
         }
@@ -152,28 +152,28 @@ 
     {
         $bIsUsed = false;
         $aInterfaces = class_implements($sClassName);
-        if(in_array(CodeGeneratorInterface::class, $aInterfaces))
+        if (in_array(CodeGeneratorInterface::class, $aInterfaces))
         {
             $this->addCodeGenerator($sClassName, $nPriority);
             $bIsUsed = true;
         }
-        if(in_array(CallableRegistryInterface::class, $aInterfaces))
+        if (in_array(CallableRegistryInterface::class, $aInterfaces))
         {
             $this->aRegistryPlugins[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
-        if(in_array(RequestHandlerInterface::class, $aInterfaces))
+        if (in_array(RequestHandlerInterface::class, $aInterfaces))
         {
             $this->aRequestHandlers[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
-        if(in_array(ResponsePluginInterface::class, $aInterfaces))
+        if (in_array(ResponsePluginInterface::class, $aInterfaces))
         {
             $this->aResponsePlugins[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
 
-        if(!$bIsUsed)
+        if (!$bIsUsed)
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -181,7 +181,7 @@ 
         }
 
         // Register the plugin in the DI container, if necessary
-        if(!$this->di->has($sClassName))
+        if (!$this->di->has($sClassName))
         {
             $this->di->auto($sClassName);
         }
@@ -197,12 +197,12 @@ 
      */
     public function getResponsePlugin(string $sName, ?Response $xResponse = null): ?ResponsePlugin
     {
-        if(!isset($this->aResponsePlugins[$sName]))
+        if (!isset($this->aResponsePlugins[$sName]))
         {
             return null;
         }
         $xPlugin = $this->di->g($this->aResponsePlugins[$sName]);
-        if(($xResponse))
+        if (($xResponse))
         {
             $xPlugin->setResponse($xResponse);
         }
@@ -223,7 +223,7 @@ 
      */
     public function registerCallable(string $sType, string $sCallable, $xOptions = [])
     {
-        if(isset($this->aRegistryPlugins[$sType]) &&
+        if (isset($this->aRegistryPlugins[$sType]) &&
             ($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
         {
             $xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));

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