Issue #3253430 by paul121: Define all callback_allowed_values_function parameters

Accidentally merged the wrong commit earlier.

modules/asset/land/farm_land.module

@@ -6,12 +6,12 @@
  */
 
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
 
 /**
  * Allowed values callback function for the land type field.
  *
- * @param \Drupal\Core\Field\FieldDefinitionInterface $definition
+ * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $definition
  *   The field definition.
  * @param \Drupal\Core\Entity\ContentEntityInterface|null $entity
  *   The entity being created if applicable.
@@ -21,7 +21,7 @@ use Drupal\Core\Field\FieldDefinitionInterface;
  * @return array
  *   Returns an array of allowed values for use in form select options.
  */
-function farm_land_type_field_allowed_values(FieldDefinitionInterface $definition, ContentEntityInterface $entity = NULL, bool &$cacheable = TRUE) {
+function farm_land_type_field_allowed_values(FieldStorageDefinitionInterface $definition, ContentEntityInterface $entity = NULL, bool &$cacheable = TRUE) {
   /** @var \Drupal\farm_land\Entity\FarmLandTypeInterface[] $types */
   $types = \Drupal::entityTypeManager()->getStorage('land_type')->loadMultiple();
   $allowed_values = [];

modules/asset/structure/farm_structure.module

@@ -6,12 +6,12 @@
  */
 
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
 
 /**
  * Allowed values callback function for the structure type field.
  *
- * @param \Drupal\Core\Field\FieldDefinitionInterface $definition
+ * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $definition
  *   The field definition.
  * @param \Drupal\Core\Entity\ContentEntityInterface|null $entity
  *   The entity being created if applicable.
@@ -21,7 +21,7 @@ use Drupal\Core\Field\FieldDefinitionInterface;
  * @return array
  *   Returns an array of allowed values for use in form select options.
  */
-function farm_structure_type_field_allowed_values(FieldDefinitionInterface $definition, ContentEntityInterface $entity = NULL, bool &$cacheable = TRUE) {
+function farm_structure_type_field_allowed_values(FieldStorageDefinitionInterface $definition, ContentEntityInterface $entity = NULL, bool &$cacheable = TRUE) {
   /** @var \Drupal\farm_structure\Entity\FarmStructureTypeInterface[] $types */
   $types = \Drupal::entityTypeManager()->getStorage('structure_type')->loadMultiple();
   $allowed_values = [];

modules/core/quantity/quantity.module

@@ -7,6 +7,7 @@
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Render\Element;
 use Drupal\quantity\Entity\QuantityInterface;
 use Drupal\quantity\Event\QuantityEvent;
@@ -67,7 +68,7 @@ function quantity_measures() {
 /**
  * Allowed values callback function for the quantity measure field.
  *
- * @param \Drupal\Core\Field\FieldDefinitionInterface $definition
+ * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $definition
  *   The field definition.
  * @param \Drupal\Core\Entity\ContentEntityInterface|null $entity
  *   The entity being created if applicable.
@@ -77,7 +78,7 @@ function quantity_measures() {
  * @return array
  *   Returns an array of allowed values for use in form select options.
  */
-function quantity_measure_field_allowed_values(FieldDefinitionInterface $definition, ContentEntityInterface $entity = NULL, bool &$cacheable = TRUE) {
+function quantity_measure_field_allowed_values(FieldStorageDefinitionInterface $definition, ContentEntityInterface $entity = NULL, bool &$cacheable = TRUE) {
 
   // Start an empty options array.
   $options = [];

modules/log/lab_test/farm_lab_test.module

@@ -6,12 +6,12 @@
  */
 
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
 
 /**
  * Allowed values callback function for the lab test type field.
  *
- * @param \Drupal\Core\Field\FieldDefinitionInterface $definition
+ * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $definition
  *   The field definition.
  * @param \Drupal\Core\Entity\ContentEntityInterface|null $entity
  *   The entity being created if applicable.
@@ -21,7 +21,7 @@ use Drupal\Core\Field\FieldDefinitionInterface;
  * @return array
  *   Returns an array of allowed values for use in form select options.
  */
-function farm_lab_test_type_field_allowed_values(FieldDefinitionInterface $definition, ContentEntityInterface $entity = NULL, bool &$cacheable = TRUE) {
+function farm_lab_test_type_field_allowed_values(FieldStorageDefinitionInterface $definition, ContentEntityInterface $entity = NULL, bool &$cacheable = TRUE) {
   /** @var \Drupal\farm_lab_test\Entity\FarmLabTestTypeInterface[] $lab_test_types */
   $lab_test_types = \Drupal::entityTypeManager()->getStorage('lab_test_type')->loadMultiple();
   $allowed_values = [];