jaxon-php / jaxon-mono

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

Switch Indentation +81 added lines, -81 removed lines

@@ -31,73 +31,73 @@ 
 
 trait ServicesTrait
 {
-    use DiTrait;
+use DiTrait;
 
-    /**
+/**
      * @return Translator
      */
-    public function translator(): Translator
-    {
-        return $this->di()->g(Translator::class);
-    }
+public function translator(): Translator
+{
+return $this->di()->g(Translator::class);
+}
 
-    /**
+/**
      * @return LoggerInterface
      */
-    public function logger(): LoggerInterface
-    {
-        return $this->di()->getLogger();
-    }
+public function logger(): LoggerInterface
+{
+return $this->di()->getLogger();
+}
 
-    /**
+/**
      * @return Bootstrap
      */
-    protected function getBootstrap(): Bootstrap
-    {
-        return $this->di()->getBootstrap();
-    }
+protected function getBootstrap(): Bootstrap
+{
+return $this->di()->getBootstrap();
+}
 
-    /**
+/**
      * @return PluginManager
      */
-    protected function getPluginManager(): PluginManager
-    {
-        return $this->di()->getPluginManager();
-    }
+protected function getPluginManager(): PluginManager
+{
+return $this->di()->getPluginManager();
+}
 
-    /**
+/**
      * @return RequestHandler
      */
-    protected function getRequestHandler(): RequestHandler
-    {
-        return $this->di()->getRequestHandler();
-    }
+protected function getRequestHandler(): RequestHandler
+{
+return $this->di()->getRequestHandler();
+}
 
-    /**
+/**
      * @return ResponseManager
      */
-    protected function getResponseManager(): ResponseManager
-    {
-        return $this->di()->getResponseManager();
-    }
+protected function getResponseManager(): ResponseManager
+{
+return $this->di()->getResponseManager();
+}
 
-    /**
+/**
      * @return PackageManager
      */
-    protected function getPackageManager(): PackageManager
-    {
-        return $this->di()->getPackageManager();
-    }
+protected function getPackageManager(): PackageManager
+{
+return $this->di()->getPackageManager();
+}
 
-    /**
+/**
      * @return CodeGenerator
      */
-    protected function getCodeGenerator(): CodeGenerator
-    {
-        return $this->di()->getCodeGenerator();
-    }
+protected function getCodeGenerator(): CodeGenerator
+{
+return $this->di()->getCodeGenerator();
+}
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sRenderer    The renderer name
@@ -106,70 +106,70 @@ 
      *
      * @return void
      */
-    public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure): void
-    {
-        $this->view()->setDefaultRenderer($sRenderer, $sExtension, $xClosure);
-    }
+public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure): void
+{
+$this->view()->setDefaultRenderer($sRenderer, $sExtension, $xClosure);
+}
 
-    /**
+/**
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger): void
-    {
-        $this->di()->setLogger($xLogger);
-    }
+public function setLogger(LoggerInterface|Closure $xLogger): void
+{
+$this->di()->setLogger($xLogger);
+}
 
-    /**
+/**
      * Set the session manager
      *
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure): void
-    {
-        $this->di()->setSessionManager($xClosure);
-    }
+public function setSessionManager(Closure $xClosure): void
+{
+$this->di()->setSessionManager($xClosure);
+}
 
-    /**
+/**
      * @return UploadHandlerInterface|null
      */
-    public function upload(): ?UploadHandlerInterface
-    {
-        return $this->di()->getUploadHandler();
-    }
+public function upload(): ?UploadHandlerInterface
+{
+return $this->di()->getUploadHandler();
+}
 
-    /**
+/**
      * @return PsrFactory
      */
-    public function psr(): PsrFactory
-    {
-        return $this->di()->getPsrFactory();
-    }
+public function psr(): PsrFactory
+{
+return $this->di()->getPsrFactory();
+}
 
-    /**
+/**
      * @return TemplateEngine
      */
-    public function template(): TemplateEngine
-    {
-        return $this->di()->getTemplateEngine();
-    }
+public function template(): TemplateEngine
+{
+return $this->di()->getTemplateEngine();
+}
 
-    /**
+/**
      * @return ViewRenderer
      */
-    public function view(): ViewRenderer
-    {
-        return $this->di()->getViewRenderer();
-    }
+public function view(): ViewRenderer
+{
+return $this->di()->getViewRenderer();
+}
 
-    /**
+/**
      * @return SessionInterface|null
      */
-    public function session(): ?SessionInterface
-    {
-        return $this->di()->getSessionManager();
-    }
+public function session(): ?SessionInterface
+{
+return $this->di()->getSessionManager();
+}
 }

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

