Merge branch 'develop' into feature/digital-signature-placement

jekuaitk · web-flow · commit 4e39f4b92cc3 · 2026-03-12T14:36:33.000+01:00
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -23,17 +23,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      
+      - name: Mark repo as safe for git (container)
+        run: |
+          docker compose run --rm --user 0 php bash -lc \
+            'git config --system --add safe.directory /app || git config --global --add safe.directory /app'
+
+      - name: Fix ownership (container)
+        run: |
+          docker compose run --rm --user 0             -e HOST_UID=$(id -u) -e HOST_GID=$(id -g)             php bash -lc 'chown -R ${HOST_UID}:${HOST_GID} /app'
+
       - name: Validate composer files
         run: |
-          # Note that we don't use the --strict flag on validate due to the
-          # package drupal/config_entity_revisions 2.0.x-dev being considered a
-          # version cf.
-          # https://getcomposer.org/doc/articles/versions.md#branches
-          docker compose run --rm php composer validate composer.json
+          docker compose run --rm --user "$(id -u):$(id -g)" php composer validate composer.json
+
       - name: Check that composer file is normalized
         run: |
-          docker compose run --rm php composer install
-          docker compose run --rm php composer normalize --dry-run
+          docker compose run --rm --user "$(id -u):$(id -g)" php composer install
+          docker compose run --rm --user "$(id -u):$(id -g)" php composer normalize --dry-run
 
   test-composer-files:
     name: Test composer files
@@ -43,29 +50,50 @@ jobs:
         dependency-version: [ prefer-lowest, prefer-stable ]
     steps:
       - uses: actions/checkout@v4
+
+      - name: Fix ownership (container)
+        run: |
+          docker compose run --rm --user 0             -e HOST_UID=$(id -u) -e HOST_GID=$(id -g)             php bash -lc 'chown -R ${HOST_UID}:${HOST_GID} /app'
+
+      - name: Debug compose + php
+        run: |
+          ls -la
+          docker compose config
+          docker compose run --rm php php -v
+
       - name: Check that dependencies resolve.
         run: |
-          # Clean up before update (cf. https://www.drupal.org/project/simplesamlphp_auth/issues/3350773)
           rm -fr vendor/
-          docker compose run --rm php composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+          docker compose run --rm --user "$(id -u):$(id -g)" php composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
   php-coding-standards:
     name: PHP coding standards
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
+      - name: Fix ownership (container)
+        run: |
+          docker compose run --rm --user 0             -e HOST_UID=$(id -u) -e HOST_GID=$(id -g)             php bash -lc 'chown -R ${HOST_UID}:${HOST_GID} /app'
+
       - name: Install Dependencies
         run: |
-          docker compose run --rm php composer install
+          docker compose run --rm --user "$(id -u):$(id -g)" php composer install
+
       - name: PHPCS
         run: |
