jaxon-php / jaxon-mono

jaxon-core/templates/plugins/config.js.php

Spacing +5 added lines, -5 removed lines

@@ -6,20 +6,20 @@
 jaxon.config.defaultMethod = "<?php echo $this->sDefaultMethod ?>";
 jaxon.config.responseType = "<?php echo $this->sResponseType ?>";
 
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jaxon.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
 
-<?php if(($this->bDebug)): ?>
+<?php if (($this->bDebug)): ?>
 jaxon.debug.active = true;
-<?php if(($this->sDebugOutputID)): ?>
+<?php if (($this->sDebugOutputID)): ?>
 jaxon.debug.outputID = "<?php echo $this->sDebugOutputID ?>";
 <?php endif ?>
-<?php if(($this->bVerboseDebug)): ?>
+<?php if (($this->bVerboseDebug)): ?>
 jaxon.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
 
-<?php if(($this->sCsrfMetaName)): ?>
+<?php if (($this->sCsrfMetaName)): ?>
 jaxon.setCsrf('<?php echo $this->sCsrfMetaName ?>');
 <?php endif ?>

jaxon-core/templates/plugins/wrapper.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if(($this->sScript)): ?>
+<?php if (($this->sScript)): ?>
 <script type="text/javascript" <?php echo $this->sJsOptions ?> charset="UTF-8">
 /* <![CDATA[ */
 <?php echo $this->sScript, "\n" ?>

jaxon-core/templates/plugins/includes.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
-<?php foreach($this->aUrls as $sUrl):
+<?php foreach ($this->aUrls as $sUrl):
 $this->include('jaxon::plugins/include.js', ['sUrl' => $sUrl, 'sJsOptions' => $this->sJsOptions]);
 endforeach;

jaxon-core/src/Di/Container.php

Indentation +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
+        $this->xLibContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Spacing +5 added lines, -6 removed lines

@@ -120,8 +120,7 @@ 
     public function setLogger(LoggerInterface|Closure $xLogger)
     {
         is_a($xLogger, LoggerInterface::class) ?
-            $this->val(LoggerInterface::class, $xLogger) :
-            $this->set(LoggerInterface::class, $xLogger);
+            $this->val(LoggerInterface::class, $xLogger) : $this->set(LoggerInterface::class, $xLogger);
     }
 
     /**
@@ -200,7 +199,7 @@ 
             return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
                 $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
         }
-        catch(Exception|Throwable $e)
+        catch (Exception|Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);
@@ -266,15 +265,15 @@ 
     {
         $xType = $xParameter->getType();
         // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
+        if ($xType instanceof ReflectionNamedType)
         {
             // Check the class + the name
-            if($this->has($xType->getName() . ' $' . $xParameter->getName()))
+            if ($this->has($xType->getName() . ' $' . $xParameter->getName()))
             {
                 return $this->get($xType->getName() . ' $' . $xParameter->getName());
             }
             // Check the class only
-            if($this->has($xType->getName()))
+            if ($this->has($xType->getName()))
             {
                 return $this->get($xType->getName());
             }

Braces +1 added lines, -2 removed lines

@@ -199,8 +199,7 @@
         {
             return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
                 $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
-        }
-        catch(Exception|Throwable $e)
+        } catch(Exception|Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);

Switch Indentation +149 added lines, -149 removed lines

@@ -33,145 +33,145 @@ 
 
 class Container
 {
-    use Traits\AppTrait;
-    use Traits\PsrTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
-    use Traits\PluginTrait;
-    use Traits\CallableTrait;
-    use Traits\ViewTrait;
-    use Traits\UtilTrait;
-    use Traits\MetadataTrait;
-    use Traits\DiAutoTrait;
+use Traits\AppTrait;
+use Traits\PsrTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
+use Traits\PluginTrait;
+use Traits\CallableTrait;
+use Traits\ViewTrait;
+use Traits\UtilTrait;
+use Traits\MetadataTrait;
+use Traits\DiAutoTrait;
 
-    /**
+/**
      * The library Dependency Injection Container
      *
      * @var PimpleContainer
      */
