jaxon-php / jaxon-mono

jaxon-dialogs/src/Dialog/Library/Bootbox.php

Switch Indentation +14 added lines, -14 removed lines

@@ -21,31 +21,31 @@
 
 class Bootbox extends AbstractLibrary implements ModalInterface, AlertInterface, ConfirmInterface
 {
-    /**
+/**
      * @const The library name
      */
-    public const NAME = 'bootbox';
+public const NAME = 'bootbox';
 
-    /**
+/**
      * The js files
      *
      * @var array
      */
-    protected $aJsFiles = ['bootbox.min.js'];
+protected $aJsFiles = ['bootbox.min.js'];
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getUri(): string
-    {
-        return 'https://cdn.jsdelivr.net/npm/bootbox@6.0.0/dist';
-    }
+public function getUri(): string
+{
+return 'https://cdn.jsdelivr.net/npm/bootbox@6.0.0/dist';
+}
 }

jaxon-dialogs/src/Dialog/Library/Bootstrap5.php

Switch Indentation +7 added lines, -7 removed lines

@@ -19,16 +19,16 @@
 
 class Bootstrap5 extends AbstractLibrary implements ModalInterface 
 {
-    /**
+/**
      * @const The library name
      */
-    public const NAME = 'bootstrap5';
+public const NAME = 'bootstrap5';
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 }

jaxon-dialogs/src/Dialog/Library/JQueryConfirm.php

Switch Indentation +17 added lines, -17 removed lines

@@ -20,40 +20,40 @@
 use Jaxon\App\Dialog\Library\ModalInterface;
 
 class JQueryConfirm extends AbstractLibrary
-    implements ModalInterface, AlertInterface, ConfirmInterface
+implements ModalInterface, AlertInterface, ConfirmInterface
 {
-    /**
+/**
      * @const The library name
      */
-    public const NAME = 'jconfirm';
+public const NAME = 'jconfirm';
 
-    /**
+/**
      * The css files
      *
      * @var array
      */
-    protected $aCssFiles = ['jquery-confirm.min.css'];
+protected $aCssFiles = ['jquery-confirm.min.css'];
 
-    /**
+/**
      * The js files
      *
      * @var array
      */
-    protected $aJsFiles = ['jquery-confirm.min.js'];
+protected $aJsFiles = ['jquery-confirm.min.js'];
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getUri(): string
-    {
-        return 'https://cdn.jsdelivr.net/npm/jquery-confirm@3.3.4/dist';
-    }
+public function getUri(): string
+{
+return 'https://cdn.jsdelivr.net/npm/jquery-confirm@3.3.4/dist';
+}
 }

jaxon-dialogs/src/Dialog/Library/Bootstrap3.php

Switch Indentation +17 added lines, -17 removed lines

@@ -20,40 +20,40 @@
 use Jaxon\App\Dialog\Library\ModalInterface;
 
 class Bootstrap3 extends AbstractLibrary
-    implements ModalInterface, AlertInterface, ConfirmInterface
+implements ModalInterface, AlertInterface, ConfirmInterface
 {
-    /**
+/**
      * @const The library name
      */
-    public const NAME = 'bootstrap3';
+public const NAME = 'bootstrap3';
 
-    /**
+/**
      * The css files
      *
      * @var array
      */
-    protected $aCssFiles = ['css/bootstrap-dialog.min.css'];
+protected $aCssFiles = ['css/bootstrap-dialog.min.css'];
 
-    /**
+/**
      * The js files
      *
      * @var array
      */
-    protected $aJsFiles = ['js/bootstrap-dialog.min.js'];
+protected $aJsFiles = ['js/bootstrap-dialog.min.js'];
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getUri(): string
-    {
-        return 'https://cdn.jsdelivr.net/npm/bootstrap3-dialog@1.35.4/dist';
-    }
+public function getUri(): string
+{
+return 'https://cdn.jsdelivr.net/npm/bootstrap3-dialog@1.35.4/dist';
+}
 }

jaxon-dialogs/src/Dialog/LibraryHelper.php

Switch Indentation +96 added lines, -96 removed lines

