jaxon-php / jaxon-core

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/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/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/Request/Handler/Psr/PsrRequestHandler.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         // and the other classes will get this request from there.
         $this->di->val(ServerRequestInterface::class, $request);
 
-        if(!$this->xRequestHandler->canProcessRequest())
+        if (!$this->xRequestHandler->canProcessRequest())
         {
             // Unable to find a plugin to process the request
             throw new RequestException($this->xTranslator->trans('errors.request.plugin'));

src/Request/Handler/Psr/PsrAjaxMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         // and the other classes will get this request from there.
         $this->di->val(ServerRequestInterface::class, $request);
 
-        if(!$this->xRequestHandler->canProcessRequest())
+        if (!$this->xRequestHandler->canProcessRequest())
         {
             // Unable to find a plugin to process the request
             return $handler->handle($request);

src/Request/Handler/ParameterReader.php

Braces +5 added lines, -10 removed lines

@@ -110,8 +110,7 @@ 
         if(isset($aServerParams['CONTENT_TYPE']))
         {
             $sContentType = $aServerParams['CONTENT_TYPE'];
-        }
-        elseif(isset($aServerParams['HTTP_CONTENT_TYPE']))
+        } elseif(isset($aServerParams['HTTP_CONTENT_TYPE']))
         {
             $sContentType = $aServerParams['HTTP_CONTENT_TYPE'];
         }
@@ -142,20 +141,17 @@ 
             $this->cUtf8Decoder = function($sStr) use($sEncoding) {
                 return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
             };
-        }
-        elseif(function_exists('mb_convert_encoding'))
+        } elseif(function_exists('mb_convert_encoding'))
         {
             $this->cUtf8Decoder = function($sStr) use($sEncoding) {
                 return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
             };
-        }
-        elseif($sEncoding === "ISO-8859-1")
+        } elseif($sEncoding === "ISO-8859-1")
         {
             $this->cUtf8Decoder = function($sStr) {
                 return utf8_decode($sStr);
             };
-        }
-        else
+        } else
         {
             throw new RequestException($this->xTranslator->trans('errors.request.conversion'));
         }
@@ -251,8 +247,7 @@ 
             {
                 $aParams = $aBody['jxnargs'];
             }
-        }
-        else
+        } else
         {
             $aParams = $xRequest->getQueryParams();
             if(isset($aParams['jxnargs']))

Switch Indentation +9 added lines, -9 removed lines

@@ -196,15 +196,15 @@
         $sValue = substr($sValue, 1);
         switch($cType)
         {
-        case 'S':
-            return $sValue;
-        case 'B':
-            return $this->convertStringToBool($sValue);
-        case 'N':
-            return ($sValue == floor($sValue) ? (int)$sValue : (float)$sValue);
-        case '*':
-        default:
-            return null;
+            case 'S':
+                return $sValue;
+            case 'B':
+                return $this->convertStringToBool($sValue);
+            case 'N':
+                return ($sValue == floor($sValue) ? (int)$sValue : (float)$sValue);
+            case '*':
+            default:
+                return null;
         }
     }
 

Spacing +19 added lines, -19 removed lines

@@ -107,16 +107,16 @@ 
         // Parameters are url encoded when uploading files
         $aServerParams = $this->di->getRequest()->getServerParams();
         $sContentType = '';
-        if(isset($aServerParams['CONTENT_TYPE']))
+        if (isset($aServerParams['CONTENT_TYPE']))
         {
             $sContentType = $aServerParams['CONTENT_TYPE'];
         }
-        elseif(isset($aServerParams['HTTP_CONTENT_TYPE']))
+        elseif (isset($aServerParams['HTTP_CONTENT_TYPE']))
         {
             $sContentType = $aServerParams['HTTP_CONTENT_TYPE'];
         }
         $sType = 'multipart/form-data';
-        if(strncmp($sContentType, $sType, strlen($sType)) !== 0)
+        if (strncmp($sContentType, $sType, strlen($sType)) !== 0)
         {
             $this->cParamDecoder = function($sParam) { return $sParam; };
             return;
@@ -137,19 +137,19 @@ 
             return $sStr;
         };
         $sEncoding = $this->xConfigManager->getOption('core.encoding', '');
-        if(function_exists('iconv'))
+        if (function_exists('iconv'))
         {
             $this->cUtf8Decoder = function($sStr) use($sEncoding) {
                 return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
             };
         }
-        elseif(function_exists('mb_convert_encoding'))
+        elseif (function_exists('mb_convert_encoding'))
         {
             $this->cUtf8Decoder = function($sStr) use($sEncoding) {
                 return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
             };
         }
