jaxon-php / jaxon-mono

jaxon-config/src/ConfigReader.php

Switch Indentation +26 added lines, -26 removed lines

@@ -19,13 +19,13 @@ 
 
 class ConfigReader
 {
-    /**
+/**
      * @param ConfigSetter $xConfigSetter
      */
-    public function __construct(private ConfigSetter $xConfigSetter)
-    {}
+public function __construct(private ConfigSetter $xConfigSetter)
+{}
 
-    /**
+/**
      * Read options from a config file to an array
      *
      * @param string $sConfigFile The full path to the config file
@@ -36,29 +36,29 @@ 
      * @throws Exception\FileContent
      * @throws Exception\YamlExtension
      */
-    public function read(string $sConfigFile): array
-    {
-        if(!($sConfigFile = trim($sConfigFile)))
-        {
-            return [];
-        }
+public function read(string $sConfigFile): array
+{
+if(!($sConfigFile = trim($sConfigFile)))
+{
+return [];
+}
 
-        $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
-        switch($sExt)
-        {
-        case 'php':
-            $aConfigOptions = Reader\PhpReader::read($sConfigFile);
-            break;
-        case 'yaml':
-        case 'yml':
-            $aConfigOptions = Reader\YamlReader::read($sConfigFile);
-            break;
-        case 'json':
-            $aConfigOptions = Reader\JsonReader::read($sConfigFile);
-            break;
-        default:
-            throw new Exception\FileExtension($sConfigFile);
-        }
+$sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
+switch($sExt)
+{
+case 'php':
+$aConfigOptions = Reader\PhpReader::read($sConfigFile);
+break;
+case 'yaml':
+case 'yml':
+$aConfigOptions = Reader\YamlReader::read($sConfigFile);
+break;
+case 'json':
+$aConfigOptions = Reader\JsonReader::read($sConfigFile);
+break;
+default:
+throw new Exception\FileExtension($sConfigFile);
+}
 
         return $aConfigOptions;
     }

jaxon-core/src/App/Metadata/InputData.php

Switch Indentation +24 added lines, -24 removed lines

@@ -20,50 +20,50 @@
 
 class InputData
 {
-    /**
+/**
      * @var ReflectionClass
      */
-    private $xReflectionClass;
+private $xReflectionClass;
 
-    /**
+/**
      * @param ReflectionClass|string $xClass
      * @param array $aMethods
      * @param array $aProperties
      */
-    public function __construct(ReflectionClass|string $xClass,
-        private array $aMethods = [], private array $aProperties = [])
-    {
-        $this->xReflectionClass = is_string($xClass) ?
-            new ReflectionClass($xClass) : $xClass;
-    }
+public function __construct(ReflectionClass|string $xClass,
+private array $aMethods = [], private array $aProperties = [])
+{
+$this->xReflectionClass = is_string($xClass) ?
+new ReflectionClass($xClass) : $xClass;
+}
 
-    /**
+/**
      * Get the reflection class
      *
      * @return ReflectionClass
      */
-    public function getReflectionClass(): ReflectionClass
-    {
-        return $this->xReflectionClass;
-    }
+public function getReflectionClass(): ReflectionClass
+{
+return $this->xReflectionClass;
+}
 
-    /**
+/**
      * The methods to check for metadata
      *
      * @return array
      */
-    public function getMethods(): array
-    {
-        return $this->aMethods;
-    }
+public function getMethods(): array
+{
+return $this->aMethods;
+}
 
-    /**
+/**
      * The properties to check for metadata
      *
      * @return array
      */
-    public function getProperties(): array
-    {
-        return $this->aProperties;
-    }
+public function getProperties(): array
+{
+return $this->aProperties;
+}
 }

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

Switch Indentation +22 added lines, -22 removed lines

@@ -16,42 +16,42 @@
 
 class ExcludeData extends AbstractData
 {
-    /**
+/**
      * @var bool
      */
-    private bool $bValue = true;
+private bool $bValue = true;
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'protected';
-    }
+public function getName(): string
+{
+return 'protected';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->bValue;
-    }
+public function getValue(): mixed
+{
+return $this->bValue;
+}
 
-    /**
+/**
      * @param bool $bValue
      *
      * @return void
      */
-    public function setValue(bool $bValue): void
-    {
-        $this->bValue = $bValue;
-    }
+public function setValue(bool $bValue): void
+{
+$this->bValue = $bValue;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return ["{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");"];
-    }
+public function encode(string $sVarName): array
+{
+return ["{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");"];
+}
 }

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

Switch Indentation +33 added lines, -33 removed lines

@@ -20,61 +20,61 @@
 
 class UploadData extends AbstractData
 {
-    /**
+/**
      * The id of the upload field
      *
      * @var string
      */
-    protected $sField = '';
+protected $sField = '';
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'upload';
-    }
+public function getName(): string
+{
+return 'upload';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        // The field id is surrounded with simple quotes.
-        return "'{$this->sField}'";
-    }
+public function getValue(): mixed
+{
+// The field id is surrounded with simple quotes.
+return "'{$this->sField}'";
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    protected function validateField(string $sField): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sField is not a valid \"field\" value for upload");
-    }
+protected function validateField(string $sField): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
+{
+return;
+}
+throw new SetupException("$sField is not a valid \"field\" value for upload");
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    public function setValue(string $sField): void
-    {
-        $this->validateField($sField);
+public function setValue(string $sField): void
+{
+$this->validateField($sField);
 
-        $this->sField = $sField;
-    }
+$this->sField = $sField;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return ["{$sVarName}->setValue('{$this->sField}');"];
-    }
+public function encode(string $sVarName): array
+{
+return ["{$sVarName}->setValue('{$this->sField}');"];
+}
 }