-          docker compose run --rm php composer coding-standards-check/phpcs
+          docker compose run --rm --user "$(id -u):$(id -g)" php composer coding-standards-check/phpcs
 
   php-code-analysis:
     name: PHP code analysis
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
+      - name: Fix ownership (container)
+        run: |
+          docker compose run --rm --user 0             -e HOST_UID=$(id -u) -e HOST_GID=$(id -g)             php bash -lc 'chown -R ${HOST_UID}:${HOST_GID} /app'
+
       - name: Code analysis
         run: |
           ./scripts/code-analysis
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,11 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 - [PR-306](https://github.com/OS2Forms/os2forms/pull/306)
   Made digital signature text placement configurable.
+- [#251](https://github.com/OS2Forms/os2forms/issues/251)
+  Webform encrypt uninstall problem fix
+- git actions check
+- [PR-289](https://github.com/OS2Forms/os2forms/pull/289)
+  Added required "Zoom control position" to map element
 
 ## [5.0.0] 2025-11-18
 
diff --git a/compose.yaml b/compose.yaml
@@ -2,12 +2,22 @@
 
 services:
   php:
-    image: ddev/ddev-php-base
+    image: ddev/ddev-php-base:v1.24.10-old
     profiles:
       - dev
     working_dir: /app
     volumes:
       - ./:/app
+    environment:
+      COMPOSER_HOME: /tmp/composer
+      COMPOSER_CACHE_DIR: /tmp/composer-cache
+    entrypoint:
+      - bash
+      - -lc
+      - |
+        git config --global --add safe.directory /app
+        exec "$@"
+      - bash
 
   markdownlint:
     image: itkdev/markdownlint
diff --git a/composer.json b/composer.json
@@ -128,7 +128,7 @@
                 "Add custom hook (hook_webform_post_load_data) for audit logging": "https://gist.githubusercontent.com/cableman/d26898fc8f65ee0a31001bf391583b59/raw/6189dc4c2ceaabb19d25cc4b98b0b3028a6b0e1e/gistfile1.txt"
             },
             "drupal/webform_encrypt": {
-                "Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch",
+                "Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://www.drupal.org/files/issues/2026-02-06/patch.diff",
                 "PHP Warning if unserialize fails (https://www.drupal.org/project/webform_encrypt/issues/3292305)": "https://www.drupal.org/files/issues/2022-06-23/unserialize-php-notice.patch"
             },
             "drupal/webform_node_element": {
diff --git a/modules/os2forms_webform_maps/os2forms_webform_maps.libraries.yml b/modules/os2forms_webform_maps/os2forms_webform_maps.libraries.yml
@@ -1,8 +1,5 @@
 webformmap:
   version: 1.x
-  css:
-    theme:
-      css/webform_map.css: {}
   js:
     js/webform_map.js: {}
   dependencies:
diff --git a/modules/os2forms_webform_maps/src/Element/WebformLeafletMapField.php b/modules/os2forms_webform_maps/src/Element/WebformLeafletMapField.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element\FormElement;
 use Drupal\webform\Element\WebformCompositeFormElementTrait;
+use Drupal\os2forms_webform_maps\Plugin\WebformElement\WebformLeafletMapField as WebformLeafletMapElement;
 
 /**
  * Provides a webform_map_field.
@@ -36,7 +37,7 @@ public function getInfo() {
       '#minZoom' => 1,
       '#maxZoom' => 18,
       '#zoomFiner' => 0,
-      '#position' => 'topleft',
+      '#position' => WebformLeafletMapElement::LEAFLET_POSITION_TOP_LEFT,
       '#marker' => 'defaultMarker',
       '#drawPolyline' => 0,
       '#drawRectangle' => 0,
@@ -90,6 +91,7 @@ public static function processWebformMapElement(&$element, FormStateInterface $f
       'zoomFiner' => $element['#zoomFiner'],
       'minZoom' => $element['#minZoom'],
       'maxZoom' => $element['#maxZoom'],
+      'zoomControlPosition' => $element['#zoomControlPosition'] ?? WebformLeafletMapElement::LEAFLET_POSITION_TOP_LEFT,
       'center' => [
         'lat' => (float) $element['#lat'],
         'lon' => (float) $element['#lon'],
diff --git a/modules/os2forms_webform_maps/src/Plugin/WebformElement/WebformLeafletMapField.php b/modules/os2forms_webform_maps/src/Plugin/WebformElement/WebformLeafletMapField.php
@@ -20,6 +20,13 @@ class WebformLeafletMapField extends WebformElementBase {
 
   use LeafletSettingsElementsTrait;
 
+  // Valid Leaflet control positions (cf.
+  // https://github.com/Leaflet/Leaflet/blob/main/src/control/Control.js).
+  const string LEAFLET_POSITION_TOP_LEFT = 'topleft';
+  const string LEAFLET_POSITION_TOP_RIGHT = 'topright';
+  const string LEAFLET_POSITION_BOTTOM_LEFT = 'bottomleft';
+  const string LEAFLET_POSITION_BOTTOM_RIGHT = 'bottomright';
+
   /**
    * {@inheritdoc}
    */
@@ -33,10 +40,11 @@ public function defineDefaultProperties(): array {
       'minZoom' => 1,
       'maxZoom' => 18,
       'zoomFiner' => 0,
+      'zoomControlPosition' => self::LEAFLET_POSITION_TOP_LEFT,
       'scrollWheelZoom' => 0,
       'doubleClickZoom' => 1,
 
-      'position' => 'topleft',
+      'position' => self::LEAFLET_POSITION_TOP_LEFT,
       'marker' => 'defaultMarker',
       'drawPolyline' => 0,
       'drawRectangle' => 0,
@@ -72,6 +80,13 @@ public function form(array $form, FormStateInterface $form_state) {
     $form = parent::form($form, $form_state);
     $map_keys = array_keys(leaflet_map_get_info());
 
+    $positionOptions = [
+      self::LEAFLET_POSITION_TOP_LEFT => $this->t('topleft'),
+      self::LEAFLET_POSITION_TOP_RIGHT => $this->t('topright'),
+      self::LEAFLET_POSITION_BOTTOM_LEFT => $this->t('bottomleft'),
+      self::LEAFLET_POSITION_BOTTOM_RIGHT => $this->t('bottomright'),
+    ];
+
     $form['mapstyles'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Map settings'),
@@ -139,6 +154,11 @@ public function form(array $form, FormStateInterface $form_state) {
         '#step' => 1,
         '#description' => $this->t('Value that might/will be added to default Fit Elements Bounds Zoom. (-5 / +5)'),
       ],
+      'zoomControlPosition' => [
+        '#type' => 'select',
+        '#title' => $this->t('Zoom control position'),
+        '#options' => $positionOptions,
+      ],
       'scrollWheelZoom' => [
         '#type' => 'checkbox',
         '#title' => $this->t('Enable Scroll Wheel Zoom on click'),
@@ -159,12 +179,7 @@ public function form(array $form, FormStateInterface $form_state) {
       'position' => [
         '#type' => 'select',
         '#title' => $this->t('Toolbar position.'),
-        '#options' => [
-          'topleft' => $this->t('topleft'),
-          'topright' => $this->t('topright'),
-          'bottomleft' => $this->t('bottomleft'),
-          'bottomright' => $this->t('bottomright'),
-        ],
+        '#options' => $positionOptions,
       ],
       'marker' => [
         '#type' => 'radios',
