From 437650b422d7497e33d6553ce2891c5c0cd4d916 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Sun, 4 Aug 2024 13:41:10 +0900
Subject: [PATCH 01/10] Form Input: Don't use `flex-direction: row-reverse` for
 checkbox field

---
 .../src/form-input/deprecated.js              | 118 +++++++++++++++++-
 packages/block-library/src/form-input/edit.js |  28 +++--
 packages/block-library/src/form-input/save.js |  16 ++-
 .../block-library/src/form-input/style.scss   |  14 +--
 .../core__form-input__deprecated-v2.html      |   8 ++
 .../core__form-input__deprecated-v2.json      |  16 +++
 ...ore__form-input__deprecated-v2.parsed.json |  13 ++
 ..._form-input__deprecated-v2.serialized.html |   3 +
 8 files changed, 192 insertions(+), 24 deletions(-)
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html

diff --git a/packages/block-library/src/form-input/deprecated.js b/packages/block-library/src/form-input/deprecated.js
index 9cd49d5b0011b..f43f300544921 100644
--- a/packages/block-library/src/form-input/deprecated.js
+++ b/packages/block-library/src/form-input/deprecated.js
@@ -9,6 +9,7 @@ import removeAccents from 'remove-accents';
  */
 import {
 	RichText,
+	useBlockProps,
 	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
 } from '@wordpress/block-editor';
@@ -26,6 +27,121 @@ const getNameFromLabelV1 = ( content ) => {
 	);
 };
 
+const getNameFromLabelV2 = getNameFromLabelV1;
+
+const v2 = {
+	attributes: {
+		type: {
+			type: 'string',
+			default: 'text',
+		},
+		name: {
+			type: 'string',
+		},
+		label: {
+			type: 'string',
+			default: 'Label',
+			selector: '.wp-block-form-input__label-content',
+			source: 'html',
+			__experimentalRole: 'content',
+		},
+		inlineLabel: {
+			type: 'boolean',
+			default: false,
+		},
+		required: {
+			type: 'boolean',
+			default: false,
+			selector: '.wp-block-form-input__input',
+			source: 'attribute',
+			attribute: 'required',
+		},
+		placeholder: {
+			type: 'string',
+			selector: '.wp-block-form-input__input',
+			source: 'attribute',
+			attribute: 'placeholder',
+			__experimentalRole: 'content',
+		},
+		value: {
+			type: 'string',
+			default: '',
+			selector: 'input',
+			source: 'attribute',
+			attribute: 'value',
+		},
+		visibilityPermissions: {
+			type: 'string',
+			default: 'all',
+		},
+	},
+	supports: {
+		className: false,
+		anchor: true,
+		reusable: false,
+		spacing: {
+			margin: [ 'top', 'bottom' ],
+		},
+		__experimentalBorder: {
+			radius: true,
+			__experimentalSkipSerialization: true,
+			__experimentalDefaultControls: {
+				radius: true,
+			},
+		},
+	},
+	save( { attributes } ) {
+		const { type, name, label, inlineLabel, required, placeholder, value } =
+			attributes;
+
+		const borderProps = getBorderClassesAndStyles( attributes );
+		const colorProps = getColorClassesAndStyles( attributes );
+
+		const inputStyle = {
+			...borderProps.style,
+			...colorProps.style,
+		};
+
+		const inputClasses = clsx(
+			'wp-block-form-input__input',
+			colorProps.className,
+			borderProps.className
+		);
+		const TagName = type === 'textarea' ? 'textarea' : 'input';
+
+		const blockProps = useBlockProps.save();
+
+		if ( 'hidden' === type ) {
+			return <input type={ type } name={ name } value={ value } />;
+		}
+
+		return (
+			<div { ...blockProps }>
+				{ /* eslint-disable jsx-a11y/label-has-associated-control */ }
+				<label
+					className={ clsx( 'wp-block-form-input__label', {
+						'is-label-inline': inlineLabel,
+					} ) }
+				>
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+					<TagName
+						className={ inputClasses }
+						type={ 'textarea' === type ? undefined : type }
+						name={ name || getNameFromLabelV2( label ) }
+						required={ required }
+						aria-required={ required }
+						placeholder={ placeholder || undefined }
+						style={ inputStyle }
+					/>
+				</label>
+				{ /* eslint-enable jsx-a11y/label-has-associated-control */ }
+			</div>
+		);
+	},
+};
+
 // Version without wrapper div in saved markup
 // See: https://github.com/WordPress/gutenberg/pull/56507
 const v1 = {
@@ -137,6 +253,6 @@ const v1 = {
 	},
 };
 
-const deprecated = [ v1 ];
+const deprecated = [ v2, v1 ];
 
 export default deprecated;
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 6939443011ee5..5f3713e83975f 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -31,6 +31,9 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		ref.current.focus();
 	}
 
