Draw the badge in the header cell

The renderer no longer emits one when the caller draws its own heading,
because it was putting a pill hard against the side of every input. This
screen draws every heading, so it draws every badge.

Author: arraypress

src/SettingFields.php

@@ -683,12 +683,21 @@ private function render_table( FieldSet $set, array $fields ): void {
 			// A self-labelling control already carries its own <label for>,
 			// and a group of controls has no single element to point at, so
 			// both get plain text rather than a second label.
+			// The badge belongs beside the heading, and the heading is here —
+			// the renderer is told to draw none, so it draws no badge either.
+			$badge = Badge::for_field( $field );
+
 			$header = $type->is_self_labelling() || $type->is_grouped()
-				? sprintf( '<span class="field-kit__row-label">%s</span>', esc_html( $field->label() ) )
+				? sprintf(
+					'<span class="field-kit__row-label">%s%s</span>',
+					esc_html( $field->label() ),
+					$badge // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- escaped as it is built.
+				)
 				: sprintf(
-					'<label for="%s">%s</label>',
+					'<label for="%s">%s</label>%s',
 					esc_attr( $field->input_id() ),
-					esc_html( $field->label() )
+					esc_html( $field->label() ),
+					$badge // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- escaped as it is built.
 				);
 
 			printf(

tests/SettingFieldsTest.php

@@ -653,9 +653,15 @@ public function test_a_badged_section_locks_its_fields(): void {
 
 		$html = $this->render( $page );
 
-		// Once in the section heading, once on the field it locked.
+		// Once in the section heading, once in the locked field's own header
+		// cell — and not against the side of the input, which is where it
+		// first went.
 		$this->assertSame( 2, substr_count( $html, 'field-kit__badge' ) );
 		$this->assertStringContainsString( 'field-kit__field--locked', $html );
+		$this->assertMatchesRegularExpression(
+			'/<th scope="row">.*field-kit__badge.*<\/th>/s',
+			$html
+		);
 
 		// And its stored value survives a save that cannot include it.
 		$GLOBALS['fk_options']['sf_demo'] = [ 'locked' => 'set-while-licensed' ];