jaxon-php / jaxon-mono

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

Switch Indentation +33 added lines, -33 removed lines

@@ -22,61 +22,61 @@
 
 class CallbackData extends AbstractData
 {
-    /**
+/**
      * The callback js objects
      *
      * @var string
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'callback';
-    }
+public function getName(): string
+{
+return 'callback';
+}
 
-    /**
+/**
      * @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 validateObjectName(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 callback");
-    }
+protected function validateObjectName(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 callback");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateObjectName($sName);
+public function addValue(string $sName): void
+{
+$this->validateObjectName($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);
+}
 }

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

Switch Indentation +59 added lines, -59 removed lines

@@ -236,82 +236,82 @@
                 $this->aComponentPublicMethods['node'],
             $xReflectionClass->isSubclassOf(FuncComponent::class) =>
                 $this->aComponentPublicMethods['func'],
-            default => [],
-        };
-        return [$aMethods, $aBaseMethods];
-    }
+default => [],
+};
+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 && $xMetadata !== null)
-        {
-            $xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
-        }
+// Try to save the metadata in the cache
+if($xMetadataCache !== null && $xMetadata !== null)
+{
+$xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
+}
 
-        return $xMetadata;
-    }
+return $xMetadata;
+}
 
-    /**
+/**
      * @param ReflectionClass $xReflectionClass
      * @param array $aOptions
      *
      * @return ComponentOptions
      */
-    private function getComponentOptions(ReflectionClass $xReflectionClass,
-        array $aOptions): ComponentOptions
-    {
-        $aMethods = $this->getPublicMethods($xReflectionClass);
-        $xMetadata = $this->getComponentMetadata($xReflectionClass, $aMethods[0], $aOptions);
+private 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/CallableTrait.php

Switch Indentation +53 added lines, -53 removed lines

@@ -15,81 +15,81 @@
 
 trait CallableTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerCallables(): void
-    {
-        // Validator
-        $this->set(Validator::class, function($di) {
-            return new Validator($di->g(ConfigManager::class), $di->g(Translator::class));
-        });
-        // Callable objects registry
-        $this->set(ComponentRegistry::class, function($di) {
-            return new ComponentRegistry($di->g(ComponentContainer::class));
-        });
-        // Callable class plugin
-        $this->set(CallableClassPlugin::class, function($di) {
-            $sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.class');
-            return new CallableClassPlugin($sPrefix, $di->getLogger(),
-                $di->g(ComponentContainer::class), $di->g(ComponentRegistry::class),
-                $di->g(Translator::class), $di->g(TemplateEngine::class),
-                $di->g(Validator::class));
-        });
-        // Callable dir plugin
-        $this->set(CallableDirPlugin::class, function($di) {
-            return new CallableDirPlugin($di->g(ComponentContainer::class),
-                $di->g(ComponentRegistry::class), $di->g(Translator::class));
-        });
-        // Callable function plugin
-        $this->set(CallableFunctionPlugin::class, function($di) {
-            $sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.function');
-            $bDebug = $di->g(ConfigManager::class)->getOption('core.debug.on', false);
-            return new CallableFunctionPlugin($sPrefix, $bDebug,
-                $di->g(Container::class), $di->g(TemplateEngine::class),
-                $di->g(Translator::class), $di->g(Validator::class));
-        });
-    }
+private function registerCallables(): void
+{
+// Validator
+$this->set(Validator::class, function($di) {
+return new Validator($di->g(ConfigManager::class), $di->g(Translator::class));
+});
+// Callable objects registry
+$this->set(ComponentRegistry::class, function($di) {
+return new ComponentRegistry($di->g(ComponentContainer::class));
+});
+// Callable class plugin
+$this->set(CallableClassPlugin::class, function($di) {
+$sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.class');
+return new CallableClassPlugin($sPrefix, $di->getLogger(),
+    $di->g(ComponentContainer::class), $di->g(ComponentRegistry::class),
+    $di->g(Translator::class), $di->g(TemplateEngine::class),
+    $di->g(Validator::class));
+});
+// Callable dir plugin
+$this->set(CallableDirPlugin::class, function($di) {
+return new CallableDirPlugin($di->g(ComponentContainer::class),
+    $di->g(ComponentRegistry::class), $di->g(Translator::class));
+});
+// Callable function plugin
+$this->set(CallableFunctionPlugin::class, function($di) {
+$sPrefix = $di->g(ConfigManager::class)->getOption('core.prefix.function');
+$bDebug = $di->g(ConfigManager::class)->getOption('core.debug.on', false);
+return new CallableFunctionPlugin($sPrefix, $bDebug,
+    $di->g(Container::class), $di->g(TemplateEngine::class),
+    $di->g(Translator::class), $di->g(Validator::class));
+});
+}
 
-    /**
+/**
      * Get the callable registry
      *
      * @return ComponentRegistry
      */
-    public function getComponentRegistry(): ComponentRegistry
-    {
-        return $this->g(ComponentRegistry::class);
-    }
+public function getComponentRegistry(): ComponentRegistry
+{
+return $this->g(ComponentRegistry::class);
+}
 
-    /**
+/**
      * Get the callable function plugin
      *
      * @return CallableFunctionPlugin
      */
-    public function getCallableFunctionPlugin(): CallableFunctionPlugin
-    {
-        return $this->g(CallableFunctionPlugin::class);
-    }
+public function getCallableFunctionPlugin(): CallableFunctionPlugin
+{
+return $this->g(CallableFunctionPlugin::class);
+}
 
-    /**
+/**
      * Get the callable class plugin
      *
      * @return CallableClassPlugin
      */
-    public function getCallableClassPlugin(): CallableClassPlugin
-    {
-        return $this->g(CallableClassPlugin::class);
-    }
+public function getCallableClassPlugin(): CallableClassPlugin
+{
+return $this->g(CallableClassPlugin::class);
+}
 
-    /**
+/**
      * Get the callable dir plugin
      *
      * @return CallableDirPlugin
      */
-    public function getCallableDirPlugin(): CallableDirPlugin
-    {
-        return $this->g(CallableDirPlugin::class);
-    }
+public function getCallableDirPlugin(): CallableDirPlugin
+{
+return $this->g(CallableDirPlugin::class);
+}
 }

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

Switch Indentation +28 added lines, -28 removed lines

@@ -9,50 +9,50 @@
 
 trait MetadataTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerMetadataReader(): void
-    {
-        // Metadata cache
-        $this->set(MetadataCache::class, fn($di) =>
-            new MetadataCache($di->g('jaxon_metadata_cache_dir')));
+private function registerMetadataReader(): void
+{
+// Metadata cache
+$this->set(MetadataCache::class, fn($di) =>
+new MetadataCache($di->g('jaxon_metadata_cache_dir')));
 
-        // By default, register a fake metadata reader.
-        $this->set('metadata_reader_null', function() {
-            return new class implements MetadataReaderInterface
-            {
-                public function getAttributes(InputData $xInputData): Metadata
-                {
-                    return new Metadata();
-                }
-            };
-        });
+// By default, register a fake metadata reader.
+$this->set('metadata_reader_null', function() {
+return new class implements MetadataReaderInterface
+{
+    public function getAttributes(InputData $xInputData): Metadata
+    {
+        return new Metadata();
     }
+};
+});
+}
 
-    /**
+/**
      * Get the metadata cache
      *
      * @return MetadataCache
      */
-    public function getMetadataCache(): MetadataCache
-    {
-        return $this->g(MetadataCache::class);
-    }
+public function getMetadataCache(): MetadataCache
+{
+return $this->g(MetadataCache::class);
+}
 
-    /**
+/**
      * Get the metadata reader with the given id
      *
      * @param string $sReaderId
      *
      * @return MetadataReaderInterface
      */
-    public function getMetadataReader(string $sReaderId): MetadataReaderInterface
-    {
-        return $this->h("metadata_reader_$sReaderId") ?
-            $this->g("metadata_reader_$sReaderId") :
-            $this->g('metadata_reader_null');
-    }
+public function getMetadataReader(string $sReaderId): MetadataReaderInterface
+{
+return $this->h("metadata_reader_$sReaderId") ?
+$this->g("metadata_reader_$sReaderId") :
+$this->g('metadata_reader_null');
+}
 }

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

Switch Indentation +96 added lines, -96 removed lines

@@ -20,152 +20,152 @@
 
 trait PsrTrait
 {
-    /**
+/**
      * @var string
      */
-    private $sPsrConfig = 'jaxon.psr.config.file';
+private $sPsrConfig = 'jaxon.psr.config.file';
 
-    /**
+/**
      * @var string
      */
-    private $sPsrServerRequest = 'jaxon.psr.server.request';
+private $sPsrServerRequest = 'jaxon.psr.server.request';
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerPsr(): void
-    {
-        // The server request
-        $this->set(Psr17Factory::class, function() {
-            return new Psr17Factory();
-        });
-        $this->set(ServerRequestCreator::class, function($di) {
-            $xPsr17Factory = $di->g(Psr17Factory::class);
-            return new ServerRequestCreator(
-                $xPsr17Factory, // ServerRequestFactory
-                $xPsr17Factory, // UriFactory
-                $xPsr17Factory, // UploadedFileFactory
-                $xPsr17Factory, // StreamFactory
-            );
-        });
-        $this->set(ServerRequestInterface::class, function($di) {
-            return $di->g(ServerRequestCreator::class)->fromGlobals();
-        });
-        // Server request with the Jaxon request parameter as attribute
-        $this->set($this->sPsrServerRequest, function($di) {
-            $xParameterReader = $di->g(ParameterReader::class);
-            $xRequest = $di->g(ServerRequestInterface::class);
-            $aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
-            return !is_array($aRequestParameter) ? $xRequest :
-                $xRequest->withAttribute('jxncall', $aRequestParameter);
-        });
-        // PSR factory
-        $this->set(PsrFactory::class, function($di) {
-            return new PsrFactory($di->g(Container::class));
-        });
-        // PSR request handler
-        $this->set(PsrRequestHandler::class, function($di) {
-            return new PsrRequestHandler($di->g(Container::class), $di->g(RequestHandler::class),
-                $di->g(ResponseManager::class), $di->g(Translator::class));
-        });
-        // PSR config middleware
-        $this->set(PsrConfigMiddleware::class, function($di) {
-            return new PsrConfigMiddleware($di->g(Container::class), $di->g($this->sPsrConfig));
-        });
-        // PSR ajax middleware
-        $this->set(PsrAjaxMiddleware::class, function($di) {
-            return new PsrAjaxMiddleware($di->g(Container::class), $di->g(RequestHandler::class),
-                $di->g(ResponseManager::class));
-        });
-        // The PSR response plugin
-        $this->set(PsrPlugin::class, function($di) {
-            return new PsrPlugin($di->g(Psr17Factory::class), $di->g(ServerRequestInterface::class));
-        });
-    }
+private function registerPsr(): void
+{
+// The server request
+$this->set(Psr17Factory::class, function() {
+return new Psr17Factory();
+});
+$this->set(ServerRequestCreator::class, function($di) {
+$xPsr17Factory = $di->g(Psr17Factory::class);
+return new ServerRequestCreator(
+    $xPsr17Factory, // ServerRequestFactory
+    $xPsr17Factory, // UriFactory
+    $xPsr17Factory, // UploadedFileFactory
+    $xPsr17Factory, // StreamFactory
+);
+});
+$this->set(ServerRequestInterface::class, function($di) {
+return $di->g(ServerRequestCreator::class)->fromGlobals();
+});
+// Server request with the Jaxon request parameter as attribute
+$this->set($this->sPsrServerRequest, function($di) {
+$xParameterReader = $di->g(ParameterReader::class);
+$xRequest = $di->g(ServerRequestInterface::class);
+$aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
+return !is_array($aRequestParameter) ? $xRequest :
+    $xRequest->withAttribute('jxncall', $aRequestParameter);
+});
+// PSR factory
+$this->set(PsrFactory::class, function($di) {
+return new PsrFactory($di->g(Container::class));
+});
+// PSR request handler
+$this->set(PsrRequestHandler::class, function($di) {
+return new PsrRequestHandler($di->g(Container::class), $di->g(RequestHandler::class),
+    $di->g(ResponseManager::class), $di->g(Translator::class));
+});
+// PSR config middleware
+$this->set(PsrConfigMiddleware::class, function($di) {
+return new PsrConfigMiddleware($di->g(Container::class), $di->g($this->sPsrConfig));
+});
+// PSR ajax middleware
+$this->set(PsrAjaxMiddleware::class, function($di) {
+return new PsrAjaxMiddleware($di->g(Container::class), $di->g(RequestHandler::class),
+    $di->g(ResponseManager::class));
+});
+// The PSR response plugin
+$this->set(PsrPlugin::class, function($di) {
+return new PsrPlugin($di->g(Psr17Factory::class), $di->g(ServerRequestInterface::class));
+});
+}
 
-    /**
+/**
      * Get the request
      *
      * @return array
      */
-    public function getServerParams(): array
-    {
-        $xRequest = $this->g(ServerRequestInterface::class);
-        return $xRequest->getServerParams();
-    }
+public function getServerParams(): array
+{
+$xRequest = $this->g(ServerRequestInterface::class);
+return $xRequest->getServerParams();
+}
 
-    /**
+/**
      * Get the request with Jaxon parameter as attribute
      *
      * @return ServerRequestInterface
      */
-    public function getRequest(): ServerRequestInterface
-    {
-        return $this->g($this->sPsrServerRequest);
-    }
+public function getRequest(): ServerRequestInterface
+{
+return $this->g($this->sPsrServerRequest);
+}
 
-    /**
+/**
      * Return the array of arguments from the GET or POST data
      *
      * @return array
      */
-    public function getRequestArguments(): array
-    {
-        return $this->getRequest()->getAttribute('jxncall')['args'] ?? [];
-    }
+public function getRequestArguments(): array
+{
+return $this->getRequest()->getAttribute('jxncall')['args'] ?? [];
+}
 
-    /**
+/**
      * Get the PSR factory
      *
      * @return PsrFactory
      */
-    public function getPsrFactory(): PsrFactory
-    {
-        return $this->g(PsrFactory::class);
-    }
+public function getPsrFactory(): PsrFactory
+{
+return $this->g(PsrFactory::class);
+}
 
-    /**
+/**
      * Get the Psr17 factory
      *
      * @return Psr17Factory
      */
-    public function getPsr17Factory(): Psr17Factory
-    {
-        return $this->g(Psr17Factory::class);
-    }
+public function getPsr17Factory(): Psr17Factory
+{
+return $this->g(Psr17Factory::class);
+}
 
-    /**
+/**
      * Get the PSR request handler
      *
      * @return PsrRequestHandler
      */
-    public function getPsrRequestHandler(): PsrRequestHandler
-    {
-        return $this->g(PsrRequestHandler::class);
-    }
+public function getPsrRequestHandler(): PsrRequestHandler
+{
+return $this->g(PsrRequestHandler::class);
+}
 
-    /**
+/**
      * Get the PSR config middleware
      *
      * @param string $sConfigFile
      *
      * @return PsrConfigMiddleware
      */
-    public function getPsrConfigMiddleware(string $sConfigFile): PsrConfigMiddleware
-    {
-        !$this->h($this->sPsrConfig) && $this->val($this->sPsrConfig, $sConfigFile);
-        return $this->g(PsrConfigMiddleware::class);
-    }
+public function getPsrConfigMiddleware(string $sConfigFile): PsrConfigMiddleware
+{
+!$this->h($this->sPsrConfig) && $this->val($this->sPsrConfig, $sConfigFile);
+return $this->g(PsrConfigMiddleware::class);
+}
 
-    /**
+/**
      * Get the PSR ajax request middleware
      *
      * @return PsrAjaxMiddleware
      */
-    public function getPsrAjaxMiddleware(): PsrAjaxMiddleware
-    {
-        return $this->g(PsrAjaxMiddleware::class);
-    }
+public function getPsrAjaxMiddleware(): PsrAjaxMiddleware
+{
+return $this->g(PsrAjaxMiddleware::class);
+}
 }

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

Switch Indentation +62 added lines, -62 removed lines

@@ -16,104 +16,104 @@
 
 trait AppTrait
 {
-    /**
+/**
      * @var string
      */
-    private $sJsLibVersion = 'jaxon_javascript_library_version';
+private $sJsLibVersion = 'jaxon_javascript_library_version';
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerApp(): void
-    {
-        // Config Manager
-        $this->set(ConfigEventManager::class, function($di) {
-            return new ConfigEventManager($di->g(Container::class));
-        });
-        $this->set(ConfigManager::class, function($di) {
-            $aDefaultOptions = require(__DIR__ . '/../../../config/lib.php');
-            return new ConfigManager($aDefaultOptions, $di->g(Translator::class),
-                $di->g(ConfigReader::class), $di->g(ConfigSetter::class),
-                $di->g(ConfigEventManager::class));
-        });
+private function registerApp(): void
+{
+// Config Manager
+$this->set(ConfigEventManager::class, function($di) {
+return new ConfigEventManager($di->g(Container::class));
+});
+$this->set(ConfigManager::class, function($di) {
+$aDefaultOptions = require(__DIR__ . '/../../../config/lib.php');
+return new ConfigManager($aDefaultOptions, $di->g(Translator::class),
+    $di->g(ConfigReader::class), $di->g(ConfigSetter::class),
+    $di->g(ConfigEventManager::class));
+});
 
-        // Jaxon App
-        $this->set(AppInterface::class, fn() => new App());
-        // Jaxon App bootstrap
-        $this->set(Bootstrap::class, function($di) {
-            return new Bootstrap($di->g(ConfigManager::class),
-                $di->g(PackageManager::class), $di->g(CallbackManager::class));
-        });
-        // The javascript library version
-        $this->set($this->sJsLibVersion, function($di) {
-            $xRequest = $di->getRequest();
-            $aParams = $xRequest->getMethod() === 'POST' ?
-                $xRequest->getParsedBody() : $xRequest->getQueryParams();
-            return $aParams['jxnv'] ?? '3.3.0';
-        });
-    }
+// Jaxon App
+$this->set(AppInterface::class, fn() => new App());
+// Jaxon App bootstrap
+$this->set(Bootstrap::class, function($di) {
+return new Bootstrap($di->g(ConfigManager::class),
+    $di->g(PackageManager::class), $di->g(CallbackManager::class));
+});
+// The javascript library version
+$this->set($this->sJsLibVersion, function($di) {
+$xRequest = $di->getRequest();
+$aParams = $xRequest->getMethod() === 'POST' ?
+    $xRequest->getParsedBody() : $xRequest->getQueryParams();
+return $aParams['jxnv'] ?? '3.3.0';
+});
+}
 
-    /**
+/**
      * Register the event handlers
      *
      * @return void
      */
-    private function setEventHandlers(): void
-    {
-        $xEventManager = $this->g(ConfigEventManager::class);
-        $xEventManager->addLibConfigListener(Translator::class);
-    }
+private function setEventHandlers(): void
+{
+$xEventManager = $this->g(ConfigEventManager::class);
+$xEventManager->addLibConfigListener(Translator::class);
+}
 
-    /**
+/**
      * Get the App instance
      *
      * @return AppInterface
      */
-    public function getApp(): AppInterface
-    {
-        return $this->g(AppInterface::class);
-    }
+public function getApp(): AppInterface
+{
+return $this->g(AppInterface::class);
+}
 
-    /**
+/**
      * Get the App bootstrap
      *
      * @return Bootstrap
      */
-    public function getBootstrap(): Bootstrap
-    {
-        return $this->g(Bootstrap::class);
-    }
+public function getBootstrap(): Bootstrap
+{
+return $this->g(Bootstrap::class);
+}
 
-    /**
+/**
      * Get the config manager
      *
      * @return ConfigManager
      */
-    public function config(): ConfigManager
-    {
-        return $this->g(ConfigManager::class);
-    }
+public function config(): ConfigManager
+{
+return $this->g(ConfigManager::class);
+}
 
-    /**
+/**
      * Get the javascript library version
      *
      * @return string
      */
-    public function getJsLibVersion(): string
-    {
-        return $this->g($this->sJsLibVersion);
-    }
+public function getJsLibVersion(): string
+{
+return $this->g($this->sJsLibVersion);
+}
 
-    /**
+/**
      * Get the default request URI
      *
      * @return string
      */
-    public function getRequestUri(): string
-    {
-        return $this->config()->getOption('core.request.uri',
-            $this->getParameterReader()->uri());
-    }
+public function getRequestUri(): string
+{
+return $this->config()->getOption('core.request.uri',
+$this->getParameterReader()->uri());
+}
 }

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

Switch Indentation +34 added lines, -34 removed lines

@@ -15,64 +15,64 @@
 
 trait ResponseTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerResponses(): void
-    {
-        // Global Response
-        $this->set(Response::class, function($di) {
-            return new Response($di->g(ResponseManager::class), $di->g(PluginManager::class));
-        });
-        // Response Manager
-        $this->set(ResponseManager::class, function($di) {
-            $sEncoding = trim($di->g(ConfigManager::class)->getOption('core.encoding', ''));
-            return new ResponseManager($di->g(Container::class), $di->g(Translator::class), $sEncoding);
-        });
-    }
+private function registerResponses(): void
+{
+// Global Response
+$this->set(Response::class, function($di) {
+return new Response($di->g(ResponseManager::class), $di->g(PluginManager::class));
+});
+// Response Manager
+$this->set(ResponseManager::class, function($di) {
+$sEncoding = trim($di->g(ConfigManager::class)->getOption('core.encoding', ''));
+return new ResponseManager($di->g(Container::class), $di->g(Translator::class), $sEncoding);
+});
+}
 
-    /**
+/**
      * Get the response manager
      *
      * @return ResponseManager
      */
-    public function getResponseManager(): ResponseManager
-    {
-        return $this->g(ResponseManager::class);
-    }
+public function getResponseManager(): ResponseManager
+{
+return $this->g(ResponseManager::class);
+}
 
-    /**
+/**
      * Get the global Response object
      *
      * @return Response
      */
-    public function getResponse(): Response
-    {
-        return $this->g(Response::class);
-    }
+public function getResponse(): Response
+{
+return $this->g(Response::class);
+}
 
-    /**
+/**
      * Create a new Jaxon response
      *
      * @return Response
      */
-    public function newResponse(): Response
-    {
-        return new Response($this->g(ResponseManager::class), $this->g(PluginManager::class));
-    }
+public function newResponse(): Response
+{
+return new Response($this->g(ResponseManager::class), $this->g(PluginManager::class));
+}
 
-    /**
+/**
      * Create a new reponse for a Jaxon component
      *
      * @param JxnCall $xJxnCall
      *
      * @return NodeResponse
      */
-    public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
-    {
-        return new NodeResponse($this->g(ResponseManager::class),
-            $this->g(PluginManager::class), $xJxnCall);
-    }
+public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
+{
+return new NodeResponse($this->g(ResponseManager::class),
+$this->g(PluginManager::class), $xJxnCall);
+}
 }

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

