Merge branch 'develop' into 'main'

Merging develop into main

See merge request !89

patches/d10.json

@@ -133,6 +133,9 @@
     "drupal/helpdesk_integration": {
       "#3228537 Exception Handling in Service class": "https://git.drupalcode.org/project/helpdesk_integration/-/merge_requests/7.diff"
     },
+    "drupal/http_client_manager": {
+      "#3385117 Code generator": "https://git.drupalcode.org/project/http_client_manager/-/merge_requests/11.diff"
+    },
     "drupal/inline_entity_form": {
       "#3204051 Check access": "https://git.drupalcode.org/project/inline_entity_form/-/merge_requests/14.diff?v=4"
     },
@@ -212,7 +215,8 @@
       "#3090673 URL field formatter": "https://www.drupal.org/files/issues/2019-10-29/3090673-2.svg_image_field.Add-support-for-a-URL-image-formatter.patch"
     },
     "drupal/tamper": {
-      "#3279973 WordCount plugin": "https://git.drupalcode.org/project/tamper/-/merge_requests/9.diff"
+      "#3279973 WordCount plugin": "https://git.drupalcode.org/project/tamper/-/merge_requests/9.diff",
+      "#3268276 Timezone plugin": "https://www.drupal.org/files/issues/2023-04-06/0001-Issue-3268276-Reworking-timezones.patch"
     },
     "drupal/taxonomy_machine_name": {
       "#3193233 Filter doesn't work": "https://www.drupal.org/files/issues/2021-01-17/taxonomy_machine_name-view-save-error-3193233.patch",

patches/d9.json

@@ -225,7 +225,8 @@
       "#3090673 URL field formatter": "https://www.drupal.org/files/issues/2019-10-29/3090673-2.svg_image_field.Add-support-for-a-URL-image-formatter.patch"
     },
     "drupal/tamper": {
-      "#3279973 WordCount plugin": "https://git.drupalcode.org/project/tamper/-/merge_requests/9.diff"
+      "#3279973 WordCount plugin": "https://git.drupalcode.org/project/tamper/-/merge_requests/9.diff",
+      "#3268276 Timezone plugin": "https://www.drupal.org/files/issues/2023-04-06/0001-Issue-3268276-Reworking-timezones.patch"
     },
     "drupal/taxonomy_machine_name": {
       "#3193233 Filter doesn't work": "https://www.drupal.org/files/issues/2021-01-17/taxonomy_machine_name-view-save-error-3193233.patch",

src/Handler.php

@@ -139,10 +139,13 @@ class Handler extends BaseHandler {
       $file = $projectRoot . '/settings/default/' . $template;
       $link = $webRoot . '/sites/default/' . $template;
       $rendered = $this->config->render($template, file_get_contents($pluginRoot . '/templates/' . $template . '.twig'));
+      if (file_exists($file)) {
+        $fs->chmod($file, 0664);
+      }
       file_put_contents($file, $rendered);
       $rel = substr($fs->makePathRelative($file, $projectRoot . '/' . $link), 3, -1);
       $fs->symlink($rel, $link);
-      $fs->chmod($file, 0664);
+      $fs->chmod($file, 0444);
       if ($this->config->readValue('chg-acl')) {
         $fs->chgrp($file, $this->config->readValue('webserver-groupname'));
       }