jaxon-php / jaxon-mono

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

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

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

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

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

Switch Indentation +14 added lines, -14 removed lines

@@ -18,52 +18,52 @@
 
 interface FileInterface
 {
-    /**
+/**
      * Get the filesystem where the file is stored
      *
      * @return Filesystem
      */
-    public function filesystem(): Filesystem;
+public function filesystem(): Filesystem;
 
-    /**
+/**
      * Get the uploaded file type
      *
      * @return string
      */
-    public function type(): string;
+public function type(): string;
 
-    /**
+/**
      * Get the uploaded file name, without the extension and slugified
      *
      * @return string
      */
-    public function name(): string;
+public function name(): string;
 
-    /**
+/**
      * Get the uploaded file name, with the extension
      *
      * @return string
      */
-    public function filename(): string;
+public function filename(): string;
 
-    /**
+/**
      * Get the uploaded file path
      *
      * @return string
      */
-    public function path(): string;
+public function path(): string;
 
-    /**
+/**
      * Get the uploaded file size
      *
      * @return int
      */
-    public function size(): int;
+public function size(): int;
 
-    /**
+/**
      * Get the uploaded file extension
      *
      * @return string
      */
-    public function extension(): string;
+public function extension(): string;
 }

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

Switch Indentation +8 added lines, -8 removed lines

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

jaxon-core/src/Script/ParameterFactory.php

Switch Indentation +45 added lines, -45 removed lines

@@ -19,109 +19,109 @@
 
 class ParameterFactory
 {
-    /**
+/**
      * Make a parameter of type form values
      *
      * @param string $sFormId    The id of the HTML form
      *
      * @return array
      */
-    public function form(string $sFormId): array
-    {
-        return (new HtmlReader($sFormId))->form();
-    }
+public function form(string $sFormId): array
+{
+return (new HtmlReader($sFormId))->form();
+}
 
-    /**
+/**
      * Make a parameter of type input value
      *
      * @param string $sInputId    the id of the HTML input element
      *
      * @return TypedValue
      */
-    public function input(string $sInputId): TypedValue
-    {
-        return (new HtmlReader($sInputId))->input();
-    }
+public function input(string $sInputId): TypedValue
+{
+return (new HtmlReader($sInputId))->input();
+}
 
-    /**
+/**
      * Make a parameter of type checked value
      *
      * @param string $sInputId    the name of the HTML form element
      *
      * @return array
      */
-    public function checked(string $sInputId): array
-    {
-        return (new HtmlReader($sInputId))->checked();
-    }
+public function checked(string $sInputId): array
+{
+return (new HtmlReader($sInputId))->checked();
+}
 
-    /**
+/**
      * Make a parameter of type select
      *
      * @param string $sInputId    the name of the HTML form element
      *
      * @return TypedValue
      */
-    public function select(string $sInputId): TypedValue
-    {
-        return $this->input($sInputId);
-    }
+public function select(string $sInputId): TypedValue
+{
+return $this->input($sInputId);
+}
 
-    /**
+/**
      * Make a parameter of type inner html
      *
      * @param string $sElementId    the id of the HTML element
      *
      * @return TypedValue
      */
-    public function html(string $sElementId): TypedValue
-    {
-        return (new HtmlReader($sElementId))->html();
-    }
+public function html(string $sElementId): TypedValue
+{
+return (new HtmlReader($sElementId))->html();
+}
 
-    /**
+/**
      * Make a parameter of type quoted string
      *
      * @param string $sValue    the value of the parameter
      *
      * @return TypedValue
      */
-    public function string(string $sValue): TypedValue
-    {
-        return TypedValue::make($sValue);
-    }
+public function string(string $sValue): TypedValue
+{
+return TypedValue::make($sValue);
+}
 
-    /**
+/**
      * Make a parameter of type numeric
      *
      * @param int $nValue    the value of the parameter
      *
      * @return TypedValue
      */
-    public function numeric(int $nValue): TypedValue
-    {
-        return TypedValue::make($nValue);
-    }
+public function numeric(int $nValue): TypedValue
+{
+return TypedValue::make($nValue);
+}
 
-    /**
+/**
      * Make a parameter of type numeric
      *
      * @param numeric $nValue    the value of the parameter
      *
      * @return TypedValue
      */
-    public function int(int $nValue): TypedValue
-    {
-        return $this->numeric($nValue);
-    }
+public function int(int $nValue): TypedValue
+{
+return $this->numeric($nValue);
+}
 
-    /**
+/**
      * Make a parameter of type page number
      *
      * @return TypedValue
      */
-    public function page(): TypedValue
-    {
-        return TypedValue::page();
-    }
+public function page(): TypedValue
+{
+return TypedValue::page();
+}
 }

