Browse Source

upgraded core, fixed customs modules

bach 2 years ago
parent
commit
1f07e66fe6
82 changed files with 623 additions and 599 deletions
  1. 20 14
      composer.json
  2. 187 400
      composer.lock
  3. 0 1
      config/sync/core.extension.yml
  4. 17 1
      config/sync/language/en/webform.webform.multi_joueur.yml
  5. 7 1
      config/sync/matomo.settings.yml
  6. 6 7
      config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml
  7. 6 7
      config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml
  8. 0 0
      config/sync/search_api_solr.solr_field_type.text_fr_6_0_0.yml
  9. 0 0
      config/sync/search_api_solr.solr_field_type.text_fr_7_0_0.yml
  10. 0 3
      config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml
  11. 0 3
      config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml
  12. 4 1
      config/sync/simplenews.settings.yml
  13. 0 9
      config/sync/toolbar_themes.settings.yml
  14. 8 2
      config/sync/views.view.advancedqueue_jobs.yml
  15. 3 1
      config/sync/views.view.content_translations.yml
  16. 49 9
      config/sync/webform.settings.yml
  17. 0 0
      config/sync/webform.webform.contact.yml
  18. 0 0
      config/sync/webform.webform.multi_joueur.yml
  19. 8 1
      config/sync/webform.webform_options.days.yml
  20. 5 1
      config/sync/webform.webform_options.education.yml
  21. 6 1
      config/sync/webform.webform_options.employment_status.yml
  22. 9 1
      config/sync/webform.webform_options.ethnicity.yml
  23. 0 0
      config/sync/webform.webform_options.gender.yml
  24. 0 0
      config/sync/webform.webform_options.industry.yml
  25. 6 1
      config/sync/webform.webform_options.likert_agreement.yml
  26. 6 1
      config/sync/webform.webform_options.likert_comparison.yml
  27. 6 1
      config/sync/webform.webform_options.likert_importance.yml
  28. 6 1
      config/sync/webform.webform_options.likert_quality.yml
  29. 6 1
      config/sync/webform.webform_options.likert_satisfaction.yml
  30. 11 1
      config/sync/webform.webform_options.likert_ten_scale.yml
  31. 6 1
      config/sync/webform.webform_options.likert_would_you.yml
  32. 5 1
      config/sync/webform.webform_options.marital_status.yml
  33. 13 1
      config/sync/webform.webform_options.months.yml
  34. 4 1
      config/sync/webform.webform_options.phone_types.yml
  35. 14 1
      config/sync/webform.webform_options.province_codes.yml
  36. 14 1
      config/sync/webform.webform_options.province_names.yml
  37. 6 1
      config/sync/webform.webform_options.relationship.yml
  38. 3 1
      config/sync/webform.webform_options.sex.yml
  39. 4 1
      config/sync/webform.webform_options.sex_icao.yml
  40. 6 1
      config/sync/webform.webform_options.size.yml
  41. 0 0
      config/sync/webform.webform_options.state_codes.yml
  42. 0 0
      config/sync/webform.webform_options.state_names.yml
  43. 0 0
      config/sync/webform.webform_options.state_province_codes.yml
  44. 0 0
      config/sync/webform.webform_options.state_province_names.yml
  45. 6 1
      config/sync/webform.webform_options.titles.yml
  46. 3 1
      config/sync/webform.webform_options.yes_no.yml
  47. 1 0
      web/.gitignore
  48. 5 5
      web/.htaccess
  49. 1 1
      web/modules/custom/editors_menus/editors_menus.info.yml
  50. 1 1
      web/modules/custom/images_styles_gen/images_styles_gen.info.yml
  51. 1 1
      web/modules/custom/materio_commerce/materio_commerce.info.yml
  52. 1 1
      web/modules/custom/materio_decoupled/materio_decoupled.info.yml
  53. 1 1
      web/modules/custom/materio_decoupled/src/Controller/AjaxHeaderMenuBlock.php
  54. 1 1
      web/modules/custom/materio_expo/materio_expo.info.yml
  55. 1 1
      web/modules/custom/materio_flag/materio_flag.info.yml
  56. 1 2
      web/modules/custom/materio_graphql/materio_graphql.info.yml
  57. 1 1
      web/modules/custom/materio_home/materio_home.info.yml
  58. 1 10
      web/modules/custom/materio_home/src/Controller/AjaxHomeController.php
  59. 1 1
      web/modules/custom/materio_id/materio_id.info.yml
  60. 1 1
      web/modules/custom/materio_jsonapi/materio_jsonapi.info.yml
  61. 1 1
      web/modules/custom/materio_migrate/materio_migrate.info.yml
  62. 1 1
      web/modules/custom/materio_samples/materio_samples.info.yml
  63. 1 1
      web/modules/custom/materio_sapi/materio_sapi.info.yml
  64. 1 1
      web/modules/custom/materio_sapi/src/Controller/Base.php
  65. 1 1
      web/modules/custom/materio_simplenews/materio_simplenews.info.yml
  66. 1 1
      web/modules/custom/materio_user/materio_user.info.yml
  67. 5 3
      web/modules/custom/materio_user/materio_user.module
  68. 1 1
      web/modules/custom/materio_user/src/Controller/AjaxLoginBlock.php
  69. 44 0
      web/modules/custom/materio_user/src/MaterioUserLoginBlockAlterRender.php
  70. 1 1
      web/modules/custom/rest_config/rest_config.info.yml
  71. 0 1
      web/modules/custom/vue_link_formatter/vue_link_formatter.info.yml
  72. 1 1
      web/modules/dev/migrate_booster/migrate_booster.info.yml
  73. 8 8
      web/robots.txt
  74. 24 9
      web/sites/default/default.services.yml
  75. 50 43
      web/sites/default/default.settings.php
  76. 1 1
      web/sites/example.settings.local.php
  77. 1 1
      web/sites/example.sites.php
  78. 1 1
      web/themes/custom/materiotheme/assets/dist/report.html
  79. 1 1
      web/themes/custom/materiotheme/materiotheme.info.yml
  80. 1 1
      web/themes/custom/matminimal/matminimal.info.yml
  81. 0 1
      web/update.php
  82. 0 12
      web/web.config

+ 20 - 14
composer.json

@@ -62,22 +62,23 @@
         "ckeditor-plugin/colorbutton": "4.16.2",
         "ckeditor-plugin/panelbutton": "4.16.2",
         "composer/installers": "^1.2",
+        "drupal/address": "^1.10",
         "drupal/admin_theme": "1.x-dev@dev",
         "drupal/advagg": "4.x-dev@dev",
         "drupal/allowed_formats": "^1",
         "drupal/amswap": "^3.0",
         "drupal/audiofield": "^1.10",
-        "drupal/auto_entitylabel": "^2.x-dev",
+        "drupal/auto_entitylabel": "3.x-dev@dev",
         "drupal/better_messages": "^2.0@alpha",
         "drupal/ckeditor_codemirror": "^2.3",
         "drupal/ckeditor_font": "^1.2",
         "drupal/ckeditor_uploadimage": "^2.0",
         "drupal/colorbutton": "^1.3",
