jaxon-php / jaxon-mono

jaxon-core/src/Request/Handler/ParameterReader.php

Spacing +5 added lines, -5 removed lines

@@ -80,11 +80,11 @@ 
     private function decoderUtf8Str(string $sStr): string
     {
         $sEncoding = $this->xConfigManager->getOption('core.encoding', '');
-        if(function_exists('iconv'))
+        if (function_exists('iconv'))
         {
             return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
         }
-        if(function_exists('mb_convert_encoding'))
+        if (function_exists('mb_convert_encoding'))
         {
             return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
         }
@@ -103,7 +103,7 @@ 
     private function decodeRequestParameter(string $sParam): string
     {
         $sParam = $this->decodeStr($sParam);
-        if(!$this->xConfigManager->getOption('core.decode_utf8'))
+        if (!$this->xConfigManager->getOption('core.decode_utf8'))
         {
             return $sParam;
         }
@@ -121,13 +121,13 @@ 
         $aBody = $xRequest->getParsedBody();
         $aParams = is_array($aBody) ? $aBody : $xRequest->getQueryParams();
         // Check if Jaxon call parameters are present.
-        if(isset($aParams['jxncall']) && is_string($aParams['jxncall']))
+        if (isset($aParams['jxncall']) && is_string($aParams['jxncall']))
         {
             $xRequest = $xRequest->withAttribute('jxncall', json_decode($this
                 ->decodeRequestParameter($aParams['jxncall']), true));
         }
         // Check if Jaxon bags parameters are present.
-        if(isset($aParams['jxnbags']) && is_string($aParams['jxnbags']))
+        if (isset($aParams['jxnbags']) && is_string($aParams['jxnbags']))
         {
             $xRequest = $xRequest->withAttribute('jxnbags', json_decode($this
                 ->decodeRequestParameter($aParams['jxnbags']), true));

jaxon-core/src/Plugin/Response/Databag/DatabagPlugin.php

Spacing +3 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      */
     private function initDatabag(): void
     {
-        if($this->xDatabag !== null)
+        if ($this->xDatabag !== null)
         {
             return;
         }
@@ -62,8 +62,7 @@ 
         // Todo: clean input data.
         // Todo: verify the checksums.
         return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
+            (json_decode($xData, true) ?: []) : (is_array($xData) ? $xData : []);
     }
 
     /**
@@ -81,7 +80,7 @@ 
     public function writeCommand(): void
     {
         $this->initDatabag();
-        if($this->xDatabag->touched())
+        if ($this->xDatabag->touched())
         {
             // Todo: calculate the checksums.
             $this->addCommand('databag.set', ['values' => $this->xDatabag]);

jaxon-core/templates/callables/objects.js.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
   rc: (name, method, parameters, options = {}) => jaxon.request({ type: 'class', name, method }, { parameters, ...options}),
   rf: (name, parameters, options = {}) => jaxon.request({ type: 'func', name }, { parameters, ...options}),
 <?php
-foreach($this->aCallableNames as $nIndex => $sName):
+foreach ($this->aCallableNames as $nIndex => $sName):
   echo "  c$nIndex: '$sName',\n";
 endforeach
 ?>

jaxon-upload/src/Manager/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -83,7 +83,7 @@ 
     {
         $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty);
         $aAllowed = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $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;
@@ -104,7 +104,7 @@ 
     {
         $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty, 0);
         $nSize = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);
-        if($nSize > 0 && (
+        if ($nSize > 0 && (
             ($sProperty == 'max-size' && $nFileSize > $nSize) ||
             ($sProperty == 'min-size' && $nFileSize < $nSize)))
         {
@@ -126,25 +126,25 @@ 
     {
         $this->sErrorMessage = '';
         // Verify the file extension
-        if(!$this->validateFileProperty($sVarName, $xFile->type(), 'types', 'type'))
+        if (!$this->validateFileProperty($sVarName, $xFile->type(), 'types', 'type'))
         {
             return false;
         }
 
         // Verify the file extension
-        if(!$this->validateFileProperty($sVarName, $xFile->extension(), 'extensions', 'extension'))
+        if (!$this->validateFileProperty($sVarName, $xFile->extension(), 'extensions', 'extension'))
         {
             return false;
         }
 
         // Verify the max size
-        if(!$this->validateFileSize($sVarName, $xFile->size(), 'max-size'))
+        if (!$this->validateFileSize($sVarName, $xFile->size(), 'max-size'))
         {
             return false;
         }
 
         // Verify the min size
-        if(!$this->validateFileSize($sVarName, $xFile->size(), 'min-size'))
+        if (!$this->validateFileSize($sVarName, $xFile->size(), 'min-size'))
         {
             return false;
         }

jaxon-upload/src/Manager/UploadManager.php

Spacing +10 added lines, -10 removed lines

@@ -121,13 +121,13 @@ 
         try
         {
             $xFilesystem->createDirectory($sUploadDir);
-            if(!$xFilesystem->directoryExists($sUploadDir))
+            if (!$xFilesystem->directoryExists($sUploadDir))
             {
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));
             }
             return $sUploadDir;
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
@@ -162,7 +162,7 @@ 
     {
         // Check the uploaded file validity
         $nErrorCode = $xHttpFile->getError();
-        if($nErrorCode !== UPLOAD_ERR_OK)
+        if ($nErrorCode !== UPLOAD_ERR_OK)
         {
             $this->xLogger->error('File upload error.', [
                 'code' => $nErrorCode,
@@ -176,7 +176,7 @@ 
 
         // 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, $sField, $this->sUploadFieldId);
@@ -185,7 +185,7 @@ 
         // Set the user file data
         $xFile = File::fromHttpFile($this->xFileStorage->filesystem($sField), $xHttpFile, $sUploadDir, $sName);
         // Verify file validity (format, size)
-        if(!$this->xValidator->validateUploadedFile($sField, $xFile))
+        if (!$this->xValidator->validateUploadedFile($sField, $xFile))
         {
             throw new RequestException($this->xValidator->getErrorMessage());
         }
@@ -209,16 +209,16 @@ 
 
         $aUserFiles = [];
         $aAllFiles = []; // A flat list of all uploaded files
-        foreach($aTempFiles as $sField => $aFiles)
+        foreach ($aTempFiles as $sField => $aFiles)
         {
             $aUserFiles[$sField] = [];
             // Get the path to the upload dir
             $sUploadDir = $this->getUploadDir($sField);
-            if(!is_array($aFiles))
+            if (!is_array($aFiles))
             {
                 $aFiles = [$aFiles];
             }
-            foreach($aFiles as $xHttpFile)
+            foreach ($aFiles as $xHttpFile)
             {
                 $aFile = $this->makeUploadedFile($xHttpFile, $sUploadDir, $sField);
                 $aUserFiles[$sField][] = $aFile['user'];
@@ -229,14 +229,14 @@ 
         // Copy the uploaded files from the temp dir to the user dir
         try
         {
-            foreach($aAllFiles as $aFiles)
+            foreach ($aAllFiles as $aFiles)
             {
                 $sPath = $aFiles['user']->path();
                 $xContent = $aFiles['temp']->getStream();
                 $aFiles['user']->filesystem()->write($sPath, $xContent);
             }
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));