jaxon-php / jaxon-mono

jaxon-upload/src/register.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 {
     $jaxon = jaxon();
     $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);
         }
@@ -92,7 +92,7 @@ 
 {
     $jaxon = jaxon();
     $jaxon->callback()->boot(function() use($jaxon) {
-        if($jaxon->getOption('core.upload.enabled'))
+        if ($jaxon->getOption('core.upload.enabled'))
         {
             registerUpload();
         }
@@ -102,7 +102,7 @@ 
 function register()
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };

jaxon-upload/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'));
         }

jaxon-upload/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;

         }

jaxon-upload/src/Manager/UploadManager.php

Spacing +10 added lines, -10 removed lines

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

         {

             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);

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

@@ -173,7 +173,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,

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

         }

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

         }

@@ -217,16 +217,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);

             }

@@ -234,12 +234,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)

         {

             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);

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

Braces +2 added lines, -4 removed lines

@@ -138,8 +138,7 @@ 
                 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'));

@@ -238,8 +237,7 @@ 
             {

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

             }

-        }

-        catch(FilesystemException $e)

+        } catch(FilesystemException $e)

         {

             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);

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

jaxon-core/src/App/Dialog/Manager/LibraryRegistryInterface.php

Switch Indentation +6 added lines, -6 removed lines

@@ -19,24 +19,24 @@
 
 interface LibraryRegistryInterface
 {
-    /**
+/**
      * Get the AlertInterface library
      *
      * @return AlertInterface
      */
-    public function getAlertLibrary(): AlertInterface;
+public function getAlertLibrary(): AlertInterface;
 
-    /**
+/**
      * Get the ConfirmInterface library
      *
      * @return ConfirmInterface
      */
-    public function getConfirmLibrary(): ConfirmInterface;
+public function getConfirmLibrary(): ConfirmInterface;
 
-    /**
+/**
      * Get the ModalInterface library
      *
      * @return ModalInterface|null
      */
-    public function getModalLibrary(): ?ModalInterface;
+public function getModalLibrary(): ?ModalInterface;
 }

jaxon-core/src/App/Dialog/Library/LibraryInterface.php

Switch Indentation +12 added lines, -12 removed lines

@@ -16,45 +16,45 @@
 
 interface LibraryInterface
 {
-    /**
+/**
      * Get the library name
      *
      * @return string
      */
-    public function getName(): string;
+public function getName(): string;
 
-    /**
+/**
      * Get the library base URI
      *
      * @return string
      */
-    public function getUri(): string;
+public function getUri(): string;
 
-    /**
+/**
      * Get the CSS header code and file includes
      *
      * @return string
      */
-    public function getCss(): string;
+public function getCss(): string;
 
-    /**
+/**
      * Get the javascript header code and file includes
      *
      * @return string
      */
-    public function getJs(): string;
+public function getJs(): string;
 
-    /**
+/**
      * Get the javascript code to be printed into the page
      *
      * @return string
      */
-    public function getScript(): string;
+public function getScript(): string;
 
-    /**
+/**
      * Get the javascript codes to include into the page
      *
      * @return JsCode|null
      */
-    public function getJsCode(): ?JsCode;
+public function getJsCode(): ?JsCode;
 }

jaxon-core/src/App/Dialog/DialogTrait.php

Switch Indentation +12 added lines, -12 removed lines

@@ -6,24 +6,24 @@
 

 trait DialogTrait

 {

-    /**

+/**

      * @return AjaxResponse

      */

-    abstract protected function response(): AjaxResponse;

+abstract protected function response(): AjaxResponse;

 

-    /**

+/**

      * @return AlertInterface

      */

-    protected function alert(): AlertInterface

-    {

-        return $this->response()->dialog;

-    }

+protected function alert(): AlertInterface

+{

+return $this->response()->dialog;

+}

 

-    /**

+/**

      * @return ModalInterface

      */

-    protected function modal(): ModalInterface

-    {

-        return $this->response()->dialog;

-    }

+protected function modal(): ModalInterface

+{

+return $this->response()->dialog;

+}

 }

jaxon-core/src/App/Dialog/ModalInterface.php

Switch Indentation +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
 

 interface ModalInterface

 {

-    /**

+/**

      * Show a modal dialog.

      *

      * @param string $sTitle The title of the dialog

@@ -26,12 +26,12 @@ 
      *

      * @return void

      */

-    public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void;

+public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void;

 

-    /**

+/**

      * Hide the modal dialog.

      *

      * @return void

      */

-    public function hide(): void;

+public function hide(): void;

 }

jaxon-core/src/App/Dialog/AlertInterface.php

Switch Indentation +10 added lines, -10 removed lines

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

 interface AlertInterface

 {

-    /**

+/**

      * Set the title of the next message.

      *

      * @param string $sTitle     The title of the message

      *

      * @return AlertInterface

      */

-    public function title(string $sTitle): AlertInterface;

+public function title(string $sTitle): AlertInterface;

 

-    /**

+/**

      * Show a success message.

      *

      * @param string $sMessage  The text of the message

@@ -33,9 +33,9 @@ 
      *

      * @return void

      */

-    public function success(string $sMessage, ...$aArgs): void;

+public function success(string $sMessage, ...$aArgs): void;

 

-    /**

+/**

      * Show an information message.

      *

      * @param string $sMessage  The text of the message

@@ -43,9 +43,9 @@ 
      *

      * @return void

      */

-    public function info(string $sMessage, ...$aArgs): void;

+public function info(string $sMessage, ...$aArgs): void;

 

-    /**

+/**

      * Show a warning message.

      *

      * @param string $sMessage  The text of the message

@@ -53,9 +53,9 @@ 
      *

      * @return void

      */

-    public function warning(string $sMessage, ...$aArgs): void;

+public function warning(string $sMessage, ...$aArgs): void;

 

-    /**

+/**

      * Show an error message.

      *

      * @param string $sMessage  The text of the message

@@ -63,5 +63,5 @@ 
      *

      * @return void

      */

-    public function error(string $sMessage, ...$aArgs): void;

+public function error(string $sMessage, ...$aArgs): void;

 }