Switch Indentation +53 added lines, -53 removed lines

@@ -18,78 +18,78 @@
 
 trait ViewTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerViews(): void
-    {
-        // Jaxon template view
-        $this->set(TemplateView::class, function($di) {
-            return new TemplateView($di->g(TemplateEngine::class));
-        });
-        // View Renderer
-        $this->set(ViewRenderer::class, function($di) {
-            $xViewRenderer = new ViewRenderer($di->g(Container::class));
-            // Add the default view renderer
-            $xViewRenderer->addRenderer('jaxon', function($di) {
-                return $di->g(TemplateView::class);
-            });
-            $sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
-            $sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
-            // By default, render pagination templates with Jaxon.
-            $xViewRenderer->addNamespace('jaxon', $sTemplateDir, '.php', 'jaxon');
-            $xViewRenderer->addNamespace('pagination', $sPaginationDir, '.php', 'jaxon');
-            return $xViewRenderer;
-        });
+private function registerViews(): void
+{
+// Jaxon template view
+$this->set(TemplateView::class, function($di) {
+return new TemplateView($di->g(TemplateEngine::class));
+});
+// View Renderer
+$this->set(ViewRenderer::class, function($di) {
+$xViewRenderer = new ViewRenderer($di->g(Container::class));
+// Add the default view renderer
+$xViewRenderer->addRenderer('jaxon', function($di) {
+    return $di->g(TemplateView::class);
+});
+$sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
+$sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
+// By default, render pagination templates with Jaxon.
+$xViewRenderer->addNamespace('jaxon', $sTemplateDir, '.php', 'jaxon');
+$xViewRenderer->addNamespace('pagination', $sPaginationDir, '.php', 'jaxon');
+return $xViewRenderer;
+});
 
-        // By default there is no dialog library registry.
-        $this->set(LibraryRegistryInterface::class, function($di) {
-            return null;
-        });
-        // Dialog command
-        $this->set(DialogCommand::class, function($di) {
-            return new DialogCommand($di->g(LibraryRegistryInterface::class));
-        });
-        // Pagination renderer
-        $this->set(RendererInterface::class, function($di) {
-            return new Renderer($di->g(ViewRenderer::class));
-        });
+// By default there is no dialog library registry.
+$this->set(LibraryRegistryInterface::class, function($di) {
+return null;
+});
+// Dialog command
+$this->set(DialogCommand::class, function($di) {
+return new DialogCommand($di->g(LibraryRegistryInterface::class));
+});
+// Pagination renderer
+$this->set(RendererInterface::class, function($di) {
+return new Renderer($di->g(ViewRenderer::class));
+});
 
-        // Helpers for HTML custom attributes formatting
-        $this->set(HtmlAttrHelper::class, function($di) {
-            return new HtmlAttrHelper($di->g(ComponentContainer::class));
-        });
-    }
+// Helpers for HTML custom attributes formatting
+$this->set(HtmlAttrHelper::class, function($di) {
+return new HtmlAttrHelper($di->g(ComponentContainer::class));
+});
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    public function getViewRenderer(): ViewRenderer
-    {
-        return $this->g(ViewRenderer::class);
-    }
+public function getViewRenderer(): ViewRenderer
+{
+return $this->g(ViewRenderer::class);
+}
 
-    /**
+/**
      * Get the custom attributes helper
      *
      * @return HtmlAttrHelper
      */
-    public function getHtmlAttrHelper(): HtmlAttrHelper
-    {
-        return $this->g(HtmlAttrHelper::class);
-    }
+public function getHtmlAttrHelper(): HtmlAttrHelper
+{
+return $this->g(HtmlAttrHelper::class);
+}
 
-    /**
+/**
      * Get the dialog command
      *
      * @return DialogCommand
      */
-    public function getDialogCommand(): DialogCommand
-    {
-        return $this->g(DialogCommand::class);
-    }
+public function getDialogCommand(): DialogCommand
+{
+return $this->g(DialogCommand::class);
+}
 }

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

Switch Indentation +58 added lines, -58 removed lines

@@ -14,78 +14,78 @@
 
 trait UtilTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerUtils(): void
-    {
-        // Translator
-        $this->set(Translator::class, function($di) {
-            $xTranslator = new Translator();
-            $sResourceDir = rtrim(trim($di->g('jaxon.core.dir.translation')), '/\\');
-            // Load the debug translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/errors.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/errors.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/errors.php', 'es');
-            // Load the config translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/config.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/config.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/config.php', 'es');
-            // Load the labels translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/labels.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/labels.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/labels.php', 'es');
-            return $xTranslator;
-        });
+private function registerUtils(): void
+{
+// Translator
+$this->set(Translator::class, function($di) {
+$xTranslator = new Translator();
+$sResourceDir = rtrim(trim($di->g('jaxon.core.dir.translation')), '/\\');
+// Load the debug translations
+$xTranslator->loadTranslations($sResourceDir . '/en/errors.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/errors.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/errors.php', 'es');
+// Load the config translations
+$xTranslator->loadTranslations($sResourceDir . '/en/config.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/config.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/config.php', 'es');
+// Load the labels translations
+$xTranslator->loadTranslations($sResourceDir . '/en/labels.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/labels.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/labels.php', 'es');
+return $xTranslator;
+});
 
-        // Config reader
-        $this->set(ConfigReader::class, function($di) {
-            return new ConfigReader($di->g(ConfigSetter::class));
-        });
-        // Config setter
-        $this->set(ConfigSetter::class, function() {
-            return new ConfigSetter();
-        });
-        // Template engine
-        $this->set(TemplateEngine::class, function($di) {
-            $xTemplateEngine = new TemplateEngine();
-            $sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
-            $sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
-            $xTemplateEngine->addNamespace('jaxon', $sTemplateDir, '.php');
-            $xTemplateEngine->addNamespace('pagination', $sPaginationDir, '.php');
-            $xTemplateEngine->setDefaultNamespace('jaxon');
-            return $xTemplateEngine;
-        });
-        // URI detector
-        $this->set(UriDetector::class, function() {
-            return new UriDetector();
-        });
+// Config reader
+$this->set(ConfigReader::class, function($di) {
+return new ConfigReader($di->g(ConfigSetter::class));
+});
+// Config setter
+$this->set(ConfigSetter::class, function() {
+return new ConfigSetter();
+});
+// Template engine
+$this->set(TemplateEngine::class, function($di) {
+$xTemplateEngine = new TemplateEngine();
+$sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
+$sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
+$xTemplateEngine->addNamespace('jaxon', $sTemplateDir, '.php');
+$xTemplateEngine->addNamespace('pagination', $sPaginationDir, '.php');
+$xTemplateEngine->setDefaultNamespace('jaxon');
+return $xTemplateEngine;
+});
+// URI detector
+$this->set(UriDetector::class, function() {
+return new UriDetector();
+});
 
-        // Temp cache for Jaxon components
-        $this->set(Stash::class, function() {
-            return new Stash();
-        });
-    }
+// Temp cache for Jaxon components
+$this->set(Stash::class, function() {
+return new Stash();
+});
+}
 
-    /**
+/**
      * Get the template engine
      *
      * @return TemplateEngine
      */
-    public function getTemplateEngine(): TemplateEngine
-    {
-        return $this->g(TemplateEngine::class);
-    }
+public function getTemplateEngine(): TemplateEngine
+{
+return $this->g(TemplateEngine::class);
+}
 
-    /**
+/**
      * Get the temp cache for Jaxon components
      *
      * @return Stash
      */
-    public function getStash(): Stash
-    {
-        return $this->g(Stash::class);
-    }
+public function getStash(): Stash
+{
+return $this->g(Stash::class);
+}
 }