From a45da8ddd1bb48d3ec3ca89c153e696e7f9b2f9a Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Sat, 20 May 2023 09:22:49 +0100
Subject: [PATCH] Issue #3361401 by Spokje, andypost: Remove remaining
 occurences of ::supportedInterfaceOrClass property

---
 .../src/Normalizer/ComplexDataNormalizer.php     |  2 +-
 .../Normalizer/ComplexDataNormalizerTest.php     | 10 +++++++++-
 .../src/Unit/Normalizer/NormalizerBaseTest.php   | 16 ++++++++--------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php b/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php
index 008216b60f62..eaa098d2c498 100644
--- a/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php
+++ b/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php
@@ -22,7 +22,7 @@ class ComplexDataNormalizer extends NormalizerBase {
    */
   public function normalize($object, $format = NULL, array $context = []): array|string|int|float|bool|\ArrayObject|NULL {
     $attributes = [];
-    // $object will not always match $supportedInterfaceOrClass.
+    // $object will not always match getSupportedTypes().
     // @see \Drupal\serialization\Normalizer\EntityNormalizer
     // Other normalizers that extend this class may only provide $object that
     // implements \Traversable.
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php
index 876dca0a11f5..bdeb13272dd1 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php
@@ -118,6 +118,14 @@ class ComplexDataNormalizerTest extends UnitTestCase {
  * Test normalizer with a different supported class.
  */
 class TestExtendedNormalizer extends ComplexDataNormalizer {
-  protected $supportedInterfaceOrClass = \stdClass::class;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSupportedTypes(?string $format): array {
+    return [
+      \stdClass::class => TRUE,
+    ];
+  }
 
 }
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
index 0a568093ba5b..928a693976ae 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
@@ -25,14 +25,14 @@ class NormalizerBaseTest extends UnitTestCase {
    *   The expected boolean return value from supportNormalization.
    * @param mixed $data
    *   The data passed to supportsNormalization.
-   * @param string $supported_interface_or_class
+   * @param string $supported_types
    *   (optional) The supported interface or class to set on the normalizer.
    */
-  public function testSupportsNormalization($expected_return, $data, $supported_interface_or_class = NULL) {
+  public function testSupportsNormalization($expected_return, $data, $supported_types = NULL) {
     $normalizer_base = $this->getMockForAbstractClass('Drupal\Tests\serialization\Unit\Normalizer\TestNormalizerBase');
 
-    if (isset($supported_interface_or_class)) {
-      $normalizer_base->setSupportedInterfaceOrClass($supported_interface_or_class);
+    if (isset($supported_types)) {
+      $normalizer_base->setSupportedTypes($supported_types);
     }
 
     $this->assertSame($expected_return, $normalizer_base->supportsNormalization($data));
@@ -76,13 +76,13 @@ abstract class TestNormalizerBase extends NormalizerBase {
   protected array $supportedTypes = ['*' => FALSE];
 
   /**
-   * Sets the protected supportedInterfaceOrClass property.
+   * Sets the supported types.
    *
-   * @param string $supported_interface_or_class
+   * @param string $supported_types
    *   The class name to set.
    */
-  public function setSupportedInterfaceOrClass($supported_interface_or_class) {
-    $this->supportedTypes = [$supported_interface_or_class => FALSE];
+  public function setSupportedTypes($supported_types): void {
+    $this->supportedTypes = [$supported_types => FALSE];
   }
 
   /**