jaxon-php / jaxon-mono

jaxon-dialogs/tests/config/ext.php

Switch Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 
 return [
-    'app' => [
-        'dialogs' => [
-            'default' => [
-                'confirm' => TestDialogLibrary::NAME,
-            ],
-            'lib' => [
-                'ext' => [
-                    TestDialogLibrary::NAME => TestDialogLibrary::class,
-                ],
-            ],
-        ],
-    ],
-    'lib' => [
+'app' => [
+'dialogs' => [
+'default' => [
+    'confirm' => TestDialogLibrary::NAME,
+],
+'lib' => [
+    'ext' => [
+        TestDialogLibrary::NAME => TestDialogLibrary::class,
     ],
+],
+],
+],
+'lib' => [
+],
 ];

jaxon-dialogs/src/register.php

Spacing +3 added lines, -3 removed lines

@@ -55,13 +55,13 @@ 
             Dialog\Library\Butterup::class, // Butterup
             Dialog\Library\IziToast::class, // IziToast
         ];
-        foreach($aLibraries as $sClass)
+        foreach ($aLibraries as $sClass)
         {
             try
             {
                 $xDialog->registerLibrary($sClass, $sClass::NAME);
             }
-            catch(SetupException $_){}
+            catch (SetupException $_) {}
         }
 
         return $xDialog;
@@ -79,7 +79,7 @@ 
 function register(): void
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
             try
             {
                 $xDialog->registerLibrary($sClass, $sClass::NAME);
-            }
-            catch(SetupException $_){}
+            } catch(SetupException $_){}
         }
 
         return $xDialog;

jaxon-dialogs/src/DialogPlugin.php

Spacing +4 added lines, -4 removed lines

@@ -142,15 +142,15 @@ 
             'defaults' => $this->xConfigManager->getAppOption('dialogs.default', []),
         ];
         $aLibrariesOptions = [];
-        foreach($this->getLibraries() as $xLibrary)
+        foreach ($this->getLibraries() as $xLibrary)
         {
             $aLibOptions = $xLibrary->helper()->getJsOptions();
-            if(count($aLibOptions) > 0)
+            if (count($aLibOptions) > 0)
             {
                 $aLibrariesOptions[$xLibrary->getName()] = $aLibOptions;
             }
         }
-        if(count($aLibrariesOptions) > 0)
+        if (count($aLibrariesOptions) > 0)
         {
             $aOptions['options'] = $aLibrariesOptions;
         }
@@ -167,7 +167,7 @@ 
         $xJsCode->sJsBefore = $this->getConfigScript();
 
         $aCodes = [];