jaxon-core/src/App/Metadata/MetadataCache.php

Switch Indentation +46 added lines, -46 removed lines

@@ -28,60 +28,60 @@ 
 
 class MetadataCache
 {
-    /**
+/**
      * @param string $sCacheDir
      */
-    public function __construct(private string $sCacheDir)
-    {}
+public function __construct(private string $sCacheDir)
+{}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return string
      */
-    private function filepath(string $sClass): string
-    {
-        $sFilename = trim(str_replace(['\\', '.'], DIRECTORY_SEPARATOR,
-            strtolower($sClass)), DIRECTORY_SEPARATOR);
-        return rtrim($this->sCacheDir, "/\\") . DIRECTORY_SEPARATOR .
-            "metadata" . DIRECTORY_SEPARATOR . "{$sFilename}.php";
-    }
+private function filepath(string $sClass): string
+{
+$sFilename = trim(str_replace(['\\', '.'], DIRECTORY_SEPARATOR,
+strtolower($sClass)), DIRECTORY_SEPARATOR);
+return rtrim($this->sCacheDir, "/\\") . DIRECTORY_SEPARATOR .
+"metadata" . DIRECTORY_SEPARATOR . "{$sFilename}.php";
+}
 
-    /**
+/**
      * Generate the PHP code to create a metadata object.
      *
      * @return array
      */
-    private function encode(Metadata $xMetadata): array
+private function encode(Metadata $xMetadata): array
+{
+$sMetadataVar = '$xMetadata';
+$sDataVar = '$xData';
+$aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
+foreach($xMetadata->getAttributes() as $sType => $aValues)
+{
+foreach($aValues as $sMethod => $xData)
+{
+    $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
+    foreach($xData->encode($sDataVar) as $sCall)
     {
-        $sMetadataVar = '$xMetadata';
-        $sDataVar = '$xData';
-        $aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
-        foreach($xMetadata->getAttributes() as $sType => $aValues)
-        {
-            foreach($aValues as $sMethod => $xData)
-            {
-                $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
-                foreach($xData->encode($sDataVar) as $sCall)
-                {
-                    $aCalls[] = $sCall;
-                }
-            }
-        }
-        $aCalls[] = "return $sMetadataVar;";
-        return $aCalls;
+        $aCalls[] = $sCall;
     }
+}
+}
+$aCalls[] = "return $sMetadataVar;";
+return $aCalls;
+}
 
-    /**
+/**
      * @param string $sClass
      * @param Metadata $xMetadata
      *
      * @return void
      */
-    public function save(string $sClass, Metadata $xMetadata): void
-    {
-        $sDataCode = implode("\n    ", $this->encode($xMetadata));
-        $sPhpCode = <<<CODE
+public function save(string $sClass, Metadata $xMetadata): void
+{
+$sDataCode = implode("\n    ", $this->encode($xMetadata));
+$sPhpCode = <<<CODE
 <?php
 
 return function() {
@@ -89,21 +89,21 @@ 
 };
 
 CODE;
-        // Recursively create the directories.
-        $sPath = $this->filepath($sClass);
-        @mkdir(dirname($sPath), 0755, true);
-        file_put_contents($sPath, $sPhpCode);
-    }
+// Recursively create the directories.
+$sPath = $this->filepath($sClass);
+@mkdir(dirname($sPath), 0755, true);
+file_put_contents($sPath, $sPhpCode);
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return Metadata|null
      */
-    public function read(string $sClass): ?Metadata
-    {
-        $sPath = $this->filepath($sClass);
-        $fCreator = file_exists($sPath) ? require $sPath : null;
-        return $fCreator instanceof Closure ? $fCreator() : null;
-    }
+public function read(string $sClass): ?Metadata
+{
+$sPath = $this->filepath($sClass);
+$fCreator = file_exists($sPath) ? require $sPath : null;
+return $fCreator instanceof Closure ? $fCreator() : null;
+}
 }

jaxon-core/src/Request/Upload/UploadHandlerInterface.php

Switch Indentation +10 added lines, -10 removed lines

@@ -20,45 +20,45 @@
 
 interface UploadHandlerInterface
 {
-    /**
+/**
      * Set the uploaded file name sanitizer
      *
      * @param Closure $cSanitizer    The closure
      *
      * @return void
      */
-    public function sanitizer(Closure $cSanitizer);
+public function sanitizer(Closure $cSanitizer);
 
-    /**
+/**
      * Get the uploaded files
      *
      * @return FileInterface[]
      */
-    public function files(): array;
+public function files(): array;
 
-    /**
+/**
      * Check if the current request contains uploaded files
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function canProcessRequest(ServerRequestInterface $xRequest): bool;
+public function canProcessRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * Process the uploaded files in the HTTP request
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function processRequest(ServerRequestInterface $xRequest): bool;
+public function processRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * @param string $sStorage
      * @param Closure $cFactory
      *
      * @return void
      */
-    public function registerStorageAdapter(string $sStorage, Closure $cFactory);
+public function registerStorageAdapter(string $sStorage, Closure $cFactory);
 }

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);
+}
 }