From 90aba6c52376157b760148a136bc109eefd823c0 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:12:47 +0200
Subject: [PATCH] Add cv.deprecated to MQTT modern schema's too (#76884)

Add cv.deprcated to modern schema too
---
 homeassistant/components/mqtt/climate.py           | 14 +++++++-------
 homeassistant/components/mqtt/cover.py             |  1 +
 homeassistant/components/mqtt/fan.py               | 10 ++++++++++
 .../components/mqtt/light/schema_basic.py          | 11 ++++++++++-
 homeassistant/components/mqtt/light/schema_json.py |  2 ++
 .../components/mqtt/light/schema_template.py       |  6 +++++-
 6 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/mqtt/climate.py b/homeassistant/components/mqtt/climate.py
index f44cf6fe8fc..f39d3857ec2 100644
--- a/homeassistant/components/mqtt/climate.py
+++ b/homeassistant/components/mqtt/climate.py
@@ -286,13 +286,6 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
 PLATFORM_SCHEMA_MODERN = vol.All(
-    _PLATFORM_SCHEMA_BASE,
-    valid_preset_mode_configuration,
-)
-
-# Configuring MQTT Climate under the climate platform key is deprecated in HA Core 2022.6
-PLATFORM_SCHEMA = vol.All(
-    cv.PLATFORM_SCHEMA.extend(_PLATFORM_SCHEMA_BASE.schema),
     # Support CONF_SEND_IF_OFF is removed with release 2022.9
     cv.removed(CONF_SEND_IF_OFF),
     # AWAY and HOLD mode topics and templates are no longer supported, support was removed with release 2022.9
@@ -304,6 +297,13 @@ PLATFORM_SCHEMA = vol.All(
     cv.removed(CONF_HOLD_STATE_TEMPLATE),
     cv.removed(CONF_HOLD_STATE_TOPIC),
     cv.removed(CONF_HOLD_LIST),
+    _PLATFORM_SCHEMA_BASE,
+    valid_preset_mode_configuration,
+)
+
+# Configuring MQTT Climate under the climate platform key is deprecated in HA Core 2022.6
+PLATFORM_SCHEMA = vol.All(
+    cv.PLATFORM_SCHEMA.extend(_PLATFORM_SCHEMA_BASE.schema),
     valid_preset_mode_configuration,
     warn_for_legacy_schema(climate.DOMAIN),
 )
diff --git a/homeassistant/components/mqtt/cover.py b/homeassistant/components/mqtt/cover.py
index b0fbacd10fc..fd96fe524d9 100644
--- a/homeassistant/components/mqtt/cover.py
+++ b/homeassistant/components/mqtt/cover.py
@@ -200,6 +200,7 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
 PLATFORM_SCHEMA_MODERN = vol.All(
+    cv.removed("tilt_invert_state"),
     _PLATFORM_SCHEMA_BASE,
     validate_options,
 )
diff --git a/homeassistant/components/mqtt/fan.py b/homeassistant/components/mqtt/fan.py
index 20c4936ab38..fab748d2bfc 100644
--- a/homeassistant/components/mqtt/fan.py
+++ b/homeassistant/components/mqtt/fan.py
@@ -186,6 +186,16 @@ PLATFORM_SCHEMA = vol.All(
 )
 
 PLATFORM_SCHEMA_MODERN = vol.All(
+    # CONF_SPEED_COMMAND_TOPIC, CONF_SPEED_LIST, CONF_SPEED_STATE_TOPIC, CONF_SPEED_VALUE_TEMPLATE and
+    # Speeds SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH SPEED_OFF,
+    # are no longer supported, support was removed in release 2021.12
+    cv.removed(CONF_PAYLOAD_HIGH_SPEED),
+    cv.removed(CONF_PAYLOAD_LOW_SPEED),
+    cv.removed(CONF_PAYLOAD_MEDIUM_SPEED),
+    cv.removed(CONF_SPEED_COMMAND_TOPIC),
+    cv.removed(CONF_SPEED_LIST),
+    cv.removed(CONF_SPEED_STATE_TOPIC),
+    cv.removed(CONF_SPEED_VALUE_TEMPLATE),
     _PLATFORM_SCHEMA_BASE,
     valid_speed_range_configuration,
     valid_preset_mode_configuration,
diff --git a/homeassistant/components/mqtt/light/schema_basic.py b/homeassistant/components/mqtt/light/schema_basic.py
index 05778aa7711..e2805781f45 100644
--- a/homeassistant/components/mqtt/light/schema_basic.py
+++ b/homeassistant/components/mqtt/light/schema_basic.py
@@ -224,7 +224,16 @@ DISCOVERY_SCHEMA_BASIC = vol.All(
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
 )
 
-PLATFORM_SCHEMA_MODERN_BASIC = _PLATFORM_SCHEMA_BASE
+PLATFORM_SCHEMA_MODERN_BASIC = vol.All(
+    # CONF_VALUE_TEMPLATE is no longer supported, support was removed in 2022.2
+    cv.removed(CONF_VALUE_TEMPLATE),
+    # CONF_WHITE_VALUE_* is no longer supported, support was removed in 2022.9
+    cv.removed(CONF_WHITE_VALUE_COMMAND_TOPIC),
+    cv.removed(CONF_WHITE_VALUE_SCALE),
+    cv.removed(CONF_WHITE_VALUE_STATE_TOPIC),
+    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
+    _PLATFORM_SCHEMA_BASE,
+)
 
 
 async def async_setup_entity_basic(
diff --git a/homeassistant/components/mqtt/light/schema_json.py b/homeassistant/components/mqtt/light/schema_json.py
index 85a0bc335cd..295b43120d4 100644
--- a/homeassistant/components/mqtt/light/schema_json.py
+++ b/homeassistant/components/mqtt/light/schema_json.py
@@ -167,6 +167,8 @@ DISCOVERY_SCHEMA_JSON = vol.All(
 )
 
 PLATFORM_SCHEMA_MODERN_JSON = vol.All(
+    # CONF_WHITE_VALUE is no longer supported, support was removed in 2022.9
+    cv.removed(CONF_WHITE_VALUE),
     _PLATFORM_SCHEMA_BASE,
     valid_color_configuration,
 )
diff --git a/homeassistant/components/mqtt/light/schema_template.py b/homeassistant/components/mqtt/light/schema_template.py
index 6f211e598b4..73f2786ad12 100644
--- a/homeassistant/components/mqtt/light/schema_template.py
+++ b/homeassistant/components/mqtt/light/schema_template.py
@@ -99,7 +99,11 @@ DISCOVERY_SCHEMA_TEMPLATE = vol.All(
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
 )
 
-PLATFORM_SCHEMA_MODERN_TEMPLATE = _PLATFORM_SCHEMA_BASE
+PLATFORM_SCHEMA_MODERN_TEMPLATE = vol.All(
+    # CONF_WHITE_VALUE_TEMPLATE is no longer supported, support was removed in 2022.9
+    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
+    _PLATFORM_SCHEMA_BASE,
+)
 
 
 async def async_setup_entity_template(