Issue #3494128 by nicxvan, smustgrave: Move helpers in contact_storage_test.module and delete it

core/.phpstan-baseline.php

@@ -15070,12 +15070,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/modules/contact/src/Plugin/views/field/ContactLink.php',
 ];
-$ignoreErrors[] = [
-	// identifier: missingType.return
-	'message' => '#^Function contact_storage_test_contact_form_form_builder\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module',
-];
 $ignoreErrors[] = [
 	// identifier: missingType.return
 	'message' => '#^Method Drupal\\\\contact_storage_test\\\\Hook\\\\ContactStorageTestHooks\\:\\:entityBaseFieldInfo\\(\\) has no return type specified\\.$#',

core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module

-<?php
-
-/**
- * @file
- * Contains custom contact message functionality for ContactStorageTest.
- */
-
-declare(strict_types=1);
-
-use Drupal\contact\ContactFormInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Entity builder for the contact form edit form with third party options.
- *
- * @see contact_storage_test_form_contact_form_edit_form_alter()
- */
-function contact_storage_test_contact_form_form_builder($entity_type, ContactFormInterface $contact_form, &$form, FormStateInterface $form_state) {
-  $contact_form->setThirdPartySetting('contact_storage_test', 'send_a_pony', $form_state->getValue('send_a_pony'));
-}

core/modules/contact/tests/modules/contact_storage_test/src/Hook/ContactStorageTestHooks.php

@@ -4,6 +4,7 @@
 
 namespace Drupal\contact_storage_test\Hook;
 
+use Drupal\contact\ContactFormInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\EntityTypeInterface;
@@ -54,7 +55,16 @@ public function formContactFormFormAlter(&$form, FormStateInterface $form_state)
       '#description' => t('Enable to send an additional email with a free pony voucher to anyone who submits the form.'),
       '#default_value' => $contact_form->getThirdPartySetting('contact_storage_test', 'send_a_pony', FALSE),
     ];
-    $form['#entity_builders'][] = 'contact_storage_test_contact_form_form_builder';
+    $form['#entity_builders'][] = [$this, 'contactFormBuilder'];
+  }
+
+  /**
+   * Entity builder for the contact form edit form with third party options.
+   *
+   * @see contact_storage_test_form_contact_form_edit_form_alter()
+   */
+  public function contactFormBuilder($entity_type, ContactFormInterface $contact_form, &$form, FormStateInterface $form_state): void {
+    $contact_form->setThirdPartySetting('contact_storage_test', 'send_a_pony', $form_state->getValue('send_a_pony'));
   }
 
 }