jaxon-php / jaxon-core

src/Request/Call/Parameter.php

Spacing +8 added lines, -8 removed lines

@@ -116,19 +116,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);
         }
@@ -230,7 +230,7 @@ 
      */
     protected function getNumericValueScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -240,7 +240,7 @@ 
      */
     protected function getUnquotedValueScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -262,7 +262,7 @@ 
      */
     protected function getPageNumberScript(): string
     {
-        return (string)$this->xValue;
+        return (string) $this->xValue;
     }
 
     /**
@@ -273,7 +273,7 @@ 
     public function getScript(): string
     {
         $sMethodName = 'get' . $this->sType . 'Script';
-        if(!method_exists($this, $sMethodName))
+        if (!method_exists($this, $sMethodName))
         {
             return '';
         }

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/CallbackManager.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
      */
     public function popBootCallbacks(): array
     {
-        if(empty($this->aBootCallbacks))
+        if (empty($this->aBootCallbacks))
         {
             return [];
         }

src/Request/Handler/RequestHandler.php

Braces +1 added lines, -2 removed lines

@@ -300,8 +300,7 @@
             $this->xResponseManager->error($e->getMessage());
             $this->onInvalid($e);
             throw $e;
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->onError($e);

Spacing +22 added lines, -22 removed lines

@@ -111,14 +111,14 @@ 
     {
         $xTarget = $this->xRequestPlugin->getTarget();
         // Call the user defined callback
-        foreach($this->xCallbackManager->getBeforeCallbacks() as $xCallback)
+        foreach ($this->xCallbackManager->getBeforeCallbacks() as $xCallback)
         {
             $xReturn = call_user_func_array($xCallback, [$xTarget, &$bEndRequest]);
-            if($xReturn instanceof ResponseInterface)
+            if ($xReturn instanceof ResponseInterface)
             {
                 $this->xResponseManager->append($xReturn);
             }
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -133,11 +133,11 @@ 
      */
     public function onAfter(bool $bEndRequest)
     {
-        foreach($this->xCallbackManager->getAfterCallbacks() as $xCallback)
+        foreach ($this->xCallbackManager->getAfterCallbacks() as $xCallback)
         {
             $xReturn = call_user_func_array($xCallback,
                 [$this->xRequestPlugin->getTarget(), $bEndRequest]);
-            if($xReturn instanceof ResponseInterface)
+            if ($xReturn instanceof ResponseInterface)
             {
                 $this->xResponseManager->append($xReturn);
             }
@@ -154,10 +154,10 @@ 
      */
     public function onInvalid(RequestException $xException)
     {
-        foreach($this->xCallbackManager->getInvalidCallbacks() as $xCallback)
+        foreach ($this->xCallbackManager->getInvalidCallbacks() as $xCallback)
         {
             $xReturn = call_user_func($xCallback, $xException);
-            if($xReturn instanceof ResponseInterface)
+            if ($xReturn instanceof ResponseInterface)
             {
                 $this->xResponseManager->append($xReturn);
             }
@@ -174,10 +174,10 @@ 
      */
     public function onError(Exception $xException)
     {
-        foreach($this->xCallbackManager->getErrorCallbacks() as $xCallback)
+        foreach ($this->xCallbackManager->getErrorCallbacks() as $xCallback)
         {
             $xReturn = call_user_func($xCallback, $xException);
-            if($xReturn instanceof ResponseInterface)
+            if ($xReturn instanceof ResponseInterface)
             {
                 $this->xResponseManager->append($xReturn);
             }
@@ -196,7 +196,7 @@ 
         $this->xUploadHandler = $this->di->getUploadHandler();
 
         // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             return true;
         }
@@ -204,9 +204,9 @@ 
         // The HTTP request
         $xRequest = $this->di->getRequest();
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
+        foreach ($this->xPluginManager->getRequestHandlers() as $sClassName)
         {
-            if($sClassName::canProcessRequest($xRequest))
+            if ($sClassName::canProcessRequest($xRequest))
             {
                 $this->xRequestPlugin = $this->di->g($sClassName);
                 $this->xRequestPlugin->setTarget($xRequest);
@@ -215,7 +215,7 @@ 
         }
 
         // Check if the upload plugin is enabled
-        if($this->xUploadHandler === null)
+        if ($this->xUploadHandler === null)
         {
             return false;
         }
@@ -237,15 +237,15 @@ 
         // The HTTP request
         $xRequest = $this->di->getRequest();
         // Process uploaded files, if the upload plugin is enabled
-        if($this->xUploadHandler !== null && $this->xUploadHandler->canProcessRequest($xRequest))
+        if ($this->xUploadHandler !== null && $this->xUploadHandler->canProcessRequest($xRequest))
         {
             $this->xUploadHandler->processRequest($xRequest);
         }
         // Process the request
-        if(($this->xRequestPlugin))
+        if (($this->xRequestPlugin))
         {
             $xResponse = $this->xRequestPlugin->processRequest();
-            if(($xResponse))
+            if (($xResponse))
             {
                 $this->xResponseManager->append($xResponse);
             }
@@ -266,7 +266,7 @@ 
     public function processRequest()
     {
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -275,11 +275,11 @@ 
         {
             $bEndRequest = false;
             // Handle before processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->onBefore($bEndRequest);
             }
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -287,7 +287,7 @@ 
             $this->_processRequest();
 
             // Handle after processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->onAfter($bEndRequest);
             }
@@ -295,13 +295,13 @@ 
         // An exception was thrown while processing the request.
         // The request missed the corresponding handler function,
         // or an error occurred while attempting to execute the handler.
-        catch(RequestException $e)
+        catch (RequestException $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->onInvalid($e);
             throw $e;
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->onError($e);

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

Spacing +11 added lines, -11 removed lines

@@ -118,15 +118,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'));
         }
@@ -147,9 +147,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;
@@ -171,12 +171,12 @@ 
     public function getCallable(string $sCallable)
     {
         $sFunction = trim($sCallable);
-        if(!isset($this->aFunctions[$sFunction]))
+        if (!isset($this->aFunctions[$sFunction]))
         {
             return null;
         }
         $xCallable = new CallableFunction($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);
         }
@@ -205,7 +205,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);
@@ -219,7 +219,7 @@ 
     public static function canProcessRequest(ServerRequestInterface $xRequest): bool
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             return isset($aBody['jxnfun']);
         }
@@ -233,7 +233,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;
@@ -251,7 +251,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

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'));
         }

src/Plugin/Request/CallableFunction/CallableFunction.php

Switch Indentation +9 added lines, -9 removed lines

@@ -114,15 +114,15 @@
     {
         switch($sName)
         {
-        case 'class': // The user function is a method in the given class
-            $this->xPhpFunction = [$sValue, $this->xPhpFunction];
-            break;
-        case 'include':
-            $this->sInclude = $sValue;
-            break;
-        default:
-            $this->aOptions[$sName] = $sValue;
-            break;
+            case 'class': // The user function is a method in the given class
+                $this->xPhpFunction = [$sValue, $this->xPhpFunction];
+                break;
+            case 'include':
+                $this->sInclude = $sValue;
+                break;
+            default:
+                $this->aOptions[$sName] = $sValue;
+                break;
         }
     }
 

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
      */
     public function configure(string $sName, string $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'class': // The user function is a method in the given class
             $this->xPhpFunction = [$sValue, $this->xPhpFunction];
@@ -136,12 +136,12 @@ 
      */
     public function call(array $aArgs = [])
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             require_once $this->sInclude;
         }
         // If the function is an alias for a class method, then instantiate the class
-        if(is_array($this->xPhpFunction) && is_string($this->xPhpFunction[0]))
+        if (is_array($this->xPhpFunction) && is_string($this->xPhpFunction[0]))
         {
             $sClassName = $this->xPhpFunction[0];
             $this->xPhpFunction[0] = new $sClassName;

src/Plugin/Request/CallableDir/CallableDirPlugin.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
     private function checkDirectory(string $sDirectory): string
     {
         $sDirectory = rtrim(trim($sDirectory), '/\\');
-        if(!is_dir($sDirectory))
+        if (!is_dir($sDirectory))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -93,11 +93,11 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(is_string($xOptions))
+        if (is_string($xOptions))
         {
             $xOptions = ['namespace' => $xOptions];
         }
-        if(!is_array($xOptions))
+        if (!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -105,14 +105,14 @@ 
         $xOptions['directory'] = $this->checkDirectory($sCallable);
         // Check the namespace
         $sNamespace = $xOptions['namespace'] ?? '';
-        if(!($xOptions['namespace'] = trim($sNamespace, ' \\')))
+        if (!($xOptions['namespace'] = trim($sNamespace, ' \\')))
         {
             $xOptions['namespace'] = '';
         }
 
         // Change the keys in $xOptions to have "\" as separator
         $_aOptions = [];
-        foreach($xOptions as $sName => $aOption)
+        foreach ($xOptions as $sName => $aOption)
         {
             $sName = trim(str_replace('.', '\\', $sName), ' \\');
             $_aOptions[$sName] = $aOption;
@@ -125,7 +125,7 @@ 
      */
     public function register(string $sType, string $sCallable, array $aOptions): bool
     {
-        if(($aOptions['namespace']))
+        if (($aOptions['namespace']))
         {
             $this->xRegistry->addNamespace($aOptions['namespace'], $aOptions);
             return true;