Merge pull request #327 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Nov 16, 2023 · 730e259 · 730e259
2 parents cdf2b7b + cb8cbe1
commit 730e259
Show file tree

Hide file tree

Showing 20 changed files with 248 additions and 250 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -0,0 +1 @@
+3
diff --git a/composer.json b/composer.json
@@ -37,11 +37,12 @@
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^9.3",
         "drupal/migrate_tools": "^5.2",
-        "mglaman/phpstan-drupal": "^1.0",
+        "jangregor/phpstan-prophecy": "^1.0",
+        "mglaman/phpstan-drupal": "^1.2",
         "phpspec/prophecy-phpunit": "^2",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.0",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpunit/phpunit": "^9.6",
         "weitzman/drupal-test-traits": "^2.0"
     },
@@ -57,6 +58,9 @@
             "composer/installers": true,
             "drupal/core-composer-scaffold": true,
             "phpstan/extension-installer": true
+        },
+        "audit": {
+            "abandoned": "report"
         }
     },
     "extra": {

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/config_ignore.settings.yml b/conf/cmi/config_ignore.settings.yml
@@ -1,11 +1,12 @@
+mode: simple
 ignored_config_entities:
-  - 'system.site:page.front'
-  - 'hdbt_admin_tools.site_settings:site_settings'
   - 'easy_breadcrumb.settings:home_segment_title'
   - hdbt_admin_tools.site_settings
+  - 'hdbt_admin_tools.site_settings:site_settings'
   - paatokset_ahjo_api.default_texts
-  - paatokset_ahjo_proxy.blacklist
   - 'paatokset_ahjo_api.disallowed_decisions.*'
+  - paatokset_ahjo_api.policymaker_labels
   - paatokset_ahjo_openid.settings
+  - paatokset_ahjo_proxy.blacklist
   - paatokset_ahjo_proxy.settings
-  - paatokset_ahjo_api.policymaker_labels
+  - 'system.site:page.front'
diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -128,9 +128,9 @@ content:
     third_party_settings: {  }
   simple_sitemap:
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
   status:
     type: boolean_checkbox
     weight: 12

diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml
@@ -42,8 +42,8 @@ content:
     weight: 4
     region: content
     settings:
-      linkit_auto_link_text: false
       linkit_profile: helfi
+      linkit_auto_link_text: false
     third_party_settings: {  }
   field_banner_link_design:
     type: design_field_widget

diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -11,7 +11,6 @@ module:
   breakpoint: 0
   ckeditor: 0
   config: 0
-  config_filter: 0
   config_ignore: 0
   config_rewrite: 0
   config_translation: 0

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -8,8 +8,8 @@ id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
 description: ''
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml
@@ -8,8 +8,8 @@ id: helfi_news_groups
 label: 'Helfi: News groups'
 label_plural: 'Helfi: News groups'
 description: 'Retrieves news groups taxonomy terms from Helfi'
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml
@@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods
 label: 'Helfi: News neighbourhoods'
 label_plural: 'Helfi: News neighbourhoods'
 description: 'Retrieves news neighbourhoods taxonomy terms from Helfi'
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml
@@ -8,8 +8,8 @@ id: helfi_news_tags
 label: 'Helfi: News tags'
 label_plural: 'Helfi: News tags'
 description: 'Retrieves news tags taxonomy terms from Helfi'
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/social_media.settings.yml b/conf/cmi/social_media.settings.yml
@@ -1,3 +1,6 @@
+_core:
+  default_config_hash: AyqoIo0GS3jnXfsBkJZCiVA4WsqNkQItXRfQMmg91jI
+langcode: en
 social_media:
   facebook_share:
     enable: 1
@@ -10,85 +13,82 @@ social_media:
     drupalSettings: ''
     library: ''
     img: facebook
+  facebook_msg:
+    enable: 0
+    text: 'Facebook messenger'
+    api_url: 'FB.ui({method: ''send'',link: ''[current-page:url]''})'
+    api_event: onclick
+    default_img: 1
+    weight: 2
+    attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer"
+    drupalSettings: 'application_id|Your Application ID'
+    library: social_media/facebook
+    img: ''
   linkedin:
     enable: 1
+    text: 'Share in Linkedin'
     api_url: 'http://www.linkedin.com/shareArticle?mini=true&url=[current-page:url]&title=[current-page:title]&source=[current-page:url]'
     api_event: href
-    text: 'Share in Linkedin'
     default_img: 0
-    weight: '3'
+    weight: 3
     attributes: "target|_blank\r\nclass|linkedin"
     drupalSettings: ''
     library: ''
     img: linkedin
   twitter:
     enable: 1
+    text: 'Share in Twitter'
     api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]'
     api_event: href
-    text: 'Share in Twitter'
     default_img: 0
     weight: 3
     attributes: "target|_blank\r\nclass|twitter"
     drupalSettings: ''
     library: ''
     img: twitter
-  email:
-    enable: 1
-    api_url: 'mailto:?subject=[current-page:title]&body=Check out this site [current-page:url]'
-    api_event: href
-    text: 'Send as an email'
-    default_img: 0
-    weight: 7
-    attributes: class|email
-    drupalSettings: ''
-    library: ''
-    img: email
-    enable_forward: 0
-    show_forward: '1'
-  facebook_msg:
-    enable: 0
-    api_url: 'FB.ui({method: ''send'',link: ''[current-page:url]''})'
-    api_event: onclick
-    drupalSettings: 'application_id|Your Application ID'
-    library: social_media/facebook
-    text: 'Facebook messenger'
-    default_img: 1
-    img: ''
-    weight: 2
-    attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer"
   pinterest:
     enable: 0
