jaxon-php / jaxon-mono

jaxon-upload/src/Manager/FileStorage.php

Switch Indentation +110 added lines, -110 removed lines

@@ -28,146 +28,146 @@
 
 class FileStorage
 {
-    /**
+/**
      * @var ConfigManager
      */
-    protected $xConfigManager;
+protected $xConfigManager;
 
-    /**
+/**
      * @var Translator
      */
-    protected $xTranslator;
+protected $xTranslator;
 
-    /**
+/**
      * @var array
      */
-    protected $aAdapters = [];
+protected $aAdapters = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aFilesystems = [];
+protected $aFilesystems = [];
 
-    /**
+/**
      * The constructor
      *
      * @param ConfigManager $xConfigManager
      * @param Translator $xTranslator
      */
-    public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)
-    {
-        $this->xConfigManager = $xConfigManager;
-        $this->xTranslator = $xTranslator;
-        $this->registerAdapters();
-    }
-
-    /**
+public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)
+{
+$this->xConfigManager = $xConfigManager;
+$this->xTranslator = $xTranslator;
+$this->registerAdapters();
+}
+
+/**
      * @param string $sStorage
      * @param Closure $cFactory
      *
      * @return void
      */
-    public function registerAdapter(string $sStorage, Closure $cFactory)
-    {
-        $this->aAdapters[$sStorage] = $cFactory;
-    }
+public function registerAdapter(string $sStorage, Closure $cFactory)
+{
+$this->aAdapters[$sStorage] = $cFactory;
+}
 
-    /**
+/**
      * Register the file storage adapters
      *
      * @return void
      */
-    private function registerAdapters()
-    {
-        // Local file system adapter
-        $this->registerAdapter('local', function(string $sRootDir, $xOptions) {
-            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) :
-                new LocalFilesystemAdapter($sRootDir, $xOptions);
-        });
-
-        // AWS S3 file system adapter
-        $this->registerAdapter('aws-s3', function(string $sRootDir, array $aOptions) {
-            /** @var \Aws\S3\S3ClientInterface $client */
-            $client = new \Aws\S3\S3Client($aOptions['client'] ?? []);
-            return new \League\Flysystem\AwsS3V3\AwsS3V3Adapter($client, $aOptions['bucket'] ?? '', $sRootDir);
-        });
-
-        // Async AWS S3 file system adapter
-        $this->registerAdapter('async-aws-s3', function(string $sRootDir, array $aOptions) {
-            $client = isset($aOptions['client']) ? new \AsyncAws\S3\S3Client($aOptions['client']) : new \AsyncAws\S3\S3Client();
-            return new \League\Flysystem\AsyncAwsS3\AsyncAwsS3Adapter($client, $aOptions['bucket'] ?? '', $sRootDir);
-        });
-
-        // Google Cloud file system adapter
-        $this->registerAdapter('google-cloud', function(string $sRootDir, array $aOptions) {
-            $storageClient = new \Google\Cloud\Storage\StorageClient($aOptions['client'] ?? []);
-            $bucket = $storageClient->bucket($aOptions['bucket'] ?? '');
-            return new \League\Flysystem\AzureBlobStorage\GoogleCloudStorageAdapter($bucket, $sRootDir);
-        });
-
-        // Microsoft Azure file system adapter
-        $this->registerAdapter('azure-blob', function(string $sRootDir, array $aOptions) {
-            $client = \MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlobService($aOptions['dsn']);
-            return new \League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter($client, $aOptions['container'], $sRootDir);
-        });
-
-        // FTP file system adapter
-        $this->registerAdapter('ftp', function(string $sRootDir, array $aOptions) {
-            $aOptions['root'] = $sRootDir;
-            $xOptions = \League\Flysystem\Ftp\FtpConnectionOptions::fromArray($aOptions);
-            return new \League\Flysystem\Ftp\FtpAdapter($xOptions);
-        });
-
-        // SFTP V2 file system adapter
-        $this->registerAdapter('sftp-v2', function(string $sRootDir, array $aOptions) {
-            $provider = new \League\Flysystem\PhpseclibV2\SftpConnectionProvider(...$aOptions);
-            return new \League\Flysystem\PhpseclibV2\SftpAdapter($provider, $sRootDir);
-        });
-
-        // SFTP V3 file system adapter
-        $this->registerAdapter('sftp-v3', function(string $sRootDir, array $aOptions) {
-            $provider = new \League\Flysystem\PhpseclibV3\SftpConnectionProvider(...$aOptions);
-            return new \League\Flysystem\PhpseclibV3\SftpAdapter($provider, $sRootDir);
-        });
-    }
-
-    /**
+private function registerAdapters()
+{
+// Local file system adapter
+$this->registerAdapter('local', function(string $sRootDir, $xOptions) {
+return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) :
+    new LocalFilesystemAdapter($sRootDir, $xOptions);
+});
+
+// AWS S3 file system adapter
+$this->registerAdapter('aws-s3', function(string $sRootDir, array $aOptions) {
+/** @var \Aws\S3\S3ClientInterface $client */
+$client = new \Aws\S3\S3Client($aOptions['client'] ?? []);
+return new \League\Flysystem\AwsS3V3\AwsS3V3Adapter($client, $aOptions['bucket'] ?? '', $sRootDir);
+});
+
+// Async AWS S3 file system adapter
+$this->registerAdapter('async-aws-s3', function(string $sRootDir, array $aOptions) {
+$client = isset($aOptions['client']) ? new \AsyncAws\S3\S3Client($aOptions['client']) : new \AsyncAws\S3\S3Client();
+return new \League\Flysystem\AsyncAwsS3\AsyncAwsS3Adapter($client, $aOptions['bucket'] ?? '', $sRootDir);
+});
+
+// Google Cloud file system adapter
+$this->registerAdapter('google-cloud', function(string $sRootDir, array $aOptions) {
+$storageClient = new \Google\Cloud\Storage\StorageClient($aOptions['client'] ?? []);
+$bucket = $storageClient->bucket($aOptions['bucket'] ?? '');
+return new \League\Flysystem\AzureBlobStorage\GoogleCloudStorageAdapter($bucket, $sRootDir);
+});
+
+// Microsoft Azure file system adapter
+$this->registerAdapter('azure-blob', function(string $sRootDir, array $aOptions) {
+$client = \MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlobService($aOptions['dsn']);
+return new \League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter($client, $aOptions['container'], $sRootDir);
+});
+
+// FTP file system adapter
+$this->registerAdapter('ftp', function(string $sRootDir, array $aOptions) {
+$aOptions['root'] = $sRootDir;
+$xOptions = \League\Flysystem\Ftp\FtpConnectionOptions::fromArray($aOptions);
+return new \League\Flysystem\Ftp\FtpAdapter($xOptions);
+});
+
+// SFTP V2 file system adapter
+$this->registerAdapter('sftp-v2', function(string $sRootDir, array $aOptions) {
+$provider = new \League\Flysystem\PhpseclibV2\SftpConnectionProvider(...$aOptions);
+return new \League\Flysystem\PhpseclibV2\SftpAdapter($provider, $sRootDir);
+});
+
+// SFTP V3 file system adapter
+$this->registerAdapter('sftp-v3', function(string $sRootDir, array $aOptions) {
+$provider = new \League\Flysystem\PhpseclibV3\SftpConnectionProvider(...$aOptions);
+return new \League\Flysystem\PhpseclibV3\SftpAdapter($provider, $sRootDir);
+});
+}
+
+/**
      * @param string $sField
      *
      * @return Filesystem
      * @throws RequestException
      */
