FriendsOfCake · ADmad · Dec 13, 2024 · Nov 16, 2024 · Nov 18, 2024 · Nov 18, 2024
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ composer.lock
 node_modules
 .phpunit.result.cache
 .phpunit.cache
+/tools
 
 # Generated test files
 tests/test_app/webroot/bootstrap_u_i

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.0.1" installed="2.0.1" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="2.0.2" installed="2.0.2" location="./tools/phpstan" copy="false"/>
   <phar name="psalm" version="5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/README.md b/README.md
@@ -22,10 +22,9 @@ For version info see [version map](https://github.com/FriendsOfCake/bootstrap-ui
 ## Requirements
 
 * CakePHP 5.x
-* Bootstrap 5.x
+* Bootstrap 5.3.x
 * npm 6.x
-* Popper.js 2.x
-* Bootstrap Icons 1.5.x
+* Bootstrap Icons 1.11.x
 
 ## What's included?
 
@@ -72,7 +71,7 @@ You can either use the Bootstrap commands to make the necessary changes, or do t
 
 ### Using the Bootstrap commands
 
-1. To install the Bootstrap assets (Bootstrap's CSS/JS files, Popper.js) via npm you can use the `install`
+1. To install the Bootstrap assets (Bootstrap's CSS/JS files) via npm you can use the `install`
    command, or [install them manually](#installing-bootstrap-assets-via-npm):
 
    ```
@@ -119,16 +118,14 @@ do manually if you wish to control which assets are being included, and where th
 Assuming you are in your application's root:
 
 ```
-npm install @popperjs/core@2 bootstrap@5 bootstrap-icons@1
+npm install bootstrap@5 bootstrap-icons@1
 mkdir -p webroot/css
 mkdir -p webroot/font/fonts
 mkdir -p webroot/js
-cp node_modules/@popperjs/core/dist/umd/popper.js webroot/js
-cp node_modules/@popperjs/core/dist/umd/popper.min.js webroot/js
 cp node_modules/bootstrap/dist/css/bootstrap.css webroot/css/
 cp node_modules/bootstrap/dist/css/bootstrap.min.css webroot/css/
-cp node_modules/bootstrap/dist/js/bootstrap.js webroot/js/
-cp node_modules/bootstrap/dist/js/bootstrap.min.js webroot/js/
+cp node_modules/bootstrap/dist/js/bootstrap.bundle.js webroot/js/
+cp node_modules/bootstrap/dist/js/bootstrap.bundle.min.js webroot/js/
 cp node_modules/bootstrap-icons/font/bootstrap-icons.css webroot/font/
 cp node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff webroot/font/fonts/
 cp node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff2 webroot/font/fonts/
@@ -245,7 +242,7 @@ them using the standard plugin syntax:
 // in the <head>
 echo $this->Html->css('BootstrapUI.bootstrap.min');
 echo $this->Html->css(['BootstrapUI./font/bootstrap-icons', 'BootstrapUI./font/bootstrap-icon-sizes']);
-echo $this->Html->script(['BootstrapUI.popper.min', 'BootstrapUI.bootstrap.min']);
+echo $this->Html->script(['BootstrapUI.bootstrap.bundle.min']);
 ```
 
 If you have installed the assets manually, you'll need to use paths accordingly. With
@@ -254,15 +251,15 @@ If you have installed the assets manually, you'll need to use paths accordingly.
 ```php
 echo $this->Html->css('bootstrap.min');
 echo $this->Html->css(['/font/bootstrap-icons', '/font/bootstrap-icon-sizes']);
-echo $this->Html->script(['popper.min', 'bootstrap.min']);
+echo $this->Html->script(['bootstrap.bundle.min']);
 ```
 
 If you're using paths that don't adhere to the CakePHP conventions, you'll have to explicitly specify them:
 
 ```php
 echo $this->Html->css('/path/to/bootstrap.css');
 echo $this->Html->css(['/path/to/bootstrap-icons.css', '/path/to/bootstrap-icon-sizes.css']);
-echo $this->Html->script(['/path/to/popper.js', '/path/to/bootstrap.js']);
+echo $this->Html->script(['/path/to/bootstrap.bundle.js']);
 ```
 
 ## Bake templates
@@ -343,7 +340,7 @@ Horizontal forms automatically render labels and controls in separate columns (w
 one, and controls in the second one.
 
 Alignment can be configured via the `align` option, which takes either a list of column sizes for the `md`
-[Bootstrap screen-size/breakpoint](https://getbootstrap.com/docs/5.0/layout/breakpoints/), or a matrix of
+[Bootstrap screen-size/breakpoint](https://getbootstrap.com/docs/5.3/layout/breakpoints/), or a matrix of
 screen-size/breakpoint names and column sizes.
 
 The following will use the default `md` screen-size/breakpoint:
@@ -477,8 +474,8 @@ will render this HTML:
 ### Spacing
 
 Out of the box BootstrapUI applies some default spacing for form controls. For default and horizontal aligned forms,
-the `mb-3` [spacing class](https://getbootstrap.com/docs/5.0/utilities/spacing/) is being applied to all controls,
-while inline forms are using the `g-3` [gutter class](https://getbootstrap.com/docs/5.0/layout/gutters/).
+the `mb-3` [spacing class](https://getbootstrap.com/docs/5.3/utilities/spacing/) is being applied to all controls,
+while inline forms are using the `g-3` [gutter class](https://getbootstrap.com/docs/5.3/layout/gutters/).
 
 This can be changed using the `spacing` option, it applies on a per-helper and per-form basis for all alignments, and
 for default/horizontal alignments it also applies on a per-control basis.
@@ -655,7 +652,7 @@ This would generate the following HTML:
 
 ### Switches
 
-[Switch style checkboxes](https://getbootstrap.com/docs/5.0/forms/checks-radios/#switches) can be created by setting the
+[Switch style checkboxes](https://getbootstrap.com/docs/5.3/forms/checks-radios/#switches) can be created by setting the
 `switch` option to `true`.
 
 ```php
@@ -677,7 +674,7 @@ This would generate the following HTML:
 
 ### Floating labels
 
-[Floating labels](https://getbootstrap.com/docs/5.0/forms/floating-labels) are supported for `text`, `textarea`, and
+[Floating labels](https://getbootstrap.com/docs/5.3/forms/floating-labels) are supported for `text`, `textarea`, and
 (non-`multiple`) `select` controls. They can be enabled via the label's `floating` option:
 
 ```php
@@ -746,7 +743,7 @@ This would generate the following HTML:
 
 ### Tooltips
 
-[Bootstrap tooltips](https://getbootstrap.com/docs/5.0/components/tooltips/) can be added to labels via the `tooltip`
+[Bootstrap tooltips](https://getbootstrap.com/docs/5.3/components/tooltips/) can be added to labels via the `tooltip`
 option. The tooltip toggles are by default being rendered as a [Bootstrap icon](https://icons.getbootstrap.com/), which
 is being included by default when installing the assets via the `install` command.
 
@@ -1001,7 +998,7 @@ echo $this->Html->badge('Text');
 
 #### Background colors
 
-[Background colors](https://getbootstrap.com/docs/5.0/components/badge/#background-colors) can be changed by specifying
+[Background colors](https://getbootstrap.com/docs/5.3/components/badge/#background-colors) can be changed by specifying
 one of the Bootstrap theme color names via the `class` option, the helper will make sure that the correct prefixes
 are being applied:
 
@@ -1155,7 +1152,7 @@ This would generate the following HTML:
 #### Configuring the ARIA labels
 
 When using the standard methods you can use the `label` option to pass a custom string to use for
-[the `aria-label` attribute](https://getbootstrap.com/docs/5.0/components/pagination/#working-with-icons):
+[the `aria-label` attribute](https://getbootstrap.com/docs/5.3/components/pagination/#working-with-icons):
 
 ```php
 echo $this->Paginator->first('«', ['label' => __('Beginning')]);
@@ -1276,7 +1273,7 @@ This would generate the following HTML:
 
 ##### Sizing
 
-[The size](https://getbootstrap.com/docs/5.0/components/pagination/#sizing) can be specified via the `size` option:
+[The size](https://getbootstrap.com/docs/5.3/components/pagination/#sizing) can be specified via the `size` option:
 
 ```php
 echo $this->Paginator->links([

diff --git a/composer.json b/composer.json
@@ -17,12 +17,12 @@
         }
     ],
     "require": {
-        "cakephp/cakephp": "^5.0"
+        "cakephp/cakephp": "^5.1.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.1",
+        "phpunit/phpunit": "^10.5.5 || ^11.1.3",
         "cakephp/bake": "^3.0",
-        "cakephp/cakephp-codesniffer": "^5.0"
+        "cakephp/cakephp-codesniffer": "^5.1"
     },
     "support": {
         "issues": "http://github.com/friendsofcake/bootstrap-ui/issues",
@@ -47,8 +47,13 @@
         "cs-check": "phpcs -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=comparisons src/ tests/",
         "cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=comparisons src/ tests/",
         "test": "phpunit",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^1.0.0 && mv composer.backup composer.json",
-        "stan": "phpstan analyze"
+        "phpstan": "tools/phpstan",
+        "psalm": "tools/psalm",
+        "stan": [
+            "@phpstan",
+            "@psalm"
+        ],
+        "stan-setup": "phive install"
     },
     "config": {
         "allow-plugins": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,6 @@
 {
     "dependencies": {
-        "@popperjs/core": "^2.9.2",
-        "bootstrap": "^5.0.1",
-        "bootstrap-icons": "^1.5.0"
+        "bootstrap": "^5.3.3",
+        "bootstrap-icons": "^1.11.3"
     }
 }
diff --git a/src/BootstrapUIPlugin.php b/src/BootstrapUIPlugin.php
@@ -26,13 +26,34 @@ class BootstrapUIPlugin extends BasePlugin
      */
     protected bool $bootstrapEnabled = false;
 
+    /**
+     * Enable middleware
+     *
+     * @var bool
+     */
+    protected bool $middlewareEnabled = false;
+
+    /**
+     * Register container services
+     *
+     * @var bool
+     */
+    protected bool $servicesEnabled = false;
+
     /**
      * Load routes or not
      *
      * @var bool
      */
     protected bool $routesEnabled = false;
 
+    /**
+     * Load events or not
+     *
+     * @var bool
+     */
+    protected bool $eventsEnabled = false;
+
     /**
      * @inheritDoc
      */

diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php
@@ -59,7 +59,7 @@ public function installPackages(Arguments $args, ConsoleIo $io): void
         $output = [];
         $return = 0;
         $this->_runNPMInstall($output, $return, $io, $args->getOption('latest') === true);
-        $io->out($output); // @phpstan-ignore argument.type
+        $io->out($output);
 
         if ($return !== 0) {
             $io->error('Package installation failed.');
@@ -352,7 +352,6 @@ protected function _findPackageAssets(): array
 
         $nodeModulesPath = Plugin::path('BootstrapUI') . 'node_modules' . DS;
         $paths = [
-            $nodeModulesPath . '@popperjs/core/dist/umd',
             $nodeModulesPath . 'bootstrap/dist',
             $nodeModulesPath . 'bootstrap-icons',
         ];

diff --git a/src/View/Helper/BreadcrumbsHelper.php b/src/View/Helper/BreadcrumbsHelper.php
@@ -49,7 +49,7 @@ public function render(array $attributes = [], array $separator = []): string
     /**
      * @inheritDoc
      */
-    public function add($title, $url = null, array $options = [])
+    public function add(array|string $title, array|string|null $url = null, array $options = [])
     {
         if (is_array($title)) {
             $crumbs = [];
@@ -74,7 +74,7 @@ public function add($title, $url = null, array $options = [])
     /**
      * @inheritDoc
      */
-    public function prepend($title, $url = null, array $options = [])
+    public function prepend(array|string $title, array|string|null $url = null, array $options = [])
     {
         $options = $this->injectClasses($this->_defaultAttributes['class']['item'], $options);
 
@@ -84,7 +84,7 @@ public function prepend($title, $url = null, array $options = [])
     /**
      * @inheritDoc
      */
-    public function insertAt(int $index, string $title, $url = null, array $options = [])
+    public function insertAt(int $index, string $title, array|string|null $url = null, array $options = [])
     {
         $options = $this->injectClasses($this->_defaultAttributes['class']['item'], $options);