jaxon-php / jaxon-core

src/Request/Call/Call.php

Spacing +16 added lines, -17 removed lines

@@ -79,10 +79,10 @@ 
      */
     private function _makeUniqueJsVar(ParameterInterface $xParameter): ParameterInterface
     {
-        if($xParameter instanceof DomSelector)
+        if ($xParameter instanceof DomSelector)
         {
             $sParameterStr = $xParameter->getScript();
-            if(!isset($this->aVariables[$sParameterStr]))
+            if (!isset($this->aVariables[$sParameterStr]))
             {
                 // The value is not yet defined. A new variable is created.
                 $sVarName = 'jxnVar' . $this->nVarId;
@@ -109,18 +109,18 @@ 
      */
     private function makePhrase(array $aArgs): string
     {
-        if(empty($aArgs))
+        if (empty($aArgs))
         {
             return '';
         }
         // The first array entry is the message.
         $sPhrase = array_shift($aArgs);
-        if(empty($aArgs))
+        if (empty($aArgs))
         {
             return $sPhrase;
         }
         $nParamId = 1;
-        foreach($aArgs as &$xParameter)
+        foreach ($aArgs as &$xParameter)
         {
             $xParameter = $this->_makeUniqueJsVar($xParameter);
             $xParameter = "'$nParamId':" . $xParameter->getScript();
@@ -137,7 +137,7 @@ 
      */
     private function makeMessage(): string
     {
-        if(!($sPhrase = $this->makePhrase($this->aMessageArgs)))
+        if (!($sPhrase = $this->makePhrase($this->aMessageArgs)))
         {
             return '';
         }
@@ -166,23 +166,22 @@ 
         // This array will avoid declaring multiple variables with the same value.
         // The array key is the variable value, while the array value is the variable name.
         $this->aVariables = []; // Array of local variables.
-        foreach($this->aParameters as &$xParameter)
+        foreach ($this->aParameters as &$xParameter)
         {
             $xParameter = $this->_makeUniqueJsVar($xParameter);
         }
 
         $sMessageScript = $this->makeMessage();
         $sScript = parent::getScript();
-        if($this->sCondition === '__confirm__')
+        if ($this->sCondition === '__confirm__')
         {
             $sConfirmPhrase = $this->makePhrase($this->aConfirmArgs);
             $sScript = $this->xDialogLibraryManager->getQuestionLibrary()
                 ->confirm($sConfirmPhrase, $sScript, $sMessageScript);
         }
-        elseif($this->sCondition !== '')
+        elseif ($this->sCondition !== '')
         {
-            $sScript = empty($sMessageScript) ? 'if(' . $this->sCondition . '){' . $sScript . ';}' :
-                'if(' . $this->sCondition . '){' . $sScript . ';}else{' . $sMessageScript . ';}';
+            $sScript = empty($sMessageScript) ? 'if(' . $this->sCondition . '){' . $sScript . ';}' : 'if(' . $this->sCondition . '){' . $sScript . ';}else{' . $sMessageScript . ';}';
         }
         return $this->sVars . $sScript;
     }
@@ -194,9 +193,9 @@ 
      */
     public function hasPageNumber(): bool
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() === Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() === Parameter::PAGE_NUMBER)
             {
                 return true;
             }
@@ -214,9 +213,9 @@ 
     public function setPageNumber(int $nPageNumber): Call
     {
         // Set the value of the Parameter::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() === Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() === Parameter::PAGE_NUMBER)
             {
                 $xParameter->setValue($nPageNumber);
                 break;
@@ -237,7 +236,7 @@ 
     public function pages(int $nCurrentPage, int $nItemsPerPage, int $nItemsTotal): array
     {
         // Append the page number to the parameter list, if not yet given.
-        if(!$this->hasPageNumber())
+        if (!$this->hasPageNumber())
         {
             $this->addParameter(Parameter::PAGE_NUMBER, 0);
         }
@@ -256,7 +255,7 @@ 
     public function paginate(int $nCurrentPage, int $nItemsPerPage, int $nItemsTotal): Paginator
     {
         // Append the page number to the parameter list, if not yet given.
-        if(!$this->hasPageNumber())
+        if (!$this->hasPageNumber())
         {
             $this->addParameter(Parameter::PAGE_NUMBER, 0);
         }

Braces +2 added lines, -4 removed lines

@@ -89,8 +89,7 @@ 
                 $this->aVariables[$sParameterStr] = $sVarName;
                 $this->sVars .= "$sVarName=$xParameter;";
                 $this->nVarId++;
-            }
-            else
+            } else
             {
                 // The value is already defined. The corresponding variable is assigned.
                 $sVarName = $this->aVariables[$sParameterStr];
@@ -178,8 +177,7 @@ 
             $sConfirmPhrase = $this->makePhrase($this->aConfirmArgs);
             $sScript = $this->xDialogLibraryManager->getQuestionLibrary()
                 ->confirm($sConfirmPhrase, $sScript, $sMessageScript);
-        }
-        elseif($this->sCondition !== '')
+        } elseif($this->sCondition !== '')
         {
             $sScript = empty($sMessageScript) ? 'if(' . $this->sCondition . '){' . $sScript . ';}' :
                 'if(' . $this->sCondition . '){' . $sScript . ';}else{' . $sMessageScript . ';}';

src/Request/Call/Paginator.php

Spacing +15 added lines, -15 removed lines

@@ -145,7 +145,7 @@ 
      */
     protected function updateTotalPages(): Paginator
     {
-        $this->nTotalPages = ($this->nItemsPerPage === 0 ? 0 : (int)ceil($this->nTotalItems / $this->nItemsPerPage));
+        $this->nTotalPages = ($this->nItemsPerPage === 0 ? 0 : (int) ceil($this->nTotalItems / $this->nItemsPerPage));
         return $this;
     }
 
@@ -220,7 +220,7 @@ 
      */
     protected function getPrevLink(): array
     {
-        if($this->nCurrentPage <= 1)
+        if ($this->nCurrentPage <= 1)
         {
             return ['disabled', $this->sPreviousText, ''];
         }
@@ -234,7 +234,7 @@ 
      */
     protected function getNextLink(): array
     {
-        if($this->nCurrentPage >= $this->nTotalPages)
+        if ($this->nCurrentPage >= $this->nTotalPages)
         {
             return ['disabled', $this->sNextText, ''];
         }
@@ -250,7 +250,7 @@ 
      */
     protected function getPageLink(int $nNumber): array
     {
-        if($nNumber < 1)
+        if ($nNumber < 1)
         {
             return ['disabled', $this->sEllipsysText, ''];
         }
@@ -269,9 +269,9 @@ 
     {
         $aPageNumbers = [];
 
-        if($this->nTotalPages <= $this->nMaxPages)
+        if ($this->nTotalPages <= $this->nMaxPages)
         {
-            for($i = 0; $i < $this->nTotalPages; $i++)
+            for ($i = 0; $i < $this->nTotalPages; $i++)
             {
                 $aPageNumbers[] = $i + 1;
             }
@@ -280,11 +280,11 @@ 
         }
 
         // Determine the sliding range, centered around the current page.
-        $nNumAdjacents = (int)floor(($this->nMaxPages - 4) / 2);
+        $nNumAdjacents = (int) floor(($this->nMaxPages - 4) / 2);
 
         $nSlidingStart = 1;
         $nSlidingEndOffset = $nNumAdjacents + 3 - $this->nCurrentPage;
-        if($nSlidingEndOffset < 0)
+        if ($nSlidingEndOffset < 0)
         {
             $nSlidingStart = $this->nCurrentPage - $nNumAdjacents;
             $nSlidingEndOffset = 0;
@@ -292,23 +292,23 @@ 
 
         $nSlidingEnd = $this->nTotalPages;
         $nSlidingStartOffset = $this->nCurrentPage + $nNumAdjacents + 2 - $this->nTotalPages;
-        if($nSlidingStartOffset < 0)
+        if ($nSlidingStartOffset < 0)
         {
             $nSlidingEnd = $this->nCurrentPage + $nNumAdjacents;
             $nSlidingStartOffset = 0;
         }
 
         // Build the list of page numbers.
-        if($nSlidingStart > 1)
+        if ($nSlidingStart > 1)
         {
             $aPageNumbers[] = 1;
             $aPageNumbers[] = 0; // Ellipsys;
         }
-        for($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
+        for ($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
         {
             $aPageNumbers[] = $i;
         }
-        if($nSlidingEnd < $this->nTotalPages)
+        if ($nSlidingEnd < $this->nTotalPages)
         {
             $aPageNumbers[] = 0; // Ellipsys;
             $aPageNumbers[] = $this->nTotalPages;
@@ -341,13 +341,13 @@ 
      */
     public function pages(): array
     {
-        if($this->nTotalPages < 2)
+        if ($this->nTotalPages < 2)
         {
             return [];
         }
 
         return array_map(function($aPage) {
-            return (object)['type' => $aPage[0], 'text' => $aPage[1], 'call' => $aPage[2]];
+            return (object) ['type' => $aPage[0], 'text' => $aPage[1], 'call' => $aPage[2]];
         }, $this->links());
     }
 
@@ -375,7 +375,7 @@ 
      */
     public function __toString()
     {
-        if($this->nTotalPages < 2)
+        if ($this->nTotalPages < 2)
         {
             return '';
         }

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

Switch Indentation +13 added lines, -13 removed lines

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

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,7 +194,7 @@ 
     {
         $cType = substr($sValue, 0, 1);
         $sValue = substr($sValue, 1);
-        switch($cType)
+        switch ($cType)
         {
         case 'S':
             $value = !$sValue ? '' : $sValue;
@@ -203,7 +203,7 @@ 
             $value = $this->convertStringToBool($sValue);
             break;
         case 'N':
-            $value = ($sValue == floor($sValue) ? (int)$sValue : (float)$sValue);
+            $value = ($sValue == floor($sValue) ? (int) $sValue : (float) $sValue);
             break;
         case '*':
         default:
@@ -222,7 +222,7 @@ 
      */
     private function decodeRequestParameter(string $sParam)
     {
-        if($sParam === '')
+        if ($sParam === '')
         {
             return $sParam;
         }
@@ -230,7 +230,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;
         }
@@ -245,9 +245,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'];
             }
@@ -255,13 +255,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);
     }
 
@@ -274,7 +274,7 @@ 
      */
     private function decodeUtf8Parameter($xValue)
     {
-        if(is_string($xValue))
+        if (is_string($xValue))
         {
             return call_user_func($this->cUtf8Decoder, $xValue);
         }
@@ -294,7 +294,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);
@@ -315,7 +315,7 @@ 
     {
         $this->setParamDecoder();
         $aParams = $this->getRequestParameters();
-        if(!$this->xConfigManager->getOption('core.decode_utf8'))
+        if (!$this->xConfigManager->getOption('core.decode_utf8'))
         {
             return $aParams;
         }

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

src/Response/Response.php

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
      */
     public function getOutput(): string
     {
-        if($this->getCommandCount() === 0)
+        if ($this->getCommandCount() === 0)
         {
             return '';
         }
@@ -147,7 +147,7 @@ 
      */
     public function bag(string $sName): DataBagContext
     {
-        return $this->plugin('bags')->bag($sName);;
+        return $this->plugin('bags')->bag($sName); ;
     }
 
     /**
@@ -161,7 +161,7 @@ 
     public function addCommand(array $aAttributes, $mData): Response
     {
         $aAttributes = array_map(function($xAttribute) {
-            return is_integer($xAttribute) ? $xAttribute : trim((string)$xAttribute, " \t");
+            return is_integer($xAttribute) ? $xAttribute : trim((string) $xAttribute, " \t");
         }, $aAttributes);
         $aAttributes['data'] = $mData;
         $this->aCommands[] = $aAttributes;
@@ -181,9 +181,9 @@ 
     protected function _addCommand(string $sName, array $aAttributes, $mData, bool $bRemoveEmpty = false): Response
     {
         $mData = is_array($mData) ? array_map(function($sData) {
-            return trim((string)$sData, " \t\n");
-        }, $mData) : trim((string)$mData, " \t\n");
-        if($bRemoveEmpty)
+            return trim((string) $sData, " \t\n");
+        }, $mData) : trim((string) $mData, " \t\n");
+        if ($bRemoveEmpty)
         {
             $aAttributes = array_filter($aAttributes, function($xValue) {
                 return $xValue === '';
@@ -216,7 +216,7 @@ 
     public function toPsr(): PsrResponseInterface
     {
         $xPsrResponse = $this->xPsr17Factory->createResponse(200);
-        if($this->di->getRequest()->getMethod() === 'GET')
+        if ($this->di->getRequest()->getMethod() === 'GET')
         {
             $xPsrResponse = $xPsrResponse
                 ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')