jaxon-php / jaxon-core

src/App/View/TemplateView.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $sViewName = $store->getViewName();
         $sNamespace = $store->getNamespace();
         // In this view renderer, the namespace must always be prepended to the view name.
-        if(substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
+        if (substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
         {
             $sViewName = $sNamespace . '::' . $sViewName;
         }

src/App/View/ViewRenderer.php

Spacing +10 added lines, -10 removed lines

@@ -89,24 +89,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');
@@ -149,7 +149,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']);
             }
@@ -182,7 +182,7 @@ 
      */
     public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
     {
-        if(!isset($this->aNamespaces[$sNamespace]))
+        if (!isset($this->aNamespaces[$sNamespace]))
         {
             return null;
         }
@@ -207,7 +207,7 @@ 
      */
     protected function store(): Store
     {
-        if(!$this->xStore)
+        if (!$this->xStore)
         {
             $this->xStore = new Store();
         }
@@ -251,7 +251,7 @@ 
      */
     public function shareValues(array $aValues): ViewRenderer
     {
-        foreach($aValues as $sName => $xValue)
+        foreach ($aValues as $sName => $xValue)
         {
             $this->share($sName, $xValue);
         }
@@ -275,12 +275,12 @@ 
         $sNamespace = $this->sDefaultNamespace;
         // Get the namespace from the view name
         $nSeparatorPosition = strrpos($sViewName, '::');
-        if($nSeparatorPosition !== false)
+        if ($nSeparatorPosition !== false)
         {
             $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
         }
         $xRenderer = $this->getNamespaceRenderer($sNamespace);
-        if(!$xRenderer)
+        if (!$xRenderer)
         {
             // Cannot render a view if there's no renderer corresponding to the namespace.
             return null;

src/App/Dialog/Library/AlertLibrary.php

Spacing +3 added lines, -4 removed lines

@@ -43,8 +43,7 @@ 
      */
     public function confirm(string $sQuestion, string $sYesScript, string $sNoScript): string
     {
-        return empty($sNoScript) ? 'if(confirm(' . $sQuestion . ')){' . $sYesScript . ';}' :
-            'if(confirm(' . $sQuestion . ')){' . $sYesScript . ';}else{' . $sNoScript . ';}';
+        return empty($sNoScript) ? 'if(confirm(' . $sQuestion . ')){' . $sYesScript . ';}' : 'if(confirm(' . $sQuestion . ')){' . $sYesScript . ';}else{' . $sNoScript . ';}';
     }
 
     /**
@@ -57,11 +56,11 @@ 
      */
     private function alert(string $sMessage, string $sTitle): string
     {
-        if(!empty($sTitle))
+        if (!empty($sTitle))
         {
             $sMessage = '<b>' . $sTitle . '</b><br/>' . $sMessage;
         }
-        if($this->returnCode())
+        if ($this->returnCode())
         {
             return 'alert(' . $sMessage . ')';
         }

src/App/Dialog/Library/DialogLibraryHelper.php

Spacing +4 added lines, -4 removed lines

@@ -136,18 +136,18 @@
         $aOptions = $this->getOptionNames($sKeyPrefix);
         $sSpaces = str_repeat(' ', $nSpaces);
         $sScript = '';
-        foreach($aOptions as $sShortName => $sFullName)
+        foreach ($aOptions as $sShortName => $sFullName)
         {
             $value = $this->xConfigManager->getOption($sFullName);
-            if(is_string($value))
+            if (is_string($value))
             {
                 $value = "'$value'";
             }
-            elseif(is_bool($value))
+            elseif (is_bool($value))
             {
                 $value = ($value ? 'true' : 'false');
             }
-            elseif(!is_numeric($value))
+            elseif (!is_numeric($value))
             {
                 $value = json_encode($value);
             }

Braces +2 added lines, -4 removed lines

@@ -142,12 +142,10 @@
             if(is_string($value))
             {
                 $value = "'$value'";
-            }
-            elseif(is_bool($value))
+            } elseif(is_bool($value))
             {
                 $value = ($value ? 'true' : 'false');
-            }
-            elseif(!is_numeric($value))
+            } elseif(!is_numeric($value))
             {
                 $value = json_encode($value);
             }

src/App/Ajax.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
      */
     public static function getInstance(): Ajax
     {
-        if(self::$xInstance === null)
+        if (self::$xInstance === null)
         {
             // First call: create and initialize the instances.
             self::$xInstance = new Ajax();
@@ -121,7 +121,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/Traits/AjaxSendTrait.php

Spacing +5 added lines, -5 removed lines

@@ -33,24 +33,24 @@ 
      */
     public function sendResponse()
     {
-        if(!$this->xConfigManager->getOption('core.response.send', false))
+        if (!$this->xConfigManager->getOption('core.response.send', false))
         {
             return;
         }
 
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($sFilename, $nLineNumber))
+        if (headers_sent($sFilename, $nLineNumber))
         {
             throw new RequestException($this->xTranslator->trans('errors.output.already-sent',
                     ['location' => $sFilename . ':' . $nLineNumber]) . "\n" .
                 $this->xTranslator->trans('errors.output.advice'));
         }
-        if(empty($sContent = $this->xResponseManager->getOutput()))
+        if (empty($sContent = $this->xResponseManager->getOutput()))
         {
             return;
         }
 
-        if($this->di()->getRequest()->getMethod() === 'GET')
+        if ($this->di()->getRequest()->getMethod() === 'GET')
         {
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -61,7 +61,7 @@ 
 
         print $sContent;
 
-        if($this->xConfigManager->getOption('core.process.exit', false))
+        if ($this->xConfigManager->getOption('core.process.exit', false))
         {
             exit();
         }

src/App/CallableClass.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public function cl(string $sName)
     {
         $xCallableClass = $this->xCallableClassHelper->xCallableRegistry->getCallableObject($sName);
-        if($xCallableClass === null)
+        if ($xCallableClass === null)
         {
             return null;
         }

src/App/App.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,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);
@@ -60,13 +60,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/Di/Container.php

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

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