-        foreach($this->getHelpers() as $xHelper)
+        foreach ($this->getHelpers() as $xHelper)
         {
             $aCodes[] = $xHelper->getScript();
             $xJsCode->aFiles = array_merge($xJsCode->aFiles, $xHelper->getFiles());

jaxon-dialogs/src/Dialog/AbstractLibrary.php

Spacing +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
      */
     public function helper(): LibraryHelper
     {
-        return $this->xHelper ?:
-            $this->xHelper = dialog()->getLibraryHelper($this->getName());
+        return $this->xHelper ?: $this->xHelper = dialog()->getLibraryHelper($this->getName());
     }
 
     /**

jaxon-dialogs/src/Dialog/LibraryHelper.php

Spacing +2 added lines, -3 removed lines

@@ -110,8 +110,7 @@ 
      */
     private function getAssetUri(string $sOption, string $sFile): ?string
     {
-        return !$this->hasOption($sOption) ? "{$this->sUri}/$sFile" :
-            (trim($this->getOption($sOption)) ?: null);
+        return !$this->hasOption($sOption) ? "{$this->sUri}/$sFile" : (trim($this->getOption($sOption)) ?: null);
     }
 
     /**
@@ -194,7 +193,7 @@ 
      */
     public function getFiles(): array
     {
-        if(!$this->getLibOption('js.app.export', false))
+        if (!$this->getLibOption('js.app.export', false))
         {
             return [];
         }

jaxon-dialogs/src/DialogManager.php

Switch Indentation +197 added lines, -197 removed lines

@@ -36,44 +36,44 @@ 
 
 class DialogManager implements ConfigListenerInterface, LibraryRegistryInterface
 {
-    /**
+/**
      * @var array
      */
-    protected $aLibraries = [];
+protected $aLibraries = [];
 
-    /**
+/**
      * The ConfirmInterface class name
      *
      * @var string
      */
-    private $sConfirmLibrary = '';
+private $sConfirmLibrary = '';
 
-    /**
+/**
      * The AlertInterface class name
      *
      * @var string
      */
-    private $sAlertLibrary = '';
+private $sAlertLibrary = '';
 
-    /**
+/**
      * The ModalInterface class name
      *
      * @var string
      */
-    private $sModalLibrary = '';
+private $sModalLibrary = '';
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
      * @param ConfigManager $xConfigManager
      * @param Translator $xTranslator
      */
-    public function __construct(private Container $di,
-        private ConfigManager $xConfigManager, private Translator $xTranslator)
-    {}
+public function __construct(private Container $di,
+private ConfigManager $xConfigManager, private Translator $xTranslator)
+{}
 
-    /**
+/**
      * Register a javascript dialog library adapter.
      *
      * @param string $sClass
@@ -81,20 +81,20 @@ 
      *
      * @return void
      */
-    private function _registerLibrary(string $sClass, string $sLibraryName): void
-    {
-        $this->di->set($sClass, function($di) use($sClass) {
-            return $di->make($sClass);
-        });
-        $this->di->set("dialog_library_helper_$sLibraryName", function($di) use($sClass) {
-            return new LibraryHelper($di->g($sClass), $di->g(ConfigManager::class),
-                $di->g(TemplateEngine::class));
-        });
-        // Set the alias, so the libraries can be found by their names.
-        $this->di->alias("dialog_library_$sLibraryName", $sClass);
-    }
+private function _registerLibrary(string $sClass, string $sLibraryName): void
+{
+$this->di->set($sClass, function($di) use($sClass) {
+return $di->make($sClass);
+});
+$this->di->set("dialog_library_helper_$sLibraryName", function($di) use($sClass) {
+return new LibraryHelper($di->g($sClass), $di->g(ConfigManager::class),
+    $di->g(TemplateEngine::class));
+});
+// Set the alias, so the libraries can be found by their names.
+$this->di->alias("dialog_library_$sLibraryName", $sClass);
+}
 
-    /**
+/**
      * Register a javascript dialog library adapter.
      *
      * @param string $sClassName
@@ -103,53 +103,53 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerLibrary(string $sClassName, string $sLibraryName): void
-    {
-        if(isset($this->aLibraries[$sLibraryName]))
-        {
-            return;
-        }
-        if(!($aInterfaces = class_implements($sClassName)))
-        {
-            // The class is invalid.
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
+public function registerLibrary(string $sClassName, string $sLibraryName): void
+{
+if(isset($this->aLibraries[$sLibraryName]))
+{
+return;
+}
+if(!($aInterfaces = class_implements($sClassName)))
+{
+// The class is invalid.
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
 
-        $bIsConfirm = in_array(ConfirmInterface::class, $aInterfaces);
-        $bIsAlert = in_array(AlertInterface::class, $aInterfaces);
-        $bIsModal = in_array(ModalInterface::class, $aInterfaces);
-        if(!$bIsConfirm && !$bIsAlert && !$bIsModal)
-        {
-            // The class is invalid.
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
+$bIsConfirm = in_array(ConfirmInterface::class, $aInterfaces);
+$bIsAlert = in_array(AlertInterface::class, $aInterfaces);
+$bIsModal = in_array(ModalInterface::class, $aInterfaces);
+if(!$bIsConfirm && !$bIsAlert && !$bIsModal)
+{
+// The class is invalid.
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
 
-        // Save the library
-        $this->aLibraries[$sLibraryName] = [
-            'confirm' => $bIsConfirm,
-            'alert' => $bIsAlert,
-            'modal' => $bIsModal,
-            'used' => false,
-        ];
-        // Register the library class in the container
-        $this->_registerLibrary($sClassName, $sLibraryName);
-    }
+// Save the library
+$this->aLibraries[$sLibraryName] = [
+'confirm' => $bIsConfirm,
+'alert' => $bIsAlert,
+'modal' => $bIsModal,
+'used' => false,
+];
+// Register the library class in the container
+$this->_registerLibrary($sClassName, $sLibraryName);
+}
 
-    /**
+/**
      * Get the dialog library helper
      *
      * @param string $sLibraryName
      *
      * @return LibraryHelper
      */
-    public function getLibraryHelper(string $sLibraryName): LibraryHelper
-    {
-        return $this->di->g("dialog_library_helper_$sLibraryName");
-    }
+public function getLibraryHelper(string $sLibraryName): LibraryHelper
+{
+return $this->di->g("dialog_library_helper_$sLibraryName");
+}
 
-    /**
+/**
      * Set the ConfirmInterface library
      *
      * @param string $sLibraryName The ConfirmInterface library name
@@ -157,29 +157,29 @@ 
      * @return void
      * @throws SetupException
      */
-    public function setConfirmLibrary(string $sLibraryName)
-    {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['confirm'])
-        {
-            $sMessage = $this->xTranslator->trans('errors.dialog.library',
-                ['type' => 'confirm', 'name' => $sLibraryName]);
-            throw new SetupException($sMessage);
-        }
-        $this->sConfirmLibrary = $sLibraryName;
-    }
+public function setConfirmLibrary(string $sLibraryName)
+{
+if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['confirm'])
+{
+$sMessage = $this->xTranslator->trans('errors.dialog.library',
+    ['type' => 'confirm', 'name' => $sLibraryName]);
+throw new SetupException($sMessage);
+}
+$this->sConfirmLibrary = $sLibraryName;
+}
 
-    /**
+/**
      * Get the ConfirmInterface library
      *
      * @return ConfirmInterface
      */
-    public function getConfirmLibrary(): ConfirmInterface
-    {
-        $sKey = "dialog_library_{$this->sConfirmLibrary}";
-        return $this->di->h($sKey) ? $this->di->g($sKey) : $this->di->g(Alert::class);
-    }
+public function getConfirmLibrary(): ConfirmInterface
+{
+$sKey = "dialog_library_{$this->sConfirmLibrary}";
+return $this->di->h($sKey) ? $this->di->g($sKey) : $this->di->g(Alert::class);
+}
 
-    /**
+/**
      * Set AlertInterface library
      *
      * @param string $sLibraryName The AlertInterface library name
@@ -187,29 +187,29 @@ 
      * @return void
      * @throws SetupException
      */
-    public function setAlertLibrary(string $sLibraryName): void
-    {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['alert'])
-        {
-            $sMessage = $this->xTranslator->trans('errors.dialog.library',
-                ['type' => 'alert', 'name' => $sLibraryName]);
-            throw new SetupException($sMessage);
-        }
-        $this->sAlertLibrary = $sLibraryName;
-    }
+public function setAlertLibrary(string $sLibraryName): void
+{
+if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['alert'])
+{
+$sMessage = $this->xTranslator->trans('errors.dialog.library',
+    ['type' => 'alert', 'name' => $sLibraryName]);
+throw new SetupException($sMessage);
+}
+$this->sAlertLibrary = $sLibraryName;
+}
 
-    /**
+/**
      * Get the AlertInterface library
      *
      * @return AlertInterface
      */
-    public function getAlertLibrary(): AlertInterface
-    {
-        $sKey = "dialog_library_{$this->sAlertLibrary}";
-        return $this->di->h($sKey) ? $this->di->g($sKey) : $this->di->g(Alert::class);
-    }
+public function getAlertLibrary(): AlertInterface
+{
+$sKey = "dialog_library_{$this->sAlertLibrary}";
+return $this->di->h($sKey) ? $this->di->g($sKey) : $this->di->g(Alert::class);
+}
 
-    /**
+/**
      * Set the ModalInterface library
      *
      * @param string $sLibraryName The ModalInterface library name
@@ -217,137 +217,137 @@ 
      * @return void
      * @throws SetupException
      */
-    public function setModalLibrary(string $sLibraryName): void
-    {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal'])
-        {
-            $sMessage = $this->xTranslator->trans('errors.dialog.library',
-                ['type' => 'modal', 'name' => $sLibraryName]);
-            throw new SetupException($sMessage);
-        }
-        $this->sModalLibrary = $sLibraryName;
-    }
+public function setModalLibrary(string $sLibraryName): void
+{
+if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal'])
+{
+$sMessage = $this->xTranslator->trans('errors.dialog.library',
+    ['type' => 'modal', 'name' => $sLibraryName]);
+throw new SetupException($sMessage);
+}
+$this->sModalLibrary = $sLibraryName;
+}
 
