jaxon-php / jaxon-mono

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

Switch Indentation +58 added lines, -58 removed lines

@@ -14,78 +14,78 @@
 
 trait UtilTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerUtils(): void
-    {
-        // Translator
-        $this->set(Translator::class, function($di) {
-            $xTranslator = new Translator();
-            $sResourceDir = rtrim(trim($di->g('jaxon.core.dir.translation')), '/\\');
-            // Load the debug translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/errors.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/errors.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/errors.php', 'es');
-            // Load the config translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/config.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/config.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/config.php', 'es');
-            // Load the labels translations
-            $xTranslator->loadTranslations($sResourceDir . '/en/labels.php', 'en');
-            $xTranslator->loadTranslations($sResourceDir . '/fr/labels.php', 'fr');
-            $xTranslator->loadTranslations($sResourceDir . '/es/labels.php', 'es');
-            return $xTranslator;
-        });
+private function registerUtils(): void
+{
+// Translator
+$this->set(Translator::class, function($di) {
+$xTranslator = new Translator();
+$sResourceDir = rtrim(trim($di->g('jaxon.core.dir.translation')), '/\\');
+// Load the debug translations
+$xTranslator->loadTranslations($sResourceDir . '/en/errors.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/errors.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/errors.php', 'es');
+// Load the config translations
+$xTranslator->loadTranslations($sResourceDir . '/en/config.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/config.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/config.php', 'es');
+// Load the labels translations
+$xTranslator->loadTranslations($sResourceDir . '/en/labels.php', 'en');
+$xTranslator->loadTranslations($sResourceDir . '/fr/labels.php', 'fr');
+$xTranslator->loadTranslations($sResourceDir . '/es/labels.php', 'es');
+return $xTranslator;
+});
 
-        // Config reader
-        $this->set(ConfigReader::class, function($di) {
-            return new ConfigReader($di->g(ConfigSetter::class));
-        });
-        // Config setter
-        $this->set(ConfigSetter::class, function() {
-            return new ConfigSetter();
-        });
-        // Template engine
-        $this->set(TemplateEngine::class, function($di) {
-            $xTemplateEngine = new TemplateEngine();
-            $sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
-            $sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
-            $xTemplateEngine->addNamespace('jaxon', $sTemplateDir, '.php');
-            $xTemplateEngine->addNamespace('pagination', $sPaginationDir, '.php');
-            $xTemplateEngine->setDefaultNamespace('jaxon');
-            return $xTemplateEngine;
-        });
-        // URI detector
-        $this->set(UriDetector::class, function() {
-            return new UriDetector();
-        });
+// Config reader
+$this->set(ConfigReader::class, function($di) {
+return new ConfigReader($di->g(ConfigSetter::class));
+});
+// Config setter
+$this->set(ConfigSetter::class, function() {
+return new ConfigSetter();
+});
+// Template engine
+$this->set(TemplateEngine::class, function($di) {
+$xTemplateEngine = new TemplateEngine();
+$sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
+$sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
+$xTemplateEngine->addNamespace('jaxon', $sTemplateDir, '.php');
+$xTemplateEngine->addNamespace('pagination', $sPaginationDir, '.php');
+$xTemplateEngine->setDefaultNamespace('jaxon');
+return $xTemplateEngine;
+});
+// URI detector
+$this->set(UriDetector::class, function() {
+return new UriDetector();
+});
 
-        // Temp cache for Jaxon components
-        $this->set(Stash::class, function() {
-            return new Stash();
-        });
-    }
+// Temp cache for Jaxon components
+$this->set(Stash::class, function() {
+return new Stash();
+});
+}
 
-    /**
+/**
      * Get the template engine
      *
      * @return TemplateEngine
      */
-    public function getTemplateEngine(): TemplateEngine
-    {
-        return $this->g(TemplateEngine::class);
-    }
+public function getTemplateEngine(): TemplateEngine
+{
+return $this->g(TemplateEngine::class);
+}
 
-    /**
+/**
      * Get the temp cache for Jaxon components
      *
      * @return Stash
      */
-    public function getStash(): Stash
-    {
-        return $this->g(Stash::class);
-    }
+public function getStash(): Stash
+{
+return $this->g(Stash::class);
+}
 }

jaxon-core/src/App/Pagination/RendererInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
 interface RendererInterface
 {
-    /**
+/**
      * Render an array of pagination links
      *
      * @param Page[] $aPages
@@ -25,5 +25,5 @@ 
      *
      * @return string
      */
-    public function render(array $aPages, Page $xPrevPage, Page $xNextPage): string;
+public function render(array $aPages, Page $xPrevPage, Page $xNextPage): string;
 }

jaxon-core/src/App/Pagination/Renderer.php

Switch Indentation +22 added lines, -22 removed lines

@@ -21,30 +21,30 @@ 
 
 class Renderer implements RendererInterface
 {
-    /**
+/**
      * The constructor.
      *
      * @param ViewRenderer $xRenderer
      */
-    public function __construct(private ViewRenderer $xRenderer)
-    {
-        $this->xRenderer = $xRenderer;
-    }
+public function __construct(private ViewRenderer $xRenderer)
+{
+$this->xRenderer = $xRenderer;
+}
 
-    /**
+/**
      * @param Page $xPage
      *
      * @return string
      */
-    private function renderPage(Page $xPage): string
-    {
-        return $this->xRenderer->render("pagination::links/{$xPage->sType}", [
-            'page' => $xPage->nNumber,
-            'text' => $xPage->sText,
-        ])->__toString();
-    }
+private function renderPage(Page $xPage): string
+{
+return $this->xRenderer->render("pagination::links/{$xPage->sType}", [
+'page' => $xPage->nNumber,
+'text' => $xPage->sText,
+])->__toString();
+}
 
-    /**
+/**
      * Render an array of pagination links
      *
      * @param Page[] $aPages
@@ -53,12 +53,12 @@ 
      *
      * @return string
      */
-    public function render(array $aPages, Page $xPrevPage, Page $xNextPage): string
-    {
-        return trim($this->xRenderer->render('pagination::wrapper', [
-            'links' => array_map(fn($xPage) => $this->renderPage($xPage), $aPages),
-            'prev' => $this->renderPage($xPrevPage),
-            'next' => $this->renderPage($xNextPage),
-        ])->__toString());
-    }
+public function render(array $aPages, Page $xPrevPage, Page $xNextPage): string
+{
+return trim($this->xRenderer->render('pagination::wrapper', [
+'links' => array_map(fn($xPage) => $this->renderPage($xPage), $aPages),
+'prev' => $this->renderPage($xPrevPage),
+'next' => $this->renderPage($xNextPage),
+])->__toString());
+}
 }

jaxon-core/src/App/Config/ConfigListenerInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
 interface ConfigListenerInterface
 {
-    /**
+/**
      * Config option changed, in case of multiple changes, the name is an empty string
      *
      * @param Config $xConfig
@@ -26,5 +26,5 @@ 
      *
      * @return void
      */
-    public function onChange(Config $xConfig, string $sName): void;
+public function onChange(Config $xConfig, string $sName): void;
 }

jaxon-core/src/App/Config/ConfigTrait.php

Switch Indentation +32 added lines, -32 removed lines

@@ -16,12 +16,12 @@ 
 
 trait ConfigTrait
 {
-    /**
+/**
      * @return ConfigManager
      */
-    abstract protected function config(): ConfigManager;
+abstract protected function config(): ConfigManager;
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sName The option name
@@ -29,24 +29,24 @@ 
      *
      * @return mixed
      */
-    public function getLibOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->config()->getOption($sName, $xDefault);
-    }
+public function getLibOption(string $sName, $xDefault = null): mixed
+{
+return $this->config()->getOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of a config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasLibOption(string $sName): bool
-    {
-        return $this->config()->hasOption($sName);
-    }
+public function hasLibOption(string $sName): bool
+{
+return $this->config()->hasOption($sName);
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -54,12 +54,12 @@ 
      *
      * @return void
      */
-    public function setLibOption(string $sName, $xValue): void
-    {
-        $this->config()->setOption($sName, $xValue);
-    }
+public function setLibOption(string $sName, $xValue): void
+{
+$this->config()->setOption($sName, $xValue);
+}
 
-    /**
+/**
      * Get the value of an application config option
      *
      * @param string $sName The option name
@@ -67,24 +67,24 @@ 
      *
      * @return mixed
      */
-    public function getAppOption(string $sName, $xDefault = null): mixed
-    {
-        return $this->config()->getAppOption($sName, $xDefault);
-    }
+public function getAppOption(string $sName, $xDefault = null): mixed
+{
+return $this->config()->getAppOption($sName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of an application config option
      *
      * @param string $sName The option name
      *
      * @return bool
      */
-    public function hasAppOption(string $sName): bool
-    {
-        return $this->config()->hasAppOption($sName);
-    }
+public function hasAppOption(string $sName): bool
+{
+return $this->config()->hasAppOption($sName);
+}
 
-    /**
+/**
      * Set the value of a config option
      *
      * @param string $sName The option name
@@ -92,8 +92,8 @@ 
      *
      * @return void
      */
-    public function setAppOption(string $sName, $xValue): void
-    {
-        $this->config()->setAppOption($sName, $xValue);
-    }
+public function setAppOption(string $sName, $xValue): void
+{
+$this->config()->setAppOption($sName, $xValue);
+}
 }

jaxon-core/src/App/Metadata/Data/HookData.php

Switch Indentation +35 added lines, -35 removed lines

@@ -21,59 +21,59 @@
 
 abstract class HookData extends AbstractData
 {
-    /**
+/**
      * @var array
      */
-    protected $aCalls = [];
+protected $aCalls = [];
 
-    /**
+/**
      * @return string
      */
-    abstract protected function getType(): string;
+abstract protected function getType(): string;
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return '__' . $this->getType();
-    }
+public function getName(): string
+{
+return '__' . $this->getType();
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aCalls;
-    }
+public function getValue(): mixed
+{
+return $this->aCalls;
+}
 
-    /**
+/**
      * @param string $sMethod
      * @param array $aParams
      *
      * @return void
      */
-    public function addCall(string $sMethod, array $aParams): void
-    {
-        if(!$this->validateMethod($sMethod))
-        {
-            $sType = $this->getType();
-            throw new SetupException("'$sMethod' is not a valid \"call\" value for $sType.");
-        }
-        $this->aCalls[$sMethod] = $aParams;
-    }
+public function addCall(string $sMethod, array $aParams): void
+{
+if(!$this->validateMethod($sMethod))
+{
+$sType = $this->getType();
+throw new SetupException("'$sMethod' is not a valid \"call\" value for $sType.");
+}
+$this->aCalls[$sMethod] = $aParams;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $aCalls = [];
-        foreach($this->aCalls as $sMethod => $aParams)
-        {
-            $sParams = addslashes(json_encode($aParams));
-            $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";
-        }
-        return $aCalls;
-    }
+public function encode(string $sVarName): array
+{
+$aCalls = [];
+foreach($this->aCalls as $sMethod => $aParams)
+{
+$sParams = addslashes(json_encode($aParams));
+$aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";
+}
+return $aCalls;
+}
 }

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function addCall(string $sMethod, array $aParams): void
     {
-        if(!$this->validateMethod($sMethod))
+        if (!$this->validateMethod($sMethod))
         {
             $sType = $this->getType();
             throw new SetupException("'$sMethod' is not a valid \"call\" value for $sType.");
@@ -69,7 +69,7 @@ 
     public function encode(string $sVarName): array
     {
         $aCalls = [];
-        foreach($this->aCalls as $sMethod => $aParams)
+        foreach ($this->aCalls as $sMethod => $aParams)
         {
             $sParams = addslashes(json_encode($aParams));
             $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";

jaxon-core/src/App/FuncComponent.php

Switch Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@ 
 
 class FuncComponent extends Component\AbstractComponent
 {
-    use Component\HelperTrait;
-    use Component\AjaxResponseTrait;
-    use Component\ComponentTrait;
+use Component\HelperTrait;
+use Component\AjaxResponseTrait;
+use Component\ComponentTrait;
 
-    /**
+/**
      * @inheritDoc
      */
-    final protected function initComponent(Container $di, ComponentHelper $xHelper): void
-    {
-        $this->setHelper($xHelper);
-        $this->setAjaxResponse($di);
-    }
+final protected function initComponent(Container $di, ComponentHelper $xHelper): void
+{
+$this->setHelper($xHelper);
+$this->setAjaxResponse($di);
+}
 
-    /**
+/**
      * Create a paginator.
      *
      * @param int $nPageNumber     The current page number
@@ -30,8 +30,8 @@ 
      *
      * @return Paginator
      */
-    final public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
-    {
-        return $this->response->paginator($nPageNumber, $nItemsPerPage, $nTotalItems);
-    }
+final public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
+{
+return $this->response->paginator($nPageNumber, $nItemsPerPage, $nTotalItems);
+}
 }

jaxon-core/src/App/Session/SessionInterface.php

Switch Indentation +18 added lines, -18 removed lines

@@ -4,23 +4,23 @@ 
 
 interface SessionInterface
 {
-    /**
+/**
      * Get the current session id
      *
      * @return string
      */
-    public function getId(): string;
+public function getId(): string;
 
-    /**
+/**
      * Generate a new session id
      *
      * @param bool $bDeleteData    Whether to delete data from the previous session
      *
      * @return void
      */
-    public function newId(bool $bDeleteData = false): void;
+public function newId(bool $bDeleteData = false): void;
 
-    /**
+/**
      * Save data in the session
      *
      * @param string $sKey    The session key
@@ -28,9 +28,9 @@ 
      *
      * @return void
      */
-    public function set(string $sKey, mixed $xValue): void;
+public function set(string $sKey, mixed $xValue): void;
 
-    /**
+/**
      * Save data in the session, that will be available only until the next call
      *
      * @param string $sKey    The session key
@@ -38,18 +38,18 @@ 
      *
      * @return void
      */
-    // public function flash(string $sKey, $xValue);
+// public function flash(string $sKey, $xValue);
 
-    /**
+/**
      * Check if a session key exists
      *
      * @param string $sKey    The session key
      *
      * @return bool
      */
-    public function has(string $sKey): bool;
+public function has(string $sKey): bool;
 
-    /**
+/**
      * Get data from the session
      *
      * @param string $sKey    The session key
@@ -57,28 +57,28 @@ 
      *
      * @return mixed
      */
-    public function get(string $sKey, mixed $xDefault = null): mixed;
+public function get(string $sKey, mixed $xDefault = null): mixed;
 
-    /**
+/**
      * Get all data in the session
      *
      * @return array
      */
-    public function all(): array;
+public function all(): array;
 
-    /**
+/**
      * Delete a session key and its data
      *
      * @param string $sKey    The session key
      *
      * @return void
      */
-    public function delete(string $sKey): void;
+public function delete(string $sKey): void;
 
-    /**
+/**
      * Delete all data in the session
      *
      * @return void
      */
-    public function clear(): void;
+public function clear(): void;
 }

jaxon-core/src/App/Ajax/Traits/ResponseTrait.php

Switch Indentation +27 added lines, -27 removed lines

@@ -23,58 +23,58 @@
 
 trait ResponseTrait
 {
-    /**
+/**
      * @return ResponseManager
      */
-    abstract public function getResponseManager(): ResponseManager;
+abstract public function getResponseManager(): ResponseManager;
 
-    /**
+/**
      * Get the global Response object
      *
      * @return Response
      */
-    public function getResponse(): Response
-    {
-        return $this->getResponseManager()->getResponse();
-    }
+public function getResponse(): Response
+{
+return $this->getResponseManager()->getResponse();
+}
 
-    /**
+/**
      * Create a new Jaxon response object
      *
      * @return Response
      */
-    public function newResponse(): Response
-    {
-        return $this->getResponseManager()->newResponse();
-    }
+public function newResponse(): Response
+{
+return $this->getResponseManager()->newResponse();
+}
 
-    /**
+/**
      * Get the Jaxon ajax response
      *
      * @return AjaxResponse
      */
-    public function ajaxResponse(): AjaxResponse
-    {
-        return $this->getResponseManager()->ajaxResponse();
-    }
+public function ajaxResponse(): AjaxResponse
+{
+return $this->getResponseManager()->ajaxResponse();
+}
 
-    /**
+/**
      * Get the configured character encoding
      *
      * @return string
      */
-    public function getCharacterEncoding(): string
-    {
-        return $this->getResponseManager()->getCharacterEncoding();
-    }
+public function getCharacterEncoding(): string
+{
+return $this->getResponseManager()->getCharacterEncoding();
+}
 
-    /**
+/**
      * Get the content type of the HTTP response
      *
      * @return string
      */
-    public function getContentType(): string
-    {
-        return $this->getResponseManager()->getContentType();
-    }
+public function getContentType(): string
+{
+return $this->getResponseManager()->getContentType();
+}
 }