Switch Indentation +63 added lines, -63 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,12 +65,12 @@ 
      * @return void
      * @throws SetupException
      */
-    public function register(string $sType, string $sName, $xOptions = []): void
-    {
-        $this->getPluginManager()->registerCallable($sType, $sName, $xOptions);
-    }
+public function register(string $sType, string $sName, $xOptions = []): void
+{
+$this->getPluginManager()->registerCallable($sType, $sName, $xOptions);
+}
 
-    /**
+/**
      * Register a plugin
      *
      * Below is a table for priorities and their description:
@@ -85,12 +85,12 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000)
-    {
-        $this->getPluginManager()->registerPlugin($sClassName, $sPluginName, $nPriority);
-    }
+public function registerPlugin(string $sClassName, string $sPluginName, int $nPriority = 1000)
+{
+$this->getPluginManager()->registerPlugin($sClassName, $sPluginName, $nPriority);
+}
 
-    /**
+/**
      * Register a package
      *
      * @param string $sClassName    The package class
@@ -99,12 +99,12 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $xPkgOptions = [])
-    {
-        $this->getPackageManager()->registerPackage($sClassName, $xPkgOptions);
-    }
+public function registerPackage(string $sClassName, array $xPkgOptions = [])
+{
+$this->getPackageManager()->registerPackage($sClassName, $xPkgOptions);
+}
 
-    /**
+/**
      * Find a response plugin by name or class name
      *
      * @template R of ResponsePluginInterface
@@ -112,12 +112,12 @@ 
      *
      * @return ($sName is class-string ? R : ResponsePluginInterface)|null
      */
-    public function plugin(string $sName): ResponsePluginInterface|null
-    {
-        return $this->getPluginManager()->getResponsePlugin($sName);
-    }
+public function plugin(string $sName): ResponsePluginInterface|null
+{
+return $this->getPluginManager()->getResponsePlugin($sName);
+}
 
-    /**
+/**
      * Get a package instance
      *
      * @template P of AbstractPackage
@@ -125,52 +125,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
@@ -182,12 +182,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
@@ -196,8 +196,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/Jaxon.php

Switch Indentation +65 added lines, -65 removed lines

@@ -32,110 +32,110 @@
 
 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|null
      */
-    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->callback()->boot(function() {
-            self::$xInstance->config()->globals();
-        });
+// Make the helpers functions available in the global namespace.
+self::$xInstance->callback()->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->xContainer->config();
-    }
+public function config(): ConfigManager
+{
+return $this->xContainer->config();
+}
 
-    /**
+/**
      * 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->xContainer->callback();
-    }
+public function callback(): CallbackManager
+{
+return $this->xContainer->callback();
+}
 
-    /**
+/**
      * @return void
      */
-    public function reset(): void
-    {
-        self::$xInstance = null;
-    }
+public function reset(): void
+{
+self::$xInstance = null;
+}
 }

jaxon-core/src/Plugin/Code/CodeGenerator.php

Spacing +20 added lines, -22 removed lines