-    public function filesystem(string $sField = ''): Filesystem
-    {
-        $sField = trim($sField);
-        if(isset($this->aFilesystems[$sField]))
-        {
-            return $this->aFilesystems[$sField];
-        }
-
-        // Default upload dir
-        $sStorage = $this->xConfigManager->getOption('upload.default.storage', 'local');
-        $sRootDir = $this->xConfigManager->getOption('upload.default.dir', '');
-        $aOptions = $this->xConfigManager->getOption('upload.default.options');
-        $sConfigKey = "upload.files.$sField";
-        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))
-        {
-            throw new RequestException($this->xTranslator->trans('errors.upload.dir'));
-        }
-        if(!isset($this->aAdapters[$sStorage]))
-        {
-            throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
-        }
-
-        $xAdapter = call_user_func($this->aAdapters[$sStorage], $sRootDir, $aOptions);
-        $this->aFilesystems[$sField] = new Filesystem($xAdapter);
-        return $this->aFilesystems[$sField];
-    }
+public function filesystem(string $sField = ''): Filesystem
+{
+$sField = trim($sField);
+if(isset($this->aFilesystems[$sField]))
+{
+return $this->aFilesystems[$sField];
+}
+
+// Default upload dir
+$sStorage = $this->xConfigManager->getOption('upload.default.storage', 'local');
+$sRootDir = $this->xConfigManager->getOption('upload.default.dir', '');
+$aOptions = $this->xConfigManager->getOption('upload.default.options');
+$sConfigKey = "upload.files.$sField";
+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))
+{
+throw new RequestException($this->xTranslator->trans('errors.upload.dir'));
+}
+if(!isset($this->aAdapters[$sStorage]))
+{
+throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
+}
+
+$xAdapter = call_user_func($this->aAdapters[$sStorage], $sRootDir, $aOptions);
+$this->aFilesystems[$sField] = new Filesystem($xAdapter);
+return $this->aFilesystems[$sField];
+}
 }

jaxon-upload/src/Manager/Validator.php

Switch Indentation +76 added lines, -76 removed lines

@@ -30,46 +30,46 @@ 
 

 class Validator

 {

-    /**

+/**

      * The config manager

      *

      * @var ConfigManager

      */

-    protected $xConfigManager;

+protected $xConfigManager;

 

-    /**

+/**

      * The translator

      *

      * @var Translator

      */

-    protected $xTranslator;

+protected $xTranslator;

 

-    /**

+/**

      * The last error message

      *

      * @var string

      */

-    protected $sErrorMessage;

+protected $sErrorMessage;

 

-    public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)

-    {

-        // Set the config manager

-        $this->xConfigManager = $xConfigManager;

-        // Set the translator

-        $this->xTranslator = $xTranslator;

-    }

+public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)

