jaxon-php / jaxon-upload

src/UploadHandler.php

Spacing +6 added lines, -6 removed lines

@@ -135,12 +135,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']);
         }
@@ -158,7 +158,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 !== '';
@@ -178,7 +178,7 @@ 
      */
     public function processRequest(ServerRequestInterface $xRequest): bool
     {
-        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.
@@ -186,7 +186,7 @@ 
             return true;
         }
 
-        if($this->bIsAjaxRequest)
+        if ($this->bIsAjaxRequest)
         {
             // Ajax request with upload.
             // Copy the uploaded files from the HTTP request.
@@ -203,7 +203,7 @@ 
             $sTempFile = $this->xUploadManager->saveToTempFile($this->aUserFiles);
             $this->xResponseManager->append(new UploadResponse($this->xPsr17Factory, $sTempFile));
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $this->xResponseManager->append(new UploadResponse($this->xPsr17Factory, '', $e->getMessage()));
         }

Braces +1 added lines, -2 removed lines

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

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/FileStorage.php

Spacing +5 added lines, -6 removed lines

@@ -80,8 +80,7 @@ 
     {
         // Local file system adapter
         $this->registerAdapter('local', function(string $sRootDir, $xOptions) {
-            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) :
-                new LocalFilesystemAdapter($sRootDir, $xOptions);
+            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) : new LocalFilesystemAdapter($sRootDir, $xOptions);
         });
 
         // In memory file system adapter
@@ -144,7 +143,7 @@ 
     public function filesystem(string $sField = ''): Filesystem
     {
         $sField = trim($sField);
-        if(isset($this->aFilesystems[$sField]))
+        if (isset($this->aFilesystems[$sField]))
         {
             return $this->aFilesystems[$sField];
         }
@@ -154,18 +153,18 @@ 
         $sRootDir = $this->xConfigManager->getOption('upload.default.dir', '');
         $aOptions = $this->xConfigManager->getOption('upload.default.options');
         $sConfigKey = "upload.files.$sField";
-        if($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
+        if ($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
         {
             $sStorage = $this->xConfigManager->getOption("$sConfigKey.storage", $sStorage);
             $sRootDir = $this->xConfigManager->getOption("$sConfigKey.dir", $sRootDir);
             $aOptions = $this->xConfigManager->getOption("$sConfigKey.options", $aOptions);
         }
 
-        if(!is_string($sRootDir))
+        if (!is_string($sRootDir))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.dir'));
         }
-        if(!isset($this->aAdapters[$sStorage]))
+        if (!isset($this->aAdapters[$sStorage]))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
         }

src/Manager/UploadManager.php

Spacing +20 added lines, -20 removed lines

@@ -154,13 +154,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)

         {

             jaxon()->logger()->error('Filesystem error', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -204,14 +204,14 @@ 
     private function makeUploadedFile(UploadedFile $xHttpFile, string $sUploadDir, string $sField): File

     {

         // Check the uploaded file validity

-        if($xHttpFile->getError())

+        if ($xHttpFile->getError())

         {

             throw new RequestException($this->xTranslator->trans('errors.upload.failed', ['name' => $sField]));

         }

 

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

         }

@@ -219,7 +219,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());

         }

@@ -244,16 +244,16 @@ 
 

         $aUserFiles = [];

         $this->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)

             {

                 $aUserFiles[$sField][] = $this->makeUploadedFile($xHttpFile, $sUploadDir, $sField);

             }

@@ -261,12 +261,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());

             }

         }

-        catch(FilesystemException $e)

+        catch (FilesystemException $e)

         {

             jaxon()->logger()->error('Filesystem error', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -286,10 +286,10 @@ 
     {

         // Convert uploaded file to an array

         $aFiles = [];

-        foreach($aUserFiles as $sField => $aFieldFiles)

+        foreach ($aUserFiles as $sField => $aFieldFiles)

         {

             $aFiles[$sField] = [];

-            foreach($aFieldFiles as $aFieldFile)

+            foreach ($aFieldFiles as $aFieldFile)

             {

                 $aFiles[$sField][] = $aFieldFile->toTempData();

             }

@@ -301,7 +301,7 @@ 
         {

             $this->xFileStorage->filesystem()->write($sUploadDir . $sTempFile . '.json', json_encode($aFiles));

         }

-        catch(FilesystemException $e)

+        catch (FilesystemException $e)

         {

             jaxon()->logger()->error('Filesystem error', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -320,7 +320,7 @@ 
     private 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'));

         }

@@ -328,13 +328,13 @@ 
         $sUploadTempFile = $sUploadDir . $sTempFile . '.json';

         try

         {

-            if($this->xFileStorage->filesystem()->visibility($sUploadTempFile) !== Visibility::PUBLIC)

+            if ($this->xFileStorage->filesystem()->visibility($sUploadTempFile) !== Visibility::PUBLIC)

             {

                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));

             }

             return $sUploadTempFile;

         }

-        catch(FilesystemException $e)

+        catch (FilesystemException $e)

         {

             jaxon()->logger()->error('Filesystem error', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -358,15 +358,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 $sField => $aFieldFiles)

+        foreach ($aFiles as $sField => $aFieldFiles)

         {

             $aUserFiles[$sField] = [];

-            foreach($aFieldFiles as $aFieldFile)

+            foreach ($aFieldFiles as $aFieldFile)

             {

                 $aUserFiles[$sField][] = File::fromTempFile($this->xFileStorage->filesystem($sField), $aFieldFile);

             }

@@ -375,7 +375,7 @@ 
         {

             $xFileSystem->delete($sUploadTempFile);

         }

-        catch(FilesystemException $e)

+        catch (FilesystemException $e)

         {

             jaxon()->logger()->warning('Filesystem error', ['message' => $e->getMessage()]);

         }

Braces +6 added lines, -12 removed lines

@@ -159,8 +159,7 @@ 
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));

             }

             return $sUploadDir;

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             jaxon()->logger()->error('Filesystem error', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -265,8 +264,7 @@ 
             {

                 $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream());

             }

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             jaxon()->logger()->error('Filesystem error', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -300,8 +298,7 @@ 
         try

         {

             $this->xFileStorage->filesystem()->write($sUploadDir . $sTempFile . '.json', json_encode($aFiles));

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             jaxon()->logger()->error('Filesystem error', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -333,8 +330,7 @@ 
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));

             }

             return $sUploadTempFile;

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             jaxon()->logger()->error('Filesystem error', ['message' => $e->getMessage()]);

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

@@ -357,8 +353,7 @@ 
         try

         {

             $aFiles = json_decode($xFileSystem->read($sUploadTempFile), true);

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

         }

@@ -374,8 +369,7 @@ 
         try

         {

             $xFileSystem->delete($sUploadTempFile);

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             jaxon()->logger()->warning('Filesystem error', ['message' => $e->getMessage()]);

         }

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;

         }

src/UploadResponse.php

Spacing +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
     public function getOutput(): string

     {

         $sResult = json_encode(($this->sUploadedFile) ?

-            ['code' => 'success', 'upl' => $this->sUploadedFile] :

-            ['code' => 'error', 'msg' => $this->sErrorMessage]) . ';';

+            ['code' => 'success', 'upl' => $this->sUploadedFile] : ['code' => 'error', 'msg' => $this->sErrorMessage]) . ';';

         $sConsoleLog = array_reduce($this->aDebugMessages, function($sJsLog, $sMessage) {

             return "$sJsLog\n\t" . 'console.log("' . addslashes($sMessage) . '");';

         }, '');