Update configuration

City-of-Helsinki · Apr 5, 2024 · d98983b · d98983b
1 parent 3fba364
commit d98983b
Show file tree

Hide file tree

Showing 16 changed files with 391 additions and 235 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -42,6 +42,9 @@
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -7,6 +7,8 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
   module:
     - allowed_formats
@@ -19,15 +21,15 @@ dependencies:
     - readonly_field_widget
     - text
 _core:
-  default_config_hash: u4cfdWUfiLgxWmusemjNf4p9sa_VCrlVLyYe8slNTEk
+  default_config_hash: rWjpesn9mLPiT19k4RZ1DEjahx07CnmM2G6kg47-IFE
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
 mode: default
 content:
   accessibility_email:
     type: readonly_field_widget
-    weight: 12
+    weight: 14
     region: content
     settings:
       label: above
@@ -37,7 +39,7 @@ content:
     third_party_settings: {  }
   accessibility_phone:
     type: readonly_field_widget
-    weight: 11
+    weight: 13
     region: content
     settings:
       label: above
@@ -47,7 +49,7 @@ content:
     third_party_settings: {  }
   accessibility_www:
     type: readonly_field_widget
-    weight: 17
+    weight: 19
     region: content
     settings:
       label: above
@@ -57,7 +59,7 @@ content:
     third_party_settings: {  }
   address:
     type: readonly_field_widget
-    weight: 20
+    weight: 22
     region: content
     settings:
       label: above
@@ -67,7 +69,7 @@ content:
     third_party_settings: {  }
   address_postal:
     type: readonly_field_widget
-    weight: 21
+    weight: 24
     region: content
     settings:
       label: above
@@ -77,7 +79,7 @@ content:
     third_party_settings: {  }
   call_charge_info:
     type: readonly_field_widget
-    weight: 20
+    weight: 23
     region: content
     settings:
       label: above
@@ -87,7 +89,7 @@ content:
     third_party_settings: {  }
   contacts:
     type: readonly_field_widget
-    weight: 39
+    weight: 43
     region: content
     settings:
       label: above
@@ -97,7 +99,7 @@ content:
     third_party_settings: {  }
   description:
     type: readonly_field_widget
-    weight: 18
+    weight: 20
     region: content
     settings:
       label: above
@@ -107,7 +109,7 @@ content:
     third_party_settings: {  }
   email:
     type: readonly_field_widget
-    weight: 10
+    weight: 12
     region: content
     settings:
       label: above
@@ -117,7 +119,7 @@ content:
     third_party_settings: {  }
   enrich_description:
     type: text_textarea
-    weight: 19
+    weight: 21
     region: content
     settings:
       rows: 5
@@ -128,7 +130,7 @@ content:
         hide_guidelines: '1'
   field_content:
     type: paragraphs
-    weight: 28
+    weight: 31
     region: content
     settings:
       title: Paragraph
@@ -147,7 +149,7 @@ content:
     third_party_settings: {  }
   field_lower_content:
     type: paragraphs
-    weight: 29
+    weight: 33
     region: content
     settings:
       title: Paragraph
@@ -166,15 +168,30 @@ content:
     third_party_settings: {  }
   field_metatags:
     type: metatag_firehose
-    weight: 27
+    weight: 30
     region: content
     settings:
       sidebar: false
       use_details: true
     third_party_settings: {  }
+  field_phone_label:
+    type: string_textfield
+    weight: 11
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_phone_with_contacts:
+    type: boolean_checkbox
+    weight: 10
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
-    weight: 30
+    weight: 34
     region: content
     settings:
       match_operator: CONTAINS
@@ -184,14 +201,14 @@ content:
     third_party_settings: {  }
   hide_sidebar_navigation:
     type: boolean_checkbox
-    weight: 31
+    weight: 35
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   highlights:
     type: readonly_field_widget
-    weight: 36
+    weight: 40
     region: content
     settings:
       label: above
@@ -208,7 +225,7 @@ content:
     third_party_settings: {  }
   latitude:
     type: readonly_field_widget
-    weight: 22
+    weight: 25
     region: content
     settings:
       label: above
@@ -218,7 +235,7 @@ content:
     third_party_settings: {  }
   links:
     type: readonly_field_widget
-    weight: 33
+    weight: 37
     region: content
     settings:
       label: above
@@ -228,7 +245,7 @@ content:
     third_party_settings: {  }
   longitude:
     type: readonly_field_widget
-    weight: 23
+    weight: 26
     region: content
     settings:
       label: above
@@ -256,7 +273,7 @@ content:
     third_party_settings: {  }
   opening_hours:
     type: readonly_field_widget
-    weight: 35
+    weight: 39
     region: content
     settings:
       label: above
@@ -266,7 +283,7 @@ content:
     third_party_settings: {  }
   other_info:
     type: readonly_field_widget
-    weight: 37
+    weight: 41
     region: content
     settings:
       label: above
@@ -276,7 +293,7 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 16
+    weight: 18
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -309,7 +326,7 @@ content:
     third_party_settings: {  }
   price_info:
     type: readonly_field_widget
-    weight: 38
+    weight: 42
     region: content
     settings:
       label: above
@@ -319,7 +336,7 @@ content:
     third_party_settings: {  }
   provided_languages:
     type: readonly_field_widget
-    weight: 32
+    weight: 36
     region: content
     settings:
       label: above
@@ -329,7 +346,7 @@ content:
     third_party_settings: {  }
   service_map_embed:
     type: readonly_field_widget
-    weight: 25
+    weight: 28
     region: content
     settings:
       label: above
@@ -339,7 +356,7 @@ content:
     third_party_settings: {  }
   services:
     type: readonly_field_widget
-    weight: 26
+    weight: 29
     region: content
     settings:
       label: above
@@ -349,19 +366,19 @@ content:
     third_party_settings: {  }
   show_www:
     type: boolean_checkbox
-    weight: 15
+    weight: 17
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   simple_sitemap:
-    weight: 14
+    weight: 16
     region: content
     settings: {  }
     third_party_settings: {  }
   streetview_entrance_url:
     type: readonly_field_widget
-    weight: 24
+    weight: 27
     region: content
     settings:
       label: above
@@ -386,7 +403,7 @@ content:
     third_party_settings: {  }
   topical:
     type: readonly_field_widget
-    weight: 34
+    weight: 38
     region: content
     settings:
       label: above
@@ -409,7 +426,7 @@ content:
     third_party_settings: {  }
   www:
     type: readonly_field_widget
-    weight: 13
+    weight: 15
     region: content
     settings:
       label: above

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -7,6 +7,8 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
   module:
@@ -19,7 +21,7 @@ dependencies:
     - telephone
     - text
 _core:
-  default_config_hash: 8GmiJoVZmgbZpZ9jGuNv_AQg3EgThOq06AsznzuWOGk
+  default_config_hash: KKLuQo4x7W4plteNKkenZDXlAFJZq_JIKLNpkVpMvY0
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -135,6 +137,24 @@ content:
     third_party_settings: {  }
     weight: 17
     region: content
+  field_phone_label:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 31
+    region: content
+  field_phone_with_contacts:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 33
+    region: content
   highlights:
     type: tpr_connection
     label: hidden

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
@@ -8,12 +8,14 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_phone_label
+    - field.field.tpr_unit.tpr_unit.field_phone_with_contacts
     - field.field.tpr_unit.tpr_unit.field_unit_type
   module:
     - address
     - helfi_tpr
 _core:
-  default_config_hash: f5AGkO_5_TgZ9InGKOLMyzbGFaCCTKeiPJYeGuTLnq0
+  default_config_hash: hyQdtfnFAHflVh30neHIGf5Q1EQKwQ6Fh8L40BGc6Q4
 id: tpr_unit.tpr_unit.minimal
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -58,6 +60,8 @@ hidden:
   field_districts: true
   field_lower_content: true
   field_metatags: true
+  field_phone_label: true
+  field_phone_with_contacts: true
   field_unit_type: true
   hide_description: true
   highlights: true