From 0250089233c23cc8db17760c2c12564b76308330 Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:13:55 +0100
Subject: [PATCH 01/10] Initial Bootstrap 5 support

Alpha support, need more work!
---
 src/Former/Form/Group.php                  |   9 +-
 src/Former/Framework/TwitterBootstrap5.php | 486 +++++++++++++++++++++
 src/Former/Traits/Checkable.php            |   7 +-
 src/config/former.php                      |  25 +-
 tests/Framework/TwitterBootstrap5Test.php  | 212 +++++++++
 tests/TestCases/ContainerTestCase.php      |  10 +
 6 files changed, 741 insertions(+), 8 deletions(-)
 create mode 100644 src/Former/Framework/TwitterBootstrap5.php
 create mode 100644 tests/Framework/TwitterBootstrap5Test.php

diff --git a/src/Former/Form/Group.php b/src/Former/Form/Group.php
index 12b1f72a..71e189c2 100644
--- a/src/Former/Form/Group.php
+++ b/src/Former/Form/Group.php
@@ -176,7 +176,9 @@ public function wrapField($field)
 	{
 		$label = $this->getLabel($field);
 		$help = $this->getHelp();
-		if ($field->isCheckable() && $this->app['former']->framework() == 'TwitterBootstrap4') {
+		if ($field->isCheckable() &&
+			in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])
+		) {
 			$wrapperClass = $field->isInline() ? 'form-check form-check-inline' : 'form-check';
 			if ($this->app['former']->getErrors($field->getName())) {
 				$hiddenInput = Element::create('input', null, ['type' => 'hidden'])->class('form-check-input is-invalid');
@@ -323,7 +325,8 @@ public function blockHelp($help, $attributes = array())
 		// Reserved method
 		if ($this->app['former.framework']->isnt('TwitterBootstrap') &&
 		    $this->app['former.framework']->isnt('TwitterBootstrap3') &&
-		    $this->app['former.framework']->isnt('TwitterBootstrap4')
+			$this->app['former.framework']->isnt('TwitterBootstrap4') &&
+		    $this->app['former.framework']->isnt('TwitterBootstrap5')
 		) {
 			throw new BadMethodCallException('This method is only available on the Bootstrap framework');
 		}
@@ -445,7 +448,7 @@ protected function getLabel($field = null)
  		// Wrap label in framework classes
  		$labelClasses = $this->app['former.framework']->getLabelClasses();
  		if ($field->isCheckable() &&
- 			$this->app['former']->framework() == 'TwitterBootstrap4' &&
+ 			in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5']) &&
  			$this->app['former.form']->isOfType('horizontal')
  		) {
  			$labelClasses = array_merge($labelClasses, array('pt-0'));
diff --git a/src/Former/Framework/TwitterBootstrap5.php b/src/Former/Framework/TwitterBootstrap5.php
new file mode 100644
index 00000000..c60d7977
--- /dev/null
+++ b/src/Former/Framework/TwitterBootstrap5.php
@@ -0,0 +1,486 @@
+<?php
+namespace Former\Framework;
+
+use Former\Interfaces\FrameworkInterface;
+use Former\Traits\Field;
+use Former\Traits\Framework;
+use HtmlObject\Element;
+use Illuminate\Container\Container;
+use Illuminate\Support\Str;
+
+/**
+ * The Twitter Bootstrap form framework
+ */
+class TwitterBootstrap5 extends Framework implements FrameworkInterface
+{
+	/**
+	 * Form types that trigger special styling for this Framework
+	 *
+	 * @var array
+	 */
+	protected $availableTypes = array('horizontal', 'vertical', 'inline');
+
+	/**
+	 * The button types available
+	 *
+	 * @var array
+	 */
+	private $buttons = array(
+		'lg',
+		'sm',
+		'xs',
+		'block',
+		'link',
+		'primary',
+		'secondary',
+		'warning',
+		'danger',
+		'success',
+		'info',
+		'light',
+		'dark',
+	);
+
+	/**
+	 * The field sizes available
+	 *
+	 * @var array
+	 */
+	private $fields = array(
+		'lg',
+		'sm',
+		// 'col-xs-1', 'col-xs-2', 'col-xs-3', 'col-xs-4', 'col-xs-5', 'col-xs-6',
+		// 'col-xs-7', 'col-xs-8', 'col-xs-9', 'col-xs-10', 'col-xs-11', 'col-xs-12',
+		// 'col-sm-1', 'col-sm-2', 'col-sm-3', 'col-sm-4', 'col-sm-5', 'col-sm-6',
+		// 'col-sm-7', 'col-sm-8', 'col-sm-9', 'col-sm-10', 'col-sm-11', 'col-sm-12',
+		// 'col-md-1', 'col-md-2', 'col-md-3', 'col-md-4', 'col-md-5', 'col-md-6',
+		// 'col-md-7', 'col-md-8', 'col-md-9', 'col-md-10', 'col-md-11', 'col-md-12',
+		// 'col-lg-1', 'col-lg-2', 'col-lg-3', 'col-lg-4', 'col-lg-5', 'col-lg-6',
+		// 'col-lg-7', 'col-lg-8', 'col-lg-9', 'col-lg-10', 'col-lg-11', 'col-lg-12',
+	);
+
+	/**
+	 * The field states available
+	 *
+	 * @var array
+	 */
+	protected $states = array(
+		'is-invalid',
+	);
+
+	/**
+	 * The default HTML tag used for icons
+	 *
+	 * @var string
+	 */
+	protected $iconTag = 'i';
+
+	/**
+	 * The default set for icon fonts
+	 * By default Bootstrap 4 offers no fonts, but we'll add Font Awesome
+	 *
+	 * @var string
+	 */
+	protected $iconSet = 'fa';
+
+	/**
+	 * The default prefix icon names
+	 * Using Font Awesome 5, this can be 'fa' or 'fas' for solid, 'far' for regular
+	 *
+	 * @var string
+	 */
+	protected $iconPrefix = 'fa';
+
+	/**
+	 * Create a new TwitterBootstrap instance
+	 *
+	 * @param \Illuminate\Container\Container $app
+	 */
+	public function __construct(Container $app)
+	{
+		$this->app = $app;
+		$this->setFrameworkDefaults();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// FILTER ARRAYS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Filter buttons classes
+	 *
+	 * @param  array $classes An array of classes
+	 *
+	 * @return string[] A filtered array
+	 */
+	public function filterButtonClasses($classes)
+	{
+		// Filter classes
+		// $classes = array_intersect($classes, $this->buttons);
+
+		// Prepend button type
+		$classes   = $this->prependWith($classes, 'btn-');
+		$classes[] = 'btn';
+
+		return $classes;
+	}
+
+	/**
+	 * Filter field classes
+	 *
+	 * @param  array $classes An array of classes
+	 *
+	 * @return array A filtered array
+	 */
+	public function filterFieldClasses($classes)
+	{
+		// Filter classes
+		$classes = array_intersect($classes, $this->fields);
+
+		// Prepend field type
+		$classes = array_map(function ($class) {
+			return Str::startsWith($class, 'col') ? $class : 'input-'.$class;
+		}, $classes);
+
+		return $classes;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Framework error state
+	 *
+	 * @return string
+	 */
+	public function errorState()
+	{
+		return 'is-invalid';
+	}
+
+	/**
+	 * Returns corresponding inline class of a field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function getInlineLabelClass($field)
+	{
+		$inlineClass = parent::getInlineLabelClass($field);
+		if ($field->isOfType('checkbox', 'checkboxes', 'radio', 'radios')) {
+			$inlineClass = 'form-check-label';
+		}
+
+		return $inlineClass;
+	}
+
+	/**
+	 * Set the fields width from a label width
+	 *
+	 * @param array $labelWidths
+	 */
+	protected function setFieldWidths($labelWidths)
+	{
+		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+		$viewports = $this->getFrameworkOption('viewports');
+		foreach ($labelWidths as $viewport => $columns) {
+			if ($viewport) {
+				$labelWidthClass .= " col-$viewports[$viewport]-$columns";
+				$fieldWidthClass .= " col-$viewports[$viewport]-".(12 - $columns);
+				$fieldOffsetClass .= " col-$viewports[$viewport]-offset-$columns";
+			}
+		}
+
+		$this->labelWidth  = ltrim($labelWidthClass);
+		$this->fieldWidth  = ltrim($fieldWidthClass);
+		$this->fieldOffset = ltrim($fieldOffsetClass);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// ADD CLASSES //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Add classes to a field
+	 *
+	 * @param Field $field
+	 * @param array $classes The possible classes to add
+	 *
+	 * @return Field
+	 */
+	public function getFieldClasses(Field $field, $classes)
+	{
+		// Add inline class for checkables
+		if ($field->isCheckable()) {
+			// Adds correct checkbox input class when is a checkbox (or radio)
+			$field->addClass('form-check-input');
+			$classes[] = 'form-check';
+
+			if (in_array('inline', $classes)) {
+				$field->inline();
+			}
+		}
+
+		// Filter classes according to field type
+		if ($field->isButton()) {
+			$classes = $this->filterButtonClasses($classes);
+		} else {
+			$classes = $this->filterFieldClasses($classes);
+		}
+
+		// Add form-control class for text-type, textarea and file fields
+		// As text-type is open-ended we instead exclude those that shouldn't receive the class
+		if (!$field->isCheckable() && !$field->isButton() && !in_array($field->getType(), [
+					'plaintext',
+					'select',
+				]) && !in_array('form-control', $classes)
+		) {
+			$classes[] = 'form-control';
+		}
+
+		// Add form-select class for select fields
+		if ($field->getType() === 'select' && !in_array('form-select', $classes)) {
+			$classes[] = 'form-select';
+		}
+
+		if ($this->app['former']->getErrors($field->getName())) {
+			$classes[] = $this->errorState();
+		}
+
+		return $this->addClassesToField($field, $classes);
+	}
+
+	/**
+	 * Add group classes
+	 *
+	 * @return string A list of group classes
+	 */
+	public function getGroupClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return 'mb-3 row';
+		} else {
+			return 'mb-3';
+		}
+	}
+
+	/**
+	 * Add label classes
+	 *
+	 * @return string[] An array of attributes with the label class
+	 */
+	public function getLabelClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return array('col-form-label', $this->labelWidth);
+		} elseif ($this->app['former.form']->isOfType('inline')) {
+			return array('visually-hidden');
+		} else {
+			return array('form-label');
+		}
+	}
+
+	/**
+	 * Add uneditable field classes
+	 *
+	 * @return string An array of attributes with the uneditable class
+	 */
+	public function getUneditableClasses()
+	{
+		return '';
+	}
+
+	/**
+	 * Add plain text field classes
+	 *
+	 * @return string An array of attributes with the plain text class
+	 */
+	public function getPlainTextClasses()
+	{
+		return 'form-control-plaintext';
+	}
+
+	/**
+	 * Add form class
+	 *
+	 * @param  string $type The type of form to add
+	 *
+	 * @return string|null
+	 */
+	public function getFormClasses($type)
+	{
+		return $type ? 'form-'.$type : null;
+	}
+
+	/**
+	 * Add actions block class
+	 *
+	 * @return string|null
+	 */
+	public function getActionClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal') || $this->app['former.form']->isOfType('inline')) {
+			return 'mb-3 row';
+		}
+
+		return null;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// RENDER BLOCKS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Render an help text
+	 *
+	 * @param string $text
+	 * @param array  $attributes
+	 *
+	 * @return Element
+	 */
+	public function createHelp($text, $attributes = array())
+	{
+		return Element::create('small', $text, $attributes)->addClass('text-muted');
+	}
+
+	/**
+	 * Render an validation error text
+	 *
+	 * @param string $text
+	 * @param array  $attributes
+	 *
+	 * @return string
+	 */
+	public function createValidationError($text, $attributes = array())
+	{
+		return Element::create('div', $text, $attributes)->addClass('invalid-feedback');
+	}
+
+	/**
+	 * Render an help text
+	 *
+	 * @param string $text
+	 * @param array  $attributes
+	 *
+	 * @return Element
+	 */
+	public function createBlockHelp($text, $attributes = array())
+	{
+		return Element::create('small', $text, $attributes)->addClass('form-text text-muted');
+	}
+
+	/**
+	 * Render a disabled field
+	 *
+	 * @param Field $field
+	 *
+	 * @return Element
+	 */
+	public function createDisabledField(Field $field)
+	{
+		return Element::create('span', $field->getValue(), $field->getAttributes());
+	}
+
+	/**
+	 * Render a plain text field
+	 *
+	 * @param Field $field
+	 *
+	 * @return Element
+	 */
+	public function createPlainTextField(Field $field)
+	{
+		$label = $field->getLabel();
+		if ($label) {
+			$label->for('');
+		}
+
+		return Element::create('div', $field->getValue(), $field->getAttributes());
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// WRAP BLOCKS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Wrap an item to be prepended or appended to the current field
+	 *
+	 * @return Element A wrapped item
+	 */
+	public function placeAround($item, $place = null)
+	{
+		// Render object
+		if (is_object($item) and method_exists($item, '__toString')) {
+			$item = $item->__toString();
+		}
+
+		$items = (array) $item;
+		$element = '';
+		foreach ($items as $item) {
+			$hasButtonTag = strpos(ltrim($item), '<button') === 0;
+
+			// Get class to use
+			$class = $hasButtonTag ? '' : 'input-group-text';
+
+			$element .= $hasButtonTag ? $item : Element::create('span', $item)->addClass($class);
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Wrap a field with prepended and appended items
+	 *
+	 * @param  Field $field
+	 * @param  array $prepend
+	 * @param  array $append
+	 *
+	 * @return string A field concatented with prepended and/or appended items
+	 */
+	public function prependAppend($field, $prepend, $append)
+	{
+		$return = '<div class="input-group">';
+		$return .= join(null, $prepend);
+		$return .= $field->render();
+		$return .= join(null, $append);
+		$return .= '</div>';
+
+		return $return;
+	}
+
+	/**
+	 * Wrap a field with potential additional tags
+	 *
+	 * @param  Field $field
+	 *
+	 * @return Element A wrapped field
+	 */
+	public function wrapField($field)
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $field)->addClass($this->fieldWidth);
+		}
+
+		return $field;
+	}
+
+	/**
+	 * Wrap actions block with potential additional tags
+	 *
+	 * @param  Actions $actions
+	 *
+	 * @return string A wrapped actions block
+	 */
+	public function wrapActions($actions)
+	{
+		// For horizontal forms, we wrap the actions in a div
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
+		}
+
+		return $actions;
+	}
+}
diff --git a/src/Former/Traits/Checkable.php b/src/Former/Traits/Checkable.php
index e79cb55f..028ece26 100644
--- a/src/Former/Traits/Checkable.php
+++ b/src/Former/Traits/Checkable.php
@@ -363,10 +363,9 @@ protected function createCheckable($item, $fallbackValue = 1)
 		// If inline items, add class
 		$isInline = $this->inline ? ' '.$this->app['former.framework']->getInlineLabelClass($this) : null;
 
