First try to switch on TWB5

.gitignore

@@ -56,8 +56,8 @@ db/multiflexi
 /.build/
 /docs/build/
 /src/zabbix.php
-src/css/dataTables.bootstrap4.css
-src/js/dataTables.bootstrap4.js
+src/css/dataTables.bootstrap5.css
+src/js/dataTables.bootstrap5.js
 src/js/jquery.dataTables.js
 /debian/multiflexi-abraflexi.debhelper.log
 /debian/multiflexi-abraflexi.substvars

INSTALL.md

@@ -26,9 +26,9 @@ php-vitexsoftware-ease-html
 php-vitexsoftware-ease-bricks
 php-spojenet-abraflexi
 php-vitexsoftware-abraflexi-bricks
-php-vitexsoftware-ease-bootstrap4
-php-vitexsoftware-ease-bootstrap4-widgets
-php-vitexsoftware-ease-bootstrap4-widgets-abraflexi
+php-vitexsoftware-ease-bootstrap5
+php-vitexsoftware-ease-bootstrap5-widgets
+php-vitexsoftware-ease-bootstrap5-widgets-abraflexi
 php-vitexsoftware-ease-fluentpdo
 multiflexi-mysql
 multiflexi
@@ -146,9 +146,9 @@ Updating dependencies
 Lock file operations: 10 installs, 0 updates, 0 removals
   - Locking deb/abraflexi (2.10)
   - Locking deb/abraflexi-bricks (0.34)
-  - Locking deb/ease-bootstrap4 (1.7)
-  - Locking deb/ease-bootstrap4-widgets (1.3)
-  - Locking deb/ease-bootstrap4-widgets-abraflexi (0.5)
+  - Locking deb/ease-bootstrap5 (1.7)
+  - Locking deb/ease-bootstrap5-widgets (1.3)
+  - Locking deb/ease-bootstrap5-widgets-abraflexi (0.5)
   - Locking deb/ease-bricks (0.9.9)
   - Locking deb/ease-core (1.35)
   - Locking deb/ease-fluentpdo (1.0)
@@ -160,11 +160,11 @@ Package operations: 10 installs, 0 updates, 0 removals
   - Installing deb/ease-core (1.35): Symlinking from /usr/share/php/EaseCore
   - Installing deb/abraflexi (2.10): Symlinking from /usr/share/php/AbraFlexi
   - Installing deb/ease-html (1.36): Symlinking from /usr/share/php/EaseHtml
-  - Installing deb/ease-bootstrap4 (1.7): Symlinking from /usr/share/php/EaseTWB4
-  - Installing deb/ease-bootstrap4-widgets (1.3): Symlinking from /usr/share/php/EaseTWB4Widgets
+  - Installing deb/ease-bootstrap5 (1.7): Symlinking from /usr/share/php/EaseTWB5
+  - Installing deb/ease-bootstrap5-widgets (1.3): Symlinking from /usr/share/php/EaseTWB5Widgets
   - Installing deb/ease-bricks (0.9.9): Symlinking from /usr/share/php/EaseBricks
   - Installing deb/abraflexi-bricks (0.34): Symlinking from /usr/share/php/AbraFlexiBricks
-  - Installing deb/ease-bootstrap4-widgets-abraflexi (0.5): Symlinking from /usr/share/php/EaseTWB4WidgetsAbraFlexi
+  - Installing deb/ease-bootstrap5-widgets-abraflexi (0.5): Symlinking from /usr/share/php/EaseTWB5WidgetsAbraFlexi
   - Installing fpdo/fluentpdo (v2.2.0): Extracting archive
   - Installing deb/ease-fluentpdo (1.0): Symlinking from /usr/share/php/EaseFluentPDO
 Generating autoload files

composer.json