@@ -109,7 +109,7 @@ 
      */
     public function addCodeGenerator(string $sClassName, int $nPriority): void
     {
-        while(isset($this->aCodeGenerators[$nPriority]))
+        while (isset($this->aCodeGenerators[$nPriority]))
         {
             $nPriority++;
         }
@@ -162,33 +162,33 @@ 
      */
     private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
     {
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
+        if (!is_subclass_of($xGenerator, AbstractPlugin::class) ||
             $this->xAssetManager->shallIncludeAssets($xGenerator))
         {
             // HTML tags for CSS
-            if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
+            if (($sCss = trim($xGenerator->getCss(), " \n")) !== '')
             {
                 $this->aCss[] = $sCss;
             }
             // HTML tags for js
-            if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
+            if (($sJs = trim($xGenerator->getJs(), " \n")) !== '')
             {
                 $this->aJs[] = $sJs;
             }
         }
 
         // Additional js codes
-        if(($xJsCode = $xGenerator->getJsCode()) !== null)
+        if (($xJsCode = $xGenerator->getJsCode()) !== null)
         {
-            if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
+            if (($sJs = trim($xJsCode->sJs, " \n")) !== '')
             {
                 $this->aCodeJs[] = $sJs;
             }
-            if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
+            if (($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
             {
                 $this->aCodeJsBefore[] = $sJsBefore;
             }
-            if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
+            if (($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
             {
                 $this->aCodeJsAfter[] = $sJsAfter;
             }
@@ -204,7 +204,7 @@ 
      */
     private function generateCodes(): void
     {
-        if($this->bGenerated)
+        if ($this->bGenerated)
         {
             return;
         }
@@ -219,7 +219,7 @@ 
         $this->xAssetManager = $this->di->getAssetManager();
 
         $this->sJsOptions = $this->xAssetManager->getJsOptions();
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $this->generatePluginCodes($this->getCodeGenerator($sClassName));
         }
@@ -265,11 +265,11 @@ 
     public function getJsScript(): string
     {
         $aJsScripts = [];
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $xGenerator = $this->getCodeGenerator($sClassName);
             // Javascript code
-            if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
+            if (($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
             {
                 $aJsScripts[] = $sJsScript;
             }
@@ -286,38 +286,36 @@ 
     private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
     {
         $aCodes = [];
-        if($bIncludeCss)
+        if ($bIncludeCss)
         {
             $aCodes[] = $this->getCss();
         }
-        if($bIncludeJs)
+        if ($bIncludeJs)
         {
             $aCodes[] = $this->getJs();
         }
 
-        $sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' :
-            $this->xAssetManager->createJsFiles($this);
+        $sUrl = !$this->xAssetManager->shallCreateJsFiles() ? '' : $this->xAssetManager->createJsFiles($this);
         // Wrap the js code into the corresponding HTML tag.
         $aCodes[] = $sUrl !== '' ?
-            $this->render('include.js', ['sUrl' => $sUrl]) :
-            $this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
+            $this->render('include.js', ['sUrl' => $sUrl]) : $this->render('wrapper.js', ['sScript' => $this->getJsScript()]);
 
         // Wrap the js codes into HTML tags.
-        if(count($this->aCodeJsBefore) > 0)
+        if (count($this->aCodeJsBefore) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJsBefore);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
         }
-        if(count($this->aCodeJs) > 0)
+        if (count($this->aCodeJs) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJs);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
         }
-        if(count($this->aCodeJsFiles) > 0)
+        if (count($this->aCodeJsFiles) > 0)
         {
             $aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
         }
-        if(count($this->aCodeJsAfter) > 0)
+        if (count($this->aCodeJsAfter) > 0)
         {
             $sScript = implode("\n\n", $this->aCodeJsAfter);
             $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);

jaxon-core/src/App/Component/Logger.php

Switch Indentation +9 added lines, -9 removed lines

@@ -7,15 +7,15 @@ 
 
 class Logger
 {
-    use LoggerTrait;
+use LoggerTrait;
 
-    /**
+/**
      * @param LoggerInterface $logger
      */
-    public function __construct(private LoggerInterface $logger)
-    {}
+public function __construct(private LoggerInterface $logger)
+{}
 
-    /**
+/**
      * Logs with an arbitrary level.
      *
      * @param mixed  $level
@@ -24,8 +24,8 @@ 
      *
      * @return void
      */
-    public function log($level, string|\Stringable $message, array $context = []): void
-    {
-        $this->logger->log($level, $message, $context);
-    }
+public function log($level, string|\Stringable $message, array $context = []): void
+{
+$this->logger->log($level, $message, $context);
+}
 }

jaxon-core/templates/callables/objects.js.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
   rc: (name, method, parameters, options = {}) => jaxon.request({ type: 'class', name, method }, { parameters, ...options}),

   rf: (name, parameters, options = {}) => jaxon.request({ type: 'func', name }, { parameters, ...options}),

 <?php

-foreach($this->aCallableNames as $nIndex => $sName):

+foreach ($this->aCallableNames as $nIndex => $sName):

   echo "  c$nIndex: '$sName',\n";

 endforeach

 ?>

jaxon-core/templates/plugins/config.js.php

Spacing +6 added lines, -6 removed lines

@@ -6,24 +6,24 @@
 jaxon.config.defaultMethod = '<?php echo $this->sDefaultMethod ?>';
 jaxon.config.responseType = '<?php echo $this->sResponseType ?>';
 
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jaxon.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
 
-<?php if($this->bLoggingEnabled): ?>
+<?php if ($this->bLoggingEnabled): ?>
 jaxon.debug.logger = '<?php echo Jaxon\rq(Jaxon\App\Component\Logger::class)->_class() ?>';
 <?php endif ?>
 
-<?php if($this->bDebug): ?>
+<?php if ($this->bDebug): ?>
 jaxon.debug.active = true;
-<?php if($this->sDebugOutputID): ?>
+<?php if ($this->sDebugOutputID): ?>
 jaxon.debug.outputID = '<?php echo $this->sDebugOutputID ?>';
 <?php endif ?>
-<?php if($this->bVerboseDebug): ?>
+<?php if ($this->bVerboseDebug): ?>
 jaxon.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
 
-<?php if($this->sCsrfMetaName): ?>
+<?php if ($this->sCsrfMetaName): ?>
 jaxon.setCsrf('<?php echo $this->sCsrfMetaName ?>');
 <?php endif ?>