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

Spacing +22 added lines, -22 removed lines

@@ -113,14 +113,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;
             }
@@ -135,11 +135,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);
             }
@@ -156,10 +156,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);
             }
@@ -176,10 +176,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 @@ 
     public function canProcessRequest(): bool
     {
         // 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);

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

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

Spacing +6 added lines, -6 removed lines

@@ -122,12 +122,12 @@ 
      */
     public function canProcessRequest(ServerRequestInterface $xRequest): bool
     {
-        if(count($xRequest->getUploadedFiles()) > 0)
+        if (count($xRequest->getUploadedFiles()) > 0)
         {
             return true;
         }
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             return isset($aBody['jxnupl']);
         }
@@ -145,7 +145,7 @@ 
     private function setTempFile(ServerRequestInterface $xRequest): bool
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             $this->sTempFile = trim($aBody['jxnupl'] ?? '');
             return $this->sTempFile !== '';
@@ -166,7 +166,7 @@ 
     public function processRequest(ServerRequestInterface $xRequest): bool
     {
         $xUploadManager = $this->di->getUploadManager();
-        if($this->setTempFile($xRequest))
+        if ($this->setTempFile($xRequest))
         {
             // Ajax request following a normal HTTP upload.
             // Copy the previously uploaded files' location from the temp file.
@@ -174,7 +174,7 @@ 
             return true;
         }
 
-        if($this->bIsAjaxRequest)
+        if ($this->bIsAjaxRequest)
         {
             // Ajax request with upload.
             // Copy the uploaded files from the HTTP request.
@@ -191,7 +191,7 @@ 
             $sTempFile = $xUploadManager->saveToTempFile($this->aUserFiles);
             $this->xResponseManager->append(new UploadResponse($this->di->getPsr17Factory(), $sTempFile));
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $this->xResponseManager->append(new UploadResponse($this->di->getPsr17Factory(), '', $e->getMessage()));
         }

Braces +1 added lines, -2 removed lines

@@ -190,8 +190,7 @@
             $this->aUserFiles = $xUploadManager->readFromHttpData($xRequest);
             $sTempFile = $xUploadManager->saveToTempFile($this->aUserFiles);
             $this->xResponseManager->append(new UploadResponse($this->di->getPsr17Factory(), $sTempFile));
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->xResponseManager->append(new UploadResponse($this->di->getPsr17Factory(), '', $e->getMessage()));
         }

src/Request/Upload/UploadManager.php

Spacing +18 added lines, -18 removed lines

@@ -150,12 +150,12 @@ 
     {
         $sUploadDir = realpath(rtrim(trim($sUploadDir), '/\\'));
         // Verify that the upload dir exists and is writable
-        if(!is_dir($sUploadDir) || !is_writable($sUploadDir))
+        if (!is_dir($sUploadDir) || !is_writable($sUploadDir))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
         $sUploadDir .= DIRECTORY_SEPARATOR . $sUploadSubDir . DIRECTORY_SEPARATOR;
-        if(!file_exists($sUploadDir) && !@mkdir($sUploadDir))
+        if (!file_exists($sUploadDir) && !@mkdir($sUploadDir))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -175,7 +175,7 @@ 
         // Default upload dir
         $sDefaultUploadDir = $this->xConfigManager->getOption('upload.default.dir');
         $sUploadDir = $this->xConfigManager->getOption('upload.files.' . $sFieldId . '.dir', $sDefaultUploadDir);
-        if(!is_string($sUploadDir))
+        if (!is_string($sUploadDir))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -192,7 +192,7 @@ 
     {
         // Default upload dir
         $sUploadDir = $this->xConfigManager->getOption('upload.default.dir');
-        if(!is_string($sUploadDir))
+        if (!is_string($sUploadDir))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -213,19 +213,19 @@ 
     {
         // Filename without the extension. Needs to be sanitized.
         $sName = pathinfo($xHttpFile->getClientFilename(), PATHINFO_FILENAME);
-        if($this->cNameSanitizer !== null)
+        if ($this->cNameSanitizer !== null)
         {
-            $sName = (string)call_user_func($this->cNameSanitizer, $sName, $sVarName, $this->sUploadFieldId);
+            $sName = (string) call_user_func($this->cNameSanitizer, $sName, $sVarName, $this->sUploadFieldId);
         }
         // Check the uploaded file validity
-        if($xHttpFile->getError())
+        if ($xHttpFile->getError())
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.failed', ['name' => $sVarName]));
         }
         // Set the user file data
         $xFile = File::fromHttpFile($sName, $sUploadDir, $xHttpFile);
         // Verify file validity (format, size)
-        if(!$this->xValidator->validateUploadedFile($sVarName, $xFile))
+        if (!$this->xValidator->validateUploadedFile($sVarName, $xFile))
         {
             throw new RequestException($this->xValidator->getErrorMessage());
         }
@@ -249,22 +249,22 @@ 
 
         $aUserFiles = [];
         $this->aAllFiles = []; // A flat list of all uploaded files
-        foreach($aTempFiles as $sVarName => $aFiles)
+        foreach ($aTempFiles as $sVarName => $aFiles)
         {
             $aUserFiles[$sVarName] = [];
             // Get the path to the upload dir
             $sUploadDir = $this->getUploadDir($sVarName);
-            if(!is_array($aFiles))
+            if (!is_array($aFiles))
             {
                 $aFiles = [$aFiles];
             }
-            foreach($aFiles as $xHttpFile)
+            foreach ($aFiles as $xHttpFile)
             {
                 $aUserFiles[$sVarName][] = $this->makeUploadedFile($sVarName, $sUploadDir, $xHttpFile);
             }
         }
         // Copy the uploaded files from the temp dir to the user dir
-        foreach($this->aAllFiles as $aFiles)
+        foreach ($this->aAllFiles as $aFiles)
         {
             $aFiles['temp']->moveTo($aFiles['user']->path());
         }
@@ -283,10 +283,10 @@ 
     {
         // Convert uploaded file to an array
         $aFiles = [];
-        foreach($aUserFiles as $sVarName => $aVarFiles)
+        foreach ($aUserFiles as $sVarName => $aVarFiles)
         {
             $aFiles[$sVarName] = [];
-            foreach($aVarFiles as $aVarFile)
+            foreach ($aVarFiles as $aVarFile)
             {
                 $aFiles[$sVarName][] = $aVarFile->toTempData();
             }
@@ -309,14 +309,14 @@ 
     protected function getUploadTempFile(string $sTempFile): string
     {
         // Verify file name validity
-        if(!$this->xValidator->validateTempFileName($sTempFile))
+        if (!$this->xValidator->validateTempFileName($sTempFile))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.invalid'));
         }
         $sUploadDir = $this->xConfigManager->getOption('upload.default.dir', '');
         $sUploadDir = realpath(rtrim(trim($sUploadDir), '/\\')) . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR;
         $sUploadTempFile = $sUploadDir . $sTempFile . '.json';
-        if(!is_readable($sUploadTempFile))
+        if (!is_readable($sUploadTempFile))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -337,10 +337,10 @@ 
         $sUploadTempFile = $this->getUploadTempFile($sTempFile);
         $aFiles = json_decode(file_get_contents($sUploadTempFile), true);
         $aUserFiles = [];
-        foreach($aFiles as $sVarName => $aVarFiles)
+        foreach ($aFiles as $sVarName => $aVarFiles)
         {
             $aUserFiles[$sVarName] = [];
-            foreach($aVarFiles as $aVarFile)
+            foreach ($aVarFiles as $aVarFile)
             {
                 $aUserFiles[$sVarName][] = File::fromTempFile($aVarFile);
             }

src/Request/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -138,7 +138,7 @@ 
     {
         $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty);
         $aAllowed = $this->xConfigManager->getOption('upload.files.' . $sName . '.' . $sProperty, $xDefault);
-        if(is_array($aAllowed) && !in_array($sValue, $aAllowed))
+        if (is_array($aAllowed) && !in_array($sValue, $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, [$sField => $sValue]);
             return false;
@@ -159,7 +159,7 @@ 
     {
         $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty, 0);
         $nSize = $this->xConfigManager->getOption('upload.files.' . $sName . '.' . $sProperty, $xDefault);
-        if($nSize > 0 && (
+        if ($nSize > 0 && (
             ($sProperty == 'max-size' && $nFileSize > $nSize) ||
             ($sProperty == 'min-size' && $nFileSize < $nSize)))
         {
@@ -181,25 +181,25 @@ 
     {
         $this->sErrorMessage = '';
         // Verify the file extension
-        if(!$this->validateFileProperty($sName, $xFile->type(), 'types', 'type'))
+        if (!$this->validateFileProperty($sName, $xFile->type(), 'types', 'type'))
         {
             return false;
         }
 
         // Verify the file extension
-        if(!$this->validateFileProperty($sName, $xFile->extension(), 'extensions', 'extension'))
+        if (!$this->validateFileProperty($sName, $xFile->extension(), 'extensions', 'extension'))
         {
             return false;
         }
 
         // Verify the max size
-        if(!$this->validateFileSize($sName, $xFile->size(), 'max-size'))
+        if (!$this->validateFileSize($sName, $xFile->size(), 'max-size'))
         {
             return false;
         }
 
         // Verify the min size
-        if(!$this->validateFileSize($sName, $xFile->size(), 'min-size'))
+        if (!$this->validateFileSize($sName, $xFile->size(), 'min-size'))
         {
             return false;
         }