jaxon-php / jaxon-mono

jaxon-upload/src/Manager/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -83,7 +83,7 @@ 
     {
         $xDefault = $this->xConfigManager->getAppOption('upload.default.' . $sProperty);
         $aAllowed = $this->xConfigManager->getAppOption('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->getAppOption('upload.default.' . $sProperty, 0);
         $nSize = $this->xConfigManager->getAppOption('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 +13 added lines, -13 removed lines

@@ -130,13 +130,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'));
@@ -152,7 +152,7 @@ 
     public function filesystem(string $sField = ''): Filesystem
     {
         $sField = trim($sField);
-        if(isset($this->aFilesystems[$sField]))
+        if (isset($this->aFilesystems[$sField]))
         {
             return $this->aFilesystems[$sField];
         }
@@ -160,11 +160,11 @@ 
         // Default upload dir
         $sStorage = $this->xConfigManager->getAppOption('upload.default.storage', 'upload');
         $sConfigKey = "upload.files.$sField";
-        if($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
+        if ($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
         {
             $sStorage = $this->xConfigManager->getAppOption("$sConfigKey.storage", $sStorage);
         }
-        if(!is_string($sStorage))
+        if (!is_string($sStorage))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
         }
@@ -201,7 +201,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,
@@ -215,7 +215,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);
@@ -224,7 +224,7 @@ 
         // Set the user file data
         $xFile = File::fromHttpFile($this->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());
         }
@@ -248,16 +248,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'];
@@ -268,14 +268,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'));

jaxon-upload/src/register.php

Spacing +4 added lines, -4 removed lines

@@ -23,13 +23,13 @@ 
 function registerUpload(): void
 {
     $jaxon = jaxon();
-    if(!$jaxon->getAppOption('upload.enabled'))
+    if (!$jaxon->getAppOption('upload.enabled'))
     {
         return;
     }
 
     $di = $jaxon->di();
-    if($di->h(UploadHandler::class))
+    if ($di->h(UploadHandler::class))
     {
         return;
     }
@@ -76,7 +76,7 @@ 
         $xUploadHandler = $di->g(UploadHandler::class);
         // The HTTP request
         $xRequest = $di->getRequest();
-        if($xUploadHandler->canProcessRequest($xRequest))
+        if ($xUploadHandler->canProcessRequest($xRequest))
         {
             $xUploadHandler->processRequest($xRequest);
         }
@@ -97,7 +97,7 @@ 
 function register()
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };