jaxon-php / jaxon-mono

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;
+}
     }
 
     /**

jaxon-annotations/src/AnnotationReader.php

Switch Indentation +152 added lines, -152 removed lines

@@ -37,207 +37,207 @@
 
 class AnnotationReader implements MetadataReaderInterface
 {
-    /**
+/**
      * @var AnnotationManager
      */
-    protected $xManager;
+protected $xManager;
 
-    /**
+/**
      * @var Metadata
      */
-    protected $xMetadata;
+protected $xMetadata;
 
-    /**
+/**
      * Properties types, read from the "var" annotations.
      *
      * @var array
      */
-    protected $aPropTypes;
+protected $aPropTypes;
 
-    /**
+/**
      * The type of the class member being currently processed.
      *
      * @var string
      */
-    protected $sCurrMemberType;
+protected $sCurrMemberType;
 
-    /**
+/**
      * The constructor
      *
      * @param AnnotationManager $xManager
      */
-    public function __construct(AnnotationManager $xManager)
-    {
-        $this->xManager = $xManager;
-        $this->xManager->registry['upload'] = UploadAnnotation::class;
-        $this->xManager->registry['databag'] = DatabagAnnotation::class;
-        $this->xManager->registry['exclude'] = ExcludeAnnotation::class;
-        $this->xManager->registry['export'] = ExportAnnotation::class;
-        $this->xManager->registry['before'] = BeforeAnnotation::class;
-        $this->xManager->registry['after'] = AfterAnnotation::class;
-        $this->xManager->registry['di'] = ContainerAnnotation::class;
-        $this->xManager->registry['callback'] = CallbackAnnotation::class;
-        // Missing standard annotations.
-        // We need to define this, otherwise they throw an exception, and make the whole processing fail.
-        $this->xManager->registry['const'] = false;
-        $this->xManager->registry['inheritDoc'] = false;
-        $this->xManager->registry['template'] = false;
-        $this->xManager->registry['param-closure-this'] = false;
-    }
+public function __construct(AnnotationManager $xManager)
+{
+$this->xManager = $xManager;
+$this->xManager->registry['upload'] = UploadAnnotation::class;
+$this->xManager->registry['databag'] = DatabagAnnotation::class;
+$this->xManager->registry['exclude'] = ExcludeAnnotation::class;
+$this->xManager->registry['export'] = ExportAnnotation::class;
+$this->xManager->registry['before'] = BeforeAnnotation::class;
+$this->xManager->registry['after'] = AfterAnnotation::class;
+$this->xManager->registry['di'] = ContainerAnnotation::class;
+$this->xManager->registry['callback'] = CallbackAnnotation::class;
+// Missing standard annotations.
+// We need to define this, otherwise they throw an exception, and make the whole processing fail.
+$this->xManager->registry['const'] = false;
+$this->xManager->registry['inheritDoc'] = false;
+$this->xManager->registry['template'] = false;
+$this->xManager->registry['param-closure-this'] = false;
+}
 
-    /**
+/**
      * @return array
      */
-    public function getPropTypes(): array
-    {
-        return $this->aPropTypes;
-    }
+public function getPropTypes(): array
+{
+return $this->aPropTypes;
+}
 
-    /**
+/**
      * @return bool
      */
-    public function annotationIsOnProperty(): bool
-    {
-        return $this->sCurrMemberType === AnnotationManager::MEMBER_PROPERTY;
-    }
+public function annotationIsOnProperty(): bool
+{
+return $this->sCurrMemberType === AnnotationManager::MEMBER_PROPERTY;
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return void
      * @throws AnnotationException
      */
-    private function readClassAnnotations(string $sClass): void
-    {
-        // Only keep the annotations declared in this package.
-        /** @var array<AbstractAnnotation> */
-        $aAnnotations = array_filter(
-            $this->xManager->getClassAnnotations($sClass),
-            fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
-        );
-        // First check if the class is excluded.
-        foreach($aAnnotations as $xAnnotation)
-        {
-            if(is_a($xAnnotation, ExcludeAnnotation::class))
-            {
-                $xAnnotation->saveValue($this->xMetadata);
-            }
-        }
-        if($this->xMetadata->isExcluded())
-        {
-            return;
-        }
-
-        foreach($aAnnotations as $xAnnotation)
-        {
-            if(!is_a($xAnnotation, ExcludeAnnotation::class))
-            {
-                $xAnnotation->saveValue($this->xMetadata);
-            }
-        }
-    }
+private function readClassAnnotations(string $sClass): void
+{
+// Only keep the annotations declared in this package.
+/** @var array<AbstractAnnotation> */
+$aAnnotations = array_filter(
+$this->xManager->getClassAnnotations($sClass),
+fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
+);
+// First check if the class is excluded.
+foreach($aAnnotations as $xAnnotation)
+{
+if(is_a($xAnnotation, ExcludeAnnotation::class))
+{
+    $xAnnotation->saveValue($this->xMetadata);
+}
+}
+if($this->xMetadata->isExcluded())
+{
+return;
+}
 
-    /**
+foreach($aAnnotations as $xAnnotation)
+{
+if(!is_a($xAnnotation, ExcludeAnnotation::class))
+{
+    $xAnnotation->saveValue($this->xMetadata);
+}
+}
+}
+
+/**
      * @param string $sClass
      * @param string $sProperty
      *
      * @return void
      * @throws AnnotationException
      */
-    private function readPropertyAnnotations(string $sClass, string $sProperty): void
+private function readPropertyAnnotations(string $sClass, string $sProperty): void
+{
+/** @var array<ContainerAnnotation> */
+// Only keep the annotations declared in this package.
+$aAnnotations = array_filter(
+$this->xManager->getPropertyAnnotations($sClass, $sProperty),
+function($xAnnotation) use($sProperty) {
+    // Save the property type
+    if(is_a($xAnnotation, VarAnnotation::class))
     {
-        /** @var array<ContainerAnnotation> */
-        // Only keep the annotations declared in this package.
-        $aAnnotations = array_filter(
-            $this->xManager->getPropertyAnnotations($sClass, $sProperty),
-            function($xAnnotation) use($sProperty) {
-                // Save the property type
-                if(is_a($xAnnotation, VarAnnotation::class))
-                {
-                    $this->aPropTypes[$sProperty] = $xAnnotation->type;
-                }
-                // Only container annotations are allowed on properties
-                return is_a($xAnnotation, ContainerAnnotation::class);
-            }
-        );
-        if(count($aAnnotations) > 1)
-        {
-            throw new AnnotationException('Only one @di annotation is allowed on a property');
-        }
-
-        foreach($aAnnotations as $xAnnotation)
-        {
-            $xAnnotation->setAttr($sProperty);
-            $xAnnotation->saveValue($this->xMetadata);
-        }
+        $this->aPropTypes[$sProperty] = $xAnnotation->type;
     }
+    // Only container annotations are allowed on properties
+    return is_a($xAnnotation, ContainerAnnotation::class);
+}
+);
+if(count($aAnnotations) > 1)
+{
+throw new AnnotationException('Only one @di annotation is allowed on a property');
+}
+
+foreach($aAnnotations as $xAnnotation)
+{
+$xAnnotation->setAttr($sProperty);
+$xAnnotation->saveValue($this->xMetadata);
+}
+}
 
-    /**
+/**
      * @param string $sClass
      * @param string $sMethod
      *
      * @return void
      * @throws AnnotationException
      */
-    private function readMethodAnnotations(string $sClass, string $sMethod): void
-    {
-        // Only keep the annotations declared in this package.
-        /** @var array<AbstractAnnotation> */
-        $aAnnotations = array_filter(
-            $this->xManager->getMethodAnnotations($sClass, $sMethod),
-            fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
-        );
-        foreach($aAnnotations as $xAnnotation)
-        {
-            $xAnnotation->saveValue($this->xMetadata, $sMethod);
-        }
-    }
+private function readMethodAnnotations(string $sClass, string $sMethod): void
+{
+// Only keep the annotations declared in this package.
+/** @var array<AbstractAnnotation> */
+$aAnnotations = array_filter(
+$this->xManager->getMethodAnnotations($sClass, $sMethod),
+fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
+);
+foreach($aAnnotations as $xAnnotation)
+{
+$xAnnotation->saveValue($this->xMetadata, $sMethod);
+}
+}
 
-    /**
+/**
      * @throws SetupException
      */
-    public function getAttributes(InputData $xInput): Metadata
-    {
-        ContainerAnnotation::$xReader = $this;
-        $this->aPropTypes = [];
-        $this->xMetadata = new Metadata();
-        $sClass = $xInput->getReflectionClass()->getName();
-
-        try
-        {
-            // Processing class annotations
-            $this->sCurrMemberType = AnnotationManager::MEMBER_CLASS;
-
-            $this->readClassAnnotations($sClass);
-
-            // Processing properties annotations
-            $this->sCurrMemberType = AnnotationManager::MEMBER_PROPERTY;
-
-            // Properties annotations
-            foreach($xInput->getProperties() as $sProperty)
-            {
-                $this->readPropertyAnnotations($sClass, $sProperty);
-            }
-
-            // The methods annotations are not taken for excluded classes.
-            if($this->xMetadata->isExcluded())
-            {
-                return $this->xMetadata;
-            }
-
-            // Processing methods annotations
-            $this->sCurrMemberType = AnnotationManager::MEMBER_METHOD;
-
-            foreach($xInput->getMethods() as $sMethod)
-            {
-                $this->readMethodAnnotations($sClass, $sMethod);
-            }
-
-            return $this->xMetadata;
-        }
-        catch(AnnotationException $e)
-        {
-            throw new SetupException($e->getMessage());
-        }
-    }
+public function getAttributes(InputData $xInput): Metadata
+{
+ContainerAnnotation::$xReader = $this;
+$this->aPropTypes = [];
+$this->xMetadata = new Metadata();
+$sClass = $xInput->getReflectionClass()->getName();
+
+try
+{
+// Processing class annotations
+$this->sCurrMemberType = AnnotationManager::MEMBER_CLASS;
+
+$this->readClassAnnotations($sClass);
+
+// Processing properties annotations
+$this->sCurrMemberType = AnnotationManager::MEMBER_PROPERTY;
+
+// Properties annotations
+foreach($xInput->getProperties() as $sProperty)
+{
+    $this->readPropertyAnnotations($sClass, $sProperty);
+}
+
+// The methods annotations are not taken for excluded classes.
+if($this->xMetadata->isExcluded())
+{
+    return $this->xMetadata;
+}
+
+// Processing methods annotations
+$this->sCurrMemberType = AnnotationManager::MEMBER_METHOD;
+
+foreach($xInput->getMethods() as $sMethod)
+{
+    $this->readMethodAnnotations($sClass, $sMethod);
+}
+
+return $this->xMetadata;
+}
+catch(AnnotationException $e)
+{
+throw new SetupException($e->getMessage());
+}
+}
 }

jaxon-core/src/Di/Traits/ComponentTrait.php

Switch Indentation +59 added lines, -59 removed lines

@@ -241,83 +241,83 @@
                 $this->aComponentPublicMethods['node'],
             $xReflectionClass->isSubclassOf(FuncComponent::class) =>
                 $this->aComponentPublicMethods['func'],
-            default => [[], []],
-        };
+default => [[], []],
+};
 
-        return [$aMethods, ...$aBaseMethods];
-    }
+return [$aMethods, ...$aBaseMethods];
+}
 
-    /**
+/**
      * @param ReflectionClass $xReflectionClass
      * @param array $aMethods
      * @param array $aOptions
      *
      * @return Metadata|null
      */
-    private function getComponentMetadata(ReflectionClass $xReflectionClass,
-        array $aMethods, array $aOptions): Metadata|null
-    {
-        /** @var Config|null */
-        $xPackageConfig = $aOptions['config'] ?? null;
-        if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
-        {
-            return null;
-        }
-        $sMetadataFormat = $xPackageConfig->getOption('metadata.format');
-        if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
-        {
-            return null;
-        }
+private function getComponentMetadata(ReflectionClass $xReflectionClass,
+array $aMethods, array $aOptions): Metadata|null
+{
+/** @var Config|null */
+$xPackageConfig = $aOptions['config'] ?? null;
+if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
+{
+return null;
+}
+$sMetadataFormat = $xPackageConfig->getOption('metadata.format');
+if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
+{
+return null;
+}
 
-        // Try to get the class metadata from the cache.
-        $di = $this->cn();
-        $xMetadata = null;
-        $xMetadataCache = null;
-        $xConfig = $di->config();
-        if($xConfig->getAppOption('metadata.cache.enabled', false))
-        {
-            if(!$di->h('jaxon_metadata_cache_dir'))
-            {
-                $sCacheDir = $xConfig->getAppOption('metadata.cache.dir');
-                $di->val('jaxon_metadata_cache_dir', $sCacheDir);
-            }
-            $xMetadataCache = $di->getMetadataCache();
-            $xMetadata = $xMetadataCache->read($xReflectionClass->getName());
-            if($xMetadata !== null)
-            {
-                return $xMetadata;
-            }
-        }
+// Try to get the class metadata from the cache.
+$di = $this->cn();
+$xMetadata = null;
+$xMetadataCache = null;
+$xConfig = $di->config();
+if($xConfig->getAppOption('metadata.cache.enabled', false))
+{
+if(!$di->h('jaxon_metadata_cache_dir'))
+{
+    $sCacheDir = $xConfig->getAppOption('metadata.cache.dir');
+    $di->val('jaxon_metadata_cache_dir', $sCacheDir);
+}
+$xMetadataCache = $di->getMetadataCache();
+$xMetadata = $xMetadataCache->read($xReflectionClass->getName());
+if($xMetadata !== null)
+{
+    return $xMetadata;
+}
+}
 
-        $aProperties = array_map(fn($xProperty) => $xProperty->getName(),
-            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
-                ReflectionProperty::IS_PROTECTED));
+$aProperties = array_map(fn($xProperty) => $xProperty->getName(),
+$xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
+    ReflectionProperty::IS_PROTECTED));
 
-        $xMetadataReader = $di->getMetadataReader($sMetadataFormat);
-        $xInput = new InputData($xReflectionClass, $aMethods, $aProperties);
-        $xMetadata = $xMetadataReader->getAttributes($xInput);
+$xMetadataReader = $di->getMetadataReader($sMetadataFormat);
+$xInput = new InputData($xReflectionClass, $aMethods, $aProperties);
+$xMetadata = $xMetadataReader->getAttributes($xInput);
 
-        // Try to save the metadata in the cache
-        if($xMetadataCache !== null)
-        {
-            $xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
-        }
+// Try to save the metadata in the cache
+if($xMetadataCache !== null)
+{
+$xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
+}
 
-        return $xMetadata;
-    }
+return $xMetadata;
+}
 
-    /**
+/**
      * @param ReflectionClass $xReflectionClass
      * @param array $aOptions
      *
      * @return ComponentOptions
      */
-    public function getComponentOptions(ReflectionClass $xReflectionClass,
-        array $aOptions): ComponentOptions
-    {
-        $aMethods = $this->getPublicMethods($xReflectionClass);
-        $xMetadata = $this->getComponentMetadata($xReflectionClass, $aMethods[0], $aOptions);
+public function getComponentOptions(ReflectionClass $xReflectionClass,
+array $aOptions): ComponentOptions
+{
+$aMethods = $this->getPublicMethods($xReflectionClass);
+$xMetadata = $this->getComponentMetadata($xReflectionClass, $aMethods[0], $aOptions);
 
-        return new ComponentOptions($aMethods, $aOptions, $xMetadata);
-    }
+return new ComponentOptions($aMethods, $aOptions, $xMetadata);
+}
 }

jaxon-core/src/Di/Traits/PluginTrait.php

Switch Indentation +139 added lines, -139 removed lines

@@ -35,154 +35,154 @@ 
 
 trait PluginTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerPlugins(): void
-    {
-        // Plugin manager
-        $this->set(PluginManager::class, function($di) {
-            $xPluginManager = new PluginManager($di->g(Container::class),
-                $di->g(CodeGenerator::class), $di->g(Translator::class));
-            // Register the Jaxon request and response plugins
-            $xPluginManager->registerPlugins();
-            return $xPluginManager;
-        });
-        // Package manager
-        $this->set(PackageManager::class, function($di) {
-            return new PackageManager($di->g(Container::class), $di->g(Translator::class),
-                $di->g(PluginManager::class), $di->g(ConfigManager::class),
-                $di->g(CodeGenerator::class), $di->g(ViewRenderer::class),
-                $di->g(CallbackManager::class), $di->g(ComponentRegistry::class));
-        });
-        // Code Generation
-        $this->set(MinifierInterface::class, function() {
-            return new class extends FileMinifier implements MinifierInterface
-            {};
-        });
-        $this->set(AssetManager::class, function($di) {
-            return new AssetManager($di->g(ConfigManager::class),
-                $di->g(MinifierInterface::class));
-        });
-        $this->set(CodeGenerator::class, function($di) {
-            return new CodeGenerator(Jaxon::VERSION, $di->g(Container::class),
-                $di->g(TemplateEngine::class));
-        });
-        $this->set(ConfigScriptGenerator::class, function($di) {
-            return new ConfigScriptGenerator($di->g(ParameterReader::class),
-                $di->g(TemplateEngine::class), $di->g(ConfigManager::class));
-        });
-        $this->set(ReadyScriptGenerator::class, function($di) {
-            return new ReadyScriptGenerator();
-        });
-
-        // Script response plugin
-        $this->set(ScriptPlugin::class, function($di) {
-            return new ScriptPlugin($di->g(CallFactory::class));
-        });
-        // Databag response plugin
-        $this->set(DatabagPlugin::class, function($di) {
-            return new DatabagPlugin($di->g(Container::class));
-        });
-        // Dialog response plugin
-        $this->set(DialogPlugin::class, function($di) {
-            return new DialogPlugin($di->g(DialogCommand::class));
-        });
-        // Paginator response plugin
-        $this->set(PaginatorPlugin::class, function($di) {
-            return new PaginatorPlugin($di->g(RendererInterface::class));
-        });
-    }
-
-    /**
+private function registerPlugins(): void
+{
+// Plugin manager
+$this->set(PluginManager::class, function($di) {
+$xPluginManager = new PluginManager($di->g(Container::class),
+    $di->g(CodeGenerator::class), $di->g(Translator::class));
+// Register the Jaxon request and response plugins
+$xPluginManager->registerPlugins();
+return $xPluginManager;
+});
+// Package manager
+$this->set(PackageManager::class, function($di) {
+return new PackageManager($di->g(Container::class), $di->g(Translator::class),
+    $di->g(PluginManager::class), $di->g(ConfigManager::class),
+    $di->g(CodeGenerator::class), $di->g(ViewRenderer::class),
+    $di->g(CallbackManager::class), $di->g(ComponentRegistry::class));
+});
+// Code Generation
+$this->set(MinifierInterface::class, function() {
+return new class extends FileMinifier implements MinifierInterface
+{};
+});
+$this->set(AssetManager::class, function($di) {
+return new AssetManager($di->g(ConfigManager::class),
+    $di->g(MinifierInterface::class));
+});
+$this->set(CodeGenerator::class, function($di) {
+return new CodeGenerator(Jaxon::VERSION, $di->g(Container::class),
+    $di->g(TemplateEngine::class));
+});
+$this->set(ConfigScriptGenerator::class, function($di) {
+return new ConfigScriptGenerator($di->g(ParameterReader::class),
+    $di->g(TemplateEngine::class), $di->g(ConfigManager::class));
+});
+$this->set(ReadyScriptGenerator::class, function($di) {
+return new ReadyScriptGenerator();
+});
+
+// Script response plugin
+$this->set(ScriptPlugin::class, function($di) {
+return new ScriptPlugin($di->g(CallFactory::class));
+});
+// Databag response plugin
+$this->set(DatabagPlugin::class, function($di) {
+return new DatabagPlugin($di->g(Container::class));
+});
+// Dialog response plugin
+$this->set(DialogPlugin::class, function($di) {
+return new DialogPlugin($di->g(DialogCommand::class));
+});
+// Paginator response plugin
+$this->set(PaginatorPlugin::class, function($di) {
+return new PaginatorPlugin($di->g(RendererInterface::class));
+});
+}
+
+/**
      * Get the plugin manager
      *
      * @return PluginManager
      */
-    public function getPluginManager(): PluginManager
-    {
-        return $this->g(PluginManager::class);
-    }
+public function getPluginManager(): PluginManager
+{
+return $this->g(PluginManager::class);
+}
 
-    /**
+/**
      * Get the package manager
      *
      * @return PackageManager
      */
-    public function getPackageManager(): PackageManager
-    {
-        return $this->g(PackageManager::class);
-    }
+public function getPackageManager(): PackageManager
+{
+return $this->g(PackageManager::class);
+}
 
-    /**
+/**
      * Get the code generator
      *
      * @return CodeGenerator
      */
-    public function getCodeGenerator(): CodeGenerator
-    {
-        return $this->g(CodeGenerator::class);
-    }
+public function getCodeGenerator(): CodeGenerator
+{
+return $this->g(CodeGenerator::class);
+}
 
-    /**
+/**
      * Get the asset manager
      *
      * @return AssetManager
      */
-    public function getAssetManager(): AssetManager
-    {
-        return $this->g(AssetManager::class);
-    }
+public function getAssetManager(): AssetManager
+{
+return $this->g(AssetManager::class);
+}
 
-    /**
+/**
      * Get the jQuery plugin
      *
      * @return ScriptPlugin
      */
-    public function getScriptPlugin(): ScriptPlugin
-    {
-        return $this->g(ScriptPlugin::class);
-    }
+public function getScriptPlugin(): ScriptPlugin
+{
+return $this->g(ScriptPlugin::class);
+}
 
-    /**
+/**
      * Get the dialog plugin
      *
      * @return DialogPlugin
      */
-    public function getDialogPlugin(): DialogPlugin
-    {
-        return $this->g(DialogPlugin::class);
-    }
+public function getDialogPlugin(): DialogPlugin
+{
+return $this->g(DialogPlugin::class);
+}
 
-    /**
+/**
      * @param class-string $sClassName    The package class name
      *
      * @return string
      */
-    private function getPackageConfigKey(string $sClassName): string
-    {
-        return $sClassName . '_PackageConfig';
-    }
+private function getPackageConfigKey(string $sClassName): string
+{
+return $sClassName . '_PackageConfig';
+}
 
-    /**
+/**
      * @param class-string $sClassName    The package class name
      * @param-closure-this AbstractPackage $cSetter
      *
      * @return void
      */
-    private function extendPackage(string $sClassName, Closure $cSetter): void
-    {
-        // Initialize the package instance.
-        $this->xLibContainer->extend($sClassName, function($xPackage) use($cSetter) {
-            // Allow the setter to access protected attributes.
-            call_user_func($cSetter->bindTo($xPackage, $xPackage));
-            return $xPackage;
-        });
-    }
-
-    /**
+private function extendPackage(string $sClassName, Closure $cSetter): void
+{
+// Initialize the package instance.
+$this->xLibContainer->extend($sClassName, function($xPackage) use($cSetter) {
+// Allow the setter to access protected attributes.
+call_user_func($cSetter->bindTo($xPackage, $xPackage));
+return $xPackage;
+});
+}
+
+/**
      * Register a package
      *
      * @param class-string $sClassName    The package class name
@@ -191,45 +191,45 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $aUserOptions): void
-    {
-        // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
-        {
-            $this->set($sClassName, fn() => $this->make($sClassName));
-        }
-
-        // Save the package config in the container.
-        $sConfigKey = $this->getPackageConfigKey($sClassName);
-        $this->set($sConfigKey, function($di) use($aUserOptions) {
-            $xOptionsProvider = $aUserOptions['provider'] ?? null;
-            // The user can provide a callable that returns the package options.
-            if(is_callable($xOptionsProvider))
-            {
-                $aUserOptions = $xOptionsProvider($aUserOptions);
-            }
-            return $di->g(ConfigManager::class)->newConfig($aUserOptions);
-        });
-
-        // Initialize the package instance.
-        $di = $this;
-        $this->extendPackage($sClassName, function() use($di, $sConfigKey) {
-            // $this here refers to the AbstractPackage instance.
-            $this->xPkgConfig = $di->g($sConfigKey);
-            $this->xRenderer = $di->g(ViewRenderer::class);
-            $this->init();
-        });
-    }
-
-    /**
+public function registerPackage(string $sClassName, array $aUserOptions): void
+{
+// Register the user class, but only if the user didn't already.
+if(!$this->h($sClassName))
+{
+$this->set($sClassName, fn() => $this->make($sClassName));
+}
+
+// Save the package config in the container.
+$sConfigKey = $this->getPackageConfigKey($sClassName);
+$this->set($sConfigKey, function($di) use($aUserOptions) {
+$xOptionsProvider = $aUserOptions['provider'] ?? null;
+// The user can provide a callable that returns the package options.
+if(is_callable($xOptionsProvider))
+{
+    $aUserOptions = $xOptionsProvider($aUserOptions);
+}
+return $di->g(ConfigManager::class)->newConfig($aUserOptions);
+});
+
+// Initialize the package instance.
+$di = $this;
+$this->extendPackage($sClassName, function() use($di, $sConfigKey) {
+// $this here refers to the AbstractPackage instance.
+$this->xPkgConfig = $di->g($sConfigKey);
+$this->xRenderer = $di->g(ViewRenderer::class);
+$this->init();
+});
+}
+
+/**
      * Get the config of a package
      *
      * @param class-string $sClassName    The package class name
      *
      * @return Config
      */
