jaxon-php / jaxon-core

src/App/Config/ConfigEventManager.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function onChanges(Config $xConfig)
     {
-        foreach($this->aListeners as $sListener)
+        foreach ($this->aListeners as $sListener)
         {
             $this->di->g($sListener)->onChanges($xConfig);
         }
@@ -67,7 +67,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->onChanges($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->onChanges($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->onChanges($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->onChanges($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

@@ -35,7 +35,7 @@
     public function onChange(Config $xConfig, string $sName)
     {
         // Set the library language any time the config is changed.
-        if($sName === 'core.language')
+        if ($sName === 'core.language')
         {
             $this->setLocale($xConfig->getOption('core.language'));
         }

src/Di/Container.php

Spacing +7 added lines, -7 removed lines

@@ -141,7 +141,7 @@ 
      */
     public function has(string $sClass): bool
     {
-        if($this->xContainer != null && $this->xContainer->has($sClass))
+        if ($this->xContainer != null && $this->xContainer->has($sClass))
         {
             return true;
         }
@@ -172,13 +172,13 @@ 
     {
         try
         {
-            if($this->xContainer != null && $this->xContainer->has($sClass))
+            if ($this->xContainer != null && $this->xContainer->has($sClass))
             {
                 return $this->xContainer->get($sClass);
             }
             return $this->offsetGet($sClass);
         }
-        catch(Exception|Throwable $e)
+        catch (Exception | Throwable $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.container', ['name' => $sClass]);
@@ -238,22 +238,22 @@ 
      */
     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();
         }
         $parameters = $constructor->getParameters();
         $parameterInstances = [];
-        foreach($parameters as $parameter)
+        foreach ($parameters as $parameter)
         {
             // Get the parameter instance from the DI
             $parameterInstances[] = $this->get($parameter->getClass()->getName());

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
                 return $this->xContainer->get($sClass);
             }
             return $this->offsetGet($sClass);
-        }
-        catch(Exception|Throwable $e)
+        } catch(Exception|Throwable $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.container', ['name' => $sClass]);

src/Di/Traits/RegisterTrait.php

Spacing +11 added lines, -11 removed lines

@@ -36,15 +36,15 @@ 
     private function getCallableObjectOptions(array $aConfigOptions, array $aAnnotationOptions): array
     {
         $aOptions = [];
-        foreach($aConfigOptions as $sNames => $aFunctionOptions)
+        foreach ($aConfigOptions as $sNames => $aFunctionOptions)
         {
             $aFunctionNames = explode(',', $sNames); // Names are in comma-separated list.
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $aOptions[$sFunctionName] = array_merge($aOptions[$sFunctionName] ?? [], $aFunctionOptions);
             }
         }
-        foreach($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
+        foreach ($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
         {
             $aOptions[$sFunctionName] = array_merge($aOptions[$sFunctionName] ?? [], $aFunctionOptions);
         }
@@ -65,7 +65,7 @@ 
         $xAnnotationReader = $this->g(AnnotationReaderInterface::class);
         [$bExcluded, $aAnnotationOptions, $aAnnotationProtected] =
             $xAnnotationReader->getAttributes($sClassName, $xCallableObject->getPublicMethods($aProtectedMethods));
-        if($bExcluded)
+        if ($bExcluded)
         {
             $xCallableObject->configure('excluded', true);
             return;
@@ -77,11 +77,11 @@ 
         // Functions options
         $aCallableOptions = [];
         $aOptions = $this->getCallableObjectOptions($aOptions['functions'], $aAnnotationOptions);
-        foreach($aOptions as $sFunctionName => $aFunctionOptions)
+        foreach ($aOptions as $sFunctionName => $aFunctionOptions)
         {
-            foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+            foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
             {
-                if(substr($sOptionName, 0, 2) !== '__')
+                if (substr($sOptionName, 0, 2) !== '__')
                 {
                     // Options for javascript code.
                     $aCallableOptions[$sFunctionName][$sOptionName] = $xOptionValue;
@@ -110,7 +110,7 @@ 
         $sReflectionClass = $sClassName . '_ReflectionClass';
 
         // Make sure the registered class exists
-        if(isset($aOptions['include']))
+        if (isset($aOptions['include']))
         {
             require_once($aOptions['include']);
         }
@@ -119,7 +119,7 @@ 
         {
             $this->val($sReflectionClass, new ReflectionClass($sClassName));
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.invalid', ['name' => $sClassName]);
@@ -145,7 +145,7 @@ 
         $this->set($sClassName, function($c) use($sClassName, $sReflectionClass) {
             $xRegisteredObject = $this->make($c->g($sReflectionClass));
             // Initialize the object
-            if($xRegisteredObject instanceof CallableClass)
+            if ($xRegisteredObject instanceof CallableClass)
             {
                 // Set the protected attributes of the object
                 $cSetter = function($c, $sClassName) {
@@ -158,7 +158,7 @@ 
 
             // Run the callback for class initialisation
             $aCallbacks = $c->g(CallbackManager::class)->getInitCallbacks();
-            foreach($aCallbacks as $xCallback)
+            foreach ($aCallbacks as $xCallback)
             {
                 call_user_func($xCallback, $xRegisteredObject);
             }

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
         try
         {
             $this->val($sReflectionClass, new ReflectionClass($sClassName));
-        }
-        catch(ReflectionException $e)
+        } catch(ReflectionException $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.invalid', ['name' => $sClassName]);

src/Di/Traits/RequestTrait.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             {
                 public function random(int $nLength): string
                 {
-                    return bin2hex(random_bytes((int)($nLength / 2)));
+                    return bin2hex(random_bytes((int) ($nLength / 2)));
                 }
             };
         });

src/Di/Traits/AnnotationTrait.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
             };
         });
 
-        if(class_exists(AnnotationReader::class))
+        if (class_exists(AnnotationReader::class))
         {
             $sEventListenerKey = AnnotationReader::class . '\\ConfigListener';
             // The annotation package is installed, register the real annotation reader,
@@ -40,7 +40,7 @@ 
                 {
                     public function onChanges(Config $xConfig)
                     {
-                        if($xConfig->getOption('core.annotations.on'))
+                        if ($xConfig->getOption('core.annotations.on'))
                         {
                             AnnotationReader::register(jaxon()->di());
                         }
@@ -48,7 +48,7 @@ 
 
                     public function onChange(Config $xConfig, string $sName)
                     {
-                        if($sName === 'core.annotations.on' && $xConfig->getOption('core.annotations.on'))
+                        if ($sName === 'core.annotations.on' && $xConfig->getOption('core.annotations.on'))
                         {
                             AnnotationReader::register(jaxon()->di());
                         }

src/Request/Call/JsCall.php

Spacing +2 added lines, -2 removed lines

@@ -105,9 +105,9 @@
      */
     public function addParameters(array $aParameters): JsCall
     {
-        foreach($aParameters as $xParameter)
+        foreach ($aParameters as $xParameter)
         {
-            if($xParameter instanceof JsCall)
+            if ($xParameter instanceof JsCall)
             {
                 $this->addParameter(Parameter::JS_VALUE, 'function(){' . $xParameter->getScript() . ';}');
             }

Braces +1 added lines, -2 removed lines

@@ -159,8 +159,7 @@
             if($xParameter instanceof JsCall)
             {
                 $this->addParameter(Parameter::JS_VALUE, 'function(){' . $xParameter->getScript() . ';}');
-            }
-            else
+            } else
             {
                 $this->pushParameter(Parameter::make($xParameter));
             }

src/Request/Call/Call.php

Spacing +16 added lines, -17 removed lines

@@ -79,10 +79,10 @@ 
      */
     private function _makeUniqueJsVar(ParameterInterface $xParameter): ParameterInterface
     {
-        if($xParameter instanceof DomSelector)
+        if ($xParameter instanceof DomSelector)
         {
             $sParameterStr = $xParameter->getScript();
-            if(!isset($this->aVariables[$sParameterStr]))
+            if (!isset($this->aVariables[$sParameterStr]))
             {
                 // The value is not yet defined. A new variable is created.
                 $sVarName = 'jxnVar' . $this->nVarId;
@@ -109,18 +109,18 @@ 
      */
     private function makePhrase(array $aArgs): string
     {
-        if(empty($aArgs))
+        if (empty($aArgs))
         {
             return '';
         }
         // The first array entry is the message.
         $sPhrase = array_shift($aArgs);
-        if(empty($aArgs))
+        if (empty($aArgs))
         {
             return $sPhrase;
         }
         $nParamId = 1;
-        foreach($aArgs as &$xParameter)
+        foreach ($aArgs as &$xParameter)
         {
             $xParameter = $this->_makeUniqueJsVar($xParameter);
             $xParameter = "'$nParamId':" . $xParameter->getScript();
@@ -137,7 +137,7 @@ 
      */
     private function makeMessage(): string
     {
-        if(!($sPhrase = $this->makePhrase($this->aMessageArgs)))
+        if (!($sPhrase = $this->makePhrase($this->aMessageArgs)))
         {
             return '';
         }
@@ -166,23 +166,22 @@ 
         // This array will avoid declaring multiple variables with the same value.
         // The array key is the variable value, while the array value is the variable name.
         $this->aVariables = []; // Array of local variables.
-        foreach($this->aParameters as &$xParameter)
+        foreach ($this->aParameters as &$xParameter)
         {
             $xParameter = $this->_makeUniqueJsVar($xParameter);
         }
 
         $sMessageScript = $this->makeMessage();
         $sScript = parent::getScript();
-        if($this->sCondition === '__confirm__')
+        if ($this->sCondition === '__confirm__')
         {
             $sConfirmPhrase = $this->makePhrase($this->aConfirmArgs);
             $sScript = $this->xDialogLibraryManager->getQuestionLibrary()
                 ->confirm($sConfirmPhrase, $sScript, $sMessageScript);
         }
-        elseif($this->sCondition !== '')
+        elseif ($this->sCondition !== '')
         {
-            $sScript = empty($sMessageScript) ? 'if(' . $this->sCondition . '){' . $sScript . ';}' :
-                'if(' . $this->sCondition . '){' . $sScript . ';}else{' . $sMessageScript . ';}';
+            $sScript = empty($sMessageScript) ? 'if(' . $this->sCondition . '){' . $sScript . ';}' : 'if(' . $this->sCondition . '){' . $sScript . ';}else{' . $sMessageScript . ';}';
         }
         return $this->sVars . $sScript;
     }
@@ -194,9 +193,9 @@ 
      */
     public function hasPageNumber(): bool
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() === Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() === Parameter::PAGE_NUMBER)
             {
                 return true;
             }
@@ -214,9 +213,9 @@ 
     public function setPageNumber(int $nPageNumber): Call
     {
         // Set the value of the Parameter::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() === Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() === Parameter::PAGE_NUMBER)
             {
                 $xParameter->setValue($nPageNumber);
                 break;
@@ -237,7 +236,7 @@ 
     public function pages(int $nCurrentPage, int $nItemsPerPage, int $nItemsTotal): array
     {
         // Append the page number to the parameter list, if not yet given.
-        if(!$this->hasPageNumber())
+        if (!$this->hasPageNumber())
         {
             $this->addParameter(Parameter::PAGE_NUMBER, 0);
         }
@@ -256,7 +255,7 @@ 
     public function paginate(int $nCurrentPage, int $nItemsPerPage, int $nItemsTotal): Paginator
     {
         // Append the page number to the parameter list, if not yet given.
-        if(!$this->hasPageNumber())
+        if (!$this->hasPageNumber())
         {
             $this->addParameter(Parameter::PAGE_NUMBER, 0);
         }

Braces +2 added lines, -4 removed lines

@@ -89,8 +89,7 @@ 
                 $this->aVariables[$sParameterStr] = $sVarName;
                 $this->sVars .= "$sVarName=$xParameter;";
                 $this->nVarId++;
-            }
-            else
+            } else
             {
                 // The value is already defined. The corresponding variable is assigned.
                 $sVarName = $this->aVariables[$sParameterStr];
@@ -178,8 +177,7 @@ 
             $sConfirmPhrase = $this->makePhrase($this->aConfirmArgs);
             $sScript = $this->xDialogLibraryManager->getQuestionLibrary()
                 ->confirm($sConfirmPhrase, $sScript, $sMessageScript);
-        }
-        elseif($this->sCondition !== '')
+        } elseif($this->sCondition !== '')
         {
             $sScript = empty($sMessageScript) ? 'if(' . $this->sCondition . '){' . $sScript . ';}' :
                 'if(' . $this->sCondition . '){' . $sScript . ';}else{' . $sMessageScript . ';}';