From 21dc6af22e3b9b5739ba502f05fde516163d0ad3 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 23 Sep 2026 23:27:29 +0100
Subject: [PATCH] [binary_sensor] Use register_apply_action for
 binary_sensor.template.publish (#19506)

---
 esphome/components/binary_sensor/__init__.py       |  3 ---
 esphome/components/binary_sensor/automation.h      | 14 --------------
 .../components/template/binary_sensor/__init__.py  | 11 ++---------
 tests/components/binary_sensor/common.yaml         | 10 ++++++++++
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index a114ab4205..001a055d7c 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -134,9 +134,6 @@ MultiClickTriggerBase = binary_sensor_ns.class_(
 MultiClickTrigger = binary_sensor_ns.class_("MultiClickTrigger", MultiClickTriggerBase)
 MultiClickTriggerEvent = binary_sensor_ns.struct("MultiClickTriggerEvent")
 
-BinarySensorPublishAction = binary_sensor_ns.class_(
-    "BinarySensorPublishAction", automation.Action
-)
 BinarySensorInvalidateAction = binary_sensor_ns.class_(
     "BinarySensorInvalidateAction", automation.Action
 )
diff --git a/esphome/components/binary_sensor/automation.h b/esphome/components/binary_sensor/automation.h
index d5a85ca9c4..1c331d22bd 100644
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -165,20 +165,6 @@ template<typename... Ts> class BinarySensorCondition final : public Condition<Ts
   bool state_;
 };
 
-template<typename... Ts> class BinarySensorPublishAction final : public Action<Ts...> {
- public:
-  explicit BinarySensorPublishAction(BinarySensor *sensor) : sensor_(sensor) {}
-  TEMPLATABLE_VALUE(bool, state)
-
-  void play(const Ts &...x) override {
-    auto val = this->state_.value(x...);
-    this->sensor_->publish_state(val);
-  }
-
- protected:
-  BinarySensor *sensor_;
-};
-
 template<typename... Ts> class BinarySensorInvalidateAction final : public Action<Ts...> {
  public:
   explicit BinarySensorInvalidateAction(BinarySensor *sensor) : sensor_(sensor) {}
diff --git a/esphome/components/template/binary_sensor/__init__.py b/esphome/components/template/binary_sensor/__init__.py
index 07028f7dff..b2d6eca260 100644
--- a/esphome/components/template/binary_sensor/__init__.py
+++ b/esphome/components/template/binary_sensor/__init__.py
@@ -60,20 +60,13 @@ async def to_code(config):
         cg.add(var.set_template(template_))
 
 
-@automation.register_action(
+automation.register_apply_action(
     "binary_sensor.template.publish",
-    binary_sensor.BinarySensorPublishAction,
     cv.Schema(
         {
             cv.Required(CONF_ID): cv.use_id(binary_sensor.BinarySensor),
             cv.Required(CONF_STATE): cv.templatable(cv.boolean),
         }
     ),
-    synchronous=True,
+    automation.ApplyField(CONF_STATE, "publish_state", cg.bool_),
 )
-async def binary_sensor_template_publish_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, paren)
-    template_ = await cg.templatable(config[CONF_STATE], args, cg.bool_)
-    cg.add(var.set_state(template_))
-    return var
diff --git a/tests/components/binary_sensor/common.yaml b/tests/components/binary_sensor/common.yaml
index d0a16cc99c..f9eda80c3f 100644
--- a/tests/components/binary_sensor/common.yaml
+++ b/tests/components/binary_sensor/common.yaml
@@ -37,6 +37,16 @@ binary_sensor:
             format: "New state is %s"
             args: ['x.has_value() ? ONOFF(x) : "Unknown"']
         - binary_sensor.invalidate_state: binary_sensor_some_binary_sensor
+        - binary_sensor.template.publish:
+            id: publish_target
+            state: true
+        - binary_sensor.template.publish:
+            id: publish_target
+            state: !lambda "return x.value_or(false);"
+
+  - platform: template
+    id: publish_target
+    name: "Publish Target"
 
   # Test autorepeat with default configuration (no timings)
   - platform: template