Automatic update

.github/dependabot.yml.dist

@@ -0,0 +1,18 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+version: 2
+updates:
+  - package-ecosystem: "composer" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    allow:
+      # Update only direct dependencies. This reduces spam since most
+      # indirect dependencies are handles by update-config workflow.
+      - dependency-type: "direct"
+    ignore:
+      # Updated by update-config workflow
+      - dependency-name: "drupal/helfi_*"
+      - dependency-name: "drupal/hdbt*"
+      # Updated separately
+      - dependency-name: "drupal/core*"

.platform/schema

@@ -1 +1 @@
-12
+14

compose.yaml

@@ -118,7 +118,7 @@ services:
     profiles:
       - search
   elastic:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.16.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
     container_name: "${COMPOSE_PROJECT_NAME}-elastic"
     environment:
       - node.name="${COMPOSE_PROJECT_NAME}-elastic"

composer.json

@@ -78,15 +78,9 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "dg/bypass-finals": "^1.5",
         "donatj/mock-webserver": "^2.4",
-        "drupal/coder": "^8.3",
-        "drupal/core-dev": "^10.2.4",
+        "drupal/core-dev": "^10",
         "jangregor/phpstan-prophecy": "^1.0",
-        "mglaman/phpstan-drupal": "^1.2",
-        "phpspec/prophecy-phpunit": "^2",
-        "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpunit/phpunit": "^9.5",
         "weitzman/drupal-test-traits": "^2.0"
     },
     "conflict": {
@@ -96,13 +90,14 @@
         "optimize-autoloader": true,
         "sort-packages": true,
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
             "composer/installers": true,
             "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-composer-scaffold": true,
-            "phpstan/extension-installer": true,
             "oomphinc/composer-installers-extender": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "phpstan/extension-installer": true,
+            "tbachert/spi": false
         },
         "audit": {
             "abandoned": "report",

conf/cmi/core.entity_view_display.paragraph.hearings.default.yml

@@ -31,9 +31,9 @@ content:
     weight: 0
     region: content
   list:
-    weight: 100
     settings: {  }
     third_party_settings: {  }
+    weight: 100
     region: content
 hidden:
   search_api_excerpt: true

conf/cmi/external_entities.external_entity_type.helfi_hearings.yml

@@ -8,8 +8,8 @@ id: helfi_hearings
 label: 'Helfi: Hearing'
 label_plural: 'Helfi: Hearing'
 description: 'Helfi hearings from hearing api.'
-generate_aliases: false
 read_only: true
+generate_aliases: false
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

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: false
 read_only: true
+generate_aliases: false
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

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:

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:

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:

conf/cmi/views.view.er_tpr_unit.yml

@@ -91,6 +91,7 @@ display:
         type: mini
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 10
           total_pages: null
           id: 0
@@ -105,7 +106,6 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

conf/cmi/views.view.locked_services.yml

@@ -381,6 +381,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -398,7 +399,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

conf/cmi/views.view.locked_units.yml

@@ -381,6 +381,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -398,7 +399,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

conf/cmi/views.view.service_list.yml

@@ -109,6 +109,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 4
           total_pages: null
           id: 0
@@ -126,7 +127,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
@@ -646,6 +646,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 5
           total_pages: null
           id: 0
@@ -663,7 +664,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

conf/cmi/views.view.service_units.yml

@@ -93,6 +93,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 8
           total_pages: null
           id: 0
@@ -110,7 +111,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

conf/cmi/views.view.unit_search.yml

@@ -286,6 +286,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 15
           total_pages: null
           id: 0
@@ -303,7 +304,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

public/modules/custom/grants_budget_components/src/TypedData/Definition/GrantsBudgetInfoDefinition.php

@@ -61,7 +61,7 @@ public function getPropertyDefinitions(): array {
    *
    * @return $this
    */
-  public function setPropertyDefinition($name, DataDefinitionInterface $definition = NULL) {
+  public function setPropertyDefinition($name, ?DataDefinitionInterface $definition = NULL) {
 
     $this->getPropertyDefinitions();
 

public/modules/custom/grants_handler/src/ApplicationGetterService.php

@@ -273,7 +273,7 @@ public function getCompanyApplications(
    */
   public function submissionObjectFromApplicationNumber(
     string $applicationNumber,
-    AtvDocument $document = NULL,
+    ?AtvDocument $document = NULL,
     bool $refetch = FALSE,
     bool $skipAccessCheck = FALSE,
   ): ?WebformSubmission {

public/modules/custom/grants_handler/src/ApplicationHelpers.php

@@ -383,7 +383,7 @@ public static function getActiveApplicationWebforms(string $applicationTypeId, $
    * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
-  public static function isApplicationWebformDuplicatable(string $id, string $formId = NULL): bool {
+  public static function isApplicationWebformDuplicatable(string $id, ?string $formId = NULL): bool {
     $applicationForms = self::getActiveApplicationWebforms($id, $formId);
     return count($applicationForms['released']) <= 1 && count($applicationForms['development']) === 0;
   }

public/modules/custom/grants_handler/src/Form/MessageForm.php

@@ -88,7 +88,7 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, WebformSubmission $webform_submission = NULL): array {
+  public function buildForm(array $form, FormStateInterface $form_state, ?WebformSubmission $webform_submission = NULL): array {
     $tOpts = ['context' => 'grants_handler'];
 
     $storage = $form_state->getStorage();

public/modules/custom/grants_handler/src/GrantsHandlerNavigationHelper.php

@@ -168,7 +168,7 @@ public function hasVisitedPage(WebformSubmissionInterface $webformSubmission, ?s
    */
   public function getErrors(
     WebformSubmissionInterface $webformSubmission,
-    string $page = NULL,
+    ?string $page = NULL,
   ): array {
 
     if (empty($webformSubmission->id())) {

public/modules/custom/grants_handler/src/LinkModifierService.php

@@ -33,7 +33,7 @@ public function __construct(RequestStack $request_stack) {
   /**
    * {@inheritdoc}
    */
-  public function processInbound($path, Request $request = NULL) {
+  public function processInbound($path, ?Request $request = NULL) {
     if (str_starts_with($path, '/yleisavustushakemus/')) {
       $sid = str_replace('/yleisavustushakemus/', '', $path);
       $path = "/admin/structure/webform/manage/yleisavustushakemus/submission/" . $sid;

public/modules/custom/grants_menu/src/ForceMenuLinkService.php

@@ -182,8 +182,8 @@ protected function createMenuLink(NodeInterface $node): void {
    */
   protected function logMessage(
     string $messageType,
-    NodeInterface $node = NULL,
-    MenuLinkContentInterface $menuLink = NULL,
+    ?NodeInterface $node = NULL,
+    ?MenuLinkContentInterface $menuLink = NULL,
     mixed $exception = NULL,
   ): void {
     $message = match ($messageType) {

public/modules/custom/grants_profile/src/ProfileConnector.php

@@ -61,7 +61,7 @@ public function __construct(
    *
    * @throws \Drupal\grants_profile\GrantsProfileException
    */
-  public function initGrantsProfile(string $profileType, array $companyData = NULL): array {
+  public function initGrantsProfile(string $profileType, ?array $companyData = NULL): array {
     // Try to load Helsinki profile data.
     try {
       $profileData = $this->helsinkiProfiili->getUserProfileData();

public/modules/custom/grants_profile/src/UserRedirect.php

@@ -39,14 +39,14 @@ public function __construct(
   /**
    * {@inheritdoc}
    */
-  public function setLoginRedirection(string $url, AccountInterface $account = NULL): void {
+  public function setLoginRedirection(string $url, ?AccountInterface $account = NULL): void {
     $this->prepareDestination($url);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function setLogoutRedirection(string $url, AccountInterface $account = NULL) {
+  public function setLogoutRedirection(string $url, ?AccountInterface $account = NULL): void {
     $this->prepareDestination($url);
   }
 

public/modules/custom/grants_profile/src/UserRedirectInterface.php

@@ -27,7 +27,7 @@ interface UserRedirectInterface {
    * @param \Drupal\Core\Session\AccountInterface|null $account
    *   User account to set destination for.
    */
-  public function setLoginRedirection(string $url, AccountInterface $account = NULL);
+  public function setLoginRedirection(string $url, ?AccountInterface $account = NULL);
 
   /**
    * Set Logout destination parameter to do redirect.
@@ -37,6 +37,6 @@ public function setLoginRedirection(string $url, AccountInterface $account = NUL
    * @param \Drupal\Core\Session\AccountInterface|null $account
    *   User account to set destination for.
    */
-  public function setLogoutRedirection(string $url, AccountInterface $account = NULL);
+  public function setLogoutRedirection(string $url, ?AccountInterface $account = NULL);
 
 }

tools/make/project/install.mk

@@ -15,7 +15,7 @@ endif
 
 PHONY += oc-sync
 oc-sync:
-	docker run --env-file .env -it --rm -v .:/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "chmod +x /app/tools/make/project/db-sync.sh && /app/tools/make/project/db-sync.sh $(OC_LOGIN_TOKEN)"
+	@docker run --env-file .env -it --rm -v $(shell pwd):/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "chmod +x /app/tools/make/project/db-sync.sh && /app/tools/make/project/db-sync.sh $(OC_LOGIN_TOKEN)"
 	$(call drush,sql-query --file=${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME),SQL dump imported)
 	$(call drush,sql-query \"UPDATE file_managed SET uri = REPLACE(uri, 'azure://', 'public://');\",Sanitized Azure URIs)
 	$(call drush,cr)