jaxon-php / jaxon-mono

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

Switch Indentation +34 added lines, -34 removed lines

@@ -15,64 +15,64 @@
 
 trait ResponseTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerResponses(): void
-    {
-        // Global Response
-        $this->set(Response::class, function($di) {
-            return new Response($di->g(ResponseManager::class), $di->g(PluginManager::class));
-        });
-        // Response Manager
-        $this->set(ResponseManager::class, function($di) {
-            $sEncoding = trim($di->g(ConfigManager::class)->getOption('core.encoding', ''));
-            return new ResponseManager($di->g(Container::class), $di->g(Translator::class), $sEncoding);
-        });
-    }
+private function registerResponses(): void
+{
+// Global Response
+$this->set(Response::class, function($di) {
+return new Response($di->g(ResponseManager::class), $di->g(PluginManager::class));
+});
+// Response Manager
+$this->set(ResponseManager::class, function($di) {
+$sEncoding = trim($di->g(ConfigManager::class)->getOption('core.encoding', ''));
+return new ResponseManager($di->g(Container::class), $di->g(Translator::class), $sEncoding);
+});
+}
 
-    /**
+/**
      * Get the response manager
      *
      * @return ResponseManager
      */
-    public function getResponseManager(): ResponseManager
-    {
-        return $this->g(ResponseManager::class);
-    }
+public function getResponseManager(): ResponseManager
+{
+return $this->g(ResponseManager::class);
+}
 
-    /**
+/**
      * Get the global Response object
      *
      * @return Response
      */
-    public function getResponse(): Response
-    {
-        return $this->g(Response::class);
-    }
+public function getResponse(): Response
+{
+return $this->g(Response::class);
+}
 
-    /**
+/**
      * Create a new Jaxon response
      *
      * @return Response
      */
-    public function newResponse(): Response
-    {
-        return new Response($this->g(ResponseManager::class), $this->g(PluginManager::class));
-    }
+public function newResponse(): Response
+{
+return new Response($this->g(ResponseManager::class), $this->g(PluginManager::class));
+}
 
-    /**
+/**
      * Create a new reponse for a Jaxon component
      *
      * @param JxnCall $xJxnCall
      *
      * @return NodeResponse
      */
-    public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
-    {
-        return new NodeResponse($this->g(ResponseManager::class),
-            $this->g(PluginManager::class), $xJxnCall);
-    }
+public function newNodeResponse(JxnCall $xJxnCall): NodeResponse
+{
+return new NodeResponse($this->g(ResponseManager::class),
+$this->g(PluginManager::class), $xJxnCall);
+}
 }

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

Switch Indentation +53 added lines, -53 removed lines

@@ -18,78 +18,78 @@
 
 trait ViewTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerViews(): void
-    {
-        // Jaxon template view
-        $this->set(TemplateView::class, function($di) {
-            return new TemplateView($di->g(TemplateEngine::class));
-        });
-        // View Renderer
-        $this->set(ViewRenderer::class, function($di) {
-            $xViewRenderer = new ViewRenderer($di->g(Container::class));
-            // Add the default view renderer
-            $xViewRenderer->addRenderer('jaxon', function($di) {
-                return $di->g(TemplateView::class);
-            });
-            $sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
-            $sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
-            // By default, render pagination templates with Jaxon.
-            $xViewRenderer->addNamespace('jaxon', $sTemplateDir, '.php', 'jaxon');
-            $xViewRenderer->addNamespace('pagination', $sPaginationDir, '.php', 'jaxon');
-            return $xViewRenderer;
-        });
+private function registerViews(): void
+{
+// Jaxon template view
+$this->set(TemplateView::class, function($di) {
+return new TemplateView($di->g(TemplateEngine::class));
+});
+// View Renderer
+$this->set(ViewRenderer::class, function($di) {
+$xViewRenderer = new ViewRenderer($di->g(Container::class));
+// Add the default view renderer
+$xViewRenderer->addRenderer('jaxon', function($di) {
+    return $di->g(TemplateView::class);
+});
+$sTemplateDir = rtrim(trim($di->g('jaxon.core.dir.template')), '/\\');
+$sPaginationDir = $sTemplateDir . DIRECTORY_SEPARATOR . 'pagination';
+// By default, render pagination templates with Jaxon.
+$xViewRenderer->addNamespace('jaxon', $sTemplateDir, '.php', 'jaxon');
+$xViewRenderer->addNamespace('pagination', $sPaginationDir, '.php', 'jaxon');
+return $xViewRenderer;
+});
 
-        // By default there is no dialog library registry.
-        $this->set(LibraryRegistryInterface::class, function($di) {
-            return null;
-        });
-        // Dialog command
-        $this->set(DialogCommand::class, function($di) {
-            return new DialogCommand($di->g(LibraryRegistryInterface::class));
-        });
-        // Pagination renderer
-        $this->set(RendererInterface::class, function($di) {
-            return new Renderer($di->g(ViewRenderer::class));
-        });
+// By default there is no dialog library registry.
+$this->set(LibraryRegistryInterface::class, function($di) {
+return null;
+});
+// Dialog command
+$this->set(DialogCommand::class, function($di) {
+return new DialogCommand($di->g(LibraryRegistryInterface::class));
+});
+// Pagination renderer
+$this->set(RendererInterface::class, function($di) {
+return new Renderer($di->g(ViewRenderer::class));
+});
 
-        // Helpers for HTML custom attributes formatting
-        $this->set(HtmlAttrHelper::class, function($di) {
-            return new HtmlAttrHelper($di->g(ComponentContainer::class));
-        });
-    }
+// Helpers for HTML custom attributes formatting
+$this->set(HtmlAttrHelper::class, function($di) {
+return new HtmlAttrHelper($di->g(ComponentContainer::class));
+});
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return ViewRenderer
      */
-    public function getViewRenderer(): ViewRenderer
-    {
-        return $this->g(ViewRenderer::class);
-    }
+public function getViewRenderer(): ViewRenderer
+{
+return $this->g(ViewRenderer::class);
+}
 
-    /**
+/**
      * Get the custom attributes helper
      *
      * @return HtmlAttrHelper
      */
-    public function getHtmlAttrHelper(): HtmlAttrHelper
-    {
-        return $this->g(HtmlAttrHelper::class);
-    }
+public function getHtmlAttrHelper(): HtmlAttrHelper
+{
+return $this->g(HtmlAttrHelper::class);
+}
 
-    /**
+/**
      * Get the dialog command
      *
      * @return DialogCommand
      */
-    public function getDialogCommand(): DialogCommand
-    {
-        return $this->g(DialogCommand::class);
-    }
+public function getDialogCommand(): DialogCommand
+{
+return $this->g(DialogCommand::class);
+}
 }

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/Di/Traits/RequestTrait.php

