jaxon-php / jaxon-mono

jaxon-core/src/Response/Manager/Command.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      */
     public function setOption(string $sName, string|array|JsonSerializable $xValue): Command
     {
-        if(isset($this->aCommand['options']))
+        if (isset($this->aCommand['options']))
         {
             $this->aCommand['options'][$this->str($sName)] = $xValue;
             return $this;

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')

jaxon-core/src/Plugin/Response/DataBag/DataBagPlugin.php

Spacing +4 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
      */
     private function initDataBag(): void
     {
-        if($this->xDataBag !== null)
+        if ($this->xDataBag !== null)
         {
             return;
         }
@@ -44,8 +44,7 @@ 
         $aBody = $xRequest->getParsedBody();
         $aParams = $xRequest->getQueryParams();
         $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
+            $this->readData($aBody['jxnbags'] ?? []) : $this->readData($aParams['jxnbags'] ?? []);
         $this->xDataBag = new DataBag($this, $aData);
     }
 
@@ -67,8 +66,7 @@ 
         // Todo: clean input data.
         // Todo: verify the checksums.
         return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
+            (json_decode($xData, true) ?: []) : (is_array($xData) ? $xData : []);
     }
 
     /**
@@ -86,7 +84,7 @@ 
     public function writeCommand(): void
     {
         $this->initDataBag();
-        if($this->xDataBag->touched())
+        if ($this->xDataBag->touched())
         {
             // Todo: calculate the checksums.
             $this->addCommand('databag.set', ['values' => $this->xDataBag]);

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'),

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]);

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.

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

Spacing +33 added lines, -33 removed lines

@@ -111,7 +111,7 @@ 
     public function __construct(protected ComponentContainer $cdi)
     {
         // Set the composer autoloader
-        if(file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
+        if (file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../../vendor/autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../vendor/autoload.php')))
         {
@@ -180,15 +180,15 @@ 
      */
     private function makeClassOptions(string $sClassName, array $aClassOptions, array $aDirectoryOptions): array
     {
-        foreach($this->aDefaultClassOptions as $sOption => $xValue)
+        foreach ($this->aDefaultClassOptions as $sOption => $xValue)
         {
-            if(!isset($aClassOptions[$sOption]))
+            if (!isset($aClassOptions[$sOption]))
             {
                 $aClassOptions[$sOption] = $xValue;
             }
         }
         $aClassOptions['excluded'] = (bool)($aClassOptions['excluded'] ?? false); // Convert to bool.
-        if(is_string($aClassOptions['protected']))
+        if (is_string($aClassOptions['protected']))
         {
             $aClassOptions['protected'] = [$aClassOptions['protected']]; // Convert to array.
         }
@@ -199,30 +199,30 @@ 
             $aDirectoryOptions['classes']['*'] ?? [], // Options for all classes
             $aDirectoryOptions['classes'][$sClassName] ?? [], // Options for this specific class
         ];
-        foreach($aOptionGroups as $aOptionGroup)
+        foreach ($aOptionGroups as $aOptionGroup)
         {
-            if(isset($aOptionGroup['separator']))
+            if (isset($aOptionGroup['separator']))
             {
                 $aClassOptions['separator'] = (string)$aOptionGroup['separator'];
             }
-            if(isset($aOptionGroup['excluded']))
+            if (isset($aOptionGroup['excluded']))
             {
                 $aClassOptions['excluded'] = (bool)$aOptionGroup['excluded'];
             }
-            if(isset($aOptionGroup['protected']))
+            if (isset($aOptionGroup['protected']))
             {
-                if(is_string($aOptionGroup['protected']))
+                if (is_string($aOptionGroup['protected']))
                 {
                     $aOptionGroup['protected'] = [$aOptionGroup['protected']]; // Convert to array.
                 }
                 $aClassOptions['protected'] = array_merge($aClassOptions['protected'], $aOptionGroup['protected']);
             }
-            if(isset($aOptionGroup['functions']))
+            if (isset($aOptionGroup['functions']))
             {
                 $aClassOptions['functions'] = array_merge($aClassOptions['functions'], $aOptionGroup['functions']);
             }
         }
-        if(isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
+        if (isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
         {
             $aClassOptions['config'] = $aDirectoryOptions['config'];
         }
@@ -244,7 +244,7 @@ 
     {
         $aOptions = $this->makeClassOptions($sClassName, $aClassOptions, $aDirectoryOptions);
         $this->cdi->registerComponent($sClassName, $aOptions);
-        if($this->bUpdateHash)
+        if ($this->bUpdateHash)
         {
             $this->sHash .= $sClassName . $aOptions['timestamp'];
         }
@@ -260,7 +260,7 @@ 
      */
     public function registerComponent(string $sClassName, array $aClassOptions): void
     {
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aClassOptions['config'] = $this->xPackageConfig;
         }
@@ -277,10 +277,10 @@ 
     public function getNamespaceComponentOptions(string $sClassName): ?array
     {
         // Find the corresponding namespace
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             // Check if the namespace matches the class.
-            if(strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
+            if (strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
             {
                 // Save the class options
                 $aClassOptions = ['namespace' => $sNamespace];
@@ -301,11 +301,11 @@ 
     public function registerDirectory(string $sDirectory, array $aOptions): void
     {
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aOptions['config'] = $this->xPackageConfig;
         }
@@ -337,30 +337,30 @@ 
     public function registerNamespace(string $sNamespace, array $aOptions): void
     {
         // Separator default value
-        if(!isset($aOptions['separator']))
+        if (!isset($aOptions['separator']))
         {
             $aOptions['separator'] = '.';
         }
         $aOptions['separator'] = trim($aOptions['separator']);
-        if(!in_array($aOptions['separator'], ['.', '_']))
+        if (!in_array($aOptions['separator'], ['.', '_']))
         {
             $aOptions['separator'] = '.';
         }
-        if($aOptions['separator'] === '_')
+        if ($aOptions['separator'] === '_')
         {
             $this->cdi->useUnderscore();
         }
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xPackageConfig !== null)
+        if ($this->xPackageConfig !== null)
         {
             $aOptions['config'] = $this->xPackageConfig;
         }
         // Register the dir with PSR4 autoloading
-        if(($aOptions['autoload']) && $this->xAutoloader != null)
+        if (($aOptions['autoload']) && $this->xAutoloader != null)
         {
             $this->xAutoloader->setPsr4($sNamespace . '\\', $aOptions['directory']);
         }
@@ -376,28 +376,28 @@ 
     public function registerComponentsInDirectories(): void
     {
         // This is to be done only once.
-        if($this->bDirectoriesParsed)
+        if ($this->bDirectoriesParsed)
         {
             return;
         }
         $this->bDirectoriesParsed = true;
 
         // Browse directories without namespaces and read all the files.
-        foreach($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
+        foreach ($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
         {
             $itFile = new SortedFileIterator($sDirectory);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // Skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
 
                 $sClassName = $xFile->getBasename('.php');
                 $aClassOptions = ['timestamp' => $xFile->getMTime()];
-                if(($aDirectoryOptions['autoload']) && $this->xAutoloader !== null)
+                if (($aDirectoryOptions['autoload']) && $this->xAutoloader !== null)
                 {
                     // Set classmap autoloading. Must be done before registering the class.
                     $this->xAutoloader->addClassMap([$sClassName => $xFile->getPathname()]);
@@ -415,7 +415,7 @@ 
     public function registerComponentsInNamespaces(): void
     {
         // This is to be done only once.
-        if($this->bNamespacesParsed)
+        if ($this->bNamespacesParsed)
         {
             return;
         }
@@ -423,17 +423,17 @@ 
 
         // Browse directories with namespaces and read all the files.
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             $this->addNamespace($sNamespace, ['separator' => $aDirectoryOptions['separator']]);
 
             // Iterate on dir content
             $sDirectory = $aDirectoryOptions['directory'];
             $itFile = new SortedFileIterator($sDirectory);
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
@@ -442,7 +442,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath !== '')
+                if ($sRelativePath !== '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }

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