@@ -17,9 +17,9 @@
     "require": {
         "ext-yaml": "*",
         "ext-simplexml": "*",
-        "vitexsoftware/ease-twbootstrap4": "^1.9",
+        "vitexsoftware/ease-twbootstrap5": "^1",
         "vitexsoftware/ease-fluentpdo": "dev-main",
-        "vitexsoftware/ease-twbootstrap4-widgets": "^1.7",
+        "vitexsoftware/ease-bootstrap5-widgets": "^1.4",
         "robmorgan/phinx": "^0.14",
         "datatables/datatables": "^1.10",
         "symfony/process": "^5.4",
@@ -79,10 +79,10 @@
     },
     "scripts": {
         "post-install-cmd": [
-            "php -r \"copy('vendor/datatables/datatables/media/js/dataTables.bootstrap4.js', 'src/js/dataTables.bootstrap4.js');copy('vendor/datatables/datatables/media/js/jquery.dataTables.js', 'src/js/jquery.dataTables.js');copy('vendor/datatables/datatables/media/css/dataTables.bootstrap4.css','src/css/dataTables.bootstrap4.css');\""
+            "php -r \"copy('vendor/datatables/datatables/media/js/dataTables.bootstrap5.js', 'src/js/dataTables.bootstrap5.js');copy('vendor/datatables/datatables/media/js/jquery.dataTables.js', 'src/js/jquery.dataTables.js');copy('vendor/datatables/datatables/media/css/dataTables.bootstrap5.css','src/css/dataTables.bootstrap5.css');\""
         ],
         "post-update-cmd": [
-            "php -r \"copy('vendor/datatables/datatables/media/js/dataTables.bootstrap4.js', 'src/js/dataTables.bootstrap4.js');copy('vendor/datatables/datatables/media/js/jquery.dataTables.js', 'src/js/jquery.dataTables.js');copy('vendor/datatables/datatables/media/css/dataTables.bootstrap4.css','src/css/dataTables.bootstrap4.css');\""
+            "php -r \"copy('vendor/datatables/datatables/media/js/dataTables.bootstrap5.js', 'src/js/dataTables.bootstrap5.js');copy('vendor/datatables/datatables/media/js/jquery.dataTables.js', 'src/js/jquery.dataTables.js');copy('vendor/datatables/datatables/media/css/dataTables.bootstrap5.css','src/css/dataTables.bootstrap5.css');\""
         ]
     },
     "config": {

debian/conf/composer.json

@@ -3,7 +3,7 @@
   "description": "Tool used to setup AbraFlexi multiinstance",
   "type": "project",
   "require": {
-    "deb/ease-bootstrap4-widgets": "*",
+    "deb/ease-bootstrap5-widgets": "*",
     "deb/ease-fluentpdo": "*",
     "deb/ease-html-widgets": "*",
     "symfony/process": "*",
@@ -59,15 +59,15 @@
     },
     {
       "type": "path",
-      "url": "/usr/share/php/EaseTWB4/"
+      "url": "/usr/share/php/EaseTWB5/"
     },
     {
       "type": "path",
       "url": "/usr/share/php/EaseFluentPDO/"
     },
     {
       "type": "path",
-      "url": "/usr/share/php/EaseTWB4Widgets/"
+      "url": "/usr/share/php/EaseTWB5Widgets/"
     }
   ]
 }

debian/control

@@ -13,7 +13,7 @@ Depends: ${misc:Depends},
  php-vitexsoftware-ease-html-widgets (>=1.1.1),
  php-cli,
  locales-all,
- php-vitexsoftware-ease-bootstrap4-widgets (>=1.7),
+ php-vitexsoftware-ease-bootstrap5-widgets (>=1.7),
  php-vitexsoftware-ease-fluentpdo (>=1.3),
  multiflexi-sqlite|multiflexi-mysql|multiflexi-pgsql,
  libjs-jquery-datatables,
@@ -84,7 +84,7 @@ Description: Zabbix support for MultiFlexi
 
 Package: multiflexi-abraflexi
 Multi-Arch: foreign
-Depends: ${misc:Depends},multiflexi, php-vitexsoftware-abraflexi-bricks,php-vitexsoftware-ease-bootstrap4-widgets-abraflexi
+Depends: ${misc:Depends},multiflexi, php-vitexsoftware-abraflexi-bricks,php-vitexsoftware-ease-bootstrap5-widgets-abraflexi
 Architecture: all
 Description: MultiFlexi support for AbraFlexi
  AbraFlexi Connection dialog

debian/multiflexi-abraflexi.postinst

@@ -8,7 +8,7 @@ composer-debian multiflexi
 
 # TODO:
 #
-#    "deb/ease-bootstrap4-widgets-abraflexi": "*",
+#    "deb/ease-bootstrap5-widgets-abraflexi": "*",
 #
 #    {
 #      "type": "path",
@@ -20,5 +20,5 @@ composer-debian multiflexi
 #    },
 #    {
 #      "type": "path",
-#      "url": "/usr/share/php/EaseTWB4WidgetsAbraFlexi/"
+#      "url": "/usr/share/php/EaseTWB5WidgetsAbraFlexi/"
 #    }

debian/rules

@@ -22,8 +22,8 @@ override_dh_install:
 	sed -i -e 's/\.\.\/\.env/\/etc\/multiflexi\/\.env/g' debian/multiflexi/usr/lib/multiflexi/phinx-adapter.php
 	sed -i -e 's/composer\.json/\/usr\/lib\/multiflexi\/composer\.json/g' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/PageBottom.php
 	sed -i -e 's/js\/jquery.dataTables.js/\/javascript\/jquery-datatables\/jquery.dataTables.js/g' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/DBDataTable.php
