jaxon-php / jaxon-core

src/Script/Call/Func.php

Spacing +3 added lines, -3 removed lines

@@ -62,9 +62,9 @@ 
      */
     private function hasPageNumber():  bool
     {
-        foreach($this->aArguments as $xArgument)
+        foreach ($this->aArguments as $xArgument)
         {
-            if($xArgument->getType() === Parameter::PAGE_NUMBER)
+            if ($xArgument->getType() === Parameter::PAGE_NUMBER)
             {
                 return true;
             }
@@ -79,7 +79,7 @@ 
      */
     public function withPage(): self
     {
-        if(!$this->hasPageNumber())
+        if (!$this->hasPageNumber())
         {
             $this->aArguments[] = new Parameter(Parameter::PAGE_NUMBER, 0);
         }

src/Script/Call/Parameter.php

Switch Indentation +22 added lines, -22 removed lines

@@ -161,28 +161,28 @@
     {
         switch($this->getType())
         {
-        case self::JS_VALUE:
-            return [
-                '_type' => 'expr',
-                'calls' => [['_type' => 'attr', '_name' => $this->getValue()]],
-            ];
-        case self::FORM_VALUES:
-            return ['_type' => 'form', '_name' => $this->getValue()];
-        case self::INPUT_VALUE:
-            return ['_type' => 'input', '_name' => $this->getValue()];
-        case self::CHECKED_VALUE:
-            return ['_type' => 'checked', '_name' => $this->getValue()];
-        case self::ELEMENT_INNERHTML:
-            return ['_type' => 'html', '_name' => $this->getValue()];
-        case self::PAGE_NUMBER:
-            return ['_type' => 'page', '_name' => ''];
-        case self::QUOTED_VALUE:
-        case self::BOOL_VALUE:
-        case self::NUMERIC_VALUE:
-        case self::JSON_VALUE:
-        default:
-            // Return the value as is.
-            return $this->getValue();
+            case self::JS_VALUE:
+                return [
+                    '_type' => 'expr',
+                    'calls' => [['_type' => 'attr', '_name' => $this->getValue()]],
+                ];
+            case self::FORM_VALUES:
+                return ['_type' => 'form', '_name' => $this->getValue()];
+            case self::INPUT_VALUE:
+                return ['_type' => 'input', '_name' => $this->getValue()];
+            case self::CHECKED_VALUE:
+                return ['_type' => 'checked', '_name' => $this->getValue()];
+            case self::ELEMENT_INNERHTML:
+                return ['_type' => 'html', '_name' => $this->getValue()];
+            case self::PAGE_NUMBER:
+                return ['_type' => 'page', '_name' => ''];
+            case self::QUOTED_VALUE:
+            case self::BOOL_VALUE:
+            case self::NUMERIC_VALUE:
+            case self::JSON_VALUE:
+            default:
+                // Return the value as is.
+                return $this->getValue();
         }
     }
 

Spacing +9 added lines, -9 removed lines

@@ -130,19 +130,19 @@ 
      */
     public static function make($xValue): ParameterInterface
     {
-        if($xValue instanceof ParameterInterface)
+        if ($xValue instanceof ParameterInterface)
         {
             return $xValue;
         }
-        if(is_numeric($xValue))
+        if (is_numeric($xValue))
         {
             return new Parameter(self::NUMERIC_VALUE, $xValue);
         }
-        if(is_string($xValue))
+        if (is_string($xValue))
         {
             return new Parameter(self::QUOTED_VALUE, $xValue);
         }
-        if(is_bool($xValue))
+        if (is_bool($xValue))
         {
             return new Parameter(self::BOOL_VALUE, $xValue);
         }
@@ -159,7 +159,7 @@ 
      */
     public function jsonSerialize(): mixed
     {
-        switch($this->getType())
+        switch ($this->getType())
         {
         case self::JS_VALUE:
             return [
@@ -278,7 +278,7 @@ 
      */
     protected function getNumericValueScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -288,7 +288,7 @@ 
      */
     protected function getUnquotedValueScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -310,7 +310,7 @@ 
      */
     protected function getPageNumberScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -321,7 +321,7 @@ 
     public function getScript(): string
     {
         $sMethodName = 'get' . $this->sType . 'Script';
-        if(!method_exists($this, $sMethodName))
+        if (!method_exists($this, $sMethodName))
         {
             return '';
         }

src/Request/Handler/CallbackManager.php

Spacing +9 added lines, -9 removed lines

@@ -98,7 +98,7 @@ 
      */
     public function popBootCallbacks(): array
     {
-        if(empty($this->aBootCallbacks))
+        if (empty($this->aBootCallbacks))
         {
             return [];
         }
@@ -117,9 +117,9 @@ 
     private function getExceptionCallbacks(Exception $xException): array
     {
         $aExceptionCallbacks = [];
-        foreach($this->aExceptionCallbacks as $sExClass => $aCallbacks)
+        foreach ($this->aExceptionCallbacks as $sExClass => $aCallbacks)
         {
-            if(is_a($xException, $sExClass))
+            if (is_a($xException, $sExClass))
             {
                 $aExceptionCallbacks = array_merge($aExceptionCallbacks, $aCallbacks);
             }
@@ -189,13 +189,13 @@ 
      */
     public function error(callable $xCallable, string $sExClass = ''): CallbackManager
     {
-        if($sExClass === '' || $sExClass === Exception::class)
+        if ($sExClass === '' || $sExClass === Exception::class)
         {
             $this->aErrorCallbacks[] = $xCallable;
             return $this;
         }
         // Callback for a given exception class
-        if(isset($this->aExceptionCallbacks[$sExClass]))
+        if (isset($this->aExceptionCallbacks[$sExClass]))
         {
             $this->aExceptionCallbacks[$sExClass][] = $xCallable;
             return $this;
@@ -236,7 +236,7 @@ 
      */
     private function executeCallbacks(array $aCallbacks, array $aParameters)
     {
-        foreach($aCallbacks as $xCallback)
+        foreach ($aCallbacks as $xCallback)
         {
             $this->executeCallback($xCallback, $aParameters);
         }
@@ -266,10 +266,10 @@ 
     public function onBefore(Target $xTarget, bool &$bEndRequest)
     {
         // Call the user defined callback
-        foreach($this->aBeforeCallbacks as $xCallback)
+        foreach ($this->aBeforeCallbacks as $xCallback)
         {
             $this->executeCallback($xCallback, [$xTarget, &$bEndRequest]);
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -316,7 +316,7 @@ 
     {
         $aExceptionCallbacks = $this->getExceptionCallbacks($xException);
         $this->executeCallbacks($aExceptionCallbacks, [$xException]);
-        if(count($aExceptionCallbacks) > 0)
+        if (count($aExceptionCallbacks) > 0)
         {
             // Do not throw the exception if a custom handler is defined
             return;

src/Di/Traits/PluginTrait.php

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
     public function registerPackage(string $sClassName, Config $xPkgConfig)
     {
         // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
+        if (!$this->h($sClassName))
         {
             $this->set($sClassName, function() use($sClassName) {
                 return $this->make($sClassName);

src/Di/ClassContainer.php

Indentation +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
      */
     public function set(string $sClass, Closure $xClosure)
     {
-       $this->xContainer->offsetSet($sClass, function() use($xClosure) {
+        $this->xContainer->offsetSet($sClass, function() use($xClosure) {
             return $xClosure($this);
         });
     }
@@ -133,7 +133,7 @@ 
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xContainer->offsetSet($sKey, $xValue);
+        $this->xContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Spacing +18 added lines, -18 removed lines

@@ -155,14 +155,14 @@ 
             isset($aOptions['include']) && require_once($aOptions['include']);
             $xReflectionClass = new ReflectionClass($sClassName);
             // Check if the class is registrable
-            if($xReflectionClass->isInstantiable() &&
+            if ($xReflectionClass->isInstantiable() &&
                 !$xReflectionClass->isSubclassOf(Pagination::class))
             {
                 $this->aClasses[$sClassName] = $aOptions;
                 $this->val($this->getReflectionClassKey($sClassName), $xReflectionClass);
             }
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             throw new SetupException($this->xTranslator->trans('errors.class.invalid',
                 ['name' => $sClassName]));
@@ -179,20 +179,20 @@ 
      */
     private function registerClassOptions(string $sClassName)
     {
-        if(!isset($this->aClasses[$sClassName]))
+        if (!isset($this->aClasses[$sClassName]))
         {
             // Find options for a class registered with namespace.
             /** @var CallableRegistry */
             $xRegistry = $this->di->g(CallableRegistry::class);
             $xRegistry->registerClassFromNamespace($sClassName);
-            if(!isset($this->aClasses[$sClassName]))
+            if (!isset($this->aClasses[$sClassName]))
             {
                 // Find options for a class registered without namespace.
                 // We need to parse all the classes to be able to find one.
                 $xRegistry->parseDirectories();
             }
         }
-        if(!isset($this->aClasses[$sClassName]))
+        if (!isset($this->aClasses[$sClassName]))
         {
             throw new SetupException($this->xTranslator->trans('errors.class.invalid',
                 ['name' => $sClassName]));
@@ -208,7 +208,7 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aClasses as $sClassName => $_)
+        foreach ($this->aClasses as $sClassName => $_)
         {
             $this->registerCallableClass($sClassName);
             $aCallableObjects[$sClassName] = $this->getCallableObject($sClassName);
@@ -227,15 +227,15 @@ 
     {
         $xType = $xParameter->getType();
         // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
+        if ($xType instanceof ReflectionNamedType)
         {
             // Check the class + the name
-            if($this->di->has($xType->getName() . ' $' . $xParameter->getName()))
+            if ($this->di->has($xType->getName() . ' $' . $xParameter->getName()))
             {
                 return $this->di->get($xType->getName() . ' $' . $xParameter->getName());
             }
             // Check the class only
-            if($this->di->has($xType->getName()))
+            if ($this->di->has($xType->getName()))
             {
                 return $this->di->get($xType->getName());
             }
@@ -255,16 +255,16 @@ 
      */
     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();
         }
@@ -331,7 +331,7 @@ 
     {
         $sCallableObject = $this->getCallableObjectKey($sClassName);
         // Prevent duplication. It's important not to use the class name here.
-        if($this->has($sCallableObject))
+        if ($this->has($sCallableObject))
         {
             return;
         }
@@ -358,7 +358,7 @@ 
         });
 
         // Register the user class, but only if the user didn't already.
-        if(!$this->has($sClassName))
+        if (!$this->has($sClassName))
         {
             $this->set($sClassName, function() use($sClassName) {
                 return $this->make($this->get($this->getReflectionClassKey($sClassName)));
@@ -366,7 +366,7 @@ 
         }
         // Initialize the user class instance
         $this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
-            if($xClassInstance instanceof AbstractCallable)
+            if ($xClassInstance instanceof AbstractCallable)
             {
                 $xClassInstance->_initCallable($this->di, $this->get($this->getCallableHelperKey($sClassName)));
             }
@@ -410,7 +410,7 @@ 
         // Replace all separators ('.' and '_') with antislashes, and remove the antislashes
         // at the beginning and the end of the class name.
         $sClassName = trim(str_replace('.', '\\', $sClassName), '\\');
-        if($this->bUsingUnderscore)
+        if ($this->bUsingUnderscore)
         {
             $sClassName = trim(str_replace('_', '\\', $sClassName), '\\');
         }
@@ -477,7 +477,7 @@ 
     private function registerRequestFactory(string $sClassName, string $sFactoryKey)
     {
         $this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
-            if(!($xCallable = $this->makeCallableObject($sClassName)))
+            if (!($xCallable = $this->makeCallableObject($sClassName)))
             {
                 return null;
             }
@@ -498,7 +498,7 @@ 
     {
         $sClassName = trim($sClassName, " \t") ?: JxnCall::class;
         $sFactoryKey = $this->getRequestFactoryKey($sClassName);
-        if(!$this->has($sFactoryKey))
+        if (!$this->has($sFactoryKey))
         {
             $this->registerRequestFactory($sClassName, $sFactoryKey);
         }

Braces +1 added lines, -2 removed lines

@@ -161,8 +161,7 @@
                 $this->aClasses[$sClassName] = $aOptions;
                 $this->val($this->getReflectionClassKey($sClassName), $xReflectionClass);
             }
-        }
-        catch(ReflectionException $e)
+        } catch(ReflectionException $e)
         {
             throw new SetupException($this->xTranslator->trans('errors.class.invalid',
                 ['name' => $sClassName]));

src/App/Ajax/Bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -117,11 +117,11 @@ 
         // Jaxon library settings
         $this->xConfigManager->setOption('js.app.export', $bExport);
         $this->xConfigManager->setOption('js.app.minify', $bMinify);
-        if($sUri !== '')
+        if ($sUri !== '')
         {
             $this->xConfigManager->setOption('js.app.uri', $sUri);
         }
-        if($sDir !== '')
+        if ($sDir !== '')
         {
             $this->xConfigManager->setOption('js.app.dir', $sDir);
         }
@@ -173,7 +173,7 @@ 
     {
         // Only call the callbacks that aren't called yet.
         $aBootCallbacks = $this->xCallbackManager->popBootCallbacks();
-        foreach($aBootCallbacks as $aBootCallback)
+        foreach ($aBootCallbacks as $aBootCallback)
         {
             call_user_func($aBootCallback);
         }

src/App/Ajax/App.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function setup(string $sConfigFile = '')
     {
-        if(!file_exists($sConfigFile))
+        if (!file_exists($sConfigFile))
         {
             $sMessage = $this->xTranslator->trans('errors.file.access', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
@@ -42,13 +42,13 @@ 
         $aOptions = $this->xConfigManager->read($sConfigFile);
         $aLibOptions = $aOptions['lib'] ?? [];
         $aAppOptions = $aOptions['app'] ?? [];
-        if(!is_array($aLibOptions) || !is_array($aAppOptions))
+        if (!is_array($aLibOptions) || !is_array($aAppOptions))
         {
             $sMessage = $this->xTranslator->trans('errors.file.content', ['path' => $sConfigFile]);
             throw new SetupException($sMessage);
         }
         // The bootstrap set this to false. It needs to be changed.
-        if(!isset($aLibOptions['core']['response']['send']))
+        if (!isset($aLibOptions['core']['response']['send']))
         {
             $aLibOptions['core']['response']['send'] = true;
         }

src/App/Ajax/Lib.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
      */
     public static function getInstance(): Lib
     {
-        if(self::$xInstance === null)
+        if (self::$xInstance === null)
         {
             // First call: create and initialize the instances.
             self::$xInstance = new Lib();
@@ -126,7 +126,7 @@ 
      */
     public function config(string $sConfigFile = '', string $sConfigSection = ''): ConfigManager
     {
-        if(!empty(($sConfigFile = trim($sConfigFile))))
+        if (!empty(($sConfigFile = trim($sConfigFile))))
         {
             $this->xConfigManager->load($sConfigFile, trim($sConfigSection));
         }

src/App/Config/ConfigManager.php

Spacing +8 added lines, -8 removed lines

@@ -80,22 +80,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);
@@ -120,7 +120,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->onChange($this->xLibConfig, '');
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);
@@ -141,7 +141,7 @@ 
     {
         try
         {
-            if(!$this->xLibConfig->setOptions($aOptions, $sKeys))
+            if (!$this->xLibConfig->setOptions($aOptions, $sKeys))
             {
                 return false;
             }
@@ -149,7 +149,7 @@ 
             $this->xEventManager->onChange($this->xLibConfig, '');
             return true;
         }
-        catch(DataDepth $e)
+        catch (DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);
@@ -261,7 +261,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

@@ -79,23 +79,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);
@@ -119,8 +115,7 @@ 
             $this->xLibConfig->setOptions($this->read($sConfigFile), $sConfigSection);
             // Call the config change listeners.
             $this->xEventManager->onChange($this->xLibConfig, '');
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);
@@ -148,8 +143,7 @@ 
             // Call the config change listeners.
             $this->xEventManager->onChange($this->xLibConfig, '');
             return true;
-        }
-        catch(DataDepth $e)
+        } catch(DataDepth $e)
         {
             $sMessage = $this->xTranslator->trans('errors.data.depth',
                 ['key' => $e->sPrefix, 'depth' => $e->nDepth]);
@@ -260,8 +254,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]);