-    public function getPackageConfig(string $sClassName): Config
-    {
-        return $this->g($this->getPackageConfigKey($sClassName));
-    }
+public function getPackageConfig(string $sClassName): Config
+{
+return $this->g($this->getPackageConfigKey($sClassName));
+}
 }

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

Switch Indentation +12 added lines, -12 removed lines

@@ -13,25 +13,25 @@
 
 class Page
 {
-    /**
+/**
      * @var string
      */
-    public $sType;
+public $sType;
 
-    /**
+/**
      * @var string
      */
-    public $sText;
+public $sText;
 
-    /**
+/**
      * @var int
      */
-    public $nNumber;
+public $nNumber;
 
-    public function __construct(string $sType, string $sText, int $nNumber)
-    {
-        $this->sType = $sType;
-        $this->sText = $sText;
-        $this->nNumber = $nNumber;
-    }
+public function __construct(string $sType, string $sText, int $nNumber)
+{
+$this->sType = $sType;
+$this->sText = $sText;
+$this->nNumber = $nNumber;
+}
 }
\ No newline at end of file

jaxon-core/src/App/View/Store.php

Switch Indentation +55 added lines, -55 removed lines

@@ -9,35 +9,35 @@ 
 
 class Store implements JsonSerializable, Stringable
 {
-    /**
+/**
      * The view renderer
      *
      * @var ViewInterface|null
      */
-    protected $xRenderer = null;
+protected $xRenderer = null;
 
-    /**
+/**
      * The view namespace
      *
      * @var string
      */
-    protected $sNamespace;
+protected $sNamespace;
 
-    /**
+/**
      * The view name
      *
      * @var string
      */
-    protected $sViewName;
+protected $sViewName;
 
-    /**
+/**
      * The view data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -45,26 +45,26 @@ 
      *
      * @return Store
      */
-    public function with(string $sName, $xValue): Store
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function with(string $sName, $xValue): Store
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Set the data to be rendered
      *
      * @param array $aViewData    The view data
      *
      * @return Store
      */
-    public function setData(array $aViewData): Store
-    {
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setData(array $aViewData): Store
+{
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Set the view to be rendered, with optional data
      *
      * @param ViewInterface $xRenderer    The view renderer
@@ -74,65 +74,65 @@ 
      *
      * @return Store
      */
-    public function setView(ViewInterface $xRenderer,
-        string $sNamespace, string $sViewName, array $aViewData = []): Store
-    {
-        $this->xRenderer = $xRenderer;
-        $this->sNamespace = trim($sNamespace);
-        $this->sViewName = trim($sViewName);
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setView(ViewInterface $xRenderer,
+string $sNamespace, string $sViewName, array $aViewData = []): Store
+{
+$this->xRenderer = $xRenderer;
+$this->sNamespace = trim($sNamespace);
+$this->sViewName = trim($sViewName);
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Get the view namespace
      *
      * @return string        The view namespace
      */
-    public function getNamespace(): string
-    {
-        return $this->sNamespace;
-    }
+public function getNamespace(): string
+{
+return $this->sNamespace;
+}
 
-    /**
+/**
      * Get the view name
      *
      * @return string        The view name
      */
-    public function getViewName(): string
-    {
-        return $this->sViewName;
-    }
+public function getViewName(): string
+{
+return $this->sViewName;
+}
 
-    /**
+/**
      * Get the view data
      *
      * @return array         The view data
      */
-    public function getViewData(): array
-    {
-        return $this->aViewData;
-    }
+public function getViewData(): array
+{
+return $this->aViewData;
+}
 
-    /**
+/**
      * Render a view using third party view system
      *
      * @return string        The string representation of the view
      */
-    public function __toString(): string
-    {
-        return !$this->xRenderer ? '' : $this->xRenderer->render($this);
-    }
+public function __toString(): string
+{
+return !$this->xRenderer ? '' : $this->xRenderer->render($this);
+}
 
-    /**
+/**
      * Convert this object to string for json.
      *
      * This is a method of the JsonSerializable interface.
      *
      * @return string
      */
-    public function jsonSerialize(): string
-    {
-        return $this->__toString();
-    }
+public function jsonSerialize(): string
+{
+return $this->__toString();
+}
 }

jaxon-core/src/App/View/ViewRenderer.php

Switch Indentation +151 added lines, -151 removed lines

@@ -13,58 +13,58 @@ 
 
 class ViewRenderer
 {
-    /**
+/**
      * @var Container
      */
-    protected $di;
+protected $di;
 
-    /**
+/**
      * The view data store
      *
      * @var Store|null
      */
-    protected $xStore = null;
+protected $xStore = null;
 
-    /**
+/**
      * The view data store
      *
      * @var Store
      */
-    protected $xEmptyStore = null;
+protected $xEmptyStore = null;
 
-    /**
+/**
      * The view namespaces
      *
      * @var array
      */
-    protected $aNamespaces = [];
+protected $aNamespaces = [];
 
-    /**
+/**
      * The default namespace
      *
      * @var string
      */
-    protected $sDefaultNamespace = 'jaxon';
+protected $sDefaultNamespace = 'jaxon';
 
-    /**
+/**
      * The view global data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * The class constructor
      *
      * @param Container $di
      */
-    public function __construct(Container $di)
-    {
-        $this->di = $di;
-        $this->xEmptyStore = new Store();
-    }
+public function __construct(Container $di)
+{
+$this->di = $di;
+$this->xEmptyStore = new Store();
+}
 
-    /**
+/**
      * Add a view namespace, and set the corresponding renderer.
      *
      * @param string $sNamespace    The namespace name
@@ -74,59 +74,59 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory,
-        string $sExtension, string $sRenderer): void
-    {
-        $aNamespace = [
-            'directory' => $sDirectory,
-            'extension' => $sExtension,
-            'renderer' => $sRenderer,
-        ];
-        $this->aNamespaces[$sNamespace] = $aNamespace;
-    }
+public function addNamespace(string $sNamespace, string $sDirectory,
+string $sExtension, string $sRenderer): void
+{
+$aNamespace = [
+'directory' => $sDirectory,
+'extension' => $sExtension,
+'renderer' => $sRenderer,
+];
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
 
-    /**
+/**
      * Set the view namespaces.
      *
      * @param Config $xAppConfig    The config options provided in the library
      *
      * @return void
      */
-    public function addNamespaces(Config $xAppConfig): void
-    {
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
-        {
-            return;
-        }
+public function addNamespaces(Config $xAppConfig): void
+{
+if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
+{
+return;
+}
 
-        $sPackage = $xAppConfig->getOption('package', '');
-        foreach($aNamespaces as $sNamespace => $sOption)
-        {
-            // Save the namespace
-            $aNamespace = $xAppConfig->getOption($sOption);
-            $aNamespace['package'] = $sPackage;
-            if(!isset($aNamespace['renderer']))
-            {
-                $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
-            }
-            $this->aNamespaces[$sNamespace] = $aNamespace;
-        }
-    }
+$sPackage = $xAppConfig->getOption('package', '');
+foreach($aNamespaces as $sNamespace => $sOption)
+{
+// Save the namespace
+$aNamespace = $xAppConfig->getOption($sOption);
+$aNamespace['package'] = $sPackage;
+if(!isset($aNamespace['renderer']))
+{
+    $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
+}
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @param string $sId    The unique identifier of the view renderer
      *
      * @return ViewInterface
      */
-    public function getRenderer(string $sId): ViewInterface
-    {
-        // Return the view renderer with the given id
-        return $this->di->g("jaxon.app.view.$sId");
-    }
+public function getRenderer(string $sId): ViewInterface
+{
+// Return the view renderer with the given id
+return $this->di->g("jaxon.app.view.$sId");
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -134,25 +134,25 @@ 
      *
      * @return void
      */
-    public function addRenderer(string $sId, Closure $xClosure): void
-    {
-        // Return the initialized view renderer
-        $this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
-            // Get the defined renderer
-            $xRenderer = $xClosure($di);
-            // Init the renderer with the template namespaces
-            $aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
-                return $aOptions['renderer'] === $sId;
-            });
-            foreach($aNamespaces as $sName => $aOptions)
-            {
-                $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
-            }
-            return $xRenderer;
-        });
-    }
+public function addRenderer(string $sId, Closure $xClosure): void
+{
+// Return the initialized view renderer
+$this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
+// Get the defined renderer
+$xRenderer = $xClosure($di);
+// Init the renderer with the template namespaces
+$aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
+    return $aOptions['renderer'] === $sId;
+});
+foreach($aNamespaces as $sName => $aOptions)
+{
+    $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
+}
+return $xRenderer;
+});
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -161,55 +161,55 @@ 
      *
      * @return void
      */
-    public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
-    {
-        $this->setDefaultNamespace($sId);
-        $this->addNamespace($sId, '', $sExtension, $sId);
-        $this->addRenderer($sId, $xClosure);
-    }
+public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
+{
+$this->setDefaultNamespace($sId);
+$this->addNamespace($sId, '', $sExtension, $sId);
+$this->addRenderer($sId, $xClosure);
+}
 
-    /**
+/**
      * Get the view renderer for a given namespace
      *
      * @param string $sNamespace    The namespace name
      *
      * @return ViewInterface|null
      */
-    public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
-    {
-        if(!isset($this->aNamespaces[$sNamespace]))
-        {
-            return null;
-        }
-        // Return the view renderer with the configured id
-        return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
-    }
+public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
+{
+if(!isset($this->aNamespaces[$sNamespace]))
+{
+return null;
+}
+// Return the view renderer with the configured id
+return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
+}
 
-    /**
+/**
      * Set the default namespace
      *
      * @param string $sDefaultNamespace
      */
-    public function setDefaultNamespace(string $sDefaultNamespace): void
-    {
-        $this->sDefaultNamespace = $sDefaultNamespace;
-    }
+public function setDefaultNamespace(string $sDefaultNamespace): void
+{
+$this->sDefaultNamespace = $sDefaultNamespace;
+}
 
-    /**
+/**
      * Get the current store or create a new store
      *
      * @return Store
      */
-    protected function store(): Store
-    {
-        if(!$this->xStore)
-        {
-            $this->xStore = new Store();
-        }
-        return $this->xStore;
-    }
+protected function store(): Store
+{
+if(!$this->xStore)
+{
+$this->xStore = new Store();
+}
+return $this->xStore;
+}
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -217,13 +217,13 @@ 
      *
      * @return ViewRenderer
      */
-    public function set(string $sName, $xValue): ViewRenderer
-    {
-        $this->store()->with($sName, $xValue);
-        return $this;
-    }
+public function set(string $sName, $xValue): ViewRenderer
+{
+$this->store()->with($sName, $xValue);
+return $this;
+}
 
-    /**
+/**
      * Make a piece of data available for all views
      *
      * @param string $sName    The data name
@@ -231,29 +231,29 @@ 
      *
      * @return ViewRenderer
      */
-    public function share(string $sName, $xValue): ViewRenderer
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function share(string $sName, $xValue): ViewRenderer
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Make an array of data available for all views
      *
      * @param array $aValues    The data values
      *
      * @return ViewRenderer
      */
-    public function shareValues(array $aValues): ViewRenderer
-    {
-        foreach($aValues as $sName => $xValue)
-        {
-            $this->share($sName, $xValue);
-        }
-        return $this;
-    }
+public function shareValues(array $aValues): ViewRenderer
+{
+foreach($aValues as $sName => $xValue)
+{
+$this->share($sName, $xValue);
+}
+return $this;
+}
 
-    /**
+/**
      * Render a view using a store
      *
      * The store returned by this function will later be used with the make() method to render the view.
@@ -263,32 +263,32 @@ 
      *
      * @return Store   A store populated with the view data
      */
-    public function render(string $sViewName, array $aViewData = []): Store
-    {
-        $xStore = $this->store();
-        // Get the default view namespace
-        $sNamespace = $this->sDefaultNamespace;
-        // Get the namespace from the view name
-        $nSeparatorPosition = strrpos($sViewName, '::');
-        if($nSeparatorPosition !== false)
-        {
-            $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
-            $sViewName = substr($sViewName, $nSeparatorPosition + 2);
-        }
+public function render(string $sViewName, array $aViewData = []): Store
+{
+$xStore = $this->store();
+// Get the default view namespace
+$sNamespace = $this->sDefaultNamespace;
+// Get the namespace from the view name
+$nSeparatorPosition = strrpos($sViewName, '::');
+if($nSeparatorPosition !== false)
+{
+$sNamespace = substr($sViewName, 0, $nSeparatorPosition);
+$sViewName = substr($sViewName, $nSeparatorPosition + 2);
+}
 
-        $xRenderer = $this->getNamespaceRenderer($sNamespace);
-        if(!$xRenderer)
-        {
-            // Cannot render a view if there's no renderer corresponding to the namespace.
-            return $this->xEmptyStore;
-        }
+$xRenderer = $this->getNamespaceRenderer($sNamespace);
+if(!$xRenderer)
+{
+// Cannot render a view if there's no renderer corresponding to the namespace.
+return $this->xEmptyStore;
+}
 
-        $xStore->setData(array_merge($this->aViewData, $aViewData))
-            ->setView($xRenderer, $sNamespace, $sViewName);
+$xStore->setData(array_merge($this->aViewData, $aViewData))
+->setView($xRenderer, $sNamespace, $sViewName);
 
-        // Set the store to null so a new store will be created for the next view.
-        $this->xStore = null;
-        // Return the store
-        return $xStore;
-    }
+// Set the store to null so a new store will be created for the next view.
+$this->xStore = null;
+// Return the store
+return $xStore;
+}
 }

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