+	// Note: radio inputs aren't implemented yet.
+	const isCheckboxOrRadio = type === 'checkbox' || type === 'radio';
+
 	const controls = (
 		<>
 			{ 'hidden' !== type && (
@@ -81,6 +84,18 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		</>
 	);
 
+	const content = (
+		<RichText
+			tagName="span"
+			className="wp-block-form-input__label-content"
+			value={ label }
+			onChange={ ( newLabel ) => setAttributes( { label: newLabel } ) }
+			aria-label={ label ? __( 'Label' ) : __( 'Empty label' ) }
+			data-empty={ ! label }
+			placeholder={ __( 'Type the label for this input' ) }
+		/>
+	);
+
 	if ( 'hidden' === type ) {
 		return (
 			<>
@@ -111,17 +126,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 					'is-label-inline': inlineLabel || 'checkbox' === type,
 				} ) }
 			>
-				<RichText
-					tagName="span"
-					className="wp-block-form-input__label-content"
-					value={ label }
-					onChange={ ( newLabel ) =>
-						setAttributes( { label: newLabel } )
-					}
-					aria-label={ label ? __( 'Label' ) : __( 'Empty label' ) }
-					data-empty={ label ? false : true }
-					placeholder={ __( 'Type the label for this input' ) }
-				/>
+				{ ! isCheckboxOrRadio && content }
 				<TagName
 					type={ 'textarea' === type ? undefined : type }
 					className={ clsx(
@@ -147,6 +152,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 						...colorProps.style,
 					} }
 				/>
+				{ isCheckboxOrRadio && content }
 			</span>
 		</div>
 	);
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index c408e06923ca9..941c23dc2014d 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -55,6 +55,9 @@ export default function save( { attributes } ) {
 
 	const blockProps = useBlockProps.save();
 
+	// Note: radio inputs aren't implemented yet.
+	const isCheckboxOrRadio = type === 'checkbox' || type === 'radio';
+
 	if ( 'hidden' === type ) {
 		return <input type={ type } name={ name } value={ value } />;
 	}
@@ -67,9 +70,11 @@ export default function save( { attributes } ) {
 					'is-label-inline': inlineLabel,
 				} ) }
 			>
-				<span className="wp-block-form-input__label-content">
-					<RichText.Content value={ label } />
-				</span>
+				{ ! isCheckboxOrRadio && (
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+				) }
 				<TagName
 					className={ inputClasses }
 					type={ 'textarea' === type ? undefined : type }
@@ -79,6 +84,11 @@ export default function save( { attributes } ) {
 					placeholder={ placeholder || undefined }
 					style={ inputStyle }
 				/>
+				{ isCheckboxOrRadio && (
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+				) }
 			</label>
 			{ /* eslint-enable jsx-a11y/label-has-associated-control */ }
 		</div>
diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index f9e1753cf0a7b..33dc54b4340a3 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -15,17 +15,13 @@
 		}
 	}
 
-	/*
-	Small tweak to left-align the checkbox.
-	Even though `:has` is not currently supported in Firefox, this is a small tweak
-	and does not affect the functionality of the block or the user's experience.
-	There will be a minor inconsistency between browsers. However, it's more important to provide
-	a better experience for 80+% of users, until Firefox catches up and supports `:has`.
-	*/
 	&:has(input[type="checkbox"]) {
+		flex-direction: row;
 		width: fit-content;
-		/* stylelint-disable-next-line declaration-property-value-allowed-list -- This should be refactored to not use the row-reverse value. */
-		flex-direction: row-reverse;
+
+		.wp-block-form-input__label-content {
+			margin: 0;
+		}
 	}
 }
 
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
new file mode 100644
index 0000000000000..3f1de1c602847
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
new file mode 100644
index 0000000000000..afaf33d614caa
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
@@ -0,0 +1,16 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all",
+			"className": "wp-block-form-input"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..dfa57c0755f68
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..f51ea098dc3a2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox","className":"wp-block-form-input"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->

From af93336a6a26f46cfe2b10e53717008e4ca8b1b1 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 13 Aug 2024 13:58:54 +0900
Subject: [PATCH 02/10] Don't create v2 variable

---
 packages/block-library/src/form-input/deprecated.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/block-library/src/form-input/deprecated.js b/packages/block-library/src/form-input/deprecated.js
index f43f300544921..2d8bb608bcc21 100644
--- a/packages/block-library/src/form-input/deprecated.js
+++ b/packages/block-library/src/form-input/deprecated.js
@@ -27,8 +27,6 @@ const getNameFromLabelV1 = ( content ) => {
 	);
 };
 
