[12.x] Allow Scheduled Command Event macros to be applied to schedule groups

src/Illuminate/Console/Scheduling/PendingEventAttributes.php

@@ -9,6 +9,13 @@ class PendingEventAttributes
 {
     use ManagesAttributes, ManagesFrequencies;
 
+    /**
+     * The recorded macro calls to replay on each event.
+     *
+     * @var array<int, array{string, array}>
+     */
+    protected array $macros = [];
+
     /**
      * Create a new pending event attributes instance.
      */
@@ -81,13 +88,23 @@ public function mergeAttributes(Event $event): void
         foreach ($this->rejects as $reject) {
             $event->skip($reject);
         }
+
+        foreach ($this->macros as [$method, $parameters]) {
+            $event->{$method}(...$parameters);
+        }
     }
 
     /**
      * Proxy missing methods onto the underlying schedule.
      */
     public function __call(string $method, array $parameters): mixed
     {
+        if (Event::hasMacro($method)) {
+            $this->macros[] = [$method, $parameters];
+
+            return $this;
+        }
+
         return $this->schedule->{$method}(...$parameters);
     }
 }

src/Illuminate/Console/Scheduling/Schedule.php

@@ -486,7 +486,7 @@ public function __call($method, $parameters)
             return $this->macroCall($method, $parameters);
         }
 
-        if (method_exists(PendingEventAttributes::class, $method)) {
+        if (method_exists(PendingEventAttributes::class, $method) || Event::hasMacro($method)) {
             $this->attributes ??= $this->groupStack ? clone array_last($this->groupStack) : new PendingEventAttributes($this);
 
             return $this->attributes->$method(...$parameters);

tests/Integration/Console/Scheduling/ScheduleGroupTest.php

@@ -4,6 +4,7 @@
 
 namespace Illuminate\Tests\Integration\Console\Scheduling;
 
+use Illuminate\Console\Scheduling\Event;
 use Illuminate\Console\Scheduling\Schedule as ScheduleClass;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Schedule;
@@ -213,4 +214,102 @@ public function testGroupedPendingEventAttributesWithoutOverlapping()
         $this->assertSame('* * * * 1-5', $events[2]->expression);
         $this->assertSame('0 4 * * 1-5', $events[3]->expression);
     }
+
+    public function testGroupAppliesEventMacrosToAllEvents()
+    {
+        Event::macro('sentryMonitor', function () {
+            $this->sentryMonitored = true;
+
+            return $this;
+        });
+
+        $schedule = new ScheduleClass;
+        $schedule->daily()->sentryMonitor()->group(function ($schedule) {
+            $schedule->command('inspire');
+            $schedule->command('inspire');
+        });
+
+        $events = $schedule->events();
+        $this->assertTrue($events[0]->sentryMonitored);
+        $this->assertTrue($events[1]->sentryMonitored);
+        $this->assertSame('0 0 * * *', $events[0]->expression);
+        $this->assertSame('0 0 * * *', $events[1]->expression);
+
+        Event::flushMacros();
+    }
+
+    public function testGroupAppliesEventMacroCalledBeforeBuiltInAttributes()
+    {
+        Event::macro('sentryMonitor', function () {
+            $this->sentryMonitored = true;
+
+            return $this;
+        });
+
+        $schedule = new ScheduleClass;
+        $schedule->sentryMonitor()->daily()->onOneServer()->group(function ($schedule) {
+            $schedule->command('inspire');
+        });
+
+        $events = $schedule->events();
+        $this->assertTrue($events[0]->sentryMonitored);
+        $this->assertTrue($events[0]->onOneServer);
+        $this->assertSame('0 0 * * *', $events[0]->expression);
+
+        Event::flushMacros();
+    }
+
+    public function testGroupAppliesMultipleEventMacros()
+    {
+        Event::macro('sentryMonitor', function () {
+            $this->sentryMonitored = true;
+
+            return $this;
+        });
+
+        Event::macro('customTag', function ($tag) {
+            $this->customTag = $tag;
+
+            return $this;
+        });
+
+        $schedule = new ScheduleClass;
+        $schedule->daily()->sentryMonitor()->customTag('billing')->group(function ($schedule) {
+            $schedule->command('inspire');
+            $schedule->command('inspire');
+        });
+
+        $events = $schedule->events();
+        $this->assertTrue($events[0]->sentryMonitored);
+        $this->assertSame('billing', $events[0]->customTag);
+        $this->assertTrue($events[1]->sentryMonitored);
+        $this->assertSame('billing', $events[1]->customTag);
+
+        Event::flushMacros();
+    }
+
+    public function testNestedGroupInheritsEventMacros()
+    {
+        Event::macro('sentryMonitor', function () {
+            $this->sentryMonitored = true;
+
+            return $this;
+        });
+
+        $schedule = new ScheduleClass;
+        $schedule->daily()->sentryMonitor()->group(function ($schedule) {
+            $schedule->command('inspire');
+            $schedule->weekly()->group(function ($schedule) {
+                $schedule->command('inspire');
+            });
+        });
+
+        $events = $schedule->events();
+        $this->assertTrue($events[0]->sentryMonitored);
+        $this->assertSame('0 0 * * *', $events[0]->expression);
+        $this->assertTrue($events[1]->sentryMonitored);
+        $this->assertSame('0 0 * * 0', $events[1]->expression);
+
+        Event::flushMacros();
+    }
 }