Switch Indentation +133 added lines, -133 removed lines

@@ -22,213 +22,213 @@
 
 class Metadata
 {
-    /**
+/**
      * @var array<string, array<string, Data\AbstractData>>
      */
-    private array $aAttributes = [
-        'exclude' => [],
-        'export' => [],
-        'container' => [],
-        'databag' => [],
-        'callback' => [],
-        'before' => [],
-        'after' => [],
-        'upload' => [],
-    ];
-
-    /**
+private array $aAttributes = [
+'exclude' => [],
+'export' => [],
+'container' => [],
+'databag' => [],
+'callback' => [],
+'before' => [],
+'after' => [],
+'upload' => [],
+];
+
+/**
      * @return array<string, array<string, Data\AbstractData>>
      */
-    public function getAttributes(): array
-    {
-        return $this->aAttributes;
-    }
+public function getAttributes(): array
+{
+return $this->aAttributes;
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExcludeData
      */
-    public function exclude(string $sMethod = '*'): Data\ExcludeData
-    {
-        return $this->aAttributes['exclude'][$sMethod] ??
-            $this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
-    }
+public function exclude(string $sMethod = '*'): Data\ExcludeData
+{
+return $this->aAttributes['exclude'][$sMethod] ??
+$this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExportData
      */
-    public function export(string $sMethod = '*'): Data\ExportData
-    {
-        $sMethod = '*'; // On classes only
-        return $this->aAttributes['export'][$sMethod] ??
-            $this->aAttributes['export'][$sMethod] = new Data\ExportData();
-    }
+public function export(string $sMethod = '*'): Data\ExportData
+{
+$sMethod = '*'; // On classes only
+return $this->aAttributes['export'][$sMethod] ??
+$this->aAttributes['export'][$sMethod] = new Data\ExportData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ContainerData
      */
-    public function container(string $sMethod = '*'): Data\ContainerData
-    {
-        return $this->aAttributes['container'][$sMethod] ??
-            $this->aAttributes['container'][$sMethod] = new Data\ContainerData();
-    }
+public function container(string $sMethod = '*'): Data\ContainerData
+{
+return $this->aAttributes['container'][$sMethod] ??
+$this->aAttributes['container'][$sMethod] = new Data\ContainerData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\DatabagData
      */
-    public function databag(string $sMethod = '*'): Data\DatabagData
-    {
-        return $this->aAttributes['databag'][$sMethod] ??
-            $this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
-    }
+public function databag(string $sMethod = '*'): Data\DatabagData
+{
+return $this->aAttributes['databag'][$sMethod] ??
+$this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\CallbackData
      */
-    public function callback(string $sMethod = '*'): Data\CallbackData
-    {
-        return $this->aAttributes['callback'][$sMethod] ??
-            $this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
-    }
+public function callback(string $sMethod = '*'): Data\CallbackData
+{
+return $this->aAttributes['callback'][$sMethod] ??
+$this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\BeforeData
      */
-    public function before(string $sMethod = '*'): Data\BeforeData
-    {
-        return $this->aAttributes['before'][$sMethod] ??
-            $this->aAttributes['before'][$sMethod] = new Data\BeforeData();
-    }
+public function before(string $sMethod = '*'): Data\BeforeData
+{
+return $this->aAttributes['before'][$sMethod] ??
+$this->aAttributes['before'][$sMethod] = new Data\BeforeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\AfterData
      */
-    public function after(string $sMethod = '*'): Data\AfterData
-    {
-        return $this->aAttributes['after'][$sMethod] ??
-            $this->aAttributes['after'][$sMethod] = new Data\AfterData();
-    }
+public function after(string $sMethod = '*'): Data\AfterData
+{
+return $this->aAttributes['after'][$sMethod] ??
+$this->aAttributes['after'][$sMethod] = new Data\AfterData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\UploadData
      */
-    public function upload(string $sMethod = '*'): Data\UploadData
-    {
-        return $this->aAttributes['upload'][$sMethod] ??
-            $this->aAttributes['upload'][$sMethod] = new Data\UploadData();
-    }
+public function upload(string $sMethod = '*'): Data\UploadData
+{
+return $this->aAttributes['upload'][$sMethod] ??
+$this->aAttributes['upload'][$sMethod] = new Data\UploadData();
+}
 
-    /**
+/**
      * True if the class is excluded
      *
      * @return bool
      */
-    public function isExcluded(): bool
-    {
-        $xData = $this->aAttributes['exclude']['*'] ?? null;
-        return $xData !== null && $xData->getValue() === true;
-    }
+public function isExcluded(): bool
+{
+$xData = $this->aAttributes['exclude']['*'] ?? null;
+return $xData !== null && $xData->getValue() === true;
+}
 
-    /**
+/**
      * Get the properties of the class methods
      *
      * @return array
      */
-    public function getProperties(): array
+public function getProperties(): array
+{
+$aProperties = [];
+$aClassProperties = [];
+foreach($this->aAttributes as $sType => $aValues)
+{
+if($sType === 'exclude')
+{
+    continue;
+}
+
+foreach($aValues as $sMethod => $xData)
+{
+    if($sMethod === '*')
     {
-        $aProperties = [];
-        $aClassProperties = [];
-        foreach($this->aAttributes as $sType => $aValues)
-        {
-            if($sType === 'exclude')
-            {
-                continue;
-            }
-
-            foreach($aValues as $sMethod => $xData)
-            {
-                if($sMethod === '*')
-                {
-                    $aClassProperties[$xData->getName()] = $xData->getValue();
-                    continue;
-                }
-                $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
-            }
-        }
-
-        if(count($aClassProperties) > 0)
-        {
-            $aProperties['*'] = $aClassProperties;
-        }
-
-        return $aProperties;
+        $aClassProperties[$xData->getName()] = $xData->getValue();
+        continue;
     }
+    $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
+}
+}
 
-    /**
+if(count($aClassProperties) > 0)
+{
+$aProperties['*'] = $aClassProperties;
+}
+
+return $aProperties;
+}
+
+/**
      * Get the methods in the export attributes
      *
      * @return array
      */
-    public function getExportMethods(): array
-    {
-        /** @var array<Data\ExcludeData> */
-        $aAttributes = $this->aAttributes['exclude'];
-        $aExcludeMethods = array_keys($aAttributes);
-        $aExcludeMethods = array_values(array_filter($aExcludeMethods,
-            fn(string $sName) => $sName !== '*' &&
-                $aAttributes[$sName]->getValue() === true));
-
-        /** @var Data\ExportData|null */
-        $xExportData = $this->aAttributes['export']['*'] ?? null;
-        $aExportMethods = $xExportData?->getValue() ?? [];
-
-        $aExceptMethods = $aExportMethods['except'] ?? [];
-        $aExportMethods['except'] = array_merge($aExcludeMethods, $aExceptMethods);
-        return $aExportMethods;
-    }
+public function getExportMethods(): array
+{
+/** @var array<Data\ExcludeData> */
+$aAttributes = $this->aAttributes['exclude'];
+$aExcludeMethods = array_keys($aAttributes);
+$aExcludeMethods = array_values(array_filter($aExcludeMethods,
+fn(string $sName) => $sName !== '*' &&
+    $aAttributes[$sName]->getValue() === true));
+
+/** @var Data\ExportData|null */
+$xExportData = $this->aAttributes['export']['*'] ?? null;
+$aExportMethods = $xExportData?->getValue() ?? [];
+
+$aExceptMethods = $aExportMethods['except'] ?? [];
+$aExportMethods['except'] = array_merge($aExcludeMethods, $aExceptMethods);
+return $aExportMethods;
+}
 
-    /**
+/**
      * Get the exluded methods
      *
      * @return array
      */
-    public function getExceptMethods(): array
-    {
-        return $this->getExportMethods()['except'];
-    }
+public function getExceptMethods(): array
+{
+return $this->getExportMethods()['except'];
+}
 
-    /**
+/**
      * Get the export base methods
      *
      * @return array
      */
-    public function getExportBaseMethods(): array
-    {
-        return $this->getExportMethods()['base'] ?? [];
-    }
+public function getExportBaseMethods(): array
+{
+return $this->getExportMethods()['base'] ?? [];
+}
 
-    /**
+/**
      * Get the export only methods
      *
      * @return array
      */
-    public function getExportOnlyMethods(): array
-    {
-        return $this->getExportMethods()['only'] ?? [];
-    }
+public function getExportOnlyMethods(): array
+{
+return $this->getExportMethods()['only'] ?? [];
+}
 }

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

Switch Indentation +33 added lines, -33 removed lines

@@ -22,61 +22,61 @@
 
 class DatabagData extends AbstractData
 {
-    /**
+/**
      * The databag names
      *
      * @var array
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'bags';
-    }
+public function getName(): string
+{
+return 'bags';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return array_values($this->aNames);
-    }
+public function getValue(): mixed
+{
+return array_values($this->aNames);
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    protected function validateName(string $sName): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sName is not a valid \"name\" value for databag");
-    }
+protected function validateName(string $sName): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+{
+return;
+}
+throw new SetupException("$sName is not a valid \"name\" value for databag");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateName($sName);
+public function addValue(string $sName): void
+{
+$this->validateName($sName);
 
-        $this->aNames[$sName] = $sName;
-    }
+$this->aNames[$sName] = $sName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return array_map(fn($sName) =>
-            "{$sVarName}->addValue('$sName');", $this->aNames);
-    }
+public function encode(string $sVarName): array
+{
+return array_map(fn($sName) =>
+"{$sVarName}->addValue('$sName');", $this->aNames);
+}
 }