From 3ca171f606bf6ecd46673579e5340ec0ab5f4ba0 Mon Sep 17 00:00:00 2001 From: Project Update Bot Date: Fri, 6 Jan 2023 00:35:13 +1000 Subject: [PATCH 1/8] Issue #3286221: Automated Drupal 10 compatibility fixes --- better_normalizers.info.yml | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/better_normalizers.info.yml b/better_normalizers.info.yml index 08ab825..399793e 100644 --- a/better_normalizers.info.yml +++ b/better_normalizers.info.yml @@ -1,7 +1,7 @@ name: Better Normalizers type: module description: 'Improve the normalizers in core.' -core_version_requirement: ^8.7.7 || ^9 +core_version_requirement: ^9 || ^10 dependencies: - - drupal:hal + - hal:hal diff --git a/composer.json b/composer.json index 3f81962..3cff26d 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "drupal/core": "^8.7.7 || ^9" + "drupal/core": "^9 || ^10" }, "homepage": "https://www.drupal.org/project/better_normalizers", "support": { -- GitLab From aa09b5f5ec8d89d5c74e90a100ce6b65485a0c1d Mon Sep 17 00:00:00 2001 From: Abhinesh Dhiman <52457-abhineshdhiman@users.noreply.drupalcode.org> Date: Mon, 27 Feb 2023 11:55:47 +0000 Subject: [PATCH 2/8] D10 Changes --- src/Normalizer/FileEntityNormalizer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Normalizer/FileEntityNormalizer.php b/src/Normalizer/FileEntityNormalizer.php index 6b96a8f..ecc257d 100644 --- a/src/Normalizer/FileEntityNormalizer.php +++ b/src/Normalizer/FileEntityNormalizer.php @@ -38,7 +38,7 @@ class FileEntityNormalizer extends ContentEntityNormalizer { /** * {@inheritdoc} */ - public function normalize($entity, $format = NULL, array $context = array()) { + public function normalize($entity, $format = NULL, array $context = array()) : float|array|int|bool|\ArrayObject|string|null { $data = parent::normalize($entity, $format, $context); if (!isset($context['included_fields']) || in_array('data', $context['included_fields'])) { // Save base64-encoded file contents to the "data" property. @@ -53,7 +53,7 @@ class FileEntityNormalizer extends ContentEntityNormalizer { /** * {@inheritdoc} */ - public function denormalize($data, $class, $format = NULL, array $context = array()) { + public function denormalize($data, $class, $format = NULL, array $context = array()) : float|array|int|bool|\ArrayObject|string|null { // Avoid 'data' being treated as a field. $file_data = $data['data'][0]['value']; unset($data['data']); -- GitLab From 47814d3964d585da6aef56b9cf6304d27b8a91e4 Mon Sep 17 00:00:00 2001 From: Abhinesh Dhiman <52457-abhineshdhiman@users.noreply.drupalcode.org> Date: Mon, 27 Feb 2023 11:56:27 +0000 Subject: [PATCH 3/8] D10 Changes --- src/Normalizer/FileItemNormalizer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Normalizer/FileItemNormalizer.php b/src/Normalizer/FileItemNormalizer.php index 63e668d..66ead62 100644 --- a/src/Normalizer/FileItemNormalizer.php +++ b/src/Normalizer/FileItemNormalizer.php @@ -31,7 +31,7 @@ class FileItemNormalizer extends EntityReferenceItemNormalizer { /** * {@inheritdoc} */ - public function normalize($field_item, $format = NULL, array $context = array()) { + public function normalize($field_item, $format = NULL, array $context = array()) : float|array|int|bool|\ArrayObject|string|null { /** @var \Drupal\file\Plugin\Field\FieldType\FileItem $field_item */ $data = parent::normalize($field_item, $format, $context); -- GitLab From b6e0bb576b99b0d9f4544a4485f492a9d954c0e0 Mon Sep 17 00:00:00 2001 From: Abhinesh Dhiman <52457-abhineshdhiman@users.noreply.drupalcode.org> Date: Mon, 27 Feb 2023 11:57:18 +0000 Subject: [PATCH 4/8] D10 Changes --- src/Normalizer/MenuLinkContentNormalizer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Normalizer/MenuLinkContentNormalizer.php b/src/Normalizer/MenuLinkContentNormalizer.php index 999b025..512ab87 100644 --- a/src/Normalizer/MenuLinkContentNormalizer.php +++ b/src/Normalizer/MenuLinkContentNormalizer.php @@ -64,7 +64,7 @@ class MenuLinkContentNormalizer extends ContentEntityNormalizer { /** * {@inheritdoc} */ - public function normalize($entity, $format = NULL, array $context = array()) { + public function normalize($entity, $format = NULL, array $context = array()) : float|array|int|bool|\ArrayObject|string|null { $normalized = parent::normalize($entity, $format, $context); if (isset($normalized['link']) && is_array($normalized['link'])) { foreach ($normalized['link'] as $key => $link) { @@ -111,7 +111,7 @@ class MenuLinkContentNormalizer extends ContentEntityNormalizer { /** * {@inheritdoc} */ - public function denormalize($data, $class, $format = NULL, array $context = array()) { + public function denormalize($data, $class, $format = NULL, array $context = array()) : float|array|int|bool|\ArrayObject|string|null { if (isset($data['link']) && is_array($data['link'])) { foreach ($data['link'] as $key => $link) { try { -- GitLab From a838264ea5b04b67b0be2fb1fbec314df709d5e4 Mon Sep 17 00:00:00 2001 From: "Pucci, Murilo henrique [GTSBR NON-J&J]" Date: Tue, 6 Jun 2023 11:28:51 -0300 Subject: [PATCH 5/8] Add #3354893 and drupal/hal as a dependency --- composer.json | 3 ++- src/BetterNormalizersServiceProvider.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 3cff26d..fae833c 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,8 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^9 || ^10", + "drupal/hal": "^2.0" }, "homepage": "https://www.drupal.org/project/better_normalizers", "support": { diff --git a/src/BetterNormalizersServiceProvider.php b/src/BetterNormalizersServiceProvider.php index d7bd8fb..94c8270 100644 --- a/src/BetterNormalizersServiceProvider.php +++ b/src/BetterNormalizersServiceProvider.php @@ -27,7 +27,8 @@ class BetterNormalizersServiceProvider extends ServiceProviderBase { )); // The priority must be higher than that of // serializer.normalizer.file_entity.hal in hal.services.yml. - $service_definition->addTag('normalizer', array('priority' => 30)); + $service_definition->addTag('normalizer', ['priority' => 30]); + $service_definition->setPublic(TRUE); $container->setDefinition('serializer.normalizer.entity.file_entity', $service_definition); // Add a normalizer service for file fields. @@ -37,13 +38,14 @@ class BetterNormalizersServiceProvider extends ServiceProviderBase { new Reference('entity_type.manager'), )); // Supersede EntityReferenceItemNormalizer. - $service_definition->addTag('normalizer', array('priority' => 20)); + $service_definition->addTag('normalizer', ['priority' => 20]); + $service_definition->setPublic(TRUE); $container->setDefinition('serializer.normalizer.entity_reference_item.file_entity', $service_definition); $modules = $container->getParameter('container.modules'); if (isset($modules['menu_link_content'])) { // Add a normalizer service for menu-link-content entities. - $service_definition = new Definition('Drupal\better_normalizers\Normalizer\MenuLinkContentNormalizer', array( + $service_definition = new Definition('Drupal\better_normalizers\Normalizer\MenuLinkContentNormalizer', [ new Reference('hal.link_manager'), new Reference('entity_type.manager'), new Reference('module_handler'), @@ -51,11 +53,12 @@ class BetterNormalizersServiceProvider extends ServiceProviderBase { new Reference('entity_field.manager'), new Reference('serializer.normalizer.entity_reference_item.hal'), new Reference('entity.repository'), - )); + ]); // The priority must be higher than that of // serializer.normalizer.entity.hal in hal.services.yml, but lower than // better_normalizers.normalizer.menu_link_content.hal. - $service_definition->addTag('normalizer', array('priority' => 30)); + $service_definition->addTag('normalizer', ['priority' => 30]); + $service_definition->setPublic(TRUE); $container->setDefinition('serializer.normalizer.menu_link_content.hal', $service_definition); } -- GitLab From bbd5a07772f725e136541b7a4d7f591df7abc652 Mon Sep 17 00:00:00 2001 From: "Pucci, Murilo henrique [GTSBR NON-J&J]" Date: Wed, 14 Jun 2023 14:59:43 -0300 Subject: [PATCH 6/8] Fix drupal-check minor issue --- tests/src/Kernel/MenuLinkContentNormalizerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/Kernel/MenuLinkContentNormalizerTest.php b/tests/src/Kernel/MenuLinkContentNormalizerTest.php index 38441ca..4d23b59 100644 --- a/tests/src/Kernel/MenuLinkContentNormalizerTest.php +++ b/tests/src/Kernel/MenuLinkContentNormalizerTest.php @@ -18,7 +18,7 @@ class MenuLinkContentNormalizerTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = [ + protected static $modules = [ 'better_normalizers', 'serialization', 'menu_link_content', @@ -33,7 +33,7 @@ class MenuLinkContentNormalizerTest extends KernelTestBase { /** * {@inheritdoc} */ - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->installEntitySchema('node'); $this->installEntitySchema('user'); -- GitLab From f8b6194969fc8f8770db66da59ff637f9d7e535f Mon Sep 17 00:00:00 2001 From: "Pucci, Murilo henrique [GTSBR NON-J&J]" Date: Mon, 26 Jun 2023 12:15:14 -0300 Subject: [PATCH 7/8] Fix tests --- composer.json | 2 +- src/Normalizer/MenuLinkContentNormalizer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index fae833c..309b9e9 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0-or-later", "require": { "drupal/core": "^9 || ^10", - "drupal/hal": "^2.0" + "drupal/hal": "^1.0 || ^2.0" }, "homepage": "https://www.drupal.org/project/better_normalizers", "support": { diff --git a/src/Normalizer/MenuLinkContentNormalizer.php b/src/Normalizer/MenuLinkContentNormalizer.php index 512ab87..f79f3b2 100644 --- a/src/Normalizer/MenuLinkContentNormalizer.php +++ b/src/Normalizer/MenuLinkContentNormalizer.php @@ -111,7 +111,7 @@ class MenuLinkContentNormalizer extends ContentEntityNormalizer { /** * {@inheritdoc} */ - public function denormalize($data, $class, $format = NULL, array $context = array()) : float|array|int|bool|\ArrayObject|string|null { + public function denormalize($data, $class, $format = NULL, array $context = array()): mixed { if (isset($data['link']) && is_array($data['link'])) { foreach ($data['link'] as $key => $link) { try { -- GitLab From 312e168ef82f385ef404344e22e4acbdd5b02aa6 Mon Sep 17 00:00:00 2001 From: "Pucci, Murilo henrique [GTSBR NON-J&J]" Date: Mon, 26 Jun 2023 13:11:01 -0300 Subject: [PATCH 8/8] Fix the return type of the denormalize functions --- src/Normalizer/FileEntityNormalizer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Normalizer/FileEntityNormalizer.php b/src/Normalizer/FileEntityNormalizer.php index ecc257d..74d732d 100644 --- a/src/Normalizer/FileEntityNormalizer.php +++ b/src/Normalizer/FileEntityNormalizer.php @@ -53,7 +53,7 @@ class FileEntityNormalizer extends ContentEntityNormalizer { /** * {@inheritdoc} */ - public function denormalize($data, $class, $format = NULL, array $context = array()) : float|array|int|bool|\ArrayObject|string|null { + public function denormalize($data, $class, $format = NULL, array $context = array()): mixed { // Avoid 'data' being treated as a field. $file_data = $data['data'][0]['value']; unset($data['data']); -- GitLab