jaxon-php / jaxon-mono

jaxon-core/src/App/PageDatabagTrait.php

Switch Indentation +37 added lines, -37 removed lines

@@ -6,81 +6,81 @@
 
 trait PageDatabagTrait
 {
-    /**
+/**
      * The current page number.
      *
      * @var int
      */
-    private int $currentPage = 1;
+private int $currentPage = 1;
 
-    /**
+/**
      * Get the pagination databag name.
      *
      * @return string
      */
-    abstract protected function bagName(): string;
+abstract protected function bagName(): string;
 
-    /**
+/**
      * Get the pagination databag attribute.
      *
      * @return string
      */
-    abstract protected function bagAttr(): string;
+abstract protected function bagAttr(): string;
 
-    /**
+/**
      * Get the page number.
      *
      * @param int $pageNumber
      *
      * @return int
      */
-    private function getPageNumber(int $pageNumber): int
-    {
-        // If no page number is provided, then get the value from the databag.
-        return $pageNumber > 0 ? $pageNumber :
-            (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
-    }
+private function getPageNumber(int $pageNumber): int
+{
+// If no page number is provided, then get the value from the databag.
+return $pageNumber > 0 ? $pageNumber :
+(int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
+}
 
-    /**
+/**
      * Set the page number.
      *
      * @param int $currentPage
      *
      * @return void
      */
-    private function setCurrentPage(int $currentPage): void
-    {
-        // Save the current page in the databag.
-        $this->bag($this->bagName())->set($this->bagAttr(), $currentPage);
-        $this->currentPage = $currentPage;
-    }
+private function setCurrentPage(int $currentPage): void
+{
+// Save the current page in the databag.
+$this->bag($this->bagName())->set($this->bagAttr(), $currentPage);
+$this->currentPage = $currentPage;
+}
 
-    /**
+/**
      * Get the paginator for the component.
      *
      * @param int $pageNumber
      *
      * @return Paginator
      */
-    protected function paginator(int $pageNumber): Paginator
-    {
-        return $this->cl(Component\Pagination::class)
-            // Use the js class name as component item identifier.
-            ->item($this->rq()->_class())
-            ->paginator($this->getPageNumber($pageNumber), $this->limit(), $this->count())
-            // This callback will receive the final value of the current page number.
-            ->page(function(int $currentPage) {
-                $this->setCurrentPage($currentPage);
-            });
-    }
+protected function paginator(int $pageNumber): Paginator
+{
+return $this->cl(Component\Pagination::class)
+// Use the js class name as component item identifier.
+->item($this->rq()->_class())
+->paginator($this->getPageNumber($pageNumber), $this->limit(), $this->count())
+// This callback will receive the final value of the current page number.
+->page(function(int $currentPage) {
+    $this->setCurrentPage($currentPage);
+});
+}
 
-    /**
+/**
      * Get the current page number
      *
      * @return int
      */
-    protected function currentPage(): int
-    {
-        return $this->currentPage;
-    }
+protected function currentPage(): int
+{
+return $this->currentPage;
+}
 }

Spacing +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
     private function getPageNumber(int $pageNumber): int
     {
         // If no page number is provided, then get the value from the databag.
-        return $pageNumber > 0 ? $pageNumber :
-            (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
+        return $pageNumber > 0 ? $pageNumber : (int)$this->bag($this->bagName())->get($this->bagAttr(), 1);
     }
 
     /**

jaxon-core/src/jaxon_fn.php

Switch Indentation +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
  */
 function jaxon(): Jaxon
 {
-    return Jaxon::getInstance();
+return Jaxon::getInstance();
 }

jaxon-core/src/Exception/Exception.php

Switch Indentation +4 added lines, -4 removed lines

@@ -16,8 +16,8 @@
 
 class Exception extends \Exception
 {
-    public function __construct(string $sMessage)
-    {
-        parent::__construct($sMessage);
-    }
+public function __construct(string $sMessage)
+{
+parent::__construct($sMessage);
+}
 }

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