Switch Indentation +61 added lines, -61 removed lines

@@ -20,99 +20,99 @@
 
 trait RequestTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerRequests(): void
-    {
-        // The parameter reader
-        $this->set(ParameterReader::class, function($di) {
-            return new ParameterReader($di->g(Container::class), $di->g(Translator::class),
-                $di->g(ConfigManager::class), $di->g(UriDetector::class));
-        });
-        // Callback Manager
-        $this->set(CallbackManager::class, function($di) {
-            return new CallbackManager($di->g(ResponseManager::class));
-        });
-        // By default, register a null upload handler
-        $this->set(UploadHandlerInterface::class, function() {
-            return null;
-        });
-        // Request Handler
-        $this->set(RequestHandler::class, function($di) {
-            return new RequestHandler($di->g(Container::class), $di->g(PluginManager::class),
-                $di->g(ResponseManager::class), $di->g(CallbackManager::class),
-                $di->g(DatabagPlugin::class));
-        });
-        // Requests and calls Factory
-        $this->set(CallFactory::class, function($di) {
-            return new CallFactory($di->g(ComponentContainer::class), $di->g(DialogCommand::class));
-        });
-        // Factory for function parameters
-        $this->set(ParameterFactory::class, function() {
-            return new ParameterFactory();
-        });
-    }
+private function registerRequests(): void
+{
+// The parameter reader
+$this->set(ParameterReader::class, function($di) {
+return new ParameterReader($di->g(Container::class), $di->g(Translator::class),
+    $di->g(ConfigManager::class), $di->g(UriDetector::class));
+});
+// Callback Manager
+$this->set(CallbackManager::class, function($di) {
+return new CallbackManager($di->g(ResponseManager::class));
+});
+// By default, register a null upload handler
+$this->set(UploadHandlerInterface::class, function() {
+return null;
+});
+// Request Handler
+$this->set(RequestHandler::class, function($di) {
+return new RequestHandler($di->g(Container::class), $di->g(PluginManager::class),
+    $di->g(ResponseManager::class), $di->g(CallbackManager::class),
+    $di->g(DatabagPlugin::class));
+});
+// Requests and calls Factory
+$this->set(CallFactory::class, function($di) {
+return new CallFactory($di->g(ComponentContainer::class), $di->g(DialogCommand::class));
+});
+// Factory for function parameters
+$this->set(ParameterFactory::class, function() {
+return new ParameterFactory();
+});
+}
 
-    /**
+/**
      * Get the js call factory
      *
      * @return CallFactory
      */
-    public function getCallFactory(): CallFactory
-    {
-        return $this->g(CallFactory::class);
-    }
+public function getCallFactory(): CallFactory
+{
+return $this->g(CallFactory::class);
+}
 
-    /**
+/**
      * Get the js call parameter factory
      *
      * @return ParameterFactory
      */
-    public function getParameterFactory(): ParameterFactory
-    {
-        return $this->g(ParameterFactory::class);
-    }
+public function getParameterFactory(): ParameterFactory
+{
+return $this->g(ParameterFactory::class);
+}
 
-    /**
+/**
      * Get the request handler
      *
      * @return RequestHandler
      */
-    public function getRequestHandler(): RequestHandler
-    {
-        return $this->g(RequestHandler::class);
-    }
+public function getRequestHandler(): RequestHandler
+{
+return $this->g(RequestHandler::class);
+}
 
-    /**
+/**
      * Get the upload handler
      *
      * @return UploadHandlerInterface|null
      */
-    public function getUploadHandler(): ?UploadHandlerInterface
-    {
-        return $this->g(UploadHandlerInterface::class);
-    }
+public function getUploadHandler(): ?UploadHandlerInterface
+{
+return $this->g(UploadHandlerInterface::class);
+}
 
-    /**
+/**
      * Get the callback manager
      *
      * @return CallbackManager
      */
-    public function getCallbackManager(): CallbackManager
-    {
-        return $this->g(CallbackManager::class);
-    }
+public function getCallbackManager(): CallbackManager
+{
+return $this->g(CallbackManager::class);
+}
 
-    /**
+/**
      * Get the parameter reader
      *
      * @return ParameterReader
      */
-    public function getParameterReader(): ParameterReader
-    {
-        return $this->g(ParameterReader::class);
-    }
+public function getParameterReader(): ParameterReader
+{
+return $this->g(ParameterReader::class);
+}
 }

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

Switch Indentation +27 added lines, -27 removed lines

@@ -24,14 +24,14 @@ 
 
 trait DiAutoTrait
 {
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    abstract protected function cn(): Container;
+abstract protected function cn(): Container;
 
-    /**
+/**
      * Create an instance of a class, getting the constructor parameters from the DI container
      *
      * @param class-string|ReflectionClass $xClass The class name or the reflection class
@@ -40,36 +40,36 @@ 
      * @throws ReflectionException
      * @throws SetupException
      */
-    public function make(string|ReflectionClass $xClass): mixed
-    {
-        if(is_string($xClass))
-        {
-            // Create the reflection class instance
-            $xClass = new ReflectionClass($xClass);
-        }
-        // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
-        {
-            return $xClass->newInstance();
-        }
+public function make(string|ReflectionClass $xClass): mixed
+{
+if(is_string($xClass))
+{
+// Create the reflection class instance
+$xClass = new ReflectionClass($xClass);
+}
+// Use the Reflection class to get the parameters of the constructor
+if(($constructor = $xClass->getConstructor()) === null)
+{
+return $xClass->newInstance();
+}
 
-        $aParameters = array_map(function($xParameter) use($xClass) {
-            return $this->cn()->getParameter($xClass, $xParameter);
-        }, $constructor->getParameters());
-        return $xClass->newInstanceArgs($aParameters);
-    }
+$aParameters = array_map(function($xParameter) use($xClass) {
+return $this->cn()->getParameter($xClass, $xParameter);
+}, $constructor->getParameters());
+return $xClass->newInstanceArgs($aParameters);
+}
 
-    /**
+/**
      * Create an instance of a class by automatically fetching the dependencies in the constructor.
      *
      * @param class-string $sClass    The class name
      *
      * @return void
      */
-    public function auto(string $sClass): void
-    {
-        $this->set($sClass, function() use ($sClass) {
-            return $this->make($sClass);
-        });
-    }
+public function auto(string $sClass): void
+{
+$this->set($sClass, function() use ($sClass) {
+return $this->make($sClass);
+});
+}
 }

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

Switch Indentation +139 added lines, -139 removed lines

@@ -34,154 +34,154 @@ 
 
 trait PluginTrait
 {
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerPlugins(): void
-    {
-        // Plugin manager
-        $this->set(PluginManager::class, function($di) {
-            $xPluginManager = new PluginManager($di->g(Container::class),
-                $di->g(CodeGenerator::class), $di->g(Translator::class));
-            // Register the Jaxon request and response plugins
-            $xPluginManager->registerPlugins();
-            return $xPluginManager;
-        });
-        // Package manager
-        $this->set(PackageManager::class, function($di) {
-            return new PackageManager($di->g(Container::class), $di->g(Translator::class),
-                $di->g(PluginManager::class), $di->g(ConfigManager::class),
-                $di->g(CodeGenerator::class), $di->g(ViewRenderer::class),
-                $di->g(CallbackManager::class), $di->g(ComponentRegistry::class));
-        });
-        // Code Generation
-        $this->set(MinifierInterface::class, function() {
-            return new class extends FileMinifier implements MinifierInterface
-            {};
-        });
-        $this->set(AssetManager::class, function($di) {
-            return new AssetManager($di->g(ConfigManager::class),
-                $di->g(MinifierInterface::class));
-        });
-        $this->set(CodeGenerator::class, function($di) {
-            return new CodeGenerator(Jaxon::VERSION, $di->g(Container::class),
-                $di->g(TemplateEngine::class));
-        });
-        $this->set(ConfigScriptGenerator::class, function($di) {
-            return new ConfigScriptGenerator($di->g(ParameterReader::class),
-                $di->g(TemplateEngine::class), $di->g(ConfigManager::class));
-        });
-        $this->set(ReadyScriptGenerator::class, function($di) {
-            return new ReadyScriptGenerator();
-        });
-
-        // Script response plugin
-        $this->set(ScriptPlugin::class, function($di) {
-            return new ScriptPlugin($di->g(CallFactory::class));
-        });
-        // Databag response plugin
-        $this->set(DatabagPlugin::class, function($di) {
-            return new DatabagPlugin($di->g(Container::class));
-        });
-        // Dialog response plugin
-        $this->set(DialogPlugin::class, function($di) {
-            return new DialogPlugin($di->g(DialogCommand::class));
-        });
-        // Paginator response plugin
-        $this->set(PaginatorPlugin::class, function($di) {
-            return new PaginatorPlugin($di->g(RendererInterface::class));
-        });
-    }
-
-    /**
+private function registerPlugins(): void
+{
+// Plugin manager
+$this->set(PluginManager::class, function($di) {
+$xPluginManager = new PluginManager($di->g(Container::class),
+    $di->g(CodeGenerator::class), $di->g(Translator::class));
+// Register the Jaxon request and response plugins
+$xPluginManager->registerPlugins();
+return $xPluginManager;
+});
+// Package manager
+$this->set(PackageManager::class, function($di) {
+return new PackageManager($di->g(Container::class), $di->g(Translator::class),
+    $di->g(PluginManager::class), $di->g(ConfigManager::class),
+    $di->g(CodeGenerator::class), $di->g(ViewRenderer::class),
+    $di->g(CallbackManager::class), $di->g(ComponentRegistry::class));
+});
+// Code Generation
+$this->set(MinifierInterface::class, function() {
+return new class extends FileMinifier implements MinifierInterface
+{};
+});
+$this->set(AssetManager::class, function($di) {
+return new AssetManager($di->g(ConfigManager::class),
+    $di->g(MinifierInterface::class));
+});
+$this->set(CodeGenerator::class, function($di) {
+return new CodeGenerator(Jaxon::VERSION, $di->g(Container::class),
+    $di->g(TemplateEngine::class));
+});
+$this->set(ConfigScriptGenerator::class, function($di) {
+return new ConfigScriptGenerator($di->g(ParameterReader::class),
+    $di->g(TemplateEngine::class), $di->g(ConfigManager::class));
+});
+$this->set(ReadyScriptGenerator::class, function($di) {
+return new ReadyScriptGenerator();
+});
+
+// Script response plugin
+$this->set(ScriptPlugin::class, function($di) {
+return new ScriptPlugin($di->g(CallFactory::class));
+});
+// Databag response plugin
+$this->set(DatabagPlugin::class, function($di) {
+return new DatabagPlugin($di->g(Container::class));
+});
+// Dialog response plugin
+$this->set(DialogPlugin::class, function($di) {
+return new DialogPlugin($di->g(DialogCommand::class));
+});
+// Paginator response plugin
+$this->set(PaginatorPlugin::class, function($di) {
+return new PaginatorPlugin($di->g(RendererInterface::class));
+});
+}
+
+/**
      * Get the plugin manager
      *
      * @return PluginManager
      */
-    public function getPluginManager(): PluginManager
-    {
-        return $this->g(PluginManager::class);
-    }
+public function getPluginManager(): PluginManager
+{
+return $this->g(PluginManager::class);
+}
 
-    /**
+/**
      * Get the package manager
      *
      * @return PackageManager
      */
-    public function getPackageManager(): PackageManager
-    {
-        return $this->g(PackageManager::class);
-    }
+public function getPackageManager(): PackageManager
+{
+return $this->g(PackageManager::class);
+}
 
-    /**
+/**
      * Get the code generator
      *
      * @return CodeGenerator
      */
-    public function getCodeGenerator(): CodeGenerator
-    {
-        return $this->g(CodeGenerator::class);
-    }
+public function getCodeGenerator(): CodeGenerator
+{
+return $this->g(CodeGenerator::class);
+}
 
-    /**
+/**
      * Get the asset manager
      *
      * @return AssetManager
      */
-    public function getAssetManager(): AssetManager
-    {
-        return $this->g(AssetManager::class);
-    }
+public function getAssetManager(): AssetManager
+{
+return $this->g(AssetManager::class);
+}
 
-    /**
+/**
      * Get the jQuery plugin
      *
      * @return ScriptPlugin
      */
-    public function getScriptPlugin(): ScriptPlugin
-    {
-        return $this->g(ScriptPlugin::class);
-    }
+public function getScriptPlugin(): ScriptPlugin
+{
+return $this->g(ScriptPlugin::class);
+}
 
-    /**
+/**
      * Get the dialog plugin
      *
      * @return DialogPlugin
      */
-    public function getDialogPlugin(): DialogPlugin
-    {
-        return $this->g(DialogPlugin::class);
-    }
+public function getDialogPlugin(): DialogPlugin
+{
+return $this->g(DialogPlugin::class);
+}
 
-    /**
+/**
      * @param class-string $sClassName    The package class name
      *
      * @return string
      */
-    private function getPackageConfigKey(string $sClassName): string
-    {
-        return $sClassName . '_PackageConfig';
-    }
+private function getPackageConfigKey(string $sClassName): string
+{
+return $sClassName . '_PackageConfig';
+}
 
-    /**
+/**
      * @param class-string $sClassName    The package class name
      * @param-closure-this Package $cSetter
      *
      * @return void
      */
-    private function extendPackage(string $sClassName, Closure $cSetter): void
-    {
-        // Initialize the package instance.
-        $this->xLibContainer->extend($sClassName, function($xPackage) use($cSetter) {
-            // Allow the setter to access protected attributes.
-            call_user_func($cSetter->bindTo($xPackage, $xPackage));
-            return $xPackage;
-        });
-    }
-
-    /**
+private function extendPackage(string $sClassName, Closure $cSetter): void
+{
+// Initialize the package instance.
+$this->xLibContainer->extend($sClassName, function($xPackage) use($cSetter) {
+// Allow the setter to access protected attributes.
+call_user_func($cSetter->bindTo($xPackage, $xPackage));
+return $xPackage;
+});
+}
+
+/**
      * Register a package
      *
      * @param class-string $sClassName    The package class name
@@ -190,45 +190,45 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $aUserOptions): void
-    {
-        // Register the user class, but only if the user didn't already.
-        if(!$this->h($sClassName))
-        {
-            $this->set($sClassName, fn() => $this->make($sClassName));
-        }
-
-        // Save the package config in the container.
-        $sConfigKey = $this->getPackageConfigKey($sClassName);
-        $this->set($sConfigKey, function($di) use($aUserOptions) {
-            $xOptionsProvider = $aUserOptions['provider'] ?? null;
-            // The user can provide a callable that returns the package options.
-            if(is_callable($xOptionsProvider))
-            {
-                $aUserOptions = $xOptionsProvider($aUserOptions);
-            }
-            return $di->g(ConfigManager::class)->newConfig($aUserOptions);
-        });
-
-        // Initialize the package instance.
-        $di = $this;
-        $this->extendPackage($sClassName, function() use($di, $sConfigKey) {
-            // $this here refers to the Package instance.
-            $this->xPkgConfig = $di->g($sConfigKey);
-            $this->xRenderer = $di->g(ViewRenderer::class);
-            $this->init();
-        });
-    }
-
-    /**
+public function registerPackage(string $sClassName, array $aUserOptions): void
+{
+// Register the user class, but only if the user didn't already.
+if(!$this->h($sClassName))
+{
+$this->set($sClassName, fn() => $this->make($sClassName));
+}
+
+// Save the package config in the container.
+$sConfigKey = $this->getPackageConfigKey($sClassName);
+$this->set($sConfigKey, function($di) use($aUserOptions) {
+$xOptionsProvider = $aUserOptions['provider'] ?? null;
+// The user can provide a callable that returns the package options.
+if(is_callable($xOptionsProvider))
+{
+    $aUserOptions = $xOptionsProvider($aUserOptions);
+}
+return $di->g(ConfigManager::class)->newConfig($aUserOptions);
+});
+
+// Initialize the package instance.
+$di = $this;
+$this->extendPackage($sClassName, function() use($di, $sConfigKey) {
+// $this here refers to the Package instance.
+$this->xPkgConfig = $di->g($sConfigKey);
+$this->xRenderer = $di->g(ViewRenderer::class);
+$this->init();
+});
+}
+
+/**
      * Get the config of a package
      *
      * @param class-string $sClassName    The package class name
      *
      * @return Config
      */
-    public function getPackageConfig(string $sClassName): Config
-    {
-        return $this->g($this->getPackageConfigKey($sClassName));
-    }
+public function getPackageConfig(string $sClassName): Config
+{
+return $this->g($this->getPackageConfigKey($sClassName));
+}
 }

