jaxon-php / jaxon-mono

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/Metadata/Data/DatabagData.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      */
     protected function validateName(string $sName): void
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
         {
             return;
         }

jaxon-core/src/App/Metadata/Data/HookData.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
      */
     protected function validateMethod(string $sMethod): void
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0)
         {
             return;
         }
@@ -81,7 +81,7 @@ 
     public function encode(string $sVarName): array
     {
         $aCalls = [];
-        foreach($this->aCalls as $sMethod => $aParams)
+        foreach ($this->aCalls as $sMethod => $aParams)
         {
             $sParams = addslashes(json_encode($aParams));
             $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";

jaxon-core/src/Plugin/AbstractRequestPlugin.php

Switch Indentation +7 added lines, -7 removed lines

@@ -30,16 +30,16 @@
 
 abstract class AbstractRequestPlugin extends AbstractPlugin implements CallableRegistryInterface, RequestHandlerInterface
 {
-    /**
+/**
      * @var Target
      */
-    protected $xTarget = null;
+protected $xTarget = null;
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getTarget(): ?Target
-    {
-        return $this->xTarget;
-    }
+public function getTarget(): ?Target
+{
+return $this->xTarget;
+}
 }

jaxon-core/src/Plugin/AbstractPackage.php

Switch Indentation +40 added lines, -40 removed lines

@@ -19,46 +19,46 @@ 
 
 abstract class AbstractPackage extends AbstractCodeGenerator
 {
-    /**
+/**
      * The configuration options of the package
      *
      * @var Config
      */
-    protected $xPkgConfig;
+protected $xPkgConfig;
 
-    /**
+/**
      * The view renderer
      *
      * @var ViewRenderer
      */
-    protected $xRenderer;
+protected $xRenderer;
 
-    /**
+/**
      * Get the path to the config file, or the config options in an array.
      *
      * @return string|array
      */
-    abstract public static function config(): string|array;
+abstract public static function config(): string|array;
 
-    /**
+/**
      * Get the package config object
      *
      * @return Config
      */
-    final public function getConfig(): Config
-    {
-        return $this->xPkgConfig;
-    }
+final public function getConfig(): Config
+{
+return $this->xPkgConfig;
+}
 
-    /**
+/**
      * This method is automatically called after the package instance is created and configured.
      *
      * @return void
      */
-    protected function init(): void
-    {}
+protected function init(): void
+{}
 
-    /**
+/**
      * Get the value of a given package option
      *
      * @param string $sOption    The option name
@@ -66,49 +66,49 @@ 
      *
      * @return mixed
      */
-    final public function getOption(string $sOption, $xDefault = null): mixed
-    {
-        return $this->xPkgConfig->getOption($sOption, $xDefault);
-    }
+final public function getOption(string $sOption, $xDefault = null): mixed
+{
+return $this->xPkgConfig->getOption($sOption, $xDefault);
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    final public function view(): ViewRenderer
-    {
-        return $this->xRenderer;
-    }
+final public function view(): ViewRenderer
+{
+return $this->xRenderer;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    final public function getHash(): string
-    {
-        // Packages do not generate hash on their own. So we make this method final.
-        return '';
-    }
+final public function getHash(): string
+{
+// Packages do not generate hash on their own. So we make this method final.
+return '';
+}
 
-    /**
+/**
      * Get the HTML code of the package home page
      *
      * @return string|Stringable
      */
-    public function getHtml(): string|Stringable
-    {
-        return '';
-    }
+public function getHtml(): string|Stringable
+{
+return '';
+}
 
-    /**
+/**
      * Get the HTML code of the package home page
      *
      * This method is an alias for getHtml().
      *
      * @return string|Stringable
      */
-    public function html(): string|Stringable
-    {
-        return $this->getHtml();
-    }
+public function html(): string|Stringable
+{
+return $this->getHtml();
+}
 }

jaxon-core/src/Plugin/RequestHandlerInterface.php

Switch Indentation +8 added lines, -8 removed lines

@@ -7,21 +7,21 @@ 
 
 interface RequestHandlerInterface
 {
-    /**
+/**
      * Get the target function or class and method
      *
      * @return Target|null
      */
-    public function getTarget(): ?Target;
+public function getTarget(): ?Target;
 
-    /**
+/**
      * @param ServerRequestInterface $xRequest
      *
      * @return Target
      */
-    public function setTarget(ServerRequestInterface $xRequest): Target;
+public function setTarget(ServerRequestInterface $xRequest): Target;
 
-    /**
+/**
      * Check if this plugin can process the current request
      *
      * Called by the <Jaxon\Plugin\RequestManager> when a request has been received to determine
@@ -31,9 +31,9 @@ 
      *
      * @return bool
      */
-    public static function canProcessRequest(ServerRequestInterface $xRequest): bool;
+public static function canProcessRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * Process the current request
      *
      * Called by the <Jaxon\Plugin\RequestManager> when a request is being processed.
@@ -42,5 +42,5 @@ 
      *
      * @return void
      */
-    public function processRequest(): void;
+public function processRequest(): void;
 }