-    /**
+/**
      * Get the ModalInterface library
      *
      * @return ModalInterface|null
      */
-    public function getModalLibrary(): ?ModalInterface
-    {
-        $sKey = "dialog_library_{$this->sModalLibrary}";
-        return $this->di->h($sKey) ? $this->di->g($sKey) : null;
-    }
+public function getModalLibrary(): ?ModalInterface
+{
+$sKey = "dialog_library_{$this->sModalLibrary}";
+return $this->di->h($sKey) ? $this->di->g($sKey) : null;
+}
 
-    /**
+/**
      * Register the javascript dialog libraries from config options.
      *
      * @return void
      * @throws SetupException
      */
-    protected function registerLibraries(): void
-    {
-        $aLibraries = $this->xConfigManager->getAppOption('dialogs.lib.ext', []);
-        foreach($aLibraries as $sLibraryName => $sClassName)
-        {
-            $this->registerLibrary($sClassName, $sLibraryName);
-        }
-    }
+protected function registerLibraries(): void
+{
+$aLibraries = $this->xConfigManager->getAppOption('dialogs.lib.ext', []);
+foreach($aLibraries as $sLibraryName => $sClassName)
+{
+$this->registerLibrary($sClassName, $sLibraryName);
+}
+}
 
-    /**
+/**
      * Set the default library for each dialog feature.
      *
      * @return void
      * @throws SetupException
      */
-    protected function setDefaultLibraries(): void
-    {
-        // Set the default modal library
-        if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.modal', '')))
-        {
-            $this->setModalLibrary($sLibraryName);
-            $this->aLibraries[$sLibraryName]['used'] = true;
-        }
-        // Set the default alert library
-        if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.alert', '')))
-        {
-            $this->setAlertLibrary($sLibraryName);
-            $this->aLibraries[$sLibraryName]['used'] = true;
-        }
-        // Set the default confirm library
-        if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.confirm', '')))
-        {
-            $this->setConfirmLibrary($sLibraryName);
-            $this->aLibraries[$sLibraryName]['used'] = true;
-        }
-    }
+protected function setDefaultLibraries(): void
+{
+// Set the default modal library
+if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.modal', '')))
+{
+$this->setModalLibrary($sLibraryName);
+$this->aLibraries[$sLibraryName]['used'] = true;
+}
+// Set the default alert library
+if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.alert', '')))
+{
+$this->setAlertLibrary($sLibraryName);
+$this->aLibraries[$sLibraryName]['used'] = true;
+}
+// Set the default confirm library
+if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.confirm', '')))
+{
+$this->setConfirmLibrary($sLibraryName);
+$this->aLibraries[$sLibraryName]['used'] = true;
+}
+}
 