-        elseif($sEncoding === "ISO-8859-1")
+        elseif ($sEncoding === "ISO-8859-1")
         {
             $this->cUtf8Decoder = function($sStr) {
                 return utf8_decode($sStr);
@@ -170,11 +170,11 @@ 
      */
     private function convertStringToBool(string $sValue): bool
     {
-        if(strcasecmp($sValue, 'true') === 0)
+        if (strcasecmp($sValue, 'true') === 0)
         {
             return true;
         }
-        if(strcasecmp($sValue, 'false') === 0)
+        if (strcasecmp($sValue, 'false') === 0)
         {
             return false;
         }
@@ -194,14 +194,14 @@ 
     {
         $cType = substr($sValue, 0, 1);
         $sValue = substr($sValue, 1);
-        switch($cType)
+        switch ($cType)
         {
         case 'S':
             return $sValue;
         case 'B':
             return $this->convertStringToBool($sValue);
         case 'N':
-            return ($sValue == floor($sValue) ? (int)$sValue : (float)$sValue);
+            return ($sValue == floor($sValue) ? (int) $sValue : (float) $sValue);
         case '*':
         default:
             return null;
@@ -217,7 +217,7 @@ 
      */
     private function decodeRequestParameter(string $sParam)
     {
-        if($sParam === '')
+        if ($sParam === '')
         {
             return $sParam;
         }
@@ -225,7 +225,7 @@ 
         $sParam = call_user_func($this->cParamDecoder, $sParam);
 
         $xJson = json_decode($sParam, true);
-        if($xJson !== null && $sParam != $xJson)
+        if ($xJson !== null && $sParam != $xJson)
         {
             return $xJson;
         }
@@ -240,9 +240,9 @@ 
         $aParams = [];
         $xRequest = $this->di->getRequest();
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
-            if(isset($aBody['jxnargs']))
+            if (isset($aBody['jxnargs']))
             {
                 $aParams = $aBody['jxnargs'];
             }
@@ -250,13 +250,13 @@ 
         else
         {
             $aParams = $xRequest->getQueryParams();
-            if(isset($aParams['jxnargs']))
+            if (isset($aParams['jxnargs']))
             {
                 $aParams = $aParams['jxnargs'];
             }
         }
         return array_map(function($sParam) {
-            return $this->decodeRequestParameter((string)$sParam);
+            return $this->decodeRequestParameter((string) $sParam);
         }, $aParams);
     }
 
@@ -269,7 +269,7 @@ 
      */
     private function decodeUtf8Parameter($xValue)
     {
-        if(is_string($xValue))
+        if (is_string($xValue))
         {
             return call_user_func($this->cUtf8Decoder, $xValue);
         }
@@ -289,7 +289,7 @@ 
     private function decodeUtf8Parameters(array $aParams): array
     {
         $aValues = [];
-        foreach($aParams as $sKey => $xValue)
+        foreach ($aParams as $sKey => $xValue)
         {
             // Decode the key
             $sKey = call_user_func($this->cUtf8Decoder, $sKey);
@@ -310,7 +310,7 @@ 
     {
         $this->setParamDecoder();
         $aParams = $this->getRequestParameters();
-        if(!$this->xConfigManager->getOption('core.decode_utf8'))
+        if (!$this->xConfigManager->getOption('core.decode_utf8'))
         {
             return $aParams;
         }

src/Plugin/Request/CallableFunction/CallableFunctionPlugin.php

Braces +1 added lines, -2 removed lines

@@ -125,8 +125,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'));
         }

Spacing +11 added lines, -11 removed lines

@@ -128,15 +128,15 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(!$this->xValidator->validateFunction(trim($sCallable)))
+        if (!$this->xValidator->validateFunction(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'));
         }
@@ -157,9 +157,9 @@ 
         $sPhpFunction = trim($sCallable);
         $sFunction = $sPhpFunction;
         // Check if an alias is defined
-        if(isset($aOptions['alias']))
+        if (isset($aOptions['alias']))
         {
-            $sFunction = (string)$aOptions['alias'];
+            $sFunction = (string) $aOptions['alias'];
             unset($aOptions['alias']);
         }
         $this->aFunctions[$sFunction] = $sPhpFunction;
@@ -181,13 +181,13 @@ 
     public function getCallable(string $sCallable)
     {
         $sFunction = trim($sCallable);
-        if(!isset($this->aFunctions[$sFunction]))
+        if (!isset($this->aFunctions[$sFunction]))
         {
             return null;
         }
         $xCallable = new CallableFunction($this->di, $sFunction,
             $this->sPrefix . $sFunction, $this->aFunctions[$sFunction]);
-        foreach($this->aOptions[$sFunction] as $sName => $sValue)
+        foreach ($this->aOptions[$sFunction] as $sName => $sValue)
         {
             $xCallable->configure($sName, $sValue);
         }
@@ -216,7 +216,7 @@ 
     public function getScript(): string
     {
         $code = '';
-        foreach(array_keys($this->aFunctions) as $sFunction)
+        foreach (array_keys($this->aFunctions) as $sFunction)
         {
             $xFunction = $this->getCallable($sFunction);
             $code .= $this->getCallableScript($xFunction);
@@ -230,7 +230,7 @@ 
     public static function canProcessRequest(ServerRequestInterface $xRequest): bool
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             return isset($aBody['jxnfun']);
         }
@@ -244,7 +244,7 @@ 
     public function setTarget(ServerRequestInterface $xRequest)
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             $this->xTarget = Target::makeFunction(trim($aBody['jxnfun']));
             return;
@@ -262,7 +262,7 @@ 
         $sRequestedFunction = $this->xTarget->getFunctionName();
 
         // Security check: make sure the requested function was registered.
-        if(!$this->xValidator->validateFunction($sRequestedFunction) ||
+        if (!$this->xValidator->validateFunction($sRequestedFunction) ||
             !isset($this->aFunctions[$sRequestedFunction]))
         {
             // Unable to find the requested function