From d0c943b529f96d03cc37783d3c28492a0dae4937 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 24 Sep 2024 11:19:58 +0200 Subject: [PATCH 1/4] Release 7.3.5 --- CHANGELOG.md | 6 ++++++ thunder.info.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1456541b0..bd1d3526b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [7.3.5](https://github.com/thunder/thunder-distribution/tree/7.3.5) 2024-09-24 + +[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.3...7.3.5) + +Allow scheduler version ^3.0 in composer.json + ## [7.3.3](https://github.com/thunder/thunder-distribution/tree/7.3.3) 2024-08-22 [Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.2...7.3.3) diff --git a/thunder.info.yml b/thunder.info.yml index 0a166329a..d83b852c7 100644 --- a/thunder.info.yml +++ b/thunder.info.yml @@ -3,7 +3,7 @@ type: profile description: 'The Drupal based CMS for professional publishing.' project: thunder core_version_requirement: ~10.3.0 -version: '7.3.3' +version: '7.3.5' distribution: name: Thunder From 43889848c3e797e61c815ae6d92cf4332d4c9341 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 24 Sep 2024 13:49:13 +0200 Subject: [PATCH 2/4] Lets try --- .../src/Plugin/GraphQL/DataProducer/EntityLinks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php b/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php index 3a3d50ab6..e07bc5ef0 100644 --- a/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php +++ b/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php @@ -98,7 +98,7 @@ public function resolve(EntityInterface $entity): array { }); $transformed_keys = array_map([$this, 'toCamelCase'], array_keys($links)); - return array_combine($transformed_keys, $links); + return array_combine($transformed_keys, $links) ?? []; }); return $result ?? []; } From 9989a3e929afc772f8046ce5ed65ae906d19b772 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 24 Sep 2024 14:01:47 +0200 Subject: [PATCH 3/4] CS fixes --- .../src/Form/NodeRevisionRevertDefaultForm.php | 2 +- .../src/Plugin/GraphQL/DataProducer/EntityLinks.php | 3 ++- modules/thunder_gqls/src/Traits/ResolverHelperTrait.php | 2 +- .../src/Functional/DataProducer/ThunderBreadcrumbTest.php | 2 +- .../src/Functional/DataProducer/ThunderSearchApiTest.php | 2 +- modules/thunder_gqls/tests/src/Functional/SchemaTest.php | 2 +- .../tests/src/Kernel/DataProducer/EntitiesWithTermTest.php | 2 +- .../tests/src/Kernel/DataProducer/EntityLinksTest.php | 2 +- .../tests/src/Kernel/DataProducer/ParagraphsBehaviorTest.php | 2 +- .../tests/src/Kernel/DataProducer/ThunderMetatagsTest.php | 4 ++-- .../tests/src/Kernel/DataProducer/ThunderRedirectTest.php | 2 +- .../src/Kernel/TypeResolver/DecoratableTypeResolverTest.php | 2 +- .../tests/src/Functional/FilenameTransliterationTest.php | 2 +- .../src/Plugin/Field/FieldWidget/ModerationStateWidget.php | 2 +- modules/thunder_workflow/src/ThunderWorkflowFormHelper.php | 4 ++-- tests/src/Functional/Integration/ContentTranslationTest.php | 2 +- tests/src/Functional/ModeratedContentSchedulingTest.php | 2 +- .../Integration/EntityReferenceActionsTest.php | 2 +- .../FunctionalJavascript/Integration/ParagraphsPasteTest.php | 4 ++-- tests/src/FunctionalJavascript/MetaInformationTest.php | 2 +- tests/src/Kernel/MetatagTest.php | 2 +- tests/src/Traits/ThunderKernelTestTrait.php | 2 +- thunder.post_update.php | 2 +- 23 files changed, 27 insertions(+), 26 deletions(-) diff --git a/modules/thunder_article/src/Form/NodeRevisionRevertDefaultForm.php b/modules/thunder_article/src/Form/NodeRevisionRevertDefaultForm.php index 458a72c50..f33c82745 100644 --- a/modules/thunder_article/src/Form/NodeRevisionRevertDefaultForm.php +++ b/modules/thunder_article/src/Form/NodeRevisionRevertDefaultForm.php @@ -99,7 +99,7 @@ public function getDescription(): TranslatableMarkup { /** * {@inheritdoc} */ - public function buildForm(array $form, FormStateInterface $form_state, NodeInterface $node = NULL): array { + public function buildForm(array $form, FormStateInterface $form_state, ?NodeInterface $node = NULL): array { $this->revision = $node; return parent::buildForm($form, $form_state); } diff --git a/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php b/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php index e07bc5ef0..2e748d053 100644 --- a/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php +++ b/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php @@ -98,7 +98,8 @@ public function resolve(EntityInterface $entity): array { }); $transformed_keys = array_map([$this, 'toCamelCase'], array_keys($links)); - return array_combine($transformed_keys, $links) ?? []; + $combined = array_combine($transformed_keys, $links); + return !$combined ? [] : $combined; }); return $result ?? []; } diff --git a/modules/thunder_gqls/src/Traits/ResolverHelperTrait.php b/modules/thunder_gqls/src/Traits/ResolverHelperTrait.php index 86d66c1e9..5df7e48b4 100644 --- a/modules/thunder_gqls/src/Traits/ResolverHelperTrait.php +++ b/modules/thunder_gqls/src/Traits/ResolverHelperTrait.php @@ -61,7 +61,7 @@ protected function createResolverBuilder(): void { * @return \Drupal\graphql\GraphQL\Resolver\Composite * The field data producer. */ - public function fromEntityReference(string $field, ResolverInterface $entity = NULL, bool $multiValue = TRUE) { + public function fromEntityReference(string $field, ?ResolverInterface $entity = NULL, bool $multiValue = TRUE) { return $this->builder->compose( $this->builder->produce('entity_reference') ->map('field', $this->builder->fromValue($field)) diff --git a/modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderBreadcrumbTest.php b/modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderBreadcrumbTest.php index 2c145a686..71ae6e14c 100644 --- a/modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderBreadcrumbTest.php +++ b/modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderBreadcrumbTest.php @@ -2,8 +2,8 @@ namespace Drupal\Tests\thunder_gqls\Functional; -use Drupal\redirect\Entity\Redirect; use Drupal\Tests\graphql\Traits\DataProducerExecutionTrait; +use Drupal\redirect\Entity\Redirect; /** * Test the schema. diff --git a/modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderSearchApiTest.php b/modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderSearchApiTest.php index a6831e38f..7e4d035c6 100644 --- a/modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderSearchApiTest.php +++ b/modules/thunder_gqls/tests/src/Functional/DataProducer/ThunderSearchApiTest.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\thunder_gqls\Functional\DataProducer; -use Drupal\search_api\Query\QueryInterface; use Drupal\Tests\graphql\Traits\DataProducerExecutionTrait; use Drupal\Tests\thunder_gqls\Functional\ThunderGqlsTestBase; +use Drupal\search_api\Query\QueryInterface; /** * Test ThunderSearchApi data producer. diff --git a/modules/thunder_gqls/tests/src/Functional/SchemaTest.php b/modules/thunder_gqls/tests/src/Functional/SchemaTest.php index 0131e5fe5..a5212db02 100644 --- a/modules/thunder_gqls/tests/src/Functional/SchemaTest.php +++ b/modules/thunder_gqls/tests/src/Functional/SchemaTest.php @@ -2,8 +2,8 @@ namespace Drupal\Tests\thunder_gqls\Functional; -use Drupal\access_unpublished\Entity\AccessToken; use Drupal\Component\Serialization\Json; +use Drupal\access_unpublished\Entity\AccessToken; use Drupal\media\Entity\MediaType; use Drupal\node\Entity\Node; diff --git a/modules/thunder_gqls/tests/src/Kernel/DataProducer/EntitiesWithTermTest.php b/modules/thunder_gqls/tests/src/Kernel/DataProducer/EntitiesWithTermTest.php index a065cf9b4..3479c63b7 100644 --- a/modules/thunder_gqls/tests/src/Kernel/DataProducer/EntitiesWithTermTest.php +++ b/modules/thunder_gqls/tests/src/Kernel/DataProducer/EntitiesWithTermTest.php @@ -2,13 +2,13 @@ namespace Drupal\Tests\thunder_gqls\Kernel\DataProducer; +use Drupal\Tests\graphql\Kernel\GraphQLTestBase; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\node\Entity\Node; use Drupal\node\Entity\NodeType; use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; -use Drupal\Tests\graphql\Kernel\GraphQLTestBase; /** * Test entities_with_term data producer. diff --git a/modules/thunder_gqls/tests/src/Kernel/DataProducer/EntityLinksTest.php b/modules/thunder_gqls/tests/src/Kernel/DataProducer/EntityLinksTest.php index 7f4c9ff62..07deac1d1 100644 --- a/modules/thunder_gqls/tests/src/Kernel/DataProducer/EntityLinksTest.php +++ b/modules/thunder_gqls/tests/src/Kernel/DataProducer/EntityLinksTest.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\thunder_gqls\Kernel\DataProducer; +use Drupal\Tests\graphql\Kernel\GraphQLTestBase; use Drupal\node\Entity\Node; use Drupal\node\Entity\NodeType; -use Drupal\Tests\graphql\Kernel\GraphQLTestBase; /** * Data producers EntityLinks test class. diff --git a/modules/thunder_gqls/tests/src/Kernel/DataProducer/ParagraphsBehaviorTest.php b/modules/thunder_gqls/tests/src/Kernel/DataProducer/ParagraphsBehaviorTest.php index b5f077e9d..9f2347a8e 100644 --- a/modules/thunder_gqls/tests/src/Kernel/DataProducer/ParagraphsBehaviorTest.php +++ b/modules/thunder_gqls/tests/src/Kernel/DataProducer/ParagraphsBehaviorTest.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\thunder_gqls\Kernel\DataProducer; +use Drupal\Tests\graphql\Kernel\GraphQLTestBase; use Drupal\paragraphs\Entity\Paragraph; use Drupal\paragraphs\Entity\ParagraphsType; -use Drupal\Tests\graphql\Kernel\GraphQLTestBase; /** * Tests the paragraphs behavior data producer. diff --git a/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderMetatagsTest.php b/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderMetatagsTest.php index a261ac857..ed25bf6ad 100644 --- a/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderMetatagsTest.php +++ b/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderMetatagsTest.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\thunder_gqls\Kernel\DataProducer; -use Drupal\node\Entity\Node; -use Drupal\Tests\graphql\Kernel\GraphQLTestBase; use Drupal\Tests\TestFileCreationTrait; +use Drupal\Tests\graphql\Kernel\GraphQLTestBase; +use Drupal\node\Entity\Node; /** * Data producers Metatags test class. diff --git a/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderRedirectTest.php b/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderRedirectTest.php index 422909e1e..4129e9f5f 100644 --- a/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderRedirectTest.php +++ b/modules/thunder_gqls/tests/src/Kernel/DataProducer/ThunderRedirectTest.php @@ -3,9 +3,9 @@ namespace Drupal\Tests\thunder_gqls\Kernel\DataProducer; use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Tests\graphql\Kernel\GraphQLTestBase; use Drupal\node\Entity\Node; use Drupal\node\NodeInterface; -use Drupal\Tests\graphql\Kernel\GraphQLTestBase; /** * ThunderRedirect data producer test class. diff --git a/modules/thunder_gqls/tests/src/Kernel/TypeResolver/DecoratableTypeResolverTest.php b/modules/thunder_gqls/tests/src/Kernel/TypeResolver/DecoratableTypeResolverTest.php index 297e4caf1..79ff54a15 100644 --- a/modules/thunder_gqls/tests/src/Kernel/TypeResolver/DecoratableTypeResolverTest.php +++ b/modules/thunder_gqls/tests/src/Kernel/TypeResolver/DecoratableTypeResolverTest.php @@ -2,8 +2,8 @@ namespace Drupal\Tests\thunder_gqls\Kernel\TypeResolver; -use Drupal\node\NodeInterface; use Drupal\Tests\graphql\Kernel\GraphQLTestBase; +use Drupal\node\NodeInterface; use Drupal\thunder_gqls\GraphQL\DecoratableTypeResolver; /** diff --git a/modules/thunder_media/tests/src/Functional/FilenameTransliterationTest.php b/modules/thunder_media/tests/src/Functional/FilenameTransliterationTest.php index d5e6845c5..ed6fd8bcd 100644 --- a/modules/thunder_media/tests/src/Functional/FilenameTransliterationTest.php +++ b/modules/thunder_media/tests/src/Functional/FilenameTransliterationTest.php @@ -4,8 +4,8 @@ use Drupal\Core\File\FileExists; use Drupal\Core\StreamWrapper\PublicStream; -use Drupal\file\Entity\File; use Drupal\Tests\thunder\Functional\ThunderTestBase; +use Drupal\file\Entity\File; /** * Tests for transliteration of file names. diff --git a/modules/thunder_workflow/src/Plugin/Field/FieldWidget/ModerationStateWidget.php b/modules/thunder_workflow/src/Plugin/Field/FieldWidget/ModerationStateWidget.php index 24d0ad65d..efb3d8227 100644 --- a/modules/thunder_workflow/src/Plugin/Field/FieldWidget/ModerationStateWidget.php +++ b/modules/thunder_workflow/src/Plugin/Field/FieldWidget/ModerationStateWidget.php @@ -2,9 +2,9 @@ namespace Drupal\thunder_workflow\Plugin\Field\FieldWidget; -use Drupal\content_moderation\Plugin\Field\FieldWidget\ModerationStateWidget as CoreModerationStateWidget; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\content_moderation\Plugin\Field\FieldWidget\ModerationStateWidget as CoreModerationStateWidget; /** * Plugin implementation of the 'thunder_moderation_state_default' widget. diff --git a/modules/thunder_workflow/src/ThunderWorkflowFormHelper.php b/modules/thunder_workflow/src/ThunderWorkflowFormHelper.php index 091662a10..bd8538e46 100644 --- a/modules/thunder_workflow/src/ThunderWorkflowFormHelper.php +++ b/modules/thunder_workflow/src/ThunderWorkflowFormHelper.php @@ -2,8 +2,6 @@ namespace Drupal\thunder_workflow; -use Drupal\content_moderation\ModerationInformationInterface; -use Drupal\content_moderation\StateTransitionValidationInterface; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Form\FormStateInterface; @@ -12,6 +10,8 @@ use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\Theme\ThemeManagerInterface; use Drupal\Core\Url; +use Drupal\content_moderation\ModerationInformationInterface; +use Drupal\content_moderation\StateTransitionValidationInterface; use Drupal\node\NodeInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/src/Functional/Integration/ContentTranslationTest.php b/tests/src/Functional/Integration/ContentTranslationTest.php index 27bb3982c..dcddeadda 100644 --- a/tests/src/Functional/Integration/ContentTranslationTest.php +++ b/tests/src/Functional/Integration/ContentTranslationTest.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\thunder\Functional\Integration; +use Drupal\Tests\thunder\Functional\ThunderTestBase; use Drupal\field\Entity\FieldConfig; use Drupal\language\Entity\ConfigurableLanguage; -use Drupal\Tests\thunder\Functional\ThunderTestBase; /** * Tests integration with the content_translation. diff --git a/tests/src/Functional/ModeratedContentSchedulingTest.php b/tests/src/Functional/ModeratedContentSchedulingTest.php index 4abdd5251..a98c70dd9 100644 --- a/tests/src/Functional/ModeratedContentSchedulingTest.php +++ b/tests/src/Functional/ModeratedContentSchedulingTest.php @@ -2,8 +2,8 @@ namespace Drupal\Tests\thunder\Functional; -use Drupal\node\Entity\Node; use Drupal\Tests\Traits\Core\CronRunTrait; +use Drupal\node\Entity\Node; /** * Tests publishing/unpublishing scheduling for moderated nodes. diff --git a/tests/src/FunctionalJavascript/Integration/EntityReferenceActionsTest.php b/tests/src/FunctionalJavascript/Integration/EntityReferenceActionsTest.php index 816862a1e..1f1a25271 100644 --- a/tests/src/FunctionalJavascript/Integration/EntityReferenceActionsTest.php +++ b/tests/src/FunctionalJavascript/Integration/EntityReferenceActionsTest.php @@ -2,9 +2,9 @@ namespace Drupal\Tests\thunder\FunctionalJavascript\Integration; -use Drupal\media\Entity\Media; use Drupal\Tests\thunder\FunctionalJavascript\ThunderJavascriptTestBase; use Drupal\Tests\thunder\FunctionalJavascript\ThunderParagraphsTestTrait; +use Drupal\media\Entity\Media; /** * Tests integration with the entity_reference_actions and views_bulk_edit. diff --git a/tests/src/FunctionalJavascript/Integration/ParagraphsPasteTest.php b/tests/src/FunctionalJavascript/Integration/ParagraphsPasteTest.php index ad5350eeb..f833ff3f8 100644 --- a/tests/src/FunctionalJavascript/Integration/ParagraphsPasteTest.php +++ b/tests/src/FunctionalJavascript/Integration/ParagraphsPasteTest.php @@ -3,14 +3,14 @@ namespace Drupal\Tests\thunder\FunctionalJavascript\Integration; use Drupal\Core\Entity\Entity\EntityFormDisplay; -use Drupal\field\Entity\FieldConfig; -use Drupal\field\Entity\FieldStorageConfig; use Drupal\Tests\node\Traits\NodeCreationTrait; use Drupal\Tests\paragraphs\FunctionalJavascript\LoginAdminTrait; use Drupal\Tests\paragraphs_paste\FunctionalJavascript\ParagraphsPasteJavascriptTestTrait; use Drupal\Tests\thunder\FunctionalJavascript\ThunderArticleTestTrait; use Drupal\Tests\thunder\FunctionalJavascript\ThunderJavascriptTestBase; use Drupal\Tests\thunder\FunctionalJavascript\ThunderParagraphsTestTrait; +use Drupal\field\Entity\FieldConfig; +use Drupal\field\Entity\FieldStorageConfig; /** * Tests the creation of paragraphs by pasting random data. diff --git a/tests/src/FunctionalJavascript/MetaInformationTest.php b/tests/src/FunctionalJavascript/MetaInformationTest.php index 43bb678ee..961491147 100644 --- a/tests/src/FunctionalJavascript/MetaInformationTest.php +++ b/tests/src/FunctionalJavascript/MetaInformationTest.php @@ -2,8 +2,8 @@ namespace Drupal\Tests\thunder\FunctionalJavascript; -use Drupal\simple_sitemap\Queue\QueueWorker; use Drupal\Tests\Traits\Core\CronRunTrait; +use Drupal\simple_sitemap\Queue\QueueWorker; /** * Testing of Meta Information. diff --git a/tests/src/Kernel/MetatagTest.php b/tests/src/Kernel/MetatagTest.php index 23b76d3bb..e35472e43 100644 --- a/tests/src/Kernel/MetatagTest.php +++ b/tests/src/Kernel/MetatagTest.php @@ -3,8 +3,8 @@ namespace Drupal\Tests\thunder\Kernel\Integration; use Drupal\KernelTests\KernelTestBase; -use Drupal\node\Entity\Node; use Drupal\Tests\thunder\Traits\ThunderKernelTestTrait; +use Drupal\node\Entity\Node; /** * Tests integration with the metatag module. diff --git a/tests/src/Traits/ThunderKernelTestTrait.php b/tests/src/Traits/ThunderKernelTestTrait.php index 69c935957..ba2169be4 100644 --- a/tests/src/Traits/ThunderKernelTestTrait.php +++ b/tests/src/Traits/ThunderKernelTestTrait.php @@ -4,11 +4,11 @@ use Drupal\Core\Config\FileStorage; use Drupal\Core\Config\InstallStorage; +use Drupal\Tests\TestFileCreationTrait; use Drupal\file\Entity\File; use Drupal\file\FileInterface; use Drupal\media\Entity\Media; use Drupal\media\MediaInterface; -use Drupal\Tests\TestFileCreationTrait; /** * Use this trait to create config and data in kernel tests. diff --git a/thunder.post_update.php b/thunder.post_update.php index e34b956ee..9f40cb7dd 100644 --- a/thunder.post_update.php +++ b/thunder.post_update.php @@ -5,8 +5,8 @@ * Update functions for the thunder installation profile. */ -use Drupal\ckeditor5\SmartDefaultSettings; use Drupal\Core\Entity\Entity\EntityFormDisplay; +use Drupal\ckeditor5\SmartDefaultSettings; use Drupal\editor\Entity\Editor; use Drupal\entity_browser\Entity\EntityBrowser; use Drupal\user\Entity\Role; From 4f8ac791991ae37d9200f22854965461d5cb7457 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 24 Sep 2024 14:50:05 +0200 Subject: [PATCH 4/4] Revert --- .../src/Plugin/GraphQL/DataProducer/EntityLinks.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php b/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php index 2e748d053..3a3d50ab6 100644 --- a/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php +++ b/modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/EntityLinks.php @@ -98,8 +98,7 @@ public function resolve(EntityInterface $entity): array { }); $transformed_keys = array_map([$this, 'toCamelCase'], array_keys($links)); - $combined = array_combine($transformed_keys, $links); - return !$combined ? [] : $combined; + return array_combine($transformed_keys, $links); }); return $result ?? []; }