jaxon-php / jaxon-mono

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

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

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/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' => ''];
+}
 }