jaxon-php / jaxon-mono

jaxon-annotations/src/Annotation/UploadAnnotation.php

Spacing +2 added lines, -3 removed lines

@@ -41,8 +41,7 @@ 
     public static function parseAnnotation($value)
     {
         $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['field' => $aParams[0]] :
-            ['field' => $aParams[0], 'extra' => $aParams[1]];
+        return count($aParams) === 1 ? ['field' => $aParams[0]] : ['field' => $aParams[0], 'extra' => $aParams[1]];
     }
 
     /**
@@ -51,7 +50,7 @@ 
      */
     public function initAnnotation(array $properties)
     {
-        if(count($properties) != 1 || !isset($properties['field']) ||
+        if (count($properties) != 1 || !isset($properties['field']) ||
             !is_string($properties['field']))
         {
             throw new AnnotationException('The @upload annotation requires a property "field" of type string');

jaxon-annotations/src/Annotation/HookAnnotation.php

Switch Indentation +45 added lines, -45 removed lines

@@ -27,64 +27,64 @@
 
 abstract class HookAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * @var string
      */
-    protected $sMethod = '';
+protected $sMethod = '';
 
-    /**
+/**
      * @var array
      */
-    protected $aParams = [];
+protected $aParams = [];
 
-    /**
+/**
      *
      */
-    abstract protected static function getType(): string;
+abstract protected static function getType(): string;
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        if(count($aParams) === 1)
-        {
-            return ['call' => rtrim($aParams[0])];
-        }
-        // The second parameter must be an array of callback parameter in json format.
-        return ['call' => rtrim($aParams[0]), 'with' => json_decode($aParams[1], false)];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+if(count($aParams) === 1)
+{
+return ['call' => rtrim($aParams[0])];
+}
+// The second parameter must be an array of callback parameter in json format.
+return ['call' => rtrim($aParams[0]), 'with' => json_decode($aParams[1], false)];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(!isset($properties['call']) || !is_string($properties['call']))
-        {
-            throw new AnnotationException('The @' . $this->getType() .
-                ' annotation requires a property "call" of type string');
-        }
-        foreach(array_keys($properties) as $propName)
-        {
-            if($propName !== 'call' && $propName !== 'with')
-            {
-                throw new AnnotationException('Unknown property "' . $propName .
-                    '" in the @' . $this->getType() . ' annotation');
-            }
-        }
-        // Cannot use isset here, because it will return false in case $properties['with'] === null
-        if(array_key_exists('with', $properties))
-        {
-            if(!is_array($properties['with']))
-            {
-                throw new AnnotationException('The "with" property of the @' .
-                    $this->getType() . ' annotation must be of type array');
-            }
-            $this->aParams = $properties['with'];
-        }
-        $this->sMethod = $properties['call'];
-    }
+public function initAnnotation(array $properties)
+{
+if(!isset($properties['call']) || !is_string($properties['call']))
+{
+throw new AnnotationException('The @' . $this->getType() .
+    ' annotation requires a property "call" of type string');
+}
+foreach(array_keys($properties) as $propName)
+{
+if($propName !== 'call' && $propName !== 'with')
+{
+    throw new AnnotationException('Unknown property "' . $propName .
+        '" in the @' . $this->getType() . ' annotation');
+}
+}
+// Cannot use isset here, because it will return false in case $properties['with'] === null
+if(array_key_exists('with', $properties))
+{
+if(!is_array($properties['with']))
+{
+    throw new AnnotationException('The "with" property of the @' .
+        $this->getType() . ' annotation must be of type array');
+}
+$this->aParams = $properties['with'];
+}
+$this->sMethod = $properties['call'];
+}
 }

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
     public static function parseAnnotation($value)
     {
         $aParams = preg_split('/[\s]+/', $value, 2);
-        if(count($aParams) === 1)
+        if (count($aParams) === 1)
         {
             return ['call' => rtrim($aParams[0])];
         }
@@ -62,23 +62,23 @@ 
      */
     public function initAnnotation(array $properties)
     {
-        if(!isset($properties['call']) || !is_string($properties['call']))
+        if (!isset($properties['call']) || !is_string($properties['call']))
         {
             throw new AnnotationException('The @' . $this->getType() .
                 ' annotation requires a property "call" of type string');
         }
-        foreach(array_keys($properties) as $propName)
+        foreach (array_keys($properties) as $propName)
         {
-            if($propName !== 'call' && $propName !== 'with')
+            if ($propName !== 'call' && $propName !== 'with')
             {
                 throw new AnnotationException('Unknown property "' . $propName .
                     '" in the @' . $this->getType() . ' annotation');
             }
         }
         // Cannot use isset here, because it will return false in case $properties['with'] === null
-        if(array_key_exists('with', $properties))
+        if (array_key_exists('with', $properties))
         {
-            if(!is_array($properties['with']))
+            if (!is_array($properties['with']))
             {
                 throw new AnnotationException('The "with" property of the @' .
                     $this->getType() . ' annotation must be of type array');

jaxon-annotations/src/AnnotationReader.php

Spacing +13 added lines, -13 removed lines

@@ -114,21 +114,21 @@ 
             fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
         );
         // First check if the class is excluded.
-        foreach($aAnnotations as $xAnnotation)
+        foreach ($aAnnotations as $xAnnotation)
         {
-            if(is_a($xAnnotation, ExcludeAnnotation::class))
+            if (is_a($xAnnotation, ExcludeAnnotation::class))
             {
                 $xAnnotation->saveValue($this->xMetadata);
             }
         }
-        if($this->xMetadata->isExcluded())
+        if ($this->xMetadata->isExcluded())
         {
             return;
         }
 
-        foreach($aAnnotations as $xAnnotation)
+        foreach ($aAnnotations as $xAnnotation)
         {
-            if(!is_a($xAnnotation, ExcludeAnnotation::class))
+            if (!is_a($xAnnotation, ExcludeAnnotation::class))
             {
                 $xAnnotation->saveValue($this->xMetadata);
             }
@@ -150,7 +150,7 @@ 
             $this->xManager->getPropertyAnnotations($sClass, $sProperty),
             function($xAnnotation) use($sProperty) {
                 // Save the property type
-                if(is_a($xAnnotation, VarAnnotation::class))
+                if (is_a($xAnnotation, VarAnnotation::class))
                 {
                     $this->aPropTypes[$sProperty] = $xAnnotation->type;
                 }
@@ -158,12 +158,12 @@ 
                 return is_a($xAnnotation, ContainerAnnotation::class);
             }
         );
-        if(count($aAnnotations) > 1)
+        if (count($aAnnotations) > 1)
         {
             throw new AnnotationException('Only one @di annotation is allowed on a property');
         }
 
-        foreach($aAnnotations as $xAnnotation)
+        foreach ($aAnnotations as $xAnnotation)
         {
             $xAnnotation->setAttr($sProperty);
             $xAnnotation->saveValue($this->xMetadata);
@@ -185,7 +185,7 @@ 
             $this->xManager->getMethodAnnotations($sClass, $sMethod),
             fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
         );
-        foreach($aAnnotations as $xAnnotation)
+        foreach ($aAnnotations as $xAnnotation)
         {
             $xAnnotation->saveValue($this->xMetadata, $sMethod);
         }
@@ -208,7 +208,7 @@ 
             $this->sCurrMemberType = AnnotationManager::MEMBER_CLASS;
 
             $this->getClassAttrs($sClass);
-            if($this->xMetadata->isExcluded())
+            if ($this->xMetadata->isExcluded())
             {
                 // The entire class is not to be exported.
                 return $this->xMetadata;
@@ -218,7 +218,7 @@ 
             $this->sCurrMemberType = AnnotationManager::MEMBER_PROPERTY;
 
             // Properties annotations
-            foreach($xInput->getProperties() as $sProperty)
+            foreach ($xInput->getProperties() as $sProperty)
             {
                 $this->getPropertyAttrs($sClass, $sProperty);
             }
@@ -226,14 +226,14 @@ 
             // Processing methods annotations
             $this->sCurrMemberType = AnnotationManager::MEMBER_METHOD;
 
-            foreach($xInput->getMethods() as $sMethod)
+            foreach ($xInput->getMethods() as $sMethod)
             {
                 $this->getMethodAttrs($sClass, $sMethod);
             }
 
             return $this->xMetadata;
         }
-        catch(AnnotationException $e)
+        catch (AnnotationException $e)
         {
             throw new SetupException($e->getMessage());
         }

Braces +1 added lines, -2 removed lines

@@ -232,8 +232,7 @@
             }
 
             return $this->xMetadata;
-        }
-        catch(AnnotationException $e)
+        } catch(AnnotationException $e)
         {
             throw new SetupException($e->getMessage());
         }

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

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

Spacing +10 added lines, -10 removed lines

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

@@ -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'));

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;

+}

 }