-	sed -i -e 's/js\/dataTables.bootstrap4.js/\/javascript\/jquery-datatables\/dataTables.bootstrap4.js/g' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/DBDataTable.php
-	sed -i -e 's/css\/dataTables.bootstrap4.css/\/javascript\/jquery-datatables\/css\/dataTables.bootstrap4.css/g' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/DBDataTable.php
+	sed -i -e 's/js\/dataTables.bootstrap5.js/\/javascript\/jquery-datatables\/dataTables.bootstrap5.js/g' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/DBDataTable.php
+	sed -i -e 's/css\/dataTables.bootstrap5.css/\/javascript\/jquery-datatables\/css\/dataTables.bootstrap5.css/g' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/DBDataTable.php
 	sed -i 's/css\/selectize/\/javascript\/selectize.js\/css\/selectize/' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/DBDataTable.php
 	sed -i -e 's/\.\.\/i18n/\/usr\/share\/locale/g'            	     debian/multiflexi/usr/share/multiflexi/init.php
 	mkdir -p                                                             debian/multiflexi-sqlite/usr/lib/multiflexi

docs/source/install.rst

@@ -58,7 +58,7 @@ To install MultiFlexi using Debian packages, you can follow these steps:
            php-composer-pcre php-composer-semver php-composer-spdx-licenses php-composer-xdebug-handler php-intl php-json-schema php-mail php-mail-mime
            php-mbstring php-mysql php-net-smtp php-net-socket php-pear php-psr-container php-psr-log php-react-promise php-symfony-console
            php-symfony-deprecation-contracts php-symfony-filesystem php-symfony-finder php-symfony-polyfill-php80 php-symfony-process
-           php-symfony-service-contracts php-symfony-string php-vitexsoftware-ease-bootstrap4 php-vitexsoftware-ease-bootstrap4-widgets
+           php-symfony-service-contracts php-symfony-string php-vitexsoftware-ease-bootstrap5 php-vitexsoftware-ease-bootstrap5-widgets
            php-vitexsoftware-ease-core php-vitexsoftware-ease-fluentpdo php-vitexsoftware-ease-html php-vitexsoftware-ease-html-widgets php-xml php-yaml
            php8.1-cli php8.1-common php8.1-intl php8.1-mbstring php8.1-mysql php8.1-opcache php8.1-readline php8.1-xml php8.1-yaml unzip
         Suggested packages:
@@ -71,7 +71,7 @@ To install MultiFlexi using Debian packages, you can follow these steps:
            php-composer-metadata-minifier php-composer-pcre php-composer-semver php-composer-spdx-licenses php-composer-xdebug-handler php-intl
            php-json-schema php-mail php-mail-mime php-mbstring php-mysql php-net-smtp php-net-socket php-pear php-psr-container php-psr-log
            php-react-promise php-symfony-console php-symfony-deprecation-contracts php-symfony-filesystem php-symfony-finder php-symfony-polyfill-php80
-           php-symfony-process php-symfony-service-contracts php-symfony-string php-vitexsoftware-ease-bootstrap4 php-vitexsoftware-ease-bootstrap4-widgets
+           php-symfony-process php-symfony-service-contracts php-symfony-string php-vitexsoftware-ease-bootstrap5 php-vitexsoftware-ease-bootstrap5-widgets
            php-vitexsoftware-ease-core php-vitexsoftware-ease-fluentpdo php-vitexsoftware-ease-html php-vitexsoftware-ease-html-widgets php-xml php-yaml
            php8.1-cli php8.1-common php8.1-intl php8.1-mbstring php8.1-mysql php8.1-opcache php8.1-readline php8.1-xml php8.1-yaml unzip
         0 upgraded, 72 newly installed, 0 to remove and 0 not upgraded.

src/MultiFlexi/Action/CustomCommand.php

@@ -51,7 +51,7 @@ public static function logo(): string
 
     public static function inputs(string $prefix)
     {
-        return new \Ease\TWB4\FormGroup(_('Command'), new \Ease\Html\InputTextTag($prefix.'[CustomCommand][command]'), '', _('Bash shell is used'));
+        return new \Ease\TWB5\FormGroup(_('Command'), new \Ease\Html\InputTextTag($prefix.'[CustomCommand][command]'), '', _('Bash shell is used'));
     }
 
     /**

src/MultiFlexi/Action/Github.php

@@ -49,7 +49,7 @@ public static function logo()
 
     public static function configForm()
     {
-        return new \Ease\TWB4\FormGroup(_('GitHub token'), new \Ease\Html\InputTextTag('Github[token]'), 'ghp_iupB8adLxIIBezDWB1BH9HJCAtpcOL2scdmX', new \Ease\Html\ATag('https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens', _('How to obtain Github Token')));
+        return new \Ease\TWB5\FormGroup(_('GitHub token'), new \Ease\Html\InputTextTag('Github[token]'), 'ghp_iupB8adLxIIBezDWB1BH9HJCAtpcOL2scdmX', new \Ease\Html\ATag('https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens', _('How to obtain Github Token')));
     }
 
     /**
@@ -59,7 +59,7 @@ public static function configForm()
      */
     public static function inputs(string $action)
     {
-        return new \Ease\TWB4\Badge('info', _('No Fields required').' ('.$action.')');
+        return new \Ease\TWB5\Badge('info', _('No Fields required').' ('.$action.')');
     }
 
     /**