+{

+// Set the config manager

+$this->xConfigManager = $xConfigManager;

+// Set the translator

+$this->xTranslator = $xTranslator;

+}

 

-    /**

+/**

      * Get the last error message

      *

      * @return string

      */

-    public function getErrorMessage(): string

-    {

-        return $this->sErrorMessage;

-    }

+public function getErrorMessage(): string

+{

+return $this->sErrorMessage;

+}

 

-    /**

+/**

      * Validate a property of an uploaded file

      *

      * @param string $sVarName    The uploaded file variable name

@@ -79,19 +79,19 @@ 
      *

      * @return bool

      */

-    private function validateFileProperty(string $sVarName, string $sValue, string $sProperty, string $sField): bool

-    {

-        $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty);

-        $aAllowed = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

-        if(is_array($aAllowed) && !in_array($sValue, $aAllowed))

-        {

-            $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, [$sField => $sValue]);

-            return false;

-        }

-        return true;

-    }

-

-    /**

+private function validateFileProperty(string $sVarName, string $sValue, string $sProperty, string $sField): bool

+{

+$xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty);

+$aAllowed = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

+if(is_array($aAllowed) && !in_array($sValue, $aAllowed))

+{

+$this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, [$sField => $sValue]);

+return false;

+}

+return true;

+}

+

+/**

      * Validate the size of an uploaded file

      *

      * @param string $sVarName    The uploaded file variable name

@@ -100,21 +100,21 @@ 
      *

      * @return bool

      */

-    private function validateFileSize(string $sVarName, int $nFileSize, string $sProperty): bool

-    {

-        $xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty, 0);

-        $nSize = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

-        if($nSize > 0 && (

-            ($sProperty == 'max-size' && $nFileSize > $nSize) ||

-            ($sProperty == 'min-size' && $nFileSize < $nSize)))

-        {

-            $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sProperty, ['size' => $nFileSize]);

-            return false;

-        }

-        return true;

-    }

-

-    /**

+private function validateFileSize(string $sVarName, int $nFileSize, string $sProperty): bool

+{

+$xDefault = $this->xConfigManager->getOption('upload.default.' . $sProperty, 0);

+$nSize = $this->xConfigManager->getOption('upload.files.' . $sVarName . '.' . $sProperty, $xDefault);

+if($nSize > 0 && (

+($sProperty == 'max-size' && $nFileSize > $nSize) ||

+($sProperty == 'min-size' && $nFileSize < $nSize)))

+{

+$this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sProperty, ['size' => $nFileSize]);

+return false;

+}

+return true;

+}

+

+/**

      * Validate an uploaded file

      *

      * @param string $sVarName    The uploaded file variable name

@@ -122,33 +122,33 @@ 
      *

      * @return bool

      */

-    public function validateUploadedFile(string $sVarName, File $xFile): bool

-    {

-        $this->sErrorMessage = '';

-        // Verify the file extension

-        if(!$this->validateFileProperty($sVarName, $xFile->type(), 'types', 'type'))

-        {

-            return false;

-        }

-

-        // Verify the file extension

-        if(!$this->validateFileProperty($sVarName, $xFile->extension(), 'extensions', 'extension'))

-        {

-            return false;

-        }

-

-        // Verify the max size

-        if(!$this->validateFileSize($sVarName, $xFile->size(), 'max-size'))

-        {

-            return false;

-        }

-

-        // Verify the min size

-        if(!$this->validateFileSize($sVarName, $xFile->size(), 'min-size'))

-        {

-            return false;

-        }

-

-        return true;

-    }

+public function validateUploadedFile(string $sVarName, File $xFile): bool

+{

+$this->sErrorMessage = '';

+// Verify the file extension

+if(!$this->validateFileProperty($sVarName, $xFile->type(), 'types', 'type'))

+{

+return false;

+}

+

+// Verify the file extension

+if(!$this->validateFileProperty($sVarName, $xFile->extension(), 'extensions', 'extension'))

+{

+return false;

+}

+

+// Verify the max size

+if(!$this->validateFileSize($sVarName, $xFile->size(), 'max-size'))

+{

+return false;

+}

+

+// Verify the min size

+if(!$this->validateFileSize($sVarName, $xFile->size(), 'min-size'))

+{

+return false;

+}

+

+return true;

+}

 }

jaxon-core/src/Jaxon.php

Switch Indentation +8 added lines, -8 removed lines

@@ -16,23 +16,23 @@
 
 class Jaxon
 {
-    /**
+/**
      * @const string
      */
-    public const VERSION = 'Jaxon 5.x';
+public const VERSION = 'Jaxon 5.x';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_CLASS = 'CallableClass';
+public const CALLABLE_CLASS = 'CallableClass';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_DIR = 'CallableDir';
+public const CALLABLE_DIR = 'CallableDir';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_FUNCTION = 'CallableFunction';
+public const CALLABLE_FUNCTION = 'CallableFunction';
 }

jaxon-core/src/Request/Target.php

Switch Indentation +73 added lines, -73 removed lines

