jaxon-php / jaxon-mono

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/Plugin/Manager/PackageManager.php

Braces +1 added lines, -2 removed lines

@@ -218,8 +218,7 @@
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
-        }
-        elseif(!is_array($aLibOptions))
+        } elseif(!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);

Spacing +18 added lines, -18 removed lines

@@ -62,25 +62,25 @@ 
     private function updateContainer(Config $xConfig): void
     {
         $aOptions = $xConfig->getOption('container.set', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->set((string)$xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.val', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->val((string)$xKey, $xValue);
         }
         $aOptions = $xConfig->getOption('container.auto', []);
-        foreach($aOptions as $xValue)
+        foreach ($aOptions as $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->auto((string)$xValue);
         }
         $aOptions = $xConfig->getOption('container.alias', []);
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
             // The key is the class name. It must be a string.
             $this->di->alias((string)$xKey, (string)$xValue);
@@ -98,16 +98,16 @@ 
      */
     private function registerCallables(array $aOptions, string $sCallableType): void
     {
-        foreach($aOptions as $xKey => $xValue)
+        foreach ($aOptions as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->xPluginManager->registerCallable($sCallableType, $xValue);
                 continue;
             }
 
-            if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            if (is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
@@ -124,7 +124,7 @@ 
      */
     private function registerExceptionHandlers(Config $xConfig): void
     {
-        foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
+        foreach ($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
         {
             $this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
         }
@@ -147,20 +147,20 @@ 
         // key of the array item, a string as the value of an entry without a key,
         // or set with the key $sOptionKey in an array entry without a key.
         $aCallables = [];
-        foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
+        foreach ($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
         {
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $aCallables[$xKey] = $xValue;
                 continue;
             }
-            if(is_string($xValue))
+            if (is_string($xValue))
             {
                 $aCallables[] = $xValue;
                 continue;
             }
 
-            if(is_array($xValue) && isset($xValue[$sOptionKey]))
+            if (is_array($xValue) && isset($xValue[$sOptionKey]))
             {
                 $aCallables[$xValue[$sOptionKey]] = $xValue;
             }
@@ -215,12 +215,12 @@ 
     {
         // $this->aPackages contains packages config file paths.
         $aLibOptions = $sClassName::config();
-        if(is_string($aLibOptions))
+        if (is_string($aLibOptions))
         {
             // A string is supposed to be the path to a config file.
             $aLibOptions = $this->xConfigManager->read($aLibOptions);
         }
-        elseif(!is_array($aLibOptions))
+        elseif (!is_array($aLibOptions))
         {
             // Otherwise, anything else than an array is not accepted.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -243,7 +243,7 @@ 
     public function registerPackage(string $sClassName, array $aUserOptions = []): void
     {
         $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, AbstractPackage::class))
+        if (!is_subclass_of($sClassName, AbstractPackage::class))
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
             throw new SetupException($sMessage);
@@ -287,9 +287,9 @@ 
 
         // Register packages
         $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $xKey => $xValue)
+        foreach ($aPackageConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a package without options
                 $sClassName = $xValue;
@@ -297,7 +297,7 @@ 
                 continue;
             }
 
-            if(is_string($xKey) && is_array($xValue))
+            if (is_string($xKey) && is_array($xValue))
             {
                 // Register a package with options
                 $sClassName = $xKey;

jaxon-core/src/Plugin/Manager/PluginManager.php

Spacing +9 added lines, -10 removed lines

@@ -100,7 +100,7 @@ 
     private function _registerPlugin(string $sClassName, string $sPluginName, array $aInterfaces): int
     {
         // Any plugin must implement the PluginInterface interface.
-        if(!in_array(PluginInterface::class, $aInterfaces))
+        if (!in_array(PluginInterface::class, $aInterfaces))
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', [
                 'name' => $sClassName,
@@ -109,7 +109,7 @@ 
         }
 
         // Response plugin.
-        if(in_array(ResponsePluginInterface::class, $aInterfaces))
+        if (in_array(ResponsePluginInterface::class, $aInterfaces))
         {
             $this->aResponsePlugins[$sPluginName] = $sClassName;
             return 1;
@@ -117,12 +117,12 @@ 
 
         // Request plugin.
         $nCount = 0;
-        if(in_array(CallableRegistryInterface::class, $aInterfaces))
+        if (in_array(CallableRegistryInterface::class, $aInterfaces))
         {
             $this->aRegistryPlugins[$sPluginName] = $sClassName;
             $nCount++;
         }
-        if(in_array(RequestHandlerInterface::class, $aInterfaces))
+        if (in_array(RequestHandlerInterface::class, $aInterfaces))
         {
             $this->aRequestHandlers[$sPluginName] = $sClassName;
             $nCount++;
@@ -151,13 +151,13 @@ 
         $nCount = $this->_registerPlugin($sClassName, $sPluginName, $aInterfaces);
 
         // Any plugin can implement the CodeGeneratorInterface interface.
-        if(in_array(CodeGeneratorInterface::class, $aInterfaces))
+        if (in_array(CodeGeneratorInterface::class, $aInterfaces))
         {
             $this->xCodeGenerator->addCodeGenerator($sClassName, $nPriority);
             $nCount++;
         }
         // The class is not a valid plugin.
-        if($nCount === 0)
+        if ($nCount === 0)
         {
             $sMessage = $this->xTranslator->trans('errors.register.invalid', [
                 'name' => $sClassName,
@@ -166,7 +166,7 @@ 
         }
 
         // Register the plugin in the DI container, if necessary
-        if(!$this->di->has($sClassName))
+        if (!$this->di->has($sClassName))
         {
             $this->di->auto($sClassName);
         }
@@ -182,8 +182,7 @@ 
      */
     public function getResponsePlugin(string $sName): ?ResponsePluginInterface
     {
-        return $this->di->h($sName) ? $this->di->g($sName) :
-            (!isset($this->aResponsePlugins[$sName]) ? null :
+        return $this->di->h($sName) ? $this->di->g($sName) : (!isset($this->aResponsePlugins[$sName]) ? null :
             $this->di->g($this->aResponsePlugins[$sName]));
     }
 
@@ -201,7 +200,7 @@ 
      */
     public function registerCallable(string $sType, string $sCallable, $xOptions = []): void
     {
-        if(isset($this->aRegistryPlugins[$sType]) &&
+        if (isset($this->aRegistryPlugins[$sType]) &&
             ($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
         {
             $xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));

jaxon-core/src/Plugin/Response/Psr/PsrPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function ajaxResponse(): ResponseInterface
     {
         $xPsrResponse = $this->xPsr17Factory->createResponse(200);
-        if($this->xRequest->getMethod() === 'GET')
+        if ($this->xRequest->getMethod() === 'GET')
         {
             $xPsrResponse = $xPsrResponse
                 ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')

Switch Indentation +33 added lines, -33 removed lines

@@ -23,56 +23,56 @@
 
 class PsrPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'psr';
+public const NAME = 'psr';
 
-    /**
+/**
      * The class constructor
      *
      * @param Psr17Factory $xPsr17Factory
      * @param RequestInterface $xRequest
      */
-    public function __construct(private Psr17Factory $xPsr17Factory,
-        private RequestInterface $xRequest)
-    {}
+public function __construct(private Psr17Factory $xPsr17Factory,
+private RequestInterface $xRequest)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '5.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '5.0.0';
+}
 
-    /**
+/**
      * Convert an ajax response to a PSR7 response object
      *
      * @return ResponseInterface
      */
-    public function ajaxResponse(): ResponseInterface
-    {
-        $xPsrResponse = $this->xPsr17Factory->createResponse(200);
-        if($this->xRequest->getMethod() === 'GET')
-        {
-            $xPsrResponse = $xPsrResponse
-                ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')
-                ->withHeader('Last-Modified', gmdate("D, d M Y H:i:s") . ' GMT')
-                ->withHeader('Cache-Control', 'no-cache, must-revalidate')
-                ->withHeader('Pragma', 'no-cache');
-        }
-        return $xPsrResponse
-            ->withHeader('content-type', $this->response()->getContentType())
-            ->withBody(Stream::create($this->response()->getOutput()));
-    }
+public function ajaxResponse(): ResponseInterface
+{
+$xPsrResponse = $this->xPsr17Factory->createResponse(200);
+if($this->xRequest->getMethod() === 'GET')
+{
+$xPsrResponse = $xPsrResponse
+    ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')
+    ->withHeader('Last-Modified', gmdate("D, d M Y H:i:s") . ' GMT')
+    ->withHeader('Cache-Control', 'no-cache, must-revalidate')
+    ->withHeader('Pragma', 'no-cache');
+}
+return $xPsrResponse
+->withHeader('content-type', $this->response()->getContentType())
+->withBody(Stream::create($this->response()->getOutput()));
+}
 }

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

Spacing +1 added lines, -2 removed lines

@@ -52,8 +52,7 @@
     public function getScript(): string
     {
         // It is important to call $this->xParameterReader->uri() only if necessary.
-        $sUri = $this->xConfigManager->getOption('core.request.uri') ?:
-            $this->xParameterReader->uri();
+        $sUri = $this->xConfigManager->getOption('core.request.uri') ?: $this->xParameterReader->uri();
         $aOptions = [
             'sResponseType'      => 'JSON',
             'sVersion'           => $this->option('core.version'),

Switch Indentation +32 added lines, -32 removed lines

@@ -22,53 +22,53 @@
 
 class ConfigScriptGenerator extends AbstractCodeGenerator
 {
-    /**
+/**
      * The constructor
      *
      * @param ParameterReader $xParameterReader
      * @param TemplateEngine $xTemplateEngine
      * @param ConfigManager $xConfigManager
      */
-    public function __construct(private ParameterReader $xParameterReader,
-        private TemplateEngine $xTemplateEngine, private ConfigManager $xConfigManager)
-    {}
+public function __construct(private ParameterReader $xParameterReader,
+private TemplateEngine $xTemplateEngine, private ConfigManager $xConfigManager)
+{}
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sName The option name
      *
      * @return mixed
      */
-    private function option(string $sName): mixed
-    {
-        return $this->xConfigManager->getOption($sName);
-    }
+private function option(string $sName): mixed
+{
+return $this->xConfigManager->getOption($sName);
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws UriException
      */
-    public function getScript(): string
-    {
-        // It is important to call $this->xParameterReader->uri() only if necessary.
-        $sUri = $this->xConfigManager->getOption('core.request.uri') ?:
-            $this->xParameterReader->uri();
-        $aOptions = [
-            'sResponseType'      => 'JSON',
-            'sVersion'           => $this->option('core.version'),
-            'sLanguage'          => $this->option('core.language'),
-            'sRequestURI'        => $sUri,
-            'sDefaultMode'       => $this->option('core.request.mode'),
-            'sDefaultMethod'     => $this->option('core.request.method'),
-            'sCsrfMetaName'      => $this->option('core.request.csrf_meta'),
-            'bDebug'             => $this->option('core.debug.on'),
-            'bVerboseDebug'      => $this->option('core.debug.verbose'),
-            'sDebugOutputID'     => $this->option('core.debug.output_id'),
-            'nResponseQueueSize' => $this->option('js.lib.queue_size'),
-            'sStatusMessages'    => $this->option('js.lib.show_status') ? 'true' : 'false',
-            'sWaitCursor'        => $this->option('js.lib.show_cursor') ? 'true' : 'false',
-        ];
-        return $this->xTemplateEngine->render('jaxon::plugins/config.js', $aOptions);
-    }
+public function getScript(): string
+{
+// It is important to call $this->xParameterReader->uri() only if necessary.
+$sUri = $this->xConfigManager->getOption('core.request.uri') ?:
+$this->xParameterReader->uri();
+$aOptions = [
+'sResponseType'      => 'JSON',
+'sVersion'           => $this->option('core.version'),
+'sLanguage'          => $this->option('core.language'),
+'sRequestURI'        => $sUri,
+'sDefaultMode'       => $this->option('core.request.mode'),
+'sDefaultMethod'     => $this->option('core.request.method'),
+'sCsrfMetaName'      => $this->option('core.request.csrf_meta'),
+'bDebug'             => $this->option('core.debug.on'),
+'bVerboseDebug'      => $this->option('core.debug.verbose'),
+'sDebugOutputID'     => $this->option('core.debug.output_id'),
+'nResponseQueueSize' => $this->option('js.lib.queue_size'),
+'sStatusMessages'    => $this->option('js.lib.show_status') ? 'true' : 'false',
+'sWaitCursor'        => $this->option('js.lib.show_cursor') ? 'true' : 'false',
+];
+return $this->xTemplateEngine->render('jaxon::plugins/config.js', $aOptions);
+}
 }

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++;
         }
@@ -163,33 +163,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;
             }
@@ -205,7 +205,7 @@ 
      */
     private function generateCodes(): void
     {
-        if($this->bGenerated)
+        if ($this->bGenerated)
         {
             return;
         }
@@ -216,7 +216,7 @@ 
         // Sort the code generators by ascending priority
         ksort($this->aCodeGenerators);
 
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $this->generatePluginCodes($this->getCodeGenerator($sClassName));
         }
@@ -261,11 +261,11 @@ 
      */
     public function getJsScript(): string
     {
-        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")) !== '')
             {
                 $aJsScript[] = $sJsScript;
             }
@@ -282,38 +282,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]);

Switch Indentation +203 added lines, -203 removed lines

@@ -31,75 +31,75 @@ 
 
 class CodeGenerator
 {
-    /**
+/**
      * @var AssetManager
      */
-    private $xAssetManager;
+private $xAssetManager;
 
-    /**
+/**
      * The classes that generate code
      *
      * @var array<string>
      */
-    protected $aCodeGenerators = [];
+protected $aCodeGenerators = [];
 
-    /**
+/**
      * @var string
      */
-    protected $sJsOptions;
+protected $sJsOptions;
 
-    /**
+/**
      * @var array
      */
-    protected $aCss = [];
+protected $aCss = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aJs = [];
+protected $aJs = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJs = [];
+protected $aCodeJs = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsBefore = [];
+protected $aCodeJsBefore = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsAfter = [];
+protected $aCodeJsAfter = [];
 
-    /**
+/**
      * @var array
      */
-    protected $aCodeJsFiles = [];
+protected $aCodeJsFiles = [];
 
-    /**
+/**
      * @var string
      */
-    protected $bGenerated = false;
+protected $bGenerated = false;
 
-    /**
+/**
      * The constructor
      *
      * @param string $sVersion
      * @param Container $di
      * @param TemplateEngine $xTemplateEngine
      */
-    public function __construct(private string $sVersion, private Container $di,
-        private TemplateEngine $xTemplateEngine)
-    {
-        // The Jaxon library config is on top.
-        $this->addCodeGenerator(ConfigScriptGenerator::class, 0);
-        // The ready script comes after.
-        $this->addCodeGenerator(ReadyScriptGenerator::class, 200);
-    }
-
-    /**
+public function __construct(private string $sVersion, private Container $di,
+private TemplateEngine $xTemplateEngine)
+{
+// The Jaxon library config is on top.
+$this->addCodeGenerator(ConfigScriptGenerator::class, 0);
+// The ready script comes after.
+$this->addCodeGenerator(ReadyScriptGenerator::class, 200);
+}
+
+/**
      * Add a code generator to the list
      *
      * @param string $sClassName    The code generator class
@@ -107,40 +107,40 @@ 
      *
      * @return void
      */
-    public function addCodeGenerator(string $sClassName, int $nPriority): void
-    {
-        while(isset($this->aCodeGenerators[$nPriority]))
-        {
-            $nPriority++;
-        }
-        $this->aCodeGenerators[$nPriority] = $sClassName;
-    }
-
-    /**
+public function addCodeGenerator(string $sClassName, int $nPriority): void
+{
+while(isset($this->aCodeGenerators[$nPriority]))
+{
+$nPriority++;
+}
+$this->aCodeGenerators[$nPriority] = $sClassName;
+}
+
+/**
      * @param string $sClassName
      *
      * @return CodeGeneratorInterface
      */
-    private function getCodeGenerator(string $sClassName): CodeGeneratorInterface
-    {
-        return $this->di->g($sClassName);
-    }
+private function getCodeGenerator(string $sClassName): CodeGeneratorInterface
+{
+return $this->di->g($sClassName);
+}
 
-    /**
+/**
      * Generate a hash for all the javascript code generated by the library
      *
      * @return string
      */
-    public function getHash(): string
-    {
-        $aHashes = array_map(function($sClassName) {
-            return $this->getCodeGenerator($sClassName)->getHash();
-        }, $this->aCodeGenerators);
-        $aHashes[] = $this->sVersion;
-        return md5(implode('', $aHashes));
-    }
-
-    /**
+public function getHash(): string
+{
+$aHashes = array_map(function($sClassName) {
+return $this->getCodeGenerator($sClassName)->getHash();
+}, $this->aCodeGenerators);
+$aHashes[] = $this->sVersion;
+return md5(implode('', $aHashes));
+}
+
+/**
      * Render a template in the 'plugins' subdir
      *
      * @param string $sTemplate    The template filename
@@ -148,180 +148,180 @@ 
      *
      * @return string
      */
-    private function render(string $sTemplate, array $aVars = []): string
-    {
-        $aVars['sJsOptions'] = $this->sJsOptions;
-        return $this->xTemplateEngine->render("jaxon::plugins/$sTemplate", $aVars);
-    }
+private function render(string $sTemplate, array $aVars = []): string
+{
+$aVars['sJsOptions'] = $this->sJsOptions;
+return $this->xTemplateEngine->render("jaxon::plugins/$sTemplate", $aVars);
+}
 
-    /**
+/**
      * Generate the Jaxon CSS and js codes for a given plugin
      *
      * @param CodeGeneratorInterface $xGenerator
      *
      * @return void
      */
-    private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
-    {
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
-            $this->xAssetManager->shallIncludeAssets($xGenerator))
-        {
-            // HTML tags for CSS
-            if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
-            {
-                $this->aCss[] = $sCss;
-            }
-            // HTML tags for js
-            if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
-            {
-                $this->aJs[] = $sJs;
-            }
-        }
-
-        // Additional js codes
-        if(($xJsCode = $xGenerator->getJsCode()) !== null)
-        {
-            if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
-            {
-                $this->aCodeJs[] = $sJs;
-            }
-            if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
-            {
-                $this->aCodeJsBefore[] = $sJsBefore;
-            }
-            if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
-            {
-                $this->aCodeJsAfter[] = $sJsAfter;
-            }
-            $this->aCodeJsFiles = array_merge($this->aCodeJsFiles, $xJsCode->aFiles);
-        }
-    }
-
-    /**
+private function generatePluginCodes(CodeGeneratorInterface $xGenerator): void
+{
+if(!is_subclass_of($xGenerator, AbstractPlugin::class) ||
+$this->xAssetManager->shallIncludeAssets($xGenerator))
+{
+// HTML tags for CSS
+if(($sCss = trim($xGenerator->getCss(), " \n")) !== '')
+{
+    $this->aCss[] = $sCss;
+}
+// HTML tags for js
+if(($sJs = trim($xGenerator->getJs(), " \n")) !== '')
+{
+    $this->aJs[] = $sJs;
+}
+}
+
+// Additional js codes
+if(($xJsCode = $xGenerator->getJsCode()) !== null)
+{
+if(($sJs = trim($xJsCode->sJs, " \n")) !== '')
+{
+    $this->aCodeJs[] = $sJs;
+}
+if(($sJsBefore = trim($xJsCode->sJsBefore, " \n")) !== '')
+{
+    $this->aCodeJsBefore[] = $sJsBefore;
+}
+if(($sJsAfter = trim($xJsCode->sJsAfter, " \n")) !== '')
+{
+    $this->aCodeJsAfter[] = $sJsAfter;
+}
+$this->aCodeJsFiles = array_merge($this->aCodeJsFiles, $xJsCode->aFiles);
+}
+}
+
+/**
      * Generate the Jaxon CSS ans js codes
      *
      * @return void
      * @throws UriException
      */
-    private function generateCodes(): void
-    {
-        if($this->bGenerated)
-        {
-            return;
-        }
-
-        $this->xAssetManager = $this->di->getAssetManager();
-        $this->sJsOptions = $this->xAssetManager->getJsOptions();
-
-        // Sort the code generators by ascending priority
-        ksort($this->aCodeGenerators);
-
-        foreach($this->aCodeGenerators as $sClassName)
-        {
-            $this->generatePluginCodes($this->getCodeGenerator($sClassName));
-        }
-
-        // Load the Jaxon lib js files, after the other libs js files.
-        $this->aJs[] = trim($this->render('includes.js', [
-            'aUrls' => $this->xAssetManager->getJsLibFiles(),
-        ]));
-
-        // The codes are already generated.
-        $this->bGenerated = true;
-    }
-
-    /**
+private function generateCodes(): void
+{
+if($this->bGenerated)
+{
+return;
+}
+
+$this->xAssetManager = $this->di->getAssetManager();
+$this->sJsOptions = $this->xAssetManager->getJsOptions();
+
+// Sort the code generators by ascending priority
+ksort($this->aCodeGenerators);
+
+foreach($this->aCodeGenerators as $sClassName)
+{
+$this->generatePluginCodes($this->getCodeGenerator($sClassName));
+}
+
+// Load the Jaxon lib js files, after the other libs js files.
+$this->aJs[] = trim($this->render('includes.js', [
+'aUrls' => $this->xAssetManager->getJsLibFiles(),
+]));
+
+// The codes are already generated.
+$this->bGenerated = true;
+}
+
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page
      *
      * @return string
      * @throws UriException
      */
-    public function getCss(): string
-    {
-        $this->generateCodes();
-        return implode("\n\n", $this->aCss);
-    }
+public function getCss(): string
+{
+$this->generateCodes();
+return implode("\n\n", $this->aCss);
+}
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page
      *
      * @return string
      * @throws UriException
      */
-    public function getJs(): string
-    {
-        $this->generateCodes();
-        return implode("\n\n", $this->aJs);
-    }
+public function getJs(): string
+{
+$this->generateCodes();
+return implode("\n\n", $this->aJs);
+}
 
-    /**
+/**
      * Get the Javascript code
      *
      * @return string
      */
-    public function getJsScript(): string
-    {
-        foreach($this->aCodeGenerators as $sClassName)
-        {
-            $xGenerator = $this->getCodeGenerator($sClassName);
-            // Javascript code
-            if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
-            {
-                $aJsScript[] = $sJsScript;
-            }
-        }
-        return implode("\n\n", $aJsScript);
-    }
-
-    /**
+public function getJsScript(): string
+{
+foreach($this->aCodeGenerators as $sClassName)
+{
+$xGenerator = $this->getCodeGenerator($sClassName);
+// Javascript code
+if(($sJsScript = trim($xGenerator->getScript(), " \n")) !== '')
+{
+    $aJsScript[] = $sJsScript;
+}
+}
+return implode("\n\n", $aJsScript);
+}
+
+/**
      * @param bool $bIncludeJs Also get the JS files
      * @param bool $bIncludeCss Also get the CSS files
      *
      * @return array<string>
      */
-    private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
-    {
-        $aCodes = [];
-        if($bIncludeCss)
-        {
-            $aCodes[] = $this->getCss();
-        }
-        if($bIncludeJs)
-        {
-            $aCodes[] = $this->getJs();
-        }
-
-        $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()]);
-
-        // Wrap the js codes into HTML tags.
-        if(count($this->aCodeJsBefore) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJsBefore);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        if(count($this->aCodeJs) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJs);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        if(count($this->aCodeJsFiles) > 0)
-        {
-            $aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
-        }
-        if(count($this->aCodeJsAfter) > 0)
-        {
-            $sScript = implode("\n\n", $this->aCodeJsAfter);
-            $aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
-        }
-        return $aCodes;
-    }
-
-    /**
+private function renderCodes(bool $bIncludeJs, bool $bIncludeCss): array
+{
+$aCodes = [];
+if($bIncludeCss)
+{
+$aCodes[] = $this->getCss();
+}
+if($bIncludeJs)
+{
+$aCodes[] = $this->getJs();
+}
+
+$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()]);
+
+// Wrap the js codes into HTML tags.
+if(count($this->aCodeJsBefore) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJsBefore);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+if(count($this->aCodeJs) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJs);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+if(count($this->aCodeJsFiles) > 0)
+{
+$aCodes[] = $this->render('includes.js', ['aUrls' => $this->aCodeJsFiles]);
+}
+if(count($this->aCodeJsAfter) > 0)
+{
+$sScript = implode("\n\n", $this->aCodeJsAfter);
+$aCodes[] = $this->render('wrapper.js', ['sScript' => $sScript]);
+}
+return $aCodes;
+}
+
+/**
      * Get the javascript code to be sent to the browser
      *
      * @param bool $bIncludeJs Also get the JS files
@@ -330,10 +330,10 @@ 
      * @return string
      * @throws UriException
      */
-    public function getScript(bool $bIncludeJs, bool $bIncludeCss): string
-    {
-        $this->generateCodes();
-        $aCodes = $this->renderCodes($bIncludeJs, $bIncludeCss);
-        return implode("\n\n", $aCodes);
-    }
+public function getScript(bool $bIncludeJs, bool $bIncludeCss): string
+{
+$this->generateCodes();
+$aCodes = $this->renderCodes($bIncludeJs, $bIncludeCss);
+return implode("\n\n", $aCodes);
+}
 }

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

Spacing +7 added lines, -7 removed lines

@@ -73,7 +73,7 @@ 
     public function shallIncludeAssets(AbstractPlugin $xPlugin): bool
     {
         $sPluginOptionName = 'assets.include.' . $xPlugin->getName();
-        if($this->hasLibOption($sPluginOptionName))
+        if ($this->hasLibOption($sPluginOptionName))
         {
             return $this->getLibOption($sPluginOptionName);
         }
@@ -97,7 +97,7 @@ 
             $this->getLibOption('js.lib.jq', "$sJsLibUri/libs/chibi/chibi$sJsExtension"),
             "$sJsLibUri/jaxon.core$sJsExtension",
         ];
-        if($this->getLibOption('core.debug.on'))
+        if ($this->getLibOption('core.debug.on'))
         {
             $sLanguage = $this->getLibOption('core.language');
             $aJsFiles[] = "$sJsLibUri/jaxon.debug$sJsExtension";
@@ -117,7 +117,7 @@ 
         // Check config options
         // - The js.app.export option must be set to true
         // - The js.app.uri and js.app.dir options must be set to non null values
-        if(!$this->getLibOption('js.app.export', false) ||
+        if (!$this->getLibOption('js.app.export', false) ||
             !$this->getLibOption('js.app.uri') || !$this->getLibOption('js.app.dir'))
         {
             return false;
@@ -138,7 +138,7 @@ 
         $sJsFileName = $this->getLibOption('js.app.file') ?: $xCodeGenerator->getHash();
         $sJsDirectory = rtrim($this->getLibOption('js.app.dir'), '\/') . DIRECTORY_SEPARATOR;
         // - The js.app.dir must be writable
-        if(!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))
+        if (!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))
         {
             return '';
         }
@@ -147,16 +147,16 @@ 
         $sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';
         $sJsFileUri = rtrim($this->getLibOption('js.app.uri'), '/') . "/$sJsFileName";
 
-        if(!is_file($sJsFilePath) &&
+        if (!is_file($sJsFilePath) &&
             !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))
         {
             return '';
         }
-        if(!$this->getLibOption('js.app.minify', false))
+        if (!$this->getLibOption('js.app.minify', false))
         {
             return $sJsFileUri . '.js';
         }
-        if(!is_file($sJsMinFilePath) &&
+        if (!is_file($sJsMinFilePath) &&
             !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))
         {
             // If the file cannot be minified, return the plain js file.

Switch Indentation +98 added lines, -98 removed lines

@@ -26,142 +26,142 @@
 
 class AssetManager
 {
-    use ConfigTrait;
+use ConfigTrait;
 
-    /**
+/**
      * Default library URL
      *
      * @var string
      */
-    const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.0.8/dist';
+const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.0.8/dist';
 
-    /**
+/**
      * The constructor
      *
      * @param ConfigManager $xConfigManager
      * @param MinifierInterface $xMinifier
      */
-    public function __construct(private ConfigManager $xConfigManager,
-        private MinifierInterface $xMinifier)
-    {}
+public function __construct(private ConfigManager $xConfigManager,
+private MinifierInterface $xMinifier)
+{}
 
-    /**
+/**
      * @return ConfigManager
      */
-    protected function config(): ConfigManager
-    {
-        return $this->xConfigManager;
-    }
+protected function config(): ConfigManager
+{
+return $this->xConfigManager;
+}
 
-    /**
+/**
      * Get app js options
      *
      * @return string
      */
-    public function getJsOptions(): string
-    {
-        return $this->getLibOption('js.app.options', '');
-    }
+public function getJsOptions(): string
+{
+return $this->getLibOption('js.app.options', '');
+}
 
-    /**
+/**
      * Check if the assets of this plugin shall be included in Jaxon generated code.
      *
      * @param AbstractPlugin $xPlugin
      *
      * @return bool
      */
-    public function shallIncludeAssets(AbstractPlugin $xPlugin): bool
-    {
-        $sPluginOptionName = 'assets.include.' . $xPlugin->getName();
-        if($this->hasLibOption($sPluginOptionName))
-        {
-            return $this->getLibOption($sPluginOptionName);
-        }
-        return $this->getLibOption('assets.include.all', true);
-    }
-
-    /**
+public function shallIncludeAssets(AbstractPlugin $xPlugin): bool
+{
+$sPluginOptionName = 'assets.include.' . $xPlugin->getName();
+if($this->hasLibOption($sPluginOptionName))
+{
+return $this->getLibOption($sPluginOptionName);
+}
+return $this->getLibOption('assets.include.all', true);
+}
+
+/**
      * Get the HTML tags to include Jaxon javascript files into the page
      *
      * @return array
      */
-    public function getJsLibFiles(): array
-    {
-        $sJsExtension = $this->getLibOption('js.app.minify') ? '.min.js' : '.js';
-        // The URI for the javascript library files
-        $sJsLibUri = $this->getLibOption('js.lib.uri', self::JS_LIB_URL);
-        $sJsLibUri = rtrim($sJsLibUri, '/');
-
-        // Add component files to the javascript file array;
-        $aJsFiles = [
-            $this->getLibOption('js.lib.jq', "$sJsLibUri/libs/chibi/chibi$sJsExtension"),
-            "$sJsLibUri/jaxon.core$sJsExtension",
-        ];
-        if($this->getLibOption('core.debug.on'))
-        {
-            $sLanguage = $this->getLibOption('core.language');
-            $aJsFiles[] = "$sJsLibUri/jaxon.debug$sJsExtension";
-            $aJsFiles[] = "$sJsLibUri/lang/jaxon.$sLanguage$sJsExtension";
-        }
-
-        return $aJsFiles;
-    }
-
-    /**
+public function getJsLibFiles(): array
+{
+$sJsExtension = $this->getLibOption('js.app.minify') ? '.min.js' : '.js';
+// The URI for the javascript library files
+$sJsLibUri = $this->getLibOption('js.lib.uri', self::JS_LIB_URL);
+$sJsLibUri = rtrim($sJsLibUri, '/');
+
+// Add component files to the javascript file array;
+$aJsFiles = [
+$this->getLibOption('js.lib.jq', "$sJsLibUri/libs/chibi/chibi$sJsExtension"),
+"$sJsLibUri/jaxon.core$sJsExtension",
+];
+if($this->getLibOption('core.debug.on'))
+{
+$sLanguage = $this->getLibOption('core.language');
+$aJsFiles[] = "$sJsLibUri/jaxon.debug$sJsExtension";
+$aJsFiles[] = "$sJsLibUri/lang/jaxon.$sLanguage$sJsExtension";
+}
+
+return $aJsFiles;
+}
+
+/**
      * Get the javascript file name
      *
      * @return bool
      */
-    public function shallCreateJsFiles(): bool
-    {
-        // Check config options
-        // - The js.app.export option must be set to true
-        // - The js.app.uri and js.app.dir options must be set to non null values
-        if(!$this->getLibOption('js.app.export', false) ||
-            !$this->getLibOption('js.app.uri') || !$this->getLibOption('js.app.dir'))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    /**
+public function shallCreateJsFiles(): bool
+{
+// Check config options
+// - The js.app.export option must be set to true
+// - The js.app.uri and js.app.dir options must be set to non null values
+if(!$this->getLibOption('js.app.export', false) ||
+!$this->getLibOption('js.app.uri') || !$this->getLibOption('js.app.dir'))
+{
+return false;
+}
+return true;
+}
+
+/**
      * Write javascript files and return the corresponding URI
      *
      * @param CodeGenerator $codeGenerator
      *
      * @return string
      */
-    public function createJsFiles(CodeGenerator $xCodeGenerator): string
-    {
-        // Check dir access
-        $sJsFileName = $this->getLibOption('js.app.file') ?: $xCodeGenerator->getHash();
-        $sJsDirectory = rtrim($this->getLibOption('js.app.dir'), '\/') . DIRECTORY_SEPARATOR;
-        // - The js.app.dir must be writable
-        if(!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))
-        {
-            return '';
-        }
-
-        $sJsFilePath = $sJsDirectory . $sJsFileName . '.js';
-        $sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';
-        $sJsFileUri = rtrim($this->getLibOption('js.app.uri'), '/') . "/$sJsFileName";
-
-        if(!is_file($sJsFilePath) &&
-            !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))
-        {
-            return '';
-        }
-        if(!$this->getLibOption('js.app.minify', false))
-        {
-            return $sJsFileUri . '.js';
-        }
-        if(!is_file($sJsMinFilePath) &&
-            !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))
-        {
-            // If the file cannot be minified, return the plain js file.
-            return $sJsFileUri . '.js';
-        }
-        return $sJsFileUri . '.min.js';
-    }
+public function createJsFiles(CodeGenerator $xCodeGenerator): string
+{
+// Check dir access
+$sJsFileName = $this->getLibOption('js.app.file') ?: $xCodeGenerator->getHash();
+$sJsDirectory = rtrim($this->getLibOption('js.app.dir'), '\/') . DIRECTORY_SEPARATOR;
+// - The js.app.dir must be writable
+if(!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))
+{
+return '';
+}
+
+$sJsFilePath = $sJsDirectory . $sJsFileName . '.js';
+$sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';
+$sJsFileUri = rtrim($this->getLibOption('js.app.uri'), '/') . "/$sJsFileName";
+
+if(!is_file($sJsFilePath) &&
+!@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))
+{
+return '';
+}
+if(!$this->getLibOption('js.app.minify', false))
+{
+return $sJsFileUri . '.js';
+}
+if(!is_file($sJsMinFilePath) &&
+!$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))
+{
+// If the file cannot be minified, return the plain js file.
+return $sJsFileUri . '.js';
+}
+return $sJsFileUri . '.min.js';
+}
 }

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

Braces +1 added lines, -2 removed lines

@@ -226,8 +226,7 @@
             if(is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
-            }
-            elseif(is_string($xMethodToCall))
+            } elseif(is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;
             }

Spacing +24 added lines, -27 removed lines

@@ -107,33 +107,33 @@ 
     {
         $this->bExcluded = ($xMetadata?->isExcluded() ?? false) ||
             (bool)($aOptions['excluded'] ?? false);
-        if($this->bExcluded)
+        if ($this->bExcluded)
         {
             return;
         }
 
         $sSeparator = $aOptions['separator'];
-        if($sSeparator === '_' || $sSeparator === '.')
+        if ($sSeparator === '_' || $sSeparator === '.')
         {
             $this->sSeparator = $sSeparator;
         }
         $this->addProtectedMethods($aOptions['protected']);
 
-        foreach($aOptions['functions'] as $sNames => $aFunctionOptions)
+        foreach ($aOptions['functions'] as $sNames => $aFunctionOptions)
         {
             // Names are in a comma-separated list.
             $aFunctionNames = explode(',', $sNames);
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
             }
         }
 
-        if($xMetadata !== null)
+        if ($xMetadata !== null)
         {
             $this->aExportMethods = $xMetadata->getExportMethods();
             $this->addProtectedMethods($xMetadata->getProtectedMethods());
-            foreach($xMetadata->getProperties() as $sFunctionName => $aFunctionOptions)
+            foreach ($xMetadata->getProperties() as $sFunctionName => $aFunctionOptions)
             {
                 $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
             }
@@ -150,8 +150,7 @@ 
     private function addProtectedMethods(array|string $xMethods): void
     {
         $this->aProtectedMethods = array_merge($this->aProtectedMethods,
-            !is_array($xMethods) ? [trim((string)$xMethods)] :
-            array_map(fn($sMethod) => trim((string)$sMethod), $xMethods));
+            !is_array($xMethods) ? [trim((string)$xMethods)] : array_map(fn($sMethod) => trim((string)$sMethod), $xMethods));
     }
 
     /**
@@ -161,7 +160,7 @@ 
      */
     private function filterPublicMethods(array $aMethods): array
     {
-        if($this->bExcluded || in_array('*', $this->aProtectedMethods))
+        if ($this->bExcluded || in_array('*', $this->aProtectedMethods))
         {
             return [];
         }
@@ -169,13 +168,13 @@ 
         $aBaseMethods = $aMethods[1];
         $aMethods = $aMethods[0];
 
-        if(isset($this->aExportMethods['only']))
+        if (isset($this->aExportMethods['only']))
         {
             $aMethods = array_intersect($aMethods, $this->aExportMethods['only']);
         }
         $aMethods = array_diff($aMethods, $this->aProtectedMethods,
             $this->aExportMethods['except'] ?? []);
-        if(count($aBaseMethods) > 0 && isset($this->aExportMethods['base']))
+        if (count($aBaseMethods) > 0 && isset($this->aExportMethods['base']))
         {
             $aBaseMethods = array_diff($aBaseMethods, $this->aExportMethods['base']);
         }
@@ -253,17 +252,17 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue): void
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(!isset($aHookMethods[$sCalledMethod]))
+            if (!isset($aHookMethods[$sCalledMethod]))
             {
                 $aHookMethods[$sCalledMethod] = [];
             }
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
             }
-            elseif(is_string($xMethodToCall))
+            elseif (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;
             }
@@ -288,7 +287,7 @@ 
      */
     private function addOption(string $sName, $xValue): void
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the methods to call before processing the request
         case '__before':
@@ -316,11 +315,11 @@ 
      */
     private function _addJsArrayOption(string $sFunctionName, string $sOptionName, $xOptionValue): void
     {
-        if(is_string($xOptionValue))
+        if (is_string($xOptionValue))
         {
             $xOptionValue = [$xOptionValue];
         }
-        if(!is_array($xOptionValue))
+        if (!is_array($xOptionValue))
         {
             return; // Do not save.
         }
@@ -350,10 +349,10 @@ 
      */
     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue): void
     {
-        switch($sOptionName)
+        switch ($sOptionName)
         {
         case 'excluded':
-            if((bool)$xOptionValue)
+            if ((bool)$xOptionValue)
             {
                 $this->addProtectedMethods($sFunctionName);
             }
@@ -377,12 +376,11 @@ 
      */
     private function addFunctionOptions(string $sFunctionName, array $aFunctionOptions): void
     {
-        foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+        foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
         {
             substr($sOptionName, 0, 2) === '__' ?
                 // Options for PHP classes. They start with "__".
-                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) :
-                // Options for javascript code.
+                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) : // Options for javascript code.
                 $this->addJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
@@ -398,16 +396,15 @@ 
         $aOptions = array_merge($this->aJsOptions['*'] ?? []); // Clone the array
         // Then add the method options.
         $aMethodOptions = $this->aJsOptions[$sMethodName] ?? [];
-        foreach($aMethodOptions as $sOptionName => $xOptionValue)
+        foreach ($aMethodOptions as $sOptionName => $xOptionValue)
         {
             // For databags and callbacks, merge the values in a single array.
             // For all the other options, keep the last value.
             $aOptions[$sOptionName] = !in_array($sOptionName, ['bags', 'callback']) ?
-                $xOptionValue :
-                array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
+                $xOptionValue : array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
         }
         // Since callbacks are js object names, they need a special formatting.
-        if(isset($aOptions['callback']))
+        if (isset($aOptions['callback']))
         {
             $aOptions['callback'] = str_replace('"', '', json_encode($aOptions['callback']));
         }

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

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     public function __construct(string $sDirectory)
     {
         $itFile = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($sDirectory));
-        foreach($itFile as $xFile)
+        foreach ($itFile as $xFile)
         {
             $this->insert($xFile);
         }