-		// In Bootsrap 3 or 4, don't append the the checkable type (radio/checkbox) as a class if
+		// In Bootsrap 3 or 4 or 5, don't append the the checkable type (radio/checkbox) as a class if
 		// rendering inline.
-		$class =  ($this->app['former']->framework() == 'TwitterBootstrap3' ||
-			$this->app['former']->framework() == 'TwitterBootstrap4') ? trim($isInline) : $this->checkable.$isInline;
+		$class =  in_array($this->app['former']->framework(), ['TwitterBootstrap3', 'TwitterBootstrap4', 'TwitterBootstrap5']) ? trim($isInline) : $this->checkable.$isInline;
 
 		// Merge custom attributes with global attributes
 		$attributes = array_merge($this->attributes, $attributes);
@@ -394,7 +393,7 @@ protected function createCheckable($item, $fallbackValue = 1)
 		// If no label to wrap, return plain checkable
 		if (!$label) {
 			$element = (is_object($field)) ? $field->render() : $field;
-		} elseif ($this->app['former']->framework() == 'TwitterBootstrap4') {
+		} elseif (in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])) {
 			// Revised for Bootstrap 4, move the 'input' outside of the 'label'
 			$labelClass = 'form-check-label';
 			$element = $field . Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
diff --git a/src/config/former.php b/src/config/former.php
index b7bbac6e..c37fe795 100644
--- a/src/config/former.php
+++ b/src/config/former.php
@@ -77,6 +77,29 @@
 	// The framework to be used by Former
 	'framework'               => 'TwitterBootstrap3',
 
+	'TwitterBootstrap5'       => array(
+
+		// Map Former-supported viewports to Bootstrap 5 equivalents
+		'viewports'   => array(
+			'large'  => 'lg',
+			'medium' => 'md',
+			'small'  => 'sm',
+			'mini'   => 'xs',
+		),
+		// Width of labels for horizontal forms expressed as viewport => grid columns
+		'labelWidths' => array(
+			'large' => 2,
+			'small' => 4,
+		),
+		// HTML markup and classes used by Bootstrap 5 for icons
+		'icon'        => array(
+			'tag'    => 'i',
+			'set'    => 'fa',
+			'prefix' => 'fa',
+		),
+
+	),
+
 	'TwitterBootstrap4'       => array(
 
 		// Map Former-supported viewports to Bootstrap 4 equivalents
@@ -91,7 +114,7 @@
 			'large' => 2,
 			'small' => 4,
 		),
-		// HTML markup and classes used by Bootstrap 5 for icons
+		// HTML markup and classes used by Bootstrap 4 for icons
 		'icon'        => array(
 			'tag'    => 'i',
 			'set'    => 'fa',
diff --git a/tests/Framework/TwitterBootstrap5Test.php b/tests/Framework/TwitterBootstrap5Test.php
new file mode 100644
index 00000000..041b34a6
--- /dev/null
+++ b/tests/Framework/TwitterBootstrap5Test.php
@@ -0,0 +1,212 @@
+<?php
+namespace Former\Framework;
+
+use Former\TestCases\FormerTests;
+
+class TwitterBootstrap5Test extends FormerTests
+{
+
+	public function setUp(): void
+	{
+		parent::setUp();
+
+		$this->former->framework('TwitterBootstrap5');
+		$this->former->horizontal_open()->__toString();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function hmatch($label, $field)
+	{
+		return '<div class="mb-3 row">'.$label.'<div class="col-lg-10 col-sm-8">'.$field.'</div></div>';
+	}
+
+	public function vmatch($label, $field)
+	{
+		return '<div class="mb-3">'.$label.$field.'</div>';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testFrameworkIsRecognized()
+	{
+		$this->assertNotEquals('TwitterBootstrap', $this->former->framework());
+		$this->assertEquals('TwitterBootstrap5', $this->former->framework());
+	}
+
+	public function testVerticalFormFieldsDontInheritHorizontalMarkup()
+	{
+		$this->former->open_vertical();
+		$field = $this->former->text('foo')->__toString();
+		$this->former->close();
+
+		$match = $this->vmatch('<label for="foo" class="form-label">Foo</label>',
+			'<input class="form-control" id="foo" type="text" name="foo">');
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testHorizontalFormWithDefaultLabelWidths()
+	{
+		$field = $this->former->text('foo')->__toString();
+		$match = $this->hmatch('<label for="foo" class="col-form-label col-lg-2 col-sm-4">Foo</label>',
+			'<input class="form-control" id="foo" type="text" name="foo">');
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testPrependIcon()
+	{
+		$this->former->open_vertical();
+		$icon  = $this->former->text('foo')->prependIcon('thumbs-up')->__toString();
+		$match = $this->vmatch('<label for="foo" class="form-label">Foo</label>',
+			'<div class="input-group">'.
+			'<span class="input-group-text"><i class="fa fa-thumbs-up"></i></span>'.
+			'<input class="form-control" id="foo" type="text" name="foo">'.
+			'</div>');
+
+		$this->assertEquals($match, $icon);
+	}
+
+	public function testAppendIcon()
+	{
+		$this->former->open_vertical();
+		$icon  = $this->former->text('foo')->appendIcon('thumbs-up')->__toString();
+		$match = $this->vmatch('<label for="foo" class="form-label">Foo</label>',
+			'<div class="input-group">'.
+			'<input class="form-control" id="foo" type="text" name="foo">'.
+			'<span class="input-group-text"><i class="fa fa-thumbs-up"></i></span>'.
+			'</div>');
+		$this->assertEquals($match, $icon);
+	}
+
+	public function testTextFieldsGetControlClass()
+	{
+		$this->former->open_vertical();
+		$field = $this->former->text('foo')->__toString();
+		$match = $this->vmatch('<label for="foo" class="form-label">Foo</label>',
+			'<input class="form-control" id="foo" type="text" name="foo">');
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testButtonSizes()
+	{
+		$this->former->open_vertical();
+		$buttons = $this->former->actions()->lg_submit('Submit')->submit('Submit')->sm_submit('Submit')->xs_submit('Submit')->__toString();
+		$match   = '<div>'.
+			'<input class="btn-lg btn" type="submit" value="Submit">'.
+			' <input class="btn" type="submit" value="Submit">'.
+			' <input class="btn-sm btn" type="submit" value="Submit">'.
+			' <input class="btn-xs btn" type="submit" value="Submit">'.
+			'</div>';
+
+		$this->assertEquals($match, $buttons);
+	}
+
+	public function testCanOverrideFrameworkIconSettings()
+	{
+		// e.g. using other Glyphicon sets
+		$icon1  = $this->app['former.framework']->createIcon('facebook', null, array(
+			'tag'	 => 'span',
+			'set'    => 'social',
+			'prefix' => 'glyphicon',
+		))->__toString();
+		$match1 = '<span class="social glyphicon-facebook"></span>';
+
+		$this->assertEquals($match1, $icon1);
+
+		// e.g using Font-Awesome circ v3.2.1
+		$icon2  = $this->app['former.framework']->createIcon('flag', null, array(
+			'tag'    => 'i',
+			'set'    => '',
+			'prefix' => 'icon',
+		))->__toString();
+		$match2 = '<i class="icon-flag"></i>';
+
+		$this->assertEquals($match2, $icon2);
+	}
+
+	public function testCanCreateWithErrors()
+	{
+		$this->former->open_vertical();
+		$this->former->withErrors($this->validator);
+
+		$required = $this->former->text('required')->__toString();
+		$matcher  =
+			'<div class="mb-3 is-invalid">'.
+			'<label for="required" class="form-label">Required</label>'.
+			'<input class="form-control is-invalid" id="required" type="text" name="required">'.
+			'<div class="invalid-feedback">The required field is required.</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $required);
+	}
+
+	public function testAddScreenReaderClassToInlineFormLabels()
+	{
+		$this->former->open_inline();
+
+		$field = $this->former->text('foo')->__toString();
+
+		$match =
+			'<div class="mb-3">'.
+			'<label for="foo" class="visually-hidden">Foo</label>'.
+			'<input class="form-control" id="foo" type="text" name="foo">'.
+			'</div>';
+
+		$this->assertEquals($match, $field);
+		$this->assertEquals($match, $field);
+
+		$this->former->close();
+	}
+
+	public function testHeightSettingForFields()
+	{
+		$this->former->open_vertical();
+
+		$field = $this->former->lg_text('foo')->__toString();
+		$match =
+			'<div class="mb-3">'.
+			'<label for="foo" class="form-label">Foo</label>'.
+			'<input class="input-lg form-control" id="foo" type="text" name="foo">'.
+			'</div>';
+		$this->assertEquals($match, $field);
+
+		$this->resetLabels();
+		$field = $this->former->sm_select('foo')->__toString();
+		$match =
+			'<div class="mb-3">'.
+			'<label for="foo" class="form-label">Foo</label>'.
+			'<select class="input-sm form-select" id="foo" name="foo"></select>'.
+			'</div>';
+		$this->assertEquals($match, $field);
+
+		$this->former->close();
+	}
+
+	public function testAddFormControlClassToInlineActionsBlock()
+	{
+		$this->former->open_inline();
+		$buttons = $this->former->actions()->submit('Foo')->__toString();
+		$match   = '<div class="mb-3 row">'.
+			'<input class="btn" type="submit" value="Foo">'.
+			'</div>';
+
+		$this->assertEquals($match, $buttons);
+
+		$this->former->close();
+	}
+
+	public function testButtonsAreNotWrapped()
+	{
+		$button  = $this->former->text('foo')->append($this->former->button('Search'))->wrapAndRender();
+		$matcher = '<button class="btn" type="button">Search</button>';
+
+		$this->assertStringContainsString($matcher, $button);
+	}
+}
diff --git a/tests/TestCases/ContainerTestCase.php b/tests/TestCases/ContainerTestCase.php
index 864bf645..a815918a 100644
--- a/tests/TestCases/ContainerTestCase.php
+++ b/tests/TestCases/ContainerTestCase.php
@@ -165,6 +165,16 @@ protected function mockConfig(array $options = array())
 				'small'  => 'sm',
 				'mini'   => 'xs',
 			),
+			'TwitterBootstrap5.icon.prefix'       => 'fa',
+			'TwitterBootstrap5.icon.set'          => 'fa',
+			'TwitterBootstrap5.icon.tag'          => 'i',
+			'TwitterBootstrap5.labelWidths'       => array('large' => 2, 'small' => 4),
+			'TwitterBootstrap5.viewports'         => array(
+				'large'  => 'lg',
+				'medium' => 'md',
+				'small'  => 'sm',
+				'mini'   => 'xs',
+			),
 			'ZurbFoundation.icon.prefix'          => 'fi',
 			'ZurbFoundation.icon.set'             => null,
 			'ZurbFoundation.icon.tag'             => 'i',

From 83c098fd7845556b4cb8e90e620dd7b01037a251 Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Thu, 11 Feb 2021 10:40:17 +0100
Subject: [PATCH 02/10] Fix indentation

---
 src/Former/Form/Group.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Former/Form/Group.php b/src/Former/Form/Group.php
index 71e189c2..05dc813d 100644
--- a/src/Former/Form/Group.php
+++ b/src/Former/Form/Group.php
@@ -324,9 +324,9 @@ public function blockHelp($help, $attributes = array())
 	{
 		// Reserved method
 		if ($this->app['former.framework']->isnt('TwitterBootstrap') &&
-		    $this->app['former.framework']->isnt('TwitterBootstrap3') &&
+			$this->app['former.framework']->isnt('TwitterBootstrap3') &&
 			$this->app['former.framework']->isnt('TwitterBootstrap4') &&
-		    $this->app['former.framework']->isnt('TwitterBootstrap5')
+			$this->app['former.framework']->isnt('TwitterBootstrap5')
 		) {
 			throw new BadMethodCallException('This method is only available on the Bootstrap framework');
 		}

From 9a2a793a2d865579ce3fd2e602f108361ebd918f Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Thu, 11 Feb 2021 10:41:33 +0100
Subject: [PATCH 03/10] Fix Former::actions() for Bootstrap 5

---
 src/Former/Framework/TwitterBootstrap5.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Former/Framework/TwitterBootstrap5.php b/src/Former/Framework/TwitterBootstrap5.php
index c60d7977..33c3e55f 100644
--- a/src/Former/Framework/TwitterBootstrap5.php
+++ b/src/Former/Framework/TwitterBootstrap5.php
@@ -190,7 +190,7 @@ protected function setFieldWidths($labelWidths)
 			if ($viewport) {
 				$labelWidthClass .= " col-$viewports[$viewport]-$columns";
 				$fieldWidthClass .= " col-$viewports[$viewport]-".(12 - $columns);
-				$fieldOffsetClass .= " col-$viewports[$viewport]-offset-$columns";
+				$fieldOffsetClass .= " offset-$viewports[$viewport]-$columns";
 			}
 		}
 

From 494309e822549cc116f2d9259b74bf40aed7b26a Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Thu, 4 Mar 2021 18:40:46 +0100
Subject: [PATCH 04/10] Update the help() and blockHelp() methods for BS5

Since Bootstrap v5.0.0-alpha1, '.form-text' no longer sets 'display',
but does set 'color' and 'font-size'.
So instead of <small class="form-text text-muted">
you should now use <div class="form-text"> or <span class="form-text">.

Reference:
https://getbootstrap.com/docs/5.0/migration/#forms-2
---
 src/Former/Form/Group.php                  | 2 +-
 src/Former/Framework/TwitterBootstrap5.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Former/Form/Group.php b/src/Former/Form/Group.php
index 05dc813d..3c7e0a6c 100644
--- a/src/Former/Form/Group.php
+++ b/src/Former/Form/Group.php
@@ -177,7 +177,7 @@ public function wrapField($field)
 		$label = $this->getLabel($field);
 		$help = $this->getHelp();
 		if ($field->isCheckable() &&
-			in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])
+			$this->app['former']->framework() === 'TwitterBootstrap4'
 		) {
 			$wrapperClass = $field->isInline() ? 'form-check form-check-inline' : 'form-check';
 			if ($this->app['former']->getErrors($field->getName())) {
diff --git a/src/Former/Framework/TwitterBootstrap5.php b/src/Former/Framework/TwitterBootstrap5.php
index 33c3e55f..6431b0a6 100644
--- a/src/Former/Framework/TwitterBootstrap5.php
+++ b/src/Former/Framework/TwitterBootstrap5.php
@@ -343,7 +343,7 @@ public function getActionClasses()
 	 */
 	public function createHelp($text, $attributes = array())
 	{
-		return Element::create('small', $text, $attributes)->addClass('text-muted');
+		return Element::create('span', $text, $attributes)->addClass('form-text');
 	}
 
 	/**
@@ -369,7 +369,7 @@ public function createValidationError($text, $attributes = array())
 	 */
 	public function createBlockHelp($text, $attributes = array())
 	{
-		return Element::create('small', $text, $attributes)->addClass('form-text text-muted');
+		return Element::create('div', $text, $attributes)->addClass('form-text');
 	}
 
 	/**

From 70b8a5802ce43b43446363f839cbbcf7a1547273 Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Fri, 7 May 2021 15:01:27 +0200
Subject: [PATCH 05/10] Add the switch markup which is a custom checkbox for
 BS5

Some use cases with Laravel:

  {!!
      Former::switch('valid_switch_ok')
          ->text('Valid switch OK')
  !!}

  {!!
      Former::switches('valid_inline_switches_ok')
          ->switches('first', 'second', 'third', 'fourth')
          ->inline()
  !!}

Reference:
https://getbootstrap.com/docs/5.0/forms/checks-radios/#switches
---
 src/Former/Form/Fields/Switchbox.php | 23 +++++++++++++++++++++++
 src/Former/MethodDispatcher.php      |  4 ++++
 src/Former/Traits/Checkable.php      | 12 ++++++++----
 src/Former/Traits/Field.php          |  2 +-
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 src/Former/Form/Fields/Switchbox.php

diff --git a/src/Former/Form/Fields/Switchbox.php b/src/Former/Form/Fields/Switchbox.php
new file mode 100644
index 00000000..570460f0
--- /dev/null
+++ b/src/Former/Form/Fields/Switchbox.php
@@ -0,0 +1,23 @@
+<?php
+namespace Former\Form\Fields;
+
+class Switchbox extends Checkbox
+{
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// FIELD METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Create a serie of switches
+	 */
+	public function switches()
+	{
+		if ($this->isGrouped()) {
+			// Remove any possible items added by the Populator.
+			$this->items = array();
+		}
+		$this->items(func_get_args());
+
+		return $this;
+	}
+}
diff --git a/src/Former/MethodDispatcher.php b/src/Former/MethodDispatcher.php
index c80f50fc..17ca8043 100644
--- a/src/Former/MethodDispatcher.php
+++ b/src/Former/MethodDispatcher.php
@@ -230,6 +230,10 @@ protected function getClassFromMethod($method)
 
 		// Else convert known fields to their classes
 		switch ($method) {
+			case 'switch':
+			case 'switches':
+				$class = Former::FIELDSPACE.'Switchbox';
+				break;
 			case 'submit':
 			case 'link':
 			case 'reset':
diff --git a/src/Former/Traits/Checkable.php b/src/Former/Traits/Checkable.php
index 028ece26..2fc4f713 100644
--- a/src/Former/Traits/Checkable.php
+++ b/src/Former/Traits/Checkable.php
@@ -380,7 +380,7 @@ protected function createCheckable($item, $fallbackValue = 1)
 		}
 
 		// Add hidden checkbox if requested
-		if ($this->isOfType('checkbox', 'checkboxes')) {
+		if ($this->isOfType('checkbox', 'checkboxes', 'switch', 'switches')) {
 			if ($this->isPushed or ($this->app['former']->getOption('push_checkboxes') and $this->isPushed !== false)) {
 				$field = $this->app['former']->hidden($name)->forceValue($this->app['former']->getOption('unchecked_value')).$field->render();
 
@@ -398,9 +398,13 @@ protected function createCheckable($item, $fallbackValue = 1)
 			$labelClass = 'form-check-label';
 			$element = $field . Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
 
-			$wrapper_class = $this->inline ? 'form-check form-check-inline' : 'form-check';
-
-			$element = Element::create('div', $element)->class($wrapper_class)->render();
+			$wrapperClass = $this->inline ? 'form-check form-check-inline' : 'form-check';
+			if ($this->app['former']->framework() === 'TwitterBootstrap5' &&
+				$this->isOfType('switch', 'switches')
+			) {
+				$wrapperClass.= ' form-switch';
+			}
+			$element = Element::create('div', $element)->class($wrapperClass)->render();
 		} else {
 			// Original way is to add the 'input' inside the 'label'
 			$element = Element::create('label', $field.$label)->for($attributes['id'])->class($class)->render();
diff --git a/src/Former/Traits/Field.php b/src/Former/Traits/Field.php
index 11e3a8de..fe079b3d 100644
--- a/src/Former/Traits/Field.php
+++ b/src/Former/Traits/Field.php
@@ -230,7 +230,7 @@ public function isUnwrappable()
 	 */
 	public function isCheckable()
 	{
-		return $this->isOfType('checkbox', 'checkboxes', 'radio', 'radios');
+		return $this->isOfType('checkbox', 'checkboxes', 'radio', 'radios', 'switch', 'switches');
 	}
 
 	/**

From c4fca7a7dfdda714ecee71b0e7eb4749db155bcb Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Fri, 7 May 2021 17:36:18 +0200
Subject: [PATCH 06/10] Add removeGroupClass() and removeLabelClass() methods
 and tests

Usage with Laravel:

  {!!
      Former::text('test')
          ->removeGroupClass('row')
          ->removeLabelClass('foo')
  !!}

Warning: there is a bug in the HTMLObject package!

See my patch for more info:
https://github.com/tortuetorche/html-object/commit/b3c5601e5a6bb06c20df10827b9292d800261c1e
---
 src/Former/Form/Group.php | 31 +++++++++++++++++++++++++++++--
 tests/GroupTest.php       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/Former/Form/Group.php b/src/Former/Form/Group.php
index 3c7e0a6c..e504b520 100644
--- a/src/Former/Form/Group.php
+++ b/src/Former/Form/Group.php
@@ -212,17 +212,27 @@ public function state($state)
 	/**
 	 * Set a class on the Group
 	 *
-	 * @param string $class The class to add
+	 * @param string $class The class(es) to add on the Group
 	 */
 	public function addGroupClass($class)
 	{
 		$this->addClass($class);
 	}
 
+	/**
+	 * Remove one or more classes on the Group
+	 *
+	 * @param string $class The class(es) to remove on the Group
+	 */
+	public function removeGroupClass($class)
+	{
+		$this->removeClass($class);
+	}
+
 	/**
 	 * Set a class on the Label
 	 *
-	 * @param string $class The class to add on the Label
+	 * @param string $class The class(es) to add on the Label
 	 */
 	public function addLabelClass($class)
 	{
@@ -236,6 +246,23 @@ public function addLabelClass($class)
 		return $this;
 	}
 
+	/**
+	 * Remove one or more classes on the Label
+	 *
+	 * @param string $class The class(es) to remove on the Label
+	 */
+	public function removeLabelClass($class)
+	{
+		// Don't remove a label class if it isn't an Element instance
+		if (!$this->label instanceof Element) {
+			return $this;
+		}
+
+		$this->label->removeClass($class);
+
+		return $this;
+	}
+
 	/**
 	 * Adds a label to the group
 	 *
diff --git a/tests/GroupTest.php b/tests/GroupTest.php
index 993d61e0..63bc08d6 100644
--- a/tests/GroupTest.php
+++ b/tests/GroupTest.php
@@ -304,6 +304,21 @@ public function testCanAddClassToGroup()
 		$this->assertEquals($matcher, $control);
 	}
 
+	public function testCanRemoveClassToGroup()
+	{
+		$element = $this->former->text('foo')->addGroupClass('foo');
+		$control = $element->__toString();
+		$matcher = $this->createMatcher();
+		$matcher = str_replace('group"', 'group foo"', $matcher);
+
+		$this->assertEquals($matcher, $control);
+
+		$controlWithoutClass = $element->removeGroupClass('foo')->__toString();
+		$matcherWithoutClass = str_replace('group foo"', 'group"', $matcher);
+
+		$this->assertEquals($matcherWithoutClass, $controlWithoutClass);
+	}
+
 	public function testCanAddClassToLabel()
 	{
 		$control = $this->former->text('foo')->addLabelClass('foo-label')->__toString();
@@ -313,6 +328,21 @@ public function testCanAddClassToLabel()
 		$this->assertEquals($matcher, $control);
 	}
 
+	public function testCanRemoveClassToLabel()
+	{
+		$element = $this->former->text('foo')->addLabelClass('foo-label');
+		$control = $element->__toString();
+		$matcher = $this->createMatcher();
+		$matcher = str_replace('control-label"', 'foo-label control-label"', $matcher);
+
+		$this->assertEquals($matcher, $control);
+
+		$controlWithoutClass = $element->removeLabelClass('foo-label')->__toString();
+		$matcherWithoutClass = str_replace('foo-label control-label"', 'control-label"', $matcher);
+
+		$this->assertEquals($matcherWithoutClass, $controlWithoutClass);
+	}
+
 	public function testCanRecognizeGroupValidationErrors()
 	{
 		$this->mockSession(array('foo' => 'bar', 'bar' => 'baz'));

From 21b30f78c1a25c40acc33877173c22445a2190bf Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Fri, 7 May 2021 17:47:11 +0200
Subject: [PATCH 07/10] Support BS5 floating labels for <input>, <select> and
 <textarea>

NOTE: You need to use floating label elements
      with a 'vertical_open' Former instance!

Usage with Laravel:

  {!! Former::vertical_open() !!}
      {!!
          Former::text('test-floating-label-ok')
              ->placeholder('dummy placeholder')
              ->floatingLabel()
      !!}
      {!!
          Former::select('users-floating-label')
              ->options(['User One', 'User Two', 'User Three'])
              ->placeholder('Select placeholder')
              ->floatingLabel()
      !!}
      {!!
          Former::textarea('textarea-floating-label')
              ->floatingLabel()
              ->placeholder('dummy placeholder')
      !!}
  {!! Former::close() !!}

  {!! Former::vertical_open() !!}
      <div class="row">
          <div class="col">
              {!!
                  Former::text('test-floating-label-one')
                      ->placeholder('dummy placeholder')
                      ->floatingLabel()
              !!}
          </div>
          <div class="col">
              {!!
                  Former::text('test-floating-label-two')
                      ->placeholder('dummy placeholder')
                      ->floatingLabel()
              !!}
          </div>
      </div>
  {!! Former::close() !!}

Reference:
https://getbootstrap.com/docs/5.0/forms/floating-labels/
---
 src/Former/Form/Group.php                  | 25 ++++++++++++++++++++
 src/Former/Framework/TwitterBootstrap5.php | 10 ++++++++
 src/Former/Traits/Field.php                | 27 ++++++++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/src/Former/Form/Group.php b/src/Former/Form/Group.php
index e504b520..b326206d 100644
--- a/src/Former/Form/Group.php
+++ b/src/Former/Form/Group.php
@@ -186,9 +186,17 @@ public function wrapField($field)
 			}
 			$help = Element::create('div', $help)->class($wrapperClass);
 		}
+		$withFloatingLabel = $field->withFloatingLabel();
+
 		$field = $this->prependAppend($field);
 		$field .= $help;
 
+		if ($withFloatingLabel &&
+			$this->app['former']->framework() === 'TwitterBootstrap5'
+		) {
+			return $this->wrapWithFloatingLabel($field, $label);
+		}
+
 		return $this->wrap($field, $label);
 	}
 
@@ -458,6 +466,23 @@ public function wrap($contents, $label = null)
 		return $group;
 	}
 
+	/**
+	 * Wraps content in a group with floating label
+	 *
+	 * @param string $contents The content
+	 * @param string $label    The label to add
+	 *
+	 * @return string A group
+	 */
+	public function wrapWithFloatingLabel($contents, $label = null)
+	{
+		$floatingLabelClass = $this->app['former.framework']->getFloatingLabelClass();
+		if ($floatingLabelClass) {
+			$this->addClass($floatingLabelClass);
+		}
+		return $this->wrap($label, $contents);
+	}
+
 	/**
 	 * Prints out the current label
 	 *
diff --git a/src/Former/Framework/TwitterBootstrap5.php b/src/Former/Framework/TwitterBootstrap5.php
index 6431b0a6..ebda9d62 100644
--- a/src/Former/Framework/TwitterBootstrap5.php
+++ b/src/Former/Framework/TwitterBootstrap5.php
@@ -329,6 +329,16 @@ public function getActionClasses()
 		return null;
 	}
 
+	/**
+	 * Add floating label class
+	 *
+	 * @return string Get the floating label class
+	 */
+	public function getFloatingLabelClass()
+	{
+		return 'form-floating';
+	}
+
 	////////////////////////////////////////////////////////////////////
 	//////////////////////////// RENDER BLOCKS /////////////////////////
 	////////////////////////////////////////////////////////////////////
diff --git a/src/Former/Traits/Field.php b/src/Former/Traits/Field.php
index fe079b3d..fb8c0b2e 100644
--- a/src/Former/Traits/Field.php
+++ b/src/Former/Traits/Field.php
@@ -65,6 +65,13 @@ abstract class Field extends FormerObject implements FieldInterface
 	 */
 	protected $bind;
 
+	/**
+	 * Renders with floating label
+	 *
+	 * @var boolean
+	 */
+	protected $floatingLabel = false;
+
 	/**
 	 * Get the current framework instance
 	 *
@@ -243,6 +250,16 @@ public function isButton()
 		return false;
 	}
 
+	/**
+	 * Check if the field get a floating label
+	 *
+	 * @return boolean
+	 */
+	public function withFloatingLabel()
+	{
+		return $this->floatingLabel;
+	}
+
 	/**
 	 * Get the rules applied to the current field
 	 *
@@ -386,6 +403,16 @@ public function name($name)
 		return $this;
 	}
 
+	/**
+	 * Set the field as floating label
+	 */
+	public function floatingLabel($isFloatingLabel = true)
+	{
+		$this->floatingLabel = $isFloatingLabel;
+
+		return $this;
+	}
+
 	/**
 	 * Get the field's labels
 	 *

From 90deb04e872cd25b0257811fe86dc325da77e6d3 Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Wed, 19 May 2021 13:33:38 +0200
Subject: [PATCH 08/10] Add tests for the switch markup, useful for Bootstrap 5

Related to commit 70b8a5802ce43b43446363f839cbbcf7a1547273

Reference:
https://getbootstrap.com/docs/5.0/forms/checks-radios/#switches
---
 tests/Fields/SwitchTest.php     | 543 ++++++++++++++++++++++++++++++++
 tests/TestCases/FormerTests.php |  32 +-
 2 files changed, 574 insertions(+), 1 deletion(-)
 create mode 100644 tests/Fields/SwitchTest.php

diff --git a/tests/Fields/SwitchTest.php b/tests/Fields/SwitchTest.php
new file mode 100644
index 00000000..5c5aa60f
--- /dev/null
+++ b/tests/Fields/SwitchTest.php
@@ -0,0 +1,543 @@
+<?php
+namespace Former\Fields;
+
+use Former\Dummy\DummyEloquent;
+use Former\TestCases\FormerTests;
+
+class SwitchTest extends FormerTests
+{
+
+	public function setUp(): void
+	{
+		parent::setUp();
+		$this->former->framework('TwitterBootstrap5');
+		$this->former->horizontal_open()->__toString();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Matches a switch
+	 *
+	 * @param  string  $name
+	 * @param  string  $label
+	 * @param  integer $value
+	 * @param  boolean $inline
+	 * @param  boolean $checked
+	 * @param  mixed $disabled If 'disabled', rendered as `disabled="disabled"`. If true, then rendered as `disabled`.
+	 * @param  boolean $raw
+	 *
+	 * @return string
+	 */
+	private function matchSwitch(
+		$name = 'foo',
+		$label = null,
+		$value = 1,
+		$inline = false,
+		$checked = false,
+		$disabled = false,
+		$raw = false
+	) {
+		$checkAttr = array(
+			'class'    => 'form-check-input',
+			'disabled' => $disabled === 'disabled' ? 'disabled' : null,
+			'id'       => $name,
+			'type'     => 'checkbox',
+			'name'     => $name,
+			'checked'  => 'checked',
+			'value'    => $value,
+		);
+		$labelAttr = array(
+			'for'   => $name,
+			'class' => 'form-check-label',
+		);
+		if (!$checked) {
+			unset($checkAttr['checked']);
+		}
+		if (!$disabled) {
+			unset($checkAttr['disabled']);
+		}
+
+		$switch = '<input'.$this->attributes($checkAttr).'>';
+
+		$controlClasses = 'form-check';
+		if ($inline) {
+			$controlClasses .= ' form-check-inline';
+		}
+		$controlClasses .= ' form-switch';
+
+		if ($label) {
+			$switch .= '<label'.$this->attributes($labelAttr).'>'.$label.'</label>';
+		}
+
+		if ($raw) {
+			return $switch;
+		}
+
+		return '<div class="'.$controlClasses.'">'.$switch.'</div>';
+	}
+
+	/**
+	 * Matches a checked switch
+	 *
+	 * @param  string  $name
+	 * @param  string  $label
+	 * @param  integer $value
+	 * @param  boolean $inline
+	 *
+	 * @return string
+	 */
+	private function matchCheckedSwitch($name = 'foo', $label = null, $value = 1, $inline = false)
+	{
+		return $this->matchSwitch($name, $label, $value, $inline, true);
+	}
+
+	/**
+	 * Matches a checked switch
+	 *
+	 * @param  string  $name
+	 * @param  string  $label
+	 * @param  integer $value
+	 * @param  boolean $inline
+	 * @param  boolean $checked
+	 * @param  mixed $disabled If 'disabled', rendered as `disabled="disabled"`. If true, then rendered as `disabled`.
+	 *
+	 * @return string
+	 */
+	private function matchRawSwitch(
+		$name = 'foo',
+		$label = null,
+		$value = 1,
+		$inline = false,
+		$checked = false,
+		$disabled = false
+	) {
+		return $this->matchSwitch($name, $label, $value, $inline, $checked, $disabled, true);
+	}
+
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanCreateASwitchWithALabel()
+	{
+		$switch  = $this->former->switch('foo')->text('bar')->__toString();
+		$matcher = $this->formGroupWithBS5($this->matchSwitch('foo', 'Bar'));
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testCanSetValueOfASingleSwitch()
+	{
+		$switch  = $this->former->switch('foo')->text('bar')->value('foo')->__toString();
+		$matcher = $this->formGroupWithBS5($this->matchSwitch('foo', 'Bar', 'foo'));
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testCanCreateMultipleSwitches()
+	{
+		$switches = $this->former->switches('foo')->switches('foo', 'bar')->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo_0', 'Foo').$this->matchSwitch('foo_1', 'Bar'));
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanFocusOnASwitch()
+	{
+		$switches = $this->former->switches('foo')
+		                           ->switches('foo', 'bar')
+		                           ->on(0)->text('first')->on(1)->text('second')->__toString();
+
+		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo_0', 'First').$this->matchSwitch('foo_1', 'Second'));
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanCreateInlineSwitches()
+	{
+		$switches1 = $this->former->inline_switches('foo')->switches('foo', 'bar')->__toString();
+		$this->resetLabels();
+		$switches2 = $this->former->switches('foo')->inline()->switches('foo', 'bar')->__toString();
+		$matcher   = $this->formGroupWithBS5($this->matchSwitch('foo_0', 'Foo', 1, true).$this->matchSwitch('foo_1', 'Bar', 1, true));
+
+		$this->assertEquals($matcher, $switches1);
+		$this->assertEquals($matcher, $switches2);
+	}
+
+	public function testCanCreateStackedSwitches()
+	{
+		$switches1 = $this->former->stacked_switches('foo')->switches('foo', 'bar')->__toString();
+		$this->resetLabels();
+		$switches2 = $this->former->switches('foo')->stacked()->switches('foo', 'bar')->__toString();
+		$matcher   = $this->formGroupWithBS5($this->matchSwitch('foo_0', 'Foo', 1).$this->matchSwitch('foo_1', 'Bar', 1));
+
+		$this->assertEquals($matcher, $switches1);
+		$this->assertEquals($matcher, $switches2);
+	}
+
+	public function testCanCreateMultipleSwitchesViaAnArray()
+	{
+		$this->resetLabels();
+		$switches = $this->former->switches('foo')->switches(array('Foo' => 'foo', 'Bar' => 'bar'))->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo', 'Foo').$this->matchSwitch('bar', 'Bar'));
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanCustomizeSwitchesViaAnArray()
+	{
+		$switches = $this->former->switches('foo')->switches($this->checkables)->__toString();
+		$matcher  = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input class="form-check-input" data-foo="bar" value="bar" id="foo" type="checkbox" name="foo">'.
+		  		'<label for="foo" class="form-check-label">Foo</label>'.
+			'</div>'.
+			'<div class="form-check form-switch">'.
+				'<input class="form-check-input" data-foo="bar" value="bar" id="bar" type="checkbox" name="foo">'.
+				'<label for="bar" class="form-check-label">Bar</label>'.
+			'</div>');
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanCreateMultipleAnonymousSwitches()
+	{
+		$checkables = $this->checkables;
+		unset($checkables['Foo']['name']);
+		unset($checkables['Bar']['name']);
+
+		$switches = $this->former->switches('foo')->switches($checkables)->__toString();
+		$matcher  = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input class="form-check-input" data-foo="bar" value="bar" id="foo_0" type="checkbox" name="foo_0">'.
+				'<label for="foo_0" class="form-check-label">Foo</label>'.
+			'</div>'.
+			'<div class="form-check form-switch">'.
+				'<input class="form-check-input" data-foo="bar" value="bar" id="bar" type="checkbox" name="foo_1">'.
+				'<label for="bar" class="form-check-label">Bar</label>'.
+			'</div>'
+		);
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanCheckASingleSwitch()
+	{
+		$switch  = $this->former->switch('foo')->text('Bar')->check()->__toString();
+		$matcher = $this->formGroupWithBS5($this->matchCheckedSwitch('foo', 'Bar'));
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testCanCheckOneInSeveralSwitches()
+	{
+		$switches = $this->former->switches('foo')->switches('foo', 'bar')->check('foo_1')->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo_0', 'Foo').$this->matchCheckedSwitch('foo_1', 'Bar'));
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanCheckMultipleSwitchesAtOnce()
+	{
+		$switches = $this->former->switches('foo')->switches('foo', 'bar')->check(array(
+			'foo_0' => false,
+			'foo_1' => true,
+		))->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo_0', 'Foo').$this->matchCheckedSwitch('foo_1', 'Bar', 1));
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanRepopulateSwitchesFromPost()
+	{
+		$this->request->shouldReceive('input')->with('_token', '', true)->andReturn('');
+		$this->request->shouldReceive('input')->with('foo', '', true)->andReturn('');
+		$this->request->shouldReceive('input')->with('foo_0', '', true)->andReturn(true);
+		$this->request->shouldReceive('input')->with('foo_1', '', true)->andReturn(false);
+
+		$switches = $this->former->switches('foo')->switches('foo', 'bar')->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchCheckedSwitch('foo_0', 'Foo').$this->matchSwitch('foo_1', 'Bar'));
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanPopulateSwitchesFromAnObject()
+	{
+		$this->former->populate((object) array('foo_0' => true));
+
+		$switches = $this->former->switches('foo')->switches('foo', 'bar')->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchCheckedSwitch('foo_0', 'Foo').$this->matchSwitch('foo_1', 'Bar'));
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanPopulateSwitchesWithRelations()
+	{
+		$eloquent = new DummyEloquent(array('id' => 1, 'name' => 3));
+
+		$this->former->populate($eloquent);
+		$switches = $this->former->switches('roles')->__toString();
+		$matcher  = $this->formGroupWithBS5(
+			$this->matchSwitch('1', 'Foo').$this->matchSwitch('3', 'Bar'),
+			'<label for="roles" class="col-form-label col-lg-2 col-sm-4 pt-0">Roles</label>');
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testCanRepopulateSwitchesWithRelations()
+	{
+		$eloquent = new DummyEloquent;
+
+		$roles = array(
+			'Value 01' => array(
+				'name'  => 'rolesAsCollection[1]',
+				'value' => '1',
+			),
+			'Value 02' => array(
+				'name'  => 'rolesAsCollection[2]',
+				'value' => '2',
+			),
+		);
+
+		$this->former->populate($eloquent);
+		$switches = $this->former->switches('rolesAsCollection[]')->switches($roles)->__toString();
+
+		$this->assertEquals($this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input class="form-check-input" value="1" id="rolesAsCollection[1]" type="checkbox" name="rolesAsCollection[1]" checked="checked">'.
+				'<label for="rolesAsCollection[1]" class="form-check-label">Value 01</label>'.
+			'</div>'.
+			'<div class="form-check form-switch">'.
+				'<input class="form-check-input" value="2" id="rolesAsCollection[2]" type="checkbox" name="rolesAsCollection[2]">'.
+				'<label for="rolesAsCollection[2]" class="form-check-label">Value 02</label>'.
+			'</div>',
+			'<label for="rolesAsCollection" class="col-form-label col-lg-2 col-sm-4 pt-0">RolesAsCollection</label>'), $switches);
+	}
+
+	public function testCanDecodeCorrectlySwitches()
+	{
+		$switch  = $this->former->switch('foo')->__toString();
+
+		$content = html_entity_decode($switch, ENT_QUOTES, 'UTF-8');
+
+		$this->assertEquals($content, $this->former->switch('foo')->__toString());
+	}
+
+	public function testCanPushUncheckedSwitches()
+	{
+		$switch  = $this->former->switch('foo')->text('foo')->push(true);
+		$matcher = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input type="hidden" name="foo" value="">'.
+				$this->matchRawSwitch('foo').
+				'<label for="foo" class="form-check-label">Foo</label>'.
+			'</div>');
+
+		$this->assertEquals($matcher, $switch->wrapAndRender());
+	}
+
+	public function testCanOverrideGloballyPushedSwitches()
+	{
+		$this->mockConfig(array('push_checkboxes' => true));
+		$switch  = $this->former->switch('foo')->text('foo')->push(false);
+
+		$matcher = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				$this->matchRawSwitch('foo').
+				'<label for="foo" class="form-check-label">Foo</label>'.
+			'</div>');
+
+		$this->assertEquals($matcher, $switch->wrapAndRender());
+	}
+
+	public function testCanPushASingleSwitch()
+	{
+		$this->mockConfig(array('push_checkboxes' => true));
+
+		$switch  = $this->former->switch('foo')->text('foo')->__toString();
+		$matcher = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input type="hidden" name="foo" value="">'.
+				$this->matchRawSwitch('foo').
+				'<label for="foo" class="form-check-label">Foo</label>'.
+			'</div>');
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testCanRepopulateSwitchesOnSubmit()
+	{
+		$this->mockConfig(array('push_checkboxes' => true));
+		$this->request->shouldReceive('input')->andReturn('');
+
+		$switch  = $this->former->switch('foo')->text('foo')->__toString();
+		$matcher = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input type="hidden" name="foo" value="">'.
+				$this->matchRawSwitch('foo').
+				'<label for="foo" class="form-check-label">Foo</label>'.
+			'</div>');
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+
+	public function testCanCustomizeTheUncheckedValue()
+	{
+		$this->mockConfig(array('unchecked_value' => 'unchecked', 'push_checkboxes' => true));
+
+		$switch  = $this->former->switch('foo')->text('foo')->__toString();
+		$matcher = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input type="hidden" name="foo" value="unchecked">'.
+				$this->matchRawSwitch('foo').
+				'<label for="foo" class="form-check-label">Foo</label>'.
+			'</div>');
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testCanRecognizeGroupedSwitchesValidationErrors()
+	{
+		$this->mockSession(array('foo' => 'bar', 'bar' => 'baz'));
+		$this->former->withErrors();
+
+		$auto  = $this->former->switches('foo[]', '')->switches('Value 01', 'Value 02')->__toString();
+		$chain = $this->former->switches('foo', '')->grouped()->switches('Value 01', 'Value 02')->__toString();
+
+		$matcher =
+			'<div class="mb-3 row is-invalid">'.
+			 	'<div class="col-lg-10 col-sm-8">'.
+					'<div class="form-check form-switch">'.
+						'<input class="form-check-input is-invalid" id="foo_0" type="checkbox" name="foo[]" value="0">'.
+						'<label for="foo_0" class="form-check-label">Value 01</label>'.
+					'</div>'.
+					'<div class="form-check form-switch">'.
+						'<input class="form-check-input is-invalid" id="foo_1" type="checkbox" name="foo[]" value="1">'.
+						'<label for="foo_1" class="form-check-label">Value 02</label>'.
+					'</div>'.
+					'<div class="invalid-feedback">bar</div>'.
+				'</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $auto);
+		$this->assertEquals($matcher, $chain);
+	}
+
+	public function testCanHandleAZeroUncheckedValue()
+	{
+		$this->mockConfig(array('unchecked_value' => 0));
+		$switches = $this->former->switches('foo')->text('Buz')->value('bar')->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo', 'Buz', 'bar'));
+
+		$this->assertEquals($matcher, $switches);
+	}
+
+	public function testRepopulatedValueDoesntChangeOriginalValue()
+	{
+		$this->markTestSkipped('Test reformulated proves opposite of that stated');
+
+		$this->former->populate(array('foo' => 'bar'));
+		$switchTrue  = $this->former->switch('foo')->__toString();
+		$matcherTrue = $this->formGroupWithBS5($this->matchCheckedSwitch());
+
+		$this->assertEquals($matcherTrue, $switchTrue);
+
+		$this->former->populate(array('foo' => 'baz'));
+		$switchFalse = $this->former->switch('foo')->__toString();
+		$matcherFalse  = $this->formGroupWithBS5($this->matchSwitch());
+
+		$this->assertEquals($matcherFalse, $switchFalse);
+	}
+
+	public function testCanPushSwitchesWithoutLabels()
+	{
+		$this->mockConfig(array('automatic_label' => false, 'push_checkboxes' => true));
+
+		$html = $this->former->label('<b>Views per Page</b>')->render();
+		$html .= $this->former->switch('per_page')->class('input')->render();
+
+		$this->assertIsString($html);
+	}
+
+	public function testDisabled()
+	{
+		$switch  = $this->former->switch('foo')->text('Bar')->disabled()->__toString();
+		$matcher = $this->formGroupWithBS5($this->matchSwitch('foo', 'Bar', 1, false, false, true));
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testToStringMagicMethodShouldOnlyReturnString()
+	{
+		$this->former->group();
+		$output = $this->former->switch('foo')->text('bar').'';
+		$this->former->closeGroup();
+
+		$this->assertIsString($output);
+	}
+
+	public function testCanBeManualyDefinied()
+	{
+		$switch  = $this->former->switch('foo', null, 'foo', ['value' => 'bar'])->__toString();
+		$matcher = $this->formGroupWithBS5('<input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo">');
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testCanBeManualyDefiniedAndRepopulated()
+	{
+		$this->former->populate(array('foo' => 'bar'));
+		$switch  = $this->former->switch('foo', null, 'foo', ['value' => 'bar'])->__toString();
+		$matcher = $this->formGroupWithBS5('<input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo" checked="checked">');
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testShouldNotBeCheckedIfHisValueIsManualyChanged()
+	{
+		$this->former->populate(array('foo' => 'foo'));
+		$switch  = $this->former->switch('foo', null, 'foo', ['value' => 'bar'])->__toString();
+		$matcher = $this->formGroupWithBS5('<input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo">');
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testNestedCanSetNonOverriddenConstructorParameters()
+	{
+		$switch  = $this->former->switch('foo[bar]', 'Foo Bar Label', 'bis', ['class' => 'ter'])->__toString();
+		$matcher = $this->formGroupWithBS5(
+			'<input class="ter form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]" value="bis">',
+			'<label for="foo[bar]" class="col-form-label col-lg-2 col-sm-4 pt-0">Foo Bar Label</label>'
+		);
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testNestedCanSetNonOverriddenConstructorParametersAndBeRepopulated()
+	{
+		$this->former->populate(array('foo' => array('bar' => 'bis')));
+		$switch  = $this->former->switch('foo[bar]', 'Foo Bar Label', 'bis', ['class' => 'ter'])->__toString();
+		$matcher = $this->formGroupWithBS5(
+			'<input class="ter form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]" checked="checked" value="bis">',
+			'<label for="foo[bar]" class="col-form-label col-lg-2 col-sm-4 pt-0">Foo Bar Label</label>'
+		);
+
+		$this->assertEquals($matcher, $switch);
+	}
+
+	public function testNestedShouldNotBeCheckedIfContstructorValueParameterIsOverridden()
+	{
+		$this->former->populate(array('foo' => array('bar' => 'bis')));
+		$switch  = $this->former->switch('foo[bar]', null, 'bis', ['value' => 'ter'])->__toString();
+		$matcher = $this->formGroupWithBS5(
+			'<input value="ter" class="form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]">',
+			'<label for="foo[bar]" class="col-form-label col-lg-2 col-sm-4 pt-0">Foo[bar]</label>'
+		);
+
+		$this->assertEquals($matcher, $switch);
+	}
+}
diff --git a/tests/TestCases/FormerTests.php b/tests/TestCases/FormerTests.php
index 1d325f5e..7c7c3aad 100644
--- a/tests/TestCases/FormerTests.php
+++ b/tests/TestCases/FormerTests.php
@@ -287,6 +287,21 @@ protected function controlGroup(
 		return '<div class="control-group">'.$label.'<div class="controls">'.$input.'</div></div>';
 	}
 
+	/**
+	 * Matches a Control Group for Bootstrap 5
+	 *
+	 * @param  string $input
+	 * @param  string $label
+	 *
+	 * @return boolean
+	 */
+	protected function controlGroupWithBS5(
+		$input = '<input class="form-control" type="text" name="foo" id="foo">',
+		$label = '<label for="foo" class="col-form-label">Foo</label>'
+	) {
+		return '<div class="mb-3">'.$label.$input.'</div>';
+	}
+
 	/**
 	 * Matches a Form Group
 	 *
@@ -303,7 +318,7 @@ protected function formGroup(
 	}
 
 	/**
-	 * Matches a Form Group
+	 * Matches a Form Group for Bootstrap 4
 	 *
 	 * @param  string $input
 	 * @param  string $label
@@ -317,6 +332,21 @@ protected function formGroupWithBS4(
 		return '<div class="form-group row">'.$label.'<div class="col-lg-10 col-sm-8">'.$input.'</div></div>';
 	}
 
+	/**
+	 * Matches a Form Group for Bootstrap 5
+	 *
+	 * @param  string $input
+	 * @param  string $label
+	 *
+	 * @return boolean
+	 */
+	protected function formGroupWithBS5(
+		$input = '<input class="form-control" type="text" name="foo" id="foo">',
+		$label = '<label for="foo" class="col-form-label col-lg-2 col-sm-4 pt-0">Foo</label>'
+	) {
+		return '<div class="mb-3 row">'.$label.'<div class="col-lg-10 col-sm-8">'.$input.'</div></div>';
+	}
+
 	/**
 	 * Matches a required Control Group
 	 *

From 94a45ea81d08708295d1a5a0bf2ecdd9b2000aea Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Wed, 19 May 2021 15:10:39 +0200
Subject: [PATCH 09/10] Fix some switch markup bugs with Bootstrap 5

---
 src/Former/Form/Group.php       | 12 +++++---
 src/Former/Traits/Checkable.php | 11 +++++---
 tests/Fields/SwitchTest.php     | 49 ++++++++++++++++++++++++---------
 tests/TestCases/FormerTests.php | 15 ----------
 4 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/Former/Form/Group.php b/src/Former/Form/Group.php
index b326206d..6877547e 100644
--- a/src/Former/Form/Group.php
+++ b/src/Former/Form/Group.php
@@ -3,6 +3,7 @@
 
 use BadMethodCallException;
 use Former\Helpers;
+use HtmlObject\Input;
 use HtmlObject\Element;
 use HtmlObject\Traits\Tag;
 use Illuminate\Container\Container;
@@ -177,14 +178,17 @@ public function wrapField($field)
 		$label = $this->getLabel($field);
 		$help = $this->getHelp();
 		if ($field->isCheckable() &&
-			$this->app['former']->framework() === 'TwitterBootstrap4'
+			in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])
 		) {
-			$wrapperClass = $field->isInline() ? 'form-check form-check-inline' : 'form-check';
+			$wrapperClass = null;
+			if ($this->app['former']->framework() === 'TwitterBootstrap4') {
+				$wrapperClass = $field->isInline() ? 'form-check form-check-inline' : 'form-check';
+			}
 			if ($this->app['former']->getErrors($field->getName())) {
-				$hiddenInput = Element::create('input', null, ['type' => 'hidden'])->class('form-check-input is-invalid');
+				$hiddenInput = Input::create('hidden')->addClass('form-check-input is-invalid');
 				$help = $hiddenInput.$help;
 			}
-			$help = Element::create('div', $help)->class($wrapperClass);
+			$help = $help ? Element::create('div', $help)->addClass($wrapperClass) : '';
 		}
 		$withFloatingLabel = $field->withFloatingLabel();
 
diff --git a/src/Former/Traits/Checkable.php b/src/Former/Traits/Checkable.php
index 2fc4f713..93fac5a0 100644
--- a/src/Former/Traits/Checkable.php
+++ b/src/Former/Traits/Checkable.php
@@ -391,12 +391,15 @@ protected function createCheckable($item, $fallbackValue = 1)
 		}
 
 		// If no label to wrap, return plain checkable
-		if (!$label) {
+		if (!$label && !$this->isOfType('switch', 'switches')) {
 			$element = (is_object($field)) ? $field->render() : $field;
 		} elseif (in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])) {
-			// Revised for Bootstrap 4, move the 'input' outside of the 'label'
-			$labelClass = 'form-check-label';
-			$element = $field . Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
+			$element = $field;
+			if ($label) {
+				// Revised for Bootstrap 4 and 5, move the 'input' outside of the 'label'
+				$labelClass = 'form-check-label';
+				$element .= Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
+			}
 
 			$wrapperClass = $this->inline ? 'form-check form-check-inline' : 'form-check';
 			if ($this->app['former']->framework() === 'TwitterBootstrap5' &&
diff --git a/tests/Fields/SwitchTest.php b/tests/Fields/SwitchTest.php
index 5c5aa60f..67895536 100644
--- a/tests/Fields/SwitchTest.php
+++ b/tests/Fields/SwitchTest.php
@@ -122,6 +122,14 @@ private function matchRawSwitch(
 	//////////////////////////////// TESTS /////////////////////////////
 	////////////////////////////////////////////////////////////////////
 
+	public function testCanCreateASingleCheckedSwitch()
+	{
+		$switch = $this->former->switch('foo')->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo'));
+
+		$this->assertEquals($matcher, $switch);
+	}
+
 	public function testCanCreateASwitchWithALabel()
 	{
 		$switch  = $this->former->switch('foo')->text('bar')->__toString();
@@ -227,8 +235,8 @@ public function testCanCreateMultipleAnonymousSwitches()
 
 	public function testCanCheckASingleSwitch()
 	{
-		$switch  = $this->former->switch('foo')->text('Bar')->check()->__toString();
-		$matcher = $this->formGroupWithBS5($this->matchCheckedSwitch('foo', 'Bar'));
+		$switch  = $this->former->switch('foo')->check()->__toString();
+		$matcher = $this->formGroupWithBS5($this->matchCheckedSwitch('foo'));
 
 		$this->assertEquals($matcher, $switch);
 	}
@@ -420,7 +428,10 @@ public function testCanRecognizeGroupedSwitchesValidationErrors()
 						'<input class="form-check-input is-invalid" id="foo_1" type="checkbox" name="foo[]" value="1">'.
 						'<label for="foo_1" class="form-check-label">Value 02</label>'.
 					'</div>'.
-					'<div class="invalid-feedback">bar</div>'.
+					'<div>'.
+						'<input type="hidden" class="form-check-input is-invalid">'.
+						'<div class="invalid-feedback">bar</div>'.
+					'</div>'.
 				'</div>'.
 			'</div>';
 
@@ -431,8 +442,8 @@ public function testCanRecognizeGroupedSwitchesValidationErrors()
 	public function testCanHandleAZeroUncheckedValue()
 	{
 		$this->mockConfig(array('unchecked_value' => 0));
-		$switches = $this->former->switches('foo')->text('Buz')->value('bar')->__toString();
-		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo', 'Buz', 'bar'));
+		$switches = $this->former->switches('foo')->value('bar')->__toString();
+		$matcher  = $this->formGroupWithBS5($this->matchSwitch('foo', null, 'bar'));
 
 		$this->assertEquals($matcher, $switches);
 	}
@@ -466,8 +477,8 @@ public function testCanPushSwitchesWithoutLabels()
 
 	public function testDisabled()
 	{
-		$switch  = $this->former->switch('foo')->text('Bar')->disabled()->__toString();
-		$matcher = $this->formGroupWithBS5($this->matchSwitch('foo', 'Bar', 1, false, false, true));
+		$switch  = $this->former->switch('foo')->disabled()->__toString();
+		$matcher = $this->formGroupWithBS5($this->matchSwitch('foo', null, 1, false, false, true));
 		$this->assertEquals($matcher, $switch);
 	}
 
@@ -483,7 +494,7 @@ public function testToStringMagicMethodShouldOnlyReturnString()
 	public function testCanBeManualyDefinied()
 	{
 		$switch  = $this->former->switch('foo', null, 'foo', ['value' => 'bar'])->__toString();
-		$matcher = $this->formGroupWithBS5('<input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo">');
+		$matcher = $this->formGroupWithBS5('<div class="form-check form-switch"><input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo"></div>');
 
 		$this->assertEquals($matcher, $switch);
 	}
@@ -492,7 +503,10 @@ public function testCanBeManualyDefiniedAndRepopulated()
 	{
 		$this->former->populate(array('foo' => 'bar'));
 		$switch  = $this->former->switch('foo', null, 'foo', ['value' => 'bar'])->__toString();
-		$matcher = $this->formGroupWithBS5('<input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo" checked="checked">');
+		$matcher = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo" checked="checked">'.
+			'</div>');
 
 		$this->assertEquals($matcher, $switch);
 	}
@@ -501,7 +515,10 @@ public function testShouldNotBeCheckedIfHisValueIsManualyChanged()
 	{
 		$this->former->populate(array('foo' => 'foo'));
 		$switch  = $this->former->switch('foo', null, 'foo', ['value' => 'bar'])->__toString();
-		$matcher = $this->formGroupWithBS5('<input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo">');
+		$matcher = $this->formGroupWithBS5(
+			'<div class="form-check form-switch">'.
+				'<input value="bar" class="form-check-input" id="foo" type="checkbox" name="foo">'.
+			'</div>');
 
 		$this->assertEquals($matcher, $switch);
 	}
@@ -510,7 +527,9 @@ public function testNestedCanSetNonOverriddenConstructorParameters()
 	{
 		$switch  = $this->former->switch('foo[bar]', 'Foo Bar Label', 'bis', ['class' => 'ter'])->__toString();
 		$matcher = $this->formGroupWithBS5(
-			'<input class="ter form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]" value="bis">',
+			'<div class="form-check form-switch">'.
+				'<input class="ter form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]" value="bis">'.
+			'</div>',
 			'<label for="foo[bar]" class="col-form-label col-lg-2 col-sm-4 pt-0">Foo Bar Label</label>'
 		);
 
@@ -522,7 +541,9 @@ public function testNestedCanSetNonOverriddenConstructorParametersAndBeRepopulat
 		$this->former->populate(array('foo' => array('bar' => 'bis')));
 		$switch  = $this->former->switch('foo[bar]', 'Foo Bar Label', 'bis', ['class' => 'ter'])->__toString();
 		$matcher = $this->formGroupWithBS5(
-			'<input class="ter form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]" checked="checked" value="bis">',
+			'<div class="form-check form-switch">'.
+				'<input class="ter form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]" checked="checked" value="bis">'.
+			'</div>',
 			'<label for="foo[bar]" class="col-form-label col-lg-2 col-sm-4 pt-0">Foo Bar Label</label>'
 		);
 
@@ -534,7 +555,9 @@ public function testNestedShouldNotBeCheckedIfContstructorValueParameterIsOverri
 		$this->former->populate(array('foo' => array('bar' => 'bis')));
 		$switch  = $this->former->switch('foo[bar]', null, 'bis', ['value' => 'ter'])->__toString();
 		$matcher = $this->formGroupWithBS5(
-			'<input value="ter" class="form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]">',
+			'<div class="form-check form-switch">'.
+				'<input value="ter" class="form-check-input" id="foo[bar]" type="checkbox" name="foo[bar]">'.
+			'</div>',
 			'<label for="foo[bar]" class="col-form-label col-lg-2 col-sm-4 pt-0">Foo[bar]</label>'
 		);
 
diff --git a/tests/TestCases/FormerTests.php b/tests/TestCases/FormerTests.php
index 7c7c3aad..7b276a7a 100644
--- a/tests/TestCases/FormerTests.php
+++ b/tests/TestCases/FormerTests.php
@@ -287,21 +287,6 @@ protected function controlGroup(
 		return '<div class="control-group">'.$label.'<div class="controls">'.$input.'</div></div>';
 	}
 
-	/**
-	 * Matches a Control Group for Bootstrap 5
-	 *
-	 * @param  string $input
-	 * @param  string $label
-	 *
-	 * @return boolean
-	 */
-	protected function controlGroupWithBS5(
-		$input = '<input class="form-control" type="text" name="foo" id="foo">',
-		$label = '<label for="foo" class="col-form-label">Foo</label>'
-	) {
-		return '<div class="mb-3">'.$label.$input.'</div>';
-	}
-
 	/**
 	 * Matches a Form Group
 	 *

From 8d8856a023f08975cc069a863a4ff669243b3d96 Mon Sep 17 00:00:00 2001
From: Tortue Torche <tortuetorche@users.noreply.github.com>
Date: Wed, 19 May 2021 16:54:13 +0200
Subject: [PATCH 10/10] Add tests for Bootstrap 5 floating labels

Related to commit 21b30f78c1a25c40acc33877173c22445a2190bf

Reference:
https://getbootstrap.com/docs/5.0/forms/floating-labels/
---
 tests/Fields/FloatingLabelTest.php | 173 +++++++++++++++++++++++++++++
 1 file changed, 173 insertions(+)
 create mode 100644 tests/Fields/FloatingLabelTest.php

diff --git a/tests/Fields/FloatingLabelTest.php b/tests/Fields/FloatingLabelTest.php
new file mode 100644
index 00000000..7104af31
--- /dev/null
+++ b/tests/Fields/FloatingLabelTest.php
@@ -0,0 +1,173 @@
+<?php
+namespace Former\Fields;
+
+use Former\TestCases\FormerTests;
+use HtmlObject\Element;
+
+class FloatingLabelTest extends FormerTests
+{
+	/**
+	 * An array of dummy options
+	 *
+	 * @var array
+	 */
+	protected $options = array('One', 'Two', 'Three');
+	public function setUp(): void
+	{
+		parent::setUp();
+		$this->former->framework('TwitterBootstrap5');
+		$this->former->vertical_open()->__toString();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Matches a floating label
+	 *
+	 * @return array
+	 */
+	public function matchFloatingLabel()
+	{
+		return array(
+			'tag' => 'label',
+		);
+	}
+
+	/**
+	 * Matches an input text tag
+	 *
+	 * @return array
+	 */
+	public function matchFloatingInputText()
+	{
+	return array(
+			'tag'        => 'input',
+			'attributes' => array(
+				'id'       => 'foo',
+				'class'    => 'form-control',
+				'placeholder' => 'Dummy placeholder',
+				'type'     => 'text',
+				'name'     => 'foo',
+			),
+		);
+	}
+
+	/**
+	 * Matches a textarea tag
+	 *
+	 * @return array
+	 */
+	public function matchFloatingTextarea()
+	{
+	return array(
+			'tag'        => 'textarea',
+			'attributes' => array(
+				'id'       => 'foo',
+				'class'    => 'form-control',
+				'placeholder' => 'Dummy placeholder',
+				'name'     => 'foo',
+			),
+		);
+	}
+
+	/**
+	 * Matches a select tag
+	 *
+	 * @return array
+	 */
+	public function matchFloatingSelect()
+	{
+	return array(
+			'tag'        => 'select',
+			'children'	=> array(
+				'count' => 4,
+				'only' => array('tag' => 'option'),
+			),
+			'attributes' => array(
+				'id'       => 'foo',
+				'class'    => 'form-select',
+				'name'     => 'foo',
+			),
+		);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// ASSERTIONS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Matches a Form Floating Label Group
+	 *
+	 * @param  string $input
+	 * @param  string $label
+	 *
+	 * @return boolean
+	 */
+	protected function formFloatingLabelGroup(
+		$input = '<input class="form-control" placeholder="Dummy placeholder" id="foo" type="text" name="foo">',
+		$label = '<label for="foo" class="form-label">Foo</label>'
+	) {
+		return '<div class="mb-3 form-floating">'.$input.$label.'</div>';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanCreateFloatingLabelInputText()
+	{
+		$input = $this->former
+			->text('foo')
+			->placeholder('Dummy placeholder')
+			->floatingLabel()
+			->__toString();
+
+		$this->assertHTML($this->matchFloatingLabel(), $input);
+		$this->assertHTML($this->matchFloatingInputText(), $input);
+
+		$matcher = $this->formFloatingLabelGroup();
+		$this->assertEquals($matcher, $input);
+	}
+
+	public function testCanCreateFloatingLabelTextarea()
+	{
+		$textarea = $this->former
+			->textarea('foo')
+			->placeholder('Dummy placeholder')
+			->floatingLabel()
+			->__toString();
+
+		$this->assertHTML($this->matchFloatingLabel(), $textarea);
+		$this->assertHTML($this->matchFloatingTextarea(), $textarea);
+
+		$matcher = $this->formFloatingLabelGroup('<textarea class="form-control" placeholder="Dummy placeholder" id="foo" name="foo"></textarea>');
+		$this->assertEquals($matcher, $textarea);
+	}
+
+	public function testCanCreateFloatingLabelSelect()
+	{
+		$selectElement = $this->former
+			->select('foo')
+			->options($this->options)
+			->placeholder('Choose an option')
+			->floatingLabel();
+
+		$select = $selectElement->__toString();
+
+		$this->assertHTML($this->matchFloatingLabel(), $select);
+		$this->assertHTML($this->matchFloatingSelect(), $select);
+
+		$placeholderOption = Element::create('option', 'Choose an option', array('value' => '', 'disabled' => 'disabled', 'selected' => 'selected'));
+
+		$options = array($placeholderOption);
+		foreach ($this->options as $key => $option) {
+			$options[] = Element::create('option', $option, array('value' => $key));
+		}
+		$this->assertEquals($selectElement->getOptions(), $options);
+
+		$matcher = $this->formFloatingLabelGroup('<select class="form-select" id="foo" name="foo">'.implode('', $options).'</select>');
+		$this->assertEquals($matcher, $select);
+	}
+}