@@ -17,56 +17,56 @@ 
 
 class Target implements TargetInterface
 {
-    /**
+/**
      * The target type for function.
      *
      * @var string
      */
-    const TYPE_FUNCTION = 'TargetFunction';
+const TYPE_FUNCTION = 'TargetFunction';
 
-    /**
+/**
      * The target type for class.
      *
      * @var string
      */
-    const TYPE_CLASS = 'TargetClass';
+const TYPE_CLASS = 'TargetClass';
 
-    /**
+/**
      * The target type.
      *
      * @var string
      */
-    private $sType = '';
+private $sType = '';
 
-    /**
+/**
      * The target function name.
      *
      * @var string
      */
-    private $sFunctionName = '';
+private $sFunctionName = '';
 
-    /**
+/**
      * The target class name.
      *
      * @var string
      */
-    private $sClassName = '';
+private $sClassName = '';
 
-    /**
+/**
      * The target method name.
      *
      * @var string
      */
-    private $sMethodName = '';
+private $sMethodName = '';
 
-    /**
+/**
      * The target method args.
      *
      * @var array
      */
-    private $aMethodArgs = [];
+private $aMethodArgs = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sType    The target type
@@ -75,116 +75,116 @@ 
      * @param string $sMethodName    The method name
      * @param array $aMethodArgs    The method args
      */
-    private function __construct(string $sType, string $sFunctionName, string $sClassName, string $sMethodName, array $aMethodArgs = [])
-    {
-        $this->sType = $sType;
-        $this->sFunctionName = $sFunctionName;
-        $this->sClassName = $sClassName;
-        $this->sMethodName = $sMethodName;
-        $this->aMethodArgs = $aMethodArgs;
-    }
+private function __construct(string $sType, string $sFunctionName, string $sClassName, string $sMethodName, array $aMethodArgs = [])
+{
+$this->sType = $sType;
+$this->sFunctionName = $sFunctionName;
+$this->sClassName = $sClassName;
+$this->sMethodName = $sMethodName;
+$this->aMethodArgs = $aMethodArgs;
+}
 
-    /**
+/**
      * Create a target of type Function
      *
      * @param string $sFunctionName    The function name
      *
      * @return Target
      */
-    public static function makeFunction(string $sFunctionName): Target
-    {
-        return new Target(self::TYPE_FUNCTION, $sFunctionName, '', '');
-    }
+public static function makeFunction(string $sFunctionName): Target
+{
+return new Target(self::TYPE_FUNCTION, $sFunctionName, '', '');
+}
 
-    /**
+/**
      * Create a target of type Class
      *
      * @param array $aCall
      *
      * @return Target
      */
-    public static function makeClass(array $aCall): Target
-    {
-        return new Target(self::TYPE_CLASS, '', trim($aCall['name']), trim($aCall['method']));
-    }
+public static function makeClass(array $aCall): Target
+{
+return new Target(self::TYPE_CLASS, '', trim($aCall['name']), trim($aCall['method']));
+}
 
-    /**
+/**
      * Check if the target type is Function.
      *
      * @return bool
      */
-    public function isFunction(): bool
-    {
-        return $this->sType === self::TYPE_FUNCTION;
-    }
+public function isFunction(): bool
+{
+return $this->sType === self::TYPE_FUNCTION;
+}
 
-    /**
+/**
      * Check if the target type is Class.
      *
      * @return bool
      */
-    public function isClass(): bool
-    {
-        return $this->sType === self::TYPE_CLASS;
-    }
+public function isClass(): bool
+{
+return $this->sType === self::TYPE_CLASS;
+}
 
-    /**
+/**
      * The target function name.
      *
      * @return string
      */
-    public function getFunctionName(): string
-    {
-        return $this->sFunctionName;
-    }
+public function getFunctionName(): string
+{
+return $this->sFunctionName;
+}
 
-    /**
+/**
      * The target class name.
      *
      * @return string
      */
-    public function getClassName(): string
-    {
-        return $this->sClassName;
-    }
+public function getClassName(): string
+{
+return $this->sClassName;
+}
 
-    /**
+/**
      * The target method name.
      *
      * @return string
      */
-    public function getMethodName(): string
-    {
-        return $this->sMethodName;
-    }
+public function getMethodName(): string
+{
+return $this->sMethodName;
+}
 
-    /**
+/**
      * Set the target method name.
      *
      * @param array $aMethodArgs
      */
-    public function setMethodArgs(array $aMethodArgs): void
-    {
-        $this->aMethodArgs = $aMethodArgs;
-    }
+public function setMethodArgs(array $aMethodArgs): void
+{
+$this->aMethodArgs = $aMethodArgs;
+}
 
-    /**
+/**
      * The target method name.
      *
      * @return string
      */
-    public function method(): string
-    {
-        return $this->sMethodName;
-    }
+public function method(): string
+{
+return $this->sMethodName;
+}
 
-    /**
+/**
      * The target method args.
      *
      * @return array
      */
-    public function args(): array
-    {
-        return $this->aMethodArgs;
-    }
+public function args(): array
+{
+return $this->aMethodArgs;
+}
 }

jaxon-core/src/Plugin/Response/Databag/DatabagPlugin.php

Switch Indentation +59 added lines, -59 removed lines

@@ -13,94 +13,94 @@
 
 class DatabagPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'bags';
+public const NAME = 'bags';
 
