City-of-Helsinki · khalima · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024
diff --git a/composer.json b/composer.json
@@ -92,7 +92,8 @@
                 "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch",
                 "[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch",
                 "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch",
-                "[#UHF-9952, #UHF-9980] Duplicate <br /> tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch"
+                "[#UHF-9952, #UHF-9980] Duplicate <br /> tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch",
+                "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch"
             },
             "drupal/default_content": {
                 "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch"

diff --git a/helfi_platform_config.module b/helfi_platform_config.module
@@ -7,7 +7,6 @@
 
 declare(strict_types=1);
 
-use Drupal\block\Entity\Block;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Breadcrumb\Breadcrumb;
 use Drupal\Core\Entity\ContentEntityInterface;
@@ -20,6 +19,7 @@ use Drupal\Core\Link;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
+use Drupal\block\Entity\Block;
 use Drupal\helfi_api_base\Environment\Project;
 use Drupal\helfi_platform_config\DTO\ParagraphTypeCollection;
 use Drupal\helfi_platform_config\EntityVersionMatcher;

diff --git a/modules/hdbt_admin_tools/src/Form/UserLoginLink.php b/modules/hdbt_admin_tools/src/Form/UserLoginLink.php
@@ -23,7 +23,7 @@ public function getFormId(): string {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, AccountInterface $user = NULL): array {
+  public function buildForm(array $form, FormStateInterface $form_state, ?AccountInterface $user = NULL): array {
     if ($user) {
       $form_state->set('account', $user);
       $form['#title'] = $this->t('Reset password');

diff --git a/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/HDSButtonCKEditor.php b/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/HDSButtonCKEditor.php
@@ -2,10 +2,10 @@
 
 namespace Drupal\hdbt_admin_tools\Plugin\CKEditorPlugin;
 
-use Drupal\ckeditor\CKEditorPluginContextualInterface;
-use Drupal\ckeditor\CKEditorPluginInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Plugin\PluginBase;
+use Drupal\ckeditor\CKEditorPluginContextualInterface;
+use Drupal\ckeditor\CKEditorPluginInterface;
 use Drupal\editor\Entity\Editor;
 
 /**

diff --git a/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/LanguageSelector.php b/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/LanguageSelector.php
@@ -4,10 +4,10 @@
 
 namespace Drupal\hdbt_admin_tools\Plugin\CKEditorPlugin;
 
-use Drupal\ckeditor\CKEditorPluginBase;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManager;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\ckeditor\CKEditorPluginBase;
 use Drupal\editor\Entity\Editor;
 
 /**

diff --git a/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/QuoteCKEditorButton.php b/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/QuoteCKEditorButton.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\hdbt_admin_tools\Plugin\CKEditorPlugin;
 
-use Drupal\ckeditor\CKEditorPluginBase;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\ckeditor\CKEditorPluginBase;
 
 /**
  * Defines the "quote" plugin.

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.module b/modules/helfi_ckeditor/helfi_ckeditor.module
@@ -7,8 +7,8 @@
 
 declare(strict_types=1);
 
-use Drupal\ckeditor5\Plugin\CKEditor5PluginDefinition;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\ckeditor5\Plugin\CKEditor5PluginDefinition;
 
 /**
  * Modify the list of available CKEditor 5 plugins.

diff --git a/modules/helfi_ckeditor/src/Plugin/CKEditor5Plugin/HelfiLanguageSelector.php b/modules/helfi_ckeditor/src/Plugin/CKEditor5Plugin/HelfiLanguageSelector.php
@@ -4,9 +4,9 @@
 
 namespace Drupal\helfi_ckeditor\Plugin\CKEditor5Plugin;
 
-use Drupal\ckeditor5\Plugin\CKEditor5PluginDefault;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManager;
+use Drupal\ckeditor5\Plugin\CKEditor5PluginDefault;
 use Drupal\editor\EditorInterface;
 
 /**

diff --git a/modules/helfi_ckeditor/src/Plugin/CKEditor5Plugin/HelfiLink.php b/modules/helfi_ckeditor/src/Plugin/CKEditor5Plugin/HelfiLink.php
@@ -4,13 +4,13 @@
 
 namespace Drupal\helfi_ckeditor\Plugin\CKEditor5Plugin;
 
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\ckeditor5\HTMLRestrictions;
 use Drupal\ckeditor5\Plugin\CKEditor5PluginConfigurableTrait;
 use Drupal\ckeditor5\Plugin\CKEditor5PluginDefault;
 use Drupal\ckeditor5\Plugin\CKEditor5PluginDefinition;
 use Drupal\ckeditor5\Plugin\CKEditor5PluginElementsSubsetInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\editor\EditorInterface;
 use Drupal\helfi_api_base\Link\InternalDomainResolver;
 use Symfony\Component\DependencyInjection\ContainerInterface;

diff --git a/...i_etusivu_entities/src/Plugin/ExternalEntities/StorageClient/EtusivuJsonApiEntityBase.php b/...i_etusivu_entities/src/Plugin/ExternalEntities/StorageClient/EtusivuJsonApiEntityBase.php
@@ -100,7 +100,7 @@ public static function create(
   /**
    * {@inheritdoc}
    */
-  public function loadMultiple(array $ids = NULL) : array {
+  public function loadMultiple(?array $ids = NULL) : array {
     $ids = $ids ?: [];
 
     $query = [

diff --git a/modules/helfi_etusivu_entities/tests/src/Functional/LocalEntitiesTest.php b/modules/helfi_etusivu_entities/tests/src/Functional/LocalEntitiesTest.php
@@ -4,11 +4,11 @@
 
 namespace Drupal\Tests\helfi_etusivu_entities\Functional;
 
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\node\NodeInterface;
-use Drupal\Tests\block\Traits\BlockCreationTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\block\Traits\BlockCreationTrait;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\node\NodeInterface;
 use Drupal\user\Entity\Role;
 
 /**

diff --git a/modules/helfi_etusivu_entities/tests/src/Kernel/EtusivuJsonApiEntityTest.php b/modules/helfi_etusivu_entities/tests/src/Kernel/EtusivuJsonApiEntityTest.php
@@ -6,12 +6,12 @@
 
 use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\helfi_api_base\Environment\EnvironmentEnum;
-use Drupal\helfi_api_base\Environment\Project;
-use Drupal\helfi_etusivu_entities\Plugin\ExternalEntities\StorageClient\Announcements;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\Tests\helfi_api_base\Traits\ApiTestTrait;
 use Drupal\Tests\helfi_api_base\Traits\EnvironmentResolverTrait;
+use Drupal\helfi_api_base\Environment\EnvironmentEnum;
+use Drupal\helfi_api_base\Environment\Project;
+use Drupal\helfi_etusivu_entities\Plugin\ExternalEntities\StorageClient\Announcements;
 use GuzzleHttp\Psr7\Response;
 
 /**

diff --git a/modules/helfi_media_chart/tests/src/Functional/MediaChartTest.php b/modules/helfi_media_chart/tests/src/Functional/MediaChartTest.php
@@ -5,9 +5,9 @@
 namespace Drupal\Tests\helfi_media_chart\Functional;
 
 use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests media chart functionality.

diff --git a/modules/helfi_media_chart/tests/src/Unit/UrlParserTraitTest.php b/modules/helfi_media_chart/tests/src/Unit/UrlParserTraitTest.php
@@ -4,8 +4,8 @@
 
 namespace Drupal\Tests\helfi_media_chart\Unit;
 
-use Drupal\helfi_media_chart\UrlParserTrait;
 use Drupal\Tests\UnitTestCase;
+use Drupal\helfi_media_chart\UrlParserTrait;
 
 /**
  * Tests UrlParserTrait.

diff --git a/modules/helfi_media_map/tests/src/Functional/MediaMapTest.php b/modules/helfi_media_map/tests/src/Functional/MediaMapTest.php
@@ -5,9 +5,9 @@
 namespace Drupal\Tests\helfi_media_map\Functional;
 
 use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\media\Entity\Media;
 use Drupal\media\Entity\MediaType;
-use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests media map functionality.

diff --git a/modules/helfi_media_map/tests/src/Unit/UrlParserTraitTest.php b/modules/helfi_media_map/tests/src/Unit/UrlParserTraitTest.php
@@ -4,8 +4,8 @@
 
 namespace Drupal\Tests\helfi_media_map\Unit;
 
-use Drupal\helfi_media_map\UrlParserTrait;
 use Drupal\Tests\UnitTestCase;
+use Drupal\helfi_media_map\UrlParserTrait;
 
 /**
  * Tests UrlParserTrait.

diff --git a/modules/helfi_paragraphs_hearings/src/Plugin/ExternalEntities/StorageClient/Hearings.php b/modules/helfi_paragraphs_hearings/src/Plugin/ExternalEntities/StorageClient/Hearings.php
@@ -73,7 +73,7 @@ public static function create(
   /**
    * {@inheritdoc}
    */
-  public function loadMultiple(array $ids = NULL) : array {
+  public function loadMultiple(?array $ids = NULL) : array {
     return $this->query(['ids' => $ids]);
   }
 

diff --git a/modules/helfi_paragraphs_hero/tests/src/Kernel/HeroParagraphTest.php b/modules/helfi_paragraphs_hero/tests/src/Kernel/HeroParagraphTest.php
@@ -4,11 +4,11 @@
 
 namespace Drupal\Tests\helfi_paragraphs_hero\Kernel\Entity;
 
+use Drupal\Tests\helfi_paragraphs_hero\Kernel\KernelTestBase;
 use Drupal\file\Entity\File;
 use Drupal\helfi_paragraphs_hero\Entity\Hero;
 use Drupal\media\Entity\Media;
 use Drupal\paragraphs\Entity\Paragraph;
-use Drupal\Tests\helfi_paragraphs_hero\Kernel\KernelTestBase;
 
 /**
  * Tests Hero installation.

diff --git a/modules/helfi_paragraphs_news_list/src/ElasticExternalEntityBase.php b/modules/helfi_paragraphs_news_list/src/ElasticExternalEntityBase.php
@@ -89,7 +89,7 @@ protected function request(
   /**
    * {@inheritdoc}
    */
-  public function loadMultiple(array $ids = NULL) : array {
+  public function loadMultiple(?array $ids = NULL) : array {
     $data = $this->request([
       'index' => $this->index,
       'body' => [

diff --git a/modules/helfi_paragraphs_news_list/tests/src/Kernel/Entity/NewsFeedParagraphTest.php b/modules/helfi_paragraphs_news_list/tests/src/Kernel/Entity/NewsFeedParagraphTest.php
@@ -4,10 +4,10 @@
 
 namespace Drupal\Tests\helfi_paragraphs_news_list\Kernel\Entity;
 
+use Drupal\Tests\helfi_paragraphs_news_list\Kernel\KernelTestBase;
 use Drupal\external_entities\ExternalEntityStorage;
 use Drupal\helfi_paragraphs_news_list\Entity\NewsFeedParagraph;
 use Drupal\paragraphs\Entity\Paragraph;
-use Drupal\Tests\helfi_paragraphs_news_list\Kernel\KernelTestBase;
 
 /**
  * Tests NewsFeedParagraph installation.

diff --git a/...lfi_paragraphs_news_list/tests/src/Kernel/ExternalEntityStorage/StorageClientTestBase.php b/...lfi_paragraphs_news_list/tests/src/Kernel/ExternalEntityStorage/StorageClientTestBase.php
@@ -5,8 +5,8 @@
 namespace Drupal\Tests\helfi_paragraphs_news_list\Kernel\ExternalEntityStorage;
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\external_entities\ExternalEntityStorage;
 use Drupal\Tests\helfi_paragraphs_news_list\Kernel\KernelTestBase;
+use Drupal\external_entities\ExternalEntityStorage;
 use Elasticsearch\Client;
 use Elasticsearch\Common\Exceptions\BadRequest400Exception;
 use Prophecy\Argument;

diff --git a/modules/helfi_paragraphs_news_list/tests/src/Unit/ClientBuilderTest.php b/modules/helfi_paragraphs_news_list/tests/src/Unit/ClientBuilderTest.php
@@ -4,10 +4,10 @@
 
 namespace Drupal\Tests\helfi_\Unit;
 
+use Drupal\Tests\UnitTestCase;
+use Drupal\Tests\helfi_api_base\Traits\EnvironmentResolverTrait;
 use Drupal\helfi_api_base\Environment\EnvironmentResolver;
 use Drupal\helfi_paragraphs_news_list\ClientBuilder;
-use Drupal\Tests\helfi_api_base\Traits\EnvironmentResolverTrait;
-use Drupal\Tests\UnitTestCase;
 use Elasticsearch\Client;
 
 /**

diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/Coordinates.php b/modules/helfi_react_search/src/Plugin/search_api/processor/Coordinates.php
@@ -29,7 +29,7 @@ class Coordinates extends ProcessorPluginBase {
   /**
    * {@inheritdoc}
    */
-  public function getPropertyDefinitions(DataSourceInterface $datasource = NULL): array {
+  public function getPropertyDefinitions(?DataSourceInterface $datasource = NULL): array {
     $properties = [];
 
     if (!$datasource) {

diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/DistrictImageAbsoluteUrl.php b/modules/helfi_react_search/src/Plugin/search_api/processor/DistrictImageAbsoluteUrl.php
@@ -29,7 +29,7 @@ class DistrictImageAbsoluteUrl extends ProcessorPluginBase {
   /**
    * {@inheritdoc}
    */
-  public function getPropertyDefinitions(DatasourceInterface $datasource = NULL) {
+  public function getPropertyDefinitions(?DatasourceInterface $datasource = NULL) {
     $properties = [];
 
     if ($datasource) {

diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/MediaReferenceToObject.php b/modules/helfi_react_search/src/Plugin/search_api/processor/MediaReferenceToObject.php
@@ -52,7 +52,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function getPropertyDefinitions(DataSourceInterface $datasource = NULL): array {
+  public function getPropertyDefinitions(?DataSourceInterface $datasource = NULL): array {
     $properties = [];
 
     if (!$datasource) {

diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectExecutionSchedule.php b/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectExecutionSchedule.php
@@ -27,7 +27,7 @@ class ProjectExecutionSchedule extends ProcessorPluginBase {
   /**
    * {@inheritdoc}
    */
-  public function getPropertyDefinitions(DatasourceInterface $datasource = NULL) {
+  public function getPropertyDefinitions(?DatasourceInterface $datasource = NULL) {
     $properties = [];
 
     if ($datasource) {

diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectImageAbsoluteUrl.php b/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectImageAbsoluteUrl.php
@@ -29,7 +29,7 @@ class ProjectImageAbsoluteUrl extends ProcessorPluginBase {
   /**
    * {@inheritdoc}
    */
-  public function getPropertyDefinitions(DatasourceInterface $datasource = NULL) {
+  public function getPropertyDefinitions(?DatasourceInterface $datasource = NULL) {
     $properties = [];
 
     if ($datasource) {

diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectPlanSchedule.php b/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectPlanSchedule.php
@@ -27,7 +27,7 @@ class ProjectPlanSchedule extends ProcessorPluginBase {
   /**
    * {@inheritdoc}
    */
-  public function getPropertyDefinitions(DatasourceInterface $datasource = NULL) {
+  public function getPropertyDefinitions(?DatasourceInterface $datasource = NULL) {
     $properties = [];
 
     if ($datasource) {

diff --git a/modules/helfi_react_search/tests/src/Unit/LinkedEventsTest.php b/modules/helfi_react_search/tests/src/Unit/LinkedEventsTest.php
@@ -11,14 +11,14 @@
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Tests\UnitTestCase;
+use Drupal\Tests\helfi_api_base\Traits\ApiTestTrait;
 use Drupal\helfi_api_base\ApiClient\ApiClient;
 use Drupal\helfi_api_base\ApiClient\ApiResponse;
 use Drupal\helfi_api_base\Environment\EnvironmentResolver;
 use Drupal\helfi_api_base\Environment\EnvironmentResolverInterface;
 use Drupal\helfi_api_base\Environment\Project;
 use Drupal\helfi_react_search\LinkedEvents;
-use Drupal\Tests\helfi_api_base\Traits\ApiTestTrait;
-use Drupal\Tests\UnitTestCase;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Psr7\Response;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -115,8 +115,8 @@ private function getTimeMock(int $expectedTime) : ObjectProphecy {
    */
   private function getApiClientMock(
     ClientInterface $httpClient,
-    TimeInterface $time = NULL,
-    EnvironmentResolverInterface $environmentResolver = NULL,
+    ?TimeInterface $time = NULL,
+    ?EnvironmentResolverInterface $environmentResolver = NULL,
   ): ApiClient {
     if (!$time) {
       $time = $this->getTimeMock(time())->reveal();
@@ -154,8 +154,8 @@ private function getApiClientMock(
    */
   private function getSut(
     ApiClient $client,
-    LanguageManagerInterface $languageManager = NULL,
-    LoggerInterface $logger = NULL,
+    ?LanguageManagerInterface $languageManager = NULL,
+    ?LoggerInterface $logger = NULL,
   ) : LinkedEvents {
 
     if (!$languageManager) {

diff --git a/modules/helfi_react_search/tests/src/Unit/SearchApiIndexItemTest.php b/modules/helfi_react_search/tests/src/Unit/SearchApiIndexItemTest.php
@@ -6,13 +6,13 @@
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Tests\UnitTestCase;
 use Drupal\helfi_react_search\Plugin\DebugDataItem\SearchApiIndex;
 use Drupal\search_api\Entity\SearchApiConfigEntityStorage;
 use Drupal\search_api\IndexInterface;
 use Drupal\search_api\SearchApiException;
 use Drupal\search_api\ServerInterface;
 use Drupal\search_api\Tracker\TrackerInterface;
-use Drupal\Tests\UnitTestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 
 /**

diff --git a/modules/helfi_tpr_config/src/Drush/Commands/RemoveNonHelsinkiTPRUnitsCommands.php b/modules/helfi_tpr_config/src/Drush/Commands/RemoveNonHelsinkiTPRUnitsCommands.php
@@ -4,9 +4,9 @@
 
 namespace Drupal\helfi_tpr_config\Drush\Commands;
 
-use Drupal\content_lock\ContentLock\ContentLock;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\content_lock\ContentLock\ContentLock;
 use Drush\Attributes\Command;
 use Drush\Commands\AutowireTrait;
 use Drush\Commands\DrushCommands;

diff --git a/modules/helfi_tpr_config/tests/src/Functional/EntityOgImageTest.php b/modules/helfi_tpr_config/tests/src/Functional/EntityOgImageTest.php
@@ -4,11 +4,11 @@
 
 namespace Drupal\Tests\helfi_tpr_config\Functional;
 
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\TestFileCreationTrait;
 use Drupal\file\Entity\File;
 use Drupal\helfi_tpr\Entity\Unit;
 use Drupal\media\Entity\Media;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\TestFileCreationTrait;
 
 /**
  * Tests default og image.