jaxon-php / jaxon-mono

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

Switch Indentation +72 added lines, -72 removed lines

@@ -28,27 +28,27 @@ 
 
 trait PluginTrait
 {
-    /**
+/**
      * @return PluginManager
      */
-    abstract public function getPluginManager(): PluginManager;
+abstract public function getPluginManager(): PluginManager;
 
-    /**
+/**
      * @return PackageManager
      */
-    abstract public function getPackageManager(): PackageManager;
+abstract public function getPackageManager(): PackageManager;
 
-    /**
+/**
      * @return CodeGenerator
      */
-    abstract public function getCodeGenerator(): CodeGenerator;
+abstract public function getCodeGenerator(): CodeGenerator;
 
-    /**
+/**
      * @return Bootstrap
      */
-    abstract protected function getBootstrap(): Bootstrap;
+abstract protected function getBootstrap(): Bootstrap;
 
-    /**
+/**
      * Register request handlers, including functions, callable classes and directories.
      *
      * @param string $sType    The type of request handler being registered
@@ -65,14 +65,14 @@ 
      * @return void
      * @throws SetupException
      */
-    public function register(string $sType, string $sName, $xOptions = []): void
-    {
-        // We need the library to have been bootstrapped.
-        $this->getBootstrap()->onBoot();
-        $this->getPluginManager()->registerCallable($sType, $sName, $xOptions);
-    }
-
-    /**
+public function register(string $sType, string $sName, $xOptions = []): void
+{
+// We need the library to have been bootstrapped.
+$this->getBootstrap()->onBoot();
+$this->getPluginManager()->registerCallable($sType, $sName, $xOptions);
+}
+
+/**
      * Register a plugin
      *
      * Below is a table for priorities and their description:
@@ -87,14 +87,14 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000)
-    {
-        // We need the library to have been bootstrapped.
-        $this->getBootstrap()->onBoot();
-        $this->getPluginManager()->registerPlugin($sClassName, $sPluginName, $nPriority);
-    }
-
-    /**
+public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000)
+{
+// We need the library to have been bootstrapped.
+$this->getBootstrap()->onBoot();
+$this->getPluginManager()->registerPlugin($sClassName, $sPluginName, $nPriority);
+}
+
+/**
      * Register a package
      *
      * @param string $sClassName    The package class
@@ -103,14 +103,14 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $xPkgOptions = [])
-    {
-        // We need the library to have been bootstrapped.
-        $this->getBootstrap()->onBoot();
-        $this->getPackageManager()->registerPackage($sClassName, $xPkgOptions);
-    }
-
-    /**
+public function registerPackage(string $sClassName, array $xPkgOptions = [])
+{
+// We need the library to have been bootstrapped.
+$this->getBootstrap()->onBoot();
+$this->getPackageManager()->registerPackage($sClassName, $xPkgOptions);
+}
+
+/**
      * Find a response plugin by name or class name
      *
      * @template R of ResponsePluginInterface
@@ -118,12 +118,12 @@ 
      *
      * @return ($sName is class-string ? R : ResponsePluginInterface)|null
      */
-    public function plugin(string $sName): ?ResponsePluginInterface
-    {
-        return $this->getPluginManager()->getResponsePlugin($sName);
-    }
+public function plugin(string $sName): ?ResponsePluginInterface
+{
+return $this->getPluginManager()->getResponsePlugin($sName);
+}
 
-    /**
+/**
      * Get a package instance
      *
      * @template P of AbstractPackage
@@ -131,52 +131,52 @@ 
      *
      * @return P|null
      */
-    public function package(string $sClassName): ?AbstractPackage
-    {
-        return $this->getPackageManager()->getPackage($sClassName);
-    }
+public function package(string $sClassName): ?AbstractPackage
+{
+return $this->getPackageManager()->getPackage($sClassName);
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string
      */
-    public function getJs(): string
-    {
-        return $this->getCodeGenerator()->getJs();
-    }
+public function getJs(): string
+{
+return $this->getCodeGenerator()->getJs();
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string  the javascript code
      */
-    public function js(): string
-    {
-        return $this->getCodeGenerator()->getJs();
-    }
+public function js(): string
+{
+return $this->getCodeGenerator()->getJs();
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string
      */
-    public function getCss(): string
-    {
-        return $this->getCodeGenerator()->getCss();
-    }
+public function getCss(): string
+{
+return $this->getCodeGenerator()->getCss();
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string
      */
-    public function css(): string
-    {
-        return $this->getCodeGenerator()->getCss();
-    }
+public function css(): string
+{
+return $this->getCodeGenerator()->getCss();
+}
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * The javascript code returned by this function depends on the plugins
@@ -188,12 +188,12 @@ 
      * @return string
      * @throws UriException
      */
-    public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string
-    {
-        return $this->getCodeGenerator()->getScript($bIncludeJs, $bIncludeCss);
-    }
+public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string
+{
+return $this->getCodeGenerator()->getScript($bIncludeJs, $bIncludeCss);
+}
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * @param bool $bIncludeJs    Also get the js code
@@ -202,8 +202,8 @@ 
      * @return string  the javascript code
      * @throws UriException
      */
-    public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string
-    {
-        return $this->getCodeGenerator()->getScript($bIncludeJs, $bIncludeCss);
-    }
+public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string
+{
+return $this->getCodeGenerator()->getScript($bIncludeJs, $bIncludeCss);
+}
 }

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

Switch Indentation +19 added lines, -19 removed lines

@@ -19,41 +19,41 @@
 
 trait DiTrait
 {
-    /**
+/**
      * @var Container
      */
-    private Container $xContainer;
+private Container $xContainer;
 
-    /**
+/**
      * @var ComponentContainer
      */
-    protected ComponentContainer $xComponentContainer;
+protected ComponentContainer $xComponentContainer;
 
-    /**
+/**
      * Get the DI container
      *
      * @return Container
      */
-    public function di(): Container
-    {
-        return $this->xContainer;
-    }
+public function di(): Container
+{
+return $this->xContainer;
+}
 
-    /**
+/**
      * Get the component DI container
      *
      * @return ComponentContainer
      */
-    public function cdi(): ComponentContainer
-    {
-        return $this->xComponentContainer;
-    }
+public function cdi(): ComponentContainer
+{
+return $this->xComponentContainer;
+}
 
-    /**
+/**
      * @return ConfigManager
      */
-    public function config(): ConfigManager
-    {
-        return $this->di()->g(ConfigManager::class);
-    }
+public function config(): ConfigManager
+{
+return $this->di()->g(ConfigManager::class);
+}
 }

jaxon-core/src/App/Ajax/Jaxon.php

Switch Indentation +65 added lines, -65 removed lines

@@ -33,111 +33,111 @@
 
 final class Jaxon
 {
-    use Traits\ConfigTrait;
-    use Traits\ServicesTrait;
-    use Traits\PluginTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
-    use Traits\SendResponseTrait;
-
-    /**
+use Traits\ConfigTrait;
+use Traits\ServicesTrait;
+use Traits\PluginTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
+use Traits\SendResponseTrait;
+
+/**
      * @var Jaxon
      */
-    private static $xInstance = null;
+private static $xInstance = null;
 
-    /**
+/**
      * The constructor
      *
      * @param Container $xContainer
      * @param ComponentContainer $xComponentContainer
      */
-    private function __construct(Container $xContainer, ComponentContainer $xComponentContainer)
-    {
-        $this->xContainer = $xContainer;
-        $this->xComponentContainer = $xComponentContainer;
-    }
+private function __construct(Container $xContainer, ComponentContainer $xComponentContainer)
+{
+$this->xContainer = $xContainer;
+$this->xComponentContainer = $xComponentContainer;
+}
 
-    /**
+/**
      * @return Jaxon
      */
-    private static function createInstance(): Jaxon
-    {
-        $xContainer = new Container();
-        $xComponentContainer = new ComponentContainer($xContainer);
-        self::$xInstance = new Jaxon($xContainer, $xComponentContainer);
+private static function createInstance(): Jaxon
+{
+$xContainer = new Container();
+$xComponentContainer = new ComponentContainer($xContainer);
+self::$xInstance = new Jaxon($xContainer, $xComponentContainer);
 
-        // Save the Jaxon and container instances
-        $xContainer->val(Jaxon::class, self::$xInstance);
-        $xContainer->val(ComponentContainer::class, $xComponentContainer);
+// Save the Jaxon and container instances
+$xContainer->val(Jaxon::class, self::$xInstance);
+$xContainer->val(ComponentContainer::class, $xComponentContainer);
 
-        // Make the helpers functions available in the global namespace.
-        self::$xInstance->getCallbackManager()->boot(function() {
-            self::$xInstance->config()->globals();
-        });
+// Make the helpers functions available in the global namespace.
+self::$xInstance->getCallbackManager()->boot(function() {
+self::$xInstance->config()->globals();
+});
 
-        return self::$xInstance;
-    }
+return self::$xInstance;
+}
 
-    /**
+/**
      * @return Jaxon
      */
-    public static function getInstance(): Jaxon
-    {
-        return self::$xInstance ?: self::$xInstance = self::createInstance();
-    }
+public static function getInstance(): Jaxon
+{
+return self::$xInstance ?: self::$xInstance = self::createInstance();
+}
 
-    /**
+/**
      * @return string
      */
-    public function getVersion(): string
-    {
-        return \Jaxon\Jaxon::VERSION;
-    }
+public function getVersion(): string
+{
+return \Jaxon\Jaxon::VERSION;
+}
 
-    /**
+/**
      * @return ConfigManager
      */
-    public function config(): ConfigManager
-    {
-        return $this->di()->g(ConfigManager::class);
-    }
+public function config(): ConfigManager
+{
+return $this->di()->g(ConfigManager::class);
+}
 
-    /**
+/**
      * Set the ajax endpoint URI
      *
      * @param string $sUri    The ajax endpoint URI
      *
      * @return void
      */
-    public function setUri(string $sUri): void
-    {
-        $this->config()->setOption('core.request.uri', $sUri);
-    }
+public function setUri(string $sUri): void
+{
+$this->config()->setOption('core.request.uri', $sUri);
+}
 
-    /**
+/**
      * @return AppInterface
      */
-    public function app(): AppInterface
-    {
-        return $this->xContainer->getApp();
-    }
+public function app(): AppInterface
+{
+return $this->xContainer->getApp();
+}
 
-    /**
+/**
      * Get the callback manager
      *
      * @return CallbackManager
      */
-    public function callback(): CallbackManager
-    {
-        return $this->getCallbackManager();
-    }
+public function callback(): CallbackManager
+{
+return $this->getCallbackManager();
+}
 
-    /**
+/**
      * @return void
      * @throws SetupException
      */
-    public function reset(): void
-    {
-        self::$xInstance = null;
-    }
+public function reset(): void
+{
+self::$xInstance = null;
+}
 }

jaxon-core/src/App/Ajax/AppInterface.php

Switch Indentation +34 added lines, -34 removed lines

@@ -22,58 +22,58 @@ 
 
 interface AppInterface
 {
-    /**
+/**
      * Set the logger.
      *
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger): void;
+public function setLogger(LoggerInterface|Closure $xLogger): void;
 
-    /**
+/**
      * Get the configured character encoding
      *
      * @return string
      */
-    public function getCharacterEncoding(): string;
+public function getCharacterEncoding(): string;
 
-    /**
+/**
      * Get the content type of the HTTP response
      *
      * @return string
      */
-    public function getContentType(): string;
+public function getContentType(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string
      */
-    public function getJs(): string;
+public function getJs(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string  the javascript code
      */
-    public function js(): string;
+public function js(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string
      */
-    public function getCss(): string;
+public function getCss(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string  the javascript code
      */
-    public function css(): string;
+public function css(): string;
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * The javascript code returned by this function is dependent on the plugins
@@ -84,9 +84,9 @@ 
      *
      * @return string
      */
-    public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
+public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * @param bool $bIncludeJs    Also get the JS files
@@ -95,46 +95,46 @@ 
      * @return string  the javascript code
      * @throws UriException
      */
-    public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
+public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
 
-    /**
+/**
      * Determine if a call is a jaxon request or a page load request
      *
      * @return bool
      */
-    public function canProcessRequest(): bool;
+public function canProcessRequest(): bool;
 
-    /**
+/**
      * Process an incoming Jaxon request, and return the response.
      *
      * @return mixed
      */
-    public function processRequest(): mixed;
+public function processRequest(): mixed;
 
-    /**
+/**
      * Get the Jaxon ajax response
      *
      * @return AjaxResponse
      */
-    public function ajaxResponse(): AjaxResponse;
+public function ajaxResponse(): AjaxResponse;
 
-    /**
+/**
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure);
+public function setSessionManager(Closure $xClosure);
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer);
+public function setContainer(ContainerInterface $xContainer);
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sRenderer    The renderer name
@@ -143,9 +143,9 @@ 
      *
      * @return void
      */
-    public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure);
+public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure);
 
-    /**
+/**
      * Set the javascript asset
      *
      * @param bool $bExport    Whether to export the js code in a file
@@ -155,14 +155,14 @@ 
      *
      * @return void
      */
-    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void;
+public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void;
 
-    /**
+/**
      * Read config options from a config file and set up the library
      *
      * @param string $sConfigFile    The full path to the config file
      *
      * @return void
      */
-    public function setup(string $sConfigFile = ''): void;
+public function setup(string $sConfigFile = ''): void;
 }

jaxon-core/src/App/Ajax/AbstractApp.php

Switch Indentation +29 added lines, -29 removed lines

@@ -20,32 +20,32 @@ 
 
 abstract class AbstractApp implements AppInterface
 {
-    use Traits\ServicesTrait;
-    use Traits\PluginTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
+use Traits\ServicesTrait;
+use Traits\PluginTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct()
-    {
-        // Declared in DiTrait.
-        $this->xContainer = Jaxon::getInstance()->di();
-        $this->xComponentContainer = Jaxon::getInstance()->cdi();
-    }
+public function __construct()
+{
+// Declared in DiTrait.
+$this->xContainer = Jaxon::getInstance()->di();
+$this->xComponentContainer = Jaxon::getInstance()->cdi();
+}
 
-    /**
+/**
      * Get the Jaxon application bootstrapper.
      *
      * @return Bootstrap
      */
-    protected function bootstrap(): Bootstrap
-    {
-        return $this->xContainer->getBootstrap();
-    }
+protected function bootstrap(): Bootstrap
+{
+return $this->xContainer->getBootstrap();
+}
 
-    /**
+/**
      * Set the javascript asset
      *
      * @param bool $bExport    Whether to export the js code in a file
@@ -55,26 +55,26 @@ 
      *
      * @return void
      */
-    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void
-    {
-        $this->bootstrap()->asset($bExport, $bMinify, $sUri, $sDir);
-    }
+public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void
+{
+$this->bootstrap()->asset($bExport, $bMinify, $sUri, $sDir);
+}
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer): void
-    {
-        $this->di()->setContainer($xContainer);
-    }
+public function setContainer(ContainerInterface $xContainer): void
+{
+$this->di()->setContainer($xContainer);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function setup(string $sConfigFile = ''): void
-    {}
+public function setup(string $sConfigFile = ''): void
+{}
 }

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

Switch Indentation +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 
 interface ViewInterface
 {
-    /**
+/**
      * Add a namespace to the view renderer
      *
      * @param string $sNamespace    The namespace name
@@ -13,14 +13,14 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void;
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void;
 
-    /**
+/**
      * Render a view
      *
      * @param Store $store    A store populated with the view data
      *
      * @return string
      */
-    public function render(Store $store): string;
+public function render(Store $store): string;
 }

jaxon-core/src/Plugin/Request/CallableClass/CallableObject.php

Spacing +4 added lines, -5 removed lines

@@ -73,8 +73,7 @@ 
      */
     public function excluded(?string $sMethodName = null): bool
     {
-        return $sMethodName === null ? $this->xOptions->excluded() :
-            !$this->xOptions->isPublicMethod($sMethodName);
+        return $sMethodName === null ? $this->xOptions->excluded() : !$this->xOptions->isPublicMethod($sMethodName);
     }
 
     /**
@@ -160,11 +159,11 @@ 
         $sMethod = $this->xTarget->getMethodName();
         // The hooks defined at method level are merged with those defined at class level.
         $aMethods = array_merge($aHookMethods['*'] ?? [], $aHookMethods[$sMethod] ?? []);
-        foreach($aMethods as $xKey => $xValue)
+        foreach ($aMethods as $xKey => $xValue)
         {
             $sHookName = $xValue;
             $aHookArgs = [];
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $sHookName = $xKey;
                 $aHookArgs = is_array($xValue) ? $xValue : [$xValue];
@@ -202,7 +201,7 @@ 
             // Warning: dynamic properties will be deprecated in PHP8.2.
             $this->$sAttr = $xDiValue;
         };
-        foreach($aDiOptions as $sAttr => $sClass)
+        foreach ($aDiOptions as $sAttr => $sClass)
         {
             $this->setDiAttribute($xComponent, $sAttr, $this->di->get($sClass), $cSetter);
         }

jaxon-attributes/src/Attribute/Export.php

Spacing +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
     public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
     {
         $aMethods = [];
-        foreach(['base', 'only', 'except'] as $key)
+        foreach (['base', 'only', 'except'] as $key)
         {
-            if($this->$key !== null && count($this->$key) > 0)
+            if ($this->$key !== null && count($this->$key) > 0)
             {
                 $aMethods[$key] = $this->$key;
             }

jaxon-annotations/src/Annotation/ExportAnnotation.php

Switch Indentation +25 added lines, -25 removed lines

@@ -26,41 +26,41 @@
  */
 class ExportAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * @var array
      */
-    private $aMethods = [];
+private $aMethods = [];
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = json_decode($value, true);
-        return is_array($aParams) ? $aParams : [];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = json_decode($value, true);
+return is_array($aParams) ? $aParams : [];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        foreach(['base', 'only', 'except'] as $key)
-        {
-            if(isset($properties[$key]) && is_array($properties[$key]) &&
-                count($properties[$key]) > 0)
-            {
-                $this->aMethods[$key] = $properties[$key];
-            }
-        }
-    }
+public function initAnnotation(array $properties)
+{
+foreach(['base', 'only', 'except'] as $key)
+{
+if(isset($properties[$key]) && is_array($properties[$key]) &&
+    count($properties[$key]) > 0)
+{
+    $this->aMethods[$key] = $properties[$key];
+}
+}
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->export($sMethod)->setMethods($this->aMethods);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->export($sMethod)->setMethods($this->aMethods);
+}
 }

Spacing +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
      */
     public function initAnnotation(array $properties)
     {
-        foreach(['base', 'only', 'except'] as $key)
+        foreach (['base', 'only', 'except'] as $key)
         {
-            if(isset($properties[$key]) && is_array($properties[$key]) &&
+            if (isset($properties[$key]) && is_array($properties[$key]) &&
                 count($properties[$key]) > 0)
             {
                 $this->aMethods[$key] = $properties[$key];