jaxon-core/src/Di/Container.php

Switch Indentation +149 added lines, -149 removed lines

@@ -33,145 +33,145 @@ 
 
 class Container
 {
-    use Traits\AppTrait;
-    use Traits\PsrTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
-    use Traits\PluginTrait;
-    use Traits\CallableTrait;
-    use Traits\ViewTrait;
-    use Traits\UtilTrait;
-    use Traits\MetadataTrait;
-    use Traits\DiAutoTrait;
+use Traits\AppTrait;
+use Traits\PsrTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
+use Traits\PluginTrait;
+use Traits\CallableTrait;
+use Traits\ViewTrait;
+use Traits\UtilTrait;
+use Traits\MetadataTrait;
+use Traits\DiAutoTrait;
 
-    /**
+/**
      * The library Dependency Injection Container
      *
      * @var PimpleContainer
      */
-    private $xLibContainer;
+private $xLibContainer;
 
-    /**
+/**
      * The application or framework Dependency Injection Container
      *
      * @var ContainerInterface
      */
-    private $xAppContainer = null;
+private $xAppContainer = null;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct()
-    {
-        $this->xLibContainer = new PimpleContainer();
+public function __construct()
+{
+$this->xLibContainer = new PimpleContainer();
 
-        $this->val(Container::class, $this);
+$this->val(Container::class, $this);
 
-        // Register the null logger by default
-        $this->setLogger(new NullLogger());
+// Register the null logger by default
+$this->setLogger(new NullLogger());
 
-        // Template directory
-        $sTemplateDir = realpath(__DIR__ . '/../../templates');
-        $this->val('jaxon.core.dir.template', $sTemplateDir);
+// Template directory
+$sTemplateDir = realpath(__DIR__ . '/../../templates');
+$this->val('jaxon.core.dir.template', $sTemplateDir);
 
-        // Translation directory
-        $sTranslationDir = realpath(__DIR__ . '/../../translations');
-        $this->val('jaxon.core.dir.translation', $sTranslationDir);
+// Translation directory
+$sTranslationDir = realpath(__DIR__ . '/../../translations');
+$this->val('jaxon.core.dir.translation', $sTranslationDir);
 
-        $this->registerAll();
-        $this->setEventHandlers();
-    }
+$this->registerAll();
+$this->setEventHandlers();
+}
 
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    protected function cn(): Container
-    {
-        return $this;
-    }
+protected function cn(): Container
+{
+return $this;
+}
 
-    /**
+/**
      * Register the values into the container
      *
      * @return void
      */
-    private function registerAll()
-    {
-        $this->registerApp();
-        $this->registerPsr();
-        $this->registerRequests();
-        $this->registerResponses();
-        $this->registerPlugins();
-        $this->registerCallables();
-        $this->registerViews();
-        $this->registerUtils();
-        $this->registerMetadataReader();
-    }
+private function registerAll()
+{
+$this->registerApp();
+$this->registerPsr();
+$this->registerRequests();
+$this->registerResponses();
+$this->registerPlugins();
+$this->registerCallables();
+$this->registerViews();
+$this->registerUtils();
+$this->registerMetadataReader();
+}
 
-    /**
+/**
      * Set the logger
      *
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger)
-    {
-        is_a($xLogger, LoggerInterface::class) ?
-            $this->val(LoggerInterface::class, $xLogger) :
-            $this->set(LoggerInterface::class, $xLogger);
-    }
+public function setLogger(LoggerInterface|Closure $xLogger)
+{
+is_a($xLogger, LoggerInterface::class) ?
+$this->val(LoggerInterface::class, $xLogger) :
+$this->set(LoggerInterface::class, $xLogger);
+}
 
-    /**
+/**
      * Get the logger
      *
      * @return LoggerInterface
      */
-    public function getLogger(): LoggerInterface
-    {
-        return $this->get(LoggerInterface::class);
-    }
+public function getLogger(): LoggerInterface
+{
+return $this->get(LoggerInterface::class);
+}
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer)
-    {
-        $this->xAppContainer = $xContainer;
-    }
+public function setContainer(ContainerInterface $xContainer)
+{
+$this->xAppContainer = $xContainer;
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param string $sClass    The full class name
      *
      * @return bool
      */
-    public function h(string $sClass): bool
-    {
-        return $this->xLibContainer->offsetExists($sClass);
-    }
+public function h(string $sClass): bool
+{
+return $this->xLibContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param string $sClass    The full class name
      *
      * @return bool
      */
-    public function has(string $sClass): bool
-    {
-        return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
-            true : $this->xLibContainer->offsetExists($sClass);
-    }
+public function has(string $sClass): bool
+{
+return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
+true : $this->xLibContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -179,12 +179,12 @@ 
      *
      * @return T
      */
-    public function g(string $sClass): mixed
-    {
-        return $this->xLibContainer->offsetGet($sClass);
-    }
+public function g(string $sClass): mixed
+{
+return $this->xLibContainer->offsetGet($sClass);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -193,24 +193,24 @@ 
      * @return T
      * @throws SetupException
      */
-    public function get(string $sClass): mixed
-    {
-        try
-        {
-            return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
-                $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
-        }
-        catch(Exception|Throwable $e)
-        {
-            $xLogger = $this->g(LoggerInterface::class);
-            $xTranslator = $this->g(Translator::class);
-            $sMessage = $e->getMessage() . ': ' . $xTranslator->trans('errors.class.container', ['name' => $sClass]);
-            $xLogger->error($e->getMessage(), ['message' => $sMessage]);
-            throw new SetupException($sMessage);
-        }
-    }
+public function get(string $sClass): mixed
+{
+try
+{
+return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ?
+    $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass);
+}
+catch(Exception|Throwable $e)
+{
+$xLogger = $this->g(LoggerInterface::class);
+$xTranslator = $this->g(Translator::class);
+$sMessage = $e->getMessage() . ': ' . $xTranslator->trans('errors.class.container', ['name' => $sClass]);
+$xLogger->error($e->getMessage(), ['message' => $sMessage]);
+throw new SetupException($sMessage);
+}
+}
 
-    /**
+/**
      * Save a closure in the container
      *
      * @param string|class-string $sClass    The full class name
@@ -219,15 +219,15 @@ 
      *
      * @return void
      */
-    public function set(string $sClass, Closure $xClosure, bool $bIsSingleton = true)
-    {
-        // Wrap the user closure into a new closure, so it can take this container as a parameter.
-        $xClosure = fn() => $xClosure($this);
-        $this->xLibContainer->offsetSet($sClass, $bIsSingleton ?
-            $xClosure : $this->xLibContainer->factory($xClosure));
-    }
+public function set(string $sClass, Closure $xClosure, bool $bIsSingleton = true)
+{
+// Wrap the user closure into a new closure, so it can take this container as a parameter.
+$xClosure = fn() => $xClosure($this);
+$this->xLibContainer->offsetSet($sClass, $bIsSingleton ?
+$xClosure : $this->xLibContainer->factory($xClosure));
+}
 
-    /**
+/**
      * Save a value in the container
      *
      * @param string|class-string $sKey    The key
@@ -235,12 +235,12 @@ 
      *
      * @return void
      */
-    public function val(string $sKey, $xValue)
-    {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
-    }
+public function val(string $sKey, $xValue)
+{
+$this->xLibContainer->offsetSet($sKey, $xValue);
+}
 
-    /**
+/**
      * Set an alias in the container
      *
      * @param string|class-string $sAlias    The alias name
@@ -248,60 +248,60 @@ 
      *
      * @return void
      */
-    public function alias(string $sAlias, string $sClass)
-    {
-        $this->set($sAlias, function($di) use ($sClass) {
-            return $di->get($sClass);
-        });
-    }
+public function alias(string $sAlias, string $sClass)
+{
+$this->set($sAlias, function($di) use ($sClass) {
+return $di->get($sClass);
+});
+}
 
-    /**
+/**
      * @param ReflectionClass $xClass
      * @param ReflectionParameter $xParameter
      *
      * @return mixed
      * @throws SetupException
      */
-    public function getParameter(ReflectionClass $xClass, ReflectionParameter $xParameter)
-    {
-        $xType = $xParameter->getType();
-        // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
-        {
-            // Check the class + the name
-            if($this->has($xType->getName() . ' $' . $xParameter->getName()))
-            {
-                return $this->get($xType->getName() . ' $' . $xParameter->getName());
-            }
-            // Check the class only
-            if($this->has($xType->getName()))
-            {
-                return $this->get($xType->getName());
-            }
-        }
-        // Check the name only
-        return $this->get('$' . $xParameter->getName());
-    }
+public function getParameter(ReflectionClass $xClass, ReflectionParameter $xParameter)
+{
+$xType = $xParameter->getType();
+// Check the parameter class first.
+if($xType instanceof ReflectionNamedType)
+{
+// Check the class + the name
+if($this->has($xType->getName() . ' $' . $xParameter->getName()))
+{
+    return $this->get($xType->getName() . ' $' . $xParameter->getName());
+}
+// Check the class only
+if($this->has($xType->getName()))
+{
+    return $this->get($xType->getName());
+}
+}
+// Check the name only
+return $this->get('$' . $xParameter->getName());
+}
 
-    /**
+/**
      * Get the session manager
      *
      * @return SessionInterface|null
      */
-    public function getSessionManager(): ?SessionInterface
-    {
-        return $this->h(SessionInterface::class) ? $this->g(SessionInterface::class) : null;
-    }
+public function getSessionManager(): ?SessionInterface
+{
+return $this->h(SessionInterface::class) ? $this->g(SessionInterface::class) : null;
+}
 
-    /**
+/**
      * Set the session manager
      *
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure)
-    {
-        $this->set(SessionInterface::class, $xClosure);
-    }
+public function setSessionManager(Closure $xClosure)
+{
+$this->set(SessionInterface::class, $xClosure);
+}
 }

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

Switch Indentation +223 added lines, -223 removed lines

@@ -59,52 +59,52 @@ 
 
 class Paginator
 {
-    /**
+/**
      * @var integer
      */
-    protected $nItemsCount = 0;
+protected $nItemsCount = 0;
 
-    /**
+/**
      * @var integer
      */
-    protected $nPagesCount = 0;
+protected $nPagesCount = 0;
 
-    /**
+/**
      * @var integer
      */
-    protected $nItemsPerPage = 0;
+protected $nItemsPerPage = 0;
 
-    /**
+/**
      * @var integer
      */
-    protected $nPageNumber = 0;
+protected $nPageNumber = 0;
 
-    /**
+/**
      * @var integer
      */
-    protected $nMaxPages = 10;
+protected $nMaxPages = 10;
 
-    /**
+/**
      * @var string
      */
-    protected $sPreviousText = '«';
+protected $sPreviousText = '«';
 
-    /**
+/**
      * @var string
      */
-    protected $sNextText = '»';
+protected $sNextText = '»';
 
-    /**
+/**
      * @var string
      */
-    protected $sEllipsysText = '...';
+protected $sEllipsysText = '...';
 
-    /**
+/**
      * @var PaginatorPlugin
      */
-    private $xPlugin;
+private $xPlugin;
 
-    /**
+/**
      * The constructor.
      *
      * @param PaginatorPlugin $xPlugin
@@ -112,293 +112,293 @@ 
      * @param int $nItemsPerPage    The number of items per page
      * @param int $nItemsCount      The total number of items
      */
-    public function __construct(PaginatorPlugin $xPlugin, int $nPageNumber, int $nItemsPerPage, int $nItemsCount)
-    {
-        $this->xPlugin = $xPlugin;
-        $this->nItemsPerPage = $nItemsPerPage > 0 ? $nItemsPerPage : 0;
-        $this->nItemsCount = $nItemsCount > 0 ? $nItemsCount : 0;
-        $this->nPageNumber = $nPageNumber < 1 ? 1 : $nPageNumber;
-        $this->updatePagesCount();
-    }
-
-    /**
+public function __construct(PaginatorPlugin $xPlugin, int $nPageNumber, int $nItemsPerPage, int $nItemsCount)
+{
+$this->xPlugin = $xPlugin;
+$this->nItemsPerPage = $nItemsPerPage > 0 ? $nItemsPerPage : 0;
+$this->nItemsCount = $nItemsCount > 0 ? $nItemsCount : 0;
+$this->nPageNumber = $nPageNumber < 1 ? 1 : $nPageNumber;
+$this->updatePagesCount();
+}
+
+/**
      * Update the number of pages
      *
      * @return Paginator
      */
-    private function updatePagesCount(): Paginator
-    {
-        $this->nPagesCount = ($this->nItemsPerPage === 0 ? 0 :
-            (int)ceil($this->nItemsCount / $this->nItemsPerPage));
-        if($this->nPageNumber > $this->nPagesCount)
-        {
-            $this->nPageNumber = $this->nPagesCount;
-        }
-        return $this;
-    }
-
-    /**
+private function updatePagesCount(): Paginator
+{
+$this->nPagesCount = ($this->nItemsPerPage === 0 ? 0 :
+(int)ceil($this->nItemsCount / $this->nItemsPerPage));
+if($this->nPageNumber > $this->nPagesCount)
+{
+$this->nPageNumber = $this->nPagesCount;
+}
+return $this;
+}
+
+/**
      * Set the text for the previous page link
      *
      * @param string $sText    The text for the previous page link
      *
      * @return Paginator
      */
-    public function setPreviousText(string $sText): Paginator
-    {
-        $this->sPreviousText = $sText;
-        return $this;
-    }
+public function setPreviousText(string $sText): Paginator
+{
+$this->sPreviousText = $sText;
+return $this;
+}
 
-    /**
+/**
      * Set the text for the next page link
      *
      * @param string $sText    The text for the previous page link
      *
      * @return Paginator
      */
-    public function setNextText(string $sText): Paginator
-    {
-        $this->sNextText = $sText;
-        return $this;
-    }
+public function setNextText(string $sText): Paginator
+{
+$this->sNextText = $sText;
+return $this;
+}
 
-    /**
+/**
      * Set the max number of pages to show
      *
      * @param int $nMaxPages    The max number of pages to show
      *
      * @return Paginator
      */
-    public function setMaxPages(int $nMaxPages): Paginator
-    {
-        $this->nMaxPages = max($nMaxPages, 4);
-        return $this;
-    }
+public function setMaxPages(int $nMaxPages): Paginator
+{
+$this->nMaxPages = max($nMaxPages, 4);
+return $this;
+}
 
-    /**
+/**
      * Get the previous page data.
      *
      * @return Page
      */
-    protected function getPrevPage(): Page
-    {
-        return $this->nPageNumber <= 1 ?
-            new Page('disabled', $this->sPreviousText, 0) :
-            new Page('enabled', $this->sPreviousText, $this->nPageNumber - 1);
-    }
-
-    /**
+protected function getPrevPage(): Page
+{
+return $this->nPageNumber <= 1 ?
+new Page('disabled', $this->sPreviousText, 0) :
+new Page('enabled', $this->sPreviousText, $this->nPageNumber - 1);
+}
+
+/**
      * Get the next page data.
      *
      * @return Page
      */
-    protected function getNextPage(): Page
-    {
-        return $this->nPageNumber >= $this->nPagesCount ?
-            new Page('disabled', $this->sNextText, 0) :
-            new Page('enabled', $this->sNextText, $this->nPageNumber + 1);
-    }
-
-    /**
+protected function getNextPage(): Page
+{
+return $this->nPageNumber >= $this->nPagesCount ?
+new Page('disabled', $this->sNextText, 0) :
+new Page('enabled', $this->sNextText, $this->nPageNumber + 1);
+}
+
+/**
      * Get a page data.
      *
      * @param integer $nNumber    The page number
      *
      * @return Page
      */
-    protected function getPage(int $nNumber): Page
-    {
-        if($nNumber < 1)
-        {
-            return new Page('disabled', $this->sEllipsysText, 0);
-        }
-        $sType = ($nNumber === $this->nPageNumber ? 'current' : 'enabled');
-        return new Page($sType, "$nNumber", $nNumber);
-    }
-
-    /**
+protected function getPage(int $nNumber): Page
+{
+if($nNumber < 1)
+{
+return new Page('disabled', $this->sEllipsysText, 0);
+}
+$sType = ($nNumber === $this->nPageNumber ? 'current' : 'enabled');
+return new Page($sType, "$nNumber", $nNumber);
+}
+
+/**
      * Get the array of page numbers to be printed.
      *
      * Example: [1, 0, 4, 5, 6, 0, 10]
      *
      * @return array
      */
-    protected function getPageNumbers(): array
-    {
-        $aPageNumbers = [];
-
-        if($this->nPagesCount <= $this->nMaxPages)
-        {
-            for($i = 0; $i < $this->nPagesCount; $i++)
-            {
-                $aPageNumbers[] = $i + 1;
-            }
-
-            return $aPageNumbers;
-        }
-
-        // Determine the sliding range, centered around the current page.
-        $nNumAdjacents = (int)floor(($this->nMaxPages - 4) / 2);
-
-        $nSlidingStart = 1;
-        $nSlidingEndOffset = $nNumAdjacents + 3 - $this->nPageNumber;
-        if($nSlidingEndOffset < 0)
-        {
-            $nSlidingStart = $this->nPageNumber - $nNumAdjacents;
-            $nSlidingEndOffset = 0;
-        }
-
-        $nSlidingEnd = $this->nPagesCount;
-        $nSlidingStartOffset = $this->nPageNumber + $nNumAdjacents + 2 - $this->nPagesCount;
-        if($nSlidingStartOffset < 0)
-        {
-            $nSlidingEnd = $this->nPageNumber + $nNumAdjacents;
-            $nSlidingStartOffset = 0;
-        }
-
-        // Build the list of page numbers.
-        if($nSlidingStart > 1)
-        {
-            $aPageNumbers[] = 1;
-            $aPageNumbers[] = 0; // Ellipsys;
-        }
-        for($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
-        {
-            $aPageNumbers[] = $i;
-        }
-        if($nSlidingEnd < $this->nPagesCount)
-        {
-            $aPageNumbers[] = 0; // Ellipsys;
-            $aPageNumbers[] = $this->nPagesCount;
-        }
-
-        return $aPageNumbers;
-    }
-
-    /**
+protected function getPageNumbers(): array
+{
+$aPageNumbers = [];
+
+if($this->nPagesCount <= $this->nMaxPages)
+{
+for($i = 0; $i < $this->nPagesCount; $i++)
+{
+    $aPageNumbers[] = $i + 1;
+}
+
+return $aPageNumbers;
+}
+
+// Determine the sliding range, centered around the current page.
+$nNumAdjacents = (int)floor(($this->nMaxPages - 4) / 2);
+
+$nSlidingStart = 1;
+$nSlidingEndOffset = $nNumAdjacents + 3 - $this->nPageNumber;
+if($nSlidingEndOffset < 0)
+{
+$nSlidingStart = $this->nPageNumber - $nNumAdjacents;
+$nSlidingEndOffset = 0;
+}
+
+$nSlidingEnd = $this->nPagesCount;
+$nSlidingStartOffset = $this->nPageNumber + $nNumAdjacents + 2 - $this->nPagesCount;
+if($nSlidingStartOffset < 0)
+{
+$nSlidingEnd = $this->nPageNumber + $nNumAdjacents;
+$nSlidingStartOffset = 0;
+}
+
+// Build the list of page numbers.
+if($nSlidingStart > 1)
+{
+$aPageNumbers[] = 1;
+$aPageNumbers[] = 0; // Ellipsys;
+}
+for($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
+{
+$aPageNumbers[] = $i;
+}
+if($nSlidingEnd < $this->nPagesCount)
+{
+$aPageNumbers[] = 0; // Ellipsys;
+$aPageNumbers[] = $this->nPagesCount;
+}
+
+return $aPageNumbers;
+}
+
+/**
      * Get the current page number.
      *
      * @return int
      */
-    public function currentPage(): int
-    {
-        return $this->nPageNumber;
-    }
+public function currentPage(): int
+{
+return $this->nPageNumber;
+}
 
-    /**
+/**
      * Get the links (pages raw data).
      *
      * @return array<Page>
      */
-    public function pages(): array
-    {
-        if($this->nPagesCount < 2)
-        {
-            return [];
-        }
-
-        $aPageNumbers = $this->getPageNumbers();
-        $aPages = [$this->getPrevPage()];
-        array_walk($aPageNumbers, function($nNumber) use(&$aPages) {
-            $aPages[] = $this->getPage($nNumber);
-        });
-        $aPages[] = $this->getNextPage();
-
-        return $aPages;
-    }
-
-    /**
+public function pages(): array
+{
+if($this->nPagesCount < 2)
+{
+return [];
+}
+
+$aPageNumbers = $this->getPageNumbers();
+$aPages = [$this->getPrevPage()];
+array_walk($aPageNumbers, function($nNumber) use(&$aPages) {
+$aPages[] = $this->getPage($nNumber);
+});
+$aPages[] = $this->getNextPage();
+
+return $aPages;
+}
+
+/**
      * Call a closure that will receive the page number as parameter.
      *
      * @param Closure $fPageCallback
      *
      * @return Paginator
      */
-    public function page(Closure $fPageCallback): Paginator
-    {
-        $fPageCallback($this->nPageNumber);
+public function page(Closure $fPageCallback): Paginator
+{
+$fPageCallback($this->nPageNumber);
 
-        return $this;
-    }
+return $this;
+}
 
-    /**
+/**
      * Call a closure that will receive the pagination offset as parameter.
      *
      * @param Closure $fOffsetCallback
      *
      * @return Paginator
      */
-    public function offset(Closure $fOffsetCallback): Paginator
-    {
-        $fOffsetCallback(($this->nPageNumber - 1) * $this->nItemsPerPage);
+public function offset(Closure $fOffsetCallback): Paginator
+{
+$fOffsetCallback(($this->nPageNumber - 1) * $this->nItemsPerPage);
 
-        return $this;
-    }
+return $this;
+}
 
-    /**
+/**
      * Show the pagination links
      *
      * @return string
      */
-    private function renderLinks(): string
-    {
-        $aPages = $this->pages();
-        if(count($aPages) === 0)
-        {
-            return '';
-        }
-
-        $xPrevPage = array_shift($aPages); // The first entry in the array
-        $xNextPage = array_pop($aPages); // The last entry in the array
-        return $this->xPlugin->renderer()->render($aPages, $xPrevPage, $xNextPage);
-    }
-
-    /**
+private function renderLinks(): string
+{
+$aPages = $this->pages();
+if(count($aPages) === 0)
+{
+return '';
+}
+
+$xPrevPage = array_shift($aPages); // The first entry in the array
+$xNextPage = array_pop($aPages); // The last entry in the array
+return $this->xPlugin->renderer()->render($aPages, $xPrevPage, $xNextPage);
+}
+
+/**
      * Show the pagination links
      *
      * @param string $sWrapperId
      *
      * @return array|null
      */
-    private function showLinks(string $sWrapperId): ?array
-    {
-        $sHtml = $this->renderLinks();
-        // The HTML code must always be displayed, even if it is empty.
-        if(is_a($this->xPlugin->response(), Response::class))
-        {
-            /** @var Response */
-            $xResponse = $this->xPlugin->response();
-            $xResponse->html($sWrapperId, $sHtml);
-            return !$sHtml ? null : ['id' => $sWrapperId];
-        }
-
-        // The wrapper id is not needed for the NodeResponse
-        /** @var NodeResponse */
-        $xResponse = $this->xPlugin->response();
-        $xResponse->html($sHtml);
-        return !$sHtml ? null : [];
-    }
-
-    /**
+private function showLinks(string $sWrapperId): ?array
+{
+$sHtml = $this->renderLinks();
+// The HTML code must always be displayed, even if it is empty.
+if(is_a($this->xPlugin->response(), Response::class))
+{
+/** @var Response */
+$xResponse = $this->xPlugin->response();
+$xResponse->html($sWrapperId, $sHtml);
+return !$sHtml ? null : ['id' => $sWrapperId];
+}
+
+// The wrapper id is not needed for the NodeResponse
+/** @var NodeResponse */
+$xResponse = $this->xPlugin->response();
+$xResponse->html($sHtml);
+return !$sHtml ? null : [];
+}
+
+/**
      * @param JsExpr $xCall
      * @param string $sWrapperId
      *
      * @return void
      */
-    public function render(JsExpr $xCall, string $sWrapperId = ''): void
-    {
-        if(($xFunc = $xCall->func()) === null)
-        {
-            return;
-        }
-
-        $aParams = $this->showLinks(trim($sWrapperId));
-        if($aParams !== null)
-        {
-            // Set click handlers on the pagination links
-            $aParams['func'] = $xFunc->withPage()->jsonSerialize();
-            $this->xPlugin->addCommand('pg.paginate', $aParams);
-        }
-    }
+public function render(JsExpr $xCall, string $sWrapperId = ''): void
+{
+if(($xFunc = $xCall->func()) === null)
+{
+return;
+}
+
+$aParams = $this->showLinks(trim($sWrapperId));
+if($aParams !== null)
+{
+// Set click handlers on the pagination links
+$aParams['func'] = $xFunc->withPage()->jsonSerialize();
+$this->xPlugin->addCommand('pg.paginate', $aParams);
+}
+}
 }

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