jaxon-php / jaxon-mono

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;

 }

jaxon-core/src/App/Component/ComponentTrait.php

Switch Indentation +44 added lines, -44 removed lines

@@ -14,41 +14,41 @@ 
 
 trait ComponentTrait
 {
-    /**
+/**
      * Get the component helper
      *
      * @return ComponentHelper
      */
-    abstract protected function helper(): ComponentHelper;
+abstract protected function helper(): ComponentHelper;
 
-    /**
+/**
      * Get the Ajax response
      *
      * @return AjaxResponse
      */
-    abstract protected function response(): AjaxResponse;
+abstract protected function response(): AjaxResponse;
 
-    /**
+/**
      * Get the Jaxon request target
      *
      * @return TargetInterface|null
      */
-    protected function target(): ?TargetInterface
-    {
-        return $this->helper()->xTarget;
-    }
+protected function target(): ?TargetInterface
+{
+return $this->helper()->xTarget;
+}
 
-    /**
+/**
      * Get the temp cache
      *
      * @return Stash
      */
-    protected function stash(): Stash
-    {
-        return $this->helper()->xStash;
-    }
+protected function stash(): Stash
+{
+return $this->helper()->xStash;
+}
 
-    /**
+/**
      * Get an instance of a Jaxon class by name
      *
      * @template T
@@ -57,60 +57,60 @@ 
      * @return T|null
      * @throws SetupException
      */
-    protected function cl(string $sClassName): mixed
-    {
-        return $this->helper()->cl($sClassName);
-    }
+protected function cl(string $sClassName): mixed
+{
+return $this->helper()->cl($sClassName);
+}
 
-    /**
+/**
      * Get the logger
      *
      * @return LoggerInterface
      */
-    protected function logger(): LoggerInterface
-    {
-        return $this->helper()->xLogger;
-    }
+protected function logger(): LoggerInterface
+{
+return $this->helper()->xLogger;
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    protected function view(): ViewRenderer
-    {
-        return $this->helper()->xViewRenderer;
-    }
+protected function view(): ViewRenderer
+{
+return $this->helper()->xViewRenderer;
+}
 
-    /**
+/**
      * Get the session manager
      *
      * @return SessionInterface
      */
-    protected function session(): SessionInterface
-    {
-        return $this->helper()->xSessionManager;
-    }
+protected function session(): SessionInterface
+{
+return $this->helper()->xSessionManager;
+}
 
-    /**
+/**
      * Get the uploaded files
      *
      * @return array
      */
-    protected function files(): array
-    {
-        return $this->helper()->xUploadHandler->files();
-    }
+protected function files(): array
+{
+return $this->helper()->xUploadHandler->files();
+}
 
-    /**
+/**
      * Get a data bag.
      *
      * @param string  $sBagName
      *
      * @return DataBagContext
      */
-    protected function bag(string $sBagName): DataBagContext
-    {
-        return $this->response()->bag($sBagName);
-    }
+protected function bag(string $sBagName): DataBagContext
+{
+return $this->response()->bag($sBagName);
+}
 }

jaxon-core/src/App/Component/Pagination.php

Switch Indentation +13 added lines, -13 removed lines

@@ -8,19 +8,19 @@ 
 
 class Pagination extends AbstractComponent
 {
-    use HelperTrait;
-    use NodeResponseTrait;
+use HelperTrait;
+use NodeResponseTrait;
 
-    /**
+/**
      * @inheritDoc
      */
-    protected function initComponent(Container $di, ComponentHelper $xHelper): void
-    {
-        $this->setHelper($xHelper);
-        $this->setNodeResponse($di);
-    }
+protected function initComponent(Container $di, ComponentHelper $xHelper): void
+{
+$this->setHelper($xHelper);
+$this->setNodeResponse($di);
+}
 
-    /**
+/**
      * Create a paginator.
      *
      * @param int $nPageNumber      The current page number
@@ -29,8 +29,8 @@ 
      *
      * @return Paginator
      */
-    final public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
-    {
-        return $this->nodeResponse->paginator($nPageNumber, $nItemsPerPage, $nTotalItems);
-    }
+final public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
+{
+return $this->nodeResponse->paginator($nPageNumber, $nItemsPerPage, $nTotalItems);
+}
 }

jaxon-core/src/App/Component/AbstractComponent.php

Switch Indentation +9 added lines, -9 removed lines

@@ -8,14 +8,14 @@ 
 
 abstract class AbstractComponent
 {
-    /**
+/**
      * Get the component helper
      *
      * @return ComponentHelper
      */
-    abstract protected function helper(): ComponentHelper;
+abstract protected function helper(): ComponentHelper;
 
-    /**
+/**
      * Initialize the component
      *
      * @param Container $di
@@ -23,17 +23,17 @@ 
      *
      * @return void
      */
-    abstract protected function initComponent(Container $di, ComponentHelper $xHelper);
+abstract protected function initComponent(Container $di, ComponentHelper $xHelper);
 
-    /**
+/**
      * Get the js call factory.
      *
      * @param string $sClassName
      *
      * @return JxnCall
      */
-    protected function rq(string $sClassName = ''): JxnCall
-    {
-        return $this->helper()->rq($sClassName);
-    }
+protected function rq(string $sClassName = ''): JxnCall
+{
+return $this->helper()->rq($sClassName);
+}
 }