From 9da5dd0090f947eeab79230e2c5b3e23127cc515 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:38:06 +0200
Subject: [PATCH] Improve config flow type hints in cast (#124861)

---
 homeassistant/components/cast/config_flow.py | 34 +++++++++++++-------
 tests/components/cast/test_config_flow.py    |  4 +--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/cast/config_flow.py b/homeassistant/components/cast/config_flow.py
index 22351f5d2f7..4f7dd59e83e 100644
--- a/homeassistant/components/cast/config_flow.py
+++ b/homeassistant/components/cast/config_flow.py
@@ -63,7 +63,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
 
         return await self.async_step_confirm()
 
-    async def async_step_config(self, user_input=None):
+    async def async_step_config(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """Confirm the setup."""
         errors = {}
         data = {CONF_KNOWN_HOSTS: self._known_hosts}
@@ -90,7 +92,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
             step_id="config", data_schema=vol.Schema(fields), errors=errors
         )
 
-    async def async_step_confirm(self, user_input=None):
+    async def async_step_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """Confirm the setup."""
 
         data = self._get_data()
@@ -116,13 +120,15 @@ class CastOptionsFlowHandler(OptionsFlow):
         self.config_entry = config_entry
         self.updated_config: dict[str, Any] = {}
 
-    async def async_step_init(self, user_input=None):
+    async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
         """Manage the Google Cast options."""
         return await self.async_step_basic_options()
 
-    async def async_step_basic_options(self, user_input=None):
+    async def async_step_basic_options(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """Manage the Google Cast options."""
-        errors = {}
+        errors: dict[str, str] = {}
         current_config = self.config_entry.data
         if user_input is not None:
             bad_hosts, known_hosts = _string_to_list(
@@ -139,9 +145,9 @@ class CastOptionsFlowHandler(OptionsFlow):
                 self.hass.config_entries.async_update_entry(
                     self.config_entry, data=self.updated_config
                 )
-                return self.async_create_entry(title="", data=None)
+                return self.async_create_entry(title="", data={})
 
-        fields = {}
+        fields: dict[vol.Marker, type[str]] = {}
         suggested_value = _list_to_string(current_config.get(CONF_KNOWN_HOSTS))
         _add_with_suggestion(fields, CONF_KNOWN_HOSTS, suggested_value)
 
@@ -152,9 +158,11 @@ class CastOptionsFlowHandler(OptionsFlow):
             last_step=not self.show_advanced_options,
         )
 
-    async def async_step_advanced_options(self, user_input=None):
+    async def async_step_advanced_options(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """Manage the Google Cast options."""
-        errors = {}
+        errors: dict[str, str] = {}
         if user_input is not None:
             bad_cec, ignore_cec = _string_to_list(
                 user_input.get(CONF_IGNORE_CEC, ""), IGNORE_CEC_SCHEMA
@@ -169,9 +177,9 @@ class CastOptionsFlowHandler(OptionsFlow):
                 self.hass.config_entries.async_update_entry(
                     self.config_entry, data=self.updated_config
                 )
-                return self.async_create_entry(title="", data=None)
+                return self.async_create_entry(title="", data={})
 
-        fields = {}
+        fields: dict[vol.Marker, type[str]] = {}
         current_config = self.config_entry.data
         suggested_value = _list_to_string(current_config.get(CONF_UUID))
         _add_with_suggestion(fields, CONF_UUID, suggested_value)
@@ -204,5 +212,7 @@ def _string_to_list(string, schema):
     return invalid, items
 
 
-def _add_with_suggestion(fields, key, suggested_value):
+def _add_with_suggestion(
+    fields: dict[vol.Marker, type[str]], key: str, suggested_value: str
+) -> None:
     fields[vol.Optional(key, description={"suggested_value": suggested_value})] = str
diff --git a/tests/components/cast/test_config_flow.py b/tests/components/cast/test_config_flow.py
index 7dce3f768e2..2dcf007c6d4 100644
--- a/tests/components/cast/test_config_flow.py
+++ b/tests/components/cast/test_config_flow.py
@@ -250,7 +250,7 @@ async def test_option_flow(hass: HomeAssistant, parameter_data) -> None:
         user_input=user_input_dict,
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] is None
+    assert result["data"] == {}
     for other_param in advanced_parameters:
         if other_param == parameter:
             continue
@@ -264,7 +264,7 @@ async def test_option_flow(hass: HomeAssistant, parameter_data) -> None:
         user_input={"known_hosts": ""},
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] is None
+    assert result["data"] == {}
     expected_data = {**orig_data, "known_hosts": []}
     if parameter in advanced_parameters:
         expected_data[parameter] = updated