jaxon-php / jaxon-mono

jaxon-core/src/Di/Container.php

Indentation +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
+        $this->xLibContainer->offsetSet($sKey, $xValue);
     }
 
     /**

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/Response/AbstractResponse.php

Indentation +9 added lines, -9 removed lines

@@ -91,15 +91,15 @@
         return $this->xManager->getErrorMessage();
     }
 
-     /**
-     * Add a response command to the array of commands
-     *
-     * @param string $sName    The command name
-     * @param array|JsonSerializable $aArgs    The command arguments
-     * @param bool $bRemoveEmpty
-     *
-     * @return Command
-     */
+        /**
+         * Add a response command to the array of commands
+         *
+         * @param string $sName    The command name
+         * @param array|JsonSerializable $aArgs    The command arguments
+         * @param bool $bRemoveEmpty
+         *
+         * @return Command
+         */
     public function addCommand(string $sName, array|JsonSerializable $aArgs = [],
         bool $bRemoveEmpty = false): Command
     {

jaxon-core/src/App/View/Store.php

Switch Indentation +55 added lines, -55 removed lines

@@ -9,35 +9,35 @@ 
 
 class Store implements JsonSerializable, Stringable
 {
-    /**
+/**
      * The view renderer
      *
      * @var ViewInterface
      */
-    protected $xRenderer;
+protected $xRenderer;
 
-    /**
+/**
      * The view namespace
      *
      * @var string
      */
-    protected $sNamespace;
+protected $sNamespace;
 
-    /**
+/**
      * The view name
      *
      * @var string
      */
-    protected $sViewName;
+protected $sViewName;
 
-    /**
+/**
      * The view data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -45,26 +45,26 @@ 
      *
      * @return Store
      */
-    public function with(string $sName, $xValue): Store
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function with(string $sName, $xValue): Store
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Set the data to be rendered
      *
      * @param array $aViewData    The view data
      *
      * @return Store
      */
-    public function setData(array $aViewData): Store
-    {
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setData(array $aViewData): Store
+{
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Set the view to be rendered, with optional data
      *
      * @param ViewInterface $xRenderer    The view renderer
@@ -74,65 +74,65 @@ 
      *
      * @return Store
      */
-    public function setView(ViewInterface $xRenderer,
-        string $sNamespace, string $sViewName, array $aViewData = []): Store
-    {
-        $this->xRenderer = $xRenderer;
-        $this->sNamespace = trim($sNamespace);
-        $this->sViewName = trim($sViewName);
-        $this->aViewData = array_merge($this->aViewData, $aViewData);
-        return $this;
-    }
+public function setView(ViewInterface $xRenderer,
+string $sNamespace, string $sViewName, array $aViewData = []): Store
+{
+$this->xRenderer = $xRenderer;
+$this->sNamespace = trim($sNamespace);
+$this->sViewName = trim($sViewName);
+$this->aViewData = array_merge($this->aViewData, $aViewData);
+return $this;
+}
 
-    /**
+/**
      * Get the view namespace
      *
      * @return string        The view namespace
      */
-    public function getNamespace(): string
-    {
-        return $this->sNamespace;
-    }
+public function getNamespace(): string
+{
+return $this->sNamespace;
+}
 
-    /**
+/**
      * Get the view name
      *
      * @return string        The view name
      */
-    public function getViewName(): string
-    {
-        return $this->sViewName;
-    }
+public function getViewName(): string
+{
+return $this->sViewName;
+}
 
-    /**
+/**
      * Get the view data
      *
      * @return array         The view data
      */
-    public function getViewData(): array
-    {
-        return $this->aViewData;
-    }
+public function getViewData(): array
+{
+return $this->aViewData;
+}
 
-    /**
+/**
      * Render a view using third party view system
      *
      * @return string        The string representation of the view
      */
-    public function __toString(): string
-    {
-        return !$this->xRenderer ? '' : $this->xRenderer->render($this);
-    }
+public function __toString(): string
+{
+return !$this->xRenderer ? '' : $this->xRenderer->render($this);
+}
 
-    /**
+/**
      * Convert this object to string for json.
      *
      * This is a method of the JsonSerializable interface.
      *
      * @return string
      */
-    public function jsonSerialize(): string
-    {
-        return $this->__toString();
-    }
+public function jsonSerialize(): string
+{
+return $this->__toString();
+}
 }

jaxon-core/src/App/View/ViewRenderer.php

Switch Indentation +151 added lines, -151 removed lines

@@ -16,58 +16,58 @@ 
 
 class ViewRenderer
 {
-    /**
+/**
      * @var Container
      */
-    protected $di;
+protected $di;
 
-    /**
+/**
      * The view data store
      *
      * @var Store
      */
-    protected $xStore = null;
+protected $xStore = null;
 
-    /**
+/**
      * The view data store
      *
      * @var Store
      */
-    protected $xEmptyStore = null;
+protected $xEmptyStore = null;
 
-    /**
+/**
      * The view namespaces
      *
      * @var array
      */
-    protected $aNamespaces = [];
+protected $aNamespaces = [];
 
-    /**
+/**
      * The default namespace
      *
      * @var string
      */
-    protected $sDefaultNamespace = 'jaxon';
+protected $sDefaultNamespace = 'jaxon';
 
-    /**
+/**
      * The view global data
      *
      * @var array
      */
-    protected $aViewData = [];
+protected $aViewData = [];
 
-    /**
+/**
      * The class constructor
      *
      * @param Container $di
      */
-    public function __construct(Container $di)
-    {
-        $this->di = $di;
-        $this->xEmptyStore = new Store();
-    }
+public function __construct(Container $di)
+{
+$this->di = $di;
+$this->xEmptyStore = new Store();
+}
 
-    /**
+/**
      * Add a view namespace, and set the corresponding renderer.
      *
      * @param string $sNamespace    The namespace name
@@ -77,59 +77,59 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory,
-        string $sExtension, string $sRenderer): void
-    {
-        $aNamespace = [
-            'directory' => $sDirectory,
-            'extension' => $sExtension,
-            'renderer' => $sRenderer,
-        ];
-        $this->aNamespaces[$sNamespace] = $aNamespace;
-    }
+public function addNamespace(string $sNamespace, string $sDirectory,
+string $sExtension, string $sRenderer): void
+{
+$aNamespace = [
+'directory' => $sDirectory,
+'extension' => $sExtension,
+'renderer' => $sRenderer,
+];
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
 
-    /**
+/**
      * Set the view namespaces.
      *
      * @param Config $xAppConfig    The config options provided in the library
      *
      * @return void
      */
-    public function addNamespaces(Config $xAppConfig): void
-    {
-        if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
-        {
-            return;
-        }
+public function addNamespaces(Config $xAppConfig): void
+{
+if(empty($aNamespaces = $xAppConfig->getOptionNames('views')))
+{
+return;
+}
 
-        $sPackage = $xAppConfig->getOption('package', '');
-        foreach($aNamespaces as $sNamespace => $sOption)
-        {
-            // Save the namespace
-            $aNamespace = $xAppConfig->getOption($sOption);
-            $aNamespace['package'] = $sPackage;
-            if(!isset($aNamespace['renderer']))
-            {
-                $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
-            }
-            $this->aNamespaces[$sNamespace] = $aNamespace;
-        }
-    }
+$sPackage = $xAppConfig->getOption('package', '');
+foreach($aNamespaces as $sNamespace => $sOption)
+{
+// Save the namespace
+$aNamespace = $xAppConfig->getOption($sOption);
+$aNamespace['package'] = $sPackage;
+if(!isset($aNamespace['renderer']))
+{
+    $aNamespace['renderer'] = 'jaxon'; // 'jaxon' is the default renderer.
+}
+$this->aNamespaces[$sNamespace] = $aNamespace;
+}
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @param string $sId    The unique identifier of the view renderer
      *
      * @return ViewInterface
      */
-    public function getRenderer(string $sId): ViewInterface
-    {
-        // Return the view renderer with the given id
-        return $this->di->g("jaxon.app.view.$sId");
-    }
+public function getRenderer(string $sId): ViewInterface
+{
+// Return the view renderer with the given id
+return $this->di->g("jaxon.app.view.$sId");
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -137,25 +137,25 @@ 
      *
      * @return void
      */
-    public function addRenderer(string $sId, Closure $xClosure): void
-    {
-        // Return the initialized view renderer
-        $this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
-            // Get the defined renderer
-            $xRenderer = $xClosure($di);
-            // Init the renderer with the template namespaces
-            $aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
-                return $aOptions['renderer'] === $sId;
-            });
-            foreach($aNamespaces as $sName => $aOptions)
-            {
-                $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
-            }
-            return $xRenderer;
-        });
-    }
+public function addRenderer(string $sId, Closure $xClosure): void
+{
+// Return the initialized view renderer
+$this->di->set("jaxon.app.view.$sId", function($di) use($sId, $xClosure) {
+// Get the defined renderer
+$xRenderer = $xClosure($di);
+// Init the renderer with the template namespaces
+$aNamespaces = array_filter($this->aNamespaces, function($aOptions) use($sId) {
+    return $aOptions['renderer'] === $sId;
+});
+foreach($aNamespaces as $sName => $aOptions)
+{
+    $xRenderer->addNamespace($sName, $aOptions['directory'], $aOptions['extension']);
+}
+return $xRenderer;
+});
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sId    The unique identifier of the view renderer
@@ -164,55 +164,55 @@ 
      *
      * @return void
      */
-    public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
-    {
-        $this->setDefaultNamespace($sId);
-        $this->addNamespace($sId, '', $sExtension, $sId);
-        $this->addRenderer($sId, $xClosure);
-    }
+public function setDefaultRenderer(string $sId, string $sExtension, Closure $xClosure): void
+{
+$this->setDefaultNamespace($sId);
+$this->addNamespace($sId, '', $sExtension, $sId);
+$this->addRenderer($sId, $xClosure);
+}
 
-    /**
+/**
      * Get the view renderer for a given namespace
      *
      * @param string $sNamespace    The namespace name
      *
      * @return ViewInterface|null
      */
-    public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
-    {
-        if(!isset($this->aNamespaces[$sNamespace]))
-        {
-            return null;
-        }
-        // Return the view renderer with the configured id
-        return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
-    }
+public function getNamespaceRenderer(string $sNamespace): ?ViewInterface
+{
+if(!isset($this->aNamespaces[$sNamespace]))
+{
+return null;
+}
+// Return the view renderer with the configured id
+return $this->getRenderer($this->aNamespaces[$sNamespace]['renderer']);
+}
 
-    /**
+/**
      * Set the default namespace
      *
      * @param string $sDefaultNamespace
      */
-    public function setDefaultNamespace(string $sDefaultNamespace): void
-    {
-        $this->sDefaultNamespace = $sDefaultNamespace;
-    }
+public function setDefaultNamespace(string $sDefaultNamespace): void
+{
+$this->sDefaultNamespace = $sDefaultNamespace;
+}
 
-    /**
+/**
      * Get the current store or create a new store
      *
      * @return Store
      */
-    protected function store(): Store
-    {
-        if(!$this->xStore)
-        {
-            $this->xStore = new Store();
-        }
-        return $this->xStore;
-    }
+protected function store(): Store
+{
+if(!$this->xStore)
+{
+$this->xStore = new Store();
+}
+return $this->xStore;
+}
 
-    /**
+/**
      * Make a piece of data available for the rendered view
      *
      * @param string $sName    The data name
@@ -220,13 +220,13 @@ 
      *
      * @return ViewRenderer
      */
-    public function set(string $sName, $xValue): ViewRenderer
-    {
-        $this->store()->with($sName, $xValue);
-        return $this;
-    }
+public function set(string $sName, $xValue): ViewRenderer
+{
+$this->store()->with($sName, $xValue);
+return $this;
+}
 
-    /**
+/**
      * Make a piece of data available for all views
      *
      * @param string $sName    The data name
@@ -234,29 +234,29 @@ 
      *
      * @return ViewRenderer
      */
-    public function share(string $sName, $xValue): ViewRenderer
-    {
-        $this->aViewData[$sName] = $xValue;
-        return $this;
-    }
+public function share(string $sName, $xValue): ViewRenderer
+{
+$this->aViewData[$sName] = $xValue;
+return $this;
+}
 
-    /**
+/**
      * Make an array of data available for all views
      *
      * @param array $aValues    The data values
      *
      * @return ViewRenderer
      */
-    public function shareValues(array $aValues): ViewRenderer
-    {
-        foreach($aValues as $sName => $xValue)
-        {
-            $this->share($sName, $xValue);
-        }
-        return $this;
-    }
+public function shareValues(array $aValues): ViewRenderer
+{
+foreach($aValues as $sName => $xValue)
+{
+$this->share($sName, $xValue);
+}
+return $this;
+}
 
-    /**
+/**
      * Render a view using a store
      *
      * The store returned by this function will later be used with the make() method to render the view.
@@ -266,32 +266,32 @@ 
      *
      * @return Store   A store populated with the view data
      */
-    public function render(string $sViewName, array $aViewData = []): Store
-    {
-        $xStore = $this->store();
-        // Get the default view namespace
-        $sNamespace = $this->sDefaultNamespace;
-        // Get the namespace from the view name
-        $nSeparatorPosition = strrpos($sViewName, '::');
-        if($nSeparatorPosition !== false)
-        {
-            $sNamespace = substr($sViewName, 0, $nSeparatorPosition);
-            $sViewName = substr($sViewName, $nSeparatorPosition + 2);
-        }
+public function render(string $sViewName, array $aViewData = []): Store
+{
+$xStore = $this->store();
+// Get the default view namespace
+$sNamespace = $this->sDefaultNamespace;
+// Get the namespace from the view name
+$nSeparatorPosition = strrpos($sViewName, '::');
+if($nSeparatorPosition !== false)
+{
+$sNamespace = substr($sViewName, 0, $nSeparatorPosition);
+$sViewName = substr($sViewName, $nSeparatorPosition + 2);
+}
 
-        $xRenderer = $this->getNamespaceRenderer($sNamespace);
-        if(!$xRenderer)
-        {
-            // Cannot render a view if there's no renderer corresponding to the namespace.
-            return $this->xEmptyStore;
-        }
+$xRenderer = $this->getNamespaceRenderer($sNamespace);
+if(!$xRenderer)
+{
+// Cannot render a view if there's no renderer corresponding to the namespace.
+return $this->xEmptyStore;
+}
 
-        $xStore->setData(array_merge($this->aViewData, $aViewData))
-            ->setView($xRenderer, $sNamespace, $sViewName);
+$xStore->setData(array_merge($this->aViewData, $aViewData))
+->setView($xRenderer, $sNamespace, $sViewName);
 
-        // Set the store to null so a new store will be created for the next view.
-        $this->xStore = null;
-        // Return the store
-        return $xStore;
-    }
+// Set the store to null so a new store will be created for the next view.
+$this->xStore = null;
+// Return the store
+return $xStore;
+}
 }

jaxon-core/src/App/PageComponent.php

Switch Indentation +23 added lines, -23 removed lines

@@ -6,53 +6,53 @@
 
 abstract class PageComponent extends NodeComponent
 {
-    /**
+/**
      * The current page number.
      *
      * @var int
      */
-    private int $currentPage = 1;
+private int $currentPage = 1;
 
-    /**
+/**
      * Get the total number of items to paginate.
      *
      * @return int
      */
-    abstract protected function count(): int;
+abstract protected function count(): int;
 
-    /**
+/**
      * Get the max number of items per page.
      *
      * @return int
      */
-    abstract protected function limit(): int;
+abstract protected function limit(): int;
 
-    /**
+/**
      * 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($pageNumber > 0 ? $pageNumber : 1, $this->limit(), $this->count())
-            // This callback will receive the final value of the current page number.
-            ->page(function(int $currentPage) {
-                $this->currentPage = $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($pageNumber > 0 ? $pageNumber : 1, $this->limit(), $this->count())
+// This callback will receive the final value of the current page number.
+->page(function(int $currentPage) {
+    $this->currentPage = $currentPage;
+});
+}
 
-    /**
+/**
      * Get the current page number
      *
      * @return int
      */
-    protected function currentPage(): int
-    {
-        return $this->currentPage;
-    }
+protected function currentPage(): int
+{
+return $this->currentPage;
+}
 }

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

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