jaxon-php / jaxon-mono

jaxon-core/src/Request/TargetInterface.php

Switch Indentation +4 added lines, -4 removed lines

@@ -4,17 +4,17 @@
 
 interface TargetInterface
 {
-    /**
+/**
      * The target method name.
      *
      * @return string
      */
-    public function method(): string;
+public function method(): string;
 
-    /**
+/**
      * The target method args.
      *
      * @return array
      */
-    public function args(): array;
+public function args(): array;
 }

jaxon-core/src/Request/Validator.php

Switch Indentation +31 added lines, -31 removed lines

@@ -29,73 +29,73 @@
 
 class Validator
 {
-    /**
+/**
      * The config manager
      *
      * @var ConfigManager
      */
-    protected $xConfigManager;
+protected $xConfigManager;
 
-    /**
+/**
      * The translator
      *
      * @var Translator
      */
-    protected $xTranslator;
+protected $xTranslator;
 
-    public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)
-    {
-        // Set the config manager
-        $this->xConfigManager = $xConfigManager;
-        // Set the translator
-        $this->xTranslator = $xTranslator;
-    }
+public function __construct(ConfigManager $xConfigManager, Translator $xTranslator)
+{
+// Set the config manager
+$this->xConfigManager = $xConfigManager;
+// Set the translator
+$this->xTranslator = $xTranslator;
+}
 
-    /**
+/**
      * Validate a function name
      *
      * @param string $sName    The function name
      *
      * @return bool
      */
-    public function validateFunction(string $sName): bool
-    {
-        return preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $sName) > 0;
-    }
+public function validateFunction(string $sName): bool
+{
+return preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $sName) > 0;
+}
 
-    /**
+/**
      * Validate a class name
      *
      * @param string $sName    The class name
      *
      * @return bool
      */
-    public function validateJsObject(string $sName): bool
-    {
-        return preg_match('/^([a-zA-Z][a-zA-Z0-9_]*)(\.[a-zA-Z][a-zA-Z0-9_]*)*$/', $sName) > 0;
-    }
+public function validateJsObject(string $sName): bool
+{
+return preg_match('/^([a-zA-Z][a-zA-Z0-9_]*)(\.[a-zA-Z][a-zA-Z0-9_]*)*$/', $sName) > 0;
+}
 
-    /**
+/**
      * Validate a class name
      *
      * @param string $sName    The class name
      *
      * @return bool
      */
-    public function validateClass(string $sName): bool
-    {
-        return preg_match('/^([a-zA-Z][a-zA-Z0-9_]*)(\\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sName) > 0;
-    }
+public function validateClass(string $sName): bool
+{
+return preg_match('/^([a-zA-Z][a-zA-Z0-9_]*)(\\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sName) > 0;
+}
 
-    /**
+/**
      * Validate a method name
      *
      * @param string $sName    The function name
      *
      * @return bool
      */
-    public function validateMethod(string $sName): bool
-    {
-        return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sName) > 0;
-    }
+public function validateMethod(string $sName): bool
+{
+return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sName) > 0;
+}
 }

jaxon-core/src/Request/Handler/Psr/PsrAjaxMiddleware.php

Switch Indentation +29 added lines, -29 removed lines

