Feature/deploy 20240117

.github/workflows/run-tests.yml

@@ -124,7 +124,7 @@ jobs:
         uses: cafuego/command-output@main
         with:
           run: |
-            docker compose -f tests/docker-compose.yml exec -T drupal drush -y si --existing-config
+            docker compose -f tests/docker-compose.yml exec -T drupal drush -y si --existing-config minimal install_configure_form.enable_update_status_emails=NULL
         env:
           fail-fast: true
 

PATCHES/svg_image--3413668--drupal-10.2-compatibility.patch

@@ -0,0 +1,60 @@
+diff --git a/src/Plugin/Field/FieldWidget/SvgImageWidget.php b/src/Plugin/Field/FieldWidget/SvgImageWidget.php
+index 6a108c031b48e1a1cdd289bcab01425748a049dc..9f1fd50061deb939b166baae7ed3d565aeb3b72b 100755
+--- a/src/Plugin/Field/FieldWidget/SvgImageWidget.php
++++ b/src/Plugin/Field/FieldWidget/SvgImageWidget.php
+@@ -184,18 +184,46 @@ class SvgImageWidget extends FileWidget {
+
+     $fieldSettings = $this->getFieldSettings();
+
+-    // Add upload resolution validation.
+-    if ($fieldSettings['max_resolution'] || $fieldSettings['min_resolution']) {
+-      $element['#upload_validators']['file_validate_image_resolution'] = [$fieldSettings['max_resolution'], $fieldSettings['min_resolution']];
++    // Druapal 10.2 changes the file validation API.
++    // @see https://www.drupal.org/node/3363700
++    if (version_compare(\Drupal::VERSION, '10.2', '>=')) {
++      // Add image validation.
++      $element['#upload_validators']['FileIsImage'] = [];
++
++      // Add upload resolution validation.
++      if ($fieldSettings['max_resolution'] || $fieldSettings['min_resolution']) {
++        $element['#upload_validators']['FileImageDimensions'] = [
++          'maxDimensions' => $fieldSettings['max_resolution'],
++          'minDimensions' => $fieldSettings['min_resolution'],
++        ];
++      }
++
++      // If not using custom extension validation, ensure this is an image.
++      $supportedExtensions = $this->imageFactory->getSupportedExtensions();
++      $supportedExtensions[] = 'svg';
++      $extensions = $element['#upload_validators']['FileExtension']['extensions'] ?? implode(' ', $supportedExtensions);
++
++      $extensions = array_intersect(explode(' ', $extensions), $supportedExtensions);
++      $element['#upload_validators']['FileExtension']['extensions'] = implode(' ', $extensions);
+     }
++    // Backward compatibility with Drupal < 10.2.
++    else {
++      // Add upload resolution validation.
++      if ($fieldSettings['max_resolution'] || $fieldSettings['min_resolution']) {
++        $element['#upload_validators']['file_validate_image_resolution'] = [
++          $fieldSettings['max_resolution'],
++          $fieldSettings['min_resolution'],
++        ];
++      }
+
+-    // If not using custom extension validation, ensure this is an image.
+-    $supportedExtensions = $this->imageFactory->getSupportedExtensions();
+-    $supportedExtensions[] = 'svg';
+-    $extensions = $element['#upload_validators']['file_validate_extensions'][0] ?? implode(' ', $supportedExtensions);
++      // If not using custom extension validation, ensure this is an image.
++      $supportedExtensions = $this->imageFactory->getSupportedExtensions();
++      $supportedExtensions[] = 'svg';
++      $extensions = $element['#upload_validators']['file_validate_extensions'][0] ?? implode(' ', $supportedExtensions);
+
+-    $extensions = array_intersect(explode(' ', $extensions), $supportedExtensions);
+-    $element['#upload_validators']['file_validate_extensions'][0] = implode(' ', $extensions);
++      $extensions = array_intersect(explode(' ', $extensions), $supportedExtensions);
++      $element['#upload_validators']['file_validate_extensions'][0] = implode(' ', $extensions);
++    }
+
+     // Add mobile device image capture acceptance.
+     $element['#accept'] = 'image/*';

composer.json

@@ -24,7 +24,7 @@
         "composer/installers": "^1.12",
         "cweagans/composer-patches": "^1.7",
         "drupal/admin_denied": "^2.0",
-        "drupal/allowed_formats": "^2.0",
+        "drupal/allowed_formats": "^3",
         "drupal/classy": "^1.0",
         "drupal/components": "^3.0@beta",
         "drupal/config_filter": "^2.2",
@@ -58,7 +58,7 @@
         "drupal/token": "^1.11",
         "drupal/user_display_name": "^1.0",
         "drupal/username_enumeration_prevention": "^1.3",
-        "drush/drush": "^11.3",
+        "drush/drush": "^12",
         "google/analytics-data": "^0.8.4",
         "google/auth": "^1.21",
         "league/commonmark": "^2.2",
@@ -70,7 +70,7 @@
         "reliefweb/simple-autocomplete": "^v1.3",
         "reliefweb/simple-datepicker": "^v1.3",
         "symfony/uid": "^6.2",
-        "unocha/common_design": "^9.2",
+        "unocha/common_design": "^9.3",
         "unocha/ocha_monitoring": "^1.0",
         "webflo/drupal-finder": "^1.2.2"
     },
@@ -106,7 +106,8 @@
             "oomphinc/composer-installers-extender": true,
             "orakili/composer-drupal-info-file-patch-helper": true,
             "phpstan/extension-installer": true,
-            "symfony/flex": true
+            "symfony/flex": true,
+            "php-http/discovery": true
         }
     },
     "autoload": {