[11.x] Fix attribute inheritance for nested scheduled groups (laravel…

…#53626) * fix nested group * refactor tests
parshikov · Nov 21, 2024 · d8438ec · d8438ec
1 parent ac3d32e
commit d8438ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/Illuminate/Console/Scheduling/Schedule.php b/src/Illuminate/Console/Scheduling/Schedule.php
@@ -454,7 +454,7 @@ public function __call($method, $parameters)
         }
 
         if (method_exists(PendingEventAttributes::class, $method)) {
-            $this->attributes ??= new PendingEventAttributes($this);
+            $this->attributes ??= end($this->groupStack) ?: new PendingEventAttributes($this);
 
             return $this->attributes->$method(...$parameters);
         }

diff --git a/tests/Integration/Console/Scheduling/ScheduleGroupTest.php b/tests/Integration/Console/Scheduling/ScheduleGroupTest.php
@@ -75,19 +75,14 @@ public function testGroupedScheduleCanBeNested()
             ->timezone('UTC')
             ->group(function () {
                 Schedule::command('inspire');
-                Schedule::timezone('Asia/Dhaka')
-                    ->everyMinute()
-                    ->group(function () {
-                        Schedule::command('inspire');
-                    });
+                Schedule::timezone('Asia/Dhaka')->group(function () {
+                    Schedule::command('inspire');
+                });
             });
 
         $events = Schedule::events();
         $this->assertSame('UTC', $events[0]->timezone);
-        $this->assertSame('0 0 * * *', $events[0]->expression);
-
         $this->assertSame('Asia/Dhaka', $events[1]->timezone);
-        $this->assertSame('* * * * *', $events[1]->expression);
     }
 
     #[DataProvider('groupAttributes')]