+    text: Pinterest
     api_url: 'https://www.pinterest.com/pin/create/button/?url=[current-page:url]&description=[current-page:title]'
     api_event: href
-    drupalSettings: ''
-    library: ''
-    text: Pinterest
     default_img: 1
-    img: ''
     weight: 5
     attributes: "target|_blank\r\nclass|pinterest\r\nrel|noopener noreferrer"
+    drupalSettings: ''
+    library: ''
+    img: ''
   whatsapp:
     enable: 0
+    text: ''
     api_url: 'https://wa.me/?text=[current-page:url]'
     api_event: href
-    drupalSettings: ''
-    library: ''
-    text: ''
     default_img: 1
-    img: ''
     weight: 6
     attributes: "class|whatsapp show-for-small-only\r\ndata-action|share/whatsapp/share"
+    drupalSettings: ''
+    library: ''
+    img: ''
+  email:
+    enable: 1
+    text: 'Send as an email'
+    api_url: 'mailto:?subject=[current-page:title]&body=Check out this site [current-page:url]'
+    api_event: href
+    default_img: 0
+    weight: 7
+    attributes: class|email
+    drupalSettings: ''
+    library: ''
+    img: email
+    enable_forward: 0
+    show_forward: 1
   print:
     enable: 0
+    text: Print
     api_url: window.print()
     api_event: onclick
-    drupalSettings: ''
-    library: ''
-    text: Print
     default_img: 1
-    img: ''
     weight: 8
     attributes: class|print
-langcode: en
-_core:
-  default_config_hash: AyqoIo0GS3jnXfsBkJZCiVA4WsqNkQItXRfQMmg91jI
+    drupalSettings: ''
+    library: ''
+    img: ''
diff --git a/conf/cmi/views.view.editoria11y_dismissals.yml b/conf/cmi/views.view.editoria11y_dismissals.yml
@@ -1,3 +1,4 @@
+uuid: df8e6795-964b-40da-a39d-dbd078dc5d5d
 langcode: en
 status: true
 dependencies:

diff --git a/conf/cmi/views.view.editoria11y_results.yml b/conf/cmi/views.view.editoria11y_results.yml
@@ -1,3 +1,4 @@
+uuid: 6e06d84e-df78-407f-8d3e-c741d910b024
 langcode: en
 status: true
 dependencies:

diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
@@ -360,13 +360,13 @@ display:
     display_plugin: block
     position: 1
     display_options:
-      display_extenders: {  }
       pager:
         type: none
         options:
           offset: 0
       defaults:
         pager: false
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       # Optionally, you can add this to your default environments variables to enable or disable
       # xdebug by default (like /etc/environments, ~/.bashrc, or ~/.zshrc).
       XDEBUG_ENABLE: "${XDEBUG_ENABLE:-false}"
+      XDEBUG_CONFIG: "${XDEBUG_CONFIG:-}"
+      PHP_IDE_CONFIG: "${PHP_IDE_CONFIG:-serverName=${DRUPAL_HOSTNAME}}"
       # DOCKERHOST: host.docker.internal
       # Use drush server to run functional tests, so we don't have to care about
       # permission or SSL issues.
@@ -121,7 +123,7 @@ services:
     container_name: "${COMPOSE_PROJECT_NAME}-artemis"
     image: quay.io/artemiscloud/activemq-artemis-broker
     environment:
-      AMQ_EXTRA_ARGS: "--nio --user admin --password admin"
+      AMQ_EXTRA_ARGS: "--user admin --password admin"
     depends_on:
       - app
     networks:

diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -121,7 +121,7 @@ function drupal_get_env(string|array $variables) : mixed {
   }
   $settings['reverse_proxy'] = TRUE;
   $settings['reverse_proxy_addresses'] = $reverse_proxy_address;
-  $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_ALL;
+  $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO;
   $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST';
 }
 

diff --git a/tools/commit-msg b/tools/commit-msg
@@ -4,12 +4,13 @@
 # feature/PROJECT-1234-test-test
 # PROJECT-1234-test-test
 # PROJECT-1234_test_test
+# fixup! (for git rebase --autosquash)
 id=$(echo `git rev-parse --abbrev-ref HEAD` | sed -nE 's|([a-z]+/)?([A-Z]+-[0-9]+)(-.+)?(_.+)?|\2|p')
 COMMIT_MESSAGE=$(cat $1)
 
 # Only prepare commit message if pattern matched and Jira ID was found and
 # message doesn't contain Jira ID already.
-if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]]; then
+if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]] && [[ $COMMIT_MESSAGE != "fixup!"* ]]; then
   # $1 is the name of the file containing the commit message
   # Prepend "ABCD-123: "
   sed -i.bak -E "1s/^/${id}: /" $1

diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
@@ -6,7 +6,12 @@ endif
 DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli
 
 OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')
+
+SYNC_TARGETS := drush-sync-db
+
+ifneq ($(DUMP_SQL_EXISTS),yes)
 SYNC_TARGETS := oc-login oc-sync
+endif
 
 PHONY += oc-login
 oc-login: