Merge pull request #412 from itk-dev/feature/drupal-10-2-7

Updated drupal core and contrib modules

CHANGELOG.md

@@ -6,6 +6,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+* [PR-412](https://github.com/itk-dev/hoeringsportal/pull/412)
+ * Upgrade drupal core 10.2.7 and contrib modules
+ * Disable migrate_subject_data module
+ * Remove deprecated webmozart/path-util package
 * [PR-411](https://github.com/itk-dev/hoeringsportal/pull/411)
  Fix paragraph spacing
 * [PR-409](https://github.com/itk-dev/hoeringsportal/pull/409)

composer.json

@@ -165,8 +165,7 @@
  "onelogin/php-saml": "^4.0",
  "oomphinc/composer-installers-extender": "^2.0",
  "vlucas/phpdotenv": "^2.4",
- "webflo/drupal-finder": "^1.0.0",
- "webmozart/path-util": "^2.3"
+ "webflo/drupal-finder": "^1.0.0"
  },
  "require-dev": {
  "drupal/content_fixtures": "^3.1",
@@ -278,9 +277,6 @@
  },
  "drupal/core": {
  "Text format wrapper does not take description_display into account (https://www.drupal.org/project/drupal/issues/2421445#comment-14328645)": "https://www.drupal.org/files/issues/2021-12-03/2421445-18_0.patch"
- },
- "drupal/publication_date": {
- "https://www.drupal.org/project/publication_date/issues/3328575": "https://www.drupal.org/files/issues/2023-05-31/3328575-5-fix-bux-publicate-date.patch"
  }
  }
  }

config/sync/core.extension.yml

@@ -77,7 +77,6 @@ module:
  maxlength: 0
  media: 0
  menu_ui: 0
- migrate_subject_data: 0
  mysql: 0
  node: 0
  openid_connect: 0

config/sync/views.view.all_citizen_proposals.yml

@@ -138,7 +138,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Any -|Alle\r\n- Enhver -|Alle\r\nAfsluttet|Afstemning afsluttet\r\nI gang|Afstemning aktiv\r\nKommende|"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  access:

config/sync/views.view.all_hearings.yml

@@ -141,7 +141,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Any -|Område\r\n- Enhver -|Vis alle områder"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  field_content_state_value:
@@ -150,7 +152,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Any -|Alle\r\n- Enhver -|Alle\r\nAfsluttet|Afsluttede\r\nI gang|Aktive"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  field_type_target_id:
@@ -159,7 +163,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Any -|Alle typer\r\n- Enhver -|Vælg type"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  access:

config/sync/views.view.all_meetings.yml

@@ -140,7 +140,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Any -|Område\r\n- Enhver -|Vis alle områder"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  field_content_state_value:
@@ -149,7 +151,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Enhver -|Alle\r\nAfsluttet|Afsluttede\r\nKommende|Aktive"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  field_type_target_id:
@@ -158,7 +162,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Any -|Alle typer\r\n- Enhver -|Vælg type"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  access:

config/sync/views.view.all_projects.yml

@@ -127,7 +127,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Any -|Område\r\n- Enhver -|Vælg område"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  field_project_category_target_id:
@@ -136,7 +138,9 @@ display:
  sort_options: false
  rewrite:
  filter_rewrite_values: "- Any -|Alle\r\n- Enhver -|Alle"
+ filter_rewrite_values_key: false
  collapsible: false
+ collapsible_disable_automatic_open: false
  is_secondary: false
  hide_label: true
  access:

web/modules/custom/hoeringsportal_citizen_proposal/modules/hoeringsportal_citizen_proposal_fixtures/src/Fixture/CitizenProposalFixture.php