-    /**
+/**
      * @var Databag
      */
-    protected $xDatabag = null;
+protected $xDatabag = null;
 
-    /**
+/**
      * The constructor
      */
-    public function __construct(protected Container $di)
-    {}
+public function __construct(protected Container $di)
+{}
 
-    /**
+/**
      * @return void
      */
-    private function initDatabag(): void
-    {
-        if($this->xDatabag !== null)
-        {
-            return;
-        }
+private function initDatabag(): void
+{
+if($this->xDatabag !== null)
+{
+return;
+}
 
-        // Get the databag contents from the HTTP request parameters.
-        $xRequest = $this->di->getRequest();
-        $aBody = $xRequest->getParsedBody();
-        $aParams = $xRequest->getQueryParams();
-        $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
-        $this->xDatabag = new Databag($this, $aData);
-    }
+// Get the databag contents from the HTTP request parameters.
+$xRequest = $this->di->getRequest();
+$aBody = $xRequest->getParsedBody();
+$aParams = $xRequest->getQueryParams();
+$aData = is_array($aBody) ?
+$this->readData($aBody['jxnbags'] ?? []) :
+$this->readData($aParams['jxnbags'] ?? []);
+$this->xDatabag = new Databag($this, $aData);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @param mixed $xData
      *
      * @return array
      */
-    private function readData($xData): array
-    {
-        // Todo: clean input data.
-        // Todo: verify the checksums.
-        return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
-    }
+private function readData($xData): array
+{
+// Todo: clean input data.
+// Todo: verify the checksums.
+return is_string($xData) ?
+(json_decode($xData, true) ?: []) :
+(is_array($xData) ? $xData : []);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '4.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '4.0.0';
+}
 
-    /**
+/**
      * @return void
      */
-    public function writeCommand(): void
-    {
-        $this->initDatabag();
-        if($this->xDatabag->touched())
-        {
-            // Todo: calculate the checksums.
-            $this->addCommand('databag.set', ['values' => $this->xDatabag]);
-        }
-    }
+public function writeCommand(): void
+{
+$this->initDatabag();
+if($this->xDatabag->touched())
+{
+// Todo: calculate the checksums.
+$this->addCommand('databag.set', ['values' => $this->xDatabag]);
+}
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return DatabagContext
      */
-    public function bag(string $sName): DatabagContext
-    {
-        $this->initDatabag();
-        return new DatabagContext($this->xDatabag, $sName);
-    }
+public function bag(string $sName): DatabagContext
+{
+$this->initDatabag();
+return new DatabagContext($this->xDatabag, $sName);
+}
 }

jaxon-annotations/src/Annotation/DatabagAnnotation.php

Switch Indentation +22 added lines, -22 removed lines

@@ -28,40 +28,40 @@
  */
 class DatabagAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * The data bag name
      *
      * @var string
      */
-    protected $sName = '';
+protected $sName = '';
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
-        {
-            throw new AnnotationException('The @databag annotation requires a property "name" of type string');
-        }
-        $this->sName = $properties['name'];
-    }
+public function initAnnotation(array $properties)
+{
+if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+{
+throw new AnnotationException('The @databag annotation requires a property "name" of type string');
+}
+$this->sName = $properties['name'];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->databag($sMethod)->addValue($this->sName);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->databag($sMethod)->addValue($this->sName);
+}
 }

jaxon-core/src/App/Databag/DatabagContext.php

Switch Indentation +25 added lines, -25 removed lines

