From 931e90ab208b9737031c86222fac34108fbc8668 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 28 Dec 2023 14:10:46 -1000
Subject: [PATCH] Humidifier platform back-compat for custom components without
 HumidifierEntityFeature (#106613)

---
 .../components/humidifier/__init__.py         | 15 ++++++++++-
 tests/components/humidifier/test_init.py      | 25 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/humidifier/__init__.py b/homeassistant/components/humidifier/__init__.py
index 821cc8c4f377b..75d4f0fd22507 100644
--- a/homeassistant/components/humidifier/__init__.py
+++ b/homeassistant/components/humidifier/__init__.py
@@ -185,7 +185,7 @@ def capability_attributes(self) -> dict[str, Any]:
             ATTR_MAX_HUMIDITY: self.max_humidity,
         }
 
-        if HumidifierEntityFeature.MODES in self.supported_features:
+        if HumidifierEntityFeature.MODES in self.supported_features_compat:
             data[ATTR_AVAILABLE_MODES] = self.available_modes
 
         return data
@@ -280,3 +280,16 @@ def max_humidity(self) -> int:
     def supported_features(self) -> HumidifierEntityFeature:
         """Return the list of supported features."""
         return self._attr_supported_features
+
+    @property
+    def supported_features_compat(self) -> HumidifierEntityFeature:
+        """Return the supported features as HumidifierEntityFeature.
+
+        Remove this compatibility shim in 2025.1 or later.
+        """
+        features = self.supported_features
+        if type(features) is int:  # noqa: E721
+            new_features = HumidifierEntityFeature(features)
+            self._report_deprecated_supported_features_values(new_features)
+            return new_features
+        return features
diff --git a/tests/components/humidifier/test_init.py b/tests/components/humidifier/test_init.py
index da45e1f1661fd..45da5ba750f7f 100644
--- a/tests/components/humidifier/test_init.py
+++ b/tests/components/humidifier/test_init.py
@@ -6,7 +6,10 @@
 import pytest
 
 from homeassistant.components import humidifier
-from homeassistant.components.humidifier import HumidifierEntity
+from homeassistant.components.humidifier import (
+    HumidifierEntity,
+    HumidifierEntityFeature,
+)
 from homeassistant.core import HomeAssistant
 
 from tests.common import import_and_test_deprecated_constant_enum
@@ -66,3 +69,23 @@ def test_deprecated_constants(
     import_and_test_deprecated_constant_enum(
         caplog, module, enum, constant_prefix, "2025.1"
     )
+
+
+def test_deprecated_supported_features_ints(caplog: pytest.LogCaptureFixture) -> None:
+    """Test deprecated supported features ints."""
+
+    class MockHumidifierEntity(HumidifierEntity):
+        @property
+        def supported_features(self) -> int:
+            """Return supported features."""
+            return 1
+
+    entity = MockHumidifierEntity()
+    assert entity.supported_features_compat is HumidifierEntityFeature(1)
+    assert "MockHumidifierEntity" in caplog.text
+    assert "is using deprecated supported features values" in caplog.text
+    assert "Instead it should use" in caplog.text
+    assert "HumidifierEntityFeature.MODES" in caplog.text
+    caplog.clear()
+    assert entity.supported_features_compat is HumidifierEntityFeature(1)
+    assert "is using deprecated supported features values" not in caplog.text