@@ -33,7 +33,7 @@ public function __construct(
  readonly private Helper $helper,
  EventDispatcherInterface $eventDispatcher,
  MailHelper $mailHelper,
- ArchiveHelper $archivingHelper
+ ArchiveHelper $archivingHelper,
  ) {
  // Prevent sending notification emails.
  $eventDispatcher->removeSubscriber($mailHelper);

web/modules/custom/hoeringsportal_citizen_proposal/src/Drush/Commands/DrushCommands.php

@@ -16,7 +16,7 @@ final class DrushCommands extends BaseDrushCommands {
  * Constructor for the citizen proposal commands class.
  */
  public function __construct(
- readonly private Helper $helper
+ readonly private Helper $helper,
  ) {
  parent::__construct();
  }

web/modules/custom/hoeringsportal_citizen_proposal/src/Drush/Commands/TestMailCommand.php

@@ -20,7 +20,7 @@ final class TestMailCommand extends BaseDrushCommands {
  */
  public function __construct(
  readonly private Helper $helper,
- readonly private MailHelper $mailHelper
+ readonly private MailHelper $mailHelper,
  ) {
  parent::__construct();
  }

web/modules/custom/hoeringsportal_citizen_proposal/src/EventSubscriber/CitizenAccessCheckEventSubscriber.php

@@ -28,7 +28,7 @@ public function __construct(
  readonly private Helper $helper,
  readonly private CprHelper $cprHelper,
  readonly private CitizenAccessChecker $accessChecker,
- LoggerChannel $logger
+ LoggerChannel $logger,
  ) {
  $this->setLogger($logger);
  }

web/modules/custom/hoeringsportal_citizen_proposal/src/Form/ProposalAdminForm.php

@@ -21,7 +21,7 @@ final class ProposalAdminForm extends FormBase {
  */
  public function __construct(
  readonly private Helper $helper,
- readonly private WebformHelper $webformHelper
+ readonly private WebformHelper $webformHelper,
  ) {
  }
 

web/modules/custom/hoeringsportal_citizen_proposal/src/Form/ProposalFormBase.php

@@ -33,7 +33,7 @@ final public function __construct(
  readonly protected Helper $helper,
  readonly protected WebformHelper $webformHelper,
  readonly private AuthenticationHelper $authenticationHelper,
- readonly private ImmutableConfig $config
+ readonly private ImmutableConfig $config,
  ) {
  }
 

web/modules/custom/hoeringsportal_citizen_proposal/src/Helper/CitizenAccessChecker.php

@@ -17,7 +17,7 @@ class CitizenAccessChecker {
  * Constructor.
  */
  public function __construct(
- LoggerChannel $logger
+ LoggerChannel $logger,
  ) {
  $this->setLogger($logger);
  }

web/modules/custom/hoeringsportal_citizen_proposal/src/Helper/CprHelper.php

@@ -119,13 +119,13 @@ private function resolveOptions(array $options): array {
  * Get AzureKeyVaultCertificateLocator.
  */
  private function getAzureKeyVaultCertificateLocator(
-  string $tenantId,
-  string $applicationId,
-  string $clientSecret,
-  string $keyVaultName,
-  string $keyVaultSecret,
-  string $keyVaultSecretVersion
-  ): CertificateLocatorInterface {
+ string $tenantId,
+ string $applicationId,
+ string $clientSecret,
+ string $keyVaultName,
+ string $keyVaultSecret,
+ string $keyVaultSecretVersion,
+ ): CertificateLocatorInterface {
  $httpClient = new GuzzleAdapter(new Client());
  $requestFactory = new RequestFactory();
 

web/modules/custom/hoeringsportal_citizen_proposal/src/Helper/Helper.php

@@ -54,7 +54,7 @@ public function __construct(
  readonly private Connection $connection,
  readonly private EntityTypeManagerInterface $entityTypeManager,
  readonly private TimeInterface $time,
- LoggerChannel $logger
+ LoggerChannel $logger,
  ) {
  $this->setLogger($logger);
  }

web/modules/custom/hoeringsportal_citizen_proposal/src/Helper/MailHelper.php

@@ -31,7 +31,7 @@ final class MailHelper implements EventSubscriberInterface, LoggerAwareInterface
  public function __construct(
  readonly private CitizenProposalHelper $citizenProposalHelper,
  readonly private EmailFactoryInterface $emailFactory,
- LoggerInterface $logger
+ LoggerInterface $logger,
  ) {
  $this->setLogger($logger);
  }

web/modules/custom/hoeringsportal_citizen_proposal/src/Helper/WebformHelper.php

@@ -21,7 +21,7 @@ class WebformHelper {
  public function __construct(
  readonly private WebformEntityStorageInterface $webformStorage,
  readonly private ImmutableConfig $webformConfig,
- readonly private PrivateTempStore $tempStore
+ readonly private PrivateTempStore $tempStore,
  ) {
  }
 

web/modules/custom/hoeringsportal_citizen_proposal_archiving/src/Archiver/AbstractArchiver.php

@@ -23,7 +23,7 @@ abstract class AbstractArchiver implements LoggerAwareInterface, LoggerInterface
  */
  public function __construct(
  readonly private Connection $database,
- LoggerInterface $logger
+ LoggerInterface $logger,
  ) {
  $this->setLogger($logger);
  }

web/modules/custom/hoeringsportal_citizen_proposal_archiving/src/Archiver/GetOrganizedArchiver.php

@@ -34,7 +34,7 @@ final class GetOrganizedArchiver extends AbstractArchiver {
  public function __construct(
  readonly private FileSystem $fileSystem,
  Connection $database,
- LoggerInterface $logger
+ LoggerInterface $logger,
  ) {
  parent::__construct($database, $logger);
  }

web/modules/custom/hoeringsportal_citizen_proposal_archiving/src/Drush/Commands/Commands.php

@@ -20,7 +20,7 @@ final class Commands extends DrushCommands {
  public function __construct(
  readonly private Helper $helper,
  readonly private CitizenProposalHelper $citizenProposalHelper,
- readonly private Renderer $renderer
+ readonly private Renderer $renderer,
  ) {
  }
 

web/modules/custom/hoeringsportal_citizen_proposal_archiving/src/Helper/Helper.php

@@ -44,7 +44,7 @@ public function __construct(
  readonly private CitizenProposalHelper $citizenProposalHelper,
  readonly private AbstractArchiver $archiver,
  readonly private Renderer $renderer,
- LoggerInterface $logger
+ LoggerInterface $logger,
  ) {
  $this->queueStorage = $entityTypeManager->getStorage('advancedqueue_queue');
  $this->setLogger($logger);

web/modules/custom/hoeringsportal_citizen_proposal_archiving/src/Plugin/AdvancedQueue/JobType/ArchiveCitizenProposalJob.php

@@ -40,7 +40,7 @@ public function __construct(
  array $configuration,
  $plugin_id,
  $plugin_definition,
- readonly private Helper $helper
+  readonly private Helper $helper,
  ) {
  parent::__construct($configuration, $plugin_id, $plugin_definition);
  }

web/modules/custom/hoeringsportal_citizen_proposal_archiving/src/Plugin/FormAlter/CitizenProposalFormAlter.php

@@ -33,7 +33,7 @@ public function __construct(
  readonly private Renderer $renderer,
  array $configuration,
  $plugin_id,
- $plugin_definition
+ $plugin_definition,
  ) {
  parent::__construct($configuration, $plugin_id, $plugin_definition);
  }
@@ -54,7 +54,7 @@ public static function create(ContainerInterface $container, array $configuratio
  /**
  * {@inheritdoc}
  */
- public function formAlter(array &$form, FormStateInterface &$form_state, $form_id) {
+ public function formAlter(array &$form, FormStateInterface $form_state, $form_id) {
  $formObject = $form_state->getFormObject();
  assert($formObject instanceof EntityFormInterface);
  $node = $formObject->getEntity();

web/modules/custom/hoeringsportal_citizen_proposal_archiving/src/Renderer/Renderer.php

@@ -24,7 +24,7 @@ final class Renderer implements LoggerAwareInterface, LoggerInterface {
  */
  public function __construct(
  readonly private DrupalRenderer $renderer,
- readonly private ModuleHandlerInterface $moduleHandler
+ readonly private ModuleHandlerInterface $moduleHandler,
  ) {
  }
 

web/modules/custom/hoeringsportal_data/src/Drush/Commands/DrushCommands.php

@@ -16,7 +16,7 @@ final class DrushCommands extends BaseDrushCommands {
  * Constructor.
  */
  public function __construct(
- private readonly HearingHelper $helper
+ private readonly HearingHelper $helper,
  ) {
  parent::__construct();
  }

web/modules/custom/hoeringsportal_data/src/Plugin/Field/FieldWidget/LocalplanDefaultWidget.php

@@ -27,7 +27,7 @@ public function formElement(
  $delta,
  array $element,
  array &$form,
- FormStateInterface $form_state
+ FormStateInterface $form_state,
  ) {
  /** @var \Drupal\hoeringsportal_data\Plugin\Field\FieldType\MapItem $item */
  $item =& $items[$delta];

web/modules/custom/hoeringsportal_deskpro/src/Drush/Commands/DrushCommands.php

@@ -55,9 +55,13 @@ public static function create(ContainerInterface $container) {
  #[CLI\Argument(name: 'ticketIds', description: 'Comma-separated list of ticket ids.')]
  #[CLI\Option(name: 'enqueue', description: 'Enqueue the synchronization.')]
  #[CLI\Usage(name: 'hoeringsportal:deskpro:synchronize-hearing-ticket 123 456', description: 'Refreshes Deskpro data for ticket 456 on hearing 123.')]
- public function synchronizeHearingTicket(int $hearingId, string $ticketIds, array $options = [
- 'enqueue' => FALSE,
- ]) {
+ public function synchronizeHearingTicket(
+ int $hearingId,
+ string $ticketIds,
+ array $options = [
+ 'enqueue' => FALSE,
+ ],
+ ) {
  // Get unique list of non-negative integers.
  $ticketIds = array_unique(
  array_filter(

web/modules/custom/hoeringsportal_deskpro/src/Form/HearingTicketAddForm.php

@@ -29,7 +29,7 @@ public static function create(ContainerInterface $container) {
  */
  public function __construct(
  private readonly DeskproConfig $config,
- private readonly HearingHelper $helper
+ private readonly HearingHelper $helper,
  ) {
  }
 

web/modules/custom/hoeringsportal_deskpro/src/Plugin/AdvancedQueue/JobType/SynchronizeTicket.php

@@ -44,7 +44,7 @@ public function __construct(
  array $configuration,
  $plugin_id,
  $plugin_definition,
- HearingHelper $helper
+ HearingHelper $helper,
  ) {
  parent::__construct($configuration, $plugin_id, $plugin_definition);
  $this->helper = $helper;

web/modules/custom/hoeringsportal_deskpro/src/Plugin/Block/BlockBase.php

@@ -52,7 +52,7 @@ public static function create(
  ContainerInterface $container,
  array $configuration,
  $plugin_id,
- $plugin_definition
+ $plugin_definition,
  ) {
  return new static(
  $configuration,
@@ -75,7 +75,7 @@ final public function __construct(
  RouteMatchInterface $routeMatch,
  LanguageManagerInterface $languageManager,
  DeskproService $deskpro,
- HearingHelper $helper
+ HearingHelper $helper,
  ) {
  parent::__construct($configuration, $plugin_id, $plugin_definition);
  $this->routeMatch = $routeMatch;

web/modules/custom/hoeringsportal_openid_connect/src/Controller/OpenIDConnectController.php

@@ -70,7 +70,7 @@ public function __construct(
  readonly private LanguageManagerInterface $languageManager,
  readonly private RendererInterface $renderer,
  readonly private EventDispatcherInterface $eventDispatcher,
- LoggerInterface $logger
+ LoggerInterface $logger,
  ) {
  $this->setLogger($logger);
  }