From 97ee7e2c98de7b0606009c8647c2ad3e0db02171 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 28 Dec 2023 13:15:48 -1000
Subject: [PATCH] Remote platform back-compat for custom components without
 RemoteEntityFeature (#106609)

---
 homeassistant/components/remote/__init__.py | 15 ++++++++++++++-
 tests/components/remote/test_init.py        | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/remote/__init__.py b/homeassistant/components/remote/__init__.py
index 8c3d094710e..7e9ebfe12b9 100644
--- a/homeassistant/components/remote/__init__.py
+++ b/homeassistant/components/remote/__init__.py
@@ -200,6 +200,19 @@ class RemoteEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_)
         """Flag supported features."""
         return self._attr_supported_features
 
+    @property
+    def supported_features_compat(self) -> RemoteEntityFeature:
+        """Return the supported features as RemoteEntityFeature.
+
+        Remove this compatibility shim in 2025.1 or later.
+        """
+        features = self.supported_features
+        if type(features) is int:  # noqa: E721
+            new_features = RemoteEntityFeature(features)
+            self._report_deprecated_supported_features_values(new_features)
+            return new_features
+        return features
+
     @cached_property
     def current_activity(self) -> str | None:
         """Active activity."""
@@ -214,7 +227,7 @@ class RemoteEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_)
     @property
     def state_attributes(self) -> dict[str, Any] | None:
         """Return optional state attributes."""
-        if RemoteEntityFeature.ACTIVITY not in self.supported_features:
+        if RemoteEntityFeature.ACTIVITY not in self.supported_features_compat:
             return None
 
         return {
diff --git a/tests/components/remote/test_init.py b/tests/components/remote/test_init.py
index b185b229cd2..a75ff858483 100644
--- a/tests/components/remote/test_init.py
+++ b/tests/components/remote/test_init.py
@@ -150,3 +150,23 @@ def test_deprecated_constants(
 ) -> None:
     """Test deprecated constants."""
     import_and_test_deprecated_constant_enum(caplog, remote, enum, "SUPPORT_", "2025.1")
+
+
+def test_deprecated_supported_features_ints(caplog: pytest.LogCaptureFixture) -> None:
+    """Test deprecated supported features ints."""
+
+    class MockRemote(remote.RemoteEntity):
+        @property
+        def supported_features(self) -> int:
+            """Return supported features."""
+            return 1
+
+    entity = MockRemote()
+    assert entity.supported_features_compat is remote.RemoteEntityFeature(1)
+    assert "MockRemote" in caplog.text
+    assert "is using deprecated supported features values" in caplog.text
+    assert "Instead it should use" in caplog.text
+    assert "RemoteEntityFeature.LEARN_COMMAND" in caplog.text
+    caplog.clear()
+    assert entity.supported_features_compat is remote.RemoteEntityFeature(1)
+    assert "is using deprecated supported features values" not in caplog.text