-    private $xLibContainer;
+private $xLibContainer;
 
-    /**
+/**
      * The application or framework Dependency Injection Container
      *
      * @var ContainerInterface
      */
-    private $xAppContainer = null;
+private $xAppContainer = null;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct()
-    {
-        $this->xLibContainer = new PimpleContainer();
+public function __construct()
+{
+$this->xLibContainer = new PimpleContainer();
 
-        $this->val(Container::class, $this);
+$this->val(Container::class, $this);
 
-        // Register the null logger by default
-        $this->setLogger(new NullLogger());
+// Register the null logger by default
+$this->setLogger(new NullLogger());
 
-        // Template directory
-        $sTemplateDir = realpath(__DIR__ . '/../../templates');
-        $this->val('jaxon.core.dir.template', $sTemplateDir);
+// Template directory
+$sTemplateDir = realpath(__DIR__ . '/../../templates');
+$this->val('jaxon.core.dir.template', $sTemplateDir);
 
-        // Translation directory
-        $sTranslationDir = realpath(__DIR__ . '/../../translations');
-        $this->val('jaxon.core.dir.translation', $sTranslationDir);
+// Translation directory
+$sTranslationDir = realpath(__DIR__ . '/../../translations');
+$this->val('jaxon.core.dir.translation', $sTranslationDir);
 
-        $this->registerAll();
-        $this->setEventHandlers();
-    }
+$this->registerAll();
+$this->setEventHandlers();
+}
 
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    protected function cn(): Container
-    {
-        return $this;
-    }
+protected function cn(): Container
+{
+return $this;
+}
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerAll()
-    {
-        $this->registerApp();
-        $this->registerPsr();
-        $this->registerRequests();
-        $this->registerResponses();
-        $this->registerPlugins();
-        $this->registerCallables();
-        $this->registerViews();
-        $this->registerUtils();
-        $this->registerMetadataReader();
-    }
+private function registerAll()
+{
+$this->registerApp();
+$this->registerPsr();
+$this->registerRequests();
+$this->registerResponses();
+$this->registerPlugins();
+$this->registerCallables();
+$this->registerViews();
+$this->registerUtils();
+$this->registerMetadataReader();
+}
 
-    /**
+/**
      * Set the logger
      *
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger)
-    {
-        is_a($xLogger, LoggerInterface::class) ?
-            $this->val(LoggerInterface::class, $xLogger) :
-            $this->set(LoggerInterface::class, $xLogger);
-    }
+public function setLogger(LoggerInterface|Closure $xLogger)
+{
+is_a($xLogger, LoggerInterface::class) ?
+$this->val(LoggerInterface::class, $xLogger) :
+$this->set(LoggerInterface::class, $xLogger);
+}
 
-    /**
+/**
      * Get the logger
      *
      * @return LoggerInterface
      */
-    public function getLogger(): LoggerInterface
-    {
-        return $this->get(LoggerInterface::class);
-    }
+public function getLogger(): LoggerInterface
+{
+return $this->get(LoggerInterface::class);
+}
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer)
-    {
-        $this->xAppContainer = $xContainer;
-    }
+public function setContainer(ContainerInterface $xContainer)
+{
+$this->xAppContainer = $xContainer;
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param string $sClass    The full class name
      *
      * @return bool
      */
-    public function h(string $sClass): bool
-    {
-        return $this->xLibContainer->offsetExists($sClass);
-    }
+public function h(string $sClass): bool
+{
+return $this->xLibContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param string $sClass    The full class name
      *
      * @return bool
      */
-    public function has(string $sClass): bool
-    {
-        return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
-            true : $this->xLibContainer->offsetExists($sClass);
-    }
+public function has(string $sClass): bool
+{
+return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
+true : $this->xLibContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -179,12 +179,12 @@ 
      *
      * @return T
      */
-    public function g(string $sClass): mixed
-    {
-        return $this->xLibContainer->offsetGet($sClass);
-    }
+public function g(string $sClass): mixed
+{
+return $this->xLibContainer->offsetGet($sClass);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -193,24 +193,24 @@ 
      * @return T
      * @throws SetupException
      */
-    public function get(string $sClass): mixed
-    {
-        try
-        {
-            return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
-                $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
-        }
-        catch(Exception|Throwable $e)
-        {
-            $xLogger = $this->g(LoggerInterface::class);
-            $xTranslator = $this->g(Translator::class);
-            $sMessage = $e->getMessage() . ': ' . $xTranslator->trans('errors.class.container', ['name' => $sClass]);
-            $xLogger->error($e->getMessage(), ['message' => $sMessage]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function get(string $sClass): mixed
+{
+try
+{
+return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
+    $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
+}
+catch(Exception|Throwable $e)
+{
+$xLogger = $this->g(LoggerInterface::class);
+$xTranslator = $this->g(Translator::class);
+$sMessage = $e->getMessage() . ': ' . $xTranslator->trans('errors.class.container', ['name' => $sClass]);
+$xLogger->error($e->getMessage(), ['message' => $sMessage]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Save a closure in the container
      *
      * @param string|class-string $sClass    The full class name
@@ -219,15 +219,15 @@ 
      *
      * @return void
      */
-    public function set(string $sClass, Closure $xClosure, bool $bIsSingleton = true)
-    {
-        // Wrap the user closure into a new closure, so it can take this container as a parameter.
-        $xClosure = fn() => $xClosure($this);
-        $this->xLibContainer->offsetSet($sClass, $bIsSingleton ?
-            $xClosure : $this->xLibContainer->factory($xClosure));
-    }
+public function set(string $sClass, Closure $xClosure, bool $bIsSingleton = true)
+{
+// Wrap the user closure into a new closure, so it can take this container as a parameter.
+$xClosure = fn() => $xClosure($this);
+$this->xLibContainer->offsetSet($sClass, $bIsSingleton ?
+$xClosure : $this->xLibContainer->factory($xClosure));
+}
 
-    /**
+/**
      * Save a value in the container
      *
      * @param string|class-string $sKey    The key
@@ -235,12 +235,12 @@ 
      *
      * @return void
      */
-    public function val(string $sKey, $xValue)
-    {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
-    }
+public function val(string $sKey, $xValue)
+{
+$this->xLibContainer->offsetSet($sKey, $xValue);
+}
 
-    /**
+/**
      * Set an alias in the container
      *
      * @param string|class-string $sAlias    The alias name
@@ -248,60 +248,60 @@ 
      *
      * @return void
      */
-    public function alias(string $sAlias, string $sClass)
-    {
-        $this->set($sAlias, function($di) use ($sClass) {
-            return $di->get($sClass);
-        });
-    }
+public function alias(string $sAlias, string $sClass)
+{
+$this->set($sAlias, function($di) use ($sClass) {
+return $di->get($sClass);
+});
+}
 
-    /**
+/**
      * @param ReflectionClass $xClass
      * @param ReflectionParameter $xParameter
      *
      * @return mixed
      * @throws SetupException
      */
-    public function getParameter(ReflectionClass $xClass, ReflectionParameter $xParameter)
-    {
-        $xType = $xParameter->getType();
-        // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
-        {
-            // Check the class + the name
-            if($this->has($xType->getName() . ' $' . $xParameter->getName()))
-            {
-                return $this->get($xType->getName() . ' $' . $xParameter->getName());
-            }
-            // Check the class only
-            if($this->has($xType->getName()))
-            {
-                return $this->get($xType->getName());
-            }
-        }
-        // Check the name only
-        return $this->get('$' . $xParameter->getName());
-    }
+public function getParameter(ReflectionClass $xClass, ReflectionParameter $xParameter)
+{
+$xType = $xParameter->getType();
+// Check the parameter class first.
+if($xType instanceof ReflectionNamedType)
+{
+// Check the class + the name
+if($this->has($xType->getName() . ' $' . $xParameter->getName()))
+{
+    return $this->get($xType->getName() . ' $' . $xParameter->getName());
+}
+// Check the class only
+if($this->has($xType->getName()))
+{
+    return $this->get($xType->getName());
+}
+}
+// Check the name only
+return $this->get('$' . $xParameter->getName());
+}
 
-    /**
+/**
      * Get the session manager
      *
      * @return SessionInterface|null
      */
-    public function getSessionManager(): ?SessionInterface
-    {
-        return $this->h(SessionInterface::class) ? $this->g(SessionInterface::class) : null;
-    }
+public function getSessionManager(): ?SessionInterface
+{
+return $this->h(SessionInterface::class) ? $this->g(SessionInterface::class) : null;
+}
 
-    /**
+/**
      * Set the session manager
      *
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure)
-    {
-        $this->set(SessionInterface::class, $xClosure);
-    }
+public function setSessionManager(Closure $xClosure)
+{
+$this->set(SessionInterface::class, $xClosure);
+}
 }

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

Spacing +1 added lines, -2 removed lines

@@ -37,7 +37,6 @@
     public function getMetadataReader(string $sReaderId): MetadataReaderInterface
     {
         return $this->h("metadata_reader_$sReaderId") ?
-            $this->g("metadata_reader_$sReaderId") :
-            $this->g('metadata_reader_null');
+            $this->g("metadata_reader_$sReaderId") : $this->g('metadata_reader_null');
     }
 }

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/DiAutoTrait.php

Spacing +2 added lines, -2 removed lines

@@ -42,13 +42,13 @@
      */
     public function make(string|ReflectionClass $xClass): mixed
     {
-        if(is_string($xClass))
+        if (is_string($xClass))
         {
             // Create the reflection class instance
             $xClass = new ReflectionClass($xClass);
         }
         // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
+        if (($constructor = $xClass->getConstructor()) === null)
         {
             return $xClass->newInstance();
         }

Switch Indentation +27 added lines, -27 removed lines

@@ -24,14 +24,14 @@ 
 
 trait DiAutoTrait
 {
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    abstract protected function cn(): Container;
+abstract protected function cn(): Container;
 
-    /**
+/**
      * Create an instance of a class, getting the constructor parameters from the DI container
      *
      * @param class-string|ReflectionClass $xClass The class name or the reflection class
@@ -40,36 +40,36 @@ 
      * @throws ReflectionException
      * @throws SetupException
      */
-    public function make(string|ReflectionClass $xClass): mixed
-    {
-        if(is_string($xClass))
-        {
-            // Create the reflection class instance
-            $xClass = new ReflectionClass($xClass);
-        }
-        // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
-        {
-            return $xClass->newInstance();
-        }
+public function make(string|ReflectionClass $xClass): mixed
+{
+if(is_string($xClass))
+{
+// Create the reflection class instance
+$xClass = new ReflectionClass($xClass);
+}
+// Use the Reflection class to get the parameters of the constructor
+if(($constructor = $xClass->getConstructor()) === null)
+{
+return $xClass->newInstance();
+}
 
-        $aParameters = array_map(function($xParameter) use($xClass) {
-            return $this->cn()->getParameter($xClass, $xParameter);
-        }, $constructor->getParameters());
-        return $xClass->newInstanceArgs($aParameters);
-    }
+$aParameters = array_map(function($xParameter) use($xClass) {
+return $this->cn()->getParameter($xClass, $xParameter);
+}, $constructor->getParameters());
+return $xClass->newInstanceArgs($aParameters);
+}
 
-    /**
+/**
      * Create an instance of a class by automatically fetching the dependencies in the constructor.
      *
      * @param class-string $sClass    The class name
      *
      * @return void
      */
-    public function auto(string $sClass): void
-    {
-        $this->set($sClass, function() use ($sClass) {
-            return $this->make($sClass);
-        });
-    }
+public function auto(string $sClass): void
+{
+$this->set($sClass, function() use ($sClass) {
+return $this->make($sClass);
+});
+}
 }

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

Spacing +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
             $xParameterReader = $di->g(ParameterReader::class);
             $xRequest = $di->g(ServerRequestInterface::class);
             $aRequestParameter = $xParameterReader->getRequestParameter($xRequest);
-            return !is_array($aRequestParameter) ? $xRequest :
-                $xRequest->withAttribute('jxncall', $aRequestParameter);
+            return !is_array($aRequestParameter) ? $xRequest : $xRequest->withAttribute('jxncall', $aRequestParameter);
         });
         // PSR factory
         $this->set(PsrFactory::class, function($di) {

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/PluginTrait.php

Spacing +2 added lines, -2 removed lines

@@ -193,7 +193,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions): void
     {
         // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
+        if (!$this->h($sClassName))
         {
             $this->set($sClassName, fn() => $this->make($sClassName));
         }
@@ -203,7 +203,7 @@ 
         $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))
+            if (is_callable($xOptionsProvider))
             {
                 $aUserOptions = $xOptionsProvider($aUserOptions);
             }

Switch Indentation +139 added lines, -139 removed lines

@@ -34,154 +34,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 Package $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
@@ -190,45 +190,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 Package 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 Package 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/Response/Manager/ResponseManager.php

Spacing +6 added lines, -7 removed lines

@@ -186,7 +186,7 @@ 
      */
     private function getCommandArgs(array|JsonSerializable $aArgs, bool $bRemoveEmpty = false): array
     {
-        if(!$bRemoveEmpty)
+        if (!$bRemoveEmpty)
         {
             return $aArgs;
         }
@@ -211,7 +211,7 @@ 
             'name' => $this->str($sName),
             'args' => $this->getCommandArgs($aArgs, $bRemoveEmpty),
         ]);
-        if($this->bOnConfirm)
+        if ($this->bOnConfirm)
         {
             $this->aConfirmCommands[] = $xCommand;
         }
@@ -240,14 +240,14 @@ 
     public function addConfirmCommand(string $sName, Closure $fConfirm,
         string $sQuestion, array $aArgs = []): self
     {
-        if($this->bOnConfirm)
+        if ($this->bOnConfirm)
         {
             throw new AppException($this->xTranslator->trans('errors.app.confirm.nested'));
         }
         $this->bOnConfirm = true;
         $fConfirm();
         $this->bOnConfirm = false;
-        if(($nCommandCount = count($this->aConfirmCommands)) > 0)
+        if (($nCommandCount = count($this->aConfirmCommands)) > 0)
         {
             $aCommand = $this->di->getDialogCommand()->confirm($this->str($sQuestion), $aArgs);
             $aCommand['count'] = $nCommandCount;
@@ -354,7 +354,7 @@ 
      */
     public function printDebug()
     {
-        foreach($this->aDebugMessages as $sMessage)
+        foreach ($this->aDebugMessages as $sMessage)
         {
             $this->addCommand('script.debug', ['message' => $this->str($sMessage)]);
         }
@@ -368,8 +368,7 @@ 
      */
     public function getContentType(): string
     {
-        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() :
-            $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
+        return empty($this->sCharacterEncoding) ? $this->getResponse()->getContentType() : $this->getResponse()->getContentType() . '; charset="' . $this->sCharacterEncoding . '"';
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -214,8 +214,7 @@
         if($this->bOnConfirm)
         {
             $this->aConfirmCommands[] = $xCommand;
-        }
-        else
+        } else
         {
             $this->aCommands[] = $xCommand;
         }