@@ -4,58 +4,58 @@
 
 class DatabagContext
 {
-    /**
+/**
      * @var Databag
      */
-    protected $xDatabag;
+protected $xDatabag;
 
-    /**
+/**
      * @var string
      */
-    protected $sName;
+protected $sName;
 
-    /**
+/**
      * The constructor
      *
      * @param Databag $xDatabag
      * @param string $sName
      */
-    public function __construct(Databag $xDatabag, string $sName)
-    {
-        $this->xDatabag = $xDatabag;
-        $this->sName = $sName;
-    }
+public function __construct(Databag $xDatabag, string $sName)
+{
+$this->xDatabag = $xDatabag;
+$this->sName = $sName;
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function set(string $sKey, $xValue): void
-    {
-        $this->xDatabag->set($this->sName, $sKey, $xValue);
-    }
+public function set(string $sKey, $xValue): void
+{
+$this->xDatabag->set($this->sName, $sKey, $xValue);
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function new(string $sKey, $xValue): void
-    {
-        $this->xDatabag->new($this->sName, $sKey, $xValue);
-    }
+public function new(string $sKey, $xValue): void
+{
+$this->xDatabag->new($this->sName, $sKey, $xValue);
+}
 
-    /**
+/**
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return mixed
      */
-    public function get(string $sKey, $xValue = null): mixed
-    {
-        return $this->xDatabag->get($this->sName, $sKey, $xValue);
-    }
+public function get(string $sKey, $xValue = null): mixed
+{
+return $this->xDatabag->get($this->sName, $sKey, $xValue);
+}
 }

jaxon-core/src/App/Databag/Databag.php

Switch Indentation +56 added lines, -56 removed lines

@@ -11,110 +11,110 @@
 
 class Databag implements JsonSerializable
 {
-    /**
+/**
      * @var DatabagPlugin
      */
-    protected $xPlugin;
+protected $xPlugin;
 
-    /**
+/**
      * @var array
      */
-    protected $aData = [];
+protected $aData = [];
 
-    /**
+/**
      * @var bool
      */
-    protected $bTouched = false;
+protected $bTouched = false;
 
-    /**
+/**
      * The constructor
      *
      * @param array $aData
      */
-    public function __construct(DatabagPlugin $xPlugin, array $aData)
-    {
-        $this->xPlugin = $xPlugin;
-        // Ensure all contents are arrays.
-        $this->aData = array_map(function($aValue) {
-            return is_array($aValue) ? $aValue : [];
-        }, $aData);
-    }
+public function __construct(DatabagPlugin $xPlugin, array $aData)
+{
+$this->xPlugin = $xPlugin;
+// Ensure all contents are arrays.
+$this->aData = array_map(function($aValue) {
+return is_array($aValue) ? $aValue : [];
+}, $aData);
+}
 
-    /**
+/**
      * @return bool
      */
-    public function touched(): bool
-    {
-        return $this->bTouched;
-    }
+public function touched(): bool
+{
+return $this->bTouched;
+}
 
-    /**
+/**
      * @return array
      */
-    public function getAll(): array
-    {
-        return $this->aData;
-    }
+public function getAll(): array
+{
+return $this->aData;
+}
 
-    /**
+/**
      * @param string $sBag
      *
      * @return void
      */
-    public function clear(string $sBag): void
-    {
-        $this->aData[$sBag] = [];
-        $this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]);
-    }
+public function clear(string $sBag): void
+{
+$this->aData[$sBag] = [];
+$this->xPlugin->addCommand('databag.clear', ['bag' => $sBag]);
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function set(string $sBag, string $sKey, $xValue): void
-    {
-        $this->bTouched = true;
-        $this->aData[$sBag][$sKey] = $xValue;
-    }
+public function set(string $sBag, string $sKey, $xValue): void
+{
+$this->bTouched = true;
+$this->aData[$sBag][$sKey] = $xValue;
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return void
      */
-    public function new(string $sBag, string $sKey, $xValue): void
-    {
-        // Set the value only if it doesn't already exist.
-        if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
-        {
-            $this->set($sBag, $sKey, $xValue);
-        }
-    }
+public function new(string $sBag, string $sKey, $xValue): void
+{
+// Set the value only if it doesn't already exist.
+if(!isset($this->aData[$sBag]) || !key_exists($sKey, $this->aData[$sBag]))
+{
+$this->set($sBag, $sKey, $xValue);
+}
+}
 
-    /**
+/**
      * @param string $sBag
      * @param string $sKey
      * @param mixed $xValue
      *
      * @return mixed
      */
-    public function get(string $sBag, string $sKey, $xValue = null): mixed
-    {
-        return $this->aData[$sBag][$sKey] ?? $xValue;
-    }
+public function get(string $sBag, string $sKey, $xValue = null): mixed
+{
+return $this->aData[$sBag][$sKey] ?? $xValue;
+}
 
-    /**
+/**
      * Convert this call to array, when converting the response into json.
      *
      * @return array
      */
-    public function jsonSerialize(): array
-    {
-        return $this->aData;
-    }
+public function jsonSerialize(): array
+{
+return $this->aData;
+}
 }

jaxon-core/src/Plugin/Request/CallableClass/ComponentOptions.php

Switch Indentation +169 added lines, -169 removed lines

@@ -34,224 +34,224 @@ 
 
 class ComponentOptions
 {
-    /**
+/**
      * Check if the js code for this object must be generated
      *
      * @var bool
      */
-    private $bExcluded = false;
+private $bExcluded = false;
 
-    /**
+/**
      * The character to use as separator in javascript class names
      *
      * @var string
      */
-    private $sSeparator = '.';
+private $sSeparator = '.';
 
-    /**
+/**
      * A list of methods of the user registered callable object the library can export to javascript
      *
      * @var array
      */
-    private $aPublicMethods = [];
+private $aPublicMethods = [];
 
-    /**
+/**
      * The methods in the export attributes
      *
      * @var array
      */
-    private $aExportMethods = ['except' => []];
+private $aExportMethods = ['except' => []];
 
-    /**
+/**
      * A list of methods to call before processing the request
      *
      * @var array
      */
-    private $aBeforeMethods = [];
+private $aBeforeMethods = [];
 
-    /**
+/**
      * A list of methods to call after processing the request
      *
      * @var array
      */
-    private $aAfterMethods = [];
+private $aAfterMethods = [];
 
-    /**
+/**
      * The javascript class options
      *
      * @var array
      */
-    private $aJsOptions = [];
+private $aJsOptions = [];
 
-    /**
+/**
      * The DI options
      *
      * @var array
      */
-    private $aDiOptions = [];
+private $aDiOptions = [];
 
-    /**
+/**
      * The constructor
      *
      * @param array $aMethods
      * @param array $aOptions
      * @param Metadata|null $xMetadata
      */
-    public function __construct(array $aMethods, array $aOptions, Metadata|null $xMetadata)
-    {
-        $this->bExcluded = ($xMetadata?->isExcluded() ?? false) ||
-            (bool)($aOptions['excluded'] ?? false);
-
-        // Options from the config.
-        $sSeparator = $aOptions['separator'] ?? '.';
-        $this->sSeparator = $sSeparator === '_' ? '_' : '.';
-        $this->addProtectedMethods($aOptions['protected'] ?? []);
-        foreach($aOptions['functions'] ?? [] as $sNames => $aFunctionOptions)
-        {
-            // Names are in a comma-separated list.
-            $aFunctionNames = explode(',', $sNames);
-            foreach($aFunctionNames as $sFunctionName)
-            {
-                $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
-            }
-        }
+public function __construct(array $aMethods, array $aOptions, Metadata|null $xMetadata)
+{
+$this->bExcluded = ($xMetadata?->isExcluded() ?? false) ||
+(bool)($aOptions['excluded'] ?? false);
+
+// Options from the config.
+$sSeparator = $aOptions['separator'] ?? '.';
+$this->sSeparator = $sSeparator === '_' ? '_' : '.';
+$this->addProtectedMethods($aOptions['protected'] ?? []);
+foreach($aOptions['functions'] ?? [] as $sNames => $aFunctionOptions)
+{
+// Names are in a comma-separated list.
+$aFunctionNames = explode(',', $sNames);
+foreach($aFunctionNames as $sFunctionName)
+{
+    $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
+}
+}
 
-        // Options from the attributes or annotations.
-        if($xMetadata !== null)
-        {
-            $this->readMetadataOptions($xMetadata);
-        }
+// Options from the attributes or annotations.
+if($xMetadata !== null)
+{
+$this->readMetadataOptions($xMetadata);
+}
 
-        $this->aPublicMethods = $this->filterPublicMethods($aMethods);
-    }
+$this->aPublicMethods = $this->filterPublicMethods($aMethods);
+}
 
-    /**
+/**
      * @param array|string $xMethods
      *
      * @return void
      */
-    private function addProtectedMethods(array|string $xMethods): void
-    {
-        $this->aExportMethods['except'] = array_merge($this->aExportMethods['except'],
-            !is_array($xMethods) ? [trim((string)$xMethods)] :
-            array_map(fn($sMethod) => trim((string)$sMethod), $xMethods));
-    }
+private function addProtectedMethods(array|string $xMethods): void
+{
+$this->aExportMethods['except'] = array_merge($this->aExportMethods['except'],
+!is_array($xMethods) ? [trim((string)$xMethods)] :
+array_map(fn($sMethod) => trim((string)$sMethod), $xMethods));
+}
 
-    /**
+/**
      * @param Metadata $xMetadata
      *
      * @return void
      */
-    private function readMetadataOptions(Metadata $xMetadata): void
-    {
-        // Excluded methods must be merged with the existing ones.
-        $aExportMethods = $xMetadata->getExportMethods();
-        $aExportMethods['except'] = array_unique(array_merge(
-            $aExportMethods['except'] ?? [], $this->aExportMethods['except']));
-        $this->aExportMethods = $aExportMethods;
-        foreach($xMetadata->getProperties() as $sFunctionName => $aFunctionOptions)
-        {
-            $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
-        }
-    }
+private function readMetadataOptions(Metadata $xMetadata): void
+{
+// Excluded methods must be merged with the existing ones.
+$aExportMethods = $xMetadata->getExportMethods();
+$aExportMethods['except'] = array_unique(array_merge(
+$aExportMethods['except'] ?? [], $this->aExportMethods['except']));
+$this->aExportMethods = $aExportMethods;
+foreach($xMetadata->getProperties() as $sFunctionName => $aFunctionOptions)
+{
+$this->addFunctionOptions($sFunctionName, $aFunctionOptions);
+}
+}
 
-    /**
+/**
      * @param array $aMethods
      *
      * @return array
      */
-    private function filterPublicMethods(array $aMethods): array
-    {
-        if($this->bExcluded || in_array('*', $this->aExportMethods['except']))
-        {
-            return [];
-        }
+private function filterPublicMethods(array $aMethods): array
+{
+if($this->bExcluded || in_array('*', $this->aExportMethods['except']))
+{
+return [];
+}
 
-        $aBaseMethods = $aMethods[1];
-        $aNoMethods = $aMethods[2];
-        $aMethods = $aMethods[0];
-        if(isset($this->aExportMethods['only']))
-        {
-            $aMethods = array_intersect($aMethods, $this->aExportMethods['only']);
-        }
-        $aMethods = array_diff($aMethods, $this->aExportMethods['except']);
-        if(count($aBaseMethods) > 0 && isset($this->aExportMethods['base']))
-        {
-            $aBaseMethods = array_diff($aBaseMethods, $this->aExportMethods['base']);
-        }
+$aBaseMethods = $aMethods[1];
+$aNoMethods = $aMethods[2];
+$aMethods = $aMethods[0];
+if(isset($this->aExportMethods['only']))
+{
+$aMethods = array_intersect($aMethods, $this->aExportMethods['only']);
+}
+$aMethods = array_diff($aMethods, $this->aExportMethods['except']);
+if(count($aBaseMethods) > 0 && isset($this->aExportMethods['base']))
+{
+$aBaseMethods = array_diff($aBaseMethods, $this->aExportMethods['base']);
+}
 
-        return array_values(array_diff($aMethods, $aBaseMethods, $aNoMethods));
-    }
+return array_values(array_diff($aMethods, $aBaseMethods, $aNoMethods));
+}
 
-    /**
+/**
      * @return array
      */
-    public function getPublicMethods(): array
-    {
-        return $this->aPublicMethods;
-    }
+public function getPublicMethods(): array
+{
+return $this->aPublicMethods;
+}
 
-    /**
+/**
      * @param string $sMethodName
      *
      * @return bool
      */
-    public function isPublicMethod(string $sMethodName): bool
-    {
-        return in_array($sMethodName, $this->aPublicMethods);
-    }
+public function isPublicMethod(string $sMethodName): bool
+{
+return in_array($sMethodName, $this->aPublicMethods);
+}
 
-    /**
+/**
      * Check if the js code for this object must be generated
      *
      * @return bool
      */
-    public function excluded(): bool
-    {
-        return $this->bExcluded;
-    }
+public function excluded(): bool
+{
+return $this->bExcluded;
+}
 
-    /**
+/**
      * @return string
      */
-    public function separator(): string
-    {
-        return $this->sSeparator;
-    }
+public function separator(): string
+{
+return $this->sSeparator;
+}
 
-    /**
+/**
      * @return array
      */
-    public function beforeMethods(): array
-    {
-        return $this->aBeforeMethods;
-    }
+public function beforeMethods(): array
+{
+return $this->aBeforeMethods;
+}
 
-    /**
+/**
      * @return array
      */
-    public function afterMethods(): array
-    {
-        return $this->aAfterMethods;
-    }
+public function afterMethods(): array
+{
+return $this->aAfterMethods;
+}
 
-    /**
+/**
      * @return array
      */
-    public function diOptions(): array
-    {
-        return $this->aDiOptions;
-    }
+public function diOptions(): array
+{
+return $this->aDiOptions;
+}
 
-    /**
+/**
      * @return array
      */
-    public function jsOptions(): array
-    {
-        return $this->aJsOptions;
-    }
+public function jsOptions(): array
+{
+return $this->aJsOptions;
+}
 
-    /**
+/**
      * Set hook methods
      *
      * @param array $aHookMethods    The array of hook methods
@@ -259,36 +259,36 @@ 
      *
      * @return void
      */
-    private function setHookMethods(array &$aHookMethods, $xValue): void
-    {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
-        {
-            if(!isset($aHookMethods[$sCalledMethod]))
-            {
-                $aHookMethods[$sCalledMethod] = [];
-            }
-            if(is_array($xMethodToCall))
-            {
-                $aHookMethods[$sCalledMethod] =
-                    array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
-                continue;
-            }
-            if(is_string($xMethodToCall))
-            {
-                $aHookMethods[$sCalledMethod][] = $xMethodToCall;
-            }
-        }
-    }
+private function setHookMethods(array &$aHookMethods, $xValue): void
+{
+foreach($xValue as $sCalledMethod => $xMethodToCall)
+{
+if(!isset($aHookMethods[$sCalledMethod]))
+{
+    $aHookMethods[$sCalledMethod] = [];
+}
+if(is_array($xMethodToCall))
+{
+    $aHookMethods[$sCalledMethod] =
+        array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
+    continue;
+}
+if(is_string($xMethodToCall))
+{
+    $aHookMethods[$sCalledMethod][] = $xMethodToCall;
+}
+}
+}
 
-    /**
+/**
      * @param array $aDiOptions
      */
-    private function addDiOption(array $aDiOptions): void
-    {
-        $this->aDiOptions = array_merge($this->aDiOptions, $aDiOptions);
-    }
+private function addDiOption(array $aDiOptions): void
+{
+$this->aDiOptions = array_merge($this->aDiOptions, $aDiOptions);
+}
 
-    /**
+/**
      * Set configuration options / call options for each method
      *
      * @param string $sName    The name of the configuration option
@@ -296,25 +296,25 @@ 
      *
      * @return void
      */
-    private function addOption(string $sName, $xValue): void
-    {
-        switch($sName)
-        {
-        // Set the methods to call before processing the request
-        case '__before':
-            $this->setHookMethods($this->aBeforeMethods, $xValue);
-            break;
-        // Set the methods to call after processing the request
-        case '__after':
-            $this->setHookMethods($this->aAfterMethods, $xValue);
-            break;
-        // Set the attributes to inject in the callable object
-        case '__di':
-            $this->addDiOption($xValue);
-            break;
-        default:
-            break;
-        }
+private function addOption(string $sName, $xValue): void
+{
+switch($sName)
+{
+// Set the methods to call before processing the request
+case '__before':
+$this->setHookMethods($this->aBeforeMethods, $xValue);
+break;
+// Set the methods to call after processing the request
+case '__after':
+$this->setHookMethods($this->aAfterMethods, $xValue);
+break;
+// Set the attributes to inject in the callable object
+case '__di':
+$this->addDiOption($xValue);
+break;
+default:
+break;
+}
     }
 
     /**