@@ -16,56 +16,56 @@ 
 
 class LibraryHelper
 {
-    use ConfigTrait;
+use ConfigTrait;
 
-    /**
+/**
      * Default library URL
      *
      * @var string
      */
-    const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-dialogs@main/js';
+const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-dialogs@main/js';
 
-    /**
+/**
      * The name of the library
      *
      * @var string
      */
-    protected $sName = '';
+protected $sName = '';
 
-    /**
+/**
      * The URI where to get the library files from
      *
      * @var string
      */
-    protected $sUri = '';
+protected $sUri = '';
 
-    /**
+/**
      * The constructor
      *
      * @param LibraryInterface $xDialogLibrary
      * @param ConfigManager $xConfigManager
      * @param TemplateEngine $xTemplateEngine
      */
-    public function __construct(LibraryInterface $xDialogLibrary,
-        private ConfigManager $xConfigManager, private TemplateEngine $xTemplateEngine)
-    {
-        // Set the library name
-        $this->sName = $xDialogLibrary->getName();
-        // Set the default URI.
-        $sDefaultUri = $this->getAppOption('dialogs.lib.uri', $xDialogLibrary->getUri());
-        // Set the library URI.
-        $this->sUri = rtrim($this->getOption('uri', $sDefaultUri), '/');
-    }
-
-    /**
+public function __construct(LibraryInterface $xDialogLibrary,
+private ConfigManager $xConfigManager, private TemplateEngine $xTemplateEngine)
+{
+// Set the library name
+$this->sName = $xDialogLibrary->getName();
+// Set the default URI.
+$sDefaultUri = $this->getAppOption('dialogs.lib.uri', $xDialogLibrary->getUri());
+// Set the library URI.
+$this->sUri = rtrim($this->getOption('uri', $sDefaultUri), '/');
+}
+
+/**
      * @return ConfigManager
      */
-    protected function config(): ConfigManager
-    {
-        return $this->xConfigManager;
-    }
+protected function config(): ConfigManager
+{
+return $this->xConfigManager;
+}
 
-    /**
+/**
      * Get the value of a config option
      *
      * @param string $sOptionName The option name
@@ -73,134 +73,134 @@ 
      *
      * @return mixed
      */
-    public function getOption(string $sOptionName, $xDefault = null)
-    {
-        $sOptionName = "dialogs.{$this->sName}.$sOptionName";
-        return $this->getAppOption($sOptionName, $xDefault);
-    }
+public function getOption(string $sOptionName, $xDefault = null)
+{
+$sOptionName = "dialogs.{$this->sName}.$sOptionName";
+return $this->getAppOption($sOptionName, $xDefault);
+}
 
-    /**
+/**
      * Check the presence of a config option
      *
      * @param string $sOptionName The option name
      *
      * @return bool
      */
-    public function hasOption(string $sOptionName): bool
-    {
-        return $this->hasAppOption("dialogs.{$this->sName}.$sOptionName");
-    }
+public function hasOption(string $sOptionName): bool
+{
+return $this->hasAppOption("dialogs.{$this->sName}.$sOptionName");
+}
 
-    /**
+/**
      * Get the options of the js library
      *
      * @return array
      */
-    public function getJsOptions(): array
-    {
-        $xOptions = $this->getAppOption("dialogs.{$this->sName}.options", []);
-        return is_array($xOptions) ? $xOptions : [];
-    }
+public function getJsOptions(): array
+{
+$xOptions = $this->getAppOption("dialogs.{$this->sName}.options", []);
+return is_array($xOptions) ? $xOptions : [];
+}
 
-    /**
+/**
      * @param string $sOption The assets option name
      * @param string $sFile The javascript file name
      *
      * @return string|null
      */
-    private function getAssetUri(string $sOption, string $sFile): ?string
-    {
-        return !$this->hasOption($sOption) ? "{$this->sUri}/$sFile" :
-            (trim($this->getOption($sOption)) ?: null);
-    }
+private function getAssetUri(string $sOption, string $sFile): ?string
+{
+return !$this->hasOption($sOption) ? "{$this->sUri}/$sFile" :
+(trim($this->getOption($sOption)) ?: null);
+}
 
-    /**
+/**
      * @param string $sOption The assets option name
      * @param array $aFiles The asset files
      *
      * @return array
      */
-    private function getUris(string $sOption, array $aFiles): array
-    {
-        $aFiles = array_map(fn($sFile) =>
-            $this->getAssetUri($sOption, $sFile), $aFiles);
-        return array_filter($aFiles, fn($sFile) => $sFile !== null);
-    }
+private function getUris(string $sOption, array $aFiles): array
+{
+$aFiles = array_map(fn($sFile) =>
+$this->getAssetUri($sOption, $sFile), $aFiles);
+return array_filter($aFiles, fn($sFile) => $sFile !== null);
+}
 
-    /**
+/**
      * @param string $sUri
      *
      * @return string
      */
-    private function getJsTag(string $sUri): string
-    {
-        return '<script type="text/javascript" src="' . $sUri . '"></script>';
-    }
+private function getJsTag(string $sUri): string
+{
+return '<script type="text/javascript" src="' . $sUri . '"></script>';
+}
 
-    /**
+/**
      * Get the javascript HTML header code
      *
      * @param array $aFiles The js files
      *
      * @return string
      */
-    public function getJs(array $aFiles): string
-    {
-        $aFiles = $this->getUris('assets.js', $aFiles);
-        $aFiles = array_map(fn($sUri) => $this->getJsTag($sUri), $aFiles);
-        return implode("\n", $aFiles);
-    }
+public function getJs(array $aFiles): string
+{
+$aFiles = $this->getUris('assets.js', $aFiles);
+$aFiles = array_map(fn($sUri) => $this->getJsTag($sUri), $aFiles);
+return implode("\n", $aFiles);
+}
 
-    /**
+/**
      * @param string $sUri
      *
      * @return string
      */
-    private function getCssTag(string $sUri): string
-    {
-        return '<link rel="stylesheet" href="' . $sUri . '" />';
-    }
+private function getCssTag(string $sUri): string
+{
+return '<link rel="stylesheet" href="' . $sUri . '" />';
+}
 
-    /**
+/**
      * Get the CSS HTML header code
      *
      * @param array $aFiles The CSS files
      *
      * @return string
      */
-    public function getCss(array $aFiles): string
-    {
-        $aFiles = $this->getUris('assets.css', $aFiles);
-        $aFiles = array_map(fn($sUri) => $this->getCssTag($sUri), $aFiles);
-        return implode("\n", $aFiles);
-    }
+public function getCss(array $aFiles): string
+{
+$aFiles = $this->getUris('assets.css', $aFiles);
+$aFiles = array_map(fn($sUri) => $this->getCssTag($sUri), $aFiles);
+return implode("\n", $aFiles);
+}
 
-    /**
+/**
      * Get the library script code
      *
      * @return string
      */
 
-    public function getScript(): string
-    {
-        return !$this->getLibOption('js.app.export', false) ?
-            $this->xTemplateEngine->render("jaxon::dialogs::{$this->sName}.js") : '';
-    }
+public function getScript(): string
+{
+return !$this->getLibOption('js.app.export', false) ?
+$this->xTemplateEngine->render("jaxon::dialogs::{$this->sName}.js") : '';
+}
 
-    /**
+/**
      * Get the javascript HTML header code
      *
      * @return array
      */
-    public function getFiles(): array
-    {
-        if(!$this->getLibOption('js.app.export', false))
-        {
-            return [];
-        }
-
-        $sJsFileName = !$this->getLibOption('js.app.minify', false) ?
-            "{$this->sName}.js" : "{$this->sName}.min.js";
-        return [self::JS_LIB_URL . "/$sJsFileName"];
-    }
+public function getFiles(): array
+{
+if(!$this->getLibOption('js.app.export', false))
+{
+return [];
+}
+
+$sJsFileName = !$this->getLibOption('js.app.minify', false) ?
+"{$this->sName}.js" : "{$this->sName}.min.js";
+return [self::JS_LIB_URL . "/$sJsFileName"];
+}
 }

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:
+}
     }
 }

