.gitlab-ci.yml

@@ -23,8 +23,6 @@ variables:
   OPT_IN_TEST_MAX_PHP: 1
   OPT_IN_TEST_NEXT_MINOR: 1
   OPT_IN_TEST_PREVIOUS_MINOR: 1
-  # Show more log output
-  _PHPUNIT_EXTRA: --verbose
   # Convenient, and we have no secrets.
   _SHOW_ENVIRONMENT_VARIABLES: 1
   # Try to track down random failures at https://www.drupal.org/node/3414252

address.libraries.yml

@@ -3,3 +3,10 @@ form:
   css:
     theme:
       css/address.form.css: {}
+
+field-icon:
+  css:
+    theme:
+      css/address.field-icon.css: {}
+  dependencies:
+    - field_ui/drupal.field_ui.manage_fields

address.module

@@ -7,6 +7,7 @@
 
 use Drupal\address\AddressInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Field\FieldTypeCategoryManagerInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
@@ -104,3 +105,10 @@ function address_field_info_alter(&$info) {
     $info['address_zone']['category'] = new TranslatableMarkup("Address");
   }
 }
+
+/**
+ * Implements hook_field_type_category_info_alter().
+ */
+function address_field_type_category_info_alter(&$definitions) {
+  $definitions[FieldTypeCategoryManagerInterface::FALLBACK_CATEGORY]['libraries'][] = 'address/field-icon';
+}

address.post_update.php

@@ -17,7 +17,8 @@ function address_post_update_default_widget_wrapper(array &$sandbox = NULL): voi
   \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'entity_form_display', function (EntityFormDisplayInterface $form_display): bool {
     $changed = FALSE;
     foreach ($form_display->getComponents() as $field => $component) {
-      if (array_key_exists('type', $component)
+      if (is_array($component)
+        && array_key_exists('type', $component)
         && ($component['type'] === 'address_default')
         && !array_key_exists('wrapper_type', $component['settings'])) {
         $component['settings']['wrapper_type'] = 'details';

css/address.field-icon.css

+
+.field-option__icon.field-icon-address {
+  position: relative;
+  height: 100%;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%2355565b' width='204px' height='204px' viewBox='0 0 576 576'%3E%3Cpath d='M528 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h480c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-352 96c35.3 0 64 28.7 64 64s-28.7 64-64 64-64-28.7-64-64 28.7-64 64-64zm112 236.8c0 10.6-10 19.2-22.4 19.2H86.4C74 384 64 375.4 64 364.8v-19.2c0-31.8 30.1-57.6 67.2-57.6h5c12.3 5.1 25.7 8 39.8 8s27.6-2.9 39.8-8h5c37.1 0 67.2 25.8 67.2 57.6v19.2zM512 312c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16zm0-64c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16zm0-64c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16z'/%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 36px;
+}
+

src/Element/Country.php

@@ -33,6 +33,7 @@ class Country extends FormElement {
       '#input' => TRUE,
       '#multiple' => FALSE,
       '#default_value' => NULL,
+      '#disabled' => FALSE,
       '#process' => [
         [$class, 'processCountry'],
         [$class, 'processGroup'],
@@ -96,6 +97,7 @@ class Country extends FormElement {
         '#options' => $country_list,
         '#default_value' => $element['#default_value'],
         '#required' => $element['#required'],
+        '#disabled' => $element['#disabled'],
         '#limit_validation_errors' => [],
         '#attributes' => [
           'class' => ['country'],

tests/modules/address_test/config/optional/views.view.address_test_filter_administrative_area.yml

@@ -225,7 +225,6 @@ display:
           default_argument_type: fixed
           default_argument_options:
             argument: ''
-          default_argument_skip_url: false
           summary_options:
             base_path: ''
             count: true

tests/src/Unit/Plugin/Validation/Constraint/CountryConstraintValidatorTest.php

@@ -57,7 +57,7 @@ class CountryConstraintValidatorTest extends UnitTestCase {
     if ($expected_violation) {
       $violation_builder = $this->prophesize(ConstraintViolationBuilderInterface::class);
       $violation_builder->setParameter('%value', Argument::any())->willReturn($violation_builder);
-      $violation_builder->addViolation()->willReturn($violation_builder);
+      $violation_builder->addViolation()->shouldBeCalled();
       $context->buildViolation($expected_violation)->willReturn($violation_builder->reveal())->shouldBeCalled();
     }
     else {