diff --git a/.gitignore b/.gitignore index 3baef8a2..816dc8f0 100644 --- 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 index d311bfa5..eaf11a6b 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -1,5 +1,5 @@ - + diff --git a/README.md b/README.md index 4f30b9be..0a44bb31 100644 --- 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 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,7 +251,7 @@ 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: @@ -262,7 +259,7 @@ If you're using paths that don't adhere to the CakePHP conventions, you'll have ```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 index 3ade071b..61d359d7 100644 --- 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 index c72d1530..a56e9b71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,57 +5,71 @@ "packages": { "": { "dependencies": { - "@popperjs/core": "^2.9.2", - "bootstrap": "^5.0.1", - "bootstrap-icons": "^1.5.0" + "bootstrap": "^5.3.3", + "bootstrap-icons": "^1.11.3" } }, "node_modules/@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==", + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" } }, "node_modules/bootstrap": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz", - "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - }, + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], "peerDependencies": { - "@popperjs/core": "^2.9.2" + "@popperjs/core": "^2.11.8" } }, "node_modules/bootstrap-icons": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.5.0.tgz", - "integrity": "sha512-44feMc7DE1Ccpsas/1wioN8ewFJNquvi5FewA06wLnqct7CwMdGDVy41ieHaacogzDqLfG8nADIvMNp9e4bfbA==", - "engines": { - "node": ">=10" - } + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz", + "integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ] } }, "dependencies": { "@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "peer": true }, "bootstrap": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz", - "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", "requires": {} }, "bootstrap-icons": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.5.0.tgz", - "integrity": "sha512-44feMc7DE1Ccpsas/1wioN8ewFJNquvi5FewA06wLnqct7CwMdGDVy41ieHaacogzDqLfG8nADIvMNp9e4bfbA==" + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz", + "integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==" } } } diff --git a/package.json b/package.json index b96a3bd5..d6be2117 100644 --- 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 index c8b3972e..f5d284a6 100644 --- a/src/BootstrapUIPlugin.php +++ b/src/BootstrapUIPlugin.php @@ -26,6 +26,20 @@ 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 * @@ -33,6 +47,13 @@ class BootstrapUIPlugin extends BasePlugin */ 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 index e8c5a5ad..247ac1fa 100644 --- 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 index c3bd89c6..f05f85db 100644 --- 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); diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php index b7d5c6ab..f740a524 100644 --- a/src/View/Helper/FormHelper.php +++ b/src/View/Helper/FormHelper.php @@ -70,7 +70,7 @@ class FormHelper extends CoreFormHelper * * @var array */ - public const ALIGN_TYPES = ['default', 'horizontal', 'inline']; + public const ALIGN_TYPES = [self::ALIGN_DEFAULT, self::ALIGN_HORIZONTAL, self::ALIGN_INLINE]; /** * Default alignment. @@ -135,41 +135,33 @@ class FormHelper extends CoreFormHelper */ protected array $_templates = [ 'error' => - '
{{content}}
', + '
{{content}}
', 'errorTooltip' => '
{{content}}
', 'label' => '{{text}}{{tooltip}}', 'help' => - '{{content}}', + '{{content}}', 'tooltip' => '', 'formGroupFloatingLabel' => '{{input}}{{label}}', - 'datetimeContainer' => - '{{content}}{{help}}', - 'datetimeContainerError' => - '' . - '{{content}}{{error}}{{help}}', - 'datetimeLabel' => - '{{text}}{{tooltip}}', 'inputContainer' => '{{content}}{{help}}', + 'class="{{containerClass}}{{type}}{{required}}">{{content}}{{help}}', 'inputContainerError' => '' . + 'class="{{containerClass}}{{formGroupPosition}}{{type}}{{required}} is-invalid">' . '{{content}}{{error}}{{help}}', 'checkboxContainer' => '{{content}}{{help}}', + 'class="{{containerClass}}form-check{{variant}} ' . + '{{type}}{{required}}">{{content}}{{help}}', 'checkboxContainerError' => '{{content}}{{error}}{{help}}', + 'class="{{containerClass}}form-check{{variant}} ' . + '{{formGroupPosition}}{{type}}{{required}} is-invalid">' . + '{{content}}{{error}}{{help}}', 'checkboxInlineContainer' => '' . @@ -185,11 +177,11 @@ class FormHelper extends CoreFormHelper 'checkboxInlineWrapper' => '
{{label}}
', 'radioContainer' => - '{{content}}{{help}}', 'radioContainerError' => '{{content}}{{error}}{{help}}', 'radioLabel' => '{{text}}{{tooltip}}', @@ -204,16 +196,16 @@ class FormHelper extends CoreFormHelper 'inputGroupText' => '{{content}}', 'multicheckboxContainer' => - '{{content}}{{help}}', 'multicheckboxContainerError' => '{{content}}{{error}}{{help}}', 'multicheckboxLabel' => '{{text}}{{tooltip}}', 'multicheckboxWrapper' => - '
{{content}}
', + '
{{content}}
', 'multicheckboxTitle' => '{{text}}', 'nestingLabel' => @@ -242,39 +234,30 @@ class FormHelper extends CoreFormHelper '{{content}}{{error}}{{help}}', - 'datetimeContainer' => - '' . - '{{content}}{{help}}', - 'datetimeContainerError' => - '' . - '{{content}}{{error}}{{help}}', - 'datetimeLabel' => - '{{text}}{{tooltip}}', 'radioContainer' => '{{content}}{{help}}', + 'class="{{containerClass}}{{formGroupPosition}}{{type}}{{required}}" ' . + 'role="group" aria-labelledby="{{groupId}}">' . + '{{content}}{{help}}', 'radioContainerError' => '{{content}}{{error}}{{help}}', + 'class="{{containerClass}}{{formGroupPosition}}{{type}}{{required}} is-invalid" ' . + 'role="group" aria-labelledby="{{groupId}}">' . + '{{content}}{{error}}{{help}}', 'radioLabel' => '{{text}}{{tooltip}}', 'multicheckboxContainer' => '{{content}}{{help}}', 'multicheckboxContainerError' => '{{content}}{{error}}{{help}}', 'multicheckboxLabel' => '{{text}}{{tooltip}}', 'multicheckboxWrapper' => - '
{{content}}
', + '
{{content}}
', 'multicheckboxTitle' => '{{text}}', ], @@ -287,50 +270,43 @@ class FormHelper extends CoreFormHelper '
{{input}}{{label}}{{error}}{{help}}
', 'checkboxFormGroup' => '
{{input}}{{label}}{{error}}{{help}}
', - 'datetimeContainer' => - '{{content}}', - 'datetimeContainerError' => - '' . - '{{content}}', - 'datetimeLabel' => - '{{text}}{{tooltip}}', 'checkboxInlineFormGroup' => '
{{input}}{{label}}
', 'submitContainer' => - '' . - '
{{content}}
', + '
{{content}}
', 'inputContainer' => - '' . + '' . '{{content}}', 'inputContainerError' => '' . - '{{content}}', - 'checkboxContainer' => - '' . + 'class="{{containerClass}}row {{formGroupPosition}}{{type}}{{required}} is-invalid">' . '{{content}}', + 'checkboxContainer' => + '{{content}}', 'checkboxContainerError' => - '' . - '{{content}}', + '' . + '{{content}}', 'radioContainer' => - '{{content}}', + '' . + '{{content}}', 'radioContainerError' => - '{{content}}', + '' . + '{{content}}', 'radioLabel' => '{{text}}{{tooltip}}', 'multicheckboxContainer' => - '{{content}}', + '' . + '{{content}}', 'multicheckboxContainerError' => - '{{content}}', + '' . + '{{content}}', 'multicheckboxLabel' => '{{text}}{{tooltip}}', ], @@ -350,13 +326,6 @@ class FormHelper extends CoreFormHelper '_default' => 'BootstrapUI\View\Widget\BasicWidget', ]; - /** - * The name of the field for which the current error is being generated. - * - * @var string|null - */ - private ?string $_errorFieldName = null; - /** * {@inheritDoc} * @@ -372,7 +341,7 @@ class FormHelper extends CoreFormHelper public function __construct(View $View, array $config = []) { $this->_defaultConfig = [ - 'align' => 'default', + 'align' => static::ALIGN_DEFAULT, 'errorClass' => 'is-invalid', 'grid' => [ static::GRID_COLUMN_ONE => 2, @@ -414,40 +383,6 @@ public function create(mixed $context = null, array $options = []): string return parent::create($context, $this->_processFormOptions($options)); } - /** - * @inheritDoc - */ - public function error(string $field, array|string|null $text = null, array $options = []): string - { - $this->_errorFieldName = $field; - $error = parent::error($field, $text, $options); - $this->_errorFieldName = null; - - return $error; - } - - /** - * @inheritDoc - */ - public function formatTemplate(string $name, array $data): string - { - // Injects the `id` attribute value for the error template. - // This is done for backwards compatibility reasons, as the - // core form helper only introduced this behavior with - // CakePHP 4.3. This can be removed once the required minimum - // CakePHP version is bumped accordingly. - - if ( - $name === 'error' && - !isset($data['id']) && - $this->_errorFieldName !== null - ) { - $data['id'] = $this->_domId($this->_errorFieldName . '-error'); - } - - return parent::formatTemplate($name, $data); - } - /** * @inheritDoc */ @@ -458,16 +393,6 @@ public function label(string $fieldName, ?string $text = null, array $options = return parent::label($fieldName, $text, $options); } - /** - * @inheritDoc - */ - public function button(string $title, array $options = []): string - { - $result = parent::button($title, $options); - - return $this->_postProcessElement($result, null, $options); - } - /** * @inheritDoc */ @@ -548,13 +473,6 @@ public function control(string $fieldName, array $options = []): string } switch ($options['type']) { - case 'datetime-local': - case 'datetime': - case 'date': - case 'time': - $options = $this->_dateTimeOptions($fieldName, $options); - break; - case 'checkbox': case 'radio': case 'select': @@ -658,11 +576,7 @@ protected function _containerOptions(?string $fieldName, array $options): array $options['container'] = $this->injectClasses('form-floating', (array)($options['container'] ?? [])); } - if (!isset($options['container'])) { - return $options; - } - - $containerOptions = $options['container']; + $containerOptions = $options['container'] ?? []; unset($options['container']); if (isset($containerOptions['class'])) { @@ -676,35 +590,6 @@ protected function _containerOptions(?string $fieldName, array $options): array return $options; } - /** - * Modify options for date time controls. - * - * @param string $fieldName Field name. - * @param array $options Options. See `$options` argument of `control()` method. - * @return array - */ - protected function _dateTimeOptions(string $fieldName, array $options): array - { - $options = $this->_labelOptions($fieldName, $options); - - // group IDs are no longer required for date/time controls, - // this is just kept for backwards compatibility - - $groupId = - $options['templateVars']['groupId'] = - $this->_domId($fieldName . '-group-label'); - - if ($options['label'] !== false) { - $options['label']['templateVars']['groupId'] = $groupId; - } - - $options['templates']['label'] = $this->templater()->get('datetimeLabel'); - $options['templates']['inputContainer'] = $this->templater()->get('datetimeContainer'); - $options['templates']['inputContainerError'] = $this->templater()->get('datetimeContainerError'); - - return $options; - } - /** * Modify options for checkbox controls. * @@ -985,8 +870,8 @@ protected function _ariaOptions(string $fieldName, array $options): array { if ( $options['type'] === 'hidden' || + ($options['type'] === 'select' && isset($options['multiple']) && $options['multiple'] === 'checkbox') || ( - isset($options['aria-required']) && isset($options['aria-describedby']) && isset($options['aria-invalid']) ) @@ -998,30 +883,6 @@ protected function _ariaOptions(string $fieldName, array $options): array $options['error'] !== false && $this->isFieldError($fieldName); - // `aria-invalid` and `aria-required` are injected for backwards - // compatibility reasons, as support for this has only been - // introduced in the core form helper with CakePHP 4.3. This can - // be removed once the required minimum CakePHP version is bumped - // accordingly. - - if ( - $isError && - !isset($options['aria-invalid']) - ) { - $options['aria-invalid'] = 'true'; - } - - if ( - $options['required'] && - !isset($options['aria-required']) - ) { - $options['aria-required'] = 'true'; - } - - if (isset($options['aria-describedby'])) { - return $options; - } - $describedByIds = []; if ($isError) { @@ -1091,36 +952,31 @@ protected function _placeholderOptions(string $fieldName, array $options): array */ protected function _helpOptions(string $fieldName, array $options): array { - if ($options['help']) { - if (!is_array($options['help'])) { - $options['help'] = [ - 'content' => $options['help'], - ]; - } + if ($options['help'] === null) { + return $options; + } - if (!isset($options['help']['id'])) { - $options['help']['id'] = $this->_domId($fieldName . '-help'); - } + if (!is_array($options['help'])) { + $options['help'] = [ + 'content' => $options['help'], + ]; + } - $helpClasses = []; - if ($this->_align === static::ALIGN_INLINE) { - $helpClasses[] = 'visually-hidden'; - } else { - $helpClasses[] = 'd-block'; - } + if (!isset($options['help']['id'])) { + $options['help']['id'] = $this->_domId($fieldName . '-help'); + } - $helpClasses[] = 'form-text'; - if ($this->_align !== static::ALIGN_INLINE) { - $helpClasses[] = 'text-muted'; - } + $helpClasses = ['form-text']; + if ($this->_align === static::ALIGN_INLINE) { + $helpClasses[] = 'visually-hidden'; + } - $options['help'] = $this->injectClasses($helpClasses, $options['help']); + $options['help'] = $this->injectClasses($helpClasses, $options['help']); - $options['help'] = $this->templater()->format('help', [ - 'content' => $options['help']['content'], - 'attrs' => $this->templater()->formatAttributes($options['help'], ['content']), - ]); - } + $options['help'] = $this->templater()->format('help', [ + 'content' => $options['help']['content'], + 'attrs' => $this->templater()->formatAttributes($options['help'], ['content']), + ]); return $options; } @@ -1409,15 +1265,13 @@ protected function _processFormOptions(array $options): array $options['templates'] = (new PhpConfig())->read($options['templates']); } - if ($this->_align === 'default') { + if ($this->_align === static::ALIGN_DEFAULT) { $options['templates'] += $templates; return $options; } - $options = $this->injectClasses('form-' . $this->_align, $options); - - if ($this->_align === 'inline') { + if ($this->_align === static::ALIGN_INLINE) { $options = $this->injectClasses( [ 'row', @@ -1435,10 +1289,6 @@ protected function _processFormOptions(array $options): array $templates['label'], $this->_gridClass(static::GRID_COLUMN_ONE) ); - $templates['datetimeLabel'] = sprintf( - $templates['datetimeLabel'], - $this->_gridClass(static::GRID_COLUMN_ONE) - ); $templates['radioLabel'] = sprintf( $templates['radioLabel'], $this->_gridClass(static::GRID_COLUMN_ONE) diff --git a/src/View/Helper/HtmlHelper.php b/src/View/Helper/HtmlHelper.php index ce747d53..2afe7430 100644 --- a/src/View/Helper/HtmlHelper.php +++ b/src/View/Helper/HtmlHelper.php @@ -54,7 +54,7 @@ public function badge(string $text, array $options = []): string $tag = $options['tag']; unset($options['tag']); - $allClasses = $this->genAllClassNames('bg'); + $allClasses = $this->genAllClassNames('text-bg'); if ($this->hasAnyClass($allClasses, $options)) { $options = $this->injectClasses('badge', $options); @@ -62,7 +62,7 @@ public function badge(string $text, array $options = []): string $options = $this->injectClasses(['badge', 'secondary'], $options); } - $classes = $this->renameClasses('bg', $options); + $classes = $this->renameClasses('text-bg', $options); return $this->tag($tag, $text, $classes); } diff --git a/src/View/Helper/OptionsAwareTrait.php b/src/View/Helper/OptionsAwareTrait.php index 941e8bc0..c4966391 100644 --- a/src/View/Helper/OptionsAwareTrait.php +++ b/src/View/Helper/OptionsAwareTrait.php @@ -91,7 +91,10 @@ public function injectClasses(array|string $classes, array $options): array $classes = $this->_toClassArray($classes); foreach ($classes as $class) { - if (!in_array($class, $options['class']) && !in_array($class, $options['skip'])) { + if ( + !in_array($class, $options['class']) && + !in_array($class, $options['skip']) + ) { array_push($options['class'], $class); } } diff --git a/src/View/Helper/Types/Element.php b/src/View/Helper/Types/Element.php index e8841f91..0a2b8f8d 100644 --- a/src/View/Helper/Types/Element.php +++ b/src/View/Helper/Types/Element.php @@ -16,6 +16,8 @@ final class Element extends Type public const BADGE = 'badge'; /** @var string The bg (background) element */ public const BG = 'bg'; + /** @var string The text bg (background) element */ + public const TEXT_BG = 'text-bg'; /** @var string The border element */ public const BORDER = 'border'; /** @var string The button element */ diff --git a/src/View/Widget/DateTimeWidget.php b/src/View/Widget/DateTimeWidget.php index 10cf30d0..02ca58ec 100644 --- a/src/View/Widget/DateTimeWidget.php +++ b/src/View/Widget/DateTimeWidget.php @@ -11,74 +11,24 @@ class DateTimeWidget extends CoreDateTimeWidget use InputGroupTrait; /** - * Render a select box form input. - * - * Render a select box input given a set of data. Supported keys - * are: - * - * - `name` - Set the input name. - * - `options` - An array of options. - * - `disabled` - Either true or an array of options to disable. - * When true, the select element will be disabled. - * - `val` - Either a string or an array of options to mark as selected. - * - `empty` - Set to true to add an empty option at the top of the - * option elements. Set to a string to define the display text of the - * empty option. If an array is used the key will set the value of the empty - * option while, the value will set the display text. - * - `escape` - Set to false to disable HTML escaping. - * - * ### Options format - * - * The options option can take a variety of data format depending on - * the complexity of HTML you want generated. - * - * You can generate simple options using a basic associative array: - * - * ``` - * 'options' => ['elk' => 'Elk', 'beaver' => 'Beaver'] - * ``` - * - * If you need to define additional attributes on your option elements - * you can use the complex form for options: - * - * ``` - * 'options' => [ - * ['value' => 'elk', 'text' => 'Elk', 'data-foo' => 'bar'], - * ] - * ``` - * - * This form **requires** that both the `value` and `text` keys be defined. - * If either is not set options will not be generated correctly. - * - * If you need to define option groups you can do those using nested arrays: - * - * ``` - * 'options' => [ - * 'Mammals' => [ - * 'elk' => 'Elk', - * 'beaver' => 'Beaver' - * ] - * ] - * ``` - * - * And finally, if you need to put attributes on your optgroup elements you - * can do that with a more complex nested array form: - * - * ``` - * 'options' => [ - * [ - * 'text' => 'Mammals', - * 'data-id' => 1, - * 'options' => [ - * 'elk' => 'Elk', - * 'beaver' => 'Beaver' - * ] - * ], - * ] - * ``` - * - * You are free to mix each of the forms in the same option set, and - * nest complex types as required. + * Render a date / time form widget. + * + * Data supports the following keys: + * + * - `name` The name attribute. + * - `val` The value attribute. + * - `escape` Set to false to disable escaping on all attributes. + * - `type` A valid HTML date/time input type. Defaults to "datetime-local". + * - `timezone` The timezone the input value should be converted to. + * - `step` The "step" attribute. Defaults to `1` for "time" and "datetime-local" type inputs. + * You can set it to `null` or `false` to prevent explicit step attribute being added in HTML. + * - `format` A `date()` function compatible datetime format string. + * By default, the widget will use a suitable format based on the input type and + * database type for the context. If an explicit format is provided, then no + * default value will be set for the `step` attribute, and it needs to be + * explicitly set if required. + * + * All other keys will be converted into HTML attributes. * * @param array $data Data to render with. * @param \Cake\View\Form\ContextInterface $context The current form context. diff --git a/templates/layout/default.php b/templates/layout/default.php index 9e56c400..93c7911f 100644 --- a/templates/layout/default.php +++ b/templates/layout/default.php @@ -93,12 +93,12 @@ /** * Prepend `script` block with Popper and Bootstrap scripts - * Change popper.min and bootstrap.min to use the compressed version + * Change bootstrap.min to use the compressed version */ if (Configure::read('debug')) { - $this->prepend('script', $this->Html->script(['BootstrapUI.popper', 'BootstrapUI.bootstrap'])); + $this->prepend('script', $this->Html->script(['BootstrapUI.bootstrap.bundle'])); } else { - $this->prepend('script', $this->Html->script(['BootstrapUI.popper.min', 'BootstrapUI.bootstrap.min'])); + $this->prepend('script', $this->Html->script(['BootstrapUI.bootstrap.bundle.min'])); } ?> diff --git a/tests/TestCase/Bake/BakeTest.php b/tests/TestCase/Bake/BakeTest.php index f2f9520f..4a07d12b 100644 --- a/tests/TestCase/Bake/BakeTest.php +++ b/tests/TestCase/Bake/BakeTest.php @@ -26,12 +26,6 @@ public function setUp(): void parent::setUp(); $this->_compareBasePath = Plugin::path('BootstrapUI') . 'tests' . DS . 'comparisons' . DS . 'Template' . DS; - - $this->loadPlugins([ - 'Cake/TwigView' => [ - 'bootstrap' => true, - ], - ]); } public function tearDown(): void diff --git a/tests/TestCase/Command/InstallCommandTest.php b/tests/TestCase/Command/InstallCommandTest.php index d88bd324..21ce2ba6 100644 --- a/tests/TestCase/Command/InstallCommandTest.php +++ b/tests/TestCase/Command/InstallCommandTest.php @@ -53,14 +53,10 @@ public function testInstall() 'fonts' . DS . 'bootstrap-icons.woff2', ]; $jsAssets = [ - 'bootstrap.js', - 'bootstrap.js.map', - 'bootstrap.min.js', - 'bootstrap.min.js.map', - 'popper.js', - 'popper.js.map', - 'popper.min.js', - 'popper.min.js.map', + 'bootstrap.bundle.js', + 'bootstrap.bundle.js.map', + 'bootstrap.bundle.min.js', + 'bootstrap.bundle.min.js.map', ]; foreach ($cssAssets as $asset) { @@ -89,10 +85,10 @@ public function testInstall() '`bootstrap.css.map` successfully deleted.', '`bootstrap.min.css` successfully deleted.', '`bootstrap.min.css.map` successfully deleted.', - '`bootstrap.js` successfully deleted.', - '`bootstrap.js.map` successfully deleted.', - '`bootstrap.min.js` successfully deleted.', - '`bootstrap.min.js.map` successfully deleted.', + '`bootstrap.bundle.js` successfully deleted.', + '`bootstrap.bundle.js.map` successfully deleted.', + '`bootstrap.bundle.min.js` successfully deleted.', + '`bootstrap.bundle.min.js.map` successfully deleted.', '`popper.js` successfully deleted.', '`popper.js.map` successfully deleted.', '`popper.min.js` successfully deleted.', @@ -106,10 +102,10 @@ public function testInstall() '`bootstrap.css.map` successfully copied.', '`bootstrap.min.css` successfully copied.', '`bootstrap.min.css.map` successfully copied.', - '`bootstrap.js` successfully copied.', - '`bootstrap.js.map` successfully copied.', - '`bootstrap.min.js` successfully copied.', - '`bootstrap.min.js.map` successfully copied.', + '`bootstrap.bundle.js` successfully copied.', + '`bootstrap.bundle.js.map` successfully copied.', + '`bootstrap.bundle.min.js` successfully copied.', + '`bootstrap.bundle.min.js.map` successfully copied.', '`popper.js` successfully copied.', '`popper.js.map` successfully copied.', '`popper.min.js` successfully copied.', @@ -131,10 +127,10 @@ public function testInstall() '`bootstrap.css.map` successfully deleted.', '`bootstrap.min.css` successfully deleted.', '`bootstrap.min.css.map` successfully deleted.', - '`bootstrap.js` successfully deleted.', - '`bootstrap.js.map` successfully deleted.', - '`bootstrap.min.js` successfully deleted.', - '`bootstrap.min.js.map` successfully deleted.', + '`bootstrap.bundle.js` successfully deleted.', + '`bootstrap.bundle.js.map` successfully deleted.', + '`bootstrap.bundle.min.js` successfully deleted.', + '`bootstrap.bundle.min.js.map` successfully deleted.', '`popper.js` successfully deleted.', '`popper.js.map` successfully deleted.', '`popper.min.js` successfully deleted.', @@ -146,10 +142,10 @@ public function testInstall() '`bootstrap.css.map` successfully copied.', '`bootstrap.min.css` successfully copied.', '`bootstrap.min.css.map` successfully copied.', - '`bootstrap.js` successfully copied.', - '`bootstrap.js.map` successfully copied.', - '`bootstrap.min.js` successfully copied.', - '`bootstrap.min.js.map` successfully copied.', + '`bootstrap.bundle.js` successfully copied.', + '`bootstrap.bundle.js.map` successfully copied.', + '`bootstrap.bundle.min.js` successfully copied.', + '`bootstrap.bundle.min.js.map` successfully copied.', '`popper.js` successfully copied.', '`popper.js.map` successfully copied.', '`popper.min.js` successfully copied.', @@ -188,14 +184,10 @@ public function testReInstall() 'fonts' . DS . 'bootstrap-icons.woff2', ]; $jsAssets = [ - 'bootstrap.js', - 'bootstrap.js.map', - 'bootstrap.min.js', - 'bootstrap.min.js.map', - 'popper.js', - 'popper.js.map', - 'popper.min.js', - 'popper.min.js.map', + 'bootstrap.bundle.js', + 'bootstrap.bundle.js.map', + 'bootstrap.bundle.min.js', + 'bootstrap.bundle.min.js.map', ]; foreach ($cssAssets as $asset) { @@ -261,14 +253,10 @@ public function testInstallVerbose() '`bootstrap.css.map` successfully deleted.', '`bootstrap.min.css` successfully deleted.', '`bootstrap.min.css.map` successfully deleted.', - '`bootstrap.js` successfully deleted.', - '`bootstrap.js.map` successfully deleted.', - '`bootstrap.min.js` successfully deleted.', - '`bootstrap.min.js.map` successfully deleted.', - '`popper.js` successfully deleted.', - '`popper.js.map` successfully deleted.', - '`popper.min.js` successfully deleted.', - '`popper.min.js.map` successfully deleted.', + '`bootstrap.bundle.js` successfully deleted.', + '`bootstrap.bundle.js.map` successfully deleted.', + '`bootstrap.bundle.min.js` successfully deleted.', + '`bootstrap.bundle.min.js.map` successfully deleted.', '`bootstrap-icons.css` successfully deleted.', '`bootstrap-icons.woff` successfully deleted.', '`bootstrap-icons.woff2` successfully deleted.', @@ -278,14 +266,10 @@ public function testInstallVerbose() '`bootstrap.css.map` successfully copied.', '`bootstrap.min.css` successfully copied.', '`bootstrap.min.css.map` successfully copied.', - '`bootstrap.js` successfully copied.', - '`bootstrap.js.map` successfully copied.', - '`bootstrap.min.js` successfully copied.', - '`bootstrap.min.js.map` successfully copied.', - '`popper.js` successfully copied.', - '`popper.js.map` successfully copied.', - '`popper.min.js` successfully copied.', - '`popper.min.js.map` successfully copied.', + '`bootstrap.bundle.js` successfully copied.', + '`bootstrap.bundle.js.map` successfully copied.', + '`bootstrap.bundle.min.js` successfully copied.', + '`bootstrap.bundle.min.js.map` successfully copied.', '`bootstrap-icons.css` successfully copied.', '`bootstrap-icons.woff` successfully copied.', '`bootstrap-icons.woff2` successfully copied.', @@ -310,9 +294,8 @@ public function testInstallLatest() $testPackageFileContents = <<=10" - } + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz", + "integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ] } }, "dependencies": { "@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "peer": true }, "bootstrap": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz", - "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", "requires": {} }, "bootstrap-icons": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.5.0.tgz", - "integrity": "sha512-44feMc7DE1Ccpsas/1wioN8ewFJNquvi5FewA06wLnqct7CwMdGDVy41ieHaacogzDqLfG8nADIvMNp9e4bfbA==" + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz", + "integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==" } } } @@ -396,48 +393,35 @@ public function testInstallLatest() $this->assertStringEqualsFile($pluginPath . 'package.json', $testPackageFileContents); $this->assertStringEqualsFile($pluginPath . 'package-lock.json', $testLockFileContents); - $package = json_decode( - file_get_contents($pluginPath . 'node_modules' . DS . '@popperjs' . DS . 'core' . DS . 'package.json'), - true - ); - $this->assertSame('2.9.2', $package['version']); - $package = json_decode( file_get_contents($pluginPath . 'node_modules' . DS . 'bootstrap' . DS . 'package.json'), true ); - $this->assertSame('5.0.1', $package['version']); + $this->assertSame('5.3.3', $package['version']); $package = json_decode( file_get_contents($pluginPath . 'node_modules' . DS . 'bootstrap-icons' . DS . 'package.json'), true ); - $this->assertSame('1.5.0', $package['version']); + $this->assertSame('1.11.3', $package['version']); $this->exec('bootstrap install --latest'); $this->assertStringEqualsFile($pluginPath . 'package.json', $testPackageFileContents); $this->assertStringEqualsFile($pluginPath . 'package-lock.json', $testLockFileContents); - $package = json_decode( - file_get_contents($pluginPath . 'node_modules' . DS . '@popperjs' . DS . 'core' . DS . 'package.json'), - true - ); - $this->assertTrue(version_compare($package['version'], '2.9.2', '>')); - $this->assertTrue(version_compare($package['version'], '3.0.0', '<')); - $package = json_decode( file_get_contents($pluginPath . 'node_modules' . DS . 'bootstrap' . DS . 'package.json'), true ); - $this->assertTrue(version_compare($package['version'], '5.0.1', '>')); + $this->assertTrue(version_compare($package['version'], '5.3.3', '>=')); $this->assertTrue(version_compare($package['version'], '6.0.0', '<')); $package = json_decode( file_get_contents($pluginPath . 'node_modules' . DS . 'bootstrap-icons' . DS . 'package.json'), true ); - $this->assertTrue(version_compare($package['version'], '1.5.0', '>')); + $this->assertTrue(version_compare($package['version'], '1.11.3', '>=')); $this->assertTrue(version_compare($package['version'], '2.0.0', '<')); $this->assertTrue(rename($pluginPath . 'package.json.bak', $pluginPath . 'package.json')); @@ -574,12 +558,12 @@ public function testNPMInstallFailure() $command ->expects($this->once()) ->method('_runNPMInstall') - ->will($this->returnCallback(function (&$out, &$return) { + ->willReturnCallback(function (&$out, &$return) { $out = [ 'installer output', ]; $return = 1234; - })); + }); $out = new StubConsoleOutput(); $err = new StubConsoleOutput(); diff --git a/tests/TestCase/View/Helper/FlashHelperTest.php b/tests/TestCase/View/Helper/FlashHelperTest.php index 30f899dc..55ee5c1b 100644 --- a/tests/TestCase/View/Helper/FlashHelperTest.php +++ b/tests/TestCase/View/Helper/FlashHelperTest.php @@ -8,6 +8,7 @@ use Cake\Http\Session; use Cake\TestSuite\TestCase; use Cake\View\View; +use PHPUnit\Framework\Attributes\DataProvider; use UnexpectedValueException; /** @@ -63,11 +64,11 @@ public static function flashTypeDefaultsDataProvider(): array } /** - * @dataProvider flashTypeDefaultsDataProvider * @param string $type The flash type. * @param string $class The alert class. * @param string $icon The icon name. */ + #[DataProvider('flashTypeDefaultsDataProvider')] public function testRenderDefaults(string $type, string $class, string $icon) { $this->View->getRequest()->getSession()->write('Flash', [ @@ -445,9 +446,9 @@ public static function flashTypeDataProvider(): array } /** - * @dataProvider flashTypeDataProvider * @param string $type The flash type. */ + #[DataProvider('flashTypeDataProvider')] public function testCustomDefaultIcon(string $type) { $this->Flash->setConfig('icon', 'info'); @@ -466,9 +467,9 @@ public function testCustomDefaultIcon(string $type) } /** - * @dataProvider flashTypeDataProvider * @param string $type The flash type. */ + #[DataProvider('flashTypeDataProvider')] public function testDisableIconsViaConfig(string $type) { $this->Flash->setConfig('icon', false); @@ -490,6 +491,7 @@ public function testDisableIconsViaConfig(string $type) * @dataProvider flashTypeDataProvider * @param string $type The flash type. */ + #[DataProvider('flashTypeDataProvider')] public function testDisableIconViaParamsOption(string $type) { $this->View->getRequest()->getSession()->write('Flash', [ @@ -508,9 +510,9 @@ public function testDisableIconViaParamsOption(string $type) } /** - * @dataProvider flashTypeDataProvider * @param string $type The flash type. */ + #[DataProvider('flashTypeDataProvider')] public function testCustomIconClassMap(string $type) { $iconClassMap = [ @@ -540,9 +542,9 @@ public function testCustomIconClassMap(string $type) } /** - * @dataProvider flashTypeDataProvider * @param string $type The flash type. */ + #[DataProvider('flashTypeDataProvider')] public function testCustomIconClassMapOptions(string $type) { $options = [ diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php index f446d0fe..0e0965c3 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php @@ -15,7 +15,7 @@ public function testDefaultAlignCheckboxControl() 'type' => 'checkbox', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -45,7 +45,7 @@ public function testDefaultAlignCheckboxControlWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -72,7 +72,7 @@ public function testDefaultAlignCheckboxControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -106,7 +106,7 @@ public function testDefaultAlignCheckboxControlWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -140,7 +140,7 @@ public function testDefaultAlignCheckboxControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -157,9 +157,9 @@ public function testDefaultAlignCheckboxControlWithHelp() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -179,7 +179,7 @@ public function testDefaultAlignCheckboxControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -196,13 +196,13 @@ public function testDefaultAlignCheckboxControlWithHelpOptions() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -217,7 +217,7 @@ public function testDefaultAlignCheckboxControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -253,7 +253,7 @@ public function testDefaultAlignCheckboxControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - ['div' => ['class' => 'custom-spacing form-group form-check checkbox']], + ['div' => ['class' => 'custom-spacing form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -285,7 +285,7 @@ public function testDefaultAlignCheckboxControlWithError() 'type' => 'checkbox', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox is-invalid']], + ['div' => ['class' => 'mb-3 form-check checkbox is-invalid']], ['input' => [ 'class' => 'is-invalid', 'type' => 'hidden', @@ -305,7 +305,7 @@ public function testDefaultAlignCheckboxControlWithError() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -325,7 +325,7 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox is-invalid']], + ['div' => ['class' => 'mb-3 form-check checkbox is-invalid']], ['input' => [ 'class' => 'is-invalid', 'type' => 'hidden', @@ -344,12 +344,12 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelp() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -372,7 +372,7 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelpAndOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox is-invalid']], + ['div' => ['class' => 'mb-3 form-check checkbox is-invalid']], ['input' => [ 'class' => 'is-invalid', 'type' => 'hidden', @@ -391,16 +391,16 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelpAndOptions() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -420,7 +420,7 @@ public function testDefaultAlignCheckboxControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group form-check checkbox', + 'class' => 'container-class mb-3 form-check checkbox', ]], ['input' => [ 'type' => 'hidden', @@ -459,7 +459,7 @@ public function testDefaultAlignCheckboxControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group form-check checkbox is-invalid', + 'class' => 'container-class mb-3 form-check checkbox is-invalid', ]], ['input' => [ 'class' => 'is-invalid', @@ -480,7 +480,7 @@ public function testDefaultAlignCheckboxControlContainerOptionsWithError() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -497,7 +497,7 @@ public function testDefaultAlignCheckboxControlNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -528,7 +528,7 @@ public function testDefaultAlignCheckboxControlNestedInputWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox']], + ['div' => ['class' => 'mb-3 form-check checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', @@ -567,7 +567,7 @@ public function testDefaultAlignCheckboxControlNestedInputWithError() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check checkbox is-invalid']], + ['div' => ['class' => 'mb-3 form-check checkbox is-invalid']], ['input' => [ 'class' => 'is-invalid', 'type' => 'hidden', @@ -587,7 +587,7 @@ public function testDefaultAlignCheckboxControlNestedInputWithError() ]], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -750,9 +750,9 @@ public function testDefaultAlignCheckboxControlInlineWithHelp() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => ['id' => 'users-help','class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help','class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -790,13 +790,13 @@ public function testDefaultAlignCheckboxControlInlineWithHelpOptions() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -871,7 +871,7 @@ public function testDefaultAlignCheckboxControlInlineWithError() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -955,7 +955,7 @@ public function testDefaultAlignCheckboxControlInlineContainerOptionsWithError() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1041,7 +1041,7 @@ public function testDefaultAlignCheckboxControlSwitch() 'switch' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group form-check form-switch checkbox']], + ['div' => ['class' => 'mb-3 form-check form-switch checkbox']], ['input' => [ 'type' => 'hidden', 'name' => 'users', diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php index 7e9e9c5d..44780e5b 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php @@ -16,7 +16,7 @@ public function testDefaultAlignColorControl() 'value' => '#ffffff', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color'], + 'div' => ['class' => 'mb-3 color'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', '/label', @@ -42,7 +42,7 @@ public function testDefaultAlignColorControlWithDisabledLabel() 'label' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color'], + 'div' => ['class' => 'mb-3 color'], 'input' => [ 'type' => 'color', 'name' => 'color', @@ -65,7 +65,7 @@ public function testDefaultAlignColorControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color'], + 'div' => ['class' => 'mb-3 color'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Custom Label', '/label', @@ -95,7 +95,7 @@ public function testDefaultAlignColorControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color'], + 'div' => ['class' => 'mb-3 color'], 'label' => ['for' => 'color', 'class' => 'custom-label-class form-label', 'foo' => 'bar'], 'Custom Label', '/label', @@ -121,7 +121,7 @@ public function testDefaultAlignColorControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color'], + 'div' => ['class' => 'mb-3 color'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', '/label', @@ -133,9 +133,9 @@ public function testDefaultAlignColorControlWithHelp() 'aria-describedby' => 'color-help', 'value' => '#ffffff', ], - ['small' => ['id' => 'color-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'color-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -156,7 +156,7 @@ public function testDefaultAlignColorControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color'], + 'div' => ['class' => 'mb-3 color'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', '/label', @@ -168,13 +168,13 @@ public function testDefaultAlignColorControlWithHelpOptions() 'aria-describedby' => 'custom-help', 'value' => '#ffffff', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -190,7 +190,7 @@ public function testDefaultAlignColorControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color'], + 'div' => ['class' => 'mb-3 color'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', 'span' => [ @@ -222,7 +222,7 @@ public function testDefaultAlignColorControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - 'div' => ['class' => 'custom-spacing form-group color'], + 'div' => ['class' => 'custom-spacing color'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', '/label', @@ -250,7 +250,7 @@ public function testDefaultAlignColorControlWithError() 'value' => '#ffffff', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color is-invalid'], + 'div' => ['class' => 'mb-3 color is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', '/label', @@ -263,7 +263,7 @@ public function testDefaultAlignColorControlWithError() 'aria-describedby' => 'color-error', 'value' => '#ffffff', ], - ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -284,7 +284,7 @@ public function testDefaultAlignColorControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color is-invalid'], + 'div' => ['class' => 'mb-3 color is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', '/label', @@ -297,12 +297,12 @@ public function testDefaultAlignColorControlWithErrorAndHelp() 'aria-describedby' => 'color-error color-help', 'value' => '#ffffff', ], - ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'color-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'color-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -326,7 +326,7 @@ public function testDefaultAlignColorControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group color is-invalid'], + 'div' => ['class' => 'mb-3 color is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', '/label', @@ -339,16 +339,16 @@ public function testDefaultAlignColorControlWithErrorAndHelpOptions() 'aria-describedby' => 'color-error custom-help', 'value' => '#ffffff', ], - ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -370,7 +370,7 @@ public function testDefaultAlignColorControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group color', + 'class' => 'container-class mb-3 color', ], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', @@ -406,7 +406,7 @@ public function testDefaultAlignColorControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group color is-invalid', + 'class' => 'container-class mb-3 color is-invalid', ], ['label' => ['class' => 'form-label', 'for' => 'color']], 'Color', @@ -420,7 +420,7 @@ public function testDefaultAlignColorControlContainerOptionsWithError() 'aria-describedby' => 'color-error', 'value' => '#ffffff', ], - ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php index fd2099b8..d0d2fcf6 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php @@ -20,7 +20,7 @@ public function testDefaultAlignDateTimeControl() ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group datetime-local']], + ['div' => ['class' => 'mb-3 datetime-local']], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', '/label', @@ -50,7 +50,7 @@ public function testDefaultAlignDateTimeControlWithDisabledLabel() $expected = [ ['div' => [ - 'class' => 'mb-3 form-group datetime-local', + 'class' => 'mb-3 datetime-local', ]], 'input' => [ 'type' => 'datetime-local', @@ -78,7 +78,7 @@ public function testDefaultAlignDateTimeControlWithCustomLabel() $expected = [ ['div' => [ - 'class' => 'mb-3 form-group datetime-local', + 'class' => 'mb-3 datetime-local', ]], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Custom Label', @@ -113,7 +113,7 @@ public function testDefaultAlignDateTimeControlWithCustomLabelOptions() $expected = [ ['div' => [ - 'class' => 'mb-3 form-group datetime-local', + 'class' => 'mb-3 datetime-local', ]], ['label' => [ 'class' => 'custom-label-class form-label', @@ -146,7 +146,7 @@ public function testDefaultAlignDateTimeControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group time']], + ['div' => ['class' => 'mb-3 time']], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', '/label', @@ -159,9 +159,9 @@ public function testDefaultAlignDateTimeControlWithHelp() 'step' => '1', 'value' => date('H:i:s', $now), ], - ['small' => ['id' => 'created-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'created-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -184,7 +184,7 @@ public function testDefaultAlignDateTimeControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group time']], + ['div' => ['class' => 'mb-3 time']], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', '/label', @@ -197,13 +197,13 @@ public function testDefaultAlignDateTimeControlWithHelpOptions() 'step' => '1', 'value' => date('H:i:s', $now), ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -221,7 +221,7 @@ public function testDefaultAlignDateTimeControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group time']], + ['div' => ['class' => 'mb-3 time']], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created ', 'span' => [ @@ -257,7 +257,7 @@ public function testDefaultAlignDateTimeControlWithCustomSpacing() ]); $expected = [ - ['div' => ['class' => 'custom-spacing form-group datetime-local']], + ['div' => ['class' => 'custom-spacing datetime-local']], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', '/label', @@ -289,7 +289,7 @@ public function testDefaultAlignDateTimeControlWithError() $expected = [ ['div' => [ - 'class' => 'mb-3 form-group datetime-local is-invalid', + 'class' => 'mb-3 datetime-local is-invalid', ]], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', @@ -304,7 +304,7 @@ public function testDefaultAlignDateTimeControlWithError() 'aria-describedby' => 'created-error', 'value' => $now->format('Y-m-d H:i:s'), ], - ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -329,7 +329,7 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelp() $expected = [ ['div' => [ - 'class' => 'mb-3 form-group datetime-local is-invalid', + 'class' => 'mb-3 datetime-local is-invalid', ]], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', @@ -343,12 +343,12 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelp() 'aria-describedby' => 'created-error created-help', 'value' => $now->format('Y-m-d H:i:s'), ], - ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'created-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'created-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -376,7 +376,7 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelpOptions() $expected = [ ['div' => [ - 'class' => 'mb-3 form-group datetime-local is-invalid', + 'class' => 'mb-3 datetime-local is-invalid', ]], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', @@ -390,16 +390,16 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelpOptions() 'aria-describedby' => 'created-error custom-help', 'value' => $now->format('Y-m-d H:i:s'), ], - ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -423,7 +423,7 @@ public function testDefaultAlignDateTimeControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group datetime-local', + 'class' => 'container-class mb-3 datetime-local', ]], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', @@ -461,7 +461,7 @@ public function testDefaultAlignDateTimeControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group datetime-local is-invalid', + 'class' => 'container-class mb-3 datetime-local is-invalid', ]], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', @@ -476,7 +476,7 @@ public function testDefaultAlignDateTimeControlContainerOptionsWithError() 'aria-describedby' => 'created-error', 'value' => $now->format('Y-m-d H:i:s'), ], - ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -495,7 +495,7 @@ public function testDefaultAlignDateTimeControlDate() 'value' => $now, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group date']], + ['div' => ['class' => 'mb-3 date']], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', '/label', @@ -522,7 +522,7 @@ public function testDefaultAlignDateTimeControlTime() 'value' => $now, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group time']], + ['div' => ['class' => 'mb-3 time']], ['label' => ['class' => 'form-label', 'for' => 'created']], 'Created', '/label', @@ -546,37 +546,37 @@ public function testDefaultAlignDateTimeControlCustomContainerTemplateViaTemplat $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $this->Form->setTemplates([ - 'datetimeContainer' => '
{{content}}
', - 'dateContainer' => '
{{content}}
', - 'timeContainer' => '
{{content}}
', + 'datetimeContainer' => '
{{content}}
', + 'dateContainer' => '
{{content}}
', + 'timeContainer' => '
{{content}}
', ]); $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); } public function testDefaultAlignDateTimeControlCustomContainerErrorTemplateViaOptions() @@ -591,40 +591,40 @@ public function testDefaultAlignDateTimeControlCustomContainerErrorTemplateViaOp $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'datetime', 'templates' => [ - 'datetimeContainerError' => '
{{content}}
', + 'datetimeContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', 'templates' => [ - 'dateContainerError' => '
{{content}}
', + 'dateContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', 'templates' => [ - 'timeContainerError' => '
{{content}}
', + 'timeContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); } } diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php index 599c6a6f..d8b02ae1 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php @@ -15,7 +15,7 @@ public function testDefaultAlignFileControl() 'type' => 'file', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -39,7 +39,7 @@ public function testDefaultAlignFileControlWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['input' => [ 'type' => 'file', 'name' => 'file', @@ -60,7 +60,7 @@ public function testDefaultAlignFileControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'Custom Label', '/label', @@ -88,7 +88,7 @@ public function testDefaultAlignFileControlWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['label' => [ 'class' => 'custom-label-class form-label', 'foo' => 'bar', @@ -116,7 +116,7 @@ public function testDefaultAlignFileControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -127,9 +127,9 @@ public function testDefaultAlignFileControlWithHelp() 'class' => 'form-control', 'aria-describedby' => 'file-help', ]], - ['small' => ['id' => 'file-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'file-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -149,7 +149,7 @@ public function testDefaultAlignFileControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -160,13 +160,13 @@ public function testDefaultAlignFileControlWithHelpOptions() 'class' => 'form-control', 'aria-describedby' => 'custom-help', ]], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -181,7 +181,7 @@ public function testDefaultAlignFileControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File ', 'span' => [ @@ -211,7 +211,7 @@ public function testDefaultAlignFileControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - ['div' => ['class' => 'custom-spacing form-group file']], + ['div' => ['class' => 'custom-spacing file']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -237,7 +237,7 @@ public function testDefaultAlignFileControlWithError() 'type' => 'file', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file is-invalid']], + ['div' => ['class' => 'mb-3 file is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -249,7 +249,7 @@ public function testDefaultAlignFileControlWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'file-error', ]], - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -269,7 +269,7 @@ public function testDefaultAlignFileControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file is-invalid']], + ['div' => ['class' => 'mb-3 file is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -281,12 +281,12 @@ public function testDefaultAlignFileControlWithErrorAndHelp() 'aria-invalid' => 'true', 'aria-describedby' => 'file-error file-help', ]], - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'file-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'file-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -309,7 +309,7 @@ public function testDefaultAlignFileControlWithErrorAndHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file is-invalid']], + ['div' => ['class' => 'mb-3 file is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -321,16 +321,16 @@ public function testDefaultAlignFileControlWithErrorAndHelpOptions() 'aria-invalid' => 'true', 'aria-describedby' => 'file-error custom-help', ]], - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -350,7 +350,7 @@ public function testDefaultAlignFileControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group file', + 'class' => 'container-class mb-3 file', ]], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', @@ -383,7 +383,7 @@ public function testDefaultAlignFileControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group file is-invalid', + 'class' => 'container-class mb-3 file is-invalid', ]], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', @@ -396,7 +396,7 @@ public function testDefaultAlignFileControlContainerOptionsWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'file-error', ]], - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -413,7 +413,7 @@ public function testDefaultAlignFileControlInputGroupAppend() 'append' => 'append', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -442,7 +442,7 @@ public function testDefaultAlignFileControlInputGroupPrepend() 'prepend' => 'prepend', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file']], + ['div' => ['class' => 'mb-3 file']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -474,7 +474,7 @@ public function testDefaultAlignFileControlInputGroupWithError() 'append' => 'append', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group file is-invalid']], + ['div' => ['class' => 'mb-3 file is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'file']], 'File', '/label', @@ -491,7 +491,7 @@ public function testDefaultAlignFileControlInputGroupWithError() 'append', '/span', '/div', - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php index ba2cb5b6..694b7b0e 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php @@ -19,7 +19,7 @@ public function testDefaultAlignMultipleCheckboxControl() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -72,7 +72,7 @@ public function testDefaultAlignMultipleCheckboxControlWithDisabledLabel() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox', + 'class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -125,7 +125,7 @@ public function testDefaultAlignMultipleCheckboxControlWithCustomLabel() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox', + 'class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -185,7 +185,7 @@ public function testDefaultAlignMultipleCheckboxControlWithCustomLabelOptions() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox', + 'class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -240,7 +240,7 @@ public function testDefaultAlignMultipleCheckboxControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -276,9 +276,9 @@ public function testDefaultAlignMultipleCheckboxControlWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -302,7 +302,7 @@ public function testDefaultAlignMultipleCheckboxControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -338,13 +338,13 @@ public function testDefaultAlignMultipleCheckboxControlWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -360,7 +360,7 @@ public function testDefaultAlignMultipleCheckboxControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users ', 'span' => [ @@ -392,7 +392,7 @@ public function testDefaultAlignMultipleCheckboxControlWithCustomSpacing() ]); $expected = [ ['div' => [ - 'class' => 'custom-spacing form-group multicheckbox', + 'class' => 'custom-spacing multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -426,7 +426,7 @@ public function testDefaultAlignMultipleCheckboxControlWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox is-invalid', + 'class' => 'mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -468,7 +468,7 @@ public function testDefaultAlignMultipleCheckboxControlWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -493,7 +493,7 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelp() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox is-invalid', + 'class' => 'mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -535,12 +535,12 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelp() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -568,7 +568,7 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox is-invalid', + 'class' => 'mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -610,16 +610,16 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelpOptions() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -639,11 +639,12 @@ public function testDefaultAlignMultipleCheckboxControlCustomAriaDescribedByWith 2 => 'option 2', ], 'help' => 'Help text', + 'aria-invalid' => 'true', 'aria-describedby' => 'custom', ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox is-invalid', + 'class' => 'mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -685,12 +686,12 @@ public function testDefaultAlignMultipleCheckboxControlCustomAriaDescribedByWith 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -714,7 +715,7 @@ public function testDefaultAlignMultipleCheckboxControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group multicheckbox', + 'class' => 'container-class mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -777,7 +778,7 @@ public function testDefaultAlignMultipleCheckboxControlContainerOptionsWithError $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group multicheckbox is-invalid', + 'class' => 'container-class mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -819,7 +820,7 @@ public function testDefaultAlignMultipleCheckboxControlContainerOptionsWithError 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -840,7 +841,7 @@ public function testDefaultAlignMultipleCheckboxControlNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -896,7 +897,7 @@ public function testDefaultAlignMultipleCheckboxControlNestedInputWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox is-invalid', + 'class' => 'mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -938,7 +939,7 @@ public function testDefaultAlignMultipleCheckboxControlNestedInputWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -959,7 +960,7 @@ public function testDefaultAlignMultipleCheckboxControlInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1012,7 +1013,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['input' => [ 'type' => 'hidden', 'id' => 'users', @@ -1062,7 +1063,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Custom Label', '/label', @@ -1119,7 +1120,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithCustomLabelOpti ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'custom-label-class form-label d-block', 'foo' => 'bar']], 'Custom Label', '/label', @@ -1173,7 +1174,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithHelp() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox', + 'class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1212,9 +1213,9 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -1240,7 +1241,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithHelpOptions() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox', + 'class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1279,13 +1280,13 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -1303,7 +1304,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithTooltip() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox', + 'class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1344,7 +1345,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox is-invalid', + 'class' => 'mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1386,7 +1387,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1413,7 +1414,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group multicheckbox', + 'class' => 'container-class mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1477,7 +1478,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineContainerOptionsWit $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group multicheckbox is-invalid', + 'class' => 'container-class mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1519,7 +1520,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineContainerOptionsWit 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1541,7 +1542,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1598,7 +1599,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroups() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1608,7 +1609,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroups() 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -1637,7 +1638,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroups() '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -1689,7 +1690,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithCustomSpa ]); $expected = [ ['div' => [ - 'class' => 'custom-spacing form-group multicheckbox', + 'class' => 'custom-spacing multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1702,7 +1703,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithCustomSpa 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'custom-spacing form-group']], + ['fieldset' => ['class' => 'custom-spacing']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -1731,7 +1732,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithCustomSpa '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'custom-spacing form-group']], + ['fieldset' => ['class' => 'custom-spacing']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -1787,7 +1788,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group multicheckbox is-invalid', + 'class' => 'mb-3 multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1801,7 +1802,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithError() 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -1834,7 +1835,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithError() '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -1867,7 +1868,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithError() '/label', '/div', '/fieldset', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1894,7 +1895,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1904,7 +1905,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsNestedInput() 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -1933,7 +1934,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsNestedInput() '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -1986,7 +1987,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1996,7 +1997,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsInline() 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -2025,7 +2026,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsInline() '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -2079,7 +2080,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsInlineNestedI 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -2089,7 +2090,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsInlineNestedI 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -2118,7 +2119,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsInlineNestedI '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -2168,7 +2169,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionsGroupsAndSingleEnt ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -2202,7 +2203,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionsGroupsAndSingleEnt 'option 2', '/label', '/div', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group', '/legend', @@ -2276,7 +2277,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionsGroupsAndSingleEnt ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -2322,7 +2323,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionsGroupsAndSingleEnt 'option 3', '/label', '/div', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group', '/legend', @@ -2394,7 +2395,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionsGroupsAndSingleEnt 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -2428,7 +2429,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionsGroupsAndSingleEnt 'option 2', '/label', '/div', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group', '/legend', @@ -2503,7 +2504,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionsGroupsAndSingleEnt 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -2549,7 +2550,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionsGroupsAndSingleEnt 'option 3', '/label', '/div', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group', '/legend', @@ -2617,7 +2618,7 @@ public function testDefaultAlignMultipleCheckboxControlSwitch() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php index 10ec5a83..d637731f 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php @@ -19,7 +19,7 @@ public function testDefaultAlignRadioControl() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -71,7 +71,7 @@ public function testDefaultAlignRadioControlWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['input' => [ 'type' => 'hidden', 'id' => 'users', @@ -120,7 +120,7 @@ public function testDefaultAlignRadioControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Custom Label', '/label', @@ -176,7 +176,7 @@ public function testDefaultAlignRadioControlWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'custom-label-class form-label d-block', 'foo' => 'bar']], 'Custom Label', '/label', @@ -228,7 +228,7 @@ public function testDefaultAlignRadioControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -264,9 +264,9 @@ public function testDefaultAlignRadioControlWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -290,7 +290,7 @@ public function testDefaultAlignRadioControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -326,13 +326,13 @@ public function testDefaultAlignRadioControlWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -347,7 +347,7 @@ public function testDefaultAlignRadioControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users' , 'span' => [ @@ -379,7 +379,7 @@ public function testDefaultAlignRadioControlWithCustomSpacing() ]); $expected = [ ['div' => [ - 'class' => 'custom-spacing form-group radio', + 'class' => 'custom-spacing radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -413,7 +413,7 @@ public function testDefaultAlignRadioControlWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group radio is-invalid', + 'class' => 'mb-3 radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -457,7 +457,7 @@ public function testDefaultAlignRadioControlWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -482,7 +482,7 @@ public function testDefaultAlignRadioControlWithErrorAndHelp() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group radio is-invalid', + 'class' => 'mb-3 radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -524,12 +524,12 @@ public function testDefaultAlignRadioControlWithErrorAndHelp() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -557,7 +557,7 @@ public function testDefaultAlignRadioControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group radio is-invalid', + 'class' => 'mb-3 radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -599,16 +599,16 @@ public function testDefaultAlignRadioControlWithErrorAndHelpOptions() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -632,7 +632,7 @@ public function testDefaultAlignRadioControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group radio', + 'class' => 'container-class mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -695,7 +695,7 @@ public function testDefaultAlignRadioControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group radio is-invalid', + 'class' => 'container-class mb-3 radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -739,7 +739,7 @@ public function testDefaultAlignRadioControlContainerOptionsWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -760,7 +760,7 @@ public function testDefaultAlignRadioControlNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -812,7 +812,7 @@ public function testDefaultAlignRadioControlInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -865,7 +865,7 @@ public function testDefaultAlignRadioControlInlineWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['input' => [ 'type' => 'hidden', 'id' => 'users', @@ -915,7 +915,7 @@ public function testDefaultAlignRadioControlInlineWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Custom Label', '/label', @@ -972,7 +972,7 @@ public function testDefaultAlignRadioControlInlineWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => [ 'id' => 'users-group-label', 'class' => 'custom-label-class form-label d-block', @@ -1029,7 +1029,7 @@ public function testDefaultAlignRadioControlInlineWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1065,9 +1065,9 @@ public function testDefaultAlignRadioControlInlineWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -1092,7 +1092,7 @@ public function testDefaultAlignRadioControlInlineWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1128,13 +1128,13 @@ public function testDefaultAlignRadioControlInlineWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -1150,7 +1150,7 @@ public function testDefaultAlignRadioControlInlineWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users' , 'span' => [ @@ -1188,7 +1188,7 @@ public function testDefaultAlignRadioControlInlineWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group radio is-invalid', + 'class' => 'mb-3 radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1232,7 +1232,7 @@ public function testDefaultAlignRadioControlInlineWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1259,7 +1259,7 @@ public function testDefaultAlignRadioControlInlineContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group radio', + 'class' => 'container-class mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1323,7 +1323,7 @@ public function testDefaultAlignRadioControlInlineContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group radio is-invalid', + 'class' => 'container-class mb-3 radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1367,7 +1367,7 @@ public function testDefaultAlignRadioControlInlineContainerOptionsWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1389,7 +1389,7 @@ public function testDefaultAlignRadioControlInlineNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1446,7 +1446,7 @@ public function testDefaultAlignRadioControlInlineNestedInputWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group radio is-invalid', + 'class' => 'mb-3 radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1490,7 +1490,7 @@ public function testDefaultAlignRadioControlInlineNestedInputWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1518,7 +1518,7 @@ public function testPerOptionConfiguration() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1590,7 +1590,7 @@ public function testPerOptionConfigurationInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', @@ -1663,7 +1663,7 @@ public function testPerOptionConfigurationInlineNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'form-label d-block']], 'Users', '/label', diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php index 61b3e62f..40683a46 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php @@ -18,7 +18,7 @@ public function testDefaultAlignRangeControl() 'step' => 1, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range'], + 'div' => ['class' => 'mb-3 range'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', '/label', @@ -48,7 +48,7 @@ public function testDefaultAlignRangeControlWithDisabledLabel() 'label' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range'], + 'div' => ['class' => 'mb-3 range'], 'input' => [ 'type' => 'range', 'name' => 'height', @@ -75,7 +75,7 @@ public function testDefaultAlignRangeControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range'], + 'div' => ['class' => 'mb-3 range'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Custom Label', '/label', @@ -109,7 +109,7 @@ public function testDefaultAlignRangeControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range'], + 'div' => ['class' => 'mb-3 range'], ['label' => ['class' => 'custom-label-class form-label', 'foo' => 'bar', 'for' => 'height']], 'Custom Label', '/label', @@ -139,7 +139,7 @@ public function testDefaultAlignRangeControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range'], + 'div' => ['class' => 'mb-3 range'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', '/label', @@ -153,9 +153,9 @@ public function testDefaultAlignRangeControlWithHelp() 'class' => 'form-range', 'aria-describedby' => 'height-help', ], - ['small' => ['id' => 'height-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'height-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -178,7 +178,7 @@ public function testDefaultAlignRangeControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range'], + 'div' => ['class' => 'mb-3 range'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', '/label', @@ -192,13 +192,13 @@ public function testDefaultAlignRangeControlWithHelpOptions() 'class' => 'form-range', 'aria-describedby' => 'custom-help', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -216,7 +216,7 @@ public function testDefaultAlignRangeControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range'], + 'div' => ['class' => 'mb-3 range'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height ', 'span' => [ @@ -252,7 +252,7 @@ public function testDefaultAlignRangeControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - 'div' => ['class' => 'custom-spacing form-group range'], + 'div' => ['class' => 'custom-spacing range'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', '/label', @@ -284,7 +284,7 @@ public function testDefaultAlignRangeControlWithError() 'step' => 1, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range is-invalid'], + 'div' => ['class' => 'mb-3 range is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', '/label', @@ -299,7 +299,7 @@ public function testDefaultAlignRangeControlWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'height-error', ], - ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -322,7 +322,7 @@ public function testDefaultAlignRangeControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range is-invalid'], + 'div' => ['class' => 'mb-3 range is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', '/label', @@ -337,12 +337,12 @@ public function testDefaultAlignRangeControlWithErrorAndHelp() 'aria-invalid' => 'true', 'aria-describedby' => 'height-error height-help', ], - ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'height-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'height-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -368,7 +368,7 @@ public function testDefaultAlignRangeControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group range is-invalid'], + 'div' => ['class' => 'mb-3 range is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', '/label', @@ -383,16 +383,16 @@ public function testDefaultAlignRangeControlWithErrorAndHelpOptions() 'aria-invalid' => 'true', 'aria-describedby' => 'height-error custom-help', ], - ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -415,7 +415,7 @@ public function testDefaultAlignRangeControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group range', + 'class' => 'container-class mb-3 range', ], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', @@ -454,7 +454,7 @@ public function testDefaultAlignRangeControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group range is-invalid', + 'class' => 'container-class mb-3 range is-invalid', ], ['label' => ['class' => 'form-label', 'for' => 'height']], 'Height', @@ -470,7 +470,7 @@ public function testDefaultAlignRangeControlContainerOptionsWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'height-error', ], - ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/SelectControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/SelectControlTest.php index b76ba9a3..baea9ed0 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/SelectControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/SelectControlTest.php @@ -19,7 +19,7 @@ public function testDefaultAlignSelectControl() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select'], + 'div' => ['class' => 'mb-3 select'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', @@ -51,7 +51,7 @@ public function testDefaultAlignSelectControlWithFloatingLabel() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-floating form-group select'], + 'div' => ['class' => 'mb-3 form-floating select'], ['select' => ['name' => 'users', 'id' => 'users', 'class' => 'form-select']], ['option' => ['value' => '1']], 'option 1', @@ -81,7 +81,7 @@ public function testDefaultAlignSelectControlWithDisabledLabel() 'label' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select'], + 'div' => ['class' => 'mb-3 select'], ['select' => ['name' => 'users', 'id' => 'users', 'class' => 'form-select']], ['option' => ['value' => '1']], 'option 1', @@ -108,7 +108,7 @@ public function testDefaultAlignSelectControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select'], + 'div' => ['class' => 'mb-3 select'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Custom Label', '/label', @@ -142,7 +142,7 @@ public function testDefaultAlignSelectControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select'], + 'div' => ['class' => 'mb-3 select'], 'label' => ['for' => 'users', 'class' => 'custom-label-class form-label', 'foo' => 'bar'], 'Custom Label', '/label', @@ -172,7 +172,7 @@ public function testDefaultAlignSelectControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select'], + 'div' => ['class' => 'mb-3 select'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', @@ -189,9 +189,9 @@ public function testDefaultAlignSelectControlWithHelp() 'option 2', '/option', '/select', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -215,7 +215,7 @@ public function testDefaultAlignSelectControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select'], + 'div' => ['class' => 'mb-3 select'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', @@ -232,13 +232,13 @@ public function testDefaultAlignSelectControlWithHelpOptions() 'option 2', '/option', '/select', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -257,7 +257,7 @@ public function testDefaultAlignSelectControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select'], + 'div' => ['class' => 'mb-3 select'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', 'span' => [ @@ -293,7 +293,7 @@ public function testDefaultAlignSelectControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - 'div' => ['class' => 'custom-spacing form-group select'], + 'div' => ['class' => 'custom-spacing select'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', @@ -325,7 +325,7 @@ public function testDefaultAlignSelectControlWithError() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select is-invalid'], + 'div' => ['class' => 'mb-3 select is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', @@ -343,7 +343,7 @@ public function testDefaultAlignSelectControlWithError() 'option 2', '/option', '/select', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -367,7 +367,7 @@ public function testDefaultAlignSelectControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select is-invalid'], + 'div' => ['class' => 'mb-3 select is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', @@ -385,12 +385,12 @@ public function testDefaultAlignSelectControlWithErrorAndHelp() 'option 2', '/option', '/select', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -417,7 +417,7 @@ public function testDefaultAlignSelectControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group select is-invalid'], + 'div' => ['class' => 'mb-3 select is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', @@ -435,16 +435,16 @@ public function testDefaultAlignSelectControlWithErrorAndHelpOptions() 'option 2', '/option', '/select', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -468,7 +468,7 @@ public function testDefaultAlignSelectControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group select', + 'class' => 'container-class mb-3 select', ], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', @@ -507,7 +507,7 @@ public function testDefaultAlignSelectControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group select is-invalid', + 'class' => 'container-class mb-3 select is-invalid', ], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', @@ -526,7 +526,7 @@ public function testDefaultAlignSelectControlContainerOptionsWithError() 'option 2', '/option', '/select', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -547,7 +547,7 @@ public function testDefaultAlignSelectControlInputGroupAppend() 'append' => 'append', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group select']], + ['div' => ['class' => 'mb-3 select']], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', @@ -582,7 +582,7 @@ public function testDefaultAlignSelectControlInputGroupPrepend() 'prepend' => 'prepend', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group select']], + ['div' => ['class' => 'mb-3 select']], ['label' => ['class' => 'form-label', 'for' => 'users']], 'Users', '/label', diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/StaticControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/StaticControlTest.php index cbd07f1f..1b52bd77 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/StaticControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/StaticControlTest.php @@ -17,7 +17,7 @@ public function testDefaultAlignStaticControl() $result = $this->Form->control('title', ['type' => 'staticControl']); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl'], + 'div' => ['class' => 'mb-3 staticControl'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -51,7 +51,7 @@ public function testDefaultAlignStaticControlWithoutHiddenField() 'escape' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl'], + 'div' => ['class' => 'mb-3 staticControl'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -77,7 +77,7 @@ public function testDefaultAlignStaticControlWithDisabledLabel() 'label' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl'], + 'div' => ['class' => 'mb-3 staticControl'], 'p' => ['class' => 'form-control-plaintext'], 'title', '/p', @@ -103,7 +103,7 @@ public function testDefaultAlignStaticControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl'], + 'div' => ['class' => 'mb-3 staticControl'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Custom Label', '/label', @@ -136,7 +136,7 @@ public function testDefaultAlignStaticControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl'], + 'div' => ['class' => 'mb-3 staticControl'], 'label' => ['class' => 'custom-label-class form-label', 'foo' => 'bar', 'for' => 'title'], 'Custom Label', '/label', @@ -165,7 +165,7 @@ public function testDefaultAlignStaticControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl'], + 'div' => ['class' => 'mb-3 staticControl'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -179,9 +179,9 @@ public function testDefaultAlignStaticControlWithHelp() 'aria-describedby' => 'title-help', 'value' => 'title', ], - ['small' => ['id' => 'title-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'title-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -203,7 +203,7 @@ public function testDefaultAlignStaticControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl'], + 'div' => ['class' => 'mb-3 staticControl'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -217,13 +217,13 @@ public function testDefaultAlignStaticControlWithHelpOptions() 'aria-describedby' => 'custom-help', 'value' => 'title', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -240,7 +240,7 @@ public function testDefaultAlignStaticControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl'], + 'div' => ['class' => 'mb-3 staticControl'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', 'span' => [ @@ -275,7 +275,7 @@ public function testDefaultAlignStaticControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - 'div' => ['class' => 'custom-spacing form-group staticControl'], + 'div' => ['class' => 'custom-spacing staticControl'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -306,7 +306,7 @@ public function testDefaultAlignStaticControlWithError() 'type' => 'staticControl', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl is-invalid'], + 'div' => ['class' => 'mb-3 staticControl is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -323,7 +323,7 @@ public function testDefaultAlignStaticControlWithError() 'aria-describedby' => 'title-error', 'value' => 'title', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -345,7 +345,7 @@ public function testDefaultAlignStaticControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl is-invalid'], + 'div' => ['class' => 'mb-3 staticControl is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -361,12 +361,12 @@ public function testDefaultAlignStaticControlWithErrorAndHelp() 'aria-describedby' => 'title-error title-help', 'value' => 'title', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'title-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'title-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -391,7 +391,7 @@ public function testDefaultAlignStaticControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group staticControl is-invalid'], + 'div' => ['class' => 'mb-3 staticControl is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -407,16 +407,16 @@ public function testDefaultAlignStaticControlWithErrorAndHelpOptions() 'aria-describedby' => 'title-error custom-help', 'value' => 'title', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -438,7 +438,7 @@ public function testDefaultAlignStaticControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group staticControl', + 'class' => 'container-class mb-3 staticControl', ], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', @@ -476,7 +476,7 @@ public function testDefaultAlignStaticControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group staticControl is-invalid', + 'class' => 'container-class mb-3 staticControl is-invalid', ], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', @@ -494,7 +494,7 @@ public function testDefaultAlignStaticControlContainerOptionsWithError() 'aria-describedby' => 'title-error', 'value' => 'title', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/TextControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/TextControlTest.php index 85db4ff5..370fd2fa 100644 --- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/TextControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/TextControlTest.php @@ -14,7 +14,7 @@ public function testDefaultAlignTextControl() $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'mb-3 form-group text'], + 'div' => ['class' => 'mb-3 text'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -40,7 +40,7 @@ public function testDefaultAlignTextControlWithFloatingLabel() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-floating form-group text'], + 'div' => ['class' => 'mb-3 form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -68,7 +68,7 @@ public function testDefaultAlignTextControlWithFloatingLabelAndCustomLabelText() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-floating form-group text'], + 'div' => ['class' => 'mb-3 form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -96,7 +96,7 @@ public function testDefaultAlignTextControlWithFloatingLabelAndCustomPlaceholder 'placeholder' => 'Custom Placeholder', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-floating form-group text'], + 'div' => ['class' => 'mb-3 form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -124,7 +124,7 @@ public function testDefaultAlignTextControlWithFloatingLabelAndDisabledPlacehold 'placeholder' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-floating form-group text'], + 'div' => ['class' => 'mb-3 form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -146,7 +146,7 @@ public function testDefaultAlignTextControlWithDisabledLabel() $result = $this->Form->control('title', ['label' => false]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text'], + 'div' => ['class' => 'mb-3 text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -165,7 +165,7 @@ public function testDefaultAlignTextControlWithCustomLabel() $result = $this->Form->control('title', ['label' => 'Custom Label']); $expected = [ - 'div' => ['class' => 'mb-3 form-group text'], + 'div' => ['class' => 'mb-3 text'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Custom Label', '/label', @@ -193,7 +193,7 @@ public function testDefaultAlignTextControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text'], + 'div' => ['class' => 'mb-3 text'], 'label' => ['for' => 'title', 'class' => 'custom-label-class form-label', 'foo' => 'bar'], 'Custom Label', '/label', @@ -217,7 +217,7 @@ public function testDefaultAlignTextControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text'], + 'div' => ['class' => 'mb-3 text'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -228,9 +228,9 @@ public function testDefaultAlignTextControlWithHelp() 'class' => 'form-control', 'aria-describedby' => 'title-help', ], - ['small' => ['id' => 'title-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'title-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -250,7 +250,7 @@ public function testDefaultAlignTextControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text'], + 'div' => ['class' => 'mb-3 text'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -261,13 +261,13 @@ public function testDefaultAlignTextControlWithHelpOptions() 'class' => 'form-control', 'aria-describedby' => 'custom-help', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -282,7 +282,7 @@ public function testDefaultAlignTextControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text'], + 'div' => ['class' => 'mb-3 text'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', 'span' => [ @@ -313,7 +313,7 @@ public function testDefaultAlignTextControlWithError() $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'mb-3 form-group text is-invalid'], + 'div' => ['class' => 'mb-3 text is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -326,7 +326,7 @@ public function testDefaultAlignTextControlWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -346,7 +346,7 @@ public function testDefaultAlignTextControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text is-invalid'], + 'div' => ['class' => 'mb-3 text is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -358,12 +358,12 @@ public function testDefaultAlignTextControlWithErrorAndHelp() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error title-help', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'title-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'title-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -386,7 +386,7 @@ public function testDefaultAlignTextControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text is-invalid'], + 'div' => ['class' => 'mb-3 text is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -398,16 +398,16 @@ public function testDefaultAlignTextControlWithErrorAndHelpOptions() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error custom-help', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', ]; $this->assertHtml($expected, $result); @@ -428,7 +428,7 @@ public function testDefaultAlignTextControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group text', + 'class' => 'container-class mb-3 text', ], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', @@ -462,7 +462,7 @@ public function testDefaultAlignTextControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group text is-invalid', + 'class' => 'container-class mb-3 text is-invalid', ], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', @@ -476,7 +476,7 @@ public function testDefaultAlignTextControlContainerOptionsWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxControlTest.php index 8e5f09fc..d278a724 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxControlTest.php @@ -23,7 +23,7 @@ public function testHorizontalAlignCheckboxControl() 'type' => 'checkbox', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -64,7 +64,7 @@ public function testHorizontalAlignCheckboxControlWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -102,7 +102,7 @@ public function testHorizontalAlignCheckboxControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -147,7 +147,7 @@ public function testHorizontalAlignCheckboxControlWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -188,7 +188,7 @@ public function testHorizontalAlignCheckboxControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -207,9 +207,9 @@ public function testHorizontalAlignCheckboxControlWithHelp() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', '/div', @@ -238,7 +238,7 @@ public function testHorizontalAlignCheckboxControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -257,13 +257,13 @@ public function testHorizontalAlignCheckboxControlWithHelpOptions() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', '/div', @@ -287,7 +287,7 @@ public function testHorizontalAlignCheckboxControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -334,7 +334,7 @@ public function testHorizontalAlignCheckboxControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - ['div' => ['class' => 'custom-spacing form-group row checkbox']], + ['div' => ['class' => 'custom-spacing row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -377,7 +377,7 @@ public function testHorizontalAlignCheckboxControlWithError() 'type' => 'checkbox', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox is-invalid']], + ['div' => ['class' => 'mb-3 row checkbox is-invalid']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -399,7 +399,7 @@ public function testHorizontalAlignCheckboxControlWithError() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -428,7 +428,7 @@ public function testHorizontalAlignCheckboxControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox is-invalid']], + ['div' => ['class' => 'mb-3 row checkbox is-invalid']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -449,12 +449,12 @@ public function testHorizontalAlignCheckboxControlWithErrorAndHelp() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', '/div', @@ -486,7 +486,7 @@ public function testHorizontalAlignCheckboxControlWithErrorAndHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox is-invalid']], + ['div' => ['class' => 'mb-3 row checkbox is-invalid']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -507,16 +507,16 @@ public function testHorizontalAlignCheckboxControlWithErrorAndHelpOptions() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', '/div', @@ -545,7 +545,7 @@ public function testHorizontalAlignCheckboxControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row checkbox', + 'class' => 'container-class mb-3 row checkbox', ]], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], @@ -595,7 +595,7 @@ public function testHorizontalAlignCheckboxControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row checkbox is-invalid', + 'class' => 'container-class mb-3 row checkbox is-invalid', ]], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], @@ -618,7 +618,7 @@ public function testHorizontalAlignCheckboxControlContainerOptionsWithError() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -644,7 +644,7 @@ public function testHorizontalAlignCheckboxControlNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -686,7 +686,7 @@ public function testHorizontalAlignCheckboxControlNestedInputWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -736,7 +736,7 @@ public function testHorizontalAlignCheckboxControlNestedInputWithError() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox is-invalid']], + ['div' => ['class' => 'mb-3 row checkbox is-invalid']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -758,7 +758,7 @@ public function testHorizontalAlignCheckboxControlNestedInputWithError() ]], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -784,7 +784,7 @@ public function testHorizontalAlignCheckboxControlInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -826,7 +826,7 @@ public function testHorizontalAlignCheckboxControlInlineWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -865,7 +865,7 @@ public function testHorizontalAlignCheckboxControlInlineWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -911,7 +911,7 @@ public function testHorizontalAlignCheckboxControlInlineWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -953,7 +953,7 @@ public function testHorizontalAlignCheckboxControlInlineWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -972,9 +972,9 @@ public function testHorizontalAlignCheckboxControlInlineWithHelp() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', '/div', @@ -1004,7 +1004,7 @@ public function testHorizontalAlignCheckboxControlInlineWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -1023,13 +1023,13 @@ public function testHorizontalAlignCheckboxControlInlineWithHelpOptions() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', '/div', @@ -1054,7 +1054,7 @@ public function testHorizontalAlignCheckboxControlInlineWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -1104,7 +1104,7 @@ public function testHorizontalAlignCheckboxControlInlineWithError() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox is-invalid']], + ['div' => ['class' => 'mb-3 row checkbox is-invalid']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -1126,7 +1126,7 @@ public function testHorizontalAlignCheckboxControlInlineWithError() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1158,7 +1158,7 @@ public function testHorizontalAlignCheckboxControlInlineContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row checkbox', + 'class' => 'container-class mb-3 row checkbox', ]], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], @@ -1209,7 +1209,7 @@ public function testHorizontalAlignCheckboxControlInlineContainerOptionsWithErro $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row checkbox is-invalid', + 'class' => 'container-class mb-3 row checkbox is-invalid', ]], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], @@ -1232,7 +1232,7 @@ public function testHorizontalAlignCheckboxControlInlineContainerOptionsWithErro ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1259,7 +1259,7 @@ public function testHorizontalAlignCheckboxControlInlineNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -1302,7 +1302,7 @@ public function testHorizontalAlignCheckboxControlInlineNestedInputWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check']], ['input' => [ @@ -1349,7 +1349,7 @@ public function testHorizontalAlignCheckboxControlSwitch() 'switch' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row checkbox']], + ['div' => ['class' => 'mb-3 row checkbox']], ['div' => ['class' => 'offset-sm-5 col-sm-7']], ['div' => ['class' => 'form-check form-switch']], ['input' => [ diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/ColorControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/ColorControlTest.php index 7870895a..e4529e56 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/ColorControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/ColorControlTest.php @@ -24,7 +24,7 @@ public function testHorizontalAlignColorControl() 'value' => '#ffffff', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color'], + 'div' => ['class' => 'mb-3 row color'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Color', '/label', @@ -59,7 +59,7 @@ public function testHorizontalAlignColorControlWithDisabledLabel() 'label' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color'], + 'div' => ['class' => 'mb-3 row color'], ['div' => ['class' => 'col-sm-7']], 'input' => [ 'type' => 'color', @@ -92,7 +92,7 @@ public function testHorizontalAlignColorControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color'], + 'div' => ['class' => 'mb-3 row color'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Custom Label', '/label', @@ -132,7 +132,7 @@ public function testHorizontalAlignColorControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color'], + 'div' => ['class' => 'mb-3 row color'], 'label' => [ 'for' => 'color', 'class' => 'custom-label-class col-form-label col-sm-5', @@ -172,7 +172,7 @@ public function testHorizontalAlignColorControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color'], + 'div' => ['class' => 'mb-3 row color'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Color', '/label', @@ -185,9 +185,9 @@ public function testHorizontalAlignColorControlWithHelp() 'aria-describedby' => 'color-help', 'value' => '#ffffff', ], - ['small' => ['id' => 'color-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'color-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -217,7 +217,7 @@ public function testHorizontalAlignColorControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color'], + 'div' => ['class' => 'mb-3 row color'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Color', '/label', @@ -230,13 +230,13 @@ public function testHorizontalAlignColorControlWithHelpOptions() 'aria-describedby' => 'custom-help', 'value' => '#ffffff', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -261,7 +261,7 @@ public function testHorizontalAlignColorControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color'], + 'div' => ['class' => 'mb-3 row color'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Color', 'span' => [ @@ -302,7 +302,7 @@ public function testHorizontalAlignColorControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - 'div' => ['class' => 'custom-spacing form-group row color'], + 'div' => ['class' => 'custom-spacing row color'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Color', '/label', @@ -340,7 +340,7 @@ public function testHorizontalAlignColorControlWithError() 'value' => '#ffffff', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color is-invalid'], + 'div' => ['class' => 'mb-3 row color is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Color', '/label', @@ -354,7 +354,7 @@ public function testHorizontalAlignColorControlWithError() 'aria-describedby' => 'color-error', 'value' => '#ffffff', ], - ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -384,7 +384,7 @@ public function testHorizontalAlignColorControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color is-invalid'], + 'div' => ['class' => 'mb-3 row color is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Color', '/label', @@ -398,12 +398,12 @@ public function testHorizontalAlignColorControlWithErrorAndHelp() 'aria-describedby' => 'color-error color-help', 'value' => '#ffffff', ], - ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'color-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'color-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -436,7 +436,7 @@ public function testHorizontalAlignColorControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row color is-invalid'], + 'div' => ['class' => 'mb-3 row color is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color'], 'Color', '/label', @@ -450,16 +450,16 @@ public function testHorizontalAlignColorControlWithErrorAndHelpOptions() 'aria-describedby' => 'color-error custom-help', 'value' => '#ffffff', ], - ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -490,7 +490,7 @@ public function testHorizontalAlignColorControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row color', + 'class' => 'container-class mb-3 row color', ], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color',], 'Color', @@ -535,7 +535,7 @@ public function testHorizontalAlignColorControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row color is-invalid', + 'class' => 'container-class mb-3 row color is-invalid', ], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'color',], 'Color', @@ -550,7 +550,7 @@ public function testHorizontalAlignColorControlContainerOptionsWithError() 'aria-describedby' => 'color-error', 'value' => '#ffffff', ], - ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/DateTimeControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/DateTimeControlTest.php index 291f6304..d82ee35e 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/DateTimeControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/DateTimeControlTest.php @@ -27,7 +27,7 @@ public function testHorizontalAlignDateTimeControl() 'value' => $now->format('Y-m-d H:i:s'), ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row datetime-local']], + ['div' => ['class' => 'mb-3 row datetime-local']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', '/label', @@ -64,7 +64,7 @@ public function testHorizontalAlignDateTimeControlWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row datetime-local']], + ['div' => ['class' => 'mb-3 row datetime-local']], ['div' => ['class' => 'col-sm-7']], 'input' => [ 'type' => 'datetime-local', @@ -98,7 +98,7 @@ public function testHorizontalAlignDateTimeControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row datetime-local']], + ['div' => ['class' => 'mb-3 row datetime-local']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Custom Label', '/label', @@ -139,7 +139,7 @@ public function testHorizontalAlignDateTimeControlWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row datetime-local']], + ['div' => ['class' => 'mb-3 row datetime-local']], ['label' => ['class' => 'custom-label-class col-form-label col-sm-5', 'foo' => 'bar', 'for' => 'created']], 'Custom Label', '/label', @@ -176,7 +176,7 @@ public function testHorizontalAlignDateTimeControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row time']], + ['div' => ['class' => 'mb-3 row time']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', '/label', @@ -190,9 +190,9 @@ public function testHorizontalAlignDateTimeControlWithHelp() 'step' => '1', 'value' => date('H:i:s', $now), ], - ['small' => ['id' => 'created-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'created-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -223,7 +223,7 @@ public function testHorizontalAlignDateTimeControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row time']], + ['div' => ['class' => 'mb-3 row time']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', '/label', @@ -237,13 +237,13 @@ public function testHorizontalAlignDateTimeControlWithHelpOptions() 'step' => '1', 'value' => date('H:i:s', $now), ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -269,7 +269,7 @@ public function testHorizontalAlignDateTimeControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row time']], + ['div' => ['class' => 'mb-3 row time']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created ', 'span' => [ @@ -313,7 +313,7 @@ public function testHorizontalAlignDateTimeControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - ['div' => ['class' => 'custom-spacing form-group row datetime-local']], + ['div' => ['class' => 'custom-spacing row datetime-local']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', '/label', @@ -353,7 +353,7 @@ public function testHorizontalAlignDateTimeControlWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row datetime-local is-invalid', + 'class' => 'mb-3 row datetime-local is-invalid', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', @@ -369,7 +369,7 @@ public function testHorizontalAlignDateTimeControlWithError() 'aria-describedby' => 'created-error', 'value' => $now->format('Y-m-d H:i:s'), ], - ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -401,7 +401,7 @@ public function testHorizontalAlignDateTimeControlWithErrorAndHelp() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row datetime-local is-invalid', + 'class' => 'mb-3 row datetime-local is-invalid', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', @@ -416,12 +416,12 @@ public function testHorizontalAlignDateTimeControlWithErrorAndHelp() 'aria-describedby' => 'created-error created-help', 'value' => $now->format('Y-m-d H:i:s'), ], - ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'created-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'created-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -456,7 +456,7 @@ public function testHorizontalAlignDateTimeControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row datetime-local is-invalid', + 'class' => 'mb-3 row datetime-local is-invalid', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', @@ -471,16 +471,16 @@ public function testHorizontalAlignDateTimeControlWithErrorAndHelpOptions() 'aria-describedby' => 'created-error custom-help', 'value' => $now->format('Y-m-d H:i:s'), ], - ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -511,7 +511,7 @@ public function testHorizontalAlignDateTimeControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row datetime-local', + 'class' => 'container-class mb-3 row datetime-local', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', @@ -557,7 +557,7 @@ public function testHorizontalAlignDateTimeControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row datetime-local is-invalid', + 'class' => 'container-class mb-3 row datetime-local is-invalid', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', @@ -573,7 +573,7 @@ public function testHorizontalAlignDateTimeControlContainerOptionsWithError() 'aria-describedby' => 'created-error', 'value' => $now->format('Y-m-d H:i:s'), ], - ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -600,7 +600,7 @@ public function testHorizontalAlignDateTimeControlDate() 'value' => $now, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row date']], + ['div' => ['class' => 'mb-3 row date']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', '/label', @@ -636,7 +636,7 @@ public function testHorizontalAlignDateTimeControlTime() 'value' => $now, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row time']], + ['div' => ['class' => 'mb-3 row time']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'created']], 'Created', '/label', @@ -669,37 +669,37 @@ public function testHorizontalAlignDateTimeControlCustomContainerTemplateViaTemp $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $this->Form->setTemplates([ - 'datetimeContainer' => '
{{content}}
', - 'dateContainer' => '
{{content}}
', - 'timeContainer' => '
{{content}}
', + 'datetimeContainer' => '
{{content}}
', + 'dateContainer' => '
{{content}}
', + 'timeContainer' => '
{{content}}
', ]); $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); } public function testHorizontalAlignDateTimeControlCustomContainerErrorTemplateViaOptions() @@ -721,40 +721,40 @@ public function testHorizontalAlignDateTimeControlCustomContainerErrorTemplateVi $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'datetime', 'templates' => [ - 'datetimeContainerError' => '
{{content}}
', + 'datetimeContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', 'templates' => [ - 'dateContainerError' => '
{{content}}
', + 'dateContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', 'templates' => [ - 'timeContainerError' => '
{{content}}
', + 'timeContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); } } diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php index 3d77a77d..d7258df2 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php @@ -23,7 +23,7 @@ public function testHorizontalAlignFileControl() 'type' => 'file', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -56,7 +56,7 @@ public function testHorizontalAlignFileControlWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['div' => ['class' => 'col-sm-7']], ['input' => [ 'type' => 'file', @@ -86,7 +86,7 @@ public function testHorizontalAlignFileControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'Custom Label', '/label', @@ -123,7 +123,7 @@ public function testHorizontalAlignFileControlWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['label' => [ 'class' => 'custom-label-class col-form-label col-sm-5', 'foo' => 'bar', @@ -160,7 +160,7 @@ public function testHorizontalAlignFileControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -172,9 +172,9 @@ public function testHorizontalAlignFileControlWithHelp() 'class' => 'form-control', 'aria-describedby' => 'file-help', ]], - ['small' => ['id' => 'file-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'file-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -202,7 +202,7 @@ public function testHorizontalAlignFileControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -214,13 +214,13 @@ public function testHorizontalAlignFileControlWithHelpOptions() 'class' => 'form-control', 'aria-describedby' => 'custom-help', ]], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -243,7 +243,7 @@ public function testHorizontalAlignFileControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File ', 'span' => [ @@ -282,7 +282,7 @@ public function testHorizontalAlignFileControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - ['div' => ['class' => 'custom-spacing form-group row file']], + ['div' => ['class' => 'custom-spacing row file']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -317,7 +317,7 @@ public function testHorizontalAlignFileControlWithError() 'type' => 'file', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file is-invalid']], + ['div' => ['class' => 'mb-3 row file is-invalid']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -330,7 +330,7 @@ public function testHorizontalAlignFileControlWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'file-error', ]], - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -358,7 +358,7 @@ public function testHorizontalAlignFileControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file is-invalid']], + ['div' => ['class' => 'mb-3 row file is-invalid']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -371,12 +371,12 @@ public function testHorizontalAlignFileControlWithErrorAndHelp() 'aria-invalid' => 'true', 'aria-describedby' => 'file-error file-help', ]], - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'file-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'file-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -407,7 +407,7 @@ public function testHorizontalAlignFileControlWithErrorAndHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file is-invalid']], + ['div' => ['class' => 'mb-3 row file is-invalid']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -420,16 +420,16 @@ public function testHorizontalAlignFileControlWithErrorAndHelpOptions() 'aria-invalid' => 'true', 'aria-describedby' => 'file-error custom-help', ]], - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -457,7 +457,7 @@ public function testHorizontalAlignFileControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row file', + 'class' => 'container-class mb-3 row file', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', @@ -499,7 +499,7 @@ public function testHorizontalAlignFileControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row file is-invalid', + 'class' => 'container-class mb-3 row file is-invalid', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', @@ -513,7 +513,7 @@ public function testHorizontalAlignFileControlContainerOptionsWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'file-error', ]], - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -538,7 +538,7 @@ public function testHorizontalAlignFileControlInputGroupAppend() 'append' => 'append', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -576,7 +576,7 @@ public function testHorizontalAlignFileControlInputGroupPrepend() 'prepend' => 'prepend', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file']], + ['div' => ['class' => 'mb-3 row file']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -617,7 +617,7 @@ public function testHorizontalAlignFileControlInputGroupWithError() 'append' => 'append', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row file is-invalid']], + ['div' => ['class' => 'mb-3 row file is-invalid']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'file']], 'File', '/label', @@ -635,7 +635,7 @@ public function testHorizontalAlignFileControlInputGroupWithError() 'append', '/span', '/div', - ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/MultipleCheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/MultipleCheckboxControlTest.php index c4fb137e..e8b918fa 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/MultipleCheckboxControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/MultipleCheckboxControlTest.php @@ -27,7 +27,7 @@ public function testHorizontalAlignMultipleCheckboxControl() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -90,7 +90,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithDisabledLabel() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -153,7 +153,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithCustomLabel() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -223,7 +223,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithCustomLabelOptions ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -289,7 +289,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithHelp() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -329,9 +329,9 @@ public function testHorizontalAlignMultipleCheckboxControlWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -364,7 +364,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithHelpOptions() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -404,13 +404,13 @@ public function testHorizontalAlignMultipleCheckboxControlWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -434,7 +434,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users ', 'span' => [ @@ -475,7 +475,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithCustomSpacing() ]); $expected = [ ['div' => [ - 'class' => 'custom-spacing form-group row multicheckbox', + 'class' => 'custom-spacing row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -518,7 +518,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox is-invalid', + 'class' => 'mb-3 row multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -561,7 +561,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -594,7 +594,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithErrorAndHelp() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox is-invalid', + 'class' => 'mb-3 row multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -637,12 +637,12 @@ public function testHorizontalAlignMultipleCheckboxControlWithErrorAndHelp() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -678,7 +678,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithErrorAndHelpOption ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox is-invalid', + 'class' => 'mb-3 row multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -721,16 +721,16 @@ public function testHorizontalAlignMultipleCheckboxControlWithErrorAndHelpOption 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -762,7 +762,7 @@ public function testHorizontalAlignMultipleCheckboxControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row multicheckbox', + 'class' => 'container-class mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -834,7 +834,7 @@ public function testHorizontalAlignMultipleCheckboxControlContainerOptionsWithEr $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row multicheckbox is-invalid', + 'class' => 'container-class mb-3 row multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -877,7 +877,7 @@ public function testHorizontalAlignMultipleCheckboxControlContainerOptionsWithEr 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -906,7 +906,7 @@ public function testHorizontalAlignMultipleCheckboxControlNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -971,7 +971,7 @@ public function testHorizontalAlignMultipleCheckboxControlNestedInputWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox is-invalid', + 'class' => 'mb-3 row multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1014,7 +1014,7 @@ public function testHorizontalAlignMultipleCheckboxControlNestedInputWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1043,7 +1043,7 @@ public function testHorizontalAlignMultipleCheckboxControlInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1106,7 +1106,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithDisabledLabe ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1169,7 +1169,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithCustomLabel( ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1239,7 +1239,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithCustomLabelO ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1305,7 +1305,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithHelp() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1345,9 +1345,9 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -1381,7 +1381,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithHelpOptions( ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox', + 'class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1421,13 +1421,13 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithHelpOptions( 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -1452,7 +1452,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users ', 'span' => [ @@ -1499,7 +1499,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox is-invalid', + 'class' => 'mb-3 row multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1542,7 +1542,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1577,7 +1577,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineContainerOptions $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row multicheckbox', + 'class' => 'container-class mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1650,7 +1650,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineContainerOptions $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row multicheckbox is-invalid', + 'class' => 'container-class mb-3 row multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1693,7 +1693,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineContainerOptions 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1723,7 +1723,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1789,7 +1789,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroups() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1800,7 +1800,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroups() 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -1829,7 +1829,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroups() '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -1891,7 +1891,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsWithCustom ]); $expected = [ ['div' => [ - 'class' => 'custom-spacing form-group row multicheckbox', + 'class' => 'custom-spacing row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1905,7 +1905,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsWithCustom 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'custom-spacing form-group']], + ['fieldset' => ['class' => 'custom-spacing']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -1934,7 +1934,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsWithCustom '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'custom-spacing form-group']], + ['fieldset' => ['class' => 'custom-spacing']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -1998,7 +1998,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsWithError( ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row multicheckbox is-invalid', + 'class' => 'mb-3 row multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -2013,7 +2013,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsWithError( 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -2046,7 +2046,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsWithError( '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -2079,7 +2079,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsWithError( '/label', '/div', '/fieldset', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -2114,7 +2114,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsNestedInpu 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -2125,7 +2125,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsNestedInpu 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -2154,7 +2154,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsNestedInpu '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -2215,7 +2215,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -2226,7 +2226,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsInline() 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -2255,7 +2255,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsInline() '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -2317,7 +2317,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsInlineNest 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -2328,7 +2328,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsInlineNest 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 1', '/legend', @@ -2357,7 +2357,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsInlineNest '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group 2', '/legend', @@ -2415,7 +2415,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionsGroupsAndSingle ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -2450,7 +2450,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionsGroupsAndSingle 'option 2', '/label', '/div', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group', '/legend', @@ -2532,7 +2532,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionsGroupsAndSingle ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -2579,7 +2579,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionsGroupsAndSingle 'option 3', '/label', '/div', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group', '/legend', @@ -2659,7 +2659,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionsGroupsAndSingle 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -2694,7 +2694,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionsGroupsAndSingle 'option 2', '/label', '/div', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group', '/legend', @@ -2777,7 +2777,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionsGroupsAndSingle 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -2824,7 +2824,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionsGroupsAndSingle 'option 3', '/label', '/div', - ['fieldset' => ['class' => 'mb-3 form-group']], + ['fieldset' => ['class' => 'mb-3']], ['legend' => ['class' => 'col-form-label pt-0']], 'group', '/legend', @@ -2900,7 +2900,7 @@ public function testHorizontalAlignMultipleCheckboxControlSwitch() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioControlTest.php index 595b70fa..cbb7391f 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioControlTest.php @@ -27,7 +27,7 @@ public function testHorizontalAlignRadioControl() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -88,7 +88,7 @@ public function testHorizontalAlignRadioControlWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['div' => ['class' => 'col-sm-7']], ['input' => [ 'type' => 'hidden', @@ -146,7 +146,7 @@ public function testHorizontalAlignRadioControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Custom Label', '/label', @@ -211,7 +211,7 @@ public function testHorizontalAlignRadioControlWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'custom-label-class col-form-label col-sm-5 d-block pt-0', 'foo' => 'bar']], 'Custom Label', '/label', @@ -272,7 +272,7 @@ public function testHorizontalAlignRadioControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -309,9 +309,9 @@ public function testHorizontalAlignRadioControlWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -343,7 +343,7 @@ public function testHorizontalAlignRadioControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -380,13 +380,13 @@ public function testHorizontalAlignRadioControlWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -409,7 +409,7 @@ public function testHorizontalAlignRadioControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users ' , 'span' => [ @@ -450,7 +450,7 @@ public function testHorizontalAlignRadioControlWithCustomSpacing() ]); $expected = [ ['div' => [ - 'class' => 'custom-spacing form-group row radio', + 'class' => 'custom-spacing row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -493,7 +493,7 @@ public function testHorizontalAlignRadioControlWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row radio is-invalid', + 'class' => 'mb-3 row radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -538,7 +538,7 @@ public function testHorizontalAlignRadioControlWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -571,7 +571,7 @@ public function testHorizontalAlignRadioControlWithErrorAndHelp() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row radio is-invalid', + 'class' => 'mb-3 row radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -614,12 +614,12 @@ public function testHorizontalAlignRadioControlWithErrorAndHelp() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -655,7 +655,7 @@ public function testHorizontalAlignRadioControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row radio is-invalid', + 'class' => 'mb-3 row radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -698,16 +698,16 @@ public function testHorizontalAlignRadioControlWithErrorAndHelpOptions() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -739,7 +739,7 @@ public function testHorizontalAlignRadioControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row radio', + 'class' => 'container-class mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -811,7 +811,7 @@ public function testHorizontalAlignRadioControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row radio is-invalid', + 'class' => 'container-class mb-3 row radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -856,7 +856,7 @@ public function testHorizontalAlignRadioControlContainerOptionsWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -885,7 +885,7 @@ public function testHorizontalAlignRadioControlNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -950,7 +950,7 @@ public function testHorizontalAlignRadioControlNestedInputWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row radio is-invalid', + 'class' => 'mb-3 row radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -995,7 +995,7 @@ public function testHorizontalAlignRadioControlNestedInputWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1024,7 +1024,7 @@ public function testHorizontalAlignRadioControlInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1086,7 +1086,7 @@ public function testHorizontalAlignRadioControlInlineWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['div' => ['class' => 'col-sm-7']], ['input' => [ 'type' => 'hidden', @@ -1145,7 +1145,7 @@ public function testHorizontalAlignRadioControlInlineWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Custom Label', '/label', @@ -1211,7 +1211,7 @@ public function testHorizontalAlignRadioControlInlineWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'custom-label-class col-form-label col-sm-5 d-block pt-0', 'foo' => 'bar']], 'Custom Label', '/label', @@ -1273,7 +1273,7 @@ public function testHorizontalAlignRadioControlInlineWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1310,9 +1310,9 @@ public function testHorizontalAlignRadioControlInlineWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -1345,7 +1345,7 @@ public function testHorizontalAlignRadioControlInlineWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1382,13 +1382,13 @@ public function testHorizontalAlignRadioControlInlineWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -1412,7 +1412,7 @@ public function testHorizontalAlignRadioControlInlineWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users ' , 'span' => [ @@ -1459,7 +1459,7 @@ public function testHorizontalAlignRadioControlInlineWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row radio is-invalid', + 'class' => 'mb-3 row radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1504,7 +1504,7 @@ public function testHorizontalAlignRadioControlInlineWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1539,7 +1539,7 @@ public function testHorizontalAlignRadioControlInlineContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row radio', + 'class' => 'container-class mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1612,7 +1612,7 @@ public function testHorizontalAlignRadioControlInlineContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row radio is-invalid', + 'class' => 'container-class mb-3 row radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1657,7 +1657,7 @@ public function testHorizontalAlignRadioControlInlineContainerOptionsWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1687,7 +1687,7 @@ public function testHorizontalAlignRadioControlInlineNestedInput() 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1753,7 +1753,7 @@ public function testHorizontalAlignRadioControlInlineNestedInputWithError() ]); $expected = [ ['div' => [ - 'class' => 'mb-3 form-group row radio is-invalid', + 'class' => 'mb-3 row radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1798,7 +1798,7 @@ public function testHorizontalAlignRadioControlInlineNestedInputWithError() 'option 2', '/label', '/div', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1834,7 +1834,7 @@ public function testHorizontalAlignRadioControlPerOptionConfiguration() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1915,7 +1915,7 @@ public function testHorizontalAlignRadioControlPerOptionConfigurationInline() 'inline' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', @@ -1997,7 +1997,7 @@ public function testHorizontalAlignRadioControlPerOptionConfigurationInlineNeste 'nestedInput' => true, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], + ['div' => ['class' => 'mb-3 row radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label']], ['label' => ['id' => 'users-group-label', 'class' => 'col-form-label col-sm-5 d-block pt-0']], 'Users', '/label', diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php index 430c4797..bd3e4aee 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php @@ -26,7 +26,7 @@ public function testHorizontalAlignRangeControl() 'step' => 1, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range'], + 'div' => ['class' => 'mb-3 row range'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', '/label', @@ -65,7 +65,7 @@ public function testHorizontalAlignRangeControlWithDisabledLabel() 'label' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range'], + 'div' => ['class' => 'mb-3 row range'], ['div' => ['class' => 'col-sm-7']], 'input' => [ 'type' => 'range', @@ -101,7 +101,7 @@ public function testHorizontalAlignRangeControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range'], + 'div' => ['class' => 'mb-3 row range'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Custom Label', '/label', @@ -144,7 +144,7 @@ public function testHorizontalAlignRangeControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range'], + 'div' => ['class' => 'mb-3 row range'], ['label' => [ 'class' => 'custom-label-class col-form-label col-sm-5 pt-0', 'foo' => 'bar', @@ -187,7 +187,7 @@ public function testHorizontalAlignRangeControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range'], + 'div' => ['class' => 'mb-3 row range'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', '/label', @@ -202,9 +202,9 @@ public function testHorizontalAlignRangeControlWithHelp() 'class' => 'form-range', 'aria-describedby' => 'height-help', ], - ['small' => ['id' => 'height-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'height-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -235,7 +235,7 @@ public function testHorizontalAlignRangeControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range'], + 'div' => ['class' => 'mb-3 row range'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', '/label', @@ -250,13 +250,13 @@ public function testHorizontalAlignRangeControlWithHelpOptions() 'class' => 'form-range', 'aria-describedby' => 'custom-help', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -282,7 +282,7 @@ public function testHorizontalAlignRangeControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range'], + 'div' => ['class' => 'mb-3 row range'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', 'span' => [ @@ -327,7 +327,7 @@ public function testHorizontalAlignRangeControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - 'div' => ['class' => 'custom-spacing form-group row range'], + 'div' => ['class' => 'custom-spacing row range'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', '/label', @@ -368,7 +368,7 @@ public function testHorizontalAlignRangeControlWithError() 'step' => 1, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range is-invalid'], + 'div' => ['class' => 'mb-3 row range is-invalid'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', '/label', @@ -384,7 +384,7 @@ public function testHorizontalAlignRangeControlWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'height-error', ], - ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -415,7 +415,7 @@ public function testHorizontalAlignRangeControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range is-invalid'], + 'div' => ['class' => 'mb-3 row range is-invalid'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', '/label', @@ -431,12 +431,12 @@ public function testHorizontalAlignRangeControlWithErrorAndHelp() 'aria-invalid' => 'true', 'aria-describedby' => 'height-error height-help', ], - ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'height-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'height-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -470,7 +470,7 @@ public function testHorizontalAlignRangeControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row range is-invalid'], + 'div' => ['class' => 'mb-3 row range is-invalid'], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', '/label', @@ -486,16 +486,16 @@ public function testHorizontalAlignRangeControlWithErrorAndHelpOptions() 'aria-invalid' => 'true', 'aria-describedby' => 'height-error custom-help', ], - ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -526,7 +526,7 @@ public function testHorizontalAlignRangeControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row range', + 'class' => 'container-class mb-3 row range', ], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', @@ -574,7 +574,7 @@ public function testHorizontalAlignRangeControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row range is-invalid', + 'class' => 'container-class mb-3 row range is-invalid', ], ['label' => ['class' => 'col-form-label col-sm-5 pt-0', 'for' => 'height']], 'Height', @@ -591,7 +591,7 @@ public function testHorizontalAlignRangeControlContainerOptionsWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'height-error', ], - ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SelectControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SelectControlTest.php index acecefe1..ce883058 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SelectControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SelectControlTest.php @@ -27,7 +27,7 @@ public function testHorizontalAlignSelectControl() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', @@ -68,7 +68,7 @@ public function testHorizontalAlignSelectControlWithFloatingLabel() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['div' => ['class' => 'offset-sm-5 col-sm-7 form-floating']], ['select' => ['name' => 'users', 'id' => 'users', 'class' => 'form-select']], ['option' => ['value' => '1']], @@ -107,7 +107,7 @@ public function testHorizontalAlignSelectControlWithDisabledLabel() 'label' => false, ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['div' => ['class' => 'col-sm-7']], ['select' => ['name' => 'users', 'id' => 'users', 'class' => 'form-select']], ['option' => ['value' => '1']], @@ -143,7 +143,7 @@ public function testHorizontalAlignSelectControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Custom Label', '/label', @@ -186,7 +186,7 @@ public function testHorizontalAlignSelectControlWithCustomLabelOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['label' => [ 'class' => 'custom-label-class col-form-label col-sm-5', 'foo' => 'bar', @@ -229,7 +229,7 @@ public function testHorizontalAlignSelectControlWithHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', @@ -247,9 +247,9 @@ public function testHorizontalAlignSelectControlWithHelp() 'option 2', '/option', '/select', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -281,7 +281,7 @@ public function testHorizontalAlignSelectControlWithHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', @@ -299,13 +299,13 @@ public function testHorizontalAlignSelectControlWithHelpOptions() 'option 2', '/option', '/select', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -332,7 +332,7 @@ public function testHorizontalAlignSelectControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', 'span' => [ @@ -377,7 +377,7 @@ public function testHorizontalAlignSelectControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - ['div' => ['class' => 'custom-spacing form-group row select']], + ['div' => ['class' => 'custom-spacing row select']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', @@ -418,7 +418,7 @@ public function testHorizontalAlignSelectControlWithError() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select is-invalid']], + ['div' => ['class' => 'mb-3 row select is-invalid']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', @@ -437,7 +437,7 @@ public function testHorizontalAlignSelectControlWithError() 'option 2', '/option', '/select', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -469,7 +469,7 @@ public function testHorizontalAlignSelectControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select is-invalid']], + ['div' => ['class' => 'mb-3 row select is-invalid']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', @@ -488,12 +488,12 @@ public function testHorizontalAlignSelectControlWithErrorAndHelp() 'option 2', '/option', '/select', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'users-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -528,7 +528,7 @@ public function testHorizontalAlignSelectControlWithErrorAndHelpOptions() ], ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select is-invalid']], + ['div' => ['class' => 'mb-3 row select is-invalid']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', @@ -547,16 +547,16 @@ public function testHorizontalAlignSelectControlWithErrorAndHelpOptions() 'option 2', '/option', '/select', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -588,7 +588,7 @@ public function testHorizontalAlignSelectControlContainerOptions() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row select', + 'class' => 'container-class mb-3 row select', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', @@ -636,7 +636,7 @@ public function testHorizontalAlignSelectControlContainerOptionsWithError() $expected = [ ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row select is-invalid', + 'class' => 'container-class mb-3 row select is-invalid', ]], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', @@ -656,7 +656,7 @@ public function testHorizontalAlignSelectControlContainerOptionsWithError() 'option 2', '/option', '/select', - ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -685,7 +685,7 @@ public function testHorizontalAlignSelectControlInputGroupAppend() 'append' => 'append', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', @@ -729,7 +729,7 @@ public function testHorizontalAlignSelectControlInputGroupPrepend() 'prepend' => 'prepend', ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row select']], + ['div' => ['class' => 'mb-3 row select']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'users']], 'Users', '/label', diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/StaticControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/StaticControlTest.php index 4ed3bfe0..c467d973 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/StaticControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/StaticControlTest.php @@ -25,7 +25,7 @@ public function testHorizontalAlignStaticControl() $result = $this->Form->control('title', ['type' => 'staticControl']); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl'], + 'div' => ['class' => 'mb-3 row staticControl'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -68,7 +68,7 @@ public function testHorizontalAlignStaticControlWithoutHiddenField() 'escape' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl'], + 'div' => ['class' => 'mb-3 row staticControl'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -103,7 +103,7 @@ public function testHorizontalAlignStaticControlWithDisabledLabel() 'label' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl'], + 'div' => ['class' => 'mb-3 row staticControl'], ['div' => ['class' => 'col-sm-7']], 'p' => ['class' => 'form-control-plaintext'], 'title', @@ -138,7 +138,7 @@ public function testHorizontalAlignStaticControlWithCustomLabel() 'label' => 'Custom Label', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl'], + 'div' => ['class' => 'mb-3 row staticControl'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Custom Label', '/label', @@ -180,7 +180,7 @@ public function testHorizontalAlignStaticControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl'], + 'div' => ['class' => 'mb-3 row staticControl'], 'label' => ['class' => 'custom-label-class col-form-label col-sm-5', 'foo' => 'bar', 'for' => 'title'], 'Custom Label', '/label', @@ -218,7 +218,7 @@ public function testHorizontalAlignStaticControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl'], + 'div' => ['class' => 'mb-3 row staticControl'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -233,9 +233,9 @@ public function testHorizontalAlignStaticControlWithHelp() 'aria-describedby' => 'title-help', 'value' => 'title', ], - ['small' => ['id' => 'title-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'title-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -265,7 +265,7 @@ public function testHorizontalAlignStaticControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl'], + 'div' => ['class' => 'mb-3 row staticControl'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -280,13 +280,13 @@ public function testHorizontalAlignStaticControlWithHelpOptions() 'aria-describedby' => 'custom-help', 'value' => 'title', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -311,7 +311,7 @@ public function testHorizontalAlignStaticControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl'], + 'div' => ['class' => 'mb-3 row staticControl'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', 'span' => [ @@ -355,7 +355,7 @@ public function testHorizontalAlignStaticControlWithCustomSpacing() 'spacing' => 'custom-spacing', ]); $expected = [ - 'div' => ['class' => 'custom-spacing form-group row staticControl'], + 'div' => ['class' => 'custom-spacing row staticControl'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -395,7 +395,7 @@ public function testHorizontalAlignStaticControlWithError() 'type' => 'staticControl', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl is-invalid'], + 'div' => ['class' => 'mb-3 row staticControl is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -413,7 +413,7 @@ public function testHorizontalAlignStaticControlWithError() 'aria-describedby' => 'title-error', 'value' => 'title', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -443,7 +443,7 @@ public function testHorizontalAlignStaticControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl is-invalid'], + 'div' => ['class' => 'mb-3 row staticControl is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -460,12 +460,12 @@ public function testHorizontalAlignStaticControlWithErrorAndHelp() 'aria-describedby' => 'title-error title-help', 'value' => 'title', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'title-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'title-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -498,7 +498,7 @@ public function testHorizontalAlignStaticControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row staticControl is-invalid'], + 'div' => ['class' => 'mb-3 row staticControl is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -515,16 +515,16 @@ public function testHorizontalAlignStaticControlWithErrorAndHelpOptions() 'aria-describedby' => 'title-error custom-help', 'value' => 'title', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -554,7 +554,7 @@ public function testHorizontalAlignStaticControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row staticControl', + 'class' => 'container-class mb-3 row staticControl', ], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', @@ -601,7 +601,7 @@ public function testHorizontalAlignStaticControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row staticControl is-invalid', + 'class' => 'container-class mb-3 row staticControl is-invalid', ], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', @@ -620,7 +620,7 @@ public function testHorizontalAlignStaticControlContainerOptionsWithError() 'aria-describedby' => 'title-error', 'value' => 'title', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SubmitControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SubmitControlTest.php index 8e645f42..6a8ed1fa 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SubmitControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SubmitControlTest.php @@ -21,7 +21,7 @@ public function testHorizontalAlignSubmit() $result = $this->Form->submit('Submit'); $expected = [ - 'div' => ['class' => 'form-group row'], + 'div' => ['class' => 'row'], ['div' => ['class' => 'offset-sm-5 col-sm-7']], 'input' => [ 'type' => 'submit', @@ -54,7 +54,7 @@ public function testHorizontalAlignSubmitContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group row', + 'class' => 'container-class row', ], ['div' => ['class' => 'offset-sm-5 col-sm-7']], 'input' => [ diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/TextControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/TextControlTest.php index f630985a..45f161c5 100644 --- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/TextControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/TextControlTest.php @@ -22,7 +22,7 @@ public function testHorizontalAlignTextControl() $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -57,7 +57,7 @@ public function testHorizontalAlignTextControlWithFloatingLabel() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], ['div' => ['class' => 'offset-sm-5 col-sm-7 form-floating']], 'input' => [ 'type' => 'text', @@ -94,7 +94,7 @@ public function testHorizontalAlignTextControlWithFloatingLabelAndCustomLabelTex ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], ['div' => ['class' => 'offset-sm-5 col-sm-7 form-floating']], 'input' => [ 'type' => 'text', @@ -131,7 +131,7 @@ public function testHorizontalAlignTextControlWithFloatingLabelAndCustomPlacehol 'placeholder' => 'Custom Placeholder', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], ['div' => ['class' => 'offset-sm-5 col-sm-7 form-floating']], 'input' => [ 'type' => 'text', @@ -168,7 +168,7 @@ public function testHorizontalAlignTextControlWithFloatingLabelAndDisabledPlaceh 'placeholder' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], ['div' => ['class' => 'offset-sm-5 col-sm-7 form-floating']], 'input' => [ 'type' => 'text', @@ -199,7 +199,7 @@ public function testHorizontalAlignTextControlWithDisabledLabel() $result = $this->Form->control('title', ['label' => false]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], ['div' => ['class' => 'col-sm-7']], 'input' => [ 'type' => 'text', @@ -227,7 +227,7 @@ public function testHorizontalAlignTextControlWithCustomLabel() $result = $this->Form->control('title', ['label' => 'Custom Label']); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Custom Label', '/label', @@ -264,7 +264,7 @@ public function testHorizontalAlignTextControlWithCustomLabelOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], 'label' => [ 'for' => 'title', 'class' => 'custom-label-class col-form-label col-sm-5', @@ -301,7 +301,7 @@ public function testHorizontalAlignTextControlWithHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -313,9 +313,9 @@ public function testHorizontalAlignTextControlWithHelp() 'class' => 'form-control', 'aria-describedby' => 'title-help', ], - ['small' => ['id' => 'title-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'title-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -343,7 +343,7 @@ public function testHorizontalAlignTextControlWithHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -355,13 +355,13 @@ public function testHorizontalAlignTextControlWithHelpOptions() 'class' => 'form-control', 'aria-describedby' => 'custom-help', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -384,7 +384,7 @@ public function testHorizontalAlignTextControlWithTooltip() 'tooltip' => 'Tooltip text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text'], + 'div' => ['class' => 'mb-3 row text'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', 'span' => [ @@ -424,7 +424,7 @@ public function testHorizontalAlignTextControlWithError() $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text is-invalid'], + 'div' => ['class' => 'mb-3 row text is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -438,7 +438,7 @@ public function testHorizontalAlignTextControlWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -466,7 +466,7 @@ public function testHorizontalAlignTextControlWithErrorAndHelp() 'help' => 'Help text', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text is-invalid'], + 'div' => ['class' => 'mb-3 row text is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -479,12 +479,12 @@ public function testHorizontalAlignTextControlWithErrorAndHelp() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error title-help', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => ['id' => 'title-help', 'class' => 'd-block form-text text-muted']], + ['div' => ['id' => 'title-help', 'class' => 'form-text']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -515,7 +515,7 @@ public function testHorizontalAlignTextControlWithErrorAndHelpOptions() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text is-invalid'], + 'div' => ['class' => 'mb-3 row text is-invalid'], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title'], 'Title', '/label', @@ -528,16 +528,16 @@ public function testHorizontalAlignTextControlWithErrorAndHelpOptions() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error custom-help', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class d-block form-text text-muted', + 'class' => 'help-class form-text', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -566,7 +566,7 @@ public function testHorizontalAlignTextControlContainerOptions() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row text', + 'class' => 'container-class mb-3 row text', ], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title',], 'Title', @@ -609,7 +609,7 @@ public function testHorizontalAlignTextControlContainerOptionsWithError() $expected = [ 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class mb-3 form-group row text is-invalid', + 'class' => 'container-class mb-3 row text is-invalid', ], 'label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title',], 'Title', @@ -624,7 +624,7 @@ public function testHorizontalAlignTextControlContainerOptionsWithError() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/CheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/CheckboxControlTest.php index 6034dddd..0e3983bb 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/CheckboxControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/CheckboxControlTest.php @@ -182,9 +182,9 @@ public function testInlineAlignCheckboxControlWithHelp() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -227,13 +227,13 @@ public function testInlineAlignCheckboxControlWithHelpOptions() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -365,9 +365,9 @@ public function testInlineAlignCheckboxControlWithErrorAndHelp() ['div' => ['id' => 'users-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -418,13 +418,13 @@ public function testInlineAlignCheckboxControlWithErrorAndHelpOptions() ['div' => ['id' => 'users-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -671,9 +671,9 @@ public function testInlineAlignCheckboxControlInlineWithHelp() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -717,13 +717,13 @@ public function testInlineAlignCheckboxControlInlineWithHelpOptions() ['label' => ['class' => 'form-check-label', 'for' => 'users']], 'Users', '/label', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/ColorControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/ColorControlTest.php index f7579cef..602d4051 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/ColorControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/ColorControlTest.php @@ -19,7 +19,7 @@ public function testInlineAlignColorControl() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group color'], + 'div' => ['class' => 'color'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', '/label', @@ -49,7 +49,7 @@ public function testInlineAlignColorControlWithDisabledLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group color'], + 'div' => ['class' => 'color'], 'input' => [ 'type' => 'color', 'name' => 'color', @@ -76,7 +76,7 @@ public function testInlineAlignColorControlWithCustomLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group color'], + 'div' => ['class' => 'color'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Custom Label', '/label', @@ -110,7 +110,7 @@ public function testInlineAlignColorControlWithCustomLabelOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group color'], + 'div' => ['class' => 'color'], 'label' => [ 'class' => 'custom-label-class form-label visually-hidden', 'foo' => 'bar', @@ -144,7 +144,7 @@ public function testInlineAlignColorControlWithHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group color'], + 'div' => ['class' => 'color'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', '/label', @@ -156,9 +156,9 @@ public function testInlineAlignColorControlWithHelp() 'aria-describedby' => 'color-help', 'value' => '#ffffff', ], - ['small' => ['id' => 'color-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'color-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -183,7 +183,7 @@ public function testInlineAlignColorControlWithHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group color'], + 'div' => ['class' => 'color'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', '/label', @@ -195,13 +195,13 @@ public function testInlineAlignColorControlWithHelpOptions() 'aria-describedby' => 'custom-help', 'value' => '#ffffff', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -221,7 +221,7 @@ public function testInlineAlignColorControlWithTooltip() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group color'], + 'div' => ['class' => 'color'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', 'span' => [ @@ -259,7 +259,7 @@ public function testInlineAlignColorControlWithError() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative color is-invalid'], + 'div' => ['class' => 'position-relative color is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', '/label', @@ -297,7 +297,7 @@ public function testInlineAlignColorControlWithErrorAndHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative color is-invalid'], + 'div' => ['class' => 'position-relative color is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', '/label', @@ -313,9 +313,9 @@ public function testInlineAlignColorControlWithErrorAndHelp() ['div' => ['id' => 'color-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'color-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'color-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -343,7 +343,7 @@ public function testInlineAlignColorControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative color is-invalid'], + 'div' => ['class' => 'position-relative color is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', '/label', @@ -359,13 +359,13 @@ public function testInlineAlignColorControlWithErrorAndHelpOptions() ['div' => ['id' => 'color-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -391,7 +391,7 @@ public function testInlineAlignColorControlContainerOptions() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group color', + 'class' => 'container-class color', ], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', @@ -431,7 +431,7 @@ public function testInlineAlignColorControlContainerOptionsWithError() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative color is-invalid', + 'class' => 'container-class position-relative color is-invalid', ], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'color'], 'Color', diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/DateTimeControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/DateTimeControlTest.php index 8673f25f..5c9dd6ed 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/DateTimeControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/DateTimeControlTest.php @@ -24,7 +24,7 @@ public function testInlineAlignDateTimeControl() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative datetime-local']], + ['div' => ['class' => 'datetime-local']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', '/label', @@ -58,7 +58,7 @@ public function testInlineAlignDateTimeControlWithDisabledLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative datetime-local']], + ['div' => ['class' => 'datetime-local']], 'input' => [ 'type' => 'datetime-local', 'name' => 'created', @@ -89,7 +89,7 @@ public function testInlineAlignDateTimeControlWithCustomLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative datetime-local']], + ['div' => ['class' => 'datetime-local']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Custom Label', '/label', @@ -127,7 +127,7 @@ public function testInlineAlignDateTimeControlWithCustomLabelOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative datetime-local']], + ['div' => ['class' => 'datetime-local']], ['label' => [ 'class' => 'custom-label-class form-label visually-hidden', 'foo' => 'bar', @@ -165,7 +165,7 @@ public function testInlineAlignDateTimeControlWithHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative datetime-local']], + ['div' => ['class' => 'datetime-local']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', '/label', @@ -177,9 +177,9 @@ public function testInlineAlignDateTimeControlWithHelp() 'aria-describedby' => 'created-help', 'value' => $now->format('Y-m-d H:i:s'), ], - ['small' => ['id' => 'created-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'created-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -208,7 +208,7 @@ public function testInlineAlignDateTimeControlWithHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative datetime-local']], + ['div' => ['class' => 'datetime-local']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', '/label', @@ -220,13 +220,13 @@ public function testInlineAlignDateTimeControlWithHelpOptions() 'aria-describedby' => 'custom-help', 'value' => $now->format('Y-m-d H:i:s'), ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -250,7 +250,7 @@ public function testInlineAlignDateTimeControlWithTooltip() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative datetime-local']], + ['div' => ['class' => 'datetime-local']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created ', 'span' => [ @@ -293,7 +293,7 @@ public function testInlineAlignDateTimeControlWithError() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative datetime-local is-invalid', + 'class' => 'position-relative datetime-local is-invalid', ]], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', @@ -338,7 +338,7 @@ public function testInlineAlignDateTimeControlContainerOptions() ['div' => ['class' => 'col-auto']], ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative datetime-local', + 'class' => 'container-class datetime-local', ]], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', @@ -377,7 +377,7 @@ public function testInlineAlignDateTimeControlWithErrorAndHelp() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative datetime-local is-invalid', + 'class' => 'position-relative datetime-local is-invalid', ]], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', @@ -394,9 +394,9 @@ public function testInlineAlignDateTimeControlWithErrorAndHelp() ['div' => ['id' => 'created-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'created-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'created-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -429,7 +429,7 @@ public function testInlineAlignDateTimeControlWithErrorAndHelpOptions() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative datetime-local is-invalid', + 'class' => 'position-relative datetime-local is-invalid', ]], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', @@ -446,13 +446,13 @@ public function testInlineAlignDateTimeControlWithErrorAndHelpOptions() ['div' => ['id' => 'created-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -487,7 +487,7 @@ public function testInlineAlignDateTimeControlContainerOptionsWithError() ['div' => ['class' => 'col-auto']], ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative datetime-local is-invalid', + 'class' => 'container-class position-relative datetime-local is-invalid', ]], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', @@ -526,7 +526,7 @@ public function testInlineAlignDateTimeControlDate() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative date']], + ['div' => ['class' => 'date']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', '/label', @@ -559,7 +559,7 @@ public function testInlineAlignDateTimeControlTime() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative time']], + ['div' => ['class' => 'time']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'created']], 'Created', '/label', @@ -588,37 +588,37 @@ public function testInlineAlignDateTimeControlCustomContainerTemplateViaTemplate $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $this->Form->setTemplates([ - 'datetimeContainer' => '
{{content}}
', - 'dateContainer' => '
{{content}}
', - 'timeContainer' => '
{{content}}
', + 'datetimeContainer' => '
{{content}}
', + 'dateContainer' => '
{{content}}
', + 'timeContainer' => '
{{content}}
', ]); $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); } public function testInlineAlignDateTimeControlCustomContainerErrorTemplateViaOptions() @@ -637,40 +637,40 @@ public function testInlineAlignDateTimeControlCustomContainerErrorTemplateViaOpt $result = $this->Form->control('created', [ 'type' => 'datetime', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'datetime', 'templates' => [ - 'datetimeContainerError' => '
{{content}}
', + 'datetimeContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'date', 'templates' => [ - 'dateContainerError' => '
{{content}}
', + 'dateContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); $result = $this->Form->control('created', [ 'type' => 'time', 'templates' => [ - 'timeContainerError' => '
{{content}}
', + 'timeContainerError' => '
{{content}}
', ], ]); - $this->assertStringContainsString('
', $result); + $this->assertStringContainsString('
', $result); } } diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/FileControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/FileControlTest.php index 29e97ee9..0f19f929 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/FileControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/FileControlTest.php @@ -20,7 +20,7 @@ public function testInlineAlignFileControl() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', @@ -50,7 +50,7 @@ public function testInlineAlignFileControlWithDisabledLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['input' => [ 'type' => 'file', 'name' => 'file', @@ -77,7 +77,7 @@ public function testInlineAlignFileControlWithCustomLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'Custom Label', '/label', @@ -111,7 +111,7 @@ public function testInlineAlignFileControlWithCustomLabelOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['label' => [ 'class' => 'custom-label-class form-label visually-hidden', 'foo' => 'bar', @@ -145,7 +145,7 @@ public function testInlineAlignFileControlWithHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', @@ -156,9 +156,9 @@ public function testInlineAlignFileControlWithHelp() 'class' => 'form-control', 'aria-describedby' => 'file-help', ]], - ['small' => ['id' => 'file-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'file-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -184,7 +184,7 @@ public function testInlineAlignFileControlWithHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', @@ -195,13 +195,13 @@ public function testInlineAlignFileControlWithHelpOptions() 'class' => 'form-control', 'aria-describedby' => 'custom-help', ]], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -222,7 +222,7 @@ public function testInlineAlignFileControlWithTooltip() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File ', 'span' => [ @@ -260,7 +260,7 @@ public function testInlineAlignFileControlWithError() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative file is-invalid']], + ['div' => ['class' => 'position-relative file is-invalid']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', @@ -298,7 +298,7 @@ public function testInlineAlignFileControlWithErrorAndHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative file is-invalid']], + ['div' => ['class' => 'position-relative file is-invalid']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', @@ -313,9 +313,9 @@ public function testInlineAlignFileControlWithErrorAndHelp() ['div' => ['id' => 'file-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'file-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'file-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -344,7 +344,7 @@ public function testInlineAlignFileControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative file is-invalid']], + ['div' => ['class' => 'position-relative file is-invalid']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', @@ -359,13 +359,13 @@ public function testInlineAlignFileControlWithErrorAndHelpOptions() ['div' => ['id' => 'file-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -391,7 +391,7 @@ public function testInlineAlignFileControlContainerOptions() ['div' => ['class' => 'col-auto']], ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group file', + 'class' => 'container-class file', ]], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', @@ -430,7 +430,7 @@ public function testInlineAlignFileControlContainerOptionsWithError() ['div' => ['class' => 'col-auto']], ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative file is-invalid', + 'class' => 'container-class position-relative file is-invalid', ]], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', @@ -464,7 +464,7 @@ public function testInlineAlignFileControlInputGroupAppend() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', @@ -497,7 +497,7 @@ public function testInlineAlignFileControlInputGroupPrepend() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group file']], + ['div' => ['class' => 'file']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', @@ -533,7 +533,7 @@ public function testInlineAlignFileControlInputGroupWithError() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group position-relative file is-invalid']], + ['div' => ['class' => 'position-relative file is-invalid']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'file']], 'File', '/label', diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/MultipleCheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/MultipleCheckboxControlTest.php index 29776ae5..6facfc00 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/MultipleCheckboxControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/MultipleCheckboxControlTest.php @@ -25,7 +25,7 @@ public function testInlineAlignMultipleCheckboxControl() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -87,7 +87,7 @@ public function testInlineAlignMultipleCheckboxControlWithDisabledLabel() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -146,7 +146,7 @@ public function testInlineAlignMultipleCheckboxControlWithCustomLabel() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -212,7 +212,7 @@ public function testInlineAlignMultipleCheckboxControlWithCustomLabelOptions() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -278,7 +278,7 @@ public function testInlineAlignMultipleCheckboxControlWithHelp() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -317,9 +317,9 @@ public function testInlineAlignMultipleCheckboxControlWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -350,7 +350,7 @@ public function testInlineAlignMultipleCheckboxControlWithHelpOptions() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -389,13 +389,13 @@ public function testInlineAlignMultipleCheckboxControlWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -418,7 +418,7 @@ public function testInlineAlignMultipleCheckboxControlWithTooltip() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -464,7 +464,7 @@ public function testInlineAlignMultipleCheckboxControlWithError() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox is-invalid', + 'class' => 'd-flex position-relative multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -537,7 +537,7 @@ public function testInlineAlignMultipleCheckboxControlWithErrorAndHelp() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox is-invalid', + 'class' => 'd-flex position-relative multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -582,9 +582,9 @@ public function testInlineAlignMultipleCheckboxControlWithErrorAndHelp() ['div' => ['id' => 'users-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -618,7 +618,7 @@ public function testInlineAlignMultipleCheckboxControlWithErrorAndHelpOptions() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox is-invalid', + 'class' => 'd-flex position-relative multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -663,13 +663,13 @@ public function testInlineAlignMultipleCheckboxControlWithErrorAndHelpOptions() ['div' => ['id' => 'users-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -699,7 +699,7 @@ public function testInlineAlignMultipleCheckboxControlContainerOptions() ['div' => ['class' => 'col-auto']], ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group d-flex position-relative multicheckbox', + 'class' => 'container-class d-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -768,7 +768,7 @@ public function testInlineAlignMultipleCheckboxControlContainerOptionsWithError( ['div' => ['class' => 'col-auto']], ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group d-flex position-relative multicheckbox is-invalid', + 'class' => 'container-class d-flex position-relative multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -845,7 +845,7 @@ public function testInlineAlignMultipleCheckboxControlWithPerOptionConfiguration $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -919,7 +919,7 @@ public function testInlineAlignMultipleCheckboxControlNestedInput() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -989,7 +989,7 @@ public function testInlineAlignMultipleCheckboxControlWithPerOptionConfiguration $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1066,7 +1066,7 @@ public function testInlineAlignMultipleCheckboxControlOptionGroups() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1079,7 +1079,7 @@ public function testInlineAlignMultipleCheckboxControlOptionGroups() 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'form-group']], + ' ['class' => 'col-form-label float-none pt-0']], 'group 1', '/legend', @@ -1108,7 +1108,7 @@ public function testInlineAlignMultipleCheckboxControlOptionGroups() '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'form-group']], + ' ['class' => 'col-form-label float-none pt-0']], 'group 2', '/legend', @@ -1168,7 +1168,7 @@ public function testInlineAlignMultipleCheckboxControlOptionGroupsWithError() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox is-invalid', + 'class' => 'd-flex position-relative multicheckbox is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -1182,7 +1182,7 @@ public function testInlineAlignMultipleCheckboxControlOptionGroupsWithError() 'name' => 'users', 'value' => '', ]], - ['fieldset' => ['class' => 'form-group']], + ' ['class' => 'col-form-label float-none pt-0']], 'group 1', '/legend', @@ -1215,7 +1215,7 @@ public function testInlineAlignMultipleCheckboxControlOptionGroupsWithError() '/label', '/div', '/fieldset', - ['fieldset' => ['class' => 'form-group']], + ' ['class' => 'col-form-label float-none pt-0']], 'group 2', '/legend', @@ -1274,7 +1274,7 @@ public function testInlineAlignMultipleCheckboxControlSwitch() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group d-flex position-relative multicheckbox', + 'class' => 'd-flex position-relative multicheckbox', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/RadioControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/RadioControlTest.php index 61cffe63..6dcfe0d7 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/RadioControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/RadioControlTest.php @@ -25,7 +25,7 @@ public function testInlineAlignRadioControl() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -88,7 +88,7 @@ public function testInlineAlignRadioControlWithDisabledLabel() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -147,7 +147,7 @@ public function testInlineAlignRadioControlWithCustomLabel() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -213,7 +213,7 @@ public function testInlineAlignRadioControlWithCustomLabelOptions() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -279,7 +279,7 @@ public function testInlineAlignRadioControlWithHelp() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -318,9 +318,9 @@ public function testInlineAlignRadioControlWithHelp() 'option 2', '/label', '/div', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -351,7 +351,7 @@ public function testInlineAlignRadioControlWithHelpOptions() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -390,13 +390,13 @@ public function testInlineAlignRadioControlWithHelpOptions() 'option 2', '/label', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -418,7 +418,7 @@ public function testInlineAlignRadioControlWithTooltip() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'published-group-label', ]], @@ -464,7 +464,7 @@ public function testInlineAlignRadioControlWithError() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio is-invalid', + 'class' => 'position-relative radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -537,7 +537,7 @@ public function testInlineAlignRadioControlWithErrorAndHelp() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio is-invalid', + 'class' => 'position-relative radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -582,9 +582,9 @@ public function testInlineAlignRadioControlWithErrorAndHelp() ['div' => ['id' => 'users-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -618,7 +618,7 @@ public function testInlineAlignRadioControlWithErrorAndHelpOptions() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio is-invalid', + 'class' => 'position-relative radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -663,13 +663,13 @@ public function testInlineAlignRadioControlWithErrorAndHelpOptions() ['div' => ['id' => 'users-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -699,7 +699,7 @@ public function testInlineAlignRadioControlContainerOptions() ['div' => ['class' => 'col-auto']], ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative radio', + 'class' => 'container-class position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -768,7 +768,7 @@ public function testInlineAlignRadioControlContainerOptionsWithError() ['div' => ['class' => 'col-auto']], ['div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative radio is-invalid', + 'class' => 'container-class position-relative radio is-invalid', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -845,7 +845,7 @@ public function testInlineAlignRadioControlWithPerOptionConfiguration() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -919,7 +919,7 @@ public function testInlineAlignRadioControlNestedInput() $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], @@ -989,7 +989,7 @@ public function testInlineAlignRadioControlWithPerOptionConfigurationNestedInput $expected = [ ['div' => ['class' => 'col-auto']], ['div' => [ - 'class' => 'form-group position-relative radio', + 'class' => 'position-relative radio', 'role' => 'group', 'aria-labelledby' => 'users-group-label', ]], diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/RangeControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/RangeControlTest.php index e0229cba..60a65b3e 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/RangeControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/RangeControlTest.php @@ -21,7 +21,7 @@ public function testInlineAlignRangeControl() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group range'], + 'div' => ['class' => 'range'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height', '/label', @@ -55,7 +55,7 @@ public function testInlineAlignRangeControlWithDisabledLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group range'], + 'div' => ['class' => 'range'], 'input' => [ 'type' => 'range', 'name' => 'height', @@ -86,7 +86,7 @@ public function testInlineAlignRangeControlWithCustomLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group range'], + 'div' => ['class' => 'range'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Custom Label', '/label', @@ -124,7 +124,7 @@ public function testInlineAlignRangeControlWithCustomLabelOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group range'], + 'div' => ['class' => 'range'], ['label' => [ 'class' => 'custom-label-class form-label visually-hidden', 'foo' => 'bar', @@ -162,7 +162,7 @@ public function testInlineAlignRangeControlWithHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group range'], + 'div' => ['class' => 'range'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height', '/label', @@ -176,9 +176,9 @@ public function testInlineAlignRangeControlWithHelp() 'class' => 'form-range', 'aria-describedby' => 'height-help', ], - ['small' => ['id' => 'height-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'height-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -205,7 +205,7 @@ public function testInlineAlignRangeControlWithHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group range'], + 'div' => ['class' => 'range'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height', '/label', @@ -219,13 +219,13 @@ public function testInlineAlignRangeControlWithHelpOptions() 'class' => 'form-range', 'aria-describedby' => 'custom-help', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -247,7 +247,7 @@ public function testInlineAlignRangeControlWithTooltip() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group range'], + 'div' => ['class' => 'range'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height ', 'span' => [ @@ -289,7 +289,7 @@ public function testInlineAlignRangeControlWithError() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative range is-invalid'], + 'div' => ['class' => 'position-relative range is-invalid'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height', '/label', @@ -331,7 +331,7 @@ public function testInlineAlignRangeControlWithErrorAndHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative range is-invalid'], + 'div' => ['class' => 'position-relative range is-invalid'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height', '/label', @@ -349,9 +349,9 @@ public function testInlineAlignRangeControlWithErrorAndHelp() ['div' => ['id' => 'height-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'height-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'height-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -381,7 +381,7 @@ public function testInlineAlignRangeControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative range is-invalid'], + 'div' => ['class' => 'position-relative range is-invalid'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height', '/label', @@ -399,13 +399,13 @@ public function testInlineAlignRangeControlWithErrorAndHelpOptions() ['div' => ['id' => 'height-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -432,7 +432,7 @@ public function testInlineAlignRangeControlContainerOptions() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group range', + 'class' => 'container-class range', ], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height', @@ -475,7 +475,7 @@ public function testInlineAlignRangeControlContainerOptionsWithError() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative range is-invalid', + 'class' => 'container-class position-relative range is-invalid', ], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'height']], 'Height', diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/SelectControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/SelectControlTest.php index 44ae87c4..0a7f0201 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/SelectControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/SelectControlTest.php @@ -22,7 +22,7 @@ public function testInlineAlignSelectControl() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group select'], + 'div' => ['class' => 'select'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', '/label', @@ -58,7 +58,7 @@ public function testInlineAlignSelectControlWithFloatingLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-floating form-group select'], + 'div' => ['class' => 'form-floating select'], ['select' => ['name' => 'users', 'id' => 'users', 'class' => 'form-select']], ['option' => ['value' => '1']], 'option 1', @@ -92,7 +92,7 @@ public function testInlineAlignSelectControlWithDisabledLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group select'], + 'div' => ['class' => 'select'], ['select' => ['name' => 'users', 'id' => 'users', 'class' => 'form-select']], ['option' => ['value' => '1']], 'option 1', @@ -123,7 +123,7 @@ public function testInlineAlignSelectControlWithCustomLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group select'], + 'div' => ['class' => 'select'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Custom Label', '/label', @@ -161,7 +161,7 @@ public function testInlineAlignSelectControlWithCustomLabelOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group select'], + 'div' => ['class' => 'select'], 'label' => [ 'for' => 'users', 'class' => 'custom-label-class form-label visually-hidden', @@ -199,7 +199,7 @@ public function testInlineAlignSelectControlWithHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group select'], + 'div' => ['class' => 'select'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', '/label', @@ -216,9 +216,9 @@ public function testInlineAlignSelectControlWithHelp() 'option 2', '/option', '/select', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -246,7 +246,7 @@ public function testInlineAlignSelectControlWithHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group select'], + 'div' => ['class' => 'select'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', '/label', @@ -263,13 +263,13 @@ public function testInlineAlignSelectControlWithHelpOptions() 'option 2', '/option', '/select', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -292,7 +292,7 @@ public function testInlineAlignSelectControlWithTooltip() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group select'], + 'div' => ['class' => 'select'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', 'span' => [ @@ -334,7 +334,7 @@ public function testInlineAlignSelectControlWithError() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative select is-invalid'], + 'div' => ['class' => 'position-relative select is-invalid'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', '/label', @@ -380,7 +380,7 @@ public function testInlineAlignSelectControlWithErrorAndHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative select is-invalid'], + 'div' => ['class' => 'position-relative select is-invalid'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', '/label', @@ -401,9 +401,9 @@ public function testInlineAlignSelectControlWithErrorAndHelp() ['div' => ['id' => 'users-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'users-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'users-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -434,7 +434,7 @@ public function testInlineAlignSelectControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative select is-invalid'], + 'div' => ['class' => 'position-relative select is-invalid'], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', '/label', @@ -455,13 +455,13 @@ public function testInlineAlignSelectControlWithErrorAndHelpOptions() ['div' => ['id' => 'users-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -489,7 +489,7 @@ public function testInlineAlignSelectControlContainerOptions() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group select', + 'class' => 'container-class select', ], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', @@ -532,7 +532,7 @@ public function testInlineAlignSelectControlContainerOptionsWithError() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative select is-invalid', + 'class' => 'container-class position-relative select is-invalid', ], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', @@ -576,7 +576,7 @@ public function testInlineAlignSelectControlInputGroupAppend() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group select']], + ['div' => ['class' => 'select']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', '/label', @@ -615,7 +615,7 @@ public function testInlineAlignSelectControlInputGroupPrepend() ]); $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group select']], + ['div' => ['class' => 'select']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'users']], 'Users', '/label', diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/StaticControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/StaticControlTest.php index d1730a3b..7882ed68 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/StaticControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/StaticControlTest.php @@ -20,7 +20,7 @@ public function testInlineAlignStaticControl() $result = $this->Form->control('title', ['type' => 'staticControl']); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group staticControl'], + 'div' => ['class' => 'staticControl'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -58,7 +58,7 @@ public function testInlineAlignStaticControlWithoutHiddenField() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group staticControl'], + 'div' => ['class' => 'staticControl'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -88,7 +88,7 @@ public function testInlineAlignStaticControlWithDisabledLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group staticControl'], + 'div' => ['class' => 'staticControl'], 'p' => ['class' => 'form-control-plaintext'], 'title', '/p', @@ -118,7 +118,7 @@ public function testInlineAlignStaticControlWithCustomLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group staticControl'], + 'div' => ['class' => 'staticControl'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Custom Label', '/label', @@ -155,7 +155,7 @@ public function testInlineAlignStaticControlWithCustomLabelOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group staticControl'], + 'div' => ['class' => 'staticControl'], 'label' => [ 'class' => 'custom-label-class form-label visually-hidden', 'foo' => 'bar', @@ -192,7 +192,7 @@ public function testInlineAlignStaticControlWithHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group staticControl'], + 'div' => ['class' => 'staticControl'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -206,9 +206,9 @@ public function testInlineAlignStaticControlWithHelp() 'aria-describedby' => 'title-help', 'value' => 'title', ], - ['small' => ['id' => 'title-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'title-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -234,7 +234,7 @@ public function testInlineAlignStaticControlWithHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group staticControl'], + 'div' => ['class' => 'staticControl'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -248,13 +248,13 @@ public function testInlineAlignStaticControlWithHelpOptions() 'aria-describedby' => 'custom-help', 'value' => 'title', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -275,7 +275,7 @@ public function testInlineAlignStaticControlWithTooltip() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group staticControl'], + 'div' => ['class' => 'staticControl'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', 'span' => [ @@ -316,7 +316,7 @@ public function testInlineAlignStaticControlWithError() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative staticControl is-invalid'], + 'div' => ['class' => 'position-relative staticControl is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -358,7 +358,7 @@ public function testInlineAlignStaticControlWithErrorAndHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative staticControl is-invalid'], + 'div' => ['class' => 'position-relative staticControl is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -377,9 +377,9 @@ public function testInlineAlignStaticControlWithErrorAndHelp() ['div' => ['id' => 'title-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'title-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'title-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -408,7 +408,7 @@ public function testInlineAlignStaticControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative staticControl is-invalid'], + 'div' => ['class' => 'position-relative staticControl is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -427,13 +427,13 @@ public function testInlineAlignStaticControlWithErrorAndHelpOptions() ['div' => ['id' => 'title-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -459,7 +459,7 @@ public function testInlineAlignStaticControlContainerOptions() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group staticControl', + 'class' => 'container-class staticControl', ], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', @@ -501,7 +501,7 @@ public function testInlineAlignStaticControlContainerOptionsWithError() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative staticControl is-invalid', + 'class' => 'container-class position-relative staticControl is-invalid', ], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', diff --git a/tests/TestCase/View/Helper/FormHelper/InlineAlign/TextControlTest.php b/tests/TestCase/View/Helper/FormHelper/InlineAlign/TextControlTest.php index a5dd73b7..851779a4 100644 --- a/tests/TestCase/View/Helper/FormHelper/InlineAlign/TextControlTest.php +++ b/tests/TestCase/View/Helper/FormHelper/InlineAlign/TextControlTest.php @@ -17,7 +17,7 @@ public function testInlineAlignTextControl() $result = $this->Form->control('title'); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group text'], + 'div' => ['class' => 'text'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -47,7 +47,7 @@ public function testInlineAlignTextControlWithFloatingLabel() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-floating form-group text'], + 'div' => ['class' => 'form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -79,7 +79,7 @@ public function testInlineAlignTextControlWithFloatingLabelAndCustomLabelText() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-floating form-group text'], + 'div' => ['class' => 'form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -111,7 +111,7 @@ public function testInlineAlignTextControlWithFloatingLabelAndCustomPlaceholder( ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-floating form-group text'], + 'div' => ['class' => 'form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -143,7 +143,7 @@ public function testInlineAlignTextControlWithFloatingLabelAndDisabledPlaceholde ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-floating form-group text'], + 'div' => ['class' => 'form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -169,7 +169,7 @@ public function testInlineAlignTextControlWithDisabledLabel() $result = $this->Form->control('title', ['label' => false]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group text'], + 'div' => ['class' => 'text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -192,7 +192,7 @@ public function testInlineAlignTextControlWithCustomLabel() $result = $this->Form->control('title', ['label' => 'Custom Label']); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group text'], + 'div' => ['class' => 'text'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Custom Label', '/label', @@ -224,7 +224,7 @@ public function testInlineAlignTextControlWithCustomLabelOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group text'], + 'div' => ['class' => 'text'], 'label' => [ 'class' => 'custom-label-class form-label visually-hidden', 'foo' => 'bar', @@ -256,7 +256,7 @@ public function testInlineAlignTextControlWithHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group text'], + 'div' => ['class' => 'text'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -267,9 +267,9 @@ public function testInlineAlignTextControlWithHelp() 'class' => 'form-control', 'aria-describedby' => 'title-help', ], - ['small' => ['id' => 'title-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'title-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -293,7 +293,7 @@ public function testInlineAlignTextControlWithHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group text'], + 'div' => ['class' => 'text'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -304,13 +304,13 @@ public function testInlineAlignTextControlWithHelpOptions() 'class' => 'form-control', 'aria-describedby' => 'custom-help', ], - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -329,7 +329,7 @@ public function testInlineAlignTextControlWithTooltip() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group text'], + 'div' => ['class' => 'text'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', 'span' => [ @@ -364,7 +364,7 @@ public function testInlineAlignTextControlWithError() $result = $this->Form->control('title'); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative text is-invalid'], + 'div' => ['class' => 'position-relative text is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -400,7 +400,7 @@ public function testInlineAlignTextControlWithErrorAndHelp() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative text is-invalid'], + 'div' => ['class' => 'position-relative text is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -415,9 +415,9 @@ public function testInlineAlignTextControlWithErrorAndHelp() ['div' => ['id' => 'title-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => ['id' => 'title-help', 'class' => 'visually-hidden form-text']], + ['div' => ['id' => 'title-help', 'class' => 'form-text visually-hidden']], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -444,7 +444,7 @@ public function testInlineAlignTextControlWithErrorAndHelpOptions() ]); $expected = [ ['div' => ['class' => 'col-auto']], - 'div' => ['class' => 'form-group position-relative text is-invalid'], + 'div' => ['class' => 'position-relative text is-invalid'], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', '/label', @@ -459,13 +459,13 @@ public function testInlineAlignTextControlWithErrorAndHelpOptions() ['div' => ['id' => 'title-error', 'class' => 'invalid-tooltip']], 'error message', '/div', - ['small' => [ + ['div' => [ 'id' => 'custom-help', 'foo' => 'bar', - 'class' => 'help-class visually-hidden form-text', + 'class' => 'help-class form-text visually-hidden', ]], 'Help text', - '/small', + '/div', '/div', '/div', ]; @@ -490,7 +490,7 @@ public function testInlineAlignTextControlContainerOptions() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group text', + 'class' => 'container-class text', ], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', @@ -528,7 +528,7 @@ public function testInlineAlignTextControlContainerOptionsWithError() ['div' => ['class' => 'col-auto']], 'div' => [ 'attribute' => 'container-attribute', - 'class' => 'container-class form-group position-relative text is-invalid', + 'class' => 'container-class position-relative text is-invalid', ], 'label' => ['class' => 'form-label visually-hidden', 'for' => 'title'], 'Title', diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php index 0996be03..a6345fdf 100644 --- a/tests/TestCase/View/Helper/FormHelperTest.php +++ b/tests/TestCase/View/Helper/FormHelperTest.php @@ -16,7 +16,7 @@ public function testBasicPasswordControl() $result = $this->Form->control('password'); $expected = [ - 'div' => ['class' => 'mb-3 form-group password'], + 'div' => ['class' => 'mb-3 password'], 'label' => ['class' => 'form-label', 'for' => 'password'], 'Password', '/label', @@ -42,7 +42,7 @@ public function testRequiredTextControl() $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -55,7 +55,6 @@ public function testRequiredTextControl() 'id' => 'title', 'class' => 'form-control', 'required' => 'required', - 'aria-required' => 'true', ], '/div', ]; @@ -68,7 +67,7 @@ public function testAddOnPrependedText() $result = $this->Form->control('title', ['prepend' => '@']); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -85,7 +84,6 @@ public function testAddOnPrependedText() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -99,7 +97,7 @@ public function testAddOnPrependedTextMultiple() $result = $this->Form->control('title', ['prepend' => ['$', '0.00']]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -119,7 +117,6 @@ public function testAddOnPrependedTextMultiple() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -133,7 +130,7 @@ public function testAddOnAppendedText() $result = $this->Form->control('title', ['append' => '@']); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -147,7 +144,6 @@ public function testAddOnAppendedText() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], 'span' => ['class' => 'input-group-text'], '@', @@ -164,7 +160,7 @@ public function testAddOnAppendedTextMultiple() $result = $this->Form->control('title', ['append' => ['$', '0.00']]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -178,7 +174,6 @@ public function testAddOnAppendedTextMultiple() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], ['span' => ['class' => 'input-group-text']], '$', @@ -198,7 +193,7 @@ public function testAddOnPrependedButton() $result = $this->Form->control('title', ['prepend' => $this->Form->button('GO')]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -215,7 +210,6 @@ public function testAddOnPrependedButton() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -234,7 +228,7 @@ public function testAddOnPrependedButtonMultiple() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -254,7 +248,6 @@ public function testAddOnPrependedButtonMultiple() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -268,7 +261,7 @@ public function testAddOnAppendedButton() $result = $this->Form->control('title', ['append' => $this->Form->button('GO')]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -282,7 +275,6 @@ public function testAddOnAppendedButton() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], 'button' => ['type' => 'submit', 'class' => 'btn btn-secondary'], 'GO', @@ -304,7 +296,7 @@ public function testAddOnAppendedButtonMultiple() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -318,7 +310,6 @@ public function testAddOnAppendedButtonMultiple() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], ['button' => ['type' => 'submit', 'class' => 'btn btn-secondary']], 'NO', @@ -338,7 +329,7 @@ public function testAddOnOptions() $result = $this->Form->control('title', ['prepend' => ['@', ['size' => 'lg']]]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -355,7 +346,6 @@ public function testAddOnOptions() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -364,7 +354,7 @@ public function testAddOnOptions() $result = $this->Form->control('title', ['append' => ['@', ['size' => 'lg']]]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -378,7 +368,6 @@ public function testAddOnOptions() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], 'span' => ['class' => 'input-group-text'], '@', @@ -399,7 +388,7 @@ public function testAddOnOptionsMultiple() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -419,7 +408,6 @@ public function testAddOnOptionsMultiple() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -432,7 +420,7 @@ public function testAddOnOptionsMultiple() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -446,7 +434,6 @@ public function testAddOnOptionsMultiple() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], ['span' => ['class' => 'input-group-text']], '$', @@ -470,7 +457,7 @@ public function testAddOnWithError() $result = $this->Form->control('title', ['prepend' => '@']); $expected = [ - 'div' => ['class' => 'mb-3 form-group text is-invalid'], + 'div' => ['class' => 'mb-3 text is-invalid'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -487,7 +474,7 @@ public function testAddOnWithError() 'aria-describedby' => 'title-error', ], '/div', - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -496,7 +483,7 @@ public function testAddOnWithError() $result = $this->Form->control('title', ['append' => '@']); $expected = [ - 'div' => ['class' => 'mb-3 form-group text is-invalid'], + 'div' => ['class' => 'mb-3 text is-invalid'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -513,7 +500,7 @@ public function testAddOnWithError() '@', '/span', '/div', - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -631,7 +618,7 @@ public function testFormCreateWithTemplatesFile() $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'custom-container mb-3 form-group'], + 'div' => ['class' => 'custom-container mb-3'], 'label' => ['class' => 'form-label', 'for' => 'title'], 'Title', '/label', @@ -654,7 +641,7 @@ public function testInlineFormCreate() 'method' => 'post', 'accept-charset' => 'utf-8', 'action' => '/articles/add', - 'class' => 'form-inline row g-3 align-items-center', + 'class' => 'row g-3 align-items-center', ], ]; $this->assertHtml($expected, $result); @@ -671,7 +658,7 @@ public function testInlineFormCreateWithCustomSpacing() 'method' => 'post', 'accept-charset' => 'utf-8', 'action' => '/articles/add', - 'class' => 'form-inline row custom-spacing align-items-center', + 'class' => 'row custom-spacing align-items-center', ], ]; $this->assertHtml($expected, $result); @@ -685,7 +672,6 @@ public function testHorizontalFormCreate() 'method' => 'post', 'accept-charset' => 'utf-8', 'action' => '/articles/add', - 'class' => 'form-horizontal', ], ]; $this->assertHtml($expected, $result); @@ -708,7 +694,7 @@ public function testCustomGridWithConstantsConfig() $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text required'], + 'div' => ['class' => 'mb-3 row text required'], 'label' => [ 'class' => 'col-form-label col-md-3', 'for' => 'title', @@ -725,7 +711,6 @@ public function testCustomGridWithConstantsConfig() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -744,7 +729,7 @@ public function testCustomGridWithBasicArrayConfig() $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text required'], + 'div' => ['class' => 'mb-3 row text required'], 'label' => [ 'class' => 'col-form-label col-md-3', 'for' => 'title', @@ -761,7 +746,6 @@ public function testCustomGridWithBasicArrayConfig() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -785,14 +769,13 @@ public function testHorizontalFormCreateFromConfig() 'method' => 'post', 'accept-charset' => 'utf-8', 'action' => '/articles/add', - 'class' => 'form-horizontal', ], ]; $this->assertHtml($expected, $result); $result = $this->Form->control('title'); $expected = [ - 'div' => ['class' => 'mb-3 form-group row text required'], + 'div' => ['class' => 'mb-3 row text required'], 'label' => [ 'class' => 'col-form-label col-md-2', 'for' => 'title', @@ -809,7 +792,6 @@ public function testHorizontalFormCreateFromConfig() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', '/div', @@ -818,7 +800,7 @@ public function testHorizontalFormCreateFromConfig() $result = $this->Form->control('published'); $expected = [ - 'div' => ['class' => 'mb-3 form-group row checkbox'], + 'div' => ['class' => 'mb-3 row checkbox'], ['div' => ['class' => 'offset-md-2 col-md-10']], ['div' => ['class' => 'form-check my-checkbox']], 'input' => [ @@ -912,7 +894,7 @@ public function testTooltipWithDisabledLabel() 'label' => false, ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required'], + 'div' => ['class' => 'mb-3 text required'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -922,7 +904,6 @@ public function testTooltipWithDisabledLabel() 'oninput' => 'this.setCustomValidity('')', 'id' => 'title', 'class' => 'form-control', - 'aria-required' => 'true', ], '/div', ]; @@ -943,7 +924,7 @@ public function testFormControlWithoutOpenForm() $result = $Form->control('title'); $expected = [ - ['div' => ['class' => 'form-group text']], + ['div' => ['class' => 'text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1023,7 +1004,7 @@ public function testFeedbackStyleFromHelperConfig() $result = $this->Form->control('title'); $expected = [ - ['div' => ['class' => 'mb-3 form-group position-relative text is-invalid']], + ['div' => ['class' => 'mb-3 position-relative text is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1058,7 +1039,7 @@ public function testOverrideFeedbackStyleFromHelperConfigViaControlConfig() ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group text is-invalid']], + ['div' => ['class' => 'mb-3 text is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1070,7 +1051,7 @@ public function testOverrideFeedbackStyleFromHelperConfigViaControlConfig() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1094,7 +1075,7 @@ public function testFormGroupPositionFromHelperConfig() $result = $this->Form->control('title'); $expected = [ - ['div' => ['class' => 'mb-3 form-group position-absolute text is-invalid']], + ['div' => ['class' => 'mb-3 position-absolute text is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1132,7 +1113,7 @@ public function testOverrideFormGroupPositionFromHelperConfigViaControlConfig() ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group position-static text is-invalid']], + ['div' => ['class' => 'mb-3 position-static text is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1166,7 +1147,7 @@ public function testDefaultAlignControlWithTooltipFeedbackStyle() ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group position-relative text is-invalid']], + ['div' => ['class' => 'mb-3 position-relative text is-invalid']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1203,7 +1184,7 @@ public function testInlineAlignControlWithDefaultFeedbackStyle() $expected = [ ['div' => ['class' => 'col-auto']], - ['div' => ['class' => 'form-group text is-invalid']], + ['div' => ['class' => 'text is-invalid']], ['label' => ['class' => 'form-label visually-hidden', 'for' => 'title']], 'Title', '/label', @@ -1215,7 +1196,7 @@ public function testInlineAlignControlWithDefaultFeedbackStyle() 'aria-invalid' => 'true', 'aria-describedby' => 'title-error', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1245,7 +1226,7 @@ public function testHorizontalAlignControlWithTooltipFeedbackStyle() ]); $expected = [ - ['div' => ['class' => 'mb-3 form-group row position-relative text is-invalid']], + ['div' => ['class' => 'mb-3 row position-relative text is-invalid']], ['label' => ['class' => 'col-form-label col-sm-5', 'for' => 'title']], 'Title', '/label', @@ -1304,7 +1285,7 @@ public function testOverrideAriaAttributes() 'aria-describedby' => 'custom', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required is-invalid'], + 'div' => ['class' => 'mb-3 text required is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1319,7 +1300,7 @@ public function testOverrideAriaAttributes() 'required' => 'required', 'aria-describedby' => 'custom', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1340,7 +1321,7 @@ public function testPartiallyOverrideAriaAttributes() 'aria-describedby' => 'custom', ]); $expected = [ - 'div' => ['class' => 'mb-3 form-group text required is-invalid'], + 'div' => ['class' => 'mb-3 text required is-invalid'], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1353,10 +1334,9 @@ public function testPartiallyOverrideAriaAttributes() 'oninput' => 'this.setCustomValidity('')', 'class' => 'is-invalid form-control', 'required' => 'required', - 'aria-required' => 'true', 'aria-describedby' => 'custom', ], - ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']], + ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']], 'error message', '/div', '/div', @@ -1375,7 +1355,7 @@ public function testSpacingViaCreateConfigIsBeingResetOnFormClose() $this->Form->end(); $expected = [ - ['div' => ['class' => 'custom-spacing-create form-group text']], + ['div' => ['class' => 'custom-spacing-create text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1394,7 +1374,7 @@ public function testSpacingViaCreateConfigIsBeingResetOnFormClose() $this->Form->end(); $expected = [ - ['div' => ['class' => 'mb-3 form-group text']], + ['div' => ['class' => 'mb-3 text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1422,7 +1402,7 @@ public function testOverrideSpacingFromHelperConfigViaCreateConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'custom-spacing-helper form-group text']], + ['div' => ['class' => 'custom-spacing-helper text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1443,7 +1423,7 @@ public function testOverrideSpacingFromHelperConfigViaCreateConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'custom-spacing-create form-group text']], + ['div' => ['class' => 'custom-spacing-create text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1471,7 +1451,7 @@ public function testOverrideSpacingFromHelperConfigViaControlConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'custom-spacing-helper form-group text']], + ['div' => ['class' => 'custom-spacing-helper text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1492,7 +1472,7 @@ public function testOverrideSpacingFromHelperConfigViaControlConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'custom-spacing-control form-group text']], + ['div' => ['class' => 'custom-spacing-control text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1517,7 +1497,7 @@ public function testOverrideSpacingFromCreateConfigViaControlConfig() $result = $this->Form->control('title'); $expected = [ - ['div' => ['class' => 'custom-spacing-create form-group text']], + ['div' => ['class' => 'custom-spacing-create text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1535,7 +1515,7 @@ public function testOverrideSpacingFromCreateConfigViaControlConfig() 'spacing' => 'custom-spacing-control', ]); $expected = [ - ['div' => ['class' => 'custom-spacing-control form-group text']], + ['div' => ['class' => 'custom-spacing-control text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1561,7 +1541,7 @@ public function testDisableSpacingViaHelperConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'mb-3 form-group text']], + ['div' => ['class' => 'mb-3 text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1584,7 +1564,7 @@ public function testDisableSpacingViaHelperConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'form-group text']], + ['div' => ['class' => 'text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1612,7 +1592,7 @@ public function testDisableSpacingFromHelperConfigViaCreateConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'custom-spacing-helper form-group text']], + ['div' => ['class' => 'custom-spacing-helper text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1633,7 +1613,7 @@ public function testDisableSpacingFromHelperConfigViaCreateConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'form-group text']], + ['div' => ['class' => 'text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1661,7 +1641,7 @@ public function testDisableSpacingFromHelperConfigViaControlConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'custom-spacing-helper form-group text']], + ['div' => ['class' => 'custom-spacing-helper text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1682,7 +1662,7 @@ public function testDisableSpacingFromHelperConfigViaControlConfig() $this->Form->end(); $expected = [ - ['div' => ['class' => 'form-group text']], + ['div' => ['class' => 'text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1707,7 +1687,7 @@ public function testDisableSpacingFromCreateConfigViaControlConfig() $result = $this->Form->control('title'); $expected = [ - ['div' => ['class' => 'custom-spacing-create form-group text']], + ['div' => ['class' => 'custom-spacing-create text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1725,7 +1705,7 @@ public function testDisableSpacingFromCreateConfigViaControlConfig() 'spacing' => false, ]); $expected = [ - ['div' => ['class' => 'form-group text']], + ['div' => ['class' => 'text']], ['label' => ['class' => 'form-label', 'for' => 'title']], 'Title', '/label', @@ -1753,7 +1733,7 @@ public function testFloatingLabelPlaceholderGeneration() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-floating form-group text'], + 'div' => ['class' => 'mb-3 form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'title', @@ -1779,7 +1759,7 @@ public function testFloatingLabelPlaceholderGenerationForNestedField() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-floating form-group text'], + 'div' => ['class' => 'mb-3 form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'author[name]', @@ -1807,7 +1787,7 @@ public function testFloatingLabelPlaceholderGenerationForIdField() ], ]); $expected = [ - 'div' => ['class' => 'mb-3 form-floating form-group text'], + 'div' => ['class' => 'mb-3 form-floating text'], 'input' => [ 'type' => 'text', 'name' => 'author_id', diff --git a/tests/TestCase/View/Helper/HtmlHelperTest.php b/tests/TestCase/View/Helper/HtmlHelperTest.php index 8332445f..1df3e320 100644 --- a/tests/TestCase/View/Helper/HtmlHelperTest.php +++ b/tests/TestCase/View/Helper/HtmlHelperTest.php @@ -37,7 +37,7 @@ public function testBadge() { $result = $this->Html->badge('foo'); $expected = [ - 'span' => ['class' => 'badge bg-secondary'], + 'span' => ['class' => 'badge text-bg-secondary'], 'foo', '/span', ]; @@ -45,7 +45,7 @@ public function testBadge() $result = $this->Html->badge('foo', ['class' => 'primary']); $expected = [ - 'span' => ['class' => 'bg-primary badge'], + 'span' => ['class' => 'text-bg-primary badge'], 'foo', '/span', ]; diff --git a/tests/TestCase/View/Helper/Types/ClassesTest.php b/tests/TestCase/View/Helper/Types/ClassesTest.php index 901b5569..2223cc55 100644 --- a/tests/TestCase/View/Helper/Types/ClassesTest.php +++ b/tests/TestCase/View/Helper/Types/ClassesTest.php @@ -15,7 +15,6 @@ class ClassesTest extends TestCase * Test get elements * * @return void - * @covers \BootstrapUI\View\Helper\Types\Classes::values */ public function testGetElements() { diff --git a/tests/TestCase/View/Helper/Types/ElementTest.php b/tests/TestCase/View/Helper/Types/ElementTest.php index 461099de..006914f7 100644 --- a/tests/TestCase/View/Helper/Types/ElementTest.php +++ b/tests/TestCase/View/Helper/Types/ElementTest.php @@ -15,7 +15,6 @@ class ElementTest extends TestCase * Test get elements * * @return void - * @covers \BootstrapUI\View\Helper\Types\Element::values */ public function testGetElements() { @@ -24,6 +23,7 @@ public function testGetElements() Element::ALERT, Element::BADGE, Element::BG, + Element::TEXT_BG, Element::BORDER, Element::BTN, Element::BTN_OUTLINE, diff --git a/tests/test_app/config/custom_templates.php b/tests/test_app/config/custom_templates.php index 98bad7fe..ac8e4234 100644 --- a/tests/test_app/config/custom_templates.php +++ b/tests/test_app/config/custom_templates.php @@ -1,4 +1,4 @@ '
{{content}}{{help}}
', + 'inputContainer' => '
{{content}}{{help}}
', ];