-        "drupal/commerce": "^2.22",
+        "drupal/commerce": "^2.29.0",
         "drupal/commerce_cart_api": "^1.4",
         "drupal/commerce_cart_redirection": "^3.0",
         "drupal/commerce_license": "2.x-dev@dev",
-        "drupal/commerce_migrate": "^2.0",
+        "drupal/commerce_migrate": "^3",
         "drupal/commerce_monetico": "^1.0",
         "drupal/commerce_pricelist": "2.x-dev",
         "drupal/commerce_recurring": "^1.x-dev",
@@ -90,8 +91,9 @@
         "drupal/console": "^1.0.2",
         "drupal/consumer_image_styles": "^4.0",
         "drupal/content_sync": "2.x-dev@dev",
-        "drupal/core": "8.9.19",
-        "drupal/core-composer-scaffold": "^9.0",
+        "drupal/core-recommended": "^9",
+        "drupal/core-composer-scaffold": "^9",
+        "drupal/core-project-message": "^9",
         "drupal/ctools": "^3.6",
         "drupal/debug_bar": "^1.4",
         "drupal/devel": "^4.1",
@@ -112,7 +114,7 @@
         "drupal/image_delta_formatter": "^1.x-dev",
         "drupal/image_effects": "3.x-dev@dev",
         "drupal/jsonapi_extras": "^3.7",
-        "drupal/jsonrpc": "^1.x-dev",
+        "drupal/jsonrpc": "^2.0",
         "drupal/login_destination": "2.x-dev@dev",
         "drupal/login_history": "^1.x-dev",
         "drupal/login_tracker": "^1.4",
@@ -126,7 +128,6 @@
         "drupal/modules_weight": "^1.8",
         "drupal/password_policy": "^3.0",
         "drupal/payment": "^2.1",
-        "drupal/payment_commerce": "2.x-dev@dev",
         "drupal/permissions_filter": "^1.1",
         "drupal/printable": "^2.0",
         "drupal/pwa": "^1.5",
@@ -152,7 +153,6 @@
         "drupal/telephone_formatter": "^1.0@beta",
         "drupal/telephone_validation": "^2.1",
         "drupal/term_reference_tree": "^1",
-        "drupal/toolbar_themes": "^1.0@alpha",
         "drupal/translate_side_by_side": "^1.x-dev",
         "drupal/translation_views": "^1.x-dev",
         "drupal/ultimate_cron": "^2.x-dev",
@@ -167,7 +167,6 @@
         "drush/drush": "^10.6",
         "kint-php/kint": "^3.3",
         "smalot/pdfparser": "*",
-        "symfony/event-dispatcher": "4.3.4 as 3.4.99",
         "vlucas/phpdotenv": "^2.4",
         "w8tcha/ckeditor_codemirror": "v1.17.8",
         "wa72/htmlpagedom": "1.3.*",
@@ -186,7 +185,16 @@
         "platform": {
           "php": "7.3"
         },