-    /**
+/**
      * Set the libraries in use.
      *
      * @return void
      */
-    protected function setUsedLibraries(): void
-    {
-        // Set the other libraries in use
-        $aLibraries = $this->xConfigManager->getAppOption('dialogs.lib.use', []);
-        foreach($aLibraries as $sLibraryName)
-        {
-            if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
-            {
-                $this->aLibraries[$sLibraryName]['used'] = true;
-            }
-        }
-    }
+protected function setUsedLibraries(): void
+{
+// Set the other libraries in use
+$aLibraries = $this->xConfigManager->getAppOption('dialogs.lib.use', []);
+foreach($aLibraries as $sLibraryName)
+{
+if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
+{
+    $this->aLibraries[$sLibraryName]['used'] = true;
+}
+}
+}
 
-    /**
+/**
      * Get the dialog libraries class instances
      *
      * @return LibraryInterface[]
      */
-    public function getLibraries(): array
-    {
-        // Reset the default libraries any time the config is changed.
-        $this->registerLibraries();
-        $this->setDefaultLibraries();
-        $this->setUsedLibraries();
+public function getLibraries(): array
+{
+// Reset the default libraries any time the config is changed.
+$this->registerLibraries();
+$this->setDefaultLibraries();
+$this->setUsedLibraries();
 
-        // Only return the libraries that are used.
-        $aLibraries = array_filter($this->aLibraries, function($aLibrary) {
-            return $aLibrary['used'];
-        });
-        return array_map(function($sLibraryName) {
-            return $this->di->g("dialog_library_$sLibraryName");
-        }, array_keys($aLibraries));
-    }
+// Only return the libraries that are used.
+$aLibraries = array_filter($this->aLibraries, function($aLibrary) {
+return $aLibrary['used'];
+});
+return array_map(function($sLibraryName) {
+return $this->di->g("dialog_library_$sLibraryName");
+}, array_keys($aLibraries));
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function onChange(Config $xConfig, string $sName): void
-    {
-        if($sName === '')
-        {
-            // Reset the default libraries any time the config is changed.
-            $this->registerLibraries();
-            $this->setDefaultLibraries();
-            $this->setUsedLibraries();
-            return;
-        }
-        $sPrefix = substr($sName, 0, 15);
-        switch($sPrefix)
-        {
-        case 'dialogs.default':
-            $this->setDefaultLibraries();
-            return;
-        case 'dialogs.lib.ext':
-            $this->registerLibraries();
-            return;
-        case 'dialogs.lib.use':
-            $this->setUsedLibraries();
-            return;
-        default:
-        }
+public function onChange(Config $xConfig, string $sName): void
+{
+if($sName === '')
+{
+// Reset the default libraries any time the config is changed.
+$this->registerLibraries();
+$this->setDefaultLibraries();
+$this->setUsedLibraries();
+return;
+}
+$sPrefix = substr($sName, 0, 15);
+switch($sPrefix)
+{
+case 'dialogs.default':
+$this->setDefaultLibraries();
+return;
+case 'dialogs.lib.ext':
+$this->registerLibraries();
+return;
+case 'dialogs.lib.use':
+$this->setUsedLibraries();
+return;
+default:
+}
     }
 }

Spacing +14 added lines, -14 removed lines

@@ -105,11 +105,11 @@ 
      */
     public function registerLibrary(string $sClassName, string $sLibraryName): void
     {
-        if(isset($this->aLibraries[$sLibraryName]))
+        if (isset($this->aLibraries[$sLibraryName]))
         {
             return;
         }
-        if(!($aInterfaces = class_implements($sClassName)))
+        if (!($aInterfaces = class_implements($sClassName)))
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -119,7 +119,7 @@ 
         $bIsConfirm = in_array(ConfirmInterface::class, $aInterfaces);
         $bIsAlert = in_array(AlertInterface::class, $aInterfaces);
         $bIsModal = in_array(ModalInterface::class, $aInterfaces);
-        if(!$bIsConfirm && !$bIsAlert && !$bIsModal)
+        if (!$bIsConfirm && !$bIsAlert && !$bIsModal)
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -159,7 +159,7 @@ 
      */
     public function setConfirmLibrary(string $sLibraryName)
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['confirm'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['confirm'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'confirm', 'name' => $sLibraryName]);
@@ -189,7 +189,7 @@ 
      */
     public function setAlertLibrary(string $sLibraryName): void
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['alert'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['alert'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'alert', 'name' => $sLibraryName]);
@@ -219,7 +219,7 @@ 
      */
     public function setModalLibrary(string $sLibraryName): void
     {
-        if(!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal'])
+        if (!isset($this->aLibraries[$sLibraryName]) || !$this->aLibraries[$sLibraryName]['modal'])
         {
             $sMessage = $this->xTranslator->trans('errors.dialog.library',
                 ['type' => 'modal', 'name' => $sLibraryName]);
@@ -248,7 +248,7 @@ 
     protected function registerLibraries(): void
     {
         $aLibraries = $this->xConfigManager->getAppOption('dialogs.lib.ext', []);
-        foreach($aLibraries as $sLibraryName => $sClassName)
+        foreach ($aLibraries as $sLibraryName => $sClassName)
         {
             $this->registerLibrary($sClassName, $sLibraryName);
         }
@@ -263,19 +263,19 @@ 
     protected function setDefaultLibraries(): void
     {
         // Set the default modal library
-        if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.modal', '')))
+        if (($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.modal', '')))
         {
             $this->setModalLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
         }
         // Set the default alert library
-        if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.alert', '')))
+        if (($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.alert', '')))
         {
             $this->setAlertLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
         }
         // Set the default confirm library
-        if(($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.confirm', '')))
+        if (($sLibraryName = $this->xConfigManager->getAppOption('dialogs.default.confirm', '')))
         {
             $this->setConfirmLibrary($sLibraryName);
             $this->aLibraries[$sLibraryName]['used'] = true;
@@ -291,9 +291,9 @@ 
     {
         // Set the other libraries in use
         $aLibraries = $this->xConfigManager->getAppOption('dialogs.lib.use', []);
-        foreach($aLibraries as $sLibraryName)
+        foreach ($aLibraries as $sLibraryName)
         {
-            if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
+            if (isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
             {
                 $this->aLibraries[$sLibraryName]['used'] = true;
             }
@@ -327,7 +327,7 @@ 
      */
     public function onChange(Config $xConfig, string $sName): void
     {
-        if($sName === '')
+        if ($sName === '')
         {
             // Reset the default libraries any time the config is changed.
             $this->registerLibraries();
@@ -336,7 +336,7 @@ 
             return;
         }
         $sPrefix = substr($sName, 0, 15);
-        switch($sPrefix)
+        switch ($sPrefix)
         {
         case 'dialogs.default':
             $this->setDefaultLibraries();

Braces +3 added lines, -1 removed lines

@@ -293,10 +293,12 @@
         $aLibraries = $this->xConfigManager->getAppOption('dialogs.lib.use', []);
         foreach($aLibraries as $sLibraryName)
         {
-            if(isset($this->aLibraries[$sLibraryName])) // Make sure the library exists
+            if(isset($this->aLibraries[$sLibraryName])) {
+                // Make sure the library exists
             {
                 $this->aLibraries[$sLibraryName]['used'] = true;
             }
+            }
         }
     }
 

jaxon-flot/src/Data/Ticks.php

Spacing +5 added lines, -5 removed lines

@@ -54,7 +54,7 @@ 
     public function point($iXaxis, $sLabel): static
     {
         $this->aPoints[] = $iXaxis;
-        if(!$this->aLabels['data'])
+        if (!$this->aLabels['data'])
         {
             $this->aLabels['data'] = [];
         }
@@ -71,9 +71,9 @@ 
      */
     public function points($aPoints): int
     {
-        foreach($aPoints as $aPoint)
+        foreach ($aPoints as $aPoint)
         {
-            if(count($aPoint) == 2)
+            if (count($aPoint) == 2)
             {
                 $this->point($aPoint[0], $aPoint[1]);
             }
@@ -96,11 +96,11 @@ 
      */
     public function expr($iStart, $iEnd, $iStep, $sJsLabel): int
     {
-        for($x = $iStart; $x < $iEnd; $x += $iStep)
+        for ($x = $iStart; $x < $iEnd; $x += $iStep)
         {
             $this->aPoints[] = $x;
         }
-        if(($sJsLabel))
+        if (($sJsLabel))
         {
             $this->aLabels['func'] = $sJsLabel;
         }

jaxon-flot/src/Data/Series.php

Spacing +8 added lines, -8 removed lines

@@ -61,14 +61,14 @@ 
     public function point($iXaxis, $xValue, $sLabel = ''): static
     {
         $this->aPoints[] = $iXaxis;
-        if(!$this->aValues['data'])
+        if (!$this->aValues['data'])
         {
             $this->aValues['data'] = [];
         }
         $this->aValues['data'][$iXaxis] = $xValue;
-        if(($sLabel))
+        if (($sLabel))
         {
-            if(!$this->aLabels['data'])
+            if (!$this->aLabels['data'])
             {
                 $this->aLabels['data'] = [];
             }
@@ -86,13 +86,13 @@ 
      */
     public function points($aPoints): int
     {
-        foreach($aPoints as $aPoint)
+        foreach ($aPoints as $aPoint)
         {
-            if(count($aPoint) === 2)
+            if (count($aPoint) === 2)
             {
                 $this->point($aPoint[0], $aPoint[1]);
             }
-            else if(count($aPoint) === 3)
+            else if (count($aPoint) === 3)
             {
                 $this->point($aPoint[0], $aPoint[1], $aPoint[2]);
             }
@@ -118,12 +118,12 @@ 
      */
     public function expr($iStart, $iEnd, $iStep, $sJsValue, $sJsLabel = ''): int
     {
-        for($x = $iStart; $x < $iEnd; $x += $iStep)
+        for ($x = $iStart; $x < $iEnd; $x += $iStep)
         {
             $this->aPoints[] = $x;
         }
         $this->aValues['func'] = $sJsValue;
-        if(($sJsLabel))
+        if (($sJsLabel))
         {
             $this->aLabels['func'] = $sJsLabel;
         }

Braces +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
             if(count($aPoint) === 2)
             {
                 $this->point($aPoint[0], $aPoint[1]);
-            }
-            else if(count($aPoint) === 3)
+            } else if(count($aPoint) === 3)
             {
                 $this->point($aPoint[0], $aPoint[1], $aPoint[2]);
             }

jaxon-flot/src/FlotPlugin.php

Spacing +2 added lines, -3 removed lines

@@ -75,8 +75,7 @@ 
      */
     public function getScript(): string
     {
-        return $this->xConfigManager->getOption('js.app.export', false) ? '' :
-            $this->xTemplateEngine->render('jaxon::flot::flot.js');
+        return $this->xConfigManager->getOption('js.app.export', false) ? '' : $this->xTemplateEngine->render('jaxon::flot::flot.js');
     }
 
     /**
@@ -84,7 +83,7 @@ 
      */
     public function getJsCode(): ?JsCode
     {
-        if(!$this->xConfigManager->getOption('js.app.export', false))
+        if (!$this->xConfigManager->getOption('js.app.export', false))
         {
             return null;
         }