jaxon-core/src/Script/Action/HtmlValue.php

Switch Indentation +25 added lines, -25 removed lines

@@ -16,49 +16,49 @@
 
 class HtmlValue extends TypedValue
 {
-    /**
+/**
      * The class contructor
      *
      * @param array $aValue
      */
-    public function __construct(protected array $aValue)
-    {}
+public function __construct(protected array $aValue)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getType(): string
-    {
-        return $this->aValue['_type'] ?? '_';
-    }
+public function getType(): string
+{
+return $this->aValue['_type'] ?? '_';
+}
 
-    /**
+/**
      * Convert the js value to int
      *
      * @return self
      */
-    public function toInt(): self
-    {
-        $this->aValue['toInt'] = true;
-        return $this;
-    }
+public function toInt(): self
+{
+$this->aValue['toInt'] = true;
+return $this;
+}
 
-    /**
+/**
      * Trim the js value
      *
      * @return self
      */
-    public function trim(): self
-    {
-        $this->aValue['trim'] = true;
-        return $this;
-    }
+public function trim(): self
+{
+$this->aValue['trim'] = true;
+return $this;
+}
 
-    /**
+/**
      * @return array
      */
-    public function jsonSerialize(): array
-    {
-        return $this->aValue;
-    }
+public function jsonSerialize(): array
+{
+return $this->aValue;
+}
 }

jaxon-core/src/Script/Action/Event.php

Switch Indentation +14 added lines, -14 removed lines

@@ -7,29 +7,29 @@
 
 class Event implements JsonSerializable
 {
-    /**
+/**
      * The constructor.
      *
      * @param string $sMode    The event mode: 'jq' or 'js'
      * @param string $sName    The event name
      * @param JsExpr $xHandler   The event handler
      */
-    public function __construct(private string $sMode,
-        private string $sName, private JsExpr $xHandler)
-    {}
+public function __construct(private string $sMode,
+private string $sName, private JsExpr $xHandler)
+{}
 
-    /**
+/**
      * Convert this call to array, when converting the response into json.
      *
      * @return array
      */
-    public function jsonSerialize(): array
-    {
-        return [
-            '_type' => 'event',
-            '_name' => $this->sName,
-            'mode' => $this->sMode,
-            'func' => $this->xHandler->jsonSerialize(),
-        ];
-    }
+public function jsonSerialize(): array
+{
+return [
+'_type' => 'event',
+'_name' => $this->sName,
+'mode' => $this->sMode,
+'func' => $this->xHandler->jsonSerialize(),
+];
+}
 }

jaxon-core/src/Script/Action/SimpleValue.php

Switch Indentation +13 added lines, -13 removed lines

@@ -15,25 +15,25 @@
 
 class SimpleValue extends TypedValue
 {
-    /**
+/**
      * @param mixed $xValue
      */
-    public function __construct(private mixed $xValue)
-    {}
+public function __construct(private mixed $xValue)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getType(): string
-    {
-        return '_';
-    }
+public function getType(): string
+{
+return '_';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function jsonSerialize(): mixed
-    {
-        return $this->xValue;
-    }
+public function jsonSerialize(): mixed
+{
+return $this->xValue;
+}
 }

jaxon-core/src/Script/Action/PageValue.php

Switch Indentation +10 added lines, -10 removed lines

@@ -15,19 +15,19 @@
 
 class PageValue extends TypedValue
 {
-    /**
+/**
      * @return string
      */
-    public function getType(): string
-    {
-        return 'page';
-    }
+public function getType(): string
+{
+return 'page';
+}
 
-    /**
+/**
      * @return array
      */
-    public function jsonSerialize(): array
-    {
-        return ['_type' => 'page', '_name' => ''];
-    }
+public function jsonSerialize(): array
+{
+return ['_type' => 'page', '_name' => ''];
+}
 }