-const getNameFromLabelV2 = getNameFromLabelV1;
-
 const v2 = {
 	attributes: {
 		type: {
@@ -129,7 +127,7 @@ const v2 = {
 					<TagName
 						className={ inputClasses }
 						type={ 'textarea' === type ? undefined : type }
-						name={ name || getNameFromLabelV2( label ) }
+						name={ name || getNameFromLabelV1( label ) }
 						required={ required }
 						aria-required={ required }
 						placeholder={ placeholder || undefined }

From 21fdda5ab762f3d8c3577a03c9e19874e6eeb425 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 13 Aug 2024 14:34:47 +0900
Subject: [PATCH 03/10] Fix fixtures

---
 packages/block-library/src/form-input/deprecated.js            | 1 -
 .../fixtures/blocks/core__form-input__deprecated-v2.json       | 3 +--
 .../blocks/core__form-input__deprecated-v2.serialized.html     | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/form-input/deprecated.js b/packages/block-library/src/form-input/deprecated.js
index 2d8bb608bcc21..451cc704a42d5 100644
--- a/packages/block-library/src/form-input/deprecated.js
+++ b/packages/block-library/src/form-input/deprecated.js
@@ -74,7 +74,6 @@ const v2 = {
 		},
 	},
 	supports: {
-		className: false,
 		anchor: true,
 		reusable: false,
 		spacing: {
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
index afaf33d614caa..162304dc84b0c 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
@@ -8,8 +8,7 @@
 			"inlineLabel": false,
 			"required": false,
 			"value": "",
-			"visibilityPermissions": "all",
-			"className": "wp-block-form-input"
+			"visibilityPermissions": "all"
 		},
 		"innerBlocks": []
 	}
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
index f51ea098dc3a2..6670593401970 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:form-input {"type":"checkbox","className":"wp-block-form-input"} -->
+<!-- wp:form-input {"type":"checkbox"} -->
 <div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
 <!-- /wp:form-input -->

From 626b24b8e234f201c8fbd2bdd7215405e6d357e9 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 13 Aug 2024 17:27:37 +0900
Subject: [PATCH 04/10] Update fixtures

---
 .../core__form-input__deprecated-v1.html      | 14 ++++++++
 .../core__form-input__deprecated-v1.json      | 26 ++++++++++++++
 ...ore__form-input__deprecated-v1.parsed.json | 36 +++++++++++++++++++
 ..._form-input__deprecated-v1.serialized.html |  8 +++++
 .../core__form-input__deprecated-v2.html      | 18 ++++++++++
 .../core__form-input__deprecated-v2.json      | 26 ++++++++++++++
 ...ore__form-input__deprecated-v2.parsed.json | 34 ++++++++++++++++++
 ..._form-input__deprecated-v2.serialized.html |  8 +++++
 8 files changed, 170 insertions(+)

diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
index 08ea661838620..6d2a6c006698b 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
@@ -4,3 +4,17 @@
 	<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
 </label>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"checkbox"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"radio"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
index fee4df284f115..21be808ad7e09 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
@@ -11,5 +11,31 @@
 			"visibilityPermissions": "all"
 		},
 		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
index 645337cbfdb4a..ba1711a79c57e 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
@@ -7,5 +7,41 @@
 		"innerContent": [
 			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
 		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
index 33f1fe88c2c6a..4702be0934e5e 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
@@ -1,3 +1,11 @@
 <!-- wp:form-input -->
 <div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
index 3f1de1c602847..e33a4c0911f25 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
@@ -1,3 +1,12 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
+
 <!-- wp:form-input {"type":"checkbox"} -->
 <div class="wp-block-form-input">
 	<label class="wp-block-form-input__label">
@@ -6,3 +15,12 @@
 	</label>
 </div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
index 162304dc84b0c..21be808ad7e09 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
@@ -1,4 +1,17 @@
 [
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "text",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
 	{
 		"name": "core/form-input",
 		"isValid": true,
@@ -11,5 +24,18 @@
 			"visibilityPermissions": "all"
 		},
 		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
index dfa57c0755f68..937dacdd2a4c8 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
@@ -1,4 +1,20 @@
 [
+	{
+		"blockName": "core/form-input",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
 	{
 		"blockName": "core/form-input",
 		"attrs": {
@@ -9,5 +25,23 @@
 		"innerContent": [
 			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
 		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
index 6670593401970..4702be0934e5e 100644
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
@@ -1,3 +1,11 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
 <!-- wp:form-input {"type":"checkbox"} -->
 <div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->

From 0c58873d98d349dfb4d4e14c0d0fbd14ede46c07 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Fri, 16 Aug 2024 10:43:11 +0900
Subject: [PATCH 05/10] Split fixtures

---
 ...__form-input__checkbox__deprecated-v1.html |  7 +++
 ...__form-input__checkbox__deprecated-v1.json | 15 ++++++
 ...input__checkbox__deprecated-v1.parsed.json | 13 +++++
 ...t__checkbox__deprecated-v1.serialized.html |  3 ++
 ...__form-input__checkbox__deprecated-v2.html |  8 ++++
 ...__form-input__checkbox__deprecated-v2.json | 15 ++++++
 ...input__checkbox__deprecated-v2.parsed.json | 13 +++++
 ...t__checkbox__deprecated-v2.serialized.html |  3 ++
 .../core__form-input__deprecated-v1.html      | 20 --------
 .../core__form-input__deprecated-v1.json      | 41 ----------------
 ...ore__form-input__deprecated-v1.parsed.json | 47 -------------------
 ..._form-input__deprecated-v1.serialized.html | 11 -----
 .../core__form-input__deprecated-v2.html      | 26 ----------
 .../core__form-input__deprecated-v2.json      | 41 ----------------
 ...ore__form-input__deprecated-v2.parsed.json | 47 -------------------
 ..._form-input__deprecated-v2.serialized.html | 11 -----
 ...ore__form-input__email__deprecated-v1.html |  6 +++
 ...ore__form-input__email__deprecated-v1.json | 15 ++++++
 ...rm-input__email__deprecated-v1.parsed.json | 13 +++++
 ...nput__email__deprecated-v1.serialized.html |  3 ++
 ...ore__form-input__email__deprecated-v2.html |  8 ++++
 ...ore__form-input__email__deprecated-v2.json | 15 ++++++
 ...rm-input__email__deprecated-v2.parsed.json | 13 +++++
 ...nput__email__deprecated-v2.serialized.html |  3 ++
 ...re__form-input__number__deprecated-v1.html |  6 +++
 ...re__form-input__number__deprecated-v1.json | 15 ++++++
 ...m-input__number__deprecated-v1.parsed.json | 13 +++++
 ...put__number__deprecated-v1.serialized.html |  3 ++
 ...re__form-input__number__deprecated-v2.html |  8 ++++
 ...re__form-input__number__deprecated-v2.json | 15 ++++++
 ...m-input__number__deprecated-v2.parsed.json | 13 +++++
 ...put__number__deprecated-v2.serialized.html |  3 ++
 ...ore__form-input__radio__deprecated-v1.html |  7 +++
 ...ore__form-input__radio__deprecated-v1.json | 15 ++++++
 ...rm-input__radio__deprecated-v1.parsed.json | 13 +++++
 ...nput__radio__deprecated-v1.serialized.html |  3 ++
 ...ore__form-input__radio__deprecated-v2.html |  8 ++++
 ...ore__form-input__radio__deprecated-v2.json | 15 ++++++
 ...rm-input__radio__deprecated-v2.parsed.json | 13 +++++
 ...nput__radio__deprecated-v2.serialized.html |  3 ++
 .../core__form-input__tel__deprecated-v1.html |  7 +++
 .../core__form-input__tel__deprecated-v1.json | 15 ++++++
 ...form-input__tel__deprecated-v1.parsed.json | 13 +++++
 ...-input__tel__deprecated-v1.serialized.html |  3 ++
 .../core__form-input__tel__deprecated-v2.html |  8 ++++
 .../core__form-input__tel__deprecated-v2.json | 15 ++++++
 ...form-input__tel__deprecated-v2.parsed.json | 13 +++++
 ...-input__tel__deprecated-v2.serialized.html |  3 ++
 ...core__form-input__text__deprecated-v1.html |  6 +++
 ...core__form-input__text__deprecated-v1.json | 15 ++++++
 ...orm-input__text__deprecated-v1.parsed.json | 11 +++++
 ...input__text__deprecated-v1.serialized.html |  3 ++
 ...core__form-input__text__deprecated-v2.html |  8 ++++
 ...core__form-input__text__deprecated-v2.json | 15 ++++++
 ...orm-input__text__deprecated-v2.parsed.json | 11 +++++
 ...input__text__deprecated-v2.serialized.html |  3 ++
 ...__form-input__textarea__deprecated-v1.html |  6 +++
 ...__form-input__textarea__deprecated-v1.json | 15 ++++++
 ...input__textarea__deprecated-v1.parsed.json | 13 +++++
 ...t__textarea__deprecated-v1.serialized.html |  3 ++
 ...__form-input__textarea__deprecated-v2.html |  9 ++++
 ...__form-input__textarea__deprecated-v2.json | 15 ++++++
 ...input__textarea__deprecated-v2.parsed.json | 13 +++++
 ...t__textarea__deprecated-v2.serialized.html |  3 ++
 .../core__form-input__url__deprecated-v1.html |  6 +++
 .../core__form-input__url__deprecated-v1.json | 15 ++++++
 ...form-input__url__deprecated-v1.parsed.json | 13 +++++
 ...-input__url__deprecated-v1.serialized.html |  3 ++
 .../core__form-input__url__deprecated-v2.html |  8 ++++
 .../core__form-input__url__deprecated-v2.json | 15 ++++++
 ...form-input__url__deprecated-v2.parsed.json | 13 +++++
 ...-input__url__deprecated-v2.serialized.html |  3 ++
 72 files changed, 608 insertions(+), 244 deletions(-)
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.serialized.html

diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html
new file mode 100644
index 0000000000000..bd64e201e1918
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html
@@ -0,0 +1,7 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json
new file mode 100644
index 0000000000000..162304dc84b0c
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..2a2490e5c1260
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..6670593401970
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html
new file mode 100644
index 0000000000000..3f1de1c602847
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json
new file mode 100644
index 0000000000000..162304dc84b0c
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..dfa57c0755f68
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..6670593401970
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
deleted file mode 100644
index 6d2a6c006698b..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:form-input -->
-<label class="wp-block-form-input__label">
-	<span class="wp-block-form-input__label-content">Label</span>
-	<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
-</label>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"checkbox"} -->
-<label class="wp-block-form-input__label">
-	<span class="wp-block-form-input__label-content">Label</span>
-	<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
-</label>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"radio"} -->
-<label class="wp-block-form-input__label">
-	<span class="wp-block-form-input__label-content">Label</span>
-	<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
-</label>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
deleted file mode 100644
index 21be808ad7e09..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "text",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "checkbox",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "radio",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
deleted file mode 100644
index ba1711a79c57e..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "checkbox"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "radio"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
deleted file mode 100644
index 4702be0934e5e..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- wp:form-input -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"checkbox"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"radio"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
deleted file mode 100644
index e33a4c0911f25..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- wp:form-input -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"checkbox"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"radio"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
deleted file mode 100644
index 21be808ad7e09..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "text",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "checkbox",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "radio",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
deleted file mode 100644
index 937dacdd2a4c8..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "checkbox"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "radio"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
deleted file mode 100644
index 4702be0934e5e..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- wp:form-input -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"checkbox"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"radio"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.html
new file mode 100644
index 0000000000000..6bf004ff33fe0
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.html
@@ -0,0 +1,6 @@
+<!-- wp:form-input {"type":"email"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.json
new file mode 100644
index 0000000000000..33d2cfc45aeea
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..f183c08d0fccc
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..22ca381a19a0d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.html
new file mode 100644
index 0000000000000..c0e24fe11ca4d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.json
new file mode 100644
index 0000000000000..33d2cfc45aeea
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..ec0b44a44402f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..22ca381a19a0d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.html
new file mode 100644
index 0000000000000..23844d0a4cfe9
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.html
@@ -0,0 +1,6 @@
+<!-- wp:form-input {"type":"number"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.json
new file mode 100644
index 0000000000000..83bae09d06571
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..8ae9b2d31801b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..b74993d42d555
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.html
new file mode 100644
index 0000000000000..581b11e4d68ba
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.json
new file mode 100644
index 0000000000000..83bae09d06571
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..a7311b75c63e0
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..b74993d42d555
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html
new file mode 100644
index 0000000000000..8c41e02f10f04
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html
@@ -0,0 +1,7 @@
+<!-- wp:form-input {"type":"radio"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json
new file mode 100644
index 0000000000000..113ce01f7ab7e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..7433a6c7e9c50
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..be1ae98e02310
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html
new file mode 100644
index 0000000000000..a1c1b58f9b7fc
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json
new file mode 100644
index 0000000000000..113ce01f7ab7e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..14c7828b1c890
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..be1ae98e02310
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.html
new file mode 100644
index 0000000000000..1e868cb74c914
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.html
@@ -0,0 +1,7 @@
+<!-- wp:form-input {"type":"tel"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.json
new file mode 100644
index 0000000000000..01aa1062912a2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..127c45f3c953d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..596b302b14143
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.html
new file mode 100644
index 0000000000000..66be25e9a0e0f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.json
new file mode 100644
index 0000000000000..01aa1062912a2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..695a30f821ac8
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..596b302b14143
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.html
new file mode 100644
index 0000000000000..08ea661838620
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.html
@@ -0,0 +1,6 @@
+<!-- wp:form-input -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.json
new file mode 100644
index 0000000000000..fee4df284f115
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "text",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..645337cbfdb4a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.parsed.json
@@ -0,0 +1,11 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..33f1fe88c2c6a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.html
new file mode 100644
index 0000000000000..151d1074885d4
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.json
new file mode 100644
index 0000000000000..fee4df284f115
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "text",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..b784632e84336
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.parsed.json
@@ -0,0 +1,11 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..33f1fe88c2c6a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html
new file mode 100644
index 0000000000000..8f7722f81ccc5
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html
@@ -0,0 +1,6 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea>
+</label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json
new file mode 100644
index 0000000000000..398106d8de1ca
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "textarea",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..e5e11f26d9960
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "textarea"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..530403c4964fa
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.html
new file mode 100644
index 0000000000000..db669fab9238a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.html
@@ -0,0 +1,9 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea>
+	</label>
+</div>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.json
new file mode 100644
index 0000000000000..398106d8de1ca
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "textarea",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..bb4fb44dee470
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "textarea"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..530403c4964fa
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.html
new file mode 100644
index 0000000000000..d5b422c9329df
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.html
@@ -0,0 +1,6 @@
+<!-- wp:form-input {"type":"url"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.json
new file mode 100644
index 0000000000000..c08c0e2bd1aa1
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..9055c7e2b9a20
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..a26dd3ac1cef2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.html
new file mode 100644
index 0000000000000..525e57cc63360
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.json
new file mode 100644
index 0000000000000..c08c0e2bd1aa1
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..186e8a58f46d0
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..a26dd3ac1cef2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->

From db310affa4ca0c43426d74f231e3fe7d7ea88351 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 20 Aug 2024 11:18:16 +0900
Subject: [PATCH 06/10] Integrate fixtures

---
 .../core__form-input__deprecated-v1.html      | 36 ++++++++
 .../core__form-input__deprecated-v1.json      | 67 +++++++++++++++
 ...ore__form-input__deprecated-v1.parsed.json | 83 +++++++++++++++++++
 ..._form-input__deprecated-v1.serialized.html | 19 +++++
 .../core__form-input__deprecated-v2.html      | 45 ++++++++++
 .../core__form-input__deprecated-v2.json      | 67 +++++++++++++++
 ...ore__form-input__deprecated-v2.parsed.json | 83 +++++++++++++++++++
 ..._form-input__deprecated-v2.serialized.html | 19 +++++
 ...ore__form-input__email__deprecated-v1.html |  6 --
 ...ore__form-input__email__deprecated-v1.json | 15 ----
 ...rm-input__email__deprecated-v1.parsed.json | 13 ---
 ...nput__email__deprecated-v1.serialized.html |  3 -
 ...ore__form-input__email__deprecated-v2.html |  8 --
 ...ore__form-input__email__deprecated-v2.json | 15 ----
 ...rm-input__email__deprecated-v2.parsed.json | 13 ---
 ...nput__email__deprecated-v2.serialized.html |  3 -
 ...re__form-input__number__deprecated-v1.html |  6 --
 ...re__form-input__number__deprecated-v1.json | 15 ----
 ...m-input__number__deprecated-v1.parsed.json | 13 ---
 ...put__number__deprecated-v1.serialized.html |  3 -
 ...re__form-input__number__deprecated-v2.html |  8 --
 ...re__form-input__number__deprecated-v2.json | 15 ----
 ...m-input__number__deprecated-v2.parsed.json | 13 ---
 ...put__number__deprecated-v2.serialized.html |  3 -
 .../core__form-input__tel__deprecated-v1.html |  7 --
 .../core__form-input__tel__deprecated-v1.json | 15 ----
 ...form-input__tel__deprecated-v1.parsed.json | 13 ---
 ...-input__tel__deprecated-v1.serialized.html |  3 -
 .../core__form-input__tel__deprecated-v2.html |  8 --
 .../core__form-input__tel__deprecated-v2.json | 15 ----
 ...form-input__tel__deprecated-v2.parsed.json | 13 ---
 ...-input__tel__deprecated-v2.serialized.html |  3 -
 ...core__form-input__text__deprecated-v1.html |  6 --
 ...core__form-input__text__deprecated-v1.json | 15 ----
 ...orm-input__text__deprecated-v1.parsed.json | 11 ---
 ...input__text__deprecated-v1.serialized.html |  3 -
 ...core__form-input__text__deprecated-v2.html |  8 --
 ...core__form-input__text__deprecated-v2.json | 15 ----
 ...orm-input__text__deprecated-v2.parsed.json | 11 ---
 ...input__text__deprecated-v2.serialized.html |  3 -
 .../core__form-input__url__deprecated-v1.html |  6 --
 .../core__form-input__url__deprecated-v1.json | 15 ----
 ...form-input__url__deprecated-v1.parsed.json | 13 ---
 ...-input__url__deprecated-v1.serialized.html |  3 -
 .../core__form-input__url__deprecated-v2.html |  8 --
 .../core__form-input__url__deprecated-v2.json | 15 ----
 ...form-input__url__deprecated-v2.parsed.json | 13 ---
 ...-input__url__deprecated-v2.serialized.html |  3 -
 48 files changed, 419 insertions(+), 377 deletions(-)
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.serialized.html

diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
new file mode 100644
index 0000000000000..5f043b0b2ef64
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
@@ -0,0 +1,36 @@
+<!-- wp:form-input -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+
+<!-- wp:form-input {"type":"email"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
new file mode 100644
index 0000000000000..2d9865ef73556
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
@@ -0,0 +1,67 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "text",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
new file mode 100644
index 0000000000000..963614974675d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
@@ -0,0 +1,83 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n\n",
+		"innerContent": [ "\n\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
new file mode 100644
index 0000000000000..d66cedcf9215b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
@@ -0,0 +1,19 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
new file mode 100644
index 0000000000000..4ba397cf86185
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
@@ -0,0 +1,45 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
new file mode 100644
index 0000000000000..2d9865ef73556
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
@@ -0,0 +1,67 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "text",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
new file mode 100644
index 0000000000000..b9536060aa345
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
@@ -0,0 +1,83 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
new file mode 100644
index 0000000000000..d66cedcf9215b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
@@ -0,0 +1,19 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.html
deleted file mode 100644
index 6bf004ff33fe0..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- wp:form-input {"type":"email"} -->
-<label class="wp-block-form-input__label">
-	<span class="wp-block-form-input__label-content">Label</span>
-	<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
-</label>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.json
deleted file mode 100644
index 33d2cfc45aeea..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "email",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.parsed.json
deleted file mode 100644
index f183c08d0fccc..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "email"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.serialized.html
deleted file mode 100644
index 22ca381a19a0d..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v1.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"email"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.html
deleted file mode 100644
index c0e24fe11ca4d..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- wp:form-input {"type":"email"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.json
deleted file mode 100644
index 33d2cfc45aeea..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "email",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.parsed.json
deleted file mode 100644
index ec0b44a44402f..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "email"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.serialized.html
deleted file mode 100644
index 22ca381a19a0d..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__email__deprecated-v2.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"email"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.html
deleted file mode 100644
index 23844d0a4cfe9..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- wp:form-input {"type":"number"} -->
-<label class="wp-block-form-input__label">
-	<span class="wp-block-form-input__label-content">Label</span>
-	<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
-</label>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.json
deleted file mode 100644
index 83bae09d06571..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "number",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.parsed.json
deleted file mode 100644
index 8ae9b2d31801b..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "number"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.serialized.html
deleted file mode 100644
index b74993d42d555..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v1.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"number"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.html
deleted file mode 100644
index 581b11e4d68ba..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- wp:form-input {"type":"number"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.json
deleted file mode 100644
index 83bae09d06571..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "number",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.parsed.json
deleted file mode 100644
index a7311b75c63e0..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "number"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.serialized.html
deleted file mode 100644
index b74993d42d555..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__number__deprecated-v2.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"number"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.html
deleted file mode 100644
index 1e868cb74c914..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- wp:form-input {"type":"tel"} -->
-<label class="wp-block-form-input__label">
-	<span class="wp-block-form-input__label-content">Label</span>
-	<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
-</label>
-<!-- /wp:form-input -->
-
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.json
deleted file mode 100644
index 01aa1062912a2..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "tel",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.parsed.json
deleted file mode 100644
index 127c45f3c953d..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "tel"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.serialized.html
deleted file mode 100644
index 596b302b14143..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v1.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"tel"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.html
deleted file mode 100644
index 66be25e9a0e0f..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- wp:form-input {"type":"tel"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.json
deleted file mode 100644
index 01aa1062912a2..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "tel",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.parsed.json
deleted file mode 100644
index 695a30f821ac8..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "tel"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.serialized.html
deleted file mode 100644
index 596b302b14143..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__tel__deprecated-v2.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"tel"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.html
deleted file mode 100644
index 08ea661838620..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- wp:form-input -->
-<label class="wp-block-form-input__label">
-	<span class="wp-block-form-input__label-content">Label</span>
-	<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
-</label>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.json
deleted file mode 100644
index fee4df284f115..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "text",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.parsed.json
deleted file mode 100644
index 645337cbfdb4a..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.parsed.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.serialized.html
deleted file mode 100644
index 33f1fe88c2c6a..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v1.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.html
deleted file mode 100644
index 151d1074885d4..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- wp:form-input -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.json
deleted file mode 100644
index fee4df284f115..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "text",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.parsed.json
deleted file mode 100644
index b784632e84336..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.parsed.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.serialized.html
deleted file mode 100644
index 33f1fe88c2c6a..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__text__deprecated-v2.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.html
deleted file mode 100644
index d5b422c9329df..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- wp:form-input {"type":"url"} -->
-<label class="wp-block-form-input__label">
-	<span class="wp-block-form-input__label-content">Label</span>
-	<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
-</label>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.json
deleted file mode 100644
index c08c0e2bd1aa1..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "url",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.parsed.json
deleted file mode 100644
index 9055c7e2b9a20..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "url"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.serialized.html
deleted file mode 100644
index a26dd3ac1cef2..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v1.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"url"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.html
deleted file mode 100644
index 525e57cc63360..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- wp:form-input {"type":"url"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.json
deleted file mode 100644
index c08c0e2bd1aa1..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "url",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.parsed.json
deleted file mode 100644
index 186e8a58f46d0..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "url"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.serialized.html
deleted file mode 100644
index a26dd3ac1cef2..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__url__deprecated-v2.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"url"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->

From 9947d4840131e5e37346b1c3deb57e0bc23f89d1 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Sun, 25 Aug 2024 11:39:15 +0900
Subject: [PATCH 07/10] Remove unneccesary fixtures

---
 .../core__form-input__deprecated-v2.html      | 45 ----------
 .../core__form-input__deprecated-v2.json      | 67 ---------------
 ...ore__form-input__deprecated-v2.parsed.json | 83 -------------------
 ..._form-input__deprecated-v2.serialized.html | 19 -----
 ...__form-input__textarea__deprecated-v2.html |  9 --
 ...__form-input__textarea__deprecated-v2.json | 15 ----
 ...input__textarea__deprecated-v2.parsed.json | 13 ---
 ...t__textarea__deprecated-v2.serialized.html |  3 -
 8 files changed, 254 deletions(-)
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.html
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.serialized.html

diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
deleted file mode 100644
index 4ba397cf86185..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- wp:form-input -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"email"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"number"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"tel"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"url"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
-	</label>
-</div>
-<!-- /wp:form-input -->
-
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
deleted file mode 100644
index 2d9865ef73556..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "text",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "email",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "number",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "tel",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "url",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
deleted file mode 100644
index b9536060aa345..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.parsed.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "email"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "number"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "tel"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "url"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
deleted file mode 100644
index d66cedcf9215b..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__deprecated-v2.serialized.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- wp:form-input -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"email"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"number"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"tel"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
-
-<!-- wp:form-input {"type":"url"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
-<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.html
deleted file mode 100644
index db669fab9238a..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:form-input {"type":"textarea"} -->
-<div class="wp-block-form-input">
-	<label class="wp-block-form-input__label">
-		<span class="wp-block-form-input__label-content">Label</span>
-		<textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea>
-	</label>
-</div>
-<!-- /wp:form-input -->
-
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.json
deleted file mode 100644
index 398106d8de1ca..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-	{
-		"name": "core/form-input",
-		"isValid": true,
-		"attributes": {
-			"type": "textarea",
-			"label": "Label",
-			"inlineLabel": false,
-			"required": false,
-			"value": "",
-			"visibilityPermissions": "all"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.parsed.json
deleted file mode 100644
index bb4fb44dee470..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.parsed.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-	{
-		"blockName": "core/form-input",
-		"attrs": {
-			"type": "textarea"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n\t</label>\n</div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n\t</label>\n</div>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.serialized.html
deleted file mode 100644
index 530403c4964fa..0000000000000
--- a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v2.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:form-input {"type":"textarea"} -->
-<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea></label></div>
-<!-- /wp:form-input -->

From 8cc11de259d6e1035639548d08f78f4cf54f97a3 Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:32:20 +0700
Subject: [PATCH 08/10] Add base fixtures for text-like inputs

All variations of the simple texts input field are added here to match the approach taken in the deprecation fixtures.
---
 .../fixtures/blocks/core__form-input.html     | 17 +++++
 .../fixtures/blocks/core__form-input.json     | 52 ++++++++++++++
 .../blocks/core__form-input.parsed.json       | 72 +++++++++++++++++++
 .../blocks/core__form-input.serialized.html   | 16 +++++
 4 files changed, 157 insertions(+)

diff --git a/test/integration/fixtures/blocks/core__form-input.html b/test/integration/fixtures/blocks/core__form-input.html
index 33f1fe88c2c6a..81ff6cf53534e 100644
--- a/test/integration/fixtures/blocks/core__form-input.html
+++ b/test/integration/fixtures/blocks/core__form-input.html
@@ -1,3 +1,20 @@
 <!-- wp:form-input -->
 <div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input.json b/test/integration/fixtures/blocks/core__form-input.json
index fee4df284f115..2d9865ef73556 100644
--- a/test/integration/fixtures/blocks/core__form-input.json
+++ b/test/integration/fixtures/blocks/core__form-input.json
@@ -11,5 +11,57 @@
 			"visibilityPermissions": "all"
 		},
 		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input.parsed.json b/test/integration/fixtures/blocks/core__form-input.parsed.json
index 5470c653c403b..439943df2841c 100644
--- a/test/integration/fixtures/blocks/core__form-input.parsed.json
+++ b/test/integration/fixtures/blocks/core__form-input.parsed.json
@@ -7,5 +7,77 @@
 		"innerContent": [
 			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/></label></div>\n"
 		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input.serialized.html b/test/integration/fixtures/blocks/core__form-input.serialized.html
index 33f1fe88c2c6a..d66cedcf9215b 100644
--- a/test/integration/fixtures/blocks/core__form-input.serialized.html
+++ b/test/integration/fixtures/blocks/core__form-input.serialized.html
@@ -1,3 +1,19 @@
 <!-- wp:form-input -->
 <div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->

From c222f887ff5c12d59128e18c1eb31ce591c960ba Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:44:20 +0700
Subject: [PATCH 09/10] Add base fixtures for checkbox, radio, and textarea
 inputs

---
 .../blocks/core__form-input__checkbox.html        |  3 +++
 .../blocks/core__form-input__checkbox.json        | 15 +++++++++++++++
 .../blocks/core__form-input__checkbox.parsed.json | 14 ++++++++++++++
 .../core__form-input__checkbox.serialized.html    |  3 +++
 .../fixtures/blocks/core__form-input__radio.html  |  3 +++
 .../fixtures/blocks/core__form-input__radio.json  | 15 +++++++++++++++
 .../blocks/core__form-input__radio.parsed.json    | 14 ++++++++++++++
 .../core__form-input__radio.serialized.html       |  3 +++
 .../blocks/core__form-input__textarea.html        |  3 +++
 .../blocks/core__form-input__textarea.json        | 15 +++++++++++++++
 .../blocks/core__form-input__textarea.parsed.json | 13 +++++++++++++
 .../core__form-input__textarea.serialized.html    |  3 +++
 12 files changed, 104 insertions(+)
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__radio.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input__textarea.serialized.html

diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.html b/test/integration/fixtures/blocks/core__form-input__checkbox.html
new file mode 100644
index 0000000000000..fd08525a17eb3
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="checkbox" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.json b/test/integration/fixtures/blocks/core__form-input__checkbox.json
new file mode 100644
index 0000000000000..cc86ecd2a9080
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": true,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json
new file mode 100644
index 0000000000000..60b7b7dd37b09
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json
@@ -0,0 +1,14 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox",
+			"inlineLabel": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html
new file mode 100644
index 0000000000000..fd08525a17eb3
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="checkbox" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.html b/test/integration/fixtures/blocks/core__form-input__radio.html
new file mode 100644
index 0000000000000..1e6c76424334f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="radio" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.json b/test/integration/fixtures/blocks/core__form-input__radio.json
new file mode 100644
index 0000000000000..18cec11e3305b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": true,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio.parsed.json
new file mode 100644
index 0000000000000..8dbb5b5a09942
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.parsed.json
@@ -0,0 +1,14 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio",
+			"inlineLabel": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio.serialized.html
new file mode 100644
index 0000000000000..1e6c76424334f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="radio" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.html b/test/integration/fixtures/blocks/core__form-input__textarea.html
new file mode 100644
index 0000000000000..b39e1c8b51166
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" required aria-required="true"></textarea></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.json b/test/integration/fixtures/blocks/core__form-input__textarea.json
new file mode 100644
index 0000000000000..62ae6f76a0e9d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "textarea",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json b/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json
new file mode 100644
index 0000000000000..3f76a2194f27e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "textarea"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><textarea class=\"wp-block-form-input__input\" name=\"label\" required aria-required=\"true\"></textarea></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><textarea class=\"wp-block-form-input__input\" name=\"label\" required aria-required=\"true\"></textarea></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html b/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html
new file mode 100644
index 0000000000000..b39e1c8b51166
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" required aria-required="true"></textarea></label></div>
+<!-- /wp:form-input -->

From 267e332a2ace049ede7fbf394ce8fc7d49d000b3 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Fri, 30 Aug 2024 18:05:44 +0900
Subject: [PATCH 10/10] Add fallback style for old markup

---
 packages/block-library/src/form-input/style.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index 33dc54b4340a3..7b1ac53cc89c0 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -23,6 +23,11 @@
 			margin: 0;
 		}
 	}
+
+	&:has(.wp-block-form-input__label-content + input[type="checkbox"]) {
+		/* stylelint-disable-next-line declaration-property-value-allowed-list -- This style is required for old markup. */
+		flex-direction: row-reverse;
+	}
 }
 
 .wp-block-form-input__label-content {