jaxon-annotations/src/Annotation/ContainerAnnotation.php

Switch Indentation +48 added lines, -48 removed lines

@@ -175,62 +175,62 @@
             0 => true,
             1 => isset($this->properties['attr']) || isset($this->properties['class']),
             2 => isset($this->properties['attr']) && isset($this->properties['class']),
-            default => false,
-        };
-    }
+default => false,
+};
+}
 
-    /**
+/**
      * @return void
      * @throws AnnotationException
      */
-    private function parseProperties()
-    {
-        if(!$this->checkPropertiesNames())
-        {
-            throw new AnnotationException('The @di annotation accepts only "attr" or "class" as properties');
-        }
+private function parseProperties()
+{
+if(!$this->checkPropertiesNames())
+{
+throw new AnnotationException('The @di annotation accepts only "attr" or "class" as properties');
+}
 
-        if(isset($this->properties['attr']))
-        {
-            if(self::$xReader->annotationIsOnProperty())
-            {
-                throw new AnnotationException('The @di annotation does not allow the "attr" property on class attributes');
-            }
-            if(!is_string($this->properties['attr']))
-            {
-                throw new AnnotationException('The @di annotation requires a property "attr" of type string');
-            }
-            $this->sAttr = $this->properties['attr'];
-        }
-        if(isset($this->properties['class']))
-        {
-            if(!is_string($this->properties['class']))
-            {
-                throw new AnnotationException('The @di annotation requires a property "class" of type string');
-            }
-            $this->sClass = $this->getFullClassName($this->properties['class']);
-        }
-    }
+if(isset($this->properties['attr']))
+{
+if(self::$xReader->annotationIsOnProperty())
+{
+    throw new AnnotationException('The @di annotation does not allow the "attr" property on class attributes');
+}
+if(!is_string($this->properties['attr']))
+{
+    throw new AnnotationException('The @di annotation requires a property "attr" of type string');
+}
+$this->sAttr = $this->properties['attr'];
+}
+if(isset($this->properties['class']))
+{
+if(!is_string($this->properties['class']))
+{
+    throw new AnnotationException('The @di annotation requires a property "class" of type string');
+}
+$this->sClass = $this->getFullClassName($this->properties['class']);
+}
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        isset($this->properties['__value__']) ? $this->parseValue() : $this->parseProperties();
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+isset($this->properties['__value__']) ? $this->parseValue() : $this->parseProperties();
 
-        // The type in the @di annotations can be set from the values in the @var annotations
-        $aPropTypes = self::$xReader->getPropTypes();
-        if($this->sClass === '')
-        {
-            if(!isset($aPropTypes[$this->sAttr]))
-            {
-                throw new AnnotationException('No class defined for @di on attribute "' .
-                    $this->sAttr . '".');
-            }
-            $this->sClass = ltrim($aPropTypes[$this->sAttr], '\\');
-        }
+// The type in the @di annotations can be set from the values in the @var annotations
+$aPropTypes = self::$xReader->getPropTypes();
+if($this->sClass === '')
+{
+if(!isset($aPropTypes[$this->sAttr]))
+{
+    throw new AnnotationException('No class defined for @di on attribute "' .
+        $this->sAttr . '".');
+}
+$this->sClass = ltrim($aPropTypes[$this->sAttr], '\\');
+}
 
-        $xMetadata->container($sMethod)->addValue($this->sAttr, $this->sClass);
-    }
+$xMetadata->container($sMethod)->addValue($this->sAttr, $this->sClass);
+}
 }

