Issue #3495514 by nikolay shapovalov, nicxvan: Move helpers in form_test.module and delete it

Author: larowlan

.phpstan-baseline.php

@@ -36980,24 +36980,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/modules/system/tests/modules/experimental_module_test/src/Hook/ExperimentalModuleTestHooks.php',
 ];
-$ignoreErrors[] = [
-	// identifier: missingType.return
-	'message' => '#^Function _form_test_tableselect_get_data\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/system/tests/modules/form_test/form_test.module',
-];
-$ignoreErrors[] = [
-	// identifier: missingType.return
-	'message' => '#^Function form_test_tableselect_ajax_callback\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/system/tests/modules/form_test/form_test.module',
-];
-$ignoreErrors[] = [
-	// identifier: missingType.return
-	'message' => '#^Function form_test_user_register_form_rebuild\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/system/tests/modules/form_test/form_test.module',
-];
 $ignoreErrors[] = [
 	// identifier: missingType.return
 	'message' => '#^Method Drupal\\\\form_test\\\\Callbacks\\:\\:validateName\\(\\) has no return type specified\\.$#',

modules/system/tests/modules/form_test/form_test.module

@@ -47,4 +47,50 @@ public function validateName(&$element, FormStateInterface $form_state) {
     }
   }
 
+  /**
+   * Create a header and options array. Helper function for callbacks.
+   */
+  public static function tableselectGetData(): array {
+    $header = [
+      'one' => t('One'),
+      'two' => t('Two'),
+      'three' => t('Three'),
+      'four' => t('Four'),
+    ];
+
+    $options['row1'] = [
+      'title' => ['data' => ['#title' => t('row1')]],
+      'one' => 'row1col1',
+      'two' => t('row1col2'),
+      'three' => t('row1col3'),
+      'four' => t('row1col4'),
+    ];
+
+    $options['row2'] = [
+      'title' => ['data' => ['#title' => t('row2')]],
+      'one' => 'row2col1',
+      'two' => t('row2col2'),
+      'three' => t('row2col3'),
+      'four' => t('row2col4'),
+    ];
+
+    $options['row3'] = [
+      'title' => ['data' => ['#title' => t('row3')]],
+      'one' => 'row3col1',
+      'two' => t('row3col2'),
+      'three' => t('row3col3'),
+      'four' => t('row3col4'),
+    ];
+
+    return [$header, $options];
+  }
+
+  /**
+   * Submit callback that just lets the form rebuild.
+   */
+  public static function userRegisterFormRebuild(array $form, FormStateInterface $form_state): void {
+    \Drupal::messenger()->addStatus('Form rebuilt.');
+    $form_state->setRebuild();
+  }
+
 }

modules/system/tests/modules/form_test/src/Callbacks.php

@@ -5,6 +5,7 @@
 namespace Drupal\form_test\Form;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\form_test\Callbacks;
 
 /**
  * Builds a form to test table selects with different column spans.
@@ -24,7 +25,7 @@ public function getFormId() {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    [$header, $options] = _form_test_tableselect_get_data();
+    [$header, $options] = Callbacks::tableselectGetData();
 
     // Change the data so that the third column has colspan=2.
     $header['three'] = ['data' => 'Three', 'colspan' => 2];

modules/system/tests/modules/form_test/src/Form/FormTestTableSelectColspanForm.php

@@ -6,6 +6,7 @@
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\form_test\Callbacks;
 
 /**
  * Provides a base class for tableselect forms.
@@ -28,7 +29,7 @@ abstract class FormTestTableSelectFormBase extends FormBase {
    *   A form with a tableselect element and a submit button.
    */
   public function tableselectFormBuilder($form, FormStateInterface $form_state, $element_properties) {
-    [$header, $options] = _form_test_tableselect_get_data();
+    [$header, $options] = Callbacks::tableselectGetData();
 
     $form['tableselect'] = $element_properties;
 
@@ -41,7 +42,7 @@ public function tableselectFormBuilder($form, FormStateInterface $form_state, $e
       '#multiple' => FALSE,
       '#empty' => t('Empty text.'),
       '#ajax' => [
-        'callback' => 'form_test_tableselect_ajax_callback',
+        'callback' => '::tableselectAjaxCallback',
         'wrapper' => 'tableselect-wrapper',
       ],
     ];
@@ -54,4 +55,11 @@ public function tableselectFormBuilder($form, FormStateInterface $form_state, $e
     return $form;
   }
 
+  /**
+   * Ajax callback that returns the form element.
+   */
+  public function tableselectAjaxCallback(array $form, FormStateInterface $form_state): array {
+    return $form['tableselect'];
+  }
+
 }

modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php

@@ -6,6 +6,7 @@
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Hook\Attribute\Hook;
+use Drupal\form_test\Callbacks;
 
 /**
  * Hook implementations for form_test.
@@ -55,7 +56,7 @@ public function formUserRegisterFormAlter(&$form, FormStateInterface $form_state
       '#type' => 'submit',
       '#value' => t('Rebuild'),
       '#submit' => [
-        'form_test_user_register_form_rebuild',
+        [Callbacks::class, 'userRegisterFormRebuild'],
       ],
     ];
   }

modules/system/tests/modules/form_test/src/Hook/FormTestHooks.php

@@ -5,6 +5,7 @@
 namespace Drupal\Tests\system\Functional\Form;
 
 use Drupal\Core\Form\FormState;
+use Drupal\form_test\Callbacks;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -154,7 +155,7 @@ public function testAdvancedSelect(): void {
    */
   public function testMultipleTrueOptionChecker(): void {
 
-    [$header, $options] = _form_test_tableselect_get_data();
+    [$header, $options] = Callbacks::tableselectGetData();
 
     $form['tableselect'] = [
       '#type' => 'tableselect',
@@ -177,7 +178,7 @@ public function testMultipleTrueOptionChecker(): void {
    */
   public function testMultipleFalseOptionChecker(): void {
 
-    [$header, $options] = _form_test_tableselect_get_data();
+    [$header, $options] = Callbacks::tableselectGetData();
 
     $form['tableselect'] = [
       '#type' => 'tableselect',