-        "discard-changes": true
+        "discard-changes": true,
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "drupal/console-extend-plugin": true,
+            "drupal/core-composer-scaffold": true,
+            "wikimedia/composer-merge-plugin": true,
+            "zaporylie/composer-drupal-optimizations": true,
+            "drupal/core-project-message": true
+        }
     },
     "autoload": {
         "classmap": [
@@ -233,15 +241,13 @@
         "patches": {
             "drupal/core": {
               "migrate_drupal getsetting on null" : "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch",
-              "language negociation exeption https://www.drupal.org/project/drupal/issues/3134349" : "https://www.drupal.org/files/issues/2020-06-02/3134349-9.patch",
               "Cannot save translated nodes after upgrading to 8.8 due to invalid path https://www.drupal.org/project/drupal/issues/3101344":"https://www.drupal.org/files/issues/2021-03-01/3101344-drupal-core-fix-permissions-checking-while-node-translating-64.patch",
               "ConfigImporter->checkOp() https://www.drupal.org/project/drupal/issues/3198715": "https://www.drupal.org/files/issues/2021-02-16/error-running-config-import-delete-on-null-3198715-3.patch",
               "Entity view/form mode formatter/widget settings have no translation UI 1 https://www.drupal.org/project/drupal/issues/2546212": "https://www.drupal.org/files/issues/2020-12-04/2546212-168-actions.patch",
-              "Entity view/form mode formatter/widget settings have no translation UI 2 https://www.drupal.org/project/drupal/issues/2546212": "https://www.drupal.org/files/issues/2020-12-04/2546212-168.patch",
-              "Register a user without email verification should still send an email https://www.drupal.org/project/drupal/issues/3002019": "https://www.drupal.org/files/issues/2019-08-30/3002019-n11.patch"
+              "Entity view/form mode formatter/widget settings have no translation UI 2 https://www.drupal.org/project/drupal/issues/2546212": "https://www.drupal.org/files/issues/2020-12-04/2546212-168.patch"
             },
             "drupal/email_registration": {
-              "allow email login through REST https://www.drupal.org/project/email_registration/issues/2856542": "https://www.drupal.org/files/issues/allow_authentication-2856542-3.patch"
+              "allow email login through REST https://www.drupal.org/project/email_registration/issues/2856542": "https://www.drupal.org/files/issues/2021-06-11/2856542-13.patch"
             },
             "drupal/field_group": {
               "undefined index name 18 https://www.drupal.org/project/field_group/issues/3064890" : "https://www.drupal.org/files/issues/2020-10-01/field_group-undefined-index-name-3064890-18.patch",

File diff suppressed because it is too large
+ 187 - 400
composer.lock


+ 0 - 1
config/sync/core.extension.yml

@@ -213,7 +213,6 @@ module:
   text: 0
   token: 0
   toolbar: 0
-  toolbar_themes: 0
   translation_views: 0
   typed_data: 0
   ultimate_cron: 0

+ 17 - 1
config/sync/language/en/webform.webform.multi_joueur.yml

@@ -1,3 +1,19 @@
-elements: "address:\n  '#default_value':\n    additional_name: ''\n    dependent_locality: ''\n    administrative_area: ''\nvat_number:\n  '#title': 'VAT number'\n  '#description': 'Intra-community VAT number'\nphone:\n  '#title': Phone\ncollaborateur:\n  '#title': Collaborators\ncommentaires:\n  '#title': Comments\nactions:\n  '#submit__label': 'Ask for a quote'\n"
+elements: |
+  address:
+    '#default_value':
+      additional_name: ''
+      dependent_locality: ''
+      administrative_area: ''
+  vat_number:
+    '#title': 'VAT number'
+    '#description': 'Intra-community VAT number'
+  phone:
+    '#title': Phone
+  collaborateur:
+    '#title': Collaborators
+  commentaires:
+    '#title': Comments
+  actions:
+    '#submit__label': 'Ask for a quote'
 settings:
   confirmation_message: "Your quote request has been registered, we are already drafting it and will send it to you by email very quickly.<br />\r\n<br />\r\n<a href=\"/\">back to materiO&#39;</a>"

+ 7 - 1
config/sync/matomo.settings.yml

@@ -4,7 +4,13 @@ url_https: ''
 domain_mode: 0
 visibility:
   request_path_mode: 0
-  request_path_pages: "/admin\n/admin/*\n/batch\n/node/add*\n/node/*/*\n/user/*/*"
+  request_path_pages: |-
+    /admin
+    /admin/*
+    /batch
+    /node/add*
+    /node/*/*
+    /user/*/*
   user_role_mode: 0
   user_role_roles: {  }
   user_account_mode: 1

File diff suppressed because it is too large
+ 6 - 7
config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml


File diff suppressed because it is too large
+ 6 - 7
config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml


File diff suppressed because it is too large
+ 0 - 0
config/sync/search_api_solr.solr_field_type.text_fr_6_0_0.yml


File diff suppressed because it is too large
+ 0 - 0
config/sync/search_api_solr.solr_field_type.text_fr_7_0_0.yml


File diff suppressed because it is too large
+ 0 - 3
config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml


File diff suppressed because it is too large
+ 0 - 3
config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml


+ 4 - 1
config/sync/simplenews.settings.yml

@@ -10,7 +10,10 @@ subscriber:
 subscription:
   use_combined: multiple
   confirm_subscribe_subject: 'Confirmation for [simplenews-newsletter:name] from [site:name]'
-  confirm_subscribe_unsubscribed: "We have received a request to subscribe [simplenews-subscriber:mail] to the [simplenews-newsletter:name] newsletter on [site:name] website at [site:url]. To confirm please use the link below. \n\n [simplenews-subscriber:subscribe-url]"
+  confirm_subscribe_unsubscribed: |-
+    We have received a request to subscribe [simplenews-subscriber:mail] to the [simplenews-newsletter:name] newsletter on [site:name] website at [site:url]. To confirm please use the link below. 
+
+     [simplenews-subscriber:subscribe-url]
   confirm_subscribe_subscribed: 'We have received a request to subscribe [simplenews-subscriber:mail] to the [simplenews-newsletter:name]  newsletter on [site:name] website at [site:url]. However, this email is already subscribed to this newsletter. If you intended to unsubscribe please visit our site: [site:url]'
   confirm_unsubscribe_subscribed: "We have received a request to remove the [simplenews-subscriber:mail] from the [simplenews-newsletter:name] mailing list on [site:name] website at [site:url]. To confirm please use the link below.\r\n\r\n[simplenews-subscriber:unsubscribe-url]"
   confirm_unsubscribe_unsubscribed: 'We have received a request to remove the [simplenews-subscriber:mail] from the [simplenews-newsletter:name] mailing list on [site:name] website at [site:url]. However, this email is not subscribed to this mailing list. If you intended to subscribe please visit our site at [site:url]'

+ 0 - 9
config/sync/toolbar_themes.settings.yml

@@ -1,9 +0,0 @@
-default_theme: toolbar_admin_menu
-icons: 1
-tabs: 0
-langcode: fr
-actions:
-  submit: Submit
-font_size: '10'
-_core:
-  default_config_hash: UQGpThfrfKtfOVtSxUzIgnTR2YS-fh2LI933lLYQJhg

+ 8 - 2
config/sync/views.view.advancedqueue_jobs.yml

@@ -277,7 +277,10 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "{{ state }}\n\n{{ num_retries }}"
+            text: |-
+              {{ state }}
+
+              {{ num_retries }}
             make_link: false
             path: ''
             absolute: false
@@ -477,7 +480,10 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "{{ processed }}\n\n{{ message }}"
+            text: |-
+              {{ processed }}
+
+              {{ message }}
             make_link: false
             path: ''
             absolute: false

+ 3 - 1
config/sync/views.view.content_translations.yml

@@ -366,7 +366,9 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "<span class=\"status\">{{ translation_status }}</span>\n{% if translation_outdated  %} <span class=\"marker\">{{ 'outdated'|t }}</span>{% endif %}"
+            text: |-
+              <span class="status">{{ translation_status }}</span>
+              {% if translation_outdated  %} <span class="marker">{{ 'outdated'|t }}</span>{% endif %}
             make_link: false
             path: ''
             absolute: false

File diff suppressed because it is too large
+ 49 - 9
config/sync/webform.settings.yml


File diff suppressed because it is too large
+ 0 - 0
config/sync/webform.webform.contact.yml


File diff suppressed because it is too large
+ 0 - 0
config/sync/webform.webform.multi_joueur.yml


+ 8 - 1
config/sync/webform.webform_options.days.yml

@@ -11,4 +11,11 @@ id: days
 label: Days
 category: 'Date and time'
 likert: false
-options: "Sunday: Sunday\nMonday: Monday\nTuesday: Tuesday\nWednesday: Wednesday\nThursday: Thursday\nFriday: Friday\nSaturday: Saturday\n"
+options: |
+  Sunday: Sunday
+  Monday: Monday
+  Tuesday: Tuesday
+  Wednesday: Wednesday
+  Thursday: Thursday
+  Friday: Friday
+  Saturday: Saturday

+ 5 - 1
config/sync/webform.webform_options.education.yml

@@ -11,4 +11,8 @@ id: education
 label: Education
 category: Demographic
 likert: false
-options: "High School: High School\nAssociate Degree: Associate Degree\nGraduate or Professional Degree: Graduate or Professional Degree\nSome College: Some College\n"
+options: |
+  High School: High School
+  Associate Degree: Associate Degree
+  Graduate or Professional Degree: Graduate or Professional Degree
+  Some College: Some College

+ 6 - 1
config/sync/webform.webform_options.employment_status.yml

@@ -11,4 +11,9 @@ id: employment_status
 label: 'Employment status'
 category: Demographic
 likert: false
-options: "'Full Time': 'Full Time'\n'Part Time': 'Part Time'\n'Military': 'Military'\nUnemployed: Unemployed\nRetired: Retired\n"
+options: |
+  'Full Time': 'Full Time'
+  'Part Time': 'Part Time'
+  'Military': 'Military'
+  Unemployed: Unemployed
+  Retired: Retired

+ 9 - 1
config/sync/webform.webform_options.ethnicity.yml

@@ -11,4 +11,12 @@ id: ethnicity
 label: Ethnicity
 category: Demographic
 likert: false
-options: "Caucasian: Caucasian\n'Latino/Hispanic': 'Latino/Hispanic'\n'Middle Eastern': 'Middle Eastern'\nAfrican: African\nCaribbean: Caribbean\n'South Asian': 'South Asian'\n'East Asian': 'East Asian'\nMixed: Mixed\n"
+options: |
+  Caucasian: Caucasian
+  'Latino/Hispanic': 'Latino/Hispanic'
+  'Middle Eastern': 'Middle Eastern'
+  African: African
+  Caribbean: Caribbean
+  'South Asian': 'South Asian'
+  'East Asian': 'East Asian'
+  Mixed: Mixed

File diff suppressed because it is too large
+ 0 - 0
config/sync/webform.webform_options.gender.yml


File diff suppressed because it is too large
+ 0 - 0
config/sync/webform.webform_options.industry.yml


+ 6 - 1
config/sync/webform.webform_options.likert_agreement.yml

@@ -11,4 +11,9 @@ id: likert_agreement
 label: 'Likert: Agreement'
 category: Likert
 likert: true
-options: "1: 'Much Worse'\n2: 'Somewhat Worse'\n3: 'About the Same'\n4: 'Somewhat Better'\n5: 'Much Better'\n"
+options: |
+  1: 'Much Worse'
+  2: 'Somewhat Worse'
+  3: 'About the Same'
+  4: 'Somewhat Better'
+  5: 'Much Better'

+ 6 - 1
config/sync/webform.webform_options.likert_comparison.yml

@@ -11,4 +11,9 @@ id: likert_comparison
 label: 'Likert: Comparison'
 category: Likert
 likert: true
-options: "1: Strongly Disagree\n2: Disagree\n3: Neutral\n4: Agree\n5: Strongly Agree\n"
+options: |
+  1: Strongly Disagree
+  2: Disagree
+  3: Neutral
+  4: Agree
+  5: Strongly Agree

+ 6 - 1
config/sync/webform.webform_options.likert_importance.yml

@@ -11,4 +11,9 @@ id: likert_importance
 label: 'Likert: Importance'
 category: Likert
 likert: true
-options: "1: Not at all Important\n2: Somewhat Important\n3: Neutral\n4: Important\n5: Very Important\n"
+options: |
+  1: Not at all Important
+  2: Somewhat Important
+  3: Neutral
+  4: Important
+  5: Very Important

+ 6 - 1
config/sync/webform.webform_options.likert_quality.yml

@@ -11,4 +11,9 @@ id: likert_quality
 label: 'Likert: Quality'
 category: Likert
 likert: true
-options: "1: Poor\n2: Fair\n3: Good\n4: Very good\n5: Excellent\n"
+options: |
+  1: Poor
+  2: Fair
+  3: Good
+  4: Very good
+  5: Excellent

+ 6 - 1
config/sync/webform.webform_options.likert_satisfaction.yml

@@ -11,4 +11,9 @@ id: likert_satisfaction
 label: 'Likert: Satisfaction'
 category: Likert
 likert: true
-options: "1: Very Unsatisfied\n2: Unsatisfied\n3: Neutral\n4: Satisfied\n5: Very Satisfied\n"
+options: |
+  1: Very Unsatisfied
+  2: Unsatisfied
+  3: Neutral
+  4: Satisfied
+  5: Very Satisfied

+ 11 - 1
config/sync/webform.webform_options.likert_ten_scale.yml

@@ -11,4 +11,14 @@ id: likert_ten_scale
 label: 'Likert: Ten Scale'
 category: Likert
 likert: true
-options: "1: 1\n2: 2\n3: 3\n4: 4\n5: 5\n6: 6\n7: 7\n8: 8\n9: 9\n10: 10\n"
+options: |
+  1: 1
+  2: 2
+  3: 3
+  4: 4
+  5: 5
+  6: 6
+  7: 7
+  8: 8
+  9: 9
+  10: 10

+ 6 - 1
config/sync/webform.webform_options.likert_would_you.yml

@@ -11,4 +11,9 @@ id: likert_would_you
 label: 'Likert: Would You'
 category: Likert
 likert: true
-options: "1: Definitely Not\n2: Probably Not\n3: Not Sure\n4: Probably\n5: Definitely\n"
+options: |
+  1: Definitely Not
+  2: Probably Not
+  3: Not Sure
+  4: Probably
+  5: Definitely

+ 5 - 1
config/sync/webform.webform_options.marital_status.yml

@@ -11,4 +11,8 @@ id: marital_status
 label: 'Marital status'
 category: Demographic
 likert: false
-options: "Single: Single\nMarried: Married\nDivorced: Divorced\nWidowed: Widowed\n"
+options: |
+  Single: Single
+  Married: Married
+  Divorced: Divorced
+  Widowed: Widowed

+ 13 - 1
config/sync/webform.webform_options.months.yml

@@ -11,4 +11,16 @@ id: months
 label: Months
 category: 'Date and time'
 likert: false
-options: "January: January\nFebruary: February\nMarch: March\nApril: April\nMay: May\nJune: June\nJuly: July\nAugust: August\nSeptember: September\nOctober: October\nNovember: November\nDecember: December\n"
+options: |
+  January: January
+  February: February
+  March: March
+  April: April
+  May: May
+  June: June
+  July: July
+  August: August
+  September: September
+  October: October
+  November: November
+  December: December

+ 4 - 1
config/sync/webform.webform_options.phone_types.yml

@@ -11,4 +11,7 @@ id: phone_types
 label: 'Phone type'
 category: Demographic
 likert: false
-options: "Home: Home\nOffice: Office\nCell: Cell\n"
+options: |
+  Home: Home
+  Office: Office
+  Cell: Cell

+ 14 - 1
config/sync/webform.webform_options.province_codes.yml

@@ -11,4 +11,17 @@ id: province_codes
 label: 'Province codes'
 category: Geographic
 likert: false
-options: "AB: Alberta\nBC: 'British Columbia'\nMB: Manitoba\nNB: 'New Brunswick'\nNL: 'Newfoundland and Labrador'\nNS: 'Nova Scotia'\nNT: 'Northwest Territories'\nNU: Nunavut\n'ON': Ontario\nPE: 'Prince Edward Island'\nQC: Quebec\nSK: Saskatchewan\nYT: Yukon\n"
+options: |
+  AB: Alberta
+  BC: 'British Columbia'
+  MB: Manitoba
+  NB: 'New Brunswick'
+  NL: 'Newfoundland and Labrador'
+  NS: 'Nova Scotia'
+  NT: 'Northwest Territories'
+  NU: Nunavut
+  'ON': Ontario
+  PE: 'Prince Edward Island'
+  QC: Quebec
+  SK: Saskatchewan
+  YT: Yukon

+ 14 - 1
config/sync/webform.webform_options.province_names.yml

@@ -11,4 +11,17 @@ id: province_names
 label: 'Province names'
 category: Geographic
 likert: false
-options: "Alberta: Alberta\n'British Columbia': 'British Columbia'\nManitoba: Manitoba\n'New Brunswick': 'New Brunswick'\n'Newfoundland and Labrador': 'Newfoundland and Labrador'\n'Nova Scotia': 'Nova Scotia'\n'Northwest Territories': 'Northwest Territories'\nNunavut: Nunavut\nOntario: Ontario\n'Prince Edward Island': 'Prince Edward Island'\nQuebec: Quebec\nSaskatchewan: Saskatchewan\nYukon: Yukon\n"
+options: |
+  Alberta: Alberta
+  'British Columbia': 'British Columbia'
+  Manitoba: Manitoba
+  'New Brunswick': 'New Brunswick'
+  'Newfoundland and Labrador': 'Newfoundland and Labrador'
+  'Nova Scotia': 'Nova Scotia'
+  'Northwest Territories': 'Northwest Territories'
+  Nunavut: Nunavut
+  Ontario: Ontario
+  'Prince Edward Island': 'Prince Edward Island'
+  Quebec: Quebec
+  Saskatchewan: Saskatchewan
+  Yukon: Yukon

+ 6 - 1
config/sync/webform.webform_options.relationship.yml

@@ -11,4 +11,9 @@ id: relationship
 label: Relationship
 category: Demographic
 likert: false
-options: "Parent: Parent\n'Significant Other': 'Significant Other'\nSibling: Sibling\nChild: Child\nFriend: Friend\n"
+options: |
+  Parent: Parent
+  'Significant Other': 'Significant Other'
+  Sibling: Sibling
+  Child: Child
+  Friend: Friend

+ 3 - 1
config/sync/webform.webform_options.sex.yml

@@ -11,4 +11,6 @@ id: sex
 label: Sex
 category: Demographic
 likert: false
-options: "Male: Male\nFemale: Female\n"
+options: |
+  Male: Male
+  Female: Female

+ 4 - 1
config/sync/webform.webform_options.sex_icao.yml

@@ -11,4 +11,7 @@ id: sex_icao
 label: 'Sex - International Civil Aviation Organization (ICAO)'
 category: Demographic
 likert: false
-options: "M: Male\nF: Female\nX: Unspecified\n"
+options: |
+  M: Male
+  F: Female
+  X: Unspecified

+ 6 - 1
config/sync/webform.webform_options.size.yml

@@ -11,4 +11,9 @@ id: size
 label: Size
 category: General
 likert: false
-options: "Extra Small: Extra Small\nSmall: Small\nMedium: Medium\nLarge: Large\nExtra Large: Extra Large\n"
+options: |
+  Extra Small: Extra Small
+  Small: Small
+  Medium: Medium
+  Large: Large
+  Extra Large: Extra Large

File diff suppressed because it is too large
+ 0 - 0
config/sync/webform.webform_options.state_codes.yml


File diff suppressed because it is too large
+ 0 - 0
config/sync/webform.webform_options.state_names.yml


File diff suppressed because it is too large
+ 0 - 0
config/sync/webform.webform_options.state_province_codes.yml


File diff suppressed because it is too large
+ 0 - 0
config/sync/webform.webform_options.state_province_names.yml


+ 6 - 1
config/sync/webform.webform_options.titles.yml

@@ -11,4 +11,9 @@ id: titles
 label: Titles
 category: Demographic
 likert: false
-options: "Miss: Miss\nMs: Ms\nMr: Mr\nMrs: Mrs\nDr: Dr\n"
+options: |
+  Miss: Miss
+  Ms: Ms
+  Mr: Mr
+  Mrs: Mrs
+  Dr: Dr

+ 3 - 1
config/sync/webform.webform_options.yes_no.yml

@@ -11,4 +11,6 @@ id: yes_no
 label: Yes/No
 category: General
 likert: false
-options: "Yes: Yes\nNo: No\n"
+options: |
+  Yes: Yes
+  No: No

+ 1 - 0
web/.gitignore

@@ -2,3 +2,4 @@
 /README.txt
 /example.gitignore
 /.eslintrc.json
+/README.md

+ 5 - 5
web/.htaccess

@@ -116,13 +116,13 @@ AddEncoding gzip svgz
   # RewriteBase /
 
   # Redirect common PHP files to their new locations.
-  RewriteCond %{REQUEST_URI} ^(.*)?/(install.php) [OR]
-  RewriteCond %{REQUEST_URI} ^(.*)?/(rebuild.php)
+  RewriteCond %{REQUEST_URI} ^(.*)?/(install\.php) [OR]
+  RewriteCond %{REQUEST_URI} ^(.*)?/(rebuild\.php)
   RewriteCond %{REQUEST_URI} !core
   RewriteRule ^ %1/core/%2 [L,QSA,R=301]
 
   # Rewrite install.php during installation to see if mod_rewrite is working
-  RewriteRule ^core/install.php core/install.php?rewrite=ok [QSA,L]
+  RewriteRule ^core/install\.php core/install.php?rewrite=ok [QSA,L]
 
   # Pass all requests not referring directly to files in the filesystem to
   # index.php.
@@ -138,11 +138,11 @@ AddEncoding gzip svgz
   # Allow access to PHP files in /core (like authorize.php or install.php):
   RewriteCond %{REQUEST_URI} !/core/[^/]*\.php$
   # Allow access to test-specific PHP files:
-  RewriteCond %{REQUEST_URI} !/core/modules/system/tests/https?.php
+  RewriteCond %{REQUEST_URI} !/core/modules/system/tests/https?\.php
   # Allow access to Statistics module's custom front controller.
   # Copy and adapt this rule to directly execute PHP files in contributed or
   # custom modules or to run another PHP application in the same directory.
-  RewriteCond %{REQUEST_URI} !/core/modules/statistics/statistics.php$
+  RewriteCond %{REQUEST_URI} !/core/modules/statistics/statistics\.php$
   # Deny access to any other PHP files that do not match the rules above.
   # Specifically, disallow autoload.php from being served directly.
   RewriteRule "^(.+/.*|autoload)\.php($|/)" - [F]

+ 1 - 1
web/modules/custom/editors_menus/editors_menus.info.yml

@@ -1,5 +1,5 @@
 name: 'Editors Menus'
 type: module
 description: 'create editors admin menus through module as they will be exportable as config'
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: 'Custom'

+ 1 - 1
web/modules/custom/images_styles_gen/images_styles_gen.info.yml

@@ -1,7 +1,7 @@
 name: 'images_styles_cron_gen'
 type: module
 description: 'helpers for progressive decoupling'
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: 'custom'
 # https://www.flocondetoile.fr/blog/generate-programmatically-image-styles-drupal-8
 # https://www.flocondetoile.fr/blog/using-drupal-8-cron-api-generate-image-styles

+ 1 - 1
web/modules/custom/materio_commerce/materio_commerce.info.yml

@@ -3,7 +3,7 @@ description: Materio commerce custom module
 package: Materio
 
 type: module
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 
 dependencies:
   - drupal:commerce

+ 1 - 1
web/modules/custom/materio_decoupled/materio_decoupled.info.yml

@@ -1,5 +1,5 @@
 name: 'materio_decoupled'
 type: module
 description: 'helpers for progressive decoupling'
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: 'Materio'

+ 1 - 1
web/modules/custom/materio_decoupled/src/Controller/AjaxHeaderMenuBlock.php

@@ -21,7 +21,7 @@ class AjaxHeaderMenuBlock extends ControllerBase {
     // \Drupal::logger('materio_user')->notice($language);
     $this->bid = "header";
     $this->block = Block::load($this->bid);
-    $this->block_builded = \Drupal::entityManager()->getViewBuilder('block')->view($this->block);
+    $this->block_builded = \Drupal::entityTypeManager()->getViewBuilder('block')->view($this->block);
   }
 
   /**

+ 1 - 1
web/modules/custom/materio_expo/materio_expo.info.yml

@@ -1,5 +1,5 @@
 name: 'materio_expo'
 type: module
 description: 'My Awesome Module'
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: 'Materio'

+ 1 - 1
web/modules/custom/materio_flag/materio_flag.info.yml

@@ -1,7 +1,7 @@
 name: Materio FLAG
 type: module
 description: Defines api behaviours for flaglist.
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: Materio
 dependencies:
   - drupal:flag_lists

+ 1 - 2
web/modules/custom/materio_graphql/materio_graphql.info.yml

@@ -2,8 +2,7 @@ name: Materio GraphQL
 type: module
 description: 'Materio GraphQL schema.'
 package: Materio
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 dependencies:
   - graphql:graphql
   - node:node
-core_version_requirement: ^8 || ^9

+ 1 - 1
web/modules/custom/materio_home/materio_home.info.yml

@@ -1,6 +1,6 @@
 name: Materio Home
 type: module
 description: Defines home contents for materiO.
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: Materio
 dependencies:

+ 1 - 10
web/modules/custom/materio_home/src/Controller/AjaxHomeController.php

@@ -4,7 +4,6 @@ namespace Drupal\materio_home\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\language\ConfigurableLanguageManagerInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -19,12 +18,6 @@ use Drupal\core\render\RenderContext;
  */
 class AjaxHomeController extends ControllerBase {
 
-  /**
-   * Drupal\Core\Entity\EntityManagerInterface definition.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
   /**
    * Drupal\language\ConfigurableLanguageManagerInterface definition.
    *
@@ -47,8 +40,7 @@ class AjaxHomeController extends ControllerBase {
   /**
    * Constructs a new AjaxHomeController object.
    */
-  public function __construct(EntityManagerInterface $entity_manager, ConfigurableLanguageManagerInterface $language_manager, RendererInterface $renderer, EntityTypeManagerInterface $entity_type_manager) {
-    $this->entityManager = $entity_manager;
+  public function __construct(ConfigurableLanguageManagerInterface $language_manager, RendererInterface $renderer, EntityTypeManagerInterface $entity_type_manager) {
     $this->languageManager = $language_manager;
     $this->renderer = $renderer;
     $this->entityTypeManager = $entity_type_manager;
@@ -59,7 +51,6 @@ class AjaxHomeController extends ControllerBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager'),
       $container->get('language_manager'),
       $container->get('renderer'),
       $container->get('entity_type.manager')

+ 1 - 1
web/modules/custom/materio_id/materio_id.info.yml

@@ -1,7 +1,7 @@
 name: Materio Id
 type: module
 description: "Compute automaticly materials references : <family>-<index>, eg. W-0459."
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: Materio
 dependencies:
   - computed_field

+ 1 - 1
web/modules/custom/materio_jsonapi/materio_jsonapi.info.yml

@@ -1,7 +1,7 @@
 name: Materio JsonAPI
 type: module
 description: Defines custom behaviours to jsonapi.
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: Materio
 dependencies:
   - drupal:jsonapi

+ 1 - 1
web/modules/custom/materio_migrate/materio_migrate.info.yml

@@ -1,7 +1,7 @@
 name: Materio Migration
 type: module
 description: Defines custom migration for materio (from d7 to d8).
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: Materio
 dependencies:
   # - config_devel

+ 1 - 1
web/modules/custom/materio_samples/materio_samples.info.yml

@@ -1,7 +1,7 @@
 name: Materio Samples
 type: module
 description: "Provide a sample field, each showroom (taxonomy term) can fill it's own sample reference, and only it's own"
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: Materio
 dependencies:
   - taxonomy

+ 1 - 1
web/modules/custom/materio_sapi/materio_sapi.info.yml

@@ -1,7 +1,7 @@
 name: Materio Serach API
 type: module
 description: 'Search Api Materio module'
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: 'Materio'
 dependencies:
   - search_api

+ 1 - 1
web/modules/custom/materio_sapi/src/Controller/Base.php

@@ -260,7 +260,7 @@ class Base extends ControllerBase {
     // Get the typed string from the URL, if it exists.
     $this->keys = $request->query->get('keys');
     if($this->keys){
-      $this->keys = Unicode::strtolower($this->keys);
+      $this->keys = mb_strtolower($this->keys);
       // $this->keys = Tags::explode($this->keys);
       \Drupal::logger('materio_sapi')->notice($this->keys);
     }

+ 1 - 1
web/modules/custom/materio_simplenews/materio_simplenews.info.yml

@@ -1,7 +1,7 @@
 name: Materio Simple News
 type: module
 description: 'Simple News extensions Materio module'
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: 'Materio'
 dependencies:
   - simplenews

+ 1 - 1
web/modules/custom/materio_user/materio_user.info.yml

@@ -1,5 +1,5 @@
 name: 'materio_user'
 type: module
 description: ''
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: 'Materio'

+ 5 - 3
web/modules/custom/materio_user/materio_user.module

@@ -9,7 +9,7 @@ use \Drupal\Core\Form\FormStateInterface;
 use \Drupal\Core\Block\BlockPluginInterface;
 use \Drupal\Core\Url;
 use \Drupal\Core\Link;
-
+use \Drupal\materio_user\MaterioUserLoginBlockAlterRender;
 /**
  * implements hook_form_FORM_ID_alter()
  *
@@ -121,10 +121,12 @@ function _materio_user_process_password_confirm($element){
 /**
  * implements hook_block_view_BASE_BLOCK_ID_alter()
  *
- * https://www.drupal.org/project/drupal/issues/2626224
+ * OLD D8 https://www.drupal.org/project/drupal/issues/2626224
+ * NEW D9 https://www.drupal.org/node/2966725
  */
 function materio_user_block_view_user_login_block_alter(array &$build, BlockPluginInterface $block) {
-  $build['#pre_render'][] = '_materio_user_user_login_block_pre_render';
+  // $build['#pre_render'][] = '_materio_user_user_login_block_pre_render';
+  $build['#pre_render'][] = [MaterioUserLoginBlockAlterRender::class, 'preRender'];
 }
 
 function _materio_user_user_login_block_pre_render(array $build){

+ 1 - 1
web/modules/custom/materio_user/src/Controller/AjaxLoginBlock.php

@@ -21,7 +21,7 @@ class AjaxLoginBlock extends ControllerBase {
     // \Drupal::logger('materio_user')->notice($language);
     $this->bid = "userlogin";
     $this->block = Block::load($this->bid);
-    $this->block_builded = \Drupal::entityManager()->getViewBuilder('block')->view($this->block);
+    $this->block_builded = \Drupal::entityTypeManager()->getViewBuilder('block')->view($this->block);
   }
 
   /**

+ 44 - 0
web/modules/custom/materio_user/src/MaterioUserLoginBlockAlterRender.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Drupal\materio_user;
+
+use Drupal\Core\Security\TrustedCallbackInterface;
+
+/**
+ * Provides a trusted callback to alter the commerce cart block.
+ *
+ * @see olla_common_block_view_commerce_cart_alter()
+ */
+class MaterioUserLoginBlockAlterRender implements TrustedCallbackInterface {
+
+   /**
+    * {@inheritdoc}
+    */
+   public static function trustedCallbacks() {
+    return ['preRender'];
+  }
+
+  /**
+   * Sets - #pre_render callback.
+   */
+  public static function preRender($build) {
+    $user_links = &$build['content']['user_links'];
+    $items = &$user_links['#items'];
+
+    unset($items['create_account']);
+    // $items['create_account']['#url']->mergeOptions(array(
+    //   "attributes" => array(
+    //     "@click.prevent" => "create_account"
+    //   )
+    // ));
+
+    // Do not handle passward reset with vue
+    // $items['request_password']['#url']->mergeOptions(array(
+    //   'attributes' => array(
+    //     "@click.prevent" => "request_password"
+    //   )
+    // ));
+    return $build;
+  }
+
+}

+ 1 - 1
web/modules/custom/rest_config/rest_config.info.yml

@@ -1,7 +1,7 @@
 name: 'REST Config'
 type: module
 description: 'Get site configiration through rest api'
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: 'Custom'
 dependencies:
   - rest

+ 0 - 1
web/modules/custom/vue_link_formatter/vue_link_formatter.info.yml

@@ -1,7 +1,6 @@
 name: Vue Link Formatter
 type: module
 description: 'Provides a simple vue link field formatter with vue attributes as @click.'
-core: 8.x
 core_version_requirement: ^8 || ^9
 package: Fields
 # version: VERSION

+ 1 - 1
web/modules/dev/migrate_booster/migrate_booster.info.yml

@@ -1,7 +1,7 @@
 name: Migrate booster
 type: module
 description: Hooks disabler
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 package: Migration
 dependencies:
   - migrate

+ 8 - 8
web/robots.txt

@@ -45,17 +45,17 @@ Disallow: /comment/reply/
 Disallow: /filter/tips
 Disallow: /node/add/
 Disallow: /search/
-Disallow: /user/register/
-Disallow: /user/password/
-Disallow: /user/login/
-Disallow: /user/logout/
+Disallow: /user/register
+Disallow: /user/password
+Disallow: /user/login
+Disallow: /user/logout
 # Paths (no clean URLs)
 Disallow: /index.php/admin/
 Disallow: /index.php/comment/reply/
 Disallow: /index.php/filter/tips
 Disallow: /index.php/node/add/
 Disallow: /index.php/search/
-Disallow: /index.php/user/password/
-Disallow: /index.php/user/register/
-Disallow: /index.php/user/login/
-Disallow: /index.php/user/logout/
+Disallow: /index.php/user/password
+Disallow: /index.php/user/register
+Disallow: /index.php/user/login
+Disallow: /index.php/user/logout

+ 24 - 9
web/sites/default/default.services.yml

@@ -36,6 +36,22 @@ parameters:
     # @default none
     # cookie_domain: '.example.com'
     #
+    # Set the session ID string length. The length can be between 22 to 256. The
+    # PHP recommended value is 48. See
+    # https://www.php.net/manual/session.security.ini.php for more information.
+    # This value should be kept in sync with
+    # \Drupal\Core\Session\SessionConfiguration::__construct()
+    # @default 48
+    sid_length: 48
+    #
+    # Set the number of bits in encoded session ID character. The possible
+    # values are '4' (0-9, a-f), '5' (0-9, a-v), and '6' (0-9, a-z, A-Z, "-",
+    # ","). The PHP recommended value is 6. See
+    # https://www.php.net/manual/session.security.ini.php for more information.
+    # This value should be kept in sync with
+    # \Drupal\Core\Session\SessionConfiguration::__construct()
+    # @default 6
+    sid_bits_per_character: 6
   twig.config:
     # Twig debugging:
     #
@@ -118,7 +134,8 @@ parameters:
   # Cacheability debugging:
   #
   # Responses with cacheability metadata (CacheableResponseInterface instances)
-  # get X-Drupal-Cache-Tags and X-Drupal-Cache-Contexts headers.
+  # get X-Drupal-Cache-Tags, X-Drupal-Cache-Contexts and X-Drupal-Cache-Max-Age
+  # headers.
   #
   # For more information about debugging cacheable responses, see
   # https://www.drupal.org/developing/api/8/response/cacheable-response-interface
@@ -126,15 +143,13 @@ parameters:
   # Not recommended in production environments
   # @default false
   http.response.debug_cacheability_headers: false
-  factory.keyvalue:
-    {}
+  factory.keyvalue: {}
     # Default key/value storage service to use.
     # @default keyvalue.database
     # default: keyvalue.database
     # Collection-specific overrides.
     # state: keyvalue.database
-  factory.keyvalue.expirable:
-    {}
+  factory.keyvalue.expirable: {}
     # Default key/value expirable storage service to use.
     # @default keyvalue.database.expirable
     # default: keyvalue.database.expirable
@@ -154,10 +169,10 @@ parameters:
     - webcal
     - rtsp
 
-   # Configure Cross-Site HTTP requests (CORS).
-   # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
-   # for more information about the topic in general.
-   # Note: By default the configuration is disabled.
+  # Configure Cross-Site HTTP requests (CORS).
+  # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
+  # for more information about the topic in general.
+  # Note: By default the configuration is disabled.
   cors.config:
     enabled: false
     # Specify allowed headers, like 'x-allowed-header'.

+ 50 - 43
web/sites/default/default.settings.php

@@ -1,6 +1,6 @@
 <?php
 
-// @codingStandardsIgnoreFile
+// phpcs:ignoreFile
 
 /**
  * @file
@@ -115,14 +115,6 @@ $databases = [];
  * namespace. This is optional for projects managed with Composer if the
  * driver's namespace is in Composer's autoloader.
  *
- * Transaction support is enabled by default for all drivers that support it,
- * including MySQL. To explicitly disable it, set the 'transactions' key to
- * FALSE.
- * Note that some configurations of MySQL, such as the MyISAM engine, don't
- * support it and will proceed silently even if enabled. If you experience
- * transaction related crashes with such configuration, set the 'transactions'
- * key to FALSE.
- *
  * For each database, you may optionally specify multiple "target" databases.
  * A target database allows Drupal to try to send certain queries to a
  * different database if it can but fall back to the default connection if not.
@@ -238,9 +230,9 @@ $databases = [];
  * Sample Database configuration format for a driver in a contributed module:
  * @code
  *   $databases['default']['default'] = [
- *     'driver' => 'mydriver',
- *     'namespace' => 'Drupal\mymodule\Driver\Database\mydriver',
- *     'autoload' => 'modules/mymodule/src/Driver/Database/mydriver/',
+ *     'driver' => 'my_driver',
+ *     'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
+ *     'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
  *     'database' => 'databasename',
  *     'username' => 'sqlusername',
  *     'password' => 'sqlpassword',
@@ -315,6 +307,22 @@ $settings['hash_salt'] = '';
  */
 $settings['update_free_access'] = FALSE;
 
+/**
+ * Fallback to HTTP for Update Manager and for fetching security advisories.
+ *
+ * If your site fails to connect to updates.drupal.org over HTTPS (either when
+ * fetching data on available updates, or when fetching the feed of critical
+ * security announcements), you may uncomment this setting and set it to TRUE to
+ * allow an insecure fallback to HTTP. Note that doing so will open your site up
+ * to a potential man-in-the-middle attack. You should instead attempt to
+ * resolve the issues before enabling this option.
+ * @see https://www.drupal.org/docs/system-requirements/php-requirements#openssl
+ * @see https://en.wikipedia.org/wiki/Man-in-the-middle_attack
+ * @see \Drupal\update\UpdateFetcher
+ * @see \Drupal\system\SecurityAdvisories\SecurityAdvisoriesFetcher
+ */
+# $settings['update_fetch_with_http_fallback'] = TRUE;
+
 /**
  * External access proxy settings:
  *
@@ -379,17 +387,20 @@ $settings['update_free_access'] = FALSE;
  * Sets which headers to trust from your reverse proxy.
  *
  * Common values are:
- * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL
+ * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR
+ * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST
+ * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT
+ * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO
  * - \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
  *
  * Note the default value of
  * @code
- * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
+ * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
  * @endcode
  * is not secure by default. The value should be set to only the specific
  * headers the reverse proxy uses. For example:
  * @code
- * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL
+ * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO
  * @endcode
  * This would trust the following headers:
  * - X_FORWARDED_FOR
@@ -397,11 +408,14 @@ $settings['update_free_access'] = FALSE;
  * - X_FORWARDED_PROTO
  * - X_FORWARDED_PORT
  *
- * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL
+ * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR
+ * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST
+ * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT
+ * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO
  * @see \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED
  * @see \Symfony\Component\HttpFoundation\Request::setTrustedProxies
  */
-# $settings['reverse_proxy_trusted_headers'] = \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED;
+# $settings['reverse_proxy_trusted_headers'] = \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_HOST | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED;
 
 
 /**
@@ -448,35 +462,13 @@ $settings['update_free_access'] = FALSE;
 /**
  * Class Loader.
  *
- * If the APC extension is detected, the Symfony APC class loader is used for
- * performance reasons. Detection can be prevented by setting
- * class_loader_auto_detect to false, as in the example below.
+ * If the APCu extension is detected, the classloader will be optimized to use
+ * it. Set to FALSE to disable this.
+ *
+ * @see https://getcomposer.org/doc/articles/autoloader-optimization.md
  */
 # $settings['class_loader_auto_detect'] = FALSE;
 
-/*
- * If the APC extension is not detected, either because APC is missing or
- * because auto-detection has been disabled, auto-loading falls back to
- * Composer's ClassLoader, which is good for development as it does not break
- * when code is moved in the file system. You can also decorate the base class
- * loader with another cached solution than the Symfony APC class loader, as
- * all production sites should have a cached class loader of some sort enabled.
- *
- * To do so, you may decorate and replace the local $class_loader variable. For
- * example, to use Symfony's APC class loader without automatic detection,
- * uncomment the code below.
- */
-/*
-if ($settings['hash_salt']) {
-  $prefix = 'drupal.' . hash('sha256', 'drupal.' . $settings['hash_salt']);
-  $apc_loader = new \Symfony\Component\ClassLoader\ApcClassLoader($prefix, $class_loader);
-  unset($prefix);
-  $class_loader->unregister();
-  $apc_loader->register();
-  $class_loader = $apc_loader;
-}
-*/
-
 /**
  * Authorized file system operations:
  *
@@ -619,6 +611,21 @@ if ($settings['hash_salt']) {
 # ini_set('pcre.backtrack_limit', 200000);
 # ini_set('pcre.recursion_limit', 200000);
 
+/**
+ * Add Permissions-Policy header to disable Google FLoC.
+ *
+ * By default, Drupal sends the 'Permissions-Policy: interest-cohort=()' header
+ * to disable Google's Federated Learning of Cohorts feature, introduced in
+ * Chrome 89.
+ *
+ * See https://en.wikipedia.org/wiki/Federated_Learning_of_Cohorts for more
+ * information about FLoC.
+ *
+ * If you don't wish to disable FLoC in Chrome, you can set this value
+ * to FALSE.
+ */
+# $settings['block_interest_cohort'] = TRUE;
+
 /**
  * Configuration overrides.
  *

+ 1 - 1
web/sites/example.settings.local.php

@@ -1,6 +1,6 @@
 <?php
 
-// @codingStandardsIgnoreFile
+// phpcs:ignoreFile
 
 /**
  * @file

+ 1 - 1
web/sites/example.sites.php

@@ -1,6 +1,6 @@
 <?php
 
-// @codingStandardsIgnoreFile
+// phpcs:ignoreFile
 
 /**
  * @file

File diff suppressed because it is too large
+ 1 - 1
web/themes/custom/materiotheme/assets/dist/report.html


+ 1 - 1
web/themes/custom/materiotheme/materiotheme.info.yml

@@ -2,7 +2,7 @@ name: Materio
 description: 'Materio Drupal 8 theme with gulp'
 type: theme
 base theme: classy
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 libraries:
   - core/normalize
   - materiotheme/global-css

+ 1 - 1
web/themes/custom/matminimal/matminimal.info.yml

@@ -1,7 +1,7 @@
 name: Matminimal
 type: theme
 description: 'Adminimal based drupal administration theme with material design.'
-core: 8.x
+core_version_requirement: ^8.8 || ^9.2
 base theme: adminimal_theme
 
 libraries:

+ 0 - 1
web/update.php

@@ -16,7 +16,6 @@ $autoloader = require_once 'autoload.php';
 // Disable garbage collection during test runs. Under certain circumstances the
 // update path will create so many objects that garbage collection causes
 // segmentation faults.
-require_once 'core/includes/bootstrap.inc';
 if (drupal_valid_test_ua()) {
   gc_collect_cycles();
   gc_disable();

+ 0 - 12
web/web.config

@@ -33,18 +33,6 @@
             <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
           </conditions>
         </rule>
-     <!-- If running on a PHP version affected by httpoxy vulnerability
-      uncomment the following rule to mitigate it's impact. To make this
-      rule work, you will also need to add HTTP_PROXY to the allowed server
-      variables manually in IIS. See https://www.drupal.org/node/2783079.
-        <rule name="Erase HTTP_PROXY" patternSyntax="Wildcard">
-          <match url="*.*" />
-          <serverVariables>
-            <set name="HTTP_PROXY" value="" />
-          </serverVariables>
-          <action type="None" />
-        </rule>
-    -->
     <!-- To redirect all users to access the site WITH the 'www.' prefix,
      http://example.com/foo will be redirected to http://www.example.com/foo)
      adapt and uncomment the following:   -->

Some files were not shown because too many files changed in this diff