jaxon-annotations/src/Annotation/AfterAnnotation.php

Switch Indentation +10 added lines, -10 removed lines

@@ -23,19 +23,19 @@
  */
 class AfterAnnotation extends HookAnnotation
 {
-    /**
+/**
      * @inheritDoc
      */
-    protected static function getType(): string
-    {
-        return 'after';
-    }
+protected static function getType(): string
+{
+return 'after';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->after($sMethod)->addCall($this->sMethod, $this->aParams);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->after($sMethod)->addCall($this->sMethod, $this->aParams);
+}
 }

jaxon-annotations/src/Annotation/CallbackAnnotation.php

Switch Indentation +22 added lines, -22 removed lines

@@ -28,40 +28,40 @@
  */
 class CallbackAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * The javascript object name
      *
      * @var string
      */
-    protected $sJsObject;
+protected $sJsObject;
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
-        {
-            throw new AnnotationException('the @callback annotation requires a single string as property');
-        }
-        $this->sJsObject = $properties['name'];
-    }
+public function initAnnotation(array $properties)
+{
+if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+{
+throw new AnnotationException('the @callback annotation requires a single string as property');
+}
+$this->sJsObject = $properties['name'];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->callback($sMethod)->addValue($this->sJsObject);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->callback($sMethod)->addValue($this->sJsObject);
+}
 }