@@ -25,54 +25,54 @@
 
 class PsrAjaxMiddleware implements MiddlewareInterface
 {
-    /**
+/**
      * @var Container
      */
-    private $di;
+private $di;
 
-    /**
+/**
      * @var RequestHandler
      */
-    private $xRequestHandler;
+private $xRequestHandler;
 
-    /**
+/**
      * @var ResponseManager
      */
-    private $xResponseManager;
+private $xResponseManager;
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
      * @param RequestHandler $xRequestHandler
      * @param ResponseManager $xResponseManager
      */
-    public function __construct(Container $di, RequestHandler $xRequestHandler, ResponseManager $xResponseManager)
-    {
-        $this->di = $di;
-        $this->xRequestHandler = $xRequestHandler;
-        $this->xResponseManager = $xResponseManager;
-    }
+public function __construct(Container $di, RequestHandler $xRequestHandler, ResponseManager $xResponseManager)
+{
+$this->di = $di;
+$this->xRequestHandler = $xRequestHandler;
+$this->xResponseManager = $xResponseManager;
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws RequestException
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        // Save the request in the container. This will override the default request,
-        // and the other classes will get this request from there.
-        $this->di->val(ServerRequestInterface::class, $request);
+public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+{
+// Save the request in the container. This will override the default request,
+// and the other classes will get this request from there.
+$this->di->val(ServerRequestInterface::class, $request);
 
-        if(!$this->xRequestHandler->canProcessRequest())
-        {
-            // Unable to find a plugin to process the request
-            return $handler->handle($request);
-        }
+if(!$this->xRequestHandler->canProcessRequest())
+{
+// Unable to find a plugin to process the request
+return $handler->handle($request);
+}
 
-        // Process the request
-        $this->xRequestHandler->processRequest();
-        // Return a Psr7 response
-        return $this->xResponseManager->getResponse()->toPsr();
-    }
+// Process the request
+$this->xRequestHandler->processRequest();
+// Return a Psr7 response
+return $this->xResponseManager->getResponse()->toPsr();
+}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         // and the other classes will get this request from there.
         $this->di->val(ServerRequestInterface::class, $request);
 
-        if(!$this->xRequestHandler->canProcessRequest())
+        if (!$this->xRequestHandler->canProcessRequest())
         {
             // Unable to find a plugin to process the request
             return $handler->handle($request);

jaxon-core/src/Request/Handler/Psr/PsrConfigMiddleware.php

Switch Indentation +18 added lines, -18 removed lines

@@ -23,37 +23,37 @@
 
 class PsrConfigMiddleware implements MiddlewareInterface
 {
-    /**
+/**
      * @var Container
      */
-    protected $di;
+protected $di;
 
-    /**
+/**
      * @var string
      */
-    protected $sConfigFile;
+protected $sConfigFile;
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
      * @param string $sConfigFile
      */
-    public function __construct(Container $di, string $sConfigFile)
-    {
-        $this->di = $di;
-        $this->sConfigFile = $sConfigFile;
-    }
+public function __construct(Container $di, string $sConfigFile)
+{
+$this->di = $di;
+$this->sConfigFile = $sConfigFile;
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        // Load the config
-        $this->di->getApp()->setup($this->sConfigFile);
-        // Next
-        return $handler->handle($request);
-    }
+public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+{
+// Load the config
+$this->di->getApp()->setup($this->sConfigFile);
+// Next
+return $handler->handle($request);
+}
 }

jaxon-core/src/Request/Handler/Psr/PsrRequestHandler.php

Switch Indentation +33 added lines, -33 removed lines

@@ -25,27 +25,27 @@ 
 
 class PsrRequestHandler implements RequestHandlerInterface
 {
-    /**
+/**
      * @var Container
      */
-    private $di;
+private $di;
 
-    /**
+/**
      * @var RequestHandler
      */
-    private $xRequestHandler;
+private $xRequestHandler;
 
-    /**
+/**
      * @var ResponseManager
      */
-    private $xResponseManager;
+private $xResponseManager;
 
-    /**
+/**
      * @var Translator
      */
-    private $xTranslator;
+private $xTranslator;
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -53,34 +53,34 @@ 
      * @param ResponseManager $xResponseManager
      * @param Translator $xTranslator
      */
-    public function __construct(Container $di, RequestHandler $xRequestHandler,
-        ResponseManager $xResponseManager, Translator $xTranslator)
-    {
-        $this->di = $di;
-        $this->xRequestHandler = $xRequestHandler;
-        $this->xResponseManager = $xResponseManager;
-        $this->xTranslator = $xTranslator;
-    }
+public function __construct(Container $di, RequestHandler $xRequestHandler,
+ResponseManager $xResponseManager, Translator $xTranslator)
+{
+$this->di = $di;
+$this->xRequestHandler = $xRequestHandler;
+$this->xResponseManager = $xResponseManager;
+$this->xTranslator = $xTranslator;
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws RequestException
      */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        // Save the request in the container. This will override the default request,
-        // and the other classes will get this request from there.
-        $this->di->val(ServerRequestInterface::class, $request);
+public function handle(ServerRequestInterface $request): ResponseInterface
+{
+// Save the request in the container. This will override the default request,
+// and the other classes will get this request from there.
+$this->di->val(ServerRequestInterface::class, $request);
 
-        if(!$this->xRequestHandler->canProcessRequest())
-        {
-            // Unable to find a plugin to process the request
-            throw new RequestException($this->xTranslator->trans('errors.request.plugin'));
-        }
+if(!$this->xRequestHandler->canProcessRequest())
+{
+// Unable to find a plugin to process the request
+throw new RequestException($this->xTranslator->trans('errors.request.plugin'));
+}
 
-        // Process the request
-        $this->xRequestHandler->processRequest();
-        // Return a Psr7 response
-        return $this->xResponseManager->getResponse()->toPsr();
-    }
+// Process the request
+$this->xRequestHandler->processRequest();
+// Return a Psr7 response
+return $this->xResponseManager->getResponse()->toPsr();
+}
 }

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         // and the other classes will get this request from there.
         $this->di->val(ServerRequestInterface::class, $request);
 
-        if(!$this->xRequestHandler->canProcessRequest())
+        if (!$this->xRequestHandler->canProcessRequest())
         {
             // Unable to find a plugin to process the request
             throw new RequestException($this->xTranslator->trans('errors.request.plugin'));

jaxon-core/src/Request/Handler/Psr/PsrFactory.php

Switch Indentation +40 added lines, -40 removed lines

@@ -22,50 +22,50 @@ 
 
 class PsrFactory
 {
-    /**
+/**
      * The container
      *
      * @var Container
      */
-    protected $di;
+protected $di;
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
      */
-    public function __construct(Container $di)
-    {
-        $this->di = $di;
-    }
+public function __construct(Container $di)
+{
+$this->di = $di;
+}
 
-    /**
+/**
      * Set the logger
      *
      * @param LoggerInterface $xLogger
      *
      * @return $this
      */
-    public function logger(LoggerInterface $xLogger): PsrFactory
-    {
-        $this->di->setLogger($xLogger);
-        return $this;
-    }
+public function logger(LoggerInterface $xLogger): PsrFactory
+{
+$this->di->setLogger($xLogger);
+return $this;
+}
 
-    /**
+/**
      * Set the container
      *
      * @param ContainerInterface $xContainer
      *
      * @return $this
      */
-    public function container(ContainerInterface $xContainer): PsrFactory
-    {
-        $this->di->setContainer($xContainer);
-        return $this;
-    }
+public function container(ContainerInterface $xContainer): PsrFactory
+{
+$this->di->setContainer($xContainer);
+return $this;
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sRenderer    The renderer name
@@ -74,41 +74,41 @@ 
      *
      * @return $this
      */
-    public function view(string $sRenderer, string $sExtension, Closure $xClosure): PsrFactory
-    {
-        $this->di->getViewRenderer()->setDefaultRenderer($sRenderer, $sExtension, $xClosure);
-        return $this;
-    }
+public function view(string $sRenderer, string $sExtension, Closure $xClosure): PsrFactory
+{
+$this->di->getViewRenderer()->setDefaultRenderer($sRenderer, $sExtension, $xClosure);
+return $this;
+}
 
-    /**
+/**
      * Get the Jaxon ajax PSR request handler
      *
      * @return PsrRequestHandler
      */
-    public function handler(): PsrRequestHandler
-    {
-        return $this->di->getPsrRequestHandler();
-    }
+public function handler(): PsrRequestHandler
+{
+return $this->di->getPsrRequestHandler();
+}
 
-    /**
+/**
      * Get the Jaxon config PSR middleware
      *
      * @param string $sConfigFile
      *
      * @return PsrConfigMiddleware
      */
-    public function config(string $sConfigFile): PsrConfigMiddleware
-    {
-        return $this->di->getPsrConfigMiddleware($sConfigFile);
-    }
+public function config(string $sConfigFile): PsrConfigMiddleware
+{
+return $this->di->getPsrConfigMiddleware($sConfigFile);
+}
 
-    /**
+/**
      * Get the Jaxon ajax PSR middleware
      *
      * @return PsrAjaxMiddleware
      */
-    public function ajax(): PsrAjaxMiddleware
-    {
-        return $this->di->getPsrAjaxMiddleware();
-    }
+public function ajax(): PsrAjaxMiddleware
+{
+return $this->di->getPsrAjaxMiddleware();
+}
 }

jaxon-core/src/Request/Handler/CallbackManager.php

Spacing +9 added lines, -9 removed lines

@@ -98,7 +98,7 @@ 
      */
     public function popBootCallbacks(): array
     {
-        if(empty($this->aBootCallbacks))
+        if (empty($this->aBootCallbacks))
         {
             return [];
         }
@@ -117,9 +117,9 @@ 
     private function getExceptionCallbacks(Exception $xException): array
     {
         $aExceptionCallbacks = [];
-        foreach($this->aExceptionCallbacks as $sExClass => $aCallbacks)
+        foreach ($this->aExceptionCallbacks as $sExClass => $aCallbacks)
         {
-            if(is_a($xException, $sExClass))
+            if (is_a($xException, $sExClass))
             {
                 $aExceptionCallbacks = array_merge($aExceptionCallbacks, $aCallbacks);
             }
@@ -189,13 +189,13 @@ 
      */
     public function error(callable $xCallable, string $sExClass = ''): CallbackManager
     {
-        if($sExClass === '' || $sExClass === Exception::class)
+        if ($sExClass === '' || $sExClass === Exception::class)
         {
             $this->aErrorCallbacks[] = $xCallable;
             return $this;
         }
         // Callback for a given exception class
-        if(isset($this->aExceptionCallbacks[$sExClass]))
+        if (isset($this->aExceptionCallbacks[$sExClass]))
         {
             $this->aExceptionCallbacks[$sExClass][] = $xCallable;
             return $this;
@@ -236,7 +236,7 @@ 
      */
     private function executeCallbacks(array $aCallbacks, array $aParameters): void
     {
-        foreach($aCallbacks as $xCallback)
+        foreach ($aCallbacks as $xCallback)
         {
             $this->executeCallback($xCallback, $aParameters);
         }
@@ -266,10 +266,10 @@ 
     public function onBefore(Target $xTarget, bool &$bEndRequest): void
     {
         // Call the user defined callback
-        foreach($this->aBeforeCallbacks as $xCallback)
+        foreach ($this->aBeforeCallbacks as $xCallback)
         {
             $this->executeCallback($xCallback, [$xTarget, &$bEndRequest]);
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -316,7 +316,7 @@ 
     {
         $aExceptionCallbacks = $this->getExceptionCallbacks($xException);
         $this->executeCallbacks($aExceptionCallbacks, [$xException]);
-        if(count($aExceptionCallbacks) > 0)
+        if (count($aExceptionCallbacks) > 0)
         {
             // Do not throw the exception if a custom handler is defined
             return;

Switch Indentation +140 added lines, -140 removed lines

@@ -26,144 +26,144 @@ 
 
 class CallbackManager
 {
-    /**
+/**
      * The callbacks to run after booting the library
      *
      * @var callable[]
      */
-    protected $aBootCallbacks = [];
+protected $aBootCallbacks = [];
 
-    /**
+/**
      * The callbacks to run before processing the request
      *
      * @var callable[]
      */
-    protected $aBeforeCallbacks = [];
+protected $aBeforeCallbacks = [];
 
-    /**
+/**
      * The callbacks to run after processing the request
      *
      * @var callable[]
      */
-    protected $aAfterCallbacks = [];
+protected $aAfterCallbacks = [];
 
-    /**
+/**
      * The callbacks to run in case of invalid request
      *
      * @var callable[]
      */
-    protected $aInvalidCallbacks = [];
+protected $aInvalidCallbacks = [];
 
-    /**
+/**
      * The callbacks to run in case of error
      *
      * @var callable[]
      */
-    protected $aErrorCallbacks = [];
+protected $aErrorCallbacks = [];
 
-    /**
+/**
      * The callbacks to run in case of exception
      *
      * @var callable[][]
      */
-    protected $aExceptionCallbacks = [];
+protected $aExceptionCallbacks = [];
 
-    /**
+/**
      * The callbacks to run when a class is instanced
      *
      * @var callable[]
      */
-    protected $aInitCallbacks = [];
+protected $aInitCallbacks = [];
 
-    /**
+/**
      * Get the library booting callbacks, and reset the array.
      *
      * @return callable[]
      */
-    public function popBootCallbacks(): array
-    {
-        if(empty($this->aBootCallbacks))
-        {
-            return [];
-        }
-        $aCallbacks = $this->aBootCallbacks;
-        $this->aBootCallbacks = [];
-        return $aCallbacks;
-    }
+public function popBootCallbacks(): array
+{
+if(empty($this->aBootCallbacks))
+{
+return [];
+}
+$aCallbacks = $this->aBootCallbacks;
+$this->aBootCallbacks = [];
+return $aCallbacks;
+}
 
-    /**
+/**
      * Get the exception callbacks.
      *
      * @param Exception $xException      The exception class
      *
      * @return callable[]
      */
-    private function getExceptionCallbacks(Exception $xException): array
-    {
-        $aExceptionCallbacks = [];
-        foreach($this->aExceptionCallbacks as $sExClass => $aCallbacks)
-        {
-            if(is_a($xException, $sExClass))
-            {
-                $aExceptionCallbacks = array_merge($aExceptionCallbacks, $aCallbacks);
-            }
-        }
-        return array_values($aExceptionCallbacks);
-    }
+private function getExceptionCallbacks(Exception $xException): array
+{
+$aExceptionCallbacks = [];
+foreach($this->aExceptionCallbacks as $sExClass => $aCallbacks)
+{
+if(is_a($xException, $sExClass))
+{
+    $aExceptionCallbacks = array_merge($aExceptionCallbacks, $aCallbacks);
+}
+}
+return array_values($aExceptionCallbacks);
+}
 
-    /**
+/**
      * Add a library booting callback.
      *
      * @param callable $xCallable    The callback function
      *
      * @return CallbackManager
      */
-    public function boot(callable $xCallable): CallbackManager
-    {
-        $this->aBootCallbacks[] = $xCallable;
-        return $this;
-    }
+public function boot(callable $xCallable): CallbackManager
+{
+$this->aBootCallbacks[] = $xCallable;
+return $this;
+}
 
-    /**
+/**
      * Add a pre-request processing callback.
      *
      * @param callable $xCallable    The callback function
      *
      * @return CallbackManager
      */
-    public function before(callable $xCallable): CallbackManager
-    {
-        $this->aBeforeCallbacks[] = $xCallable;
-        return $this;
-    }
+public function before(callable $xCallable): CallbackManager
+{
+$this->aBeforeCallbacks[] = $xCallable;
+return $this;
+}
 
-    /**
+/**
      * Add a post-request processing callback.
      *
      * @param callable $xCallable    The callback function
      *
      * @return CallbackManager
      */
-    public function after(callable $xCallable): CallbackManager
-    {
-        $this->aAfterCallbacks[] = $xCallable;
-        return $this;
-    }
+public function after(callable $xCallable): CallbackManager
+{
+$this->aAfterCallbacks[] = $xCallable;
+return $this;
+}
 
-    /**
+/**
      * Add a invalid request callback.
      *
      * @param callable $xCallable    The callback function
      *
      * @return CallbackManager
      */
-    public function invalid(callable $xCallable): CallbackManager
-    {
-        $this->aInvalidCallbacks[] = $xCallable;
-        return $this;
-    }
+public function invalid(callable $xCallable): CallbackManager
+{
+$this->aInvalidCallbacks[] = $xCallable;
+return $this;
+}
 
-    /**
+/**
      * Add a processing error callback.
      *
      * @param callable $xCallable   The callback function
@@ -171,74 +171,74 @@ 
      *
      * @return CallbackManager
      */
-    public function error(callable $xCallable, string $sExClass = ''): CallbackManager
-    {
-        if($sExClass === '' || $sExClass === Exception::class)
-        {
-            $this->aErrorCallbacks[] = $xCallable;
-            return $this;
-        }
-        // Callback for a given exception class
-        if(isset($this->aExceptionCallbacks[$sExClass]))
-        {
-            $this->aExceptionCallbacks[$sExClass][] = $xCallable;
-            return $this;
-        }
-        $this->aExceptionCallbacks[$sExClass] = [$xCallable];
-        return $this;
-    }
+public function error(callable $xCallable, string $sExClass = ''): CallbackManager
+{
+if($sExClass === '' || $sExClass === Exception::class)
+{
+$this->aErrorCallbacks[] = $xCallable;
+return $this;
+}
+// Callback for a given exception class
+if(isset($this->aExceptionCallbacks[$sExClass]))
+{
+$this->aExceptionCallbacks[$sExClass][] = $xCallable;
+return $this;
+}
+$this->aExceptionCallbacks[$sExClass] = [$xCallable];
+return $this;
+}
 
-    /**
+/**
      * Add a class initialisation callback.
      *
      * @param callable $xCallable    The callback function
      *
      * @return CallbackManager
      */
-    public function init(callable $xCallable): CallbackManager
-    {
-        $this->aInitCallbacks[] = $xCallable;
-        return $this;
-    }
+public function init(callable $xCallable): CallbackManager
+{
+$this->aInitCallbacks[] = $xCallable;
+return $this;
+}
 
-    /**
+/**
      * @param callable $xCallback
      * @param array $aParameters
      *
      * @return void
      */
-    private function executeCallback(callable $xCallback, array $aParameters): void
-    {
-        call_user_func_array($xCallback, $aParameters);
-    }
+private function executeCallback(callable $xCallback, array $aParameters): void
+{
+call_user_func_array($xCallback, $aParameters);
+}
 
-    /**
+/**
      * @param array $aCallbacks
      * @param array $aParameters
      *
      * @return void
      */
-    private function executeCallbacks(array $aCallbacks, array $aParameters): void
-    {
-        foreach($aCallbacks as $xCallback)
-        {
-            $this->executeCallback($xCallback, $aParameters);
-        }
-    }
+private function executeCallbacks(array $aCallbacks, array $aParameters): void
+{
+foreach($aCallbacks as $xCallback)
+{
+$this->executeCallback($xCallback, $aParameters);
+}
+}
 
-    /**
+/**
      * Execute the class initialisation callbacks.
      *
      * @param mixed $xComponent
      *
      * @return void
      */
-    public function onInit($xComponent): void
-    {
-        $this->executeCallbacks($this->aInitCallbacks, [$xComponent]);
-    }
+public function onInit($xComponent): void
+{
+$this->executeCallbacks($this->aInitCallbacks, [$xComponent]);
+}
 
-    /**
+/**
      * These are the pre-request processing callbacks passed to the Jaxon library.
      *
      * @param Target $xTarget
@@ -247,20 +247,20 @@ 
      * @return void
      * @throws RequestException
      */
-    public function onBefore(Target $xTarget, bool &$bEndRequest): void
-    {
-        // Call the user defined callback
-        foreach($this->aBeforeCallbacks as $xCallback)
-        {
-            $this->executeCallback($xCallback, [$xTarget, &$bEndRequest]);
-            if($bEndRequest)
-            {
-                return;
-            }
-        }
-    }
+public function onBefore(Target $xTarget, bool &$bEndRequest): void
+{
+// Call the user defined callback
+foreach($this->aBeforeCallbacks as $xCallback)
+{
+$this->executeCallback($xCallback, [$xTarget, &$bEndRequest]);
+if($bEndRequest)
+{
+    return;
+}
+}
+}
 
-    /**
+/**
      * These are the post-request processing callbacks passed to the Jaxon library.
      *
      * @param Target $xTarget
@@ -269,12 +269,12 @@ 
      * @return void
      * @throws RequestException
      */
-    public function onAfter(Target $xTarget, bool $bEndRequest): void
-    {
-        $this->executeCallbacks($this->aAfterCallbacks, [$xTarget, $bEndRequest]);
-    }
+public function onAfter(Target $xTarget, bool $bEndRequest): void
+{
+$this->executeCallbacks($this->aAfterCallbacks, [$xTarget, $bEndRequest]);
+}
 
-    /**
+/**
      * These callbacks are called whenever an invalid request is processed.
      *
      * @param RequestException $xException
@@ -282,13 +282,13 @@ 
      * @return void
      * @throws RequestException
      */
-    public function onInvalid(RequestException $xException): void
-    {
-        $this->executeCallbacks($this->aInvalidCallbacks, [$xException]);
-        throw $xException;
-    }
+public function onInvalid(RequestException $xException): void
+{
+$this->executeCallbacks($this->aInvalidCallbacks, [$xException]);
+throw $xException;
+}
 
-    /**
+/**
      * These callbacks are called whenever an invalid request is processed.
      *
      * @param Exception $xException
@@ -296,17 +296,17 @@ 
      * @return void
      * @throws Exception
      */
-    public function onError(Exception $xException): void
-    {
-        $aExceptionCallbacks = $this->getExceptionCallbacks($xException);
-        $this->executeCallbacks($aExceptionCallbacks, [$xException]);
-        if(count($aExceptionCallbacks) > 0)
-        {
-            // Do not throw the exception if a custom handler is defined
-            return;
-        }
+public function onError(Exception $xException): void
+{
+$aExceptionCallbacks = $this->getExceptionCallbacks($xException);
+$this->executeCallbacks($aExceptionCallbacks, [$xException]);
+if(count($aExceptionCallbacks) > 0)
+{
+// Do not throw the exception if a custom handler is defined
+return;
+}
 
-        $this->executeCallbacks($this->aErrorCallbacks, [$xException]);
-        throw $xException;
-    }
+$this->executeCallbacks($this->aErrorCallbacks, [$xException]);
+throw $xException;
+}
 }

jaxon-core/src/Request/Handler/RequestHandler.php

Spacing +10 added lines, -10 removed lines

@@ -61,7 +61,7 @@ 
     public function canProcessRequest(): bool
     {
         // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             return true;
         }
@@ -70,9 +70,9 @@ 
         $xRequest = $this->di->getRequest();
 
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
+        foreach ($this->xPluginManager->getRequestHandlers() as $sClassName)
         {
-            if($sClassName::canProcessRequest($xRequest))
+            if ($sClassName::canProcessRequest($xRequest))
             {
                 $this->xRequestPlugin = $this->di->g($sClassName);
                 $xTarget = $this->xRequestPlugin->setTarget($xRequest);
@@ -92,7 +92,7 @@ 
     private function _processRequest(): void
     {
         // Process the request
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             $this->xRequestPlugin->processRequest();
             // Process the databag
@@ -109,7 +109,7 @@ 
     public function processRequest(): void
     {
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -118,11 +118,11 @@ 
         {
             $bEndRequest = false;
             // Handle before processing event
-            if($this->xRequestPlugin !== null)
+            if ($this->xRequestPlugin !== null)
             {
                 $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -130,7 +130,7 @@ 
             $this->_processRequest();
 
             // Handle after processing event
-            if($this->xRequestPlugin !== null)
+            if ($this->xRequestPlugin !== null)
             {
                 $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
@@ -138,12 +138,12 @@ 
         // An exception was thrown while processing the request.
         // The request missed the corresponding handler function,
         // or an error occurred while attempting to execute the handler.
-        catch(RequestException $e)
+        catch (RequestException $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

Switch Indentation +84 added lines, -84 removed lines

@@ -30,14 +30,14 @@ 
 
 class RequestHandler
 {
-    /**
+/**
      * The request plugin that is able to process the current request
      *
      * @var RequestHandlerInterface
      */
-    private $xRequestPlugin = null;
+private $xRequestPlugin = null;
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -46,110 +46,110 @@ 
      * @param CallbackManager $xCallbackManager
      * @param DatabagPlugin $xDatabagPlugin
      */
-    public function __construct(private Container $di, private PluginManager $xPluginManager,
-        private ResponseManager $xResponseManager, private CallbackManager $xCallbackManager,
-        private DatabagPlugin $xDatabagPlugin)
-    {}
+public function __construct(private Container $di, private PluginManager $xPluginManager,
+private ResponseManager $xResponseManager, private CallbackManager $xCallbackManager,
+private DatabagPlugin $xDatabagPlugin)
+{}
 
-    /**
+/**
      * Check if the current request can be processed
      *
      * Calls each of the request plugins and determines if the current request can be processed by one of them.
      *
      * @return bool
      */
-    public function canProcessRequest(): bool
-    {
-        // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
-        {
-            return true;
-        }
+public function canProcessRequest(): bool
+{
+// Return true if the request plugin was already found
+if($this->xRequestPlugin !== null)
+{
+return true;
+}
 
-        // The HTTP request
-        $xRequest = $this->di->getRequest();
+// The HTTP request
+$xRequest = $this->di->getRequest();
 
-        // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
-        {
-            if($sClassName::canProcessRequest($xRequest))
-            {
-                $this->xRequestPlugin = $this->di->g($sClassName);
-                $xTarget = $this->xRequestPlugin->setTarget($xRequest);
-                $xTarget->setMethodArgs($this->di->getRequestArguments());
-                return true;
-            }
-        }
-        return false;
-    }
+// Find a plugin to process the request
+foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
+{
+if($sClassName::canProcessRequest($xRequest))
+{
+    $this->xRequestPlugin = $this->di->g($sClassName);
+    $xTarget = $this->xRequestPlugin->setTarget($xRequest);
+    $xTarget->setMethodArgs($this->di->getRequestArguments());
+    return true;
+}
+}
+return false;
+}
 
-    /**
+/**
      * Process the current request and handle errors and exceptions.
      *
      * @return void
      * @throws RequestException
      */
-    private function _processRequest(): void
-    {
-        // Process the request
-        if($this->xRequestPlugin !== null)
-        {
-            $this->xRequestPlugin->processRequest();
-            // Process the databag
-            $this->xDatabagPlugin->writeCommand();
-        }
-    }
+private function _processRequest(): void
+{
+// Process the request
+if($this->xRequestPlugin !== null)
+{
+$this->xRequestPlugin->processRequest();
+// Process the databag
+$this->xDatabagPlugin->writeCommand();
+}
+}
 
-    /**
+/**
      * Process the current request.
      *
      * @return void
      * @throws RequestException
      */
-    public function processRequest(): void
-    {
-        // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
-        {
-            return;
-        }
+public function processRequest(): void
+{
+// Check if there is a plugin to process this request
+if(!$this->canProcessRequest())
+{
+return;
+}
 
-        try
-        {
-            $bEndRequest = false;
-            // Handle before processing event
-            if($this->xRequestPlugin !== null)
-            {
-                $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
-            }
-            if($bEndRequest)
-            {
-                return;
-            }
+try
+{
+$bEndRequest = false;
+// Handle before processing event
+if($this->xRequestPlugin !== null)
+{
+    $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
+}
+if($bEndRequest)
+{
+    return;
+}
 
-            $this->_processRequest();
+$this->_processRequest();
 
-            // Handle after processing event
-            if($this->xRequestPlugin !== null)
-            {
-                $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
-            }
-        }
-        // An exception was thrown while processing the request.
-        // The request missed the corresponding handler function,
-        // or an error occurred while attempting to execute the handler.
-        catch(RequestException $e)
-        {
-            $this->xResponseManager->error($e->getMessage());
-            $this->xCallbackManager->onInvalid($e);
-        }
-        catch(Exception $e)
-        {
-            $this->xResponseManager->error($e->getMessage());
-            $this->xCallbackManager->onError($e);
-        }
+// Handle after processing event
+if($this->xRequestPlugin !== null)
+{
+    $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
+}
+}
+// An exception was thrown while processing the request.
+// The request missed the corresponding handler function,
+// or an error occurred while attempting to execute the handler.
+catch(RequestException $e)
+{
+$this->xResponseManager->error($e->getMessage());
+$this->xCallbackManager->onInvalid($e);
+}
+catch(Exception $e)
+{
+$this->xResponseManager->error($e->getMessage());
+$this->xCallbackManager->onError($e);
+}
 
-        // Print the debug messages
-        $this->xResponseManager->printDebug();
-    }
+// Print the debug messages
+$this->xResponseManager->printDebug();
+}
 }

jaxon-core/src/Request/Handler/ParameterReader.php

Switch Indentation +60 added lines, -60 removed lines

@@ -40,7 +40,7 @@ 
 
 class ParameterReader
 {
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -48,28 +48,28 @@ 
      * @param ConfigManager $xConfigManager
      * @param UriDetector $xUriDetector
      */
-    public function __construct(private Container $di, private Translator $xTranslator,
-        private ConfigManager $xConfigManager, private UriDetector $xUriDetector)
-    {}
+public function __construct(private Container $di, private Translator $xTranslator,
+private ConfigManager $xConfigManager, private UriDetector $xUriDetector)
+{}
 
-    /**
+/**
      * Decode input data.
      *
      * @param string $sStr
      *
      * @return string
      */
-    private function decodeStr(string $sStr): string
-    {
-        $aServerParams = $this->di->getServerParams();
-        $sContentType = $aServerParams['CONTENT_TYPE'] ?? $aServerParams['HTTP_CONTENT_TYPE'] ?? '';
-        $sType = 'multipart/form-data';
-        // Parameters are url encoded when uploading files
-        return strncmp($sContentType, $sType, strlen($sType)) !== 0 ?
-            $sStr : urldecode($sStr);
-    }
+private function decodeStr(string $sStr): string
+{
+$aServerParams = $this->di->getServerParams();
+$sContentType = $aServerParams['CONTENT_TYPE'] ?? $aServerParams['HTTP_CONTENT_TYPE'] ?? '';
+$sType = 'multipart/form-data';
+// Parameters are url encoded when uploading files
+return strncmp($sContentType, $sType, strlen($sType)) !== 0 ?
+$sStr : urldecode($sStr);
+}
 
-    /**
+/**
      * Decode input data.
      *
      * @param string $sStr
@@ -77,73 +77,73 @@ 
      * @return string
      * @throws RequestException
      */
-    private function decoderUtf8Str(string $sStr): string
-    {
-        $sEncoding = $this->xConfigManager->getOption('core.encoding', '');
-        if(function_exists('iconv'))
-        {
-            return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
-        }
-        if(function_exists('mb_convert_encoding'))
-        {
-            return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
-        }
-        // By default, no decoding
-        // return $sStr;
-        throw new RequestException($this->xTranslator->trans('errors.request.conversion'));
-    }
+private function decoderUtf8Str(string $sStr): string
+{
+$sEncoding = $this->xConfigManager->getOption('core.encoding', '');
+if(function_exists('iconv'))
+{
+return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
+}
+if(function_exists('mb_convert_encoding'))
+{
+return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
+}
+// By default, no decoding
+// return $sStr;
+throw new RequestException($this->xTranslator->trans('errors.request.conversion'));
+}
 
-    /**
+/**
      * Choose the function to use to decode input data.
      *
      * @param string $sParam
      *
      * @return string
      */
-    private function decodeRequestParameter(string $sParam): string
-    {
-        $sParam = $this->decodeStr($sParam);
-        if(!$this->xConfigManager->getOption('core.decode_utf8'))
-        {
-            return $sParam;
-        }
-        $this->xConfigManager->setOption('core.decode_utf8', false);
-        return $this->decoderUtf8Str($sParam);
-    }
+private function decodeRequestParameter(string $sParam): string
+{
+$sParam = $this->decodeStr($sParam);
+if(!$this->xConfigManager->getOption('core.decode_utf8'))
+{
+return $sParam;
+}
+$this->xConfigManager->setOption('core.decode_utf8', false);
+return $this->decoderUtf8Str($sParam);
+}
 
-    /**
+/**
      * @param ServerRequestInterface $xRequest
      *
      * @return array|null
      */
-    public function getRequestParameter(ServerRequestInterface $xRequest): ?array
-    {
-        $aBody = $xRequest->getParsedBody();
-        $aParams = is_array($aBody) ? $aBody : $xRequest->getQueryParams();
-        // Check if Jaxon call parameters are present.
-        return !isset($aParams['jxncall']) || !is_string($aParams['jxncall']) ? null :
-            json_decode($this->decodeRequestParameter($aParams['jxncall']), true);
-    }
+public function getRequestParameter(ServerRequestInterface $xRequest): ?array
+{
+$aBody = $xRequest->getParsedBody();
+$aParams = is_array($aBody) ? $aBody : $xRequest->getQueryParams();
+// Check if Jaxon call parameters are present.
+return !isset($aParams['jxncall']) || !is_string($aParams['jxncall']) ? null :
+json_decode($this->decodeRequestParameter($aParams['jxncall']), true);
+}
 
-    /**
+/**
      * Get the URI of the current request
      *
      * @throws UriException
      */
-    public function uri(): string
-    {
-        return $this->xUriDetector->detect($this->di->getServerParams());
-    }
+public function uri(): string
+{
+return $this->xUriDetector->detect($this->di->getServerParams());
+}
 
-    /**
+/**
      * Make the specified URL suitable for redirect
      *
      * @param string $sURL    The relative or fully qualified URL
      *
      * @return string
      */
-    public function parseUrl(string $sURL): string
-    {
-        return $this->xUriDetector->redirect($sURL, $this->di->getServerParams());
-    }
+public function parseUrl(string $sURL): string
+{
+return $this->xUriDetector->redirect($sURL, $this->di->getServerParams());
+}
 }

Spacing +3 added lines, -3 removed lines

@@ -80,11 +80,11 @@ 
     private function decoderUtf8Str(string $sStr): string
     {
         $sEncoding = $this->xConfigManager->getOption('core.encoding', '');
-        if(function_exists('iconv'))
+        if (function_exists('iconv'))
         {
             return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
         }
-        if(function_exists('mb_convert_encoding'))
+        if (function_exists('mb_convert_encoding'))
         {
             return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
         }
@@ -103,7 +103,7 @@ 
     private function decodeRequestParameter(string $sParam): string
     {
         $sParam = $this->decodeStr($sParam);
-        if(!$this->xConfigManager->getOption('core.decode_utf8'))
+        if (!$this->xConfigManager->getOption('core.decode_utf8'))
         {
             return $sParam;
         }