From 45c994e4de71c99bc0fb8051c8ca9ea484348ee8 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 18 Nov 2025 21:56:23 -0600
Subject: [PATCH 1/5] [light] Modernize namespace declarations to C++17 syntax
 (#11986)

---
 esphome/components/light/addressable_light.cpp       | 6 ++----
 esphome/components/light/addressable_light.h         | 6 ++----
 esphome/components/light/addressable_light_effect.h  | 6 ++----
 esphome/components/light/addressable_light_wrapper.h | 6 ++----
 esphome/components/light/automation.cpp              | 6 ++----
 esphome/components/light/automation.h                | 6 ++----
 esphome/components/light/base_light_effects.h        | 6 ++----
 esphome/components/light/color_mode.h                | 6 ++----
 esphome/components/light/esp_color_correction.cpp    | 6 ++----
 esphome/components/light/esp_color_correction.h      | 6 ++----
 esphome/components/light/esp_color_view.h            | 6 ++----
 esphome/components/light/esp_hsv_color.cpp           | 6 ++----
 esphome/components/light/esp_hsv_color.h             | 6 ++----
 esphome/components/light/esp_range_view.cpp          | 6 ++----
 esphome/components/light/esp_range_view.h            | 6 ++----
 esphome/components/light/light_call.cpp              | 6 ++----
 esphome/components/light/light_color_values.h        | 6 ++----
 esphome/components/light/light_effect.cpp            | 6 ++----
 esphome/components/light/light_effect.h              | 6 ++----
 esphome/components/light/light_json_schema.cpp       | 6 ++----
 esphome/components/light/light_json_schema.h         | 6 ++----
 esphome/components/light/light_output.cpp            | 6 ++----
 esphome/components/light/light_output.h              | 6 ++----
 esphome/components/light/light_state.cpp             | 6 ++----
 esphome/components/light/light_state.h               | 6 ++----
 esphome/components/light/light_transformer.h         | 6 ++----
 esphome/components/light/transformers.h              | 6 ++----
 27 files changed, 54 insertions(+), 108 deletions(-)

diff --git a/esphome/components/light/addressable_light.cpp b/esphome/components/light/addressable_light.cpp
index 5cbdcb0e86..2f6ffc9a38 100644
--- a/esphome/components/light/addressable_light.cpp
+++ b/esphome/components/light/addressable_light.cpp
@@ -1,8 +1,7 @@
 #include "addressable_light.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 static const char *const TAG = "light.addressable";
 
@@ -112,5 +111,4 @@ optional<LightColorValues> AddressableLightTransformer::apply() {
   return {};
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/addressable_light.h b/esphome/components/light/addressable_light.h
index 393cc679bc..2e4b984ce4 100644
--- a/esphome/components/light/addressable_light.h
+++ b/esphome/components/light/addressable_light.h
@@ -14,8 +14,7 @@
 #include "esphome/components/power_supply/power_supply.h"
 #endif
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 /// Convert the color information from a `LightColorValues` object to a `Color` object (does not apply brightness).
 Color color_from_light_color_values(LightColorValues val);
@@ -116,5 +115,4 @@ class AddressableLightTransformer : public LightTransformer {
   Color target_color_{};
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/addressable_light_effect.h b/esphome/components/light/addressable_light_effect.h
index 0847db3770..a85ea4661d 100644
--- a/esphome/components/light/addressable_light_effect.h
+++ b/esphome/components/light/addressable_light_effect.h
@@ -7,8 +7,7 @@
 #include "esphome/components/light/light_state.h"
 #include "esphome/components/light/addressable_light.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 inline static int16_t sin16_c(uint16_t theta) {
   static const uint16_t BASE[] = {0, 6393, 12539, 18204, 23170, 27245, 30273, 32137};
@@ -371,5 +370,4 @@ class AddressableFlickerEffect : public AddressableLightEffect {
   uint8_t intensity_{13};
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/addressable_light_wrapper.h b/esphome/components/light/addressable_light_wrapper.h
index d358502430..8665e62a79 100644
--- a/esphome/components/light/addressable_light_wrapper.h
+++ b/esphome/components/light/addressable_light_wrapper.h
@@ -3,8 +3,7 @@
 #include "esphome/core/component.h"
 #include "addressable_light.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 class AddressableLightWrapper : public light::AddressableLight {
  public:
@@ -123,5 +122,4 @@ class AddressableLightWrapper : public light::AddressableLight {
   ColorMode color_mode_{ColorMode::UNKNOWN};
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/automation.cpp b/esphome/components/light/automation.cpp
index 8c1785f061..ddac2f9341 100644
--- a/esphome/components/light/automation.cpp
+++ b/esphome/components/light/automation.cpp
@@ -1,8 +1,7 @@
 #include "automation.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 static const char *const TAG = "light.automation";
 
@@ -11,5 +10,4 @@ void addressableset_warn_about_scale(const char *field) {
            field);
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/automation.h b/esphome/components/light/automation.h
index 8899db8bba..9893c15e0c 100644
--- a/esphome/components/light/automation.h
+++ b/esphome/components/light/automation.h
@@ -4,8 +4,7 @@
 #include "light_state.h"
 #include "addressable_light.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 enum class LimitMode { CLAMP, DO_NOTHING };
 
@@ -216,5 +215,4 @@ template<typename... Ts> class AddressableSet : public Action<Ts...> {
   }
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/base_light_effects.h b/esphome/components/light/base_light_effects.h
index 515afc5c59..2eeae574e7 100644
--- a/esphome/components/light/base_light_effects.h
+++ b/esphome/components/light/base_light_effects.h
@@ -6,8 +6,7 @@
 #include "esphome/core/helpers.h"
 #include "light_effect.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 inline static float random_cubic_float() {
   const float r = random_float() * 2.0f - 1.0f;
@@ -235,5 +234,4 @@ class FlickerLightEffect : public LightEffect {
   float alpha_{};
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/color_mode.h b/esphome/components/light/color_mode.h
index aa3448c145..0750ae250d 100644
--- a/esphome/components/light/color_mode.h
+++ b/esphome/components/light/color_mode.h
@@ -3,8 +3,7 @@
 #include <cstdint>
 #include "esphome/core/finite_set_mask.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 /// Color capabilities are the various outputs that a light has and that can be independently controlled by the user.
 enum class ColorCapability : uint8_t {
@@ -210,5 +209,4 @@ inline bool has_capability(const ColorModeMask &mask, ColorCapability capability
   return (mask.get_mask() & CAPABILITY_BITMASKS[capability_to_index(capability)]) != 0;
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/esp_color_correction.cpp b/esphome/components/light/esp_color_correction.cpp
index e5e68264cc..1b511a94b2 100644
--- a/esphome/components/light/esp_color_correction.cpp
+++ b/esphome/components/light/esp_color_correction.cpp
@@ -2,8 +2,7 @@
 #include "light_color_values.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 void ESPColorCorrection::calculate_gamma_table(float gamma) {
   for (uint16_t i = 0; i < 256; i++) {
@@ -23,5 +22,4 @@ void ESPColorCorrection::calculate_gamma_table(float gamma) {
   }
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/esp_color_correction.h b/esphome/components/light/esp_color_correction.h
index 14c065058c..d275e045b7 100644
--- a/esphome/components/light/esp_color_correction.h
+++ b/esphome/components/light/esp_color_correction.h
@@ -2,8 +2,7 @@
 
 #include "esphome/core/color.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 class ESPColorCorrection {
  public:
@@ -73,5 +72,4 @@ class ESPColorCorrection {
   uint8_t local_brightness_{255};
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/esp_color_view.h b/esphome/components/light/esp_color_view.h
index 35117e7dd8..440a23e9c9 100644
--- a/esphome/components/light/esp_color_view.h
+++ b/esphome/components/light/esp_color_view.h
@@ -4,8 +4,7 @@
 #include "esp_hsv_color.h"
 #include "esp_color_correction.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 class ESPColorSettable {
  public:
@@ -106,5 +105,4 @@ class ESPColorView : public ESPColorSettable {
   const ESPColorCorrection *color_correction_;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/esp_hsv_color.cpp b/esphome/components/light/esp_hsv_color.cpp
index 450c2e11ce..07205ea6d0 100644
--- a/esphome/components/light/esp_hsv_color.cpp
+++ b/esphome/components/light/esp_hsv_color.cpp
@@ -1,7 +1,6 @@
 #include "esp_hsv_color.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 Color ESPHSVColor::to_rgb() const {
   // based on FastLED's hsv rainbow to rgb
@@ -70,5 +69,4 @@ Color ESPHSVColor::to_rgb() const {
   return rgb;
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/esp_hsv_color.h b/esphome/components/light/esp_hsv_color.h
index cdde91c71c..4b54039258 100644
--- a/esphome/components/light/esp_hsv_color.h
+++ b/esphome/components/light/esp_hsv_color.h
@@ -3,8 +3,7 @@
 #include "esphome/core/color.h"
 #include "esphome/core/helpers.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 struct ESPHSVColor {
   union {
@@ -32,5 +31,4 @@ struct ESPHSVColor {
   Color to_rgb() const;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/esp_range_view.cpp b/esphome/components/light/esp_range_view.cpp
index e1f0a507bd..58d552031a 100644
--- a/esphome/components/light/esp_range_view.cpp
+++ b/esphome/components/light/esp_range_view.cpp
@@ -1,8 +1,7 @@
 #include "esp_range_view.h"
 #include "addressable_light.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 int32_t HOT interpret_index(int32_t index, int32_t size) {
   if (index < 0)
@@ -92,5 +91,4 @@ ESPRangeView &ESPRangeView::operator=(const ESPRangeView &rhs) {  // NOLINT
 
 ESPColorView ESPRangeIterator::operator*() const { return this->range_.parent_->get(this->i_); }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/esp_range_view.h b/esphome/components/light/esp_range_view.h
index 07d18af79f..f5e4ebb83f 100644
--- a/esphome/components/light/esp_range_view.h
+++ b/esphome/components/light/esp_range_view.h
@@ -3,8 +3,7 @@
 #include "esp_color_view.h"
 #include "esp_hsv_color.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 int32_t interpret_index(int32_t index, int32_t size);
 
@@ -76,5 +75,4 @@ class ESPRangeIterator {
   int32_t i_;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_call.cpp b/esphome/components/light/light_call.cpp
index b15ff84b97..b3bdb16c73 100644
--- a/esphome/components/light/light_call.cpp
+++ b/esphome/components/light/light_call.cpp
@@ -4,8 +4,7 @@
 #include "esphome/core/log.h"
 #include "esphome/core/optional.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 static const char *const TAG = "light";
 
@@ -647,5 +646,4 @@ LightCall &LightCall::set_rgbw(float red, float green, float blue, float white)
   return *this;
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_color_values.h b/esphome/components/light/light_color_values.h
index 04d7d1e7d8..bedfad2c35 100644
--- a/esphome/components/light/light_color_values.h
+++ b/esphome/components/light/light_color_values.h
@@ -4,8 +4,7 @@
 #include "color_mode.h"
 #include <cmath>
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 inline static uint8_t to_uint8_scale(float x) { return static_cast<uint8_t>(roundf(x * 255.0f)); }
 
@@ -310,5 +309,4 @@ class LightColorValues {
   ColorMode color_mode_;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_effect.cpp b/esphome/components/light/light_effect.cpp
index a210b48e5b..81b923f7f9 100644
--- a/esphome/components/light/light_effect.cpp
+++ b/esphome/components/light/light_effect.cpp
@@ -1,8 +1,7 @@
 #include "light_effect.h"
 #include "light_state.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 uint32_t LightEffect::get_index() const {
   if (this->state_ == nullptr) {
@@ -32,5 +31,4 @@ uint32_t LightEffect::get_index_in_parent_() const {
   return 0;  // Not found
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_effect.h b/esphome/components/light/light_effect.h
index d4c2dc3582..aa1f6f7899 100644
--- a/esphome/components/light/light_effect.h
+++ b/esphome/components/light/light_effect.h
@@ -2,8 +2,7 @@
 
 #include "esphome/core/component.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 class LightState;
 
@@ -55,5 +54,4 @@ class LightEffect {
   uint32_t get_index_in_parent_() const;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_json_schema.cpp b/esphome/components/light/light_json_schema.cpp
index e754c453b5..1c9b92f504 100644
--- a/esphome/components/light/light_json_schema.cpp
+++ b/esphome/components/light/light_json_schema.cpp
@@ -3,8 +3,7 @@
 
 #ifdef USE_JSON
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 // See https://www.home-assistant.io/integrations/light.mqtt/#json-schema for documentation on the schema
 
@@ -169,7 +168,6 @@ void LightJSONSchema::parse_json(LightState &state, LightCall &call, JsonObject
   }
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
 
 #endif
diff --git a/esphome/components/light/light_json_schema.h b/esphome/components/light/light_json_schema.h
index c92dd7b655..dac81e32e3 100644
--- a/esphome/components/light/light_json_schema.h
+++ b/esphome/components/light/light_json_schema.h
@@ -8,8 +8,7 @@
 #include "light_call.h"
 #include "light_state.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 class LightJSONSchema {
  public:
@@ -22,7 +21,6 @@ class LightJSONSchema {
   static void parse_color_json(LightState &state, LightCall &call, JsonObject root);
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
 
 #endif
diff --git a/esphome/components/light/light_output.cpp b/esphome/components/light/light_output.cpp
index e805a0b694..a86e8e5bf1 100644
--- a/esphome/components/light/light_output.cpp
+++ b/esphome/components/light/light_output.cpp
@@ -1,12 +1,10 @@
 #include "light_output.h"
 #include "transformers.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 std::unique_ptr<LightTransformer> LightOutput::create_default_transition() {
   return make_unique<LightTransitionTransformer>();
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_output.h b/esphome/components/light/light_output.h
index 73ba0371cd..c82d270be8 100644
--- a/esphome/components/light/light_output.h
+++ b/esphome/components/light/light_output.h
@@ -5,8 +5,7 @@
 #include "light_state.h"
 #include "light_transformer.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 /// Interface to write LightStates to hardware.
 class LightOutput {
@@ -29,5 +28,4 @@ class LightOutput {
   virtual void write_state(LightState *state) = 0;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index 4c253ec5a8..36b2af03a5 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -5,8 +5,7 @@
 #include "light_output.h"
 #include "transformers.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 static const char *const TAG = "light";
 
@@ -304,5 +303,4 @@ void LightState::save_remote_values_() {
   this->rtc_.save(&saved);
 }
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_state.h b/esphome/components/light/light_state.h
index bf63c0ec27..06519cdc14 100644
--- a/esphome/components/light/light_state.h
+++ b/esphome/components/light/light_state.h
@@ -15,8 +15,7 @@
 #include <strings.h>
 #include <vector>
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 class LightOutput;
 
@@ -298,5 +297,4 @@ class LightState : public EntityBase, public Component {
   LightRestoreMode restore_mode_;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/light_transformer.h b/esphome/components/light/light_transformer.h
index a84183c03c..079c2d2ae0 100644
--- a/esphome/components/light/light_transformer.h
+++ b/esphome/components/light/light_transformer.h
@@ -4,8 +4,7 @@
 #include "esphome/core/helpers.h"
 #include "light_color_values.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 /// Base class for all light color transformers, such as transitions or flashes.
 class LightTransformer {
@@ -59,5 +58,4 @@ class LightTransformer {
   LightColorValues target_values_;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light
diff --git a/esphome/components/light/transformers.h b/esphome/components/light/transformers.h
index 71d41a66d3..a26713b723 100644
--- a/esphome/components/light/transformers.h
+++ b/esphome/components/light/transformers.h
@@ -6,8 +6,7 @@
 #include "light_state.h"
 #include "light_transformer.h"
 
-namespace esphome {
-namespace light {
+namespace esphome::light {
 
 class LightTransitionTransformer : public LightTransformer {
  public:
@@ -118,5 +117,4 @@ class LightFlashTransformer : public LightTransformer {
   bool begun_lightstate_restore_;
 };
 
-}  // namespace light
-}  // namespace esphome
+}  // namespace esphome::light

From b3ef05e5e137fd47ec4f781050af9a571f7689b1 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 18 Nov 2025 22:00:39 -0600
Subject: [PATCH 2/5] [ld24xx] Modernize namespace declarations to C++17 syntax
 (#11988)

---
 esphome/components/ld2410/automation.h                      | 6 ++----
 esphome/components/ld2410/button/factory_reset_button.cpp   | 6 ++----
 esphome/components/ld2410/button/factory_reset_button.h     | 6 ++----
 esphome/components/ld2410/button/query_button.cpp           | 6 ++----
 esphome/components/ld2410/button/query_button.h             | 6 ++----
 esphome/components/ld2410/button/restart_button.cpp         | 6 ++----
 esphome/components/ld2410/button/restart_button.h           | 6 ++----
 esphome/components/ld2410/ld2410.cpp                        | 6 ++----
 esphome/components/ld2410/ld2410.h                          | 6 ++----
 esphome/components/ld2410/number/gate_threshold_number.cpp  | 6 ++----
 esphome/components/ld2410/number/gate_threshold_number.h    | 6 ++----
 esphome/components/ld2410/number/light_threshold_number.cpp | 6 ++----
 esphome/components/ld2410/number/light_threshold_number.h   | 6 ++----
 .../ld2410/number/max_distance_timeout_number.cpp           | 6 ++----
 .../components/ld2410/number/max_distance_timeout_number.h  | 6 ++----
 esphome/components/ld2410/select/baud_rate_select.cpp       | 6 ++----
 esphome/components/ld2410/select/baud_rate_select.h         | 6 ++----
 .../components/ld2410/select/distance_resolution_select.cpp | 6 ++----
 .../components/ld2410/select/distance_resolution_select.h   | 6 ++----
 .../components/ld2410/select/light_out_control_select.cpp   | 6 ++----
 esphome/components/ld2410/select/light_out_control_select.h | 6 ++----
 esphome/components/ld2410/switch/bluetooth_switch.cpp       | 6 ++----
 esphome/components/ld2410/switch/bluetooth_switch.h         | 6 ++----
 .../components/ld2410/switch/engineering_mode_switch.cpp    | 6 ++----
 esphome/components/ld2410/switch/engineering_mode_switch.h  | 6 ++----
 esphome/components/ld2412/button/factory_reset_button.cpp   | 6 ++----
 esphome/components/ld2412/button/factory_reset_button.h     | 6 ++----
 esphome/components/ld2412/button/query_button.cpp           | 6 ++----
 esphome/components/ld2412/button/query_button.h             | 6 ++----
 esphome/components/ld2412/button/restart_button.cpp         | 6 ++----
 esphome/components/ld2412/button/restart_button.h           | 6 ++----
 .../button/start_dynamic_background_correction_button.cpp   | 6 ++----
 .../button/start_dynamic_background_correction_button.h     | 6 ++----
 esphome/components/ld2412/ld2412.cpp                        | 6 ++----
 esphome/components/ld2412/ld2412.h                          | 6 ++----
 esphome/components/ld2412/number/gate_threshold_number.cpp  | 6 ++----
 esphome/components/ld2412/number/gate_threshold_number.h    | 6 ++----
 esphome/components/ld2412/number/light_threshold_number.cpp | 6 ++----
 esphome/components/ld2412/number/light_threshold_number.h   | 6 ++----
 .../ld2412/number/max_distance_timeout_number.cpp           | 6 ++----
 .../components/ld2412/number/max_distance_timeout_number.h  | 6 ++----
 esphome/components/ld2412/select/baud_rate_select.cpp       | 6 ++----
 esphome/components/ld2412/select/baud_rate_select.h         | 6 ++----
 .../components/ld2412/select/distance_resolution_select.cpp | 6 ++----
 .../components/ld2412/select/distance_resolution_select.h   | 6 ++----
 .../components/ld2412/select/light_out_control_select.cpp   | 6 ++----
 esphome/components/ld2412/select/light_out_control_select.h | 6 ++----
 esphome/components/ld2412/switch/bluetooth_switch.cpp       | 6 ++----
 esphome/components/ld2412/switch/bluetooth_switch.h         | 6 ++----
 .../components/ld2412/switch/engineering_mode_switch.cpp    | 6 ++----
 esphome/components/ld2412/switch/engineering_mode_switch.h  | 6 ++----
 .../ld2420/binary_sensor/ld2420_binary_sensor.cpp           | 6 ++----
 .../components/ld2420/binary_sensor/ld2420_binary_sensor.h  | 6 ++----
 esphome/components/ld2420/button/reconfig_buttons.cpp       | 6 ++----
 esphome/components/ld2420/button/reconfig_buttons.h         | 6 ++----
 esphome/components/ld2420/ld2420.cpp                        | 6 ++----
 esphome/components/ld2420/ld2420.h                          | 6 ++----
 esphome/components/ld2420/number/gate_config_number.cpp     | 6 ++----
 esphome/components/ld2420/number/gate_config_number.h       | 6 ++----
 esphome/components/ld2420/select/operating_mode_select.cpp  | 6 ++----
 esphome/components/ld2420/select/operating_mode_select.h    | 6 ++----
 esphome/components/ld2420/sensor/ld2420_sensor.cpp          | 6 ++----
 esphome/components/ld2420/sensor/ld2420_sensor.h            | 6 ++----
 .../components/ld2420/text_sensor/ld2420_text_sensor.cpp    | 6 ++----
 esphome/components/ld2420/text_sensor/ld2420_text_sensor.h  | 6 ++----
 esphome/components/ld2450/button/factory_reset_button.cpp   | 6 ++----
 esphome/components/ld2450/button/factory_reset_button.h     | 6 ++----
 esphome/components/ld2450/button/restart_button.cpp         | 6 ++----
 esphome/components/ld2450/button/restart_button.h           | 6 ++----
 esphome/components/ld2450/ld2450.cpp                        | 6 ++----
 esphome/components/ld2450/ld2450.h                          | 6 ++----
 .../components/ld2450/number/presence_timeout_number.cpp    | 6 ++----
 esphome/components/ld2450/number/presence_timeout_number.h  | 6 ++----
 esphome/components/ld2450/number/zone_coordinate_number.cpp | 6 ++----
 esphome/components/ld2450/number/zone_coordinate_number.h   | 6 ++----
 esphome/components/ld2450/select/baud_rate_select.cpp       | 6 ++----
 esphome/components/ld2450/select/baud_rate_select.h         | 6 ++----
 esphome/components/ld2450/select/zone_type_select.cpp       | 6 ++----
 esphome/components/ld2450/select/zone_type_select.h         | 6 ++----
 esphome/components/ld2450/switch/bluetooth_switch.cpp       | 6 ++----
 esphome/components/ld2450/switch/bluetooth_switch.h         | 6 ++----
 esphome/components/ld2450/switch/multi_target_switch.cpp    | 6 ++----
 esphome/components/ld2450/switch/multi_target_switch.h      | 6 ++----
 esphome/components/ld24xx/ld24xx.h                          | 6 ++----
 84 files changed, 168 insertions(+), 336 deletions(-)

diff --git a/esphome/components/ld2410/automation.h b/esphome/components/ld2410/automation.h
index f4f1c197b2..614453b575 100644
--- a/esphome/components/ld2410/automation.h
+++ b/esphome/components/ld2410/automation.h
@@ -4,8 +4,7 @@
 #include "esphome/core/component.h"
 #include "ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 template<typename... Ts> class BluetoothPasswordSetAction : public Action<Ts...> {
  public:
@@ -18,5 +17,4 @@ template<typename... Ts> class BluetoothPasswordSetAction : public Action<Ts...>
   LD2410Component *ld2410_comp_;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/factory_reset_button.cpp b/esphome/components/ld2410/button/factory_reset_button.cpp
index a848b02a9d..0223df7086 100644
--- a/esphome/components/ld2410/button/factory_reset_button.cpp
+++ b/esphome/components/ld2410/button/factory_reset_button.cpp
@@ -1,9 +1,7 @@
 #include "factory_reset_button.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/factory_reset_button.h b/esphome/components/ld2410/button/factory_reset_button.h
index 45bf979033..715a8c4056 100644
--- a/esphome/components/ld2410/button/factory_reset_button.h
+++ b/esphome/components/ld2410/button/factory_reset_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class FactoryResetButton : public button::Button, public Parented<LD2410Componen
   void press_action() override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/query_button.cpp b/esphome/components/ld2410/button/query_button.cpp
index 47ab416f5a..4085dc3d11 100644
--- a/esphome/components/ld2410/button/query_button.cpp
+++ b/esphome/components/ld2410/button/query_button.cpp
@@ -1,9 +1,7 @@
 #include "query_button.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void QueryButton::press_action() { this->parent_->read_all_info(); }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/query_button.h b/esphome/components/ld2410/button/query_button.h
index c7a47e32d8..7a786901ae 100644
--- a/esphome/components/ld2410/button/query_button.h
+++ b/esphome/components/ld2410/button/query_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class QueryButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class QueryButton : public button::Button, public Parented<LD2410Component> {
   void press_action() override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/restart_button.cpp b/esphome/components/ld2410/button/restart_button.cpp
index de0d36c1ef..0d5002d3c6 100644
--- a/esphome/components/ld2410/button/restart_button.cpp
+++ b/esphome/components/ld2410/button/restart_button.cpp
@@ -1,9 +1,7 @@
 #include "restart_button.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/button/restart_button.h b/esphome/components/ld2410/button/restart_button.h
index d00dc05a53..9bf8639a8c 100644
--- a/esphome/components/ld2410/button/restart_button.h
+++ b/esphome/components/ld2410/button/restart_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class RestartButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class RestartButton : public button::Button, public Parented<LD2410Component> {
   void press_action() override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/ld2410.cpp b/esphome/components/ld2410/ld2410.cpp
index 391f2024cd..bb2e4e2f4c 100644
--- a/esphome/components/ld2410/ld2410.cpp
+++ b/esphome/components/ld2410/ld2410.cpp
@@ -9,8 +9,7 @@
 
 #include "esphome/core/application.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 static const char *const TAG = "ld2410";
 
@@ -782,5 +781,4 @@ void LD2410Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/ld2410.h b/esphome/components/ld2410/ld2410.h
index 52cf76b5b6..efe585fb76 100644
--- a/esphome/components/ld2410/ld2410.h
+++ b/esphome/components/ld2410/ld2410.h
@@ -29,8 +29,7 @@
 
 #include <array>
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 using namespace ld24xx;
 
@@ -133,5 +132,4 @@ class LD2410Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/gate_threshold_number.cpp b/esphome/components/ld2410/number/gate_threshold_number.cpp
index 5d040554d7..65e864a4d7 100644
--- a/esphome/components/ld2410/number/gate_threshold_number.cpp
+++ b/esphome/components/ld2410/number/gate_threshold_number.cpp
@@ -1,7 +1,6 @@
 #include "gate_threshold_number.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 GateThresholdNumber::GateThresholdNumber(uint8_t gate) : gate_(gate) {}
 
@@ -10,5 +9,4 @@ void GateThresholdNumber::control(float value) {
   this->parent_->set_gate_threshold(this->gate_);
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/gate_threshold_number.h b/esphome/components/ld2410/number/gate_threshold_number.h
index 2806ecce63..63491f18d3 100644
--- a/esphome/components/ld2410/number/gate_threshold_number.h
+++ b/esphome/components/ld2410/number/gate_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class GateThresholdNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -15,5 +14,4 @@ class GateThresholdNumber : public number::Number, public Parented<LD2410Compone
   void control(float value) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/light_threshold_number.cpp b/esphome/components/ld2410/number/light_threshold_number.cpp
index 0ff35782cd..55f69ff1fc 100644
--- a/esphome/components/ld2410/number/light_threshold_number.cpp
+++ b/esphome/components/ld2410/number/light_threshold_number.cpp
@@ -1,12 +1,10 @@
 #include "light_threshold_number.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void LightThresholdNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/light_threshold_number.h b/esphome/components/ld2410/number/light_threshold_number.h
index 8f014373c0..3c5e433416 100644
--- a/esphome/components/ld2410/number/light_threshold_number.h
+++ b/esphome/components/ld2410/number/light_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class LightThresholdNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class LightThresholdNumber : public number::Number, public Parented<LD2410Compon
   void control(float value) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/max_distance_timeout_number.cpp b/esphome/components/ld2410/number/max_distance_timeout_number.cpp
index 8a946f7ea9..b8667f5dbc 100644
--- a/esphome/components/ld2410/number/max_distance_timeout_number.cpp
+++ b/esphome/components/ld2410/number/max_distance_timeout_number.cpp
@@ -1,12 +1,10 @@
 #include "max_distance_timeout_number.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void MaxDistanceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_max_distances_timeout();
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/number/max_distance_timeout_number.h b/esphome/components/ld2410/number/max_distance_timeout_number.h
index 7d91b4b5fe..35f4cbbfae 100644
--- a/esphome/components/ld2410/number/max_distance_timeout_number.h
+++ b/esphome/components/ld2410/number/max_distance_timeout_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2410Co
   void control(float value) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/baud_rate_select.cpp b/esphome/components/ld2410/select/baud_rate_select.cpp
index 6da7c1d5f5..a533a2e2d6 100644
--- a/esphome/components/ld2410/select/baud_rate_select.cpp
+++ b/esphome/components/ld2410/select/baud_rate_select.cpp
@@ -1,12 +1,10 @@
 #include "baud_rate_select.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/baud_rate_select.h b/esphome/components/ld2410/select/baud_rate_select.h
index 9385c8cf7e..fb1d016b1f 100644
--- a/esphome/components/ld2410/select/baud_rate_select.h
+++ b/esphome/components/ld2410/select/baud_rate_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class BaudRateSelect : public select::Select, public Parented<LD2410Component> {
   void control(size_t index) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/distance_resolution_select.cpp b/esphome/components/ld2410/select/distance_resolution_select.cpp
index 4fc4c5af02..635bf206d3 100644
--- a/esphome/components/ld2410/select/distance_resolution_select.cpp
+++ b/esphome/components/ld2410/select/distance_resolution_select.cpp
@@ -1,12 +1,10 @@
 #include "distance_resolution_select.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void DistanceResolutionSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_distance_resolution(this->option_at(index));
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/distance_resolution_select.h b/esphome/components/ld2410/select/distance_resolution_select.h
index 1a04f843a6..be2389d36e 100644
--- a/esphome/components/ld2410/select/distance_resolution_select.h
+++ b/esphome/components/ld2410/select/distance_resolution_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class DistanceResolutionSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class DistanceResolutionSelect : public select::Select, public Parented<LD2410Co
   void control(size_t index) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/light_out_control_select.cpp b/esphome/components/ld2410/select/light_out_control_select.cpp
index 25d7ced666..1c55721d52 100644
--- a/esphome/components/ld2410/select/light_out_control_select.cpp
+++ b/esphome/components/ld2410/select/light_out_control_select.cpp
@@ -1,12 +1,10 @@
 #include "light_out_control_select.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void LightOutControlSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/select/light_out_control_select.h b/esphome/components/ld2410/select/light_out_control_select.h
index e8cd8f1d6a..608c311af4 100644
--- a/esphome/components/ld2410/select/light_out_control_select.h
+++ b/esphome/components/ld2410/select/light_out_control_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class LightOutControlSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class LightOutControlSelect : public select::Select, public Parented<LD2410Compo
   void control(size_t index) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/switch/bluetooth_switch.cpp b/esphome/components/ld2410/switch/bluetooth_switch.cpp
index 9bcee9b049..c85dd70ec9 100644
--- a/esphome/components/ld2410/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2410/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/switch/bluetooth_switch.h b/esphome/components/ld2410/switch/bluetooth_switch.h
index 35ae1ec0c9..07804e2292 100644
--- a/esphome/components/ld2410/switch/bluetooth_switch.h
+++ b/esphome/components/ld2410/switch/bluetooth_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2410Component>
   void write_state(bool state) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/switch/engineering_mode_switch.cpp b/esphome/components/ld2410/switch/engineering_mode_switch.cpp
index 967c87c887..4f2f08b03e 100644
--- a/esphome/components/ld2410/switch/engineering_mode_switch.cpp
+++ b/esphome/components/ld2410/switch/engineering_mode_switch.cpp
@@ -1,12 +1,10 @@
 #include "engineering_mode_switch.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 void EngineeringModeSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_engineering_mode(state);
 }
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2410/switch/engineering_mode_switch.h b/esphome/components/ld2410/switch/engineering_mode_switch.h
index e521200cd6..4dd8e16653 100644
--- a/esphome/components/ld2410/switch/engineering_mode_switch.h
+++ b/esphome/components/ld2410/switch/engineering_mode_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2410.h"
 
-namespace esphome {
-namespace ld2410 {
+namespace esphome::ld2410 {
 
 class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2410Component> {
  public:
@@ -14,5 +13,4 @@ class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2410Comp
   void write_state(bool state) override;
 };
 
-}  // namespace ld2410
-}  // namespace esphome
+}  // namespace esphome::ld2410
diff --git a/esphome/components/ld2412/button/factory_reset_button.cpp b/esphome/components/ld2412/button/factory_reset_button.cpp
index 7ee85bc8f9..e8fd891c0f 100644
--- a/esphome/components/ld2412/button/factory_reset_button.cpp
+++ b/esphome/components/ld2412/button/factory_reset_button.cpp
@@ -1,9 +1,7 @@
 #include "factory_reset_button.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/factory_reset_button.h b/esphome/components/ld2412/button/factory_reset_button.h
index 36a3fffcd5..1ef6b23b80 100644
--- a/esphome/components/ld2412/button/factory_reset_button.h
+++ b/esphome/components/ld2412/button/factory_reset_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class FactoryResetButton : public button::Button, public Parented<LD2412Componen
   void press_action() override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/query_button.cpp b/esphome/components/ld2412/button/query_button.cpp
index 536f74427f..9affb26556 100644
--- a/esphome/components/ld2412/button/query_button.cpp
+++ b/esphome/components/ld2412/button/query_button.cpp
@@ -1,9 +1,7 @@
 #include "query_button.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void QueryButton::press_action() { this->parent_->read_all_info(); }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/query_button.h b/esphome/components/ld2412/button/query_button.h
index 595ef6d1e9..373e135802 100644
--- a/esphome/components/ld2412/button/query_button.h
+++ b/esphome/components/ld2412/button/query_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class QueryButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class QueryButton : public button::Button, public Parented<LD2412Component> {
   void press_action() override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/restart_button.cpp b/esphome/components/ld2412/button/restart_button.cpp
index aca0d17841..430f6c998f 100644
--- a/esphome/components/ld2412/button/restart_button.cpp
+++ b/esphome/components/ld2412/button/restart_button.cpp
@@ -1,9 +1,7 @@
 #include "restart_button.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/restart_button.h b/esphome/components/ld2412/button/restart_button.h
index 5cd582e2a3..80c79f5e7d 100644
--- a/esphome/components/ld2412/button/restart_button.h
+++ b/esphome/components/ld2412/button/restart_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class RestartButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class RestartButton : public button::Button, public Parented<LD2412Component> {
   void press_action() override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp b/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp
index 9b37243b82..8ba41a03fb 100644
--- a/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp
+++ b/esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp
@@ -2,10 +2,8 @@
 
 #include "restart_button.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void StartDynamicBackgroundCorrectionButton::press_action() { this->parent_->start_dynamic_background_correction(); }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/button/start_dynamic_background_correction_button.h b/esphome/components/ld2412/button/start_dynamic_background_correction_button.h
index 3af0a8a149..b1f2127896 100644
--- a/esphome/components/ld2412/button/start_dynamic_background_correction_button.h
+++ b/esphome/components/ld2412/button/start_dynamic_background_correction_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class StartDynamicBackgroundCorrectionButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class StartDynamicBackgroundCorrectionButton : public button::Button, public Par
   void press_action() override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/ld2412.cpp b/esphome/components/ld2412/ld2412.cpp
index 4f2fd7c2bd..0f6fe62d30 100644
--- a/esphome/components/ld2412/ld2412.cpp
+++ b/esphome/components/ld2412/ld2412.cpp
@@ -10,8 +10,7 @@
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 static const char *const TAG = "ld2412";
 
@@ -855,5 +854,4 @@ void LD2412Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/ld2412.h b/esphome/components/ld2412/ld2412.h
index 2bed34bdd8..5dd5e7bcde 100644
--- a/esphome/components/ld2412/ld2412.h
+++ b/esphome/components/ld2412/ld2412.h
@@ -29,8 +29,7 @@
 
 #include <array>
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 using namespace ld24xx;
 
@@ -137,5 +136,4 @@ class LD2412Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/gate_threshold_number.cpp b/esphome/components/ld2412/number/gate_threshold_number.cpp
index 47f8cd9107..8d12bad115 100644
--- a/esphome/components/ld2412/number/gate_threshold_number.cpp
+++ b/esphome/components/ld2412/number/gate_threshold_number.cpp
@@ -1,7 +1,6 @@
 #include "gate_threshold_number.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 GateThresholdNumber::GateThresholdNumber(uint8_t gate) : gate_(gate) {}
 
@@ -10,5 +9,4 @@ void GateThresholdNumber::control(float value) {
   this->parent_->set_gate_threshold();
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/gate_threshold_number.h b/esphome/components/ld2412/number/gate_threshold_number.h
index 61d9945a0a..78c2e54d82 100644
--- a/esphome/components/ld2412/number/gate_threshold_number.h
+++ b/esphome/components/ld2412/number/gate_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class GateThresholdNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -15,5 +14,4 @@ class GateThresholdNumber : public number::Number, public Parented<LD2412Compone
   void control(float value) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/light_threshold_number.cpp b/esphome/components/ld2412/number/light_threshold_number.cpp
index 5dab1716bf..81e668e779 100644
--- a/esphome/components/ld2412/number/light_threshold_number.cpp
+++ b/esphome/components/ld2412/number/light_threshold_number.cpp
@@ -1,12 +1,10 @@
 #include "light_threshold_number.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void LightThresholdNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/light_threshold_number.h b/esphome/components/ld2412/number/light_threshold_number.h
index d8727d3c98..81fd73111c 100644
--- a/esphome/components/ld2412/number/light_threshold_number.h
+++ b/esphome/components/ld2412/number/light_threshold_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class LightThresholdNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class LightThresholdNumber : public number::Number, public Parented<LD2412Compon
   void control(float value) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/max_distance_timeout_number.cpp b/esphome/components/ld2412/number/max_distance_timeout_number.cpp
index 1c6471bc72..0d156fbc00 100644
--- a/esphome/components/ld2412/number/max_distance_timeout_number.cpp
+++ b/esphome/components/ld2412/number/max_distance_timeout_number.cpp
@@ -1,12 +1,10 @@
 #include "max_distance_timeout_number.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void MaxDistanceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_basic_config();
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/number/max_distance_timeout_number.h b/esphome/components/ld2412/number/max_distance_timeout_number.h
index af0dcf68c5..c1e947fa19 100644
--- a/esphome/components/ld2412/number/max_distance_timeout_number.h
+++ b/esphome/components/ld2412/number/max_distance_timeout_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2412Co
   void control(float value) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/baud_rate_select.cpp b/esphome/components/ld2412/select/baud_rate_select.cpp
index 7bc4683853..8e351a6541 100644
--- a/esphome/components/ld2412/select/baud_rate_select.cpp
+++ b/esphome/components/ld2412/select/baud_rate_select.cpp
@@ -1,12 +1,10 @@
 #include "baud_rate_select.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/baud_rate_select.h b/esphome/components/ld2412/select/baud_rate_select.h
index ffe0329341..4666dd2fa0 100644
--- a/esphome/components/ld2412/select/baud_rate_select.h
+++ b/esphome/components/ld2412/select/baud_rate_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class BaudRateSelect : public select::Select, public Parented<LD2412Component> {
   void control(size_t index) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/distance_resolution_select.cpp b/esphome/components/ld2412/select/distance_resolution_select.cpp
index 5a6f46a071..95b80f87fb 100644
--- a/esphome/components/ld2412/select/distance_resolution_select.cpp
+++ b/esphome/components/ld2412/select/distance_resolution_select.cpp
@@ -1,12 +1,10 @@
 #include "distance_resolution_select.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void DistanceResolutionSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_distance_resolution(this->option_at(index));
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/distance_resolution_select.h b/esphome/components/ld2412/select/distance_resolution_select.h
index 842f63b7b1..d3b7fad2f9 100644
--- a/esphome/components/ld2412/select/distance_resolution_select.h
+++ b/esphome/components/ld2412/select/distance_resolution_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class DistanceResolutionSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class DistanceResolutionSelect : public select::Select, public Parented<LD2412Co
   void control(size_t index) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/light_out_control_select.cpp b/esphome/components/ld2412/select/light_out_control_select.cpp
index cfbc7f7d7c..bdfb78d687 100644
--- a/esphome/components/ld2412/select/light_out_control_select.cpp
+++ b/esphome/components/ld2412/select/light_out_control_select.cpp
@@ -1,12 +1,10 @@
 #include "light_out_control_select.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void LightOutControlSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/select/light_out_control_select.h b/esphome/components/ld2412/select/light_out_control_select.h
index 7a50970d0d..9f86189878 100644
--- a/esphome/components/ld2412/select/light_out_control_select.h
+++ b/esphome/components/ld2412/select/light_out_control_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class LightOutControlSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class LightOutControlSelect : public select::Select, public Parented<LD2412Compo
   void control(size_t index) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/switch/bluetooth_switch.cpp b/esphome/components/ld2412/switch/bluetooth_switch.cpp
index 14387aa276..e5f49a819a 100644
--- a/esphome/components/ld2412/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2412/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/switch/bluetooth_switch.h b/esphome/components/ld2412/switch/bluetooth_switch.h
index 730d338d87..0c0d1fa550 100644
--- a/esphome/components/ld2412/switch/bluetooth_switch.h
+++ b/esphome/components/ld2412/switch/bluetooth_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2412Component>
   void write_state(bool state) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/switch/engineering_mode_switch.cpp b/esphome/components/ld2412/switch/engineering_mode_switch.cpp
index 29ca0c22a8..28b4e5d9e6 100644
--- a/esphome/components/ld2412/switch/engineering_mode_switch.cpp
+++ b/esphome/components/ld2412/switch/engineering_mode_switch.cpp
@@ -1,12 +1,10 @@
 #include "engineering_mode_switch.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 void EngineeringModeSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_engineering_mode(state);
 }
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2412/switch/engineering_mode_switch.h b/esphome/components/ld2412/switch/engineering_mode_switch.h
index aaa404c673..4e75a8a185 100644
--- a/esphome/components/ld2412/switch/engineering_mode_switch.h
+++ b/esphome/components/ld2412/switch/engineering_mode_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2412.h"
 
-namespace esphome {
-namespace ld2412 {
+namespace esphome::ld2412 {
 
 class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2412Component> {
  public:
@@ -14,5 +13,4 @@ class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2412Comp
   void write_state(bool state) override;
 };
 
-}  // namespace ld2412
-}  // namespace esphome
+}  // namespace esphome::ld2412
diff --git a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
index d8632e9c19..6297cba2e7 100644
--- a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
+++ b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420.binary_sensor";
 
@@ -12,5 +11,4 @@ void LD2420BinarySensor::dump_config() {
   LOG_BINARY_SENSOR("  ", "Presence", this->presence_bsensor_);
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
index ee06439090..ec52312f92 100644
--- a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
+++ b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420BinarySensor : public LD2420Listener, public Component, binary_sensor::BinarySensor {
  public:
@@ -21,5 +20,4 @@ class LD2420BinarySensor : public LD2420Listener, public Component, binary_senso
   binary_sensor::BinarySensor *presence_bsensor_{nullptr};
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/button/reconfig_buttons.cpp b/esphome/components/ld2420/button/reconfig_buttons.cpp
index fb8ec2b5a6..1e748e59b8 100644
--- a/esphome/components/ld2420/button/reconfig_buttons.cpp
+++ b/esphome/components/ld2420/button/reconfig_buttons.cpp
@@ -4,13 +4,11 @@
 
 static const char *const TAG = "ld2420.button";
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 void LD2420ApplyConfigButton::press_action() { this->parent_->apply_config_action(); }
 void LD2420RevertConfigButton::press_action() { this->parent_->revert_config_action(); }
 void LD2420RestartModuleButton::press_action() { this->parent_->restart_module_action(); }
 void LD2420FactoryResetButton::press_action() { this->parent_->factory_reset_action(); }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/button/reconfig_buttons.h b/esphome/components/ld2420/button/reconfig_buttons.h
index 4e9e7a3692..72171ef386 100644
--- a/esphome/components/ld2420/button/reconfig_buttons.h
+++ b/esphome/components/ld2420/button/reconfig_buttons.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2420.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420ApplyConfigButton : public button::Button, public Parented<LD2420Component> {
  public:
@@ -38,5 +37,4 @@ class LD2420FactoryResetButton : public button::Button, public Parented<LD2420Co
   void press_action() override;
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/ld2420.cpp b/esphome/components/ld2420/ld2420.cpp
index f544acc112..4fca9494aa 100644
--- a/esphome/components/ld2420/ld2420.cpp
+++ b/esphome/components/ld2420/ld2420.cpp
@@ -58,8 +58,7 @@ Gate 0 high thresh = 10 00 uint16_t 0x0010, Threshold value = 60 EA 00 00 uint32
 Gate 0 low thresh = 20 00 uint16_t 0x0020, Threshold value = 60 EA 00 00 uint32_t 0x0000EA60
 */
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420";
 
@@ -880,5 +879,4 @@ void LD2420Component::refresh_gate_config_numbers() {
 
 #endif
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/ld2420.h b/esphome/components/ld2420/ld2420.h
index 128baab604..50ddf45264 100644
--- a/esphome/components/ld2420/ld2420.h
+++ b/esphome/components/ld2420/ld2420.h
@@ -17,8 +17,7 @@
 #include "esphome/components/button/button.h"
 #endif
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const uint8_t CALIBRATE_SAMPLES = 64;
 static const uint8_t MAX_LINE_LENGTH = 46;  // Max characters for serial buffer
@@ -193,5 +192,4 @@ class LD2420Component : public Component, public uart::UARTDevice {
   std::vector<LD2420Listener *> listeners_{};
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/number/gate_config_number.cpp b/esphome/components/ld2420/number/gate_config_number.cpp
index a373753770..998eed2188 100644
--- a/esphome/components/ld2420/number/gate_config_number.cpp
+++ b/esphome/components/ld2420/number/gate_config_number.cpp
@@ -4,8 +4,7 @@
 
 static const char *const TAG = "ld2420.number";
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 void LD2420TimeoutNumber::control(float timeout) {
   this->publish_state(timeout);
@@ -69,5 +68,4 @@ void LD2420StillThresholdNumbers::control(float still_threshold) {
   }
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/number/gate_config_number.h b/esphome/components/ld2420/number/gate_config_number.h
index 459a8026e3..8a8b9c61b1 100644
--- a/esphome/components/ld2420/number/gate_config_number.h
+++ b/esphome/components/ld2420/number/gate_config_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2420.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420TimeoutNumber : public number::Number, public Parented<LD2420Component> {
  public:
@@ -74,5 +73,4 @@ class LD2420MoveThresholdNumbers : public number::Number, public Parented<LD2420
   void control(float move_threshold) override;
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/select/operating_mode_select.cpp b/esphome/components/ld2420/select/operating_mode_select.cpp
index 5bf80b33c9..82939e18d3 100644
--- a/esphome/components/ld2420/select/operating_mode_select.cpp
+++ b/esphome/components/ld2420/select/operating_mode_select.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420.select";
 
@@ -12,5 +11,4 @@ void LD2420Select::control(size_t index) {
   this->parent_->set_operating_mode(this->option_at(index));
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/select/operating_mode_select.h b/esphome/components/ld2420/select/operating_mode_select.h
index f59eb33432..c1b8e0b11b 100644
--- a/esphome/components/ld2420/select/operating_mode_select.h
+++ b/esphome/components/ld2420/select/operating_mode_select.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/select/select.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420Select : public Component, public select::Select, public Parented<LD2420Component> {
  public:
@@ -14,5 +13,4 @@ class LD2420Select : public Component, public select::Select, public Parented<LD
   void control(size_t index) override;
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/sensor/ld2420_sensor.cpp b/esphome/components/ld2420/sensor/ld2420_sensor.cpp
index 723604f396..02b5826f98 100644
--- a/esphome/components/ld2420/sensor/ld2420_sensor.cpp
+++ b/esphome/components/ld2420/sensor/ld2420_sensor.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420.sensor";
 
@@ -12,5 +11,4 @@ void LD2420Sensor::dump_config() {
   LOG_SENSOR("  ", "Distance", this->distance_sensor_);
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/sensor/ld2420_sensor.h b/esphome/components/ld2420/sensor/ld2420_sensor.h
index 82730d60e3..4849cfa047 100644
--- a/esphome/components/ld2420/sensor/ld2420_sensor.h
+++ b/esphome/components/ld2420/sensor/ld2420_sensor.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/sensor/sensor.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420Sensor : public LD2420Listener, public Component, sensor::Sensor {
  public:
@@ -30,5 +29,4 @@ class LD2420Sensor : public LD2420Listener, public Component, sensor::Sensor {
   std::vector<sensor::Sensor *> energy_sensors_ = std::vector<sensor::Sensor *>(TOTAL_GATES);
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp b/esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp
index f647a36936..f7b016c9d9 100644
--- a/esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp
+++ b/esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp
@@ -2,8 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 static const char *const TAG = "ld2420.text_sensor";
 
@@ -12,5 +11,4 @@ void LD2420TextSensor::dump_config() {
   LOG_TEXT_SENSOR("  ", "Firmware", this->fw_version_text_sensor_);
 }
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2420/text_sensor/ld2420_text_sensor.h b/esphome/components/ld2420/text_sensor/ld2420_text_sensor.h
index 073ddd5d0f..1932eaaf69 100644
--- a/esphome/components/ld2420/text_sensor/ld2420_text_sensor.h
+++ b/esphome/components/ld2420/text_sensor/ld2420_text_sensor.h
@@ -3,8 +3,7 @@
 #include "../ld2420.h"
 #include "esphome/components/text_sensor/text_sensor.h"
 
-namespace esphome {
-namespace ld2420 {
+namespace esphome::ld2420 {
 
 class LD2420TextSensor : public LD2420Listener, public Component, text_sensor::TextSensor {
  public:
@@ -20,5 +19,4 @@ class LD2420TextSensor : public LD2420Listener, public Component, text_sensor::T
   text_sensor::TextSensor *fw_version_text_sensor_{nullptr};
 };
 
-}  // namespace ld2420
-}  // namespace esphome
+}  // namespace esphome::ld2420
diff --git a/esphome/components/ld2450/button/factory_reset_button.cpp b/esphome/components/ld2450/button/factory_reset_button.cpp
index bcac7ada2f..7a8eb5b0dd 100644
--- a/esphome/components/ld2450/button/factory_reset_button.cpp
+++ b/esphome/components/ld2450/button/factory_reset_button.cpp
@@ -1,9 +1,7 @@
 #include "factory_reset_button.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/button/factory_reset_button.h b/esphome/components/ld2450/button/factory_reset_button.h
index 8e80347119..392fc67ffd 100644
--- a/esphome/components/ld2450/button/factory_reset_button.h
+++ b/esphome/components/ld2450/button/factory_reset_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class FactoryResetButton : public button::Button, public Parented<LD2450Componen
   void press_action() override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/button/restart_button.cpp b/esphome/components/ld2450/button/restart_button.cpp
index ee2f5ac12f..572df80325 100644
--- a/esphome/components/ld2450/button/restart_button.cpp
+++ b/esphome/components/ld2450/button/restart_button.cpp
@@ -1,9 +1,7 @@
 #include "restart_button.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/button/restart_button.h b/esphome/components/ld2450/button/restart_button.h
index a44ae5a4d2..9219011f8b 100644
--- a/esphome/components/ld2450/button/restart_button.h
+++ b/esphome/components/ld2450/button/restart_button.h
@@ -3,8 +3,7 @@
 #include "esphome/components/button/button.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class RestartButton : public button::Button, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class RestartButton : public button::Button, public Parented<LD2450Component> {
   void press_action() override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/ld2450.cpp b/esphome/components/ld2450/ld2450.cpp
index 8e5287aec7..e69ef31d4f 100644
--- a/esphome/components/ld2450/ld2450.cpp
+++ b/esphome/components/ld2450/ld2450.cpp
@@ -13,8 +13,7 @@
 #include <cmath>
 #include <numbers>
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 static const char *const TAG = "ld2450";
 
@@ -939,5 +938,4 @@ float LD2450Component::restore_from_flash_() {
 }
 #endif
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/ld2450.h b/esphome/components/ld2450/ld2450.h
index 44b63be444..b94c3cac37 100644
--- a/esphome/components/ld2450/ld2450.h
+++ b/esphome/components/ld2450/ld2450.h
@@ -31,8 +31,7 @@
 
 #include <array>
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 using namespace ld24xx;
 
@@ -193,5 +192,4 @@ class LD2450Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/number/presence_timeout_number.cpp b/esphome/components/ld2450/number/presence_timeout_number.cpp
index ecfe71f484..19a1ada0d7 100644
--- a/esphome/components/ld2450/number/presence_timeout_number.cpp
+++ b/esphome/components/ld2450/number/presence_timeout_number.cpp
@@ -1,12 +1,10 @@
 #include "presence_timeout_number.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void PresenceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_presence_timeout();
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/number/presence_timeout_number.h b/esphome/components/ld2450/number/presence_timeout_number.h
index b18699792f..09c8afca55 100644
--- a/esphome/components/ld2450/number/presence_timeout_number.h
+++ b/esphome/components/ld2450/number/presence_timeout_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class PresenceTimeoutNumber : public number::Number, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class PresenceTimeoutNumber : public number::Number, public Parented<LD2450Compo
   void control(float value) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/number/zone_coordinate_number.cpp b/esphome/components/ld2450/number/zone_coordinate_number.cpp
index 5338d7e5ee..83be3cbec4 100644
--- a/esphome/components/ld2450/number/zone_coordinate_number.cpp
+++ b/esphome/components/ld2450/number/zone_coordinate_number.cpp
@@ -1,7 +1,6 @@
 #include "zone_coordinate_number.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 ZoneCoordinateNumber::ZoneCoordinateNumber(uint8_t zone) : zone_(zone) {}
 
@@ -10,5 +9,4 @@ void ZoneCoordinateNumber::control(float value) {
   this->parent_->set_zone_coordinate(this->zone_);
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/number/zone_coordinate_number.h b/esphome/components/ld2450/number/zone_coordinate_number.h
index 72b83889c4..f5a389d712 100644
--- a/esphome/components/ld2450/number/zone_coordinate_number.h
+++ b/esphome/components/ld2450/number/zone_coordinate_number.h
@@ -3,8 +3,7 @@
 #include "esphome/components/number/number.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class ZoneCoordinateNumber : public number::Number, public Parented<LD2450Component> {
  public:
@@ -15,5 +14,4 @@ class ZoneCoordinateNumber : public number::Number, public Parented<LD2450Compon
   void control(float value) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/select/baud_rate_select.cpp b/esphome/components/ld2450/select/baud_rate_select.cpp
index 754972214e..7b18b28006 100644
--- a/esphome/components/ld2450/select/baud_rate_select.cpp
+++ b/esphome/components/ld2450/select/baud_rate_select.cpp
@@ -1,12 +1,10 @@
 #include "baud_rate_select.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/select/baud_rate_select.h b/esphome/components/ld2450/select/baud_rate_select.h
index 22810d5f13..cb53118170 100644
--- a/esphome/components/ld2450/select/baud_rate_select.h
+++ b/esphome/components/ld2450/select/baud_rate_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class BaudRateSelect : public select::Select, public Parented<LD2450Component> {
   void control(size_t index) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/select/zone_type_select.cpp b/esphome/components/ld2450/select/zone_type_select.cpp
index 1111428c7c..39642b99ad 100644
--- a/esphome/components/ld2450/select/zone_type_select.cpp
+++ b/esphome/components/ld2450/select/zone_type_select.cpp
@@ -1,12 +1,10 @@
 #include "zone_type_select.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void ZoneTypeSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_zone_type(this->option_at(index));
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/select/zone_type_select.h b/esphome/components/ld2450/select/zone_type_select.h
index fc95ec1021..566346eb48 100644
--- a/esphome/components/ld2450/select/zone_type_select.h
+++ b/esphome/components/ld2450/select/zone_type_select.h
@@ -3,8 +3,7 @@
 #include "esphome/components/select/select.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class ZoneTypeSelect : public select::Select, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class ZoneTypeSelect : public select::Select, public Parented<LD2450Component> {
   void control(size_t index) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/switch/bluetooth_switch.cpp b/esphome/components/ld2450/switch/bluetooth_switch.cpp
index fa0d4fb06a..0e19a3e6c6 100644
--- a/esphome/components/ld2450/switch/bluetooth_switch.cpp
+++ b/esphome/components/ld2450/switch/bluetooth_switch.cpp
@@ -1,12 +1,10 @@
 #include "bluetooth_switch.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/switch/bluetooth_switch.h b/esphome/components/ld2450/switch/bluetooth_switch.h
index 3c1c4f755c..3d48a89b57 100644
--- a/esphome/components/ld2450/switch/bluetooth_switch.h
+++ b/esphome/components/ld2450/switch/bluetooth_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2450Component>
   void write_state(bool state) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/switch/multi_target_switch.cpp b/esphome/components/ld2450/switch/multi_target_switch.cpp
index a163e29fc5..0b1cb04a68 100644
--- a/esphome/components/ld2450/switch/multi_target_switch.cpp
+++ b/esphome/components/ld2450/switch/multi_target_switch.cpp
@@ -1,12 +1,10 @@
 #include "multi_target_switch.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 void MultiTargetSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_multi_target(state);
 }
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld2450/switch/multi_target_switch.h b/esphome/components/ld2450/switch/multi_target_switch.h
index ca6253588d..739f308cce 100644
--- a/esphome/components/ld2450/switch/multi_target_switch.h
+++ b/esphome/components/ld2450/switch/multi_target_switch.h
@@ -3,8 +3,7 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2450.h"
 
-namespace esphome {
-namespace ld2450 {
+namespace esphome::ld2450 {
 
 class MultiTargetSwitch : public switch_::Switch, public Parented<LD2450Component> {
  public:
@@ -14,5 +13,4 @@ class MultiTargetSwitch : public switch_::Switch, public Parented<LD2450Componen
   void write_state(bool state) override;
 };
 
-}  // namespace ld2450
-}  // namespace esphome
+}  // namespace esphome::ld2450
diff --git a/esphome/components/ld24xx/ld24xx.h b/esphome/components/ld24xx/ld24xx.h
index e695b00705..cbd86e4e40 100644
--- a/esphome/components/ld24xx/ld24xx.h
+++ b/esphome/components/ld24xx/ld24xx.h
@@ -37,8 +37,7 @@
 #define highbyte(val) (uint8_t)((val) >> 8)
 #define lowbyte(val) (uint8_t)((val) &0xff)
 
-namespace esphome {
-namespace ld24xx {
+namespace esphome::ld24xx {
 
 static const char *const UNKNOWN_MAC = "unknown";
 static const char *const VERSION_FMT = "%u.%02X.%02X%02X%02X%02X";
@@ -83,5 +82,4 @@ template<typename T> class SensorWithDedup {
   Deduplicator<T> publish_dedup;
 };
 #endif
-}  // namespace ld24xx
-}  // namespace esphome
+}  // namespace esphome::ld24xx

From 100ea46f03eb45b10beed6f8d36133f9d2635e70 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 18 Nov 2025 23:19:54 -0600
Subject: [PATCH 3/5] [tests] Fix SNTP time ID conflicts in component tests for
 grouped testing (#11990)

---
 tests/components/lvgl/common.yaml       | 4 ++--
 tests/components/lvgl/lvgl-package.yaml | 6 +++---
 tests/components/mqtt/common.yaml       | 1 +
 tests/components/uptime/common.yaml     | 1 +
 tests/components/wireguard/common.yaml  | 2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/components/lvgl/common.yaml b/tests/components/lvgl/common.yaml
index c70dd7568d..652ae7e7a1 100644
--- a/tests/components/lvgl/common.yaml
+++ b/tests/components/lvgl/common.yaml
@@ -115,8 +115,8 @@ wifi:
   password: PASSWORD123
 
 time:
-  platform: sntp
-  id: time_id
+  - platform: sntp
+    id: sntp_time
 
 text:
   - id: lvgl_text
diff --git a/tests/components/lvgl/lvgl-package.yaml b/tests/components/lvgl/lvgl-package.yaml
index eabceff9d9..5839643638 100644
--- a/tests/components/lvgl/lvgl-package.yaml
+++ b/tests/components/lvgl/lvgl-package.yaml
@@ -478,19 +478,19 @@ lvgl:
                   id: hello_label
                   text:
                     time_format: "%c"
-                    time: time_id
+                    time: sntp_time
               - lvgl.label.update:
                   id: hello_label
                   text:
                     time_format: "%c"
-                    time: !lambda return id(time_id).now();
+                    time: !lambda return id(sntp_time).now();
               - lvgl.label.update:
                   id: hello_label
                   text:
                     time_format: "%c"
                     time: !lambda |-
                         ESP_LOGD("label", "multi-line lambda");
-                        return id(time_id).now();
+                        return id(sntp_time).now();
             on_value:
               logger.log:
                 format: "state now %d"
diff --git a/tests/components/mqtt/common.yaml b/tests/components/mqtt/common.yaml
index 3f1b83bb01..284ac30337 100644
--- a/tests/components/mqtt/common.yaml
+++ b/tests/components/mqtt/common.yaml
@@ -4,6 +4,7 @@ wifi:
 
 time:
   - platform: sntp
+    id: sntp_time
 
 mqtt:
   broker: "192.168.178.84"
diff --git a/tests/components/uptime/common.yaml b/tests/components/uptime/common.yaml
index 86b764e7ff..279258c670 100644
--- a/tests/components/uptime/common.yaml
+++ b/tests/components/uptime/common.yaml
@@ -3,6 +3,7 @@ wifi:
 
 time:
   - platform: sntp
+    id: sntp_time
 
 sensor:
   - platform: uptime
diff --git a/tests/components/wireguard/common.yaml b/tests/components/wireguard/common.yaml
index cd7ab1075e..342ffa32f6 100644
--- a/tests/components/wireguard/common.yaml
+++ b/tests/components/wireguard/common.yaml
@@ -4,8 +4,10 @@ wifi:
 
 time:
   - platform: sntp
+    id: sntp_time
 
 wireguard:
+  time_id: sntp_time
   address: 172.16.34.100
   netmask: 255.255.255.0
   # NEVER use the following keys for your VPN -- they are now public!

From f2b10ad132dcc4118cd6e0ecbead9da746863b77 Mon Sep 17 00:00:00 2001
From: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
Date: Wed, 19 Nov 2025 10:12:34 -0500
Subject: [PATCH 4/5] [text_sensor] Fix infinite loop in substitute filter
 (#11989)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 esphome/components/text_sensor/filter.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/esphome/components/text_sensor/filter.cpp b/esphome/components/text_sensor/filter.cpp
index a242b43b1c..40a37febee 100644
--- a/esphome/components/text_sensor/filter.cpp
+++ b/esphome/components/text_sensor/filter.cpp
@@ -66,10 +66,14 @@ SubstituteFilter::SubstituteFilter(const std::initializer_list<Substitution> &su
     : substitutions_(substitutions) {}
 
 optional<std::string> SubstituteFilter::new_value(std::string value) {
-  std::size_t pos;
   for (const auto &sub : this->substitutions_) {
-    while ((pos = value.find(sub.from)) != std::string::npos)
+    std::size_t pos = 0;
+    while ((pos = value.find(sub.from, pos)) != std::string::npos) {
       value.replace(pos, sub.from.size(), sub.to);
+      // Advance past the replacement to avoid infinite loop when
+      // the replacement contains the search pattern (e.g., f -> foo)
+      pos += sub.to.size();
+    }
   }
   return value;
 }

From 73bc5252a1467a7530b921eb9be16ab6819f3038 Mon Sep 17 00:00:00 2001
From: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
Date: Wed, 19 Nov 2025 10:12:57 -0500
Subject: [PATCH 5/5] [wifi] Fix positive RSSI values on 8266 (#11994)

---
 esphome/components/wifi/wifi_component_esp8266.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index a543628e27..274a505db2 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -872,7 +872,13 @@ bssid_t WiFiComponent::wifi_bssid() {
   return bssid;
 }
 std::string WiFiComponent::wifi_ssid() { return WiFi.SSID().c_str(); }
-int8_t WiFiComponent::wifi_rssi() { return WiFi.status() == WL_CONNECTED ? WiFi.RSSI() : WIFI_RSSI_DISCONNECTED; }
+int8_t WiFiComponent::wifi_rssi() {
+  if (WiFi.status() != WL_CONNECTED)
+    return WIFI_RSSI_DISCONNECTED;
+  int8_t rssi = WiFi.RSSI();
+  // Values >= 31 are error codes per NONOS SDK API, not valid RSSI readings
+  return rssi >= 31 ? WIFI_RSSI_DISCONNECTED : rssi;
+}
 int32_t WiFiComponent::get_wifi_channel() { return WiFi.channel(); }
 network::IPAddress WiFiComponent::wifi_subnet_mask_() { return {(const ip_addr_t *) WiFi.subnetMask()}; }
 network::IPAddress WiFiComponent::wifi_gateway_ip_() { return {(const ip_addr_t *) WiFi.gatewayIP()}; }