jaxon-php / jaxon-core

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

src/App/Attribute/DI.php

Spacing +23 added lines, -25 removed lines

@@ -100,29 +100,29 @@ 
     public function validateArguments(array $aArguments)
     {
         $nArgCount = count($aArguments);
-        if($nArgCount > 2)
+        if ($nArgCount > 2)
         {
             throw new SetupException('The DI attribute requires cannot take more than two arguments.');
         }
-        if($this->xTarget === Attribute::TARGET_CLASS)
+        if ($this->xTarget === Attribute::TARGET_CLASS)
         {
-            if($nArgCount !== 2)
+            if ($nArgCount !== 2)
             {
                 throw new SetupException('When applied to a class, the DI attribute requires two arguments.');
             }
             return;
         }
-        if($this->xTarget === Attribute::TARGET_METHOD)
+        if ($this->xTarget === Attribute::TARGET_METHOD)
         {
-            if($nArgCount !== 1 && $nArgCount !== 2)
+            if ($nArgCount !== 1 && $nArgCount !== 2)
             {
                 throw new SetupException('When applied to a method, the DI attribute requires one or two arguments.');
             }
             return;
         }
-        if($this->xTarget === Attribute::TARGET_PROPERTY)
+        if ($this->xTarget === Attribute::TARGET_PROPERTY)
         {
-            if($nArgCount !== 0 && $nArgCount !== 1)
+            if ($nArgCount !== 0 && $nArgCount !== 1)
             {
                 throw new SetupException('When applied to a property, the DI attribute requires one or no argument.');
             }
@@ -150,50 +150,50 @@ 
      */
     protected function validateValues()
     {
-        if($this->xTarget === Attribute::TARGET_PROPERTY)
+        if ($this->xTarget === Attribute::TARGET_PROPERTY)
         {
             // if($this->sPropertyName !== '')
             // {
             //     throw new SetupException('The "property" argument must not be set on the DI attribute on a property.');
             // }
         }
-        elseif($this->xTarget === Attribute::TARGET_METHOD)
+        elseif ($this->xTarget === Attribute::TARGET_METHOD)
         {
             // For a method, if only one parameter is provided, then make it the attribute name.
-            if($this->sPropertyName === '' && $this->sPropertyType !== '')
+            if ($this->sPropertyName === '' && $this->sPropertyType !== '')
             {
                 $this->sPropertyName = $this->sPropertyType;
                 $this->sPropertyType = '';
             }
-            if($this->sPropertyName === '')
+            if ($this->sPropertyName === '')
             {
                 throw new SetupException('The "property" argument is mandatory on the DI attribute on a method.');
             }
         }
         else // if($this->xTarget === Attribute::TARGET_CLASS)
         {
-            if($this->sPropertyType === '')
+            if ($this->sPropertyType === '')
             {
                 throw new SetupException('The "type" argument is mandatory on the DI attribute on a class.');
             }
-            if($this->sPropertyName === '')
+            if ($this->sPropertyName === '')
             {
                 throw new SetupException('The "property" argument is mandatory on the DI attribute on a class.');
             }
         }
 
-        if(!$this->validateName())
+        if (!$this->validateName())
         {
             throw new SetupException($this->sPropertyName . ' is not a valid "property" value for the DI attribute.');
         }
         // An empty type is allowed on properties and methods...
-        if(($this->sPropertyType !== '' || $this->xTarget === Attribute::TARGET_CLASS) && !$this->validateType())
+        if (($this->sPropertyType !== '' || $this->xTarget === Attribute::TARGET_CLASS) && !$this->validateType())
         {
             throw new SetupException($this->sPropertyType . ' is not a valid "type" value for the DI attribute.');
         }
         // But in this case the type must be resolved from the property type.
         $this->sPropertyType = $this->getFullClassName();
-        if($this->sPropertyType === '')
+        if ($this->sPropertyType === '')
         {
             throw new SetupException('An empty "type" value is not allowed for the DI attribute.');
         }
@@ -204,29 +204,27 @@ 
      */
     private function getFullClassName(): string
     {
-        if($this->sPropertyType === '')
+        if ($this->sPropertyType === '')
         {
             // If no type is provided, take the attribute type.
             return $this->aPropertyTypes[$this->sPropertyName] ?? '';
         }
-        if($this->sPropertyType[0] === '\\')
+        if ($this->sPropertyType[0] === '\\')
         {
             return ltrim($this->sPropertyType, '\\');
         }
 
         // Try to resolve the full class name
         $nSeparatorPosition = strpos($this->sPropertyType, '\\');
-        $sClassprefix = $nSeparatorPosition === false ? $this->sPropertyType :
-            substr($this->sPropertyType, 0, $nSeparatorPosition);
-        if(isset($this->aImportedTypes[$sClassprefix]))
+        $sClassprefix = $nSeparatorPosition === false ? $this->sPropertyType : substr($this->sPropertyType, 0, $nSeparatorPosition);
+        if (isset($this->aImportedTypes[$sClassprefix]))
         {
             // The class namespace is imported.
-            return $nSeparatorPosition === false ? $this->aImportedTypes[$sClassprefix] :
-                $this->aImportedTypes[$sClassprefix] . substr($this->sPropertyType, $nSeparatorPosition);
+            return $nSeparatorPosition === false ? $this->aImportedTypes[$sClassprefix] : $this->aImportedTypes[$sClassprefix] . substr($this->sPropertyType, $nSeparatorPosition);
         }
 
         // The class is in the current namespace.
-        return $this->sNamespace . '\\'. $this->sPropertyType;
+        return $this->sNamespace . '\\' . $this->sPropertyType;
     }
 
     /**
@@ -235,7 +233,7 @@ 
      */
     protected function getValue()
     {
-        if(is_array($this->xPrevValue))
+        if (is_array($this->xPrevValue))
         {
             // Append the current value to the array
             $this->xPrevValue[$this->sPropertyName] = $this->sPropertyType;

Braces +2 added lines, -4 removed lines

@@ -156,8 +156,7 @@ 
             // {
             //     throw new SetupException('The "property" argument must not be set on the DI attribute on a property.');
             // }
-        }
-        elseif($this->xTarget === Attribute::TARGET_METHOD)
+        } elseif($this->xTarget === Attribute::TARGET_METHOD)
         {
             // For a method, if only one parameter is provided, then make it the attribute name.
             if($this->sPropertyName === '' && $this->sPropertyType !== '')
@@ -169,8 +168,7 @@ 
             {
                 throw new SetupException('The "property" argument is mandatory on the DI attribute on a method.');
             }
-        }
-        else // if($this->xTarget === Attribute::TARGET_CLASS)
+        } else // if($this->xTarget === Attribute::TARGET_CLASS)
         {
             if($this->sPropertyType === '')
             {

src/App/Attribute/Upload.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function validateArguments(array $aArguments)
     {
-        if(count($aArguments) !== 1)
+        if (count($aArguments) !== 1)
         {
             throw new SetupException('The Upload attribute requires only one argument');
         }
@@ -61,7 +61,7 @@ 
      */
     protected function validateValues()
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $this->sFieldId) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $this->sFieldId) > 0)
         {
             return;
         }
@@ -73,6 +73,6 @@ 
      */
     protected function getValue()
     {
-        return "'" . $this->sFieldId . "'" ; // The field id is surrounded with simple quotes.
+        return "'" . $this->sFieldId . "'"; // The field id is surrounded with simple quotes.
     }
 }

src/App/Attribute/DataBag.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
      */
     public function validateArguments(array $aArguments)
     {
-        if(count($aArguments) !== 1)
+        if (count($aArguments) !== 1)
         {
             throw new SetupException('The DataBag attribute requires only one argument');
         }
@@ -64,7 +64,7 @@ 
      */
     protected function validateValues()
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $this->sName) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $this->sName) > 0)
         {
             return;
         }
@@ -76,7 +76,7 @@ 
      */
     protected function getValue()
     {
-        if(is_array($this->xPrevValue))
+        if (is_array($this->xPrevValue))
         {
             $this->xPrevValue[] = $this->sName; // Append the current value to the array
             return $this->xPrevValue;

src/App/Attribute/Exclude.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function validateArguments(array $aArguments)
     {
-        if(count($aArguments) !== 0 && count($aArguments) !== 1)
+        if (count($aArguments) !== 0 && count($aArguments) !== 1)
         {
             throw new SetupException('the Exclude attribute requires a single boolean or no argument');
         }

src/App/Attribute/AbstractCallback.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
      */
     public function validateArguments(array $aArguments)
     {
-        if(count($aArguments) !== 1 && count($aArguments) !== 2)
+        if (count($aArguments) !== 1 && count($aArguments) !== 2)
         {
             throw new SetupException('the Exclude attribute requires a single boolean or no argument');
         }
@@ -70,7 +70,7 @@ 
      */
     protected function validateValues()
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $this->sMethodName) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $this->sMethodName) > 0)
         {
             return;
         }
@@ -83,7 +83,7 @@ 
      */
     protected function getValue()
     {
-        if(is_array($this->xPrevValue))
+        if (is_array($this->xPrevValue))
         {
             // Add the current value to the array
             $this->xPrevValue[$this->sMethodName] = $this->aMethodParams;

src/App/View/ViewRenderer.php

Spacing +10 added lines, -10 removed lines

@@ -98,24 +98,24 @@ 
      */
     public function addNamespaces(Config $xAppConfig, ?Config $xUserConfig = null)
     {
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
+        if (empty($aNamespaces = $xAppConfig->getOptionNames('views')))
         {
             return;
         }
         $sPackage = $xAppConfig->getOption('package', '');
-        foreach($aNamespaces as $sNamespace => $sOption)
+        foreach ($aNamespaces as $sNamespace => $sOption)
         {
             // Save the namespace
             $aNamespace = $xAppConfig->getOption($sOption);
             $aNamespace['package'] = $sPackage;
-            if(!isset($aNamespace['renderer']))
+            if (!isset($aNamespace['renderer']))
             {
                 $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
             }
 
             // If the lib config has defined a template option, then its value must be
             // read from the app config.
-            if($xUserConfig !== null && isset($aNamespace['template']) && is_array($aNamespace['template']))
+            if ($xUserConfig !== null && isset($aNamespace['template']) && is_array($aNamespace['template']))
             {
                 $sTemplateOption = $xAppConfig->getOption($sOption . '.template.option');
                 $sTemplateDefault = $xAppConfig->getOption($sOption . '.template.default');
@@ -158,7 +158,7 @@ 
             $aNamespaces = array_filter($this->aNamespaces, function($aNamespace) use($sId) {
                 return $aNamespace['renderer'] === $sId;
             });
-            foreach($aNamespaces as $sNamespace => $aNamespace)
+            foreach ($aNamespaces as $sNamespace => $aNamespace)
             {
                 $xRenderer->addNamespace($sNamespace, $aNamespace['directory'], $aNamespace['extension']);
             }
@@ -191,7 +191,7 @@ 
      */
     public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
     {
-        if(!isset($this->aNamespaces[$sNamespace]))
+        if (!isset($this->aNamespaces[$sNamespace]))
         {
             return null;
         }
@@ -216,7 +216,7 @@ 
      */
     protected function store(): Store
     {
-        if(!$this->xStore)
+        if (!$this->xStore)
         {
             $this->xStore = new Store();
         }
@@ -260,7 +260,7 @@ 
      */
     public function shareValues(array $aValues): ViewRenderer
     {
-        foreach($aValues as $sName => $xValue)
+        foreach ($aValues as $sName => $xValue)
         {
             $this->share($sName, $xValue);
         }
@@ -284,14 +284,14 @@ 
         $sNamespace = $this->sDefaultNamespace;
         // Get the namespace from the view name
         $nSeparatorPosition = strrpos($sViewName, '::');
-        if($nSeparatorPosition !== false)
+        if ($nSeparatorPosition !== false)
         {
             $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
             $sViewName = substr($sViewName, $nSeparatorPosition + 2);
         }
 
         $xRenderer = $this->getNamespaceRenderer($sNamespace);
-        if(!$xRenderer)
+        if (!$xRenderer)
         {
             // Cannot render a view if there's no renderer corresponding to the namespace.
             return $this->xEmptyStore;

src/App/View/AttrHelper.php

Spacing +9 added lines, -9 removed lines

@@ -56,13 +56,13 @@ 
     public function html(JxnCall $xJsCall): string
     {
         $sClassName = $xJsCall->_class();
-        if(!$sClassName)
+        if (!$sClassName)
         {
             return '';
         }
 
         $xCallable = $this->cls->makeRegisteredObject($sClassName);
-        return is_a($xCallable, Component::class) ? (string)$xCallable->html() : '';
+        return is_a($xCallable, Component::class) ? (string) $xCallable->html() : '';
     }
 
     /**
@@ -113,15 +113,15 @@ 
     {
         // Only accept arrays of 2 entries.
         $count = count($on);
-        if($count !== 2)
+        if ($count !== 2)
         {
             return false;
         }
 
         // Only accept arrays with int index from 0, and string value.
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(!isset($on[$i]) || !is_string($on[$i]))
+            if (!isset($on[$i]) || !is_string($on[$i]))
             {
                 return false;
             }
@@ -156,13 +156,13 @@ 
      *
      * @return string
      */
-    public function on(string|array $on, JsExpr $xJsExpr): string
+    public function on(string | array $on, JsExpr $xJsExpr): string
     {
         $select = '';
         $event = $on;
-        if(is_array($on))
+        if (is_array($on))
         {
-            if(!$this->checkOn($on))
+            if (!$this->checkOn($on))
             {
                 return '';
             }
@@ -196,7 +196,7 @@ 
      */
     public function event(array $on, JsExpr $xJsExpr): string
     {
-        if(!$this->checkOn($on))
+        if (!$this->checkOn($on))
         {
             return '';
         }

src/App/PageComponent.php

Spacing +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
      */
     private function getPageNumber(int $pageNumber): int
     {
-        return $pageNumber > 0 ? $pageNumber :
-            (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
+        return $pageNumber > 0 ? $pageNumber : (int) $this->bag($this->bagName())->get($this->bagAttr(), 1);
     }
 
     /**