jaxon-php / jaxon-upload

src/start.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
  */
 function register(Container $di, bool $bForce = false)
 {
-    if(!$bForce && $di->h(UploadHandler::class))
+    if (!$bForce && $di->h(UploadHandler::class))
     {
         return;
     }
@@ -73,7 +73,7 @@ 
 {
     $di = jaxon()->di();
     $sEventListenerKey = UploadHandler::class . '\\ConfigListener';
-    if($di->h($sEventListenerKey))
+    if ($di->h($sEventListenerKey))
     {
         return;
     }
@@ -86,7 +86,7 @@ 
             public function onChange(Config $xConfig, string $sName)
             {
                 $sConfigKey = 'core.upload.enabled';
-                if(($sName === $sConfigKey || $sName === '') && $xConfig->getOption($sConfigKey))
+                if (($sName === $sConfigKey || $sName === '') && $xConfig->getOption($sConfigKey))
                 {
                     register(jaxon()->di());
                 }

src/Manager/UploadManager.php

Spacing +20 added lines, -20 removed lines

@@ -153,13 +153,13 @@ 
         try
         {
             $xFilesystem->createDirectory($sUploadDir);
-            if($xFilesystem->visibility($sUploadDir) !== Visibility::PUBLIC)
+            if ($xFilesystem->visibility($sUploadDir) !== Visibility::PUBLIC)
             {
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));
             }
             return $sUploadDir;
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -205,20 +205,20 @@ 
     private function makeUploadedFile(Filesystem $xFilesystem, string $sUploadDir, string $sVarName, UploadedFile $xHttpFile): File
     {
         // 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($xFilesystem, $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());
         }
         // 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);
         }
@@ -243,16 +243,16 @@ 
 
         $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
             [$xFilesystem, $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($xFilesystem, $sUploadDir, $sVarName, $xHttpFile);
             }
@@ -260,12 +260,12 @@ 
         // Copy the uploaded files from the temp dir to the user dir
         try
         {
-            foreach($this->aAllFiles as $aFiles)
+            foreach ($this->aAllFiles as $aFiles)
             {
                 $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream()->getContents());
             }
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -284,10 +284,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();
             }
@@ -299,7 +299,7 @@ 
         {
             $xFilesystem->write($sUploadDir . $sTempFile . '.json', json_encode($aFiles));
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -317,7 +317,7 @@ 
     private function getUploadTempFile(string $sTempFile): array
     {
         // Verify file name validity
-        if(!$this->xValidator->validateTempFileName($sTempFile))
+        if (!$this->xValidator->validateTempFileName($sTempFile))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.invalid'));
         }
@@ -325,13 +325,13 @@ 
         $sUploadTempFile = $sUploadDir . $sTempFile . '.json';
         try
         {
-            if($xFilesystem->visibility($sUploadTempFile) !== Visibility::PUBLIC)
+            if ($xFilesystem->visibility($sUploadTempFile) !== Visibility::PUBLIC)
             {
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));
             }
             return [$xFilesystem, $sUploadTempFile];
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -353,15 +353,15 @@ 
         {
             $aFiles = json_decode($xFilesystem->read($sUploadTempFile), true);
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
         $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($xFilesystem, $aVarFile);
             }
@@ -370,7 +370,7 @@ 
         {
             $xFilesystem->delete($sUploadTempFile);
         }
-        catch(FilesystemException $e){/* Not a big deal if the file cannot be deleted. */}
+        catch (FilesystemException $e) {/* Not a big deal if the file cannot be deleted. */}
         return $aUserFiles;
     }
 }

Braces +6 added lines, -12 removed lines

@@ -158,8 +158,7 @@ 
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));
             }
             return $sUploadDir;
-        }
-        catch(FilesystemException $e)
+        } catch(FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -264,8 +263,7 @@ 
             {
                 $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream()->getContents());
             }
-        }
-        catch(FilesystemException $e)
+        } catch(FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -298,8 +296,7 @@ 
         try
         {
             $xFilesystem->write($sUploadDir . $sTempFile . '.json', json_encode($aFiles));
-        }
-        catch(FilesystemException $e)
+        } catch(FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -330,8 +327,7 @@ 
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));
             }
             return [$xFilesystem, $sUploadTempFile];
-        }
-        catch(FilesystemException $e)
+        } catch(FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -352,8 +348,7 @@ 
         try
         {
             $aFiles = json_decode($xFilesystem->read($sUploadTempFile), true);
-        }
-        catch(FilesystemException $e)
+        } catch(FilesystemException $e)
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
         }
@@ -369,8 +364,7 @@ 
         try
         {
             $xFilesystem->delete($sUploadTempFile);
-        }
-        catch(FilesystemException $e){/* Not a big deal if the file cannot be deleted. */}
+        } catch(FilesystemException $e){/* Not a big deal if the file cannot be deleted. */}
         return $aUserFiles;
     }
 }

src/Manager/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,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;
@@ -118,7 +118,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)))
         {
@@ -140,25 +140,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;
         }