From 5ee806ab41c373abbe4853041051baf8a0180f42 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 29 Jan 2024 10:16:33 +0000
Subject: [PATCH] Issue #3417551 by longwave, Spokje: Remove withConsecutive()
in EntityNormalizerTest
(cherry picked from commit 8474508c6a0747888a89b13d094aea9043238cfc)
---
.../Unit/Normalizer/EntityNormalizerTest.php | 55 +++++++------------
core/phpstan-baseline.neon | 5 --
2 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
index 759f98c4f7e3..648c2f92e645 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
@@ -94,18 +94,11 @@ public function testNormalize() {
->method('getFields')
->willReturn($definitions);
- $serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')
- ->disableOriginalConstructor()
- ->onlyMethods(['normalize'])
- ->getMock();
- $serializer->expects($this->exactly(2))
- ->method('normalize')
- ->withConsecutive(
- [$list_item_1, 'test_format'],
- [$list_item_2, 'test_format'],
- );
+ $serializer = $this->prophesize('Symfony\Component\Serializer\Serializer');
+ $serializer->normalize($list_item_1, 'test_format', [])->shouldBeCalled();
+ $serializer->normalize($list_item_2, 'test_format', [])->shouldBeCalled();
- $this->entityNormalizer->setSerializer($serializer);
+ $this->entityNormalizer->setSerializer($serializer->reveal());
$this->entityNormalizer->normalize($content_entity, 'test_format');
}
@@ -224,18 +217,15 @@ public function testDenormalizeWithValidBundle() {
// Setup expectations for the serializer. This will be called for each field
// item.
- $serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')
- ->disableOriginalConstructor()
- ->onlyMethods(['denormalize'])
- ->getMock();
- $serializer->expects($this->exactly(2))
- ->method('denormalize')
- ->withConsecutive(
- ['value_1', get_class($key_1), NULL, ['target_instance' => $key_1, 'entity_type' => 'test']],
- ['value_2', get_class($key_2), NULL, ['target_instance' => $key_2, 'entity_type' => 'test']],
- );
+ $serializer = $this->prophesize('Symfony\Component\Serializer\Serializer');
+ $serializer->denormalize('value_1', get_class($key_1), NULL, ['target_instance' => $key_1, 'entity_type' => 'test'])
+ ->willReturn(NULL)
+ ->shouldBeCalled();
+ $serializer->denormalize('value_2', get_class($key_2), NULL, ['target_instance' => $key_2, 'entity_type' => 'test'])
+ ->willReturn(NULL)
+ ->shouldBeCalled();
- $this->entityNormalizer->setSerializer($serializer);
+ $this->entityNormalizer->setSerializer($serializer->reveal());
$this->assertNotNull($this->entityNormalizer->denormalize($test_data, 'Drupal\Core\Entity\ContentEntityBase', NULL, ['entity_type' => 'test']));
}
@@ -377,18 +367,15 @@ public function testDenormalizeWithNoBundle() {
// Setup expectations for the serializer. This will be called for each field
// item.
- $serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')
- ->disableOriginalConstructor()
- ->onlyMethods(['denormalize'])
- ->getMock();
- $serializer->expects($this->exactly(2))
- ->method('denormalize')
- ->withConsecutive(
- ['value_1', get_class($key_1), NULL, ['target_instance' => $key_1, 'entity_type' => 'test']],
- ['value_2', get_class($key_2), NULL, ['target_instance' => $key_2, 'entity_type' => 'test']],
- );
-
- $this->entityNormalizer->setSerializer($serializer);
+ $serializer = $this->prophesize('Symfony\Component\Serializer\Serializer');
+ $serializer->denormalize('value_1', get_class($key_1), NULL, ['target_instance' => $key_1, 'entity_type' => 'test'])
+ ->willReturn(NULL)
+ ->shouldBeCalled();
+ $serializer->denormalize('value_2', get_class($key_2), NULL, ['target_instance' => $key_2, 'entity_type' => 'test'])
+ ->willReturn(NULL)
+ ->shouldBeCalled();
+
+ $this->entityNormalizer->setSerializer($serializer->reveal());
$this->assertNotNull($this->entityNormalizer->denormalize($test_data, 'Drupal\Core\Entity\ContentEntityBase', NULL, ['entity_type' => 'test']));
}
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index 773c18e2f7bd..04a98c790b93 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -2210,11 +2210,6 @@ parameters:
count: 1
path: modules/serialization/src/Normalizer/EntityNormalizer.php
- -
- message: "#^Call to deprecated method withConsecutive\\(\\) of class PHPUnit\\\\Framework\\\\MockObject\\\\Builder\\\\InvocationMocker\\.$#"
- count: 3
- path: modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
-
-
message: "#^Method Drupal\\\\shortcut